开源软件构建与测试

Changes of Revision 3

_service:tar_scm:libgphoto2.spec Changed

@@ -1,7 +1,7 @@
 Name:           libgphoto2
 Summary:        library for giving access to literally hundreds of digital cameras
-Version:        2.5.18
-Release:        4
+Version:        2.5.31
+Release:        1
 License:        GPL-2.0+ and LGPL-2.1+
 URL:            http://www.gphoto.org/
 Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
@@ -9,7 +9,7 @@
 Patch1:         gphoto2-pkgcfg.patch
 Patch2:         gphoto2-device-return.patch
 
-BuildRequires:  gcc gcc-c++ make systemd libtool-ltdl-devel libjpeg-devel gd-devel
+BuildRequires:  gcc gcc-c++ make systemd libtool-ltdl-devel libjpeg-devel gd-devel libcurl-devel
 BuildRequires:  pkgconfig(libxml-2.0) pkgconfig(libexif) lockdev-devel pkgconfig(libusb-1.0)
 
 Requires:       lockdev
@@ -53,12 +53,14 @@
 %install
 %make_install INSTALL="install -p" mandir=%{_mandir}
 
-pushd packaging/linux-hotplug/
+pushd packaging/generic/
   export LIBDIR=${RPM_BUILD_ROOT}%{_libdir}
   export CAMLIBS=${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{version}
   export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir}
   install -d ${RPM_BUILD_ROOT}%{_udevrulesdir}
-  ${RPM_BUILD_ROOT}%{_libdir}/%{name}/print-camera-list udev-rules version 136 > ${RPM_BUILD_ROOT}%{_udevrulesdir}/40-%{name}.rules
+  %{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 201 > %{buildroot}%{_udevrulesdir}/40-%{name}.rules 
+  install -d %{buildroot}%{_udevhwdbdir}            
+  %{buildroot}%{_libdir}/%{name}/print-camera-list hwdb version 201 > %{buildroot}%{_udevhwdbdir}/20-gphoto2.hwdb
 popd
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -print -delete
@@ -68,6 +70,7 @@
 cat %{name}*.lang >> %{name}.lang
 
 mkdir __doc
+rm -rf %{buildroot}%{_pkgdocdir}_port/{AUTHORS,NEWS,README}
 cp -a ${RPM_BUILD_ROOT}%{_pkgdocdir}/* __doc
 
 %files -f %{name}.lang
@@ -75,12 +78,13 @@
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/%{version}/
 %dir %{_libdir}/%{name}_port/
-%dir %{_libdir}/%{name}_port/0.12.0/
+%dir %{_libdir}/%{name}_port/0.12.2/
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}_port.so.*
 %{_libdir}/%{name}/%{version}/*.so
-%{_libdir}/%{name}_port/0.12.0/*.so
+%{_libdir}/%{name}_port/0.12.2/*.so
 %{_udevrulesdir}/40-%{name}.rules
+%{_udevhwdbdir}/20-gphoto2.hwdb
 %(pkg-config --variable=udevdir udev)/check-ptp-camera
 %{_datadir}/%{name}/
 %exclude %{_includedir}/gphoto2/gphoto2
@@ -107,6 +111,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 28 2023 liyanan <thistleslyn@163.com> - 2.5.31-1
+- Update to 2.5.31
+
 * Thu Jan 21 2021 Ge Wang<wangge20@huawei.com> - 2.5.18-4
 - Modify license information

_service:tar_scm:gphoto2-device-return.patch Changed

@@ -1,4 +1,4 @@
-From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
+From 189602f17a2b3363d5b358ce726924a866a4979a Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel <lkundrak@v3.sk>
 Date: Fri, 23 Oct 2009 13:12:16 +0200
 Subject: PATCH Repair reattach of kernel driver if it was unbound
@@ -7,26 +7,45 @@
 
 Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
 ---
- libgphoto2_port/usb/libusb.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ libgphoto2_port/usb/libusb.c | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
 
 diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
-index d1535a5..c8a63f1 100644
+index 3cd91fa..dfd347c 100644
 --- a/libgphoto2_port/usb/libusb.c
 +++ b/libgphoto2_port/usb/libusb.c
-@@ -38,6 +38,12 @@
+@@ -44,8 +44,30 @@
  #include <gphoto2/gphoto2-port-result.h>
  #include <gphoto2/gphoto2-port-log.h>
  
+-#include "libgphoto2_port/i18n.h"
 +#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
 +/* Pull in USBDEVFS_CONNECT */
 +#include <sys/ioctl.h>
 +#include <linux/usbdevice_fs.h>
 +#endif
-+
- #ifdef ENABLE_NLS
- #  include <libintl.h>
- #  undef _
+ 
++#ifdef ENABLE_NLS
++#  include <libintl.h>
++#  undef _
++#  define _(String) dgettext (GETTEXT_PACKAGE, String)
++#  ifdef gettext_noop
++#    define N_(String) gettext_noop (String)
++#  else
++#    define N_(String) (String)
++#  endif
++#else
++#  define textdomain(String) (String)
++#  define gettext(String) (String)
++#  define dgettext(Domain,Message) (Message)
++#  define dcgettext(Domain,Message,Type) (Message)
++#  define bindtextdomain(Domain,Directory) (Domain)
++#  define _(String) (String)
++#  define N_(String) (String)
++#endif
+ 
+ #define CHECK(result) {int r=(result); if (r<0) return (r);}
+ 
 -- 
-1.6.5.rc2
+2.34.1

_service Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/HACKING Deleted

@@ -1,310 +0,0 @@
-If you want to hack on gphoto2 (or a camera driver for gphoto2),
-please follow some rules to make our work easier: 
-
-
-licensing
----------
-
-We urge you to license your contributions under the LGPL so we can
-distribute gphoto2 under the LGPL as well.
-
-
-patches
--------
-
-... are always welcome.
-
-We prefer patches against the current SVN trunk very much over
-patches against old released versions, but these are also welcome :-)
-
-source files
-------------
-
-Every source file (file_name.c) should have the following layout:
-
-/* Licence, author, etc. */
-#include "config.h"
-#include "file_name.h"
-
-#include <std*.h> (i.e. stdlib, stdio, string, etc.)
-
-#include <gphoto2/gphoto2-*.h> (what you need)
-
-/* Source code here. */
-
-header files
-------------
-
-Please use the following layout:
-
-/* Licence, author, etc. */
-#ifndef __FILE_NAME_H__
-#define __FILE_NAME_H__
-
-#include <whatever is needed for the _header_>
-
-/* Declarations */
-
-#endif /* __FILE_NAME_H__ */
-
-camlib
-------
-
-Camera libraries are often very sensitive to changes. Therefore,
-before you commit any changes, double check with the author that your
-changes won't break the driver. 
-
-If you want to write a driver for gphoto2, the easiest way to do so
-would be to copy over the contents of camlibs/template and fill in
-your code. 
-
-Use something like CHECK_RESULT (see for example
-libgphoto2/filesys.c).
-
-Let's say you write a driver called sillycam. Please set up a file
-called library.c containing all gphoto2-specific code (like
-camera_init) and another two files called sillycam.c and sillycam.h
-containing the "magic", that is all gp_port_read,write functions and
-the basic logic of the communication. This makes it easier for us to
-adapt your code if anything should change in the gphoto2-API.
-
-Use the port provided by camera->port.
-
-Use the filesystem provided by camera->fs and set up the callbacks so
-that libgphoto2 can cache listings and file-information. 
-
-Please keep track of the changes to the sillycam camlib in the file 
-
-   camlib/sillycam/ChangeLog
-
-For test compiling and installing only the sillycam and doofuscam
-camlibs, you can use
-
-   make -C camlibs sillycam.la doofuscam.la
-
-and
-
-   make CAMLIBS="sillycam.la doofuscam.la" install-camlibs
-
-respectively.
-
-Compiling all camlibs is sped up considerably on N CPU core
-computers using "make -jN".
-
-
-
-
-libgphoto2
-----------
-
-If you add code, use the coding style of that file. This is, code like
-
-int
-my_func (int arg)
-{
-	int var, res;
-
-	/*
-	 * This is a multiline
-	 * comment. Use TAB for 
-	 * indentation!
-	 */
-	res = gp_some_action (var);
-
-	/* This is a simple one-line comment */
-	if (res < 0) {
-		gp_log (GP_LOG_DEBUG, "Error happened!");
-
-		/* Note that we _don't_ indent the case statements */
-		switch (res) {
-		case GP_ERROR:
-			gp_log (GP_LOG_DEBUG, "Generic error");
-			break;
-		default:
-			gp_log (GP_LOG_DEBUG, "Not a generic error");
-		}
-		return (res);
-	}
-
-	return (GP_OK);
-}
-
-Please always check the return value of gp_-functions! We defined some
-handy macros all over the place (like CHECK_RESULT) - by using those,
-you'll avoid lots of if {} else {}. 
-
-Emacs users may define and use a gphoto-c-mode by putting the
-following stuff into their .emacs file:
-
------8<------------------------------------------------
-
-;;* gphoto-c-mode
-;;*=====================================================================
-(defun gphoto-c-mode ()
-  "C mode with adjusted defaults for gphoto hacking"
-  (interactive)
-  (c-mode)
-  (c-set-style "linux")
-  (setq indent-tabs-mode t)
-  (font-lock-mode))
-
-;; 
-(setq auto-mode-alist (cons '("/home/user/src/gphoto.*\\.ch$" . gphoto-c-mode)
-			    auto-mode-alist))
-
------8<------------------------------------------------
-
-compatibility
--------------
-
-Once gphoto2 has been officially launched as a 2.0 version, it is important
-that the API does not change frequently.  It is annoying to users when they
-have to upgrade all sort of libraries and applications just to get an
-upgraded camera driver.  Once the 2.0 release has been made, try to
-follow these guidelines:
-
-    - New versions of the gphoto2 core libraries in the 2.0 series shall
-    work with all older 2.0 camera libraries
-
-    - New versions of the gphoto2 camera libraries in the 2.0 series shall
-    work with all older 2.0 core libraries (this one may be relaxed)
-
-    - Before fixing 2.0 in stone, look for weaknesses in the current
-    APIs that may preclude enhancements in the future.  For instance, there
-    should be some filler entries added to the end of struct _CameraFunctions
-    so that a newer camera library that tries to fill in an entry that
-    is added in gphoto2 ver. 2.1 that doesn't exist there now won't
-    overwrite something important.
-
-    - Try to work using the existing API instead of making minor
-    changes here and there; think about whether the change you're proposing
-    will demonstratively benefit gphoto2 or it's just a "nice to have"
-
-    - Instead of adding a new parameter to a function, create a new function
-    that enhances the other one (where appropriate)
-
-    - If a new parameter is absolutely needed in an existing function
-    call, rename the function with the new parameter, but leave the
-    existing function as is, calling the new function with a default value
-    for the new parameter
-
-    - When adding entries to a common structure, add them to the end of the
-    struct so that the other members aren't shifted around.  Consider what
-    will happen if that member is not filled in by an older application.
-
-    - Don't delete entries from a common struct; instead, just rename them
-    into filler entries.
-
-    - If there is a very good reason to break compatibility, wait until
-    release 3.0 to make those changes
-
-    - Delay the release of 3.0 until the benefits outweigh the consequences
-    to the user of an incompatible library version.
-
-
-portability
------------
-
-Please remember that people will be running gphoto2 on a wide variety
-of operating systems and CPUs and will be compiling it on a wide
-variety of C compilers.  As you write your code, be sure not to make
-any assumptions in your code that aren't in the ANSI C89 standard.
-If your code absolutely needs some feature or header file that isn't
-available everywhere, write an autoconf test so that the configure
-script will detect if that feature is available at compile time and
-provide an alternative for those compilers that don't support it.
-
-There are lots of subtle portability issues that you should keep in
-the back of your mind.  Following are some of the major ones that affect
-gphoto2.  See the paper "Notes on Writing Portable Programs in C" at
-<URL:http://www.literateprogramming.com/portableC.pdf> or "Writing
-Portable C with GNU Autotools" at
-<URL:http://sources.redhat.com/autobook/autobook/autobook_110.html#SEC110>
-for more details.
-
-
-* A char can be signed or unsigned.
-
-Use 'signed char' or 'unsigned char', or int8_t or uint8_t from _stdint.h,
-to be sure to get the type you want when it is important.
-
-
-* A pointer is not necessarily an int.
-
-Don't cast a pointer to an int and vice-versa.
-
-
-* An int can be almost any width.
-
-Don't assume that it's 32 or 16 bits or any other value.  Instead,
-if you need a variable of a certain size, include the gphoto2 header
-file _stdint.h (or gphoto2-endian.h) and use the C99-style fixed-width
-types declared therein.  If you don't really care about the size of a
-variable (e.g. as the index variable in a small for loop), you can still
-use an int as it's often the most efficient type for each processor.
-It's usually the case that a char is 8 bits, int is at least 16 bits,
-and a long is at least 32 bits.  Never assume that int or long (or char,
-for that matter) have a specific size, or that they will overflow at a
-particular point.  Use a size-specific type (e.g. uint32_t) if necessary.
-
-
-* The sequence of bytes received from a camera isn't necessarily the
-same as how those bytes are stored in a C struct in memory.
-
-Many compilers will place padding bytes between the elements of a C
-struct to improve run-time efficiency on the target processor.  This
-means that if you read a camera packet directly into such a struct,
-the bytes will not line up and your program will use the wrong values.
-
-A similar problem occurs even if you read just a couple of bytes
-into an int, if gphoto is running on a processor with a different
-"endianness" than the camera.
-
-The most portable solution is to use the macros available in the
-gphoto2-endian.h header file.  When you read a packet from a camera
-(writing is similar), use a uint8_t array or heap space to store the
-raw packet.  Extract each member of the packet out of the array one at a
-time using a macro like be32atoh from gphoto2-endian.h.  Those macros
-take care of both those problems at once.
-
-The macros have the form AANNatoh or htoAANNa, where AA is `le'
-(little-endian) or `be' (big-endian), NN is 16 or 32 (bits in the
-word) and `a', if present, means that the preceding type is located in
-a byte array, not an integer. `h' refers to `host', and could be big
-or little-endian depending on the current CPU.  Upper-case versions of
-these macros (where appropriate) do the conversion in place.  Do a
-'man ntohl' to find out more about why these are needed, and the generated
-gphoto2-endian.h file for more descriptions.
-
-
-* Your code won't necessarily be compiled with gcc.
-
-gcc is a great C compiler, but it isn't installed on everybody's
-systems (yet!).  Avoid use of proprietary gcc language extensions and
-features that aren't available in ANSI C89 compilers.  Sure, there's
-probably some code that would be more elegant using a gcc language
-extension, but somebody, somewhere will be denied the use of the best
-digital camera application in existence because of it.
-
-This also applies to new standard C features that appeared in the
-C99 specification of the language.  There is not much support yet
-in the installed base of C compilers to allow unrestricted use, but
-this will change as time goes by.  In the meantime, use autoconf to
-detect if the feature is available at run-time and act appropriately
-(for an extreme example, see how configure handles the C99 header
-file <stdint.h> or inline keyword).
-
-Although one-line comments starting with // have been available
-in most compilers for several years, they were only officially
-added to the ANSI C99 spec and some compilers out there still
-don't support them.  The "inline" keyword also falls into the same
-category, but configure tests for this feature at compile time
-and supplies the appropriate inline keyword as a macro.  Finally,
-don't add compiler-specific flags to make files directly, as many
-of them are specific to one compiler and will cause the build to
-fail when using another.
-
-
-Local Variables:
-mode:text
-End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/localization/Makefile.am Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/localization/Makefile.in Deleted

@@ -1,594 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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 = camlibs/konica/localization
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-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)$(localizationdir)"
-DATA = $(localization_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/auto-aux/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGD_CFLAGS = @LIBGD_CFLAGS@
-LIBGD_CONFIG_PROG = @LIBGD_CONFIG_PROG@
-LIBGD_LIBS = @LIBGD_LIBS@
-LIBGPHOTO2_AGE = @LIBGPHOTO2_AGE@
-LIBGPHOTO2_CURRENT = @LIBGPHOTO2_CURRENT@
-LIBGPHOTO2_CURRENT_MIN = @LIBGPHOTO2_CURRENT_MIN@
-LIBGPHOTO2_REVISION = @LIBGPHOTO2_REVISION@
-LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNUSED_CFLAGS = @NO_UNUSED_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
-REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-camlibdir = @camlibdir@
-camlibdocdir = @camlibdocdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hotplugdocdir = @hotplugdocdir@
-hotplugusermapdir = @hotplugusermapdir@
-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@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevscriptdir = @udevscriptdir@
-utilsdir = @utilsdir@
-localizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica
-localization_DATA = english french german japanese korean spanish
-EXTRA_DIST = $(localization_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(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) --foreign camlibs/konica/localization/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign camlibs/konica/localization/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:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-localizationDATA: $(localization_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(localization_DATA)'; test -n "$(localizationdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(localizationdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(localizationdir)" || exit 1; \
-	fi; \
-	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)$(localizationdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(localizationdir)" || exit $$?; \
-	done
-
-uninstall-localizationDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(localization_DATA)'; test -n "$(localizationdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(localizationdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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)$(localizationdir)"; 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 clean-libtool 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-localizationDATA
-
-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 mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-localizationDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool 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-localizationDATA 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 \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-localizationDATA
-
-.PRECIOUS: Makefile
-
-
-# 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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/nls.h Deleted

@@ -1,41 +0,0 @@
-/* Sony DSC-F55 & MSAC-SR1 - gPhoto2 camera library
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef NLS_H
-#define NLS_H
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
-#endif				/* NLS_H */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/bayer.c Deleted

@@ -1,201 +0,0 @@
-/*
- * STV0680 Vision Camera Chipset Driver
- * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include "bayer.h"
-
-/* Enhanced by Kurt Garloff to do scaling and debayering at the same time. */
-void bayer_unshuffle_preview(int w, int h, int scale, unsigned char *raw, unsigned char *output)
-{
-
-    int x, y, nx, ny;
-    int colour; int rgb3;
-    int nw = w >> scale;
-    int nh = h >> scale;
-    int incr = 1<<scale;
-
-    for (ny = 0; ny < nh; ++ny, raw += w<<scale) {
-	for (nx = 0; nx < nw; ++nx, output += 3) {
-	    rgb0 = 0; rgb1 = 0; rgb2 = 0;
-	    for (y = 0; y < incr; ++y) {
-		for (x = 0; x < incr; ++x) {
-		    colour = 1 - (x&1) + (y&1);
-		    rgbcolour += rawy*w + (nx<<(scale-1))+(x>>1) + ((x&1)? 0: (w>>1));
-		}
-	    }
-	    output0 = rgb0>>(2*scale-2);
-	    output1 = rgb1>>(2*scale-1);
-	    output2 = rgb2>>(2*scale-2);
-	}
-    }
-}
-
-/****** gamma correction from trans, plus hardcoded white balance */
-/* Thanks to Alexander Schwartx <alexander.schwartx@gmx.net> for this code.
-   Gamma correction (trans values generated by (pow((i-17)/239, GAMMA)*254)
-   where GAMMA=0.5x, 1<i<255. */
-/* KG: Looking at very dark parts of images, the sensor seems to produce
- * only very few points below 0x11 and almost none below 14. Therefore we map everything
- * below 14 to 0 and ev'thing below 17 to 1; then the power function reigns.
- */
-
-#define ZERO0 14 /* 0--13 mapped to 0 */
-#define ZERO1 17 /* 14--16 mapped to 1 */
-
-typedef struct _rgbgamma {
-	float ampl, gamma;
-} rgbgamma;
-
-
-/* KG: Some notes on these:
- * - Try to avoid strong deviations from 1.00 for the amplification,
- *   because this potentially results in not using the full range
- *   of colours (<1) or in clipping (>1) multiple colours to max,
- *   which would be a loss of information.
- * - The gamma mainly determines how fast values increase after ZERO1.
- *   Influence on the highlights is small; therefore the description
- *   with amplifiaction and gamma seems not very appropriate; a better
- *   correction function would allow to influence the slope for small
- *   and for large values indepentently without incurring loss of
- *   accuracy/information. It should not be hard to construct such a
- *   thing. (Splines or Bézier or Triginometric/Hyperbolic functions
- *   could be used, e.g.)
- * - The below parameters have been found by lots of experiments with
- *   pictures taken at different light levels. They're optimized for
- *   my PenCam (and my screens), of course. No theory behind this;
- *   I don't have insight into the physics of the imaging sensor.
- *   CCDs are linear, basically; but higher order effects may play
- *   a role as well as the electronics that controls the shutter
- *   and the one doing the readout.
- */
-static const rgbgamma gampar63 = {
-	{ { 1.02, 0.56 }, { 1.00, 0.61 }, { 0.99, 0.65 } }, /* cold */
-	{ { 1.01, 0.56 }, { 1.00, 0.58 }, { 1.00, 0.61 } }, /* coldish */
-	{ { 1.00, 0.55 }, { 1.00, 0.57 }, { 1.00, 0.59 } }, /* mid */
-	{ { 1.00, 0.55 }, { 1.00, 0.56 }, { 1.01, 0.55 } }, /* warmish */
-	{ { 1.01, 0.56 }, { 0.99, 0.57 }, { 1.03, 0.50 } }, /* warm */
-	{ { 1.03, 0.52 }, { 0.97, 0.57 }, { 1.04, 0.49 } }  /* warm bright */
-};
-
-void light_enhance(int vw, int vh, int coarse, int fine,
-		   unsigned char avg_pix, unsigned char *output)
-{
-    unsigned long int i;
-    int lt=3; /* 3 is auto */
-    /* float wb33; */
-    unsigned char trans3256;
-    unsigned char col;
-    /* int tmp1, tmp2, tmp3, whitex=20, whitey=20, j, k; */
-
-    double brightness = 1.00; /* FIXME: configurable? */
-
-    /* fprintf(stderr, "(FineExp=%i CoarseExp=%i => filter=", fine, coarse); */
-
-#if 0
-    if (fine >= (coarse<<1)) {
-	lt = 0;
-	/* fprintf(stderr, "natural)\n"); */
-    } else if (((fine<<1) < coarse) && (coarse < 400)) {
-	lt = 2;
-	/* fprintf(stderr, "incandescent)\n"); */
-    } else {
-	lt = 1;
-	/* fprintf(stderr, "fluorescent)\n"); */
-    }
-    wb00 = 1.08 * x;  wb01 = 1.00 * x;  wb02 = 0.95 * x; /* natural */
-    wb10 = 1.00 * x;  wb11 = 1.00 * x;  wb12 = 1.00 * x; /* fluorescent */
-    wb20 = 0.90 * x;  wb21 = 1.00 * x;  wb22 = 1.11 * x; /* incandescent */
-#else
-    if (fine > coarse) {
-	lt = 0; /* fprintf (stderr, "cold)\n"); */
-    } else if (coarse < 100) {
-	lt = 1; /* fprintf (stderr, "coldish)\n"); */
-    } else if (coarse < 200) {
-	lt = 2; /* fprintf (stderr, "mid)\n"); */
-    } else if (coarse < 400) {
-	lt = 3; /* fprintf (stderr, "warmish)\n"); */
-    } else if (avg_pix < 94) {
-	lt = 4; /* fprintf (stderr, "warm)\n"); */
-    } else {
-	lt = 5; /* fprintf (stderr, "warm, bright)\n"); */
-    }
-#endif
-
-#if 0
-    /* find white pixel */
-    for (j=0;j<vh;j++)
-    {
-	for (k=0; k<vw; k++)
-	{
-	    i = (j*vw + k)*3;
-	    tmp1 = abs(*(output+i) - *(output+i+1));
-	    tmp2 = abs(*(output+i) - *(output+i+2));
-	    tmp3 = abs(*(output+i+1) - *(output+i+2));
-	    if ((tmp1<16) && (tmp2<16) && (tmp3<16) && (*(output+i)>=160)) {
-		whitex = k;  whitey = j;
-		break;
-	    }
-	}
-    }
-#endif
-
-    for (col = 0; col < 3; col++) {
-	double y;
-	const rgbgamma *gp = gamparlt + col;
-	for(i=0; i<256; ++i) {
-		if (i < ZERO0)
-			y = 0;
-		else if (i < ZERO1)
-			y = 1;
-		else
-			y = brightness * gp->ampl * (2 + pow((i-ZERO1)/((double)254-ZERO1),gp->gamma) * 253.5);
-		if (y > 255.0)
-			y = 255.0;
-		transcoli = (unsigned char) y;
-	}
-    }
-
-    for (i=0;i<(vw*vh*3);i+=3)
-    {
-	int r,g,b;
-	r = *(output+i);
-	g = *(output+i+1);
-	b = *(output+i+2);
-	/* this (adjusting white) isn't quite right yet, so I turned it off */
-	if ( 0 && (abs(r-g) < 8) &&
-	          (abs(r-b) < 8) &&
-	          (abs(b-g) < 8)) {
-		int v = trans1(r+b+g+1)/3;
-		*(output+i) =   (unsigned char) (v);
-		*(output+i+1) = (unsigned char) (v);
-		*(output+i+2) = (unsigned char) (v);
-		fprintf(stderr,"Adjusting white\n");
-	} else {          /* this is OK */
-		*(output+i)   = trans0r;
-		*(output+i+1) = trans1g;
-		*(output+i+2) = trans2b;
-	}
-    }  /* for */
-
-}  /* light_enhance */
-
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/bayer.h Deleted

@@ -1,30 +0,0 @@
-/*
- * STV0680 Vision Camera Chipset Driver
- * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef BAYER_H
-#define BAYER_H
-
-void bayer_unshuffle_preview(int w, int h, int scale, 
-			     unsigned char *raw, unsigned char *output);
-void light_enhance(int vw, int vh, int coarse, int fine, 
-		   unsigned char avg_pix_val, unsigned char *output);
-
-#endif
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/build_OS2.txt Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/Makefile-files Deleted

@@ -1,30 +0,0 @@
-# -*- Makefile -*-
-
-EXTRA_DIST += %reldir%/README.md
-EXTRA_DIST += %reldir%/gphoto-m4-sync
-
-EXTRA_DIST += %reldir%/gp-byteorder.m4
-EXTRA_DIST += %reldir%/gp-camlibs.m4
-EXTRA_DIST += %reldir%/gp-check-doxygen.m4
-EXTRA_DIST += %reldir%/gp-check-library.m4
-EXTRA_DIST += %reldir%/gp-check-popt.m4
-EXTRA_DIST += %reldir%/gp-check-shell-environment.m4
-EXTRA_DIST += %reldir%/gp-config-msg.m4
-EXTRA_DIST += %reldir%/gp-documentation.m4
-EXTRA_DIST += %reldir%/gp-dynamic-libraries.m4
-EXTRA_DIST += %reldir%/gp-gettext-hack.m4
-EXTRA_DIST += %reldir%/gp-internal-docs.m4
-EXTRA_DIST += %reldir%/gp-libltdl.m4
-EXTRA_DIST += %reldir%/gp-manual-docbook-xml.m4
-EXTRA_DIST += %reldir%/gp-manual-documentation.m4
-EXTRA_DIST += %reldir%/gp-manual-fig2dev.m4
-EXTRA_DIST += %reldir%/gp-manual-graphviz.m4
-EXTRA_DIST += %reldir%/gp-manual-gtk-doc.m4
-EXTRA_DIST += %reldir%/gp-manual-pstoimg.m4
-EXTRA_DIST += %reldir%/gp-manual-w3m.m4
-EXTRA_DIST += %reldir%/gp-packaging.m4
-EXTRA_DIST += %reldir%/gp-references.m4
-EXTRA_DIST += %reldir%/gp-stdint.m4
-EXTRA_DIST += %reldir%/gp-subpackage.m4
-EXTRA_DIST += %reldir%/gp-udev.m4
-EXTRA_DIST += %reldir%/gp-va-copy.m4

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/Makefile.am Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/Makefile.in Deleted

@@ -1,553 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-
-# This is the compatibility Makefile.am - you are probably better off
-# just including the Makefile-files directly from your top-level
-# Makefile.am.
-
-# -*- Makefile -*-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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 = gphoto-m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile-files $(srcdir)/Makefile.in \
-	$(top_srcdir)/auto-aux/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGD_CFLAGS = @LIBGD_CFLAGS@
-LIBGD_CONFIG_PROG = @LIBGD_CONFIG_PROG@
-LIBGD_LIBS = @LIBGD_LIBS@
-LIBGPHOTO2_AGE = @LIBGPHOTO2_AGE@
-LIBGPHOTO2_CURRENT = @LIBGPHOTO2_CURRENT@
-LIBGPHOTO2_CURRENT_MIN = @LIBGPHOTO2_CURRENT_MIN@
-LIBGPHOTO2_REVISION = @LIBGPHOTO2_REVISION@
-LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNUSED_CFLAGS = @NO_UNUSED_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
-REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-camlibdir = @camlibdir@
-camlibdocdir = @camlibdocdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hotplugdocdir = @hotplugdocdir@
-hotplugusermapdir = @hotplugusermapdir@
-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@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevscriptdir = @udevscriptdir@
-utilsdir = @utilsdir@
-EXTRA_DIST = README.md gphoto-m4-sync gp-byteorder.m4 gp-camlibs.m4 \
-	gp-check-doxygen.m4 gp-check-library.m4 gp-check-popt.m4 \
-	gp-check-shell-environment.m4 gp-config-msg.m4 \
-	gp-documentation.m4 gp-dynamic-libraries.m4 gp-gettext-hack.m4 \
-	gp-internal-docs.m4 gp-libltdl.m4 gp-manual-docbook-xml.m4 \
-	gp-manual-documentation.m4 gp-manual-fig2dev.m4 \
-	gp-manual-graphviz.m4 gp-manual-gtk-doc.m4 \
-	gp-manual-pstoimg.m4 gp-manual-w3m.m4 gp-packaging.m4 \
-	gp-references.m4 gp-stdint.m4 gp-subpackage.m4 gp-udev.m4 \
-	gp-va-copy.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile-files $(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) --foreign gphoto-m4/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign gphoto-m4/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;
-$(srcdir)/Makefile-files $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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:
-	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 clean-libtool 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 mostlyclean-libtool
-
-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 clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool 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 mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# 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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/README.md Deleted

@@ -1,140 +0,0 @@
-gphoto-m4
-=========
-
-`gphoto-m4` is the gPhoto projects' collection of m4 macros for use
-with the autoconf/automake based build systems.
-
-It has been designed to be used in
-
-  * `gphoto2`
-  * `libgphoto2`
-  * `libgphoto2_port` (located in `libgphoto2/`)
-  * `gtkam`
-
-Some macros are re-used ones from `libexif`.
-
-Since the gPhoto project moved from SVN to git, we have not figured
-out yet how to properly include the `gphoto-m4` files into the
-respective software's `gphoto-m4/` subdirectory (either `git subtree`
-or `git submodule` come to mind).
-
-So for the time being, we manually update and synchronize the files.
-
-
-Use of `gphoto-m4` after the switch to git from SVN
----------------------------------------------------
-
-Since the gPhoto project moved from SVN to git, we have not figured
-out yet how to properly include the `gphoto-m4` files into the
-respective software's `gphoto-m4/` subdirectory. The options are:
-
-  1. Manually update (and hopefully synchronize) the files.
-
-     Advantages:
-
-       * No special commands needed for users or developers.
-
-     Disadvantages:
-
-       * The manual work for the maintainers is exhausting and error
-         prone.
-
-  2. Use `git submodule`.
-
-     Advantages:
-
-       * Defined mechanism for syncing and updating the `gphoto-m4/*`
-         files.
-
-     Disadvantages:
-
-       * Requires special git commands from everybody (users,
-         developers, and maintainers) all the time (e.g. `git clone
-         --recursive` instead of `git clone`).
-
-         This is the showstopper for `git submodule`.
-
-  3. Use `git subtree`.
-
-     Advantages:
-
-       * Defined mechanism for syncing and updating the `gphoto-m4/*`
-         files.
-
-       * Requires no special git commands from users or developers.
-
-       * Not even people actually messing with the files in
-         `gphoto-m4/*` strictly need special commands.
-
-         Only the maintainers who do the syncing and updating of the
-		 `gphoto-m4/*` files need the special commands.
-
-     Disadvantages:
-
-       * Requires special knowledge of special commands instead of
-         just copying files around. The concept is less complex than
-         copying files round, but it does require special commands.
-
-       * No rebasing possible across pulls to `gphoto-m4/`. Not really
-         necessary anyway, though.
-
-       * Pushes of changes to from, say, `gphoto2/gphoto-m4` to
-         upstream `gphoto-m4` create a lot of commit history noise in
-         the `gphoto-m4` repository by including the complete history
-         of the `gphoto2` repository.
-
-         Note this cannot be avoided by using `git subtree split`:
-         That is executed internally by `git subtree push`.
-
-         So it appears that using `git subtree push` will push all
-         projects' commit history into the `gphoto-m4` repo.
-
-         That is if not a showstopper, then at least very ugly.
-
-For the time being, we manually update and synchronize the files.
-
-
-Manually syncing and updating files
------------------------------------
-
-This section has not been written yet.
-
-
-Using `git submodule`
----------------------
-
-This section has not been written yet.
-
-
-Using `git subtree`
--------------------
-
-
-### Using `gphoto-m4` as git subtree ###
-
-This section describes how to use `gphoto-m4` when it has been set up
-as a `git subtree` (e.g. in `gphoto2` and `libgphoto2`).
-
-Add a remote for `gphoto-m4`:
-
-    git remote add origin-gphoto-m4 git@github.com:gphoto/gphoto-m4.git
-
-Pull changes to origin-gphoto-m4 into local `gphoto-m4`:
-
-    git subtree pull --prefix gphoto-m4 origin-gphoto-m4 master --squash
-
-Now we can push local changes to 'gphoto-m4/*' back to
-`origin-gphoto-m4` as follows:
-
-    git subtree push --prefix gphoto-m4 origin-gphoto-m4 master
-
-FIXME: Add more typical uses cases.
-
-
-### Setting up `gphoto-m4` as git subtree ###
-
-This section describes how we initially set up `gphoto-m4` as a git
-subtree for `gphoto2`. This is only required once by one person, then
-never needs to be done by anybody else ever again.
-
-    git subtree add --prefix gphoto-m4 origin-gphoto-m4 master --squash

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-byteorder.m4 Deleted

@@ -1,450 +0,0 @@
-dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE )
-dnl Originally written by Dan Fandrich <dan@coneharvesters.com>
-dnl My contribution is hereby placed into the public domain.
-dnl No warranty is expressed or implied.
-dnl
-dnl Create a header file that guarantees that byte swapping macros of the
-dnl ntohl variety as well as the extended types included in OpenBSD and
-dnl NetBSD such as le32toh are defined.  If possible, the standard ntohl
-dnl are overloaded as they are optimized for the given platform, but when
-dnl this is not possible (e.g. on a big-endian machine) they are defined
-dnl in this file.
-
-dnl Look for a symbol in a header file
-dnl AC_HAVE_SYMBOL ( IDENTIFIER, HEADER-FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
-AC_DEFUN(AC_HAVE_SYMBOL,
-
-AC_MSG_CHECKING(for $1 in $2)
-AC_EGREP_CPP(symbol is present|\<$1\>,
-#include <$2>
-#ifdef $1
- 	symbol is present
-#endif
-	, 
-AC_MSG_RESULT(yes)
-$3
-,
-AC_MSG_RESULT(no)
-$4
-))
-
-
-dnl Create a header file that defines extended byte swapping macros
-AC_DEFUN(AC_NEED_BYTEORDER_H,
-
-ac_dir=`AS_DIRNAME("$1")`
-if test "$ac_dir" != "$1" && test "$ac_dir" != .; then
-  # The file is in a subdirectory.
-  test ! -d "$ac_dir" && AS_MKDIR_P("$ac_dir")
-fi
-
-# We're only interested in the target CPU, but it's not always set
-effective_target="$target"
-if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
-	effective_target="$host"
-fi
-AC_SUBST(effective_target)
-
-cat > "$1" << EOF
-/* This file is generated automatically by configure */
-/* It is valid only for the system type ${effective_target} */
-
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
-
-EOF
-
-dnl First, do an endian check
-AC_C_BIGENDIAN
-
-dnl Look for NetBSD-style extended byte swapping macros
-AC_HAVE_SYMBOL(le32toh,machine/endian.h,
- HAVE_LE32TOH=1
- cat >> "$1" << EOF
-/* extended byte swapping macros are already available */
-#include <machine/endian.h>
-
-EOF,
-
-
-
-dnl Look for standard byte swapping macros
-AC_HAVE_SYMBOL(ntohl,arpa/inet.h,
- cat >> "$1" << EOF
-/* ntohl and relatives live here */
-#include <arpa/inet.h>
-#define __HAVE_NTOHL
-
-EOF,
-
- AC_HAVE_SYMBOL(ntohl,netinet/in.h,
-  cat >> "$1" << EOF
-/* ntohl and relatives live here */
-#include <netinet/in.h>
-#define __HAVE_NTOHL
-
-EOF,true))
-)
-
-dnl Look for generic byte swapping macros
-
-dnl OpenBSD
-AC_HAVE_SYMBOL(swap32,machine/endian.h,
- cat >> "$1" << EOF
-/* swap32 and swap16 are defined in machine/endian.h */
-
-EOF,
-
- 
-dnl Linux GLIBC
-  AC_HAVE_SYMBOL(bswap_32,byteswap.h,
-   cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <byteswap.h>
-#define swap16(x) bswap_16(x)
-#define swap32(x) bswap_32(x)
-#define swap64(x) bswap_64(x)
-
-EOF,
-
-   
-dnl NetBSD
-  	AC_HAVE_SYMBOL(bswap32,machine/endian.h,
-    dnl We're already including machine/endian.h if this test succeeds
-  	 cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-EOF
-	if test "$HAVE_LE32TOH" != "1"; then
-		echo '#include <machine/endian.h>'>> "$1"
-	fi
-cat >> "$1" << EOF
-#define swap16(x) bswap16(x)
-#define swap32(x) bswap32(x)
-#define swap64(x) bswap64(x)
-
-EOF,
-
-   
-dnl FreeBSD
-  	AC_HAVE_SYMBOL(__byte_swap_long,sys/types.h,
-  	 cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <sys/types.h>
-#define swap16(x) __byte_swap_word(x)
-#define swap32(x) __byte_swap_long(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF,
-
-  	 
-dnl OS X
-  	AC_HAVE_SYMBOL(NXSwapLong,machine/byte_order.h,
-  	 cat >> "$1" << EOF
-/* Define generic byte swapping functions */
-#include <machine/byte_order.h>
-#define swap16(x) NXSwapShort(x)
-#define swap32(x) NXSwapLong(x)
-#define swap64(x) NXSwapLongLong(x)
-
-EOF,
-         
-	if test $ac_cv_c_bigendian = yes; then
-		cat >> "$1" << EOF
-/* No other byte swapping functions are available on this big-endian system */
-#define swap16(x)	((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
-#define swap32(x)	((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\
-				    ((uint32_t)(x) << 8)  & 0x00ff0000UL | \\
-				    ((x) >> 8)  & 0x0000ff00UL | \\
-				    ((x) >> 24) & 0x000000ffUL))
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-	else
- cat >> "$1" << EOF
-/* Use these as generic byteswapping macros on this little endian system */
-/* on windows we might not have ntohs / ntohl without including winsock.dll,
- * so use generic macros */
-#ifdef __HAVE_NTOHL
-# define swap16(x)	htons(x)
-# define swap32(x)	htonl(x)
-#else
-# define swap16(x)	((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
-# define swap32(x)	((uint32_t)((((uint32_t)(x) << 24) & 0xff000000UL) | \\
-				    (((uint32_t)(x) << 8)  & 0x00ff0000UL) | \\
-				    (((x) >> 8)  & 0x0000ff00UL) | \\
-				    (((x) >> 24) & 0x000000ffUL)))
-#endif
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)((((uint64_t)(x) << 56) & 0xff00000000000000ULL) | \\
-			      (((uint64_t)(x) << 40) & 0x00ff000000000000ULL) | \\
-			      (((uint64_t)(x) << 24) & 0x0000ff0000000000ULL) | \\
-			      (((uint64_t)(x) << 8)  & 0x000000ff00000000ULL) | \\
-			      (((x) >> 8)  & 0x00000000ff000000ULL) | \\
-			      (((x) >> 24) & 0x0000000000ff0000ULL) | \\
-			      (((x) >> 40) & 0x000000000000ff00ULL) | \\
-			      (((x) >> 56) & 0x00000000000000ffULL)))
-
-EOF
-	fi
-)
-  	  )
-    )
-  )
-)
-
-
-
-if test "$HAVE_LE32TOH" != "1"; then
- cat >> "$1" << EOF
-/* The byte swapping macros have the form: */
-/*   EENNatoh or htoEENNa where EE is be (big endian) or */
-/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
-/* if present, indicates that the endian side is a pointer to an */
-/* array of uint8_t bytes instead of an integer of the specified length. */
-/* h refers to the host's ordering method. */
-
-/* So, to convert a 32-bit integer stored in a buffer in little-endian */
-/* format into a uint32_t usable on this machine, you could use: */
-/*   uint32_t value = le32atoh(&buf3); */
-/* To put that value back into the buffer, you could use: */
-/*   htole32a(&buf3, value); */
-
-/* Define aliases for the standard byte swapping macros */
-/* Arguments to these macros must be properly aligned on natural word */
-/* boundaries in order to work properly on all architectures */
-#ifndef htobe16
-# ifdef __HAVE_NTOHL
-#  define htobe16(x) htons(x)
-# else
-#  ifdef WORDS_BIGENDIAN
-#   define htobe16(x) (x)
-#  else
-#   define htobe16(x) swap16(x)
-#  endif
-# endif
-#endif
-#ifndef htobe32
-# ifdef __HAVE_NTOHL
-#  define htobe32(x) htonl(x)
-# else
-#  ifdef WORDS_BIGENDIAN
-#   define htobe32(x) (x)
-#  else
-#   define htobe32(x) swap32(x)
-#  endif
-# endif
-#endif
-#ifndef be16toh
-# define be16toh(x) htobe16(x)
-#endif
-#ifndef be32toh
-# define be32toh(x) htobe32(x)
-#endif
-
-#define HTOBE16(x) (x) = htobe16(x)
-#define HTOBE32(x) (x) = htobe32(x)
-#define BE32TOH(x) (x) = be32toh(x)
-#define BE16TOH(x) (x) = be16toh(x)
-
-EOF
-
- if test $ac_cv_c_bigendian = yes; then
-  cat >> "$1" << EOF
-/* Define our own extended byte swapping macros for big-endian machines */
-#ifndef htole16
-# define htole16(x)      swap16(x)
-#endif
-#ifndef htole32
-# define htole32(x)      swap32(x)
-#endif
-#ifndef htole64
-# define htole64(x)      swap64(x)
-#endif
-#ifndef le16toh
-# define le16toh(x)      swap16(x)
-#endif
-#ifndef le32toh
-# define le32toh(x)      swap32(x)
-#endif
-#ifndef le64toh
-# define le64toh(x)      swap64(x)
-#endif
-
-#ifndef htobe64
-# define htobe64(x)      (x)
-#endif
-#ifndef be64toh
-# define be64toh(x)      (x)
-#endif
-
-#define HTOLE16(x)      (x) = htole16(x)
-#define HTOLE32(x)      (x) = htole32(x)
-#define HTOLE64(x)      (x) = htole64(x)
-#define LE16TOH(x)      (x) = le16toh(x)
-#define LE32TOH(x)      (x) = le32toh(x)
-#define LE64TOH(x)      (x) = le64toh(x)
-
-#define HTOBE64(x)      (void) (x)
-#define BE64TOH(x)      (void) (x)
-
-EOF
- else
-  cat >> "$1" << EOF
-/* On little endian machines, these macros are null */
-#ifndef htole16
-# define htole16(x)      (x)
-#endif
-#ifndef htole32
-# define htole32(x)      (x)
-#endif
-#ifndef htole64
-# define htole64(x)      (x)
-#endif
-#ifndef le16toh
-# define le16toh(x)      (x)
-#endif
-#ifndef le32toh
-# define le32toh(x)      (x)
-#endif
-#ifndef le64toh
-# define le64toh(x)      (x)
-#endif
-
-#define HTOLE16(x)      (void) (x)
-#define HTOLE32(x)      (void) (x)
-#define HTOLE64(x)      (void) (x)
-#define LE16TOH(x)      (void) (x)
-#define LE32TOH(x)      (void) (x)
-#define LE64TOH(x)      (void) (x)
-
-/* These don't have standard aliases */
-#ifndef htobe64
-# define htobe64(x)      swap64(x)
-#endif
-#ifndef be64toh
-# define be64toh(x)      swap64(x)
-#endif
-
-#define HTOBE64(x)      (x) = htobe64(x)
-#define BE64TOH(x)      (x) = be64toh(x)
-
-EOF
- fi
-fi
-
-cat >> "$1" << EOF
-/* Define the C99 standard length-specific integer types */
-#include <_stdint.h>
-
-EOF
-
-case "${effective_target}" in
- i345686-*)
-  cat >> "$1" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* The i386 and compatibles can handle unaligned memory access, */
-/* so use the optimized macros above to do this job */
-#ifndef be16atoh
-# define be16atoh(x)     be16toh(*(uint16_t*)(x))
-#endif
-#ifndef be32atoh
-# define be32atoh(x)     be32toh(*(uint32_t*)(x))
-#endif
-#ifndef be64atoh
-# define be64atoh(x)     be64toh(*(uint64_t*)(x))
-#endif
-#ifndef le16atoh
-# define le16atoh(x)     le16toh(*(uint16_t*)(x))
-#endif
-#ifndef le32atoh
-# define le32atoh(x)     le32toh(*(uint32_t*)(x))
-#endif
-#ifndef le64atoh
-# define le64atoh(x)     le64toh(*(uint64_t*)(x))
-#endif
-
-#ifndef htob16a
-# define htobe16a(a,x)   *(uint16_t*)(a) = htobe16(x)
-#endif
-#ifndef htobe32a
-# define htobe32a(a,x)   *(uint32_t*)(a) = htobe32(x)
-#endif
-#ifndef htobe64a
-# define htobe64a(a,x)   *(uint64_t*)(a) = htobe64(x)
-#endif
-#ifndef htole16a
-# define htole16a(a,x)   *(uint16_t*)(a) = htole16(x)
-#endif
-#ifndef htole32a
-# define htole32a(a,x)   *(uint32_t*)(a) = htole32(x)
-#endif
-#ifndef htole64a
-# define htole64a(a,x)   *(uint64_t*)(a) = htole64(x)
-#endif
-
-EOF
-  ;;
-
- *)
-  cat >> "$1" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* Non-optimized but portable macros */
-#define be16atoh(x)     ((uint16_t)(((x)0<<8)|(x)1))
-#define be32atoh(x)     ((uint32_t)(((x)0<<24)|((x)1<<16)|((x)2<<8)|(x)3))
-#define be64atoh_x(x,off,shift) 	(((uint64_t)((x)off))<<shift)
-#define be64atoh(x)     ((uint64_t)(be64atoh_x(x,0,56)|be64atoh_x(x,1,48)|be64atoh_x(x,2,40)| \\
-        be64atoh_x(x,3,32)|be64atoh_x(x,4,24)|be64atoh_x(x,5,16)|be64atoh_x(x,6,8)|((x)7)))
-#define le16atoh(x)     ((uint16_t)(((x)1<<8)|(x)0))
-#define le32atoh(x)     ((uint32_t)(((x)3<<24)|((x)2<<16)|((x)1<<8)|(x)0))
-#define le64atoh_x(x,off,shift) (((uint64_t)(x)off)<<shift)
-#define le64atoh(x)     ((uint64_t)(le64atoh_x(x,7,56)|le64atoh_x(x,6,48)|le64atoh_x(x,5,40)| \\
-        le64atoh_x(x,4,32)|le64atoh_x(x,3,24)|le64atoh_x(x,2,16)|le64atoh_x(x,1,8)|((x)0)))
-
-#define htobe16a(a,x)   (a)0=(uint8_t)((x)>>8), (a)1=(uint8_t)(x)
-#define htobe32a(a,x)   (a)0=(uint8_t)((x)>>24), (a)1=(uint8_t)((x)>>16), \\
-        (a)2=(uint8_t)((x)>>8), (a)3=(uint8_t)(x)
-#define htobe64a(a,x)   (a)0=(uint8_t)((x)>>56), (a)1=(uint8_t)((x)>>48), \\
-        (a)2=(uint8_t)((x)>>40), (a)3=(uint8_t)((x)>>32), \\
-        (a)4=(uint8_t)((x)>>24), (a)5=(uint8_t)((x)>>16), \\
-        (a)6=(uint8_t)((x)>>8), (a)7=(uint8_t)(x)
-#define htole16a(a,x)   (a)1=(uint8_t)((x)>>8), (a)0=(uint8_t)(x)
-#define htole32a(a,x)   (a)3=(uint8_t)((x)>>24), (a)2=(uint8_t)((x)>>16), \\
-        (a)1=(uint8_t)((x)>>8), (a)0=(uint8_t)(x)
-#define htole64a(a,x)   (a)7=(uint8_t)((x)>>56), (a)6=(uint8_t)((x)>>48), \\
-        (a)5=(uint8_t)((x)>>40), (a)4=(uint8_t)((x)>>32), \\
-        (a)3=(uint8_t)((x)>>24), (a)2=(uint8_t)((x)>>16), \\
-        (a)1=(uint8_t)((x)>>8), (a)0=(uint8_t)(x)
-
-EOF
-  ;;
-esac
-
-
-cat >> "$1" << EOF
-#endif /*__BYTEORDER_H*/
-EOF)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-camlibs.m4 Deleted

@@ -1,170 +0,0 @@
-dnl GP_CAMLIB & Co.
-dnl
-dnl Redundancy free definition of libgphoto2 camlibs.
-dnl
-dnl Removes the redundany from the camlib lists, and executes
-dnl additional consistency checks, e.g. to ensure that subdirectories
-dnl actually exist.
-dnl
-dnl You can mark camlibs as unlisted, i.e. they won't be listed
-dnl explicitly but still be recognized.
-dnl
-dnl Example usage:
-dnl
-dnl   GP_CAMLIB(canon)
-dnl   GP_CAMLIB(casio)
-dnl   ...
-dnl   GP_CAMLIB(ptp,unlisted)
-dnl   GP_CAMLIB(ptp2)
-dnl   ...
-dnl   GP_CAMLIB(toshiba)
-dnl   GP_CAMLIBS_DEFINE(camlibs)
-dnl
-dnl The camlibs basedir parameter of GP_CAMLIBS_DEFINE is optional.
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(GP_CAMLIBS_INIT,dnl
-AC_BEFORE($0,GP_CAMLIB)dnl
-m4_define_default(gp_camlib_srcdir, camlibs)dnl
-m4_define_default(gp_camlibs, )dnl
-m4_define_default(gp_camlibs_unlisted, )dnl
-)dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(GP_CAMLIB,dnl
-AC_REQUIRE(GP_CAMLIBS_INIT)dnl
-AC_BEFORE($0,GP_CAMLIBS_DEFINE)dnl
-m4_if($2,unlisted,dnl
-# $0($1,$2)
-m4_append(gp_camlibs_unlisted, $1,  )dnl
-,$#,1,dnl
-# $0($1)
-m4_append(gp_camlibs, $1,  )dnl
-,dnl
-m4_errprint(__file__:__line__: Error:
-*** Illegal parameter 2 to $0: `$2'
-*** Valid values are: undefined or unlisted
-)dnl
-m4_exit(1)dnl
-)dnl
-)dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(GP_CAMLIBS_WARNING,dnl
-AC_MSG_WARN(
-
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-# 
-# Many cameras of several brands are supported by a camlib with a 
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the "ptp2" camlib
-#   * or even better, just build "all" camlibs.
-)
-sleep 2
-)
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(GP_CAMLIBS_DEFINE,dnl
-AC_REQUIRE(GP_CAMLIBS_INIT)dnl
-m4_pattern_allow(m4_strip)dnl
-m4_ifval($1,m4_define(gp_camlib_srcdir,$1))dnl
-dnl for camlib in m4_strip(gp_camlibs) m4_strip(gp_camlibs_unlisted)
-dnl do
-dnl 	if test -d "$srcdir/m4_strip(gp_camlib_srcdir)/$camlib"; then :; else
-dnl 		AC_MSG_ERROR(
-dnl * Fatal:
-dnl * Source subdirectory for camlib \`$camlib' not found in
-dnl * directory \`$srcdir/m4_strip(gp_camlib_srcdir)/'
-dnl )
-dnl 	fi
-dnl done
-AC_MSG_CHECKING(which camlibs to compile)
-dnl Yes, that help output won't be all that pretty, but we at least
-dnl do not have to edit it by hand.
-AC_ARG_WITH(camlibs,AS_HELP_STRING(
-	--with-camlibs=<list>,
-	Compile camera drivers (camlibs) in <list>. dnl
-	Drivers may be separated with commas. dnl
-	CAUTION: DRIVER NAMES AND CAMERA NAMES MAY DIFFER. dnl
-	'all' is the default and compiles all camlibs. dnl
-	Possible camlibs are: dnl
-	m4_strip(gp_camlibs)),
-	camlibs="$withval",
-	camlibs="all")dnl
-dnl
-ALL_DEFINED_CAMLIBS="m4_strip(gp_camlibs) m4_strip(gp_camlibs_unlisted)"
-ALL_DEFAULT_CAMLIBS="m4_strip(gp_camlibs)"
-BUILD_THESE_CAMLIBS_BASE=""
-if test "$camlibs" = "all"; then
-	BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-	AC_MSG_RESULT(all)
-else
-	# If the string starts with "all,", we start with the default list
-	# and add the explicitly defined ones later
-	if echo "$camlibs" | grep "^all," > /dev/null; then
-		BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-		camlibs="$(echo "$camlibs" | sed 's/^all,//')"
-	fi
-	# camlibs=$(echo $camlibs | sed 's/,/ /g')
-	IFS_save="$IFS"
-	IFS=",$IFS"
-	# Walk through enumeration of camlibs given by user and add them to list
-	# of camlibs to build if we know them.
-	for camlib in ${camlibs}; do
-		IFS="$IFS_save"
-		found=false
-		for from_all_camlib in ${ALL_DEFINED_CAMLIBS}; do
-			if test "$camlib" = "$from_all_camlib"; then
-				if test "x$BUILD_THESE_CAMLIBS_BASE" = "x"; then
-					BUILD_THESE_CAMLIBS_BASE="$camlib"
-				else
-					BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE $camlib"
-				fi
-				found=:
-				break
-			fi
-		done
-		if $found; then :; else
-			AC_MSG_ERROR(Unknown camlib $camlib!)		
-		fi
-	done
-        if test "x$BUILD_THESE_CAMLIBS_BASE" = "xcanon" ; then
-		# Gentoo mode... if user just said "canon", add "ptp2" ... should save support requests.
-		BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE ptp2"
-		camlibs="$camlibs ptp2"
-		AC_MSG_WARN(
-		"You have just selected the old canon driver. However most current Canons\n"
-		"are supported by the PTP2 driver.\n"
-		"Autoselecting ptp2 driver too to avoid support requests.\n"
-		)
-        fi
-	IFS="$IFS_save"
-	AC_MSG_RESULT($camlibs)
-	GP_CAMLIBS_WARNING
-	AC_DEFINE_UNQUOTED(INCOMPLETE_CAMLIB_SET, "$BUILD_THESE_CAMLIBS_BASE", 
-                           Whether the set of camlibs built is incomplete)
-fi
-BUILD_THESE_CAMLIBS=""
-for f in $BUILD_THESE_CAMLIBS_BASE
-do
-    BUILD_THESE_CAMLIBS="${BUILD_THESE_CAMLIBS}${BUILD_THESE_CAMLIBS+ }${f}.la"
-done
-AC_SUBST(BUILD_THESE_CAMLIBS)
-AC_SUBST(ALL_DEFINED_CAMLIBS)
-AC_SUBST(ALL_DEFAULT_CAMLIBS)
-)dnl
-dnl
-dnl ####################################################################
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-check-doxygen.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-check-library.m4 Deleted

@@ -1,456 +0,0 @@
-dnl @synopsis GP_CHECK_LIBRARY(VARNAMEPART,libname,VERSION-REQUIREMENT,
-dnl                            headername,functionname,
-dnl                            ACTION-IF-FOUND,ACTION-IF-NOT-FOUND,
-dnl                            OPTIONAL-REQUIRED-ETC,WHERE-TO-GET-IT)
-dnl
-dnl Checks for the presence of a certain library.
-dnl
-dnl Parameters:
-dnl
-dnl    VARNAMEPART            partial variable name for variable definitions
-dnl    libname                name of library
-dnl    VERSION-REQUIREMENT    check for the version using pkg-config.
-dnl                           default: 
-dnl    headername             name of header file
-dnl                           default: 
-dnl    functionname           name of function name in library
-dnl                           default: 
-dnl    ACTION-IF-FOUND        shell action to execute if found
-dnl                           default: 
-dnl    ACTION-IF-NOT-FOUND    shell action to execute if not found
-dnl                           default: 
-dnl    OPTIONAL-REQUIRED-ETC  one of "mandatory", "default-on", "default-off"
-dnl                                  "disable-explicitly"
-dnl                           default: mandatory
-dnl    WHERE-TO-GET-IT        place where to find the library, e.g. a URL
-dnl                           default: 
-dnl
-dnl What the ACTION-IFs can do:
-dnl
-dnl   * change the variable have_$1 to "yes" or "no" and thus change
-dnl     the outcome of the test
-dnl   * execute additional checks to define more specific variables, e.g.
-dnl     for different API versions
-dnl
-dnl What the OPTIONAL-REQUIRED-ETC options mean:
-dnl
-dnl   mandatory           Absolute requirement, cannot be disabled.
-dnl   default-on          If found, it is used. If not found, it is not used.
-dnl   default-off         In case of --with-libfoo, detect it. Without
-dnl                       --with-libfoo, do not look for and use it.
-dnl   disable-explicitly  Required by default, but can be disabled by
-dnl                       explicitly giving --without-libfoo.
-dnl
-dnl These results have happened after calling GP_CHECK_LIBRARY:
-dnl
-dnl    AM_CONDITIONAL(HAVE_VARPREFIX, if found )
-dnl    AM_SUBST(have_VARPREFIX,  "yes" if found, "no" if not found )
-dnl    AM_SUBST(VARPREFIX_CFLAGS, -I, -D and stuff )
-dnl    AM_SUBST(VARPREFIX_LIBS,  /path/to/libname.la -L/path -lfoo )
-dnl
-dnl Parameters to ./configure which influence the GP_CHECK_LIBRARY results:
-dnl
-dnl   * VARNAMEPART_LIBS=/foobar/arm-palmos/lib/libname.la
-dnl     VARNAMEPART_CFLAGS=-I/foobar/include
-dnl   * --without-libfoo
-dnl   * --with-libfoo=/usr/local
-dnl   * --with-libfoo-include-dir=/foobar/include
-dnl   * --with-libfoo-lib=/foobar/arm-palmos/lib
-dnl   * --with-libfoo=autodetect
-dnl
-dnl Examples:
-dnl    GP_CHECK_LIBRARY(LIBEXIF, libexif)dnl
-dnl    GP_CHECK_LIBRARY(LIBEXIF, libexif-gtk, >= 0.3.3)dnl
-dnl                                  note the space! ^
-dnl
-dnl Possible enhancements:
-dnl
-dnl   * Derive VAR_PREFIX directly from libname
-dnl     This will change the calling conventions, so be aware of that.
-dnl   * Give names of a header file and function name and to a test
-dnl     compilation.
-dnl
-AC_DEFUN(_GP_CHECK_LIBRARY_SOEXT,dnl
-AC_MSG_CHECKING(for dynamic library extension)
-soext=""
-case "$host" in
-	*linux*)	soext=".so" ;;
-	*sunos*)	soext=".so" ;;
-	*solaris*)	soext=".so" ;;
-	*bsd*)		soext=".so" ;;
-	*darwin*)	soext=".dylib" ;;
-	*w32*)		soext=".dll" ;;
-esac
-case "$host_os" in
-	gnu*)		soext=".so" ;;
-esac
-if test "x$soext" = "x"; then
-	soext=".so"
-	AC_MSG_RESULT(${soext})
-	AC_MSG_WARN(
-Host system "${host}" not recognized, defaulting to "${soext}".
-)
-else
-	AC_MSG_RESULT(${soext})
-fi
-)dnl
-dnl
-AC_DEFUN(_GP_CHECK_LIBRARY,
-# ----------------------------------------------------------------------
-# GP_CHECK_LIBRARY($1,$2,$3,
-#                    $4,$5,
-#                    ...,...,$8)
-m4_ifval($9,dnl
-# $9
-)dnl
-# ----------------------------------------------------------------------
-dnl
-AC_REQUIRE(GP_CONFIG_MSG)dnl
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-AC_REQUIRE(_GP_CHECK_LIBRARY_SOEXT)dnl
-# Use _CFLAGS and _LIBS given to configure.
-# This makes it possible to set these vars in a configure script
-# and AC_CONFIG_SUBDIRS this configure.
-AC_ARG_VAR($1_CFLAGS, CFLAGS for compiling with $2)dnl
-AC_ARG_VAR($1_LIBS,   LIBS to add for linking against $2)dnl
-dnl
-AC_MSG_CHECKING(for $2 to use)
-m4_ifval($3,REQUIREMENTS_FOR_$1="$2 $3",
-              REQUIREMENTS_FOR_$1="$2")
-userdef_$1=no
-have_$1=no
-if test "x${$1_LIBS}" = "x" && test "x${$1_CFLAGS}" = "x"; then
-	# define --with/--without argument
-	m4_if($8, default-off,
-		m4_pushdef(gp_lib_arg,--without-$2)dnl
-			try_$1=no
-		,
-		m4_pushdef(gp_lib_arg,--with-$2)dnl
-			try_$1=auto
-		)dnl
-	AC_ARG_WITH($2,AS_HELP_STRING(gp_lib_arg=PREFIX,where to find $2, "no" or "auto"),try_$1="$withval")
-	if test "x${try_$1}" = "xno"; then
-              REQUIREMENTS_FOR_$1=
-	fi
-	if test "x${try_$1}" = "xauto"; then try_$1=autodetect; fi
-	AC_MSG_RESULT(${try_$1})
-	m4_popdef(gp_lib_arg)dnl
-	if test "x${try_$1}" = "xautodetect"; then
-		# OK, we have to autodetect.
-		# We start autodetection with the cleanest known method: pkg-config
-		if test "x${have_$1}" = "xno"; then
-			# we need that line break after the PKG_CHECK_MODULES
-			m4_ifval($3,
-				PKG_CHECK_MODULES($1,$2 $3,have_$1=yes,:),
-				PKG_CHECK_MODULES($1,$2,     have_$1=yes,:)
-			)
-		fi
-		# If pkg-config didn't find anything, try the libfoo-config program
-		# certain known libraries ship with.
-		if test "x${have_$1}" = "xno"; then
-			AC_MSG_CHECKING($2 config program)
-			m4_pushdef(gp_lib_config,m4_if($2,libusb,libusb-config,
-				$2,libgphoto2,gphoto2-config,
-				$2,libgphoto2_port,gphoto2-port-config,
-				$2,gdlib,gdlib-config,
-				$2,libxml-2.0,xml2-config,
-				none))dnl
-			AC_MSG_RESULT(gp_lib_config)
-			AC_PATH_PROG($1_CONFIG_PROG,gp_lib_config)
-			if test -n "${$1_CONFIG_PROG}" &&
-				test "${$1_CONFIG_PROG}" != "none"; then
-				m4_ifval($3,
-				AC_MSG_CHECKING(for $2 version according to gp_lib_config)
-				m4_pushdef(gp_lib_compop,regexp($3, $>=\|>\|<\|<=\|=$ \t*.*, \1))dnl comparison operator
-				m4_if(	gp_lib_compop,>=,_$1_COMPN="-lt",
-					gp_lib_compop,>, _$1_COMPN="-le",
-					gp_lib_compop,<, _$1_COMPN="-ge",
-					gp_lib_compop,<=,_$1_COMPN="-gt",
-					gp_lib_compop,=, _$1_COMPN="-ne",
-					m4_errprint(__file__:__line__: Error:
-Illegal version comparison operator: `gp_lib_compop'
-It must be one of ">=", ">", "<", "<=", "=".
-)m4_exit(1))
-				m4_popdef(gp_lib_compop)dnl
-				# split requested version number using m4 regexps
-				_$1_REQ_1="regexp($3, $>=\|>\|<\|<=\|=$ \t*$0-9+$.*,                           \2)"
-				_$1_REQ_2="regexp($3, $>=\|>\|<\|<=\|=$ \t*$0-9+$\.$0-9+$.*,               \3)"
-				_$1_REQ_3="regexp($3, $>=\|>\|<\|<=\|=$ \t*$0-9+$\.$0-9+$\.$0-9+$.*,   \4)"
-				_$1_REQ_4="regexp($3, $>=\|>\|<\|<=\|=$ \t*$0-9+$\.$0-9+$\.$0-9+$$.*$, \5)"
-				# split installed version number via shell and sed
-				_$1_VERSION="$("${$1_CONFIG_PROG}" --version | sed 's/^.* //')"
-				_$1_VER_1="$(echo "${_$1_VERSION}" | sed 's/$0-9*$.*/\1/g')"
-				_$1_VER_2="$(echo "${_$1_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
-				_$1_VER_3="$(echo "${_$1_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
-				_$1_VER_4="$(echo "${_$1_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				AC_MSG_RESULT(${_$1_VERSION})
-				_tmp=false
-				if   test "${_$1_VER_1}" "${_$1_COMPN}" "${_$1_REQ_1}"; then _tmp=true;
-				elif test "${_$1_VER_2}" "${_$1_COMPN}" "${_$1_REQ_2}"; then _tmp=true;
-				elif test "${_$1_VER_3}" "${_$1_COMPN}" "${_$1_REQ_3}"; then _tmp=true;
-				elif test "x${_$1_VER_4}" = "x" && test "x${_$1_REQ_4}" != "x"; then _tmp=true;
-				elif test "${_$1_VER_4}" "${_$1_COMPN}" "${_$1_REQ_4}"; then _tmp=true;
-				fi
-				AC_MSG_CHECKING(if $2 version is matching requirement $3)
-				if "${_tmp}"; then
-				   AC_MSG_RESULT(no)
-				   AC_MSG_ERROR(Version requirement $2 $3 not met. Found: ${_$1_VERSION})
-				else
-				   AC_MSG_RESULT(yes)
-				fi
-				)dnl if version requirement given
-				AC_MSG_CHECKING(for $2 parameters from gp_lib_config)
-				$1_LIBS="$(${$1_CONFIG_PROG} --libs || echo "*error*")"
-				$1_CFLAGS="$(${$1_CONFIG_PROG} --cflags || echo "*error*")"
-				if test "x${$1_LIBS}" = "*error*" || 
-					test "x${$1_CFLAGS}" = "*error*"; then
-					AC_MSG_RESULT(error)
-				else
-					have_$1=yes
-					AC_MSG_RESULT(ok)
-				fi
-			fi
-			m4_popdef(gp_lib_config)dnl
-		fi
-		m4_ifval($3,# Version requirement given, so we do not rely on probing.,
-		# Neither pkg-config, nor the libfoo-config program have found anything.
-		# So let's just probe the system.
-		AC_MSG_WARN(The `$2' library could not be found using pkg-config or its known config program.
-No version checks will be performed if it is found using any other method.)
-		if test "x${have_$1}" = "xno"; then
-			ifs="$IFS"
-			IFS=":" # FIXME: for W32 and OS/2 we may need ";" here
-			for _libdir_ in \
-				${LD_LIBRARY_PATH} \
-				"${libdir}" \
-				"${prefix}/lib64" "${prefix}/lib" \
-				/usr/lib64 /usr/lib \
-				/usr/local/lib64 /usr/local/lib \
-				/opt/lib64 /opt/lib
-			do
-				IFS="$ifs"
-				for _soext_ in .la ${soext} .a; do
-					if test -f "${_libdir_}/$2${_soext_}"
-					then
-						if test "x${_soext_}" = "x.la" ||
-						   test "x${_soext_}" = "x.a"; then
-							$1_LIBS="${_libdir_}/$2${_soext_}"
-						else
-							$1_LIBS="-L${_libdir_} -l$(echo "$2" | sed 's/^lib//')"
-						fi
-						break
-					fi
-				done
-				if test "x${$1_LIBS}" != "x"; then
-					break
-				fi
-			done
-			IFS="$ifs"
-			if test "x${$1_LIBS}" != "x"; then
-				have_$1=yes
-			fi
-		fi
-		)
-	elif test "x${try_$1}" = "xno"; then
-		:
-	else
-		# We've been given a prefix to look in for library $2.
-		# We start looking for $2.la files first.
-		AC_MSG_CHECKING(for $2.la file in ${try_$1})
-		if test -f "${try_$1}/lib/$2.la"; then
-			$1_LIBS="${try_$1}/lib/$2.la"
-			$1_CFLAGS="-I${try_$1}/include"
-			AC_MSG_RESULT(libtool file $$1_LIBS (good))
-			have_$1=yes
-		elif test -f "${try_$1}/lib64/$2.la"; then # HACK
-			$1_LIBS="${try_$1}/lib64/$2.la"
-			$1_CFLAGS="-I${try_$1}/include"
-			AC_MSG_RESULT(libtool file $$1_LIBS (good))
-			have_$1=yes
-		else
-			AC_MSG_RESULT(wild guess that something is in $try_$1)
-			$1_LIBS="-L${try_$1}/lib -l$(echo "$2" | sed 's/^lib//')"
-			$1_CFLAGS="-I${try_$1}/include"
-			have_$1=yes
-			AC_MSG_WARN(
-* Warning:
-*   libtool file $2.la could not be found.
-*   We may be linking against the WRONG library.
-)
-		fi
-	fi
-elif test "x${$1_LIBS}" != "x" && test "x${$1_CFLAGS}" != "x"; then
-	AC_MSG_RESULT(user-defined)
-	userdef_$1=yes
-	have_$1=yes
-else
-	AC_MSG_RESULT(broken call)
-	AC_MSG_ERROR(
-* Fatal:
-* When calling configure for ${PACKAGE_TARNAME}
-*     ${PACKAGE_NAME}
-* either set both $1_LIBS *and* $1_CFLAGS
-* or neither.
-)
-fi
-AC_SUBST(REQUIREMENTS_FOR_$1)
-dnl
-dnl ACTION-IF-FOUND
-dnl
-m4_ifval($6,dnl
-if test "x${have_$1}" = "xyes"; then
-# ACTION-IF-FOUND
-$6
-fi
-)dnl
-dnl
-dnl ACTION-IF-NOT-FOUND
-dnl
-m4_ifval($7,dnl
-if test "x${have_$1}" = "xno"; then
-# ACTION-IF-NOT-FOUND
-$7
-fi
-)dnl
-dnl
-dnl Run our own test compilation
-dnl
-m4_ifval($4,dnl
-if test "x${have_$1}" = "xyes"; then
-dnl AC_MSG_CHECKING(whether $2 test compile succeeds)
-dnl AC_MSG_RESULT(${have_$1})
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="${$1_CFLAGS}"
-AC_CHECK_HEADER($4,have_$1=yes,have_$1=no)
-CPPFLAGS="$CPPFLAGS_save"
-fi
-)dnl
-dnl
-dnl Run our own test link
-dnl    Does not work for libraries which be built after configure time,
-dnl    so we deactivate it for them (userdef_).
-dnl
-m4_ifval($5,dnl
-if test "x${userdef_$1}" = "xno" && test "x${have_$1}" = "xyes"; then
-	AC_MSG_CHECKING(for function $5 in $2)
-	LIBS_save="$LIBS"
-	LIBS="${$1_LIBS}"
-	AC_TRY_LINK_FUNC($5,,have_$1=no)
-	LIBS="$LIBS_save"
-	AC_MSG_RESULT(${have_$1})
-fi
-)dnl
-dnl
-dnl Abort configure script if mandatory, but not found
-dnl
-m4_if($8,mandatory,
-if test "x${have_$1}" = "xno"; then
-	AC_MSG_ERROR(
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
-$1_LIBS=${$1_LIBS}
-$1_CFLAGS=${$1_CFLAGS}
-
-* Fatal: ${PACKAGE_NAME} requires $2 $3 to build.
-* 
-* Possible solutions:
-*   - set PKG_CONFIG_PATH to adequate value
-*   - call configure with $1_LIBS=.. and $1_CFLAGS=..
-*   - call configure with one of the --with-$2 parameters
-m4_ifval($9,dnl
-*   - get $2 and install it:
-*     $9,dnl
-*   - get $2 and install it))
-fi
-)dnl
-dnl
-dnl Abort configure script if not found and not explicitly disabled
-dnl
-m4_if($8,disable-explicitly,
-if test "x${try_$1}" != "xno" && test "x${have_$1}" = "xno"; then
-        AC_MSG_ERROR(
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
-$1_LIBS=${$1_LIBS}
-$1_CFLAGS=${$1_CFLAGS}
-
-* Fatal: ${PACKAGE_NAME} by default requires $2 $3 to build.
-*        You must explicitly disable $2 to build ${PACKAGE_TARNAME} without it.
-* 
-* Possible solutions:
-*   - call configure with --with-$2=no or --without-$2
-*   - set PKG_CONFIG_PATH to adequate value
-*   - call configure with $1_LIBS=.. and $1_CFLAGS=..
-*   - call configure with one of the --with-$2 parameters
-m4_ifval($9,dnl
-*   - get $2 and install it:
-*     $9,dnl
-*   - get $2 and install it
-)m4_if($2,libusb,dnl
-*   - if you have libusb >= 1.0 installed, you must also install
-*     either the libusb0 compat library or a libusb 0.x version
-))
-fi
-)dnl
-AM_CONDITIONAL(HAVE_$1, test "x$have_$1" = "xyes")
-if test "x$have_$1" = "xyes"; then
-	AC_DEFINE(HAVE_$1, 1, whether we compile with $2 support)
-	GP_CONFIG_MSG($2,yes)dnl
-	AC_MSG_CHECKING($2 library flags)
-	AC_MSG_RESULT("${$1_LIBS}")
-	AC_MSG_CHECKING($2 cpp flags)
-	AC_MSG_RESULT("${$1_CFLAGS}")
-else
-	REQUIREMENTS_FOR_$1=
-	GP_CONFIG_MSG($2,no)dnl
-fi
-dnl AC_SUBST is done implicitly by AC_ARG_VAR above.
-dnl AC_SUBST($1_LIBS)
-dnl AC_SUBST($1_CFLAGS)
-)dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(_GP_CHECK_LIBRARY_SYNTAX_ERROR,dnl
-m4_errprint(__file__:__line__: Error:
-*** Calling $0 macro with old syntax
-*** Aborting.
-)dnl
-m4_exit(1)dnl
-)dnl
-dnl
-dnl ####################################################################
-dnl
-AC_DEFUN(GP_CHECK_LIBRARY,dnl
-m4_if($4, mandatory,        _GP_CHECK_LIBRARY_SYNTAX_ERROR($0),
-      $4, default-enabled,  _GP_CHECK_LIBRARY_SYNTAX_ERROR($0),
-      $4, default-disabled, _GP_CHECK_LIBRARY_SYNTAX_ERROR($0))dnl
-m4_if($8, , dnl
-      _GP_CHECK_LIBRARY($1,$2,$3,$4,$5,$6,$7,mandatory,$9),
-      $8, default-on, dnl
-      _GP_CHECK_LIBRARY($1,$2,$3,$4,$5,$6,$7,$8,$9),
-      $8, disable-explicitly, dnl
-      _GP_CHECK_LIBRARY($1,$2,$3,$4,$5,$6,$7,$8,$9),
-      $8, default-off, dnl
-      _GP_CHECK_LIBRARY($1,$2,$3,$4,$5,$6,$7,$8,$9),
-      $8, mandatory, dnl
-      _GP_CHECK_LIBRARY($1,$2,$3,$4,$5,$6,$7,$8,$9),
-      m4_errprint(__file__:__line__: Error:
-Illegal argument 6 to $0: `$6'
-It must be one of "default-on", "default-off", "mandatory".
-)m4_exit(1))dnl
-)dnl
-dnl
-m4_pattern_disallow(GP_CHECK_LIBRARY)
-m4_pattern_disallow(_GP_CHECK_LIBRARY)
-m4_pattern_disallow(_GP_CHECK_LIBRARY_SYNTAX_ERROR)
-m4_pattern_disallow(_GP_CHECK_LIBRARY_SOEXT)
-dnl
-dnl ####################################################################
-dnl
-dnl Please do not remove this:
-dnl filetype: 6e60b4f0-acb2-4cd5-8258-42014f92bd2c
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-check-popt.m4 Deleted

@@ -1,241 +0,0 @@
-dnl @synopsis GP_CHECK_POPT(FLAG)
-dnl
-dnl Check whether libpopt is available.
-dnl FLAG must be one of
-dnl    "mandatory"
-dnl    "default-enabled"
-dnl    "default-disabled"
-dnl
-AC_DEFUN(GP_CHECK_POPT,
-#
-# GP_CHECK_POPT
-#
-AC_REQUIRE(GP_CONFIG_MSG)dnl
-m4_if($1,mandatory,        _GP_CHECK_POPT(mandatory),
-      $1,default-enabled,  _GP_CHECK_POPT(disable),
-      $1,default-disabled, _GP_CHECK_POPT(enable),
-      m4_errprint(__file__:__line__: Error:
-Illegal argument to $0: `$1'
-Valid values are: mandatory, default-enabled, default-disabled
-)m4_exit(1))dnl
-)dnl
-dnl
-AC_DEFUN(_GP_CHECK_POPT,
-m4_if($1,mandatory,
-try_popt=yes
-require_popt=yes
-,
-try_popt=auto
-require_popt=no
-AC_ARG_ENABLE(popt,
-AS_HELP_STRING(--$1-popt,Do not use popt),
- if   test "x$enableval" = xno \
-    || test "x$enableval" = xoff \
-    || test "x$enableval" = xfalse; 
-  then
-    try_popt=no
-    require_popt=no
-  elif test "x$enableval" = xyes \
-    || test "x$enableval" = xon \
-    || test "x$enableval" = xtrue
-  then
-    try_popt=yes
-    require_popt=yes
-  fi
-)dnl
-)dnl
-
-AC_MSG_CHECKING(whether popt is required)
-AC_MSG_RESULT(${require_popt})
-
-if test "$require_popt" != yes; then
-	AC_MSG_CHECKING(whether popt is requested)
-	AC_MSG_RESULT(${try_popt})
-fi
-
-dnl Implicit AC_SUBST
-AC_ARG_VAR(POPT_CFLAGS,cppflags to compile with libpopt)dnl
-AC_ARG_VAR(POPT_LIBS,location of libpopt to link against)dnl
-
-have_popt=no
-
-if test "x$POPT_CFLAGS" = "x" && test "x$POPT_LIBS" = "x"; then
-
-	# try to find options to compile popt.h
-	CPPFLAGS_save="$CPPFLAGS"
-	popth_found=no
-        case "$MSYSTEM" in
-         MINGW32)
-		if test -n "/mingw32"; then
-			:
-		elif test -d "/mingw32/include"; then
-			CPPFLAGS="-I/mingw32/include ${CPPFLAGS}"
-		else
-			continue
-		fi
-		ac_cv_header_popt_h=""
-		unset ac_cv_header_popt_h
-		AC_CHECK_HEADER(popt.h, popth_found=yes)
-         ;;
-         MINGW64)
-		if test -n "${popt_prefix}"; then
-			:
-		elif test -d "/mingw64/include"; then
-			CPPFLAGS="-I/mingw64/include ${CPPFLAGS}"
-		else
-			continue
-		fi
-		ac_cv_header_popt_h=""
-		unset ac_cv_header_popt_h
-		AC_CHECK_HEADER(popt.h, popth_found=yes)
-         ;;
-         *)
-           for popt_prefix in "" /usr /usr/local
-           do
-		if test -n "${popt_prefix}"; then
-			:
-		elif test -d "${popt_prefix}/include"; then
-			CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}"
-		else
-			continue
-		fi
-		ac_cv_header_popt_h=""
-		unset ac_cv_header_popt_h
-		AC_CHECK_HEADER(popt.h, popth_found=yes)
-		if test "$popth_found" = yes; then break; fi
-	   done
-         ;;
-        esac
-	CPPFLAGS="$CPPFLAGS_save"
-	if test "$popth_found" = "yes"; then
-		if test "$popt_prefix" = ""; then
-			POPT_CFLAGS=""
-		else
-			POPT_CFLAGS="-I${popt_prefix}/include"
-		fi
-	elif test "$require_popt" = "yes"; then
-		AC_MSG_ERROR(
-* Cannot autodetect popt.h
-*
-* Set POPT_CFLAGS and POPT_LIBS correctly.
-)
-	fi
-
-	# try to find options to link against popt
-	LDFLAGS_save="$LDFLAGS"
-	popt_links=no
-        case "$MSYSTEM" in
-         MINGW32)
-#		for ldir in "" lib; do
-			popt_libdir="/mingw32/lib"
-			if test "${popt_libdir}" = "/"; then
-				popt_libdir=""
-			elif test -d "${popt_libdir}"; then
-				LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
-			else
-				continue
-			fi
-			# Avoid caching of results
-			ac_cv_lib_popt_poptStuffArgs=""
-			unset ac_cv_lib_popt_poptStuffArgs
-			AC_CHECK_LIB(popt, poptStuffArgs, popt_links=yes)
-         ;;
-         MINGW64)
-			popt_libdir="/mingw64/lib"
-			if test "${popt_libdir}" = "/"; then
-				popt_libdir=""
-			elif test -d "${popt_libdir}"; then
-				LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
-			else
-				continue
-			fi
-			# Avoid caching of results
-			ac_cv_lib_popt_poptStuffArgs=""
-			unset ac_cv_lib_popt_poptStuffArgs
-			AC_CHECK_LIB(popt, poptStuffArgs, popt_links=yes)
-          ;;
-         *)
-	    for popt_prefix in /usr "" /usr/local; do
-		# We could have "/usr" and "lib64" at the beginning of the
-		# lists. Then the first tested location would
-		# incidentally be the right one on 64bit systems, and
-		# thus work around a bug in libtool on 32bit systems:
-		#
-		# 32bit libtool doesn't know about 64bit systems, and so the
-		# compilation will fail when linking a 32bit library from
-		# /usr/lib to a 64bit binary.
-		#
-		# This hack has been confirmed to workwith a
-		# 32bit Debian Sarge and 64bit Fedora Core 3 system.
-		for ldir in lib64 "" lib; do
-			popt_libdir="${popt_prefix}/${ldir}"
-			if test "${popt_libdir}" = "/"; then
-				popt_libdir=""
-			elif test -d "${popt_libdir}"; then
-				LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
-			else
-				continue
-			fi
-			# Avoid caching of results
-			ac_cv_lib_popt_poptStuffArgs=""
-			unset ac_cv_lib_popt_poptStuffArgs
-			AC_CHECK_LIB(popt, poptStuffArgs, popt_links=yes)
-			if test "$popt_links" = yes; then break; fi
-		done
-		if test "$popt_links" = yes; then break; fi
-	  done
-         ;;
-        esac
-	LDFLAGS="$LDFLAGS_save"
-	if test "$popt_links" = "yes"; then
-		if test "$popt_libdir" = ""; then
-			POPT_LIBS="-lpopt"
-		else
-			POPT_LIBS="-L${popt_libdir} -lpopt"
-		fi
-		have_popt=yes
-	elif test "$require_popt" = "yes"; then
-		AC_MSG_ERROR(
-* Cannot autodetect library directory containing popt
-*
-* Set POPT_CFLAGS and POPT_LIBS correctly.
-)
-	fi
-elif test "x$POPT_CFLAGS" != "x" && test "x$POPT_LIBS" != "x"; then
-    # just use the user specivied option
-    popt_msg="yes (user specified)"
-    have_popt=yes
-else
-	AC_MSG_ERROR(
-* Fatal: Either set both POPT_CFLAGS and POPT_LIBS or neither.
-)
-fi
-
-AC_MSG_CHECKING(if popt is functional)
-if test "$require_popt$have_popt" = "yesno"; then
-	AC_MSG_RESULT(no, but required)
-	AC_MSG_ERROR(
-* popt library not found
-* Fatal: ${PACKAGE_NAME} (${PACKAGE_TARNAME}) requires popt
-* Please install it and/or set POPT_CFLAGS and POPT_LIBS.
-)
-fi
-AC_MSG_RESULT(${have_popt})
-
-GP_CONFIG_MSG(use popt library, ${have_popt})
-if test "$have_popt" = "yes"; then
-	AC_DEFINE(HAVE_POPT,1,whether the popt library is available)
-	GP_CONFIG_MSG(popt libs,${POPT_LIBS})
-	GP_CONFIG_MSG(popt cppflags,${POPT_CFLAGS})
-fi
-AM_CONDITIONAL(HAVE_POPT,test "$have_popt" = "yes")
-)dnl
-dnl
-dnl Please do not remove this:
-dnl filetype: 7595380e-eff3-49e5-90ab-e40f1d544639
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-check-shell-environment.m4 Deleted

@@ -1,48 +0,0 @@
-dnl @synopsis GP_CHECK_SHELL_ENVIRONMENT(SHOW-LOCALE-VARS)
-dnl 
-dnl Check that the shell environment is sane.
-dnl
-dnl If SHOW-LOCALE-VARS is set to true, print all LC_* and LANG*
-dnl variables at configure time. (WARNING: This is not portable!)
-dnl
-dnl
-AC_DEFUN(GP_CHECK_SHELL_ENVIRONMENT,
-
-# make sure "cd" doesn't print anything on stdout
-if test x"${CDPATH+set}" = xset
-then
-	CDPATH=:
-	export CDPATH
-fi
-
-# make sure $() command substitution works
-AC_MSG_CHECKING(for POSIX sh \$() command substitution)
-if test "x$(pwd)" = "x`pwd`" && test "y$(echo "foobar")" = "y`echo foobar`" # ''''
-then
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-	uname=`uname 2>&1` # ''
-	uname_a=`uname -a 2>&1` # ''
-	AC_MSG_ERROR(
-
-* POSIX sh \$() command substition does not work with this shell.
-*
-* You are running a very rare species of shell. Please report this
-* sighting to <${PACKAGE_BUGREPORT}>:
-* SHELL=${SHELL}
-* uname=${uname}
-* uname-a=${uname_a}
-* Please also include your OS and version.
-*
-* Run this configure script using a better (i.e. POSIX compliant) shell.
-)
-fi
-dnl
-m4_if($1,true,dnl
-printenv | grep -E '^(LC_|LANG)'
-)dnl
-
-dnl
-)dnl
-dnl

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-config-msg.m4 Deleted

@@ -1,102 +0,0 @@
-dnl
-dnl GP_CONFIG_INIT
-dnl      use default LHS width (called implicitly if not called explicitly)
-dnl GP_CONFIG_INIT(WIDTH-OF-LHS)
-dnl      explicitly set the LHS width to the given value
-dnl
-dnl GP_CONFIG_MSG
-dnl      empty output line
-dnl GP_CONFIG_MSG(LHS,RHS)
-dnl      formatted output line "LHS: RHS"
-dnl
-dnl GP_CONFIG_OUTPUT
-dnl      print all the output messages we collected in the mean time
-dnl
-dnl Simple way to print a configuration summary at the end of ./configure.
-dnl
-dnl Example usage:
-dnl
-dnl    GP_CONFIG_INIT
-dnl    GP_CONFIG_MSG(Source code location,${srcdir})
-dnl    GP_CONFIG_MSG(Compiler,${CC})
-dnl    GP_CONFIG_MSG
-dnl    GP_CONFIG_MSG(Feature foo,${foo})
-dnl    GP_CONFIG_MSG(Location of bar,${bar})
-dnl    ...
-dnl    AC_OUTPUT
-dnl    GP_CONFIG_OUTPUT
-dnl
-dnl
-AC_DEFUN(GP_CONFIG_INIT,
-dnl
-AC_REQUIRE(GP_CHECK_SHELL_ENVIRONMENT)
-dnl the empty string must contain at least as many spaces as the substr length
-dnl FIXME: let m4 determine that length
-dnl        (collect left parts in array and choose largest length)
-m4_if($1,,gp_config_len="30",gp_config_len="$1")
-gp_config_empty=""
-gp_config_len3="$(expr "$gp_config_len" - 3)"
-n="$gp_config_len"
-while test "$n" -gt 0; do
-      gp_config_empty="${gp_config_empty} "
-      n="$(expr "$n" - 1)"
-done
-gp_config_msg="
-Configuration (${PACKAGE_TARNAME} ${PACKAGE_VERSION}):
-"
-)dnl
-dnl
-dnl
-AC_DEFUN(GP_CONFIG_MSG,
-AC_REQUIRE(GP_CONFIG_INIT)dnl
-m4_if($1,,
-gp_config_msg="${gp_config_msg}
-"
-,$2,,
-gp_config_msg="${gp_config_msg}
-  $1
-"
-,
-gp_config_msg_len="$(expr "$1" : '.*')"
-if test "$gp_config_msg_len" -ge "$gp_config_len"; then
-	gp_config_msg_lhs="$(expr "$1" : "$.\{0,${gp_config_len3}\}$")..:"
-else
-	gp_config_msg_lhs="$(expr "$1:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
-fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} $2
-"
-))dnl
-dnl
-AC_DEFUN(GP_CONFIG_MSG_SUBDIRS,dnl
-# Message about configured subprojects
-if test "x$subdirs" != "x"; then
-	GP_CONFIG_MSG()dnl
-	_subdirs=""
-	for sd in $subdirs; do
-		ssd="$(basename "$sd")"
-		if test "x$_subdirs" = "x"; then
-			_subdirs="$ssd";
-		else
-			_subdirs="$_subdirs $ssd"
-		fi
-	done
-	GP_CONFIG_MSG(Subprojects,${_subdirs})dnl
-fi
-)dnl
-dnl
-AC_DEFUN(GP_CONFIG_OUTPUT,
-AC_REQUIRE(GP_CONFIG_INIT)dnl
-AC_REQUIRE(GP_CONFIG_MSG)dnl
-AC_REQUIRE(GP_CONFIG_MSG_SUBDIRS)dnl
-echo "${gp_config_msg}
-You may run \"make\" and \"make install\" now."
-)dnl
-dnl
-dnl Please do not remove this:
-dnl filetype: de774af3-dc3b-4b1d-b6f2-4aca35d3da16
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-documentation.m4 Deleted

@@ -1,113 +0,0 @@
-dnl
-dnl check where to install documentation
-dnl
-dnl determines documentation "root directory", i.e. the directory
-dnl where all documentation will be placed in
-dnl
-
-AC_DEFUN(GP_CHECK_DOC_DIR,
-
-AC_BEFORE($0, GP_BUILD_GTK_DOCS)dnl
-AC_BEFORE($0, GP_CHECK_DOXYGEN)dnl
-
-AC_ARG_WITH(doc-dir,
-AS_HELP_STRING(--with-doc-dir=PATH,
-Where to install docs  default=autodetect))
-
-# check for the main ("root") documentation directory
-AC_MSG_CHECKING(main docdir)
-
-if test "x${with_doc_dir}" != "x"
-then # docdir is given as parameter
-    docdir="${with_doc_dir}"
-    AC_MSG_RESULT(${docdir} (from parameter))
-else # otherwise invent a docdir hopefully compatible with system policy
-    if test -d "/usr/share/doc"
-    then
-        maindocdir='${prefix}/share/doc'
-        AC_MSG_RESULT(${maindocdir} (FHS style))
-    elif test -d "/usr/doc"
-    then
-        maindocdir='${prefix}/doc'
-        AC_MSG_RESULT(${maindocdir} (old style))
-    else
-        maindocdir='${datadir}/doc'
-        AC_MSG_RESULT(${maindocdir} (default value))
-    fi
-    AC_MSG_CHECKING(package docdir)
-    # check whether to include package version into documentation path
-    # FIXME: doesn't work properly.
-    if ls -d /usr/{share/,}doc/make-0-9* > /dev/null 2>&1
-    then
-        docdir="${maindocdir}/${PACKAGE}-${VERSION}"
-        AC_MSG_RESULT(${docdir} (redhat style))
-    else
-        docdir="${maindocdir}/${PACKAGE}"
-        AC_MSG_RESULT(${docdir} (default style))
-    fi
-fi
-
-AC_SUBST(docdir)
-)dnl
-
-dnl
-dnl check whether to build docs and where to:
-dnl
-dnl * determine presence of prerequisites (only gtk-doc for now)
-dnl * determine destination directory for HTML files
-dnl
-
-AC_DEFUN(GP_BUILD_GTK_DOCS,
-
-# docdir has to be determined in advance
-AC_REQUIRE(GP_CHECK_DOC_DIR)
-
-# ---------------------------------------------------------------------------
-# gtk-doc: We use gtk-doc for building our documentation. However, we
-#          require the user to explicitely request the build.
-# ---------------------------------------------------------------------------
-try_gtkdoc=false
-gtkdoc_msg="no (not requested)"
-have_gtkdoc=false
-AC_ARG_ENABLE(docs,
-AS_HELP_STRING(--enable-docs,
-Use gtk-doc to build documentation default=no),
-	if test x$enableval = xyes; then
-		try_gtkdoc=true
-	fi
-)
-if $try_gtkdoc; then
-	AC_PATH_PROG(GTKDOC,gtkdoc-mkdb)
-	if test -n "${GTKDOC}"; then
-		have_gtkdoc=true
-		gtkdoc_msg="yes"
-	else
-		gtkdoc_msg="no (http://www.gtk.org/rdp/download.html)"
-	fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, $have_gtkdoc)
-GP_CONFIG_MSG(build API docs with gtk-doc,$gtkdoc_msg)
-
-
-# ---------------------------------------------------------------------------
-# Give the user the possibility to install html documentation in a 
-# user-defined location.
-# ---------------------------------------------------------------------------
-AC_ARG_WITH(html-dir,
-AS_HELP_STRING(--with-html-dir=PATH,
-Where to install html docs default=autodetect))
-
-AC_MSG_CHECKING(for html dir)
-if test "x${with_html_dir}" = "x" ; then
-    htmldir="${docdir}/html"
-    AC_MSG_RESULT(${htmldir} (default))
-else
-    htmldir="${with_html_dir}"
-    AC_MSG_RESULT(${htmldir} (from parameter))
-fi
-AC_SUBST(htmldir)
-apidocdir="${htmldir}/api"
-AC_SUBST(apidocdir)
-
-)dnl
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-dynamic-libraries.m4 Deleted

@@ -1,60 +0,0 @@
-AC_DEFUN(GP_DYNAMIC_LIBRARIES,dnl
-dnl We require either of those
-dnl AC_REQUIRE(AC_LIBTTDL_INSTALLABLE)dnl
-dnl AC_REQUIRE(AC_LIBLTDL_CONVENIENCE)dnl
-AC_REQUIRE(AC_LIBTOOL_DLOPEN)dnl
-AC_REQUIRE(AC_PROG_LIBTOOL)dnl
-dnl ---------------------------------------------------------------------------
-dnl Check for libltdl:
-dnl  - lt_dlforeachfile has been introduced in libtool-1.4.
-dnl  - However, there are still systems out there running libtool-1.3.
-dnl    For those, we will use our shipped libltdl. This has the welcome
-dnl    side effect that we don't have to distinguish between libltdl 1.3 with
-dnl    and without the notorious segfault bug.
-dnl  - FIXME: In case we're using our own version, we have to check whether
-dnl           -ldl is required?
-dnl ---------------------------------------------------------------------------
-# $0
-ltdl_msg="no (not found or too old)"
-have_ltdl=false
-LIBS_save="$LIBS"
-LIBS="$LIBLTDL"
-AC_CHECK_LIB(ltdl, lt_dlforeachfile,
-	CPPFLAGS_save="$CPPFLAGS"
-	CPPFLAGS="$LTDLINCL"
-	AC_CHECK_HEADER(ltdl.h,
-		AC_DEFINE(HAVE_LTDL,1,whether we use libltdl)
-		ltdl_msg="yes (from system)"
-		have_ltdl=:
-	)
-	CPPFLAGS="$CPPFLAGS_save"
-)
-LIBS="$LIBS_save"
-if "$have_ltdl"; then :; else
-	AC_MSG_CHECKING(for included libltdl)
-	if test -d "$srcdir/libltdl"; then
-		LIBLTDL="\$(top_builddir)/libltdl/libltdlc.la"
-		LTDLINCL="-I\$(top_srcdir)/libltdl"
-		have_ltdl=:
-		ltdl_msg="yes (included)"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-		AC_MSG_ERROR(
-*** Could not detect or configure libltdl.
-)
-	fi
-fi
-GP_CONFIG_MSG(libltdl,"${ltdl_msg}")
-)dnl
-dnl
-dnl ####################################################################
-dnl
-dnl Please do not remove this:
-dnl filetype: 2b993145-3256-47b4-84fd-ec4dcdf4fdf9
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-gettext-hack.m4 Deleted

@@ -1,78 +0,0 @@
-dnl
-dnl GP_GETTEXT_HACK
-dnl
-dnl gettext hack, originally designed for libexif, libgphoto2, and Co.
-dnl This creates a po/Makevars file with adequate values if the
-dnl po/Makevars.template is present.
-dnl
-dnl Example usage:
-dnl    GP_GETTEXT_HACK(${PACKAGE_TARNAME}-${LIBFOO_CURRENT},
-dnl                    Copyright Holder,
-dnl                    foo-translation@example.org)
-dnl    ALL_LINGUAS="de es fr"
-dnl    AM_GNU_GETTEXT_VERSION(0.14.1)
-dnl    AM_GNU_GETTEXT(external)
-dnl    AM_PO_SUBDIRS()
-dnl    AM_ICONV()
-dnl    GP_GETTEXT_FLAGS
-dnl
-dnl You can leave out the GP_GETTEXT_HACK parameters if you want to,
-dnl GP_GETTEXT_HACK will try fall back to sensible values in that case:
-dnl
-
-AC_DEFUN(GP_GETTEXT_HACK,
-
-AC_BEFORE($0, AM_GNU_GETTEXT)dnl
-AC_BEFORE($0, AM_GNU_GETTEXT_VERSION)dnl
-m4_if($1,,GETTEXT_PACKAGE="${PACKAGE_TARNAME}",GETTEXT_PACKAGE="$1")
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                   The gettext domain we're using)
-AC_SUBST(GETTEXT_PACKAGE)
-sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
-m4_if($2,,,sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|")
-m4_ifval($3,
-if test -n "$PACKAGE_BUGREPORT"; then
-   sed_mb="${PACKAGE_BUGREPORT}"
-else
-   AC_MSG_ERROR(
-*** Your configure.{ac,in} is wrong.
-*** Either define PACKAGE_BUGREPORT (by using the 4-parameter AC INIT syntax)
-*** or give GP_GETTEXT_HACK the third parameter.
-***
-)
-fi
-,
-sed_mb="$3"
-)
-sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
-# Not so sure whether this hack is all *that* evil...
-AC_MSG_CHECKING(for po/Makevars requiring hack)
-if test -f "${srcdir}/po/Makevars.template"; then
-   sed "$sed_cmds" < "${srcdir}/po/Makevars.template" > "${srcdir}/po/Makevars"
-   AC_MSG_RESULT(yes, done.)
-else
-   AC_MSG_RESULT(no)
-fi
-)
-
-AC_DEFUN(GP_GETTEXT_FLAGS,
-
-AC_REQUIRE(AM_GNU_GETTEXT)
-AC_REQUIRE(GP_CONFIG_INIT)
-if test "x${BUILD_INCLUDED_LIBINTL}" = "xyes"; then
-   AM_CFLAGS="${AM_CFLAGS} -I\$(top_srcdir)/intl"
-fi
-GP_CONFIG_MSG(Use translations,${USE_NLS})
-if test "x$USE_NLS" = "xyes" && test "${BUILD_INCLUDED_LIBINTL}"; then
-   GP_CONFIG_MSG(Use included libintl,${BUILD_INCLUDED_LIBINTL})
-fi
-)
-
-dnl Please do not remove this:
-dnl filetype: 71ff3941-a5ae-4677-a369-d7cb01f92c81
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-internal-docs.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-libltdl.m4 Deleted

@@ -1,59 +0,0 @@
-dnl Written by Hans Ulrich Niedermann
-dnl LDFLAGS vs LIBS fix by Dan Nicholson
-dnl 
-dnl We are using our own libltdl checks instead of AC_WITH_LTDL
-dnl because we do not want to ship our own copy of libltdl any more.
-dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
-dnl and relying on standard autoconf's "autoreconf".
-dnl
-dnl Look for external libltdl, not shipping internal libltdl.
-AC_DEFUN(GP_LIB_LTDL,dnl
-AC_ARG_VAR(LTDLINCL,CFLAGS for compiling with libltdl)
-AC_ARG_VAR(LIBLTDL,LIBS to add for linking against libltdl)
-if test "x${LTDLINCL}${LIBLTDL}" = "x"; then
-AC_CHECK_HEADER(ltdl.h,
-dnl
-AC_CHECK_LIB(ltdl, lt_dlinit,dnl
-LTDLINCL=""
-LIBLTDL="-lltdl"
-AC_DEFINE(HAVE_LTDL,1,Whether libltdl (of libtool fame) is present)
-,dnl
-AC_MSG_ERROR(
-$PACKAGE requires the ltdl library, included with libtool
-
-Please make sure that the proper development package is installed
-(libltdl-dev, libtool-ltdl-devel, etc.)
-)dnl
-)dnl
-)
-else
-	AC_MSG_CHECKING(for libltdl flags)
-	AC_MSG_RESULT(set explicitly: ${LTDLINCL} ${LIBLTDL})
-fi
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-dnl
-dnl Make sure we can actually compile and link against libltdl
-AC_LANG_PUSH(C)
-AC_MSG_CHECKING(that we can compile and link with libltdl)
-saved_CPPFLAGS="$CPPFLAGS"
-saved_LIBS="$LIBS"
-CPPFLAGS="$CPPFLAGS $LTDLINCL"
-LIBS="$LIBS $LIBLTDL"
-AC_LINK_IFELSE(AC_LANG_PROGRAM(dnl
-#include <stdlib.h> /* for NULL */
-#include <ltdl.h>   /* for lt_* */
-,dnl
-int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
-), AC_MSG_RESULT(yes), dnl
-AC_MSG_RESULT(no)
-AC_MSG_ERROR(cannot compile and link against libltdl
-${PACKAGE_TARNAME} requires libltdl (the libtool dl* library),
-but cannot compile and link against it.
-Aborting.
-)
-)
-CPPFLAGS="$saved_CPPFLAGS"
-LIBS="$saved_LIBS"
-AC_LANG_POP
-)dnl

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-docbook-xml.m4 Deleted

@@ -1,46 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl try to find xmlto (required for generation of man pages and html docs)
-dnl ------------------------------------------------------------------------
-AC_DEFUN(GP_CHECK_DOCBOOK_XML,
-
-
-AC_MSG_CHECKING(for XML catalogs)
-XML_CATALOG_FILES="`find /etc/xml /usr/share/xml /usr/share/sgml -type f $ -iname 'catalog.xml' -or -iname 'catalog' $ -print 2> /dev/null | while read file; do echo -n "$file "; done`"
-if test "x$XML_CATALOG_FILES" = "x"
-then
-	AC_MSG_RESULT(none found.)
-else
-	AC_MSG_RESULT(found ${XML_CATALOG_FILES})
-fi
-AC_SUBST(XML_CATALOG_FILES)
-
-#XML_DEBUG_CATALOG=0
-#AC_SUBST(XML_DEBUG_CATALOG)
-
-manual_msg="no (http://cyberelk.net/tim/xmlto/)"
-try_xmlto=true
-have_xmlto=false
-AC_ARG_WITH(xmlto,   --without-xmlto           Don't use xmlto,
-	if test x$withval = xno; then
-		try_xmlto=false
-	fi)
-if $try_xmlto; then
-	AC_PATH_PROG(XMLTO,xmlto)
-	if test -n "${XMLTO}"; then
-		have_xmlto=true
-		manual_msg="yes"
-		PURE_XMLTO="$XMLTO"
-		if true || test "x$XML_CATALOG_FILES" = "x"; then
-			unset XML_CATALOG_FILES
-			XMLTO="${XMLTO} -m \$(top_srcdir)/src/xsl/custom.xsl"
-		else
-			XMLTO="env XML_CATALOG_FILES=\"${XML_CATALOG_FILES}\" ${XMLTO} -m ${top_srcdir}/src/xsl/custom.xsl"
-		fi
-        else
-                # in case anybody runs $(XMLTO) somewhere, we return false
-                XMLTO=false
-	fi
-fi
-
-AM_CONDITIONAL(XMLTO, $have_xmlto)
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-documentation.m4 Deleted

@@ -1,329 +0,0 @@
-dnl
-dnl check where to install documentation
-dnl
-dnl determines documentation "root directory", i.e. the directory
-dnl where all documentation will be placed in
-dnl
-
-AC_DEFUN(GP_CHECK_DOCDIR,
-
-
-AC_ARG_WITH(doc-dir,   --with-doc-dir=PATH       Where to install docs  default=autodetect)dnl
-
-# check for the main ("root") documentation directory
-AC_MSG_CHECKING(main docdir)
-
-if test "x${with_doc_dir}" != "x"
-then # docdir is given as parameter
-    docdir="${with_doc_dir}"
-    AC_MSG_RESULT(${docdir} (from parameter))
-else # otherwise invent a docdir hopefully compatible with system policy
-    if test -d "/usr/share/doc"
-    then
-        maindocdir='${prefix}/share/doc'
-        AC_MSG_RESULT(${maindocdir} (FHS style))
-    elif test -d "/usr/doc"
-    then
-        maindocdir='${prefix}/doc'
-        AC_MSG_RESULT(${maindocdir} (old style))
-    else
-        maindocdir='${datadir}/doc'
-        AC_MSG_RESULT(${maindocdir} (default value))
-    fi
-    AC_MSG_CHECKING(package docdir)
-    # check whether to include package version into documentation path
-    # FIXME: doesn't work properly.
-    if ls -d /usr/{share/,}doc/*-0-9* > /dev/null 2>&1
-    then
-        docdir="${maindocdir}/${PACKAGE}-${VERSION}"
-        AC_MSG_RESULT(${docdir} (redhat style))
-    else
-        docdir="${maindocdir}/${PACKAGE}"
-        AC_MSG_RESULT(${docdir} (default style))
-    fi
-fi
-
-AC_SUBST(docdir)
-
-)dnl
-
-dnl Solaris hack for grep and tr
-AC_DEFUN(GP_CHECK_TR,
-
-if test -n "`echo $host_os | grep 'sSolaris'`"; then
-  TR=/usr/xpg4/bin/tr
-  GREP=/usr/xpg4/bin/grep  
-else
-  TR=tr
-  GREP=grep
-fi	
-)
-
-dnl
-dnl check whether to build docs and where to:
-dnl
-dnl * determine presence of prerequisites (only gtk-doc for now)
-dnl * determine destination directory for HTML files
-dnl
-
-AC_DEFUN(GP_BUILD_DOCS,
-
-# doc dir has to be determined in advance
-AC_REQUIRE(GP_CHECK_DOCDIR)
-AC_REQUIRE(GP_CHECK_GTK_DOC)
-AC_REQUIRE(GP_CHECK_FIG2DEV)
-AC_REQUIRE(GP_CHECK_DOCBOOK_XML)
-AC_REQUIRE(GP_CHECK_TR)
-AC_REQUIRE(GP_CHECK_PSTOIMG)
-AC_REQUIRE(GP_CHECK_DOT)
-AC_REQUIRE(GP_CHECK_W3M)
-
-gphoto2xml='$(top_srcdir)/src/gphoto2.xml'
-AC_SUBST(gphoto2xml)
-
-dnl ---------------------------------------------------------------------------
-dnl Give the user the possibility to install documentation in
-dnl user-defined locations.
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(html-dir,   --with-html-dir=PATH      Where to install html docs default=autodetect)
-AC_MSG_CHECKING(for html dir)
-if test "x${with_html_dir}" = "x" ; then
-    htmldir="${docdir}/html"
-    AC_MSG_RESULT(${htmldir} (default))
-else
-    htmldir="${with_html_dir}"
-    AC_MSG_RESULT(${htmldir} (from parameter))
-fi
-AC_SUBST(htmldir)
-
-AC_ARG_WITH(xhtml-dir,   --with-xhtml-dir=PATH     Where to install xhtml docs default=autodetect)
-AC_MSG_CHECKING(for xhtml dir)
-if test "x${with_xhtml_dir}" = "x" ; then
-    xhtmldir="${docdir}/xhtml"
-    AC_MSG_RESULT(${xhtmldir} (default))
-else
-    xhtmldir="${with_xhtml_dir}"
-    AC_MSG_RESULT(${xhtmldir} (from parameter))
-fi
-AC_SUBST(xhtmldir)
-
-AC_ARG_WITH(html-nochunks-dir,   --with-html-nochunks-dir=PATH      Where to install html-nochunks docs default=autodetect)
-AC_MSG_CHECKING(for html-nochunks dir)
-if test "x${with_html_nochunks_dir}" = "x" ; then
-    htmlnochunksdir="${docdir}/html-nochunks"
-    AC_MSG_RESULT(${htmlnochunksdir} (default))
-else
-    htmlnochunksdir="${with_html_nochunks_dir}"
-    AC_MSG_RESULT(${htmlnochunksdir} (from parameter))
-fi
-AC_SUBST(htmlnochunksdir)
-
-AC_ARG_WITH(xhtml-nochunks-dir,   --with-xhtml-nochunks-dir=PATH      Where to install xhtml-nochunks docs default=autodetect)
-AC_MSG_CHECKING(for xhtml-nochunks dir)
-if test "x${with_xhtml_nochunks_dir}" = "x" ; then
-    xhtmlnochunksdir="${docdir}/xhtml-nochunks"
-    AC_MSG_RESULT(${xhtmlnochunksdir} (default))
-else
-    xhtmlnochunksdir="${with_xhtml_nochunks_dir}"
-    AC_MSG_RESULT(${xhtmlnochunksdir} (from parameter))
-fi
-AC_SUBST(xhtmlnochunksdir)
-
-AC_ARG_WITH(xml-dir,   --with-xml-dir=PATH      Where to install xml docs default=autodetect)
-AC_MSG_CHECKING(for xml dir)
-if test "x${with_xml_dir}" = "x" ; then
-    xmldir="${docdir}/xml"
-    AC_MSG_RESULT(${xmldir} (default))
-else
-    xmldir="${with_xml_dir}"
-    AC_MSG_RESULT(${xmldir} (from parameter))
-fi
-AC_SUBST(xmldir)
-xmlcssdir="${xmldir}/css"
-AC_SUBST(xmlcssdir)
-
-AC_ARG_WITH(txt-dir,   --with-txt-dir=PATH      Where to install txt docs default=autodetect)
-AC_MSG_CHECKING(for txt dir)
-if test "x${with_txt_dir}" = "x" ; then
-    txtdir="${docdir}/txt"
-    AC_MSG_RESULT(${txtdir} (default))
-else
-    txtdir="${with_txt_dir}"
-    AC_MSG_RESULT(${txtdir} (from parameter))
-fi
-AC_SUBST(txtdir)
-
-AC_ARG_WITH(man-dir,   --with-man-dir=PATH      Where to install man docs default=autodetect)
-AC_MSG_CHECKING(for man dir)
-if test "x${with_man_dir}" = "x" ; then
-    manmandir="${docdir}/man"
-    AC_MSG_RESULT(${manmandir} (default))
-else
-    manmandir="${with_man_dir}"
-    AC_MSG_RESULT(${manmandir} (from parameter))
-fi
-AC_SUBST(manmandir)
-
-AC_ARG_WITH(pdf-dir,   --with-pdf-dir=PATH      Where to install pdf docs default=autodetect)
-AC_MSG_CHECKING(for pdf dir)
-if test "x${with_pdf_dir}" = "x" ; then
-    pdfdir="${docdir}/pdf"
-    AC_MSG_RESULT(${pdfdir} (default))
-else
-    pdfdir="${with_pdf_dir}"
-    AC_MSG_RESULT(${pdfdir} (from parameter))
-fi
-AC_SUBST(pdfdir)
-
-AC_ARG_WITH(ps-dir,   --with-ps-dir=PATH      Where to install ps docs default=autodetect)
-AC_MSG_CHECKING(for ps dir)
-if test "x${with_ps_dir}" = "x" ; then
-    psdir="${docdir}/ps"
-    AC_MSG_RESULT(${psdir} (default))
-else
-    psdir="${with_ps_dir}"
-    AC_MSG_RESULT(${psdir} (from parameter))
-fi
-AC_SUBST(psdir)
-
-AC_ARG_WITH(figure-dir,   --with-figure-dir=PATH      Where to install figures default=autodetect)
-AC_MSG_CHECKING(for figure dir)
-if test "x${with_figure_dir}" = "x" ; then
-    figuredir="${docdir}/figures"
-    AC_MSG_RESULT(${figuredir} (default))
-else
-    figuredir="${with_figure_dir}"
-    AC_MSG_RESULT(${figuredir} (from parameter))
-fi
-AC_SUBST(figuredir)
-
-AC_ARG_WITH(screenshots-dir,   --with-screenshots-dir=PATH      Where to install screenshotss default=autodetect)
-AC_MSG_CHECKING(for screenshots dir)
-if test "x${with_screenshots_dir}" = "x" ; then
-    screenshotsdir="${docdir}/screenshots"
-    AC_MSG_RESULT(${screenshotsdir} (default))
-else
-    screenshotsdir="${with_screenshots_dir}"
-    AC_MSG_RESULT(${screenshotsdir} (from parameter))
-fi
-AC_SUBST(screenshotsdir)
-screenshotsgtkamdir="${screenshotsdir}/gtkam"
-AC_SUBST(screenshotsgtkamdir)
-
-doc_formats_list='man html txt ps pdf'
-
-# initialize have_xmlto* to false
-for i in $doc_formats_list; do
-  d=`echo $i | $TR A-Z a-z`
-  eval "have_xmlto$d=false"
-done
-
-AC_MSG_CHECKING(checking doc formats)
-AC_ARG_WITH(doc_formats,
-    --with-doc-formats=<list>   create doc with format in <list>; 
-                              'all' build all doc formats; 
-                              possible formats are: 
-                              man, html, ps, pdf ,
-  doc_formats="$withval", doc_formats="man html txt")
-
-if test "$doc_formats" = "all"; then
-  doc_formats=$doc_formats_list
-else
-  doc_formats=`echo $doc_formats | sed 's/,/ /g'`
-fi
-
-# set have_xmlto* to true if requested and possible
-if $have_xmlto; then
-  for i in $doc_formats; do
-    if test -n "`echo $doc_formats_list | $GREP -E \"(^| )$i( |\$)\"`"; then
-      eval "have_xmlto$i=true"
-    else
-      AC_ERROR(Unknown doc format $i!)
-    fi
-  done
-  AC_MSG_RESULT($doc_formats)
-else
-  AC_MSG_RESULT(deactivated (requires xmlto))
-fi
-
-# Make sure that xmltopdf actually works
-if $have_xmltopdf; then
-	AC_MSG_CHECKING(whether pdf creation works)
-	oldcwd="$(pwd)"
-	top_srcdir() { echo "$srcdir"; }
-	mkdir test-pdf
-	cd test-pdf
-	cat>test-db.xml<<EOF
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<book id="foobook">
-	<bookinfo>
-		<title>Foo Title</title>
-	</bookinfo>
-	<chapter id="foochapter">
-		<title>Foo Chapter</title>
-		<para>
-			Foo bar blah blah
-		      .
-		</para>
-	</chapter>
-</book>
-EOF
-	${PURE_XMLTO} pdf -o . test-db.xml --searchpath ..
-	if test -s test-db.pdf; then
-		AC_MSG_RESULT(yes, look at $(pwd)/test-db.pdf to verify)
-	else
-		if $have_xmltopdf; then
-			AC_MSG_ERROR(PDF creation requested, but failed. See $(pwd) ...)
-		else
-			AC_MSG_RESULT(no, but not requested)
-		fi
-	fi
-	cd "$oldcwd"
-	unset top_srcdir
-fi
-
-AM_CONDITIONAL(XMLTOHTML,$have_xmltohtml)
-AM_CONDITIONAL(XMLTOMAN,$have_xmltoman)
-AM_CONDITIONAL(XMLTOTXT,$have_xmltotxt)
-AM_CONDITIONAL(XMLTOTXT2,$have_xmltotxt && $have_w3m)
-AM_CONDITIONAL(XMLTOPDF,$have_xmltopdf)
-AM_CONDITIONAL(XMLTOPS,$have_xmltops)
-
-# create list of supported formats
-AC_MSG_CHECKING(for manual formats to recreate)
-xxx=""
-manual_html=""
-manual_pdf=""
-manual_ps=""
-if $have_xmltohtml; then
-        xxx="${xxx} html"
-fi
-if $have_xmltoman; then
-        xxx="${xxx} man"
-fi
-if $have_xmltopdf; then
-        xxx="${xxx} pdf"
-fi
-if $have_xmltops; then 
-        xxx="${xxx} ps"
-fi
-if $have_xmltotxt; then 
-        xxx="${xxx} txt"
-fi
-AC_SUBST(manual_html)
-AC_SUBST(manual_pdf)
-AC_SUBST(manual_ps)
-AC_MSG_RESULT($xxx)
-
-if test "x$xxx" != "x"
-then
-        if $have_fig2dev; then
-                fig_out=""
-        else
-                fig_out="out"
-        fi
-        manual_msg="in (${xxx} ) formats with${fig_out} figures"
-fi
-
-)dnl

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-fig2dev.m4 Deleted

@@ -1,40 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl fig2dev: This program is needed for processing images. If not found,
-dnl          documentation can still be built, but without figures.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(GP_CHECK_FIG2DEV,
-
-
-try_fig2dev=true
-have_fig2dev=false
-AC_ARG_WITH(fig2dev,   --without-fig2dev         Don't use fig2dev,
-	if test "x$withval" = "xno"; then
-		try_fig2dev=false
-	fi)
-if $try_fig2dev; then
-	AC_PATH_PROG(FIG2DEV,fig2dev)
-	if test -n "${FIG2DEV}"; then
-		have_fig2dev=true
-	fi
-fi
-if $have_fig2dev; then
-	AC_SUBST(FIG2DEV)
-        ${FIG2DEV} -L ps > /dev/null <<EOF
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter  
-100.00
-Single
--2
-1200 2
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 3000 3750 270 270 3000 3750 3150 3975
-EOF
-        if test $? != 0; then
-                have_fig2dev=false
-        fi
-fi
-AM_CONDITIONAL(ENABLE_FIGURES, $have_fig2dev)
-
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-graphviz.m4 Deleted

@@ -1,49 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl dot: This program is needed for processing images. If not found,
-dnl          documentation can still be built, but without figures.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(GP_CHECK_DOT,
-
-
-try_dot=true
-have_dot=false
-AC_ARG_WITH(dot, AS_HELP_STRING(--without-dot, Do not use dot), 
-	if test "x$withval" = "xno"; then
-		try_dot=false
-	fi)
-if $try_dot; then
-	AC_PATH_PROG(DOT,dot)
-	if test -n "${DOT}"; then
-		have_dot=true
-	fi
-fi
-if $have_dot; then
-	AC_SUBST(DOT)
-	AC_MSG_CHECKING(whether ${DOT} works)
-        ${DOT} -Tps -o tesseract.ps 2> /dev/null <<EOF
-graph tesseract {
-	node shape=point;
-	o -- {a;b;c;d;}
-	a -- {ab;ac;ad;}
-	b -- {ab;bc;bd;}
-	c -- {ac;bc;cd;}
-	d -- {ad;bd;cd;}
-	ab -- {abc;abd;}
-	ac -- {abc;acd;}
-	ad -- {abd;acd;}
-	bc -- {abc;bcd;}
-	bd -- {abd;bcd;}
-	cd -- {acd;bcd;}
-	{abc;abd;acd;bcd;} -- abcd;
-}
-EOF
-        if test $? != 0 || test ! -f tesseract.ps; then
-                have_dot=false
-		AC_MSG_RESULT(no (see http://www.graphviz.org/ ...))
-	else
-		AC_MSG_RESULT(yes)
-        fi
-fi
-AM_CONDITIONAL(ENABLE_GRAPHS, $have_dot)
-
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-gtk-doc.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-pstoimg.m4 Deleted

@@ -1,36 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl pstoimg: This program is needed for processing images. If not found,
-dnl          documentation can still be built, but without figures.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(GP_CHECK_PSTOIMG,
-
-AC_REQUIRE(GP_CHECK_DOT)dnl for creating tesseract.ps
-
-try_pstoimg=true
-have_pstoimg=false
-AC_ARG_WITH(pstoimg, AS_HELP_STRING(--without-pstoimg, Do not use pstoimg),
-	if test "x$withval" = "xno"; then
-		try_pstoimg=false
-	fi)
-if $try_pstoimg; then
-	AC_PATH_PROG(PSTOIMG,pstoimg)
-	if test -n "${PSTOIMG}"; then
-		have_pstoimg=true
-	fi
-fi
-if $have_pstoimg; then
-	AC_SUBST(PSTOIMG)
-	AC_MSG_CHECKING(whether ${PSTOIMG} works)
-	rm -f tesseract.png
-        ${PSTOIMG} -type png -scale 1.2 -antialias -crop a tesseract.ps > /dev/null
-        if test $? != 0 || test ! -f tesseract.png; then
-                have_pstoimg=false
-		AC_MSG_RESULT(no)
-	else
-		AC_MSG_RESULT(yes)
-        fi
-	rm -f tesseract.png
-fi
-AM_CONDITIONAL(ENABLE_PSTOIMG, $have_pstoimg)
-
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-manual-w3m.m4 Deleted

@@ -1,45 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl w3m: This program is needed for converting HTML to text.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN(GP_CHECK_W3M,
-
-
-try_w3m=true
-have_w3m=false
-AC_ARG_WITH(w3m,   --without-w3m         Don't use w3m,
-	if test "x$withval" = "xno"; then
-		try_w3m=false
-	fi)
-if $try_w3m; then
-	AC_PATH_PROG(W3M,w3m)
-	if test -n "${W3M}"; then
-		have_w3m=true
-	fi
-fi
-if $have_w3m; then
-	AC_MSG_CHECKING(whether ${W3M} works)
-        cat > html2text-test.xxxhtml 2> /dev/null <<EOF
-<html>
-<title>
-<h1>HTML2TEXT Test</h1>
-</title>
-<body>
-<p>This is a test.</p>
-</body>
-</html>
-EOF
-	${W3M} -T text/html -cols 78 -dump html2text-test.xxxhtml > html2text-test.txt
-        if test $? != 0 || test ! -f html2text-test.txt || test ! -s html2text-test.txt
-        then
-                have_w3m=false
-		AC_MSG_RESULT(no (see http://www.w3m.org/ or http://w3m.sourceforge.net/ ...))
-		W3M=false
-		AC_SUBST(W3M)
-	else
-		AC_MSG_RESULT(yes)
-		AC_SUBST(W3M)
-        fi
-fi
-AM_CONDITIONAL(HAVE_W3M, $have_w3m)
-
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-packaging.m4 Deleted

@@ -1,81 +0,0 @@
-AC_DEFUN(GPKG_CHECK_RPM,
-
-AC_ARG_WITH(rpmbuild,
-AS_HELP_STRING(--with-rpmbuild=PATH,
-Program to use for building RPMs))
-
-AC_MSG_CHECKING(for rpmbuild or rpm)
-if test -x "${with_rpmbuild}"
-then
-    RPMBUILD="${with_rpmbuild}"
-    AC_MSG_RESULT(${RPMBUILD} (from parameter))
-else
-    AC_MSG_RESULT(using autodetection)
-    AC_CHECK_PROGS(RPMBUILD, rpmbuild rpm, false)
-    AC_MSG_CHECKING(for rpmbuild or rpm)
-    AC_MSG_RESULT(${RPMBUILD} (autodetected))
-fi
-AC_SUBST(RPMBUILD)
-AM_CONDITIONAL(ENABLE_RPM, test "$RPMBUILD" != "false")
-
-)
-
-AC_DEFUN(GPKG_CHECK_LINUX,
-
-	# effective_target has to be determined in advance
-	AC_REQUIRE(AC_NEED_BYTEORDER_H)
-
-	is_linux=false
-	case "$effective_target" in 
-		*linux*)
-			is_linux=true
-			;;
-	esac
-	AM_CONDITIONAL(HAVE_LINUX, "$is_linux")
-
-	# required for docdir
-	# FIXME: Implicit dependency
-	# AC_REQUIRE(GP_CHECK_DOC_DIR)
-
-	AC_ARG_WITH(hotplug-doc-dir,
-	AS_HELP_STRING(--with-hotplug-doc-dir=PATH,
-	Where to install hotplug scripts as docs default=autodetect))
-
-	if "$is_linux"; then
-		AC_MSG_CHECKING(for hotplug doc dir)
-		if test "x${with_hotplug_doc_dir}" != "x"
-		then # given as parameter
-		    hotplugdocdir="${with_hotplug_doc_dir}"
-		    AC_MSG_RESULT(${hotplugdocdir} (from parameter))
-		else # start at docdir
-		    hotplugdocdir="${docdir}/linux-hotplug"
-		    AC_MSG_RESULT(${hotplugdocdir} (default))
-		fi
-	else
-		hotplugdocdir=""
-	fi
-
-	AC_ARG_WITH(hotplug-usermap-dir,
-	AS_HELP_STRING(--with-hotplug-usermap-dir=PATH,
-	Where to install hotplug scripts as docs default=autodetect))
-
-	if "$is_linux"; then
-		AC_MSG_CHECKING(for hotplug usermap dir)
-		if test "x${with_hotplug_usermap_dir}" != "x"
-		then # given as parameter
-		    hotplugusermapdir="${with_hotplug_usermap_dir}"
-		    AC_MSG_RESULT(${hotplugusermapdir} (from parameter))
-		else # start at docdir
-		    hotplugusermapdir="${docdir}/linux-hotplug"
-		    AC_MSG_RESULT(${hotplugusermapdir} (default))
-		fi
-	else
-		hotplugusermapdir=""
-	fi
-
-	# Let us hope that automake does not create "" directories
-	# on non-Linux systems now.
-	AC_SUBST(hotplugdocdir)
-	AC_SUBST(hotplugusermapdir)
-)
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-references.m4 Deleted

@@ -1,48 +0,0 @@
-dnl
-dnl Define external references
-dnl
-dnl Define once, use many times. 
-dnl No more URLs and Mail addresses in translated strings and stuff.
-dnl
-
-AC_DEFUN(GP_REF,
-AC_SUBST($1,"$2")
-AC_DEFINE_UNQUOTED($1,"$2",$3)
-)
-
-AC_DEFUN(GP_REFERENCES,
-
-
-GP_REF(	URL_GPHOTO_HOME, 
-	http://www.gphoto.org/, 
-	gphoto project home page)dnl
-
-GP_REF(	URL_GPHOTO_PROJECT,
-	https://github.com/gphoto,
-	gphoto github project page)
-
-GP_REF(	URL_DIGICAM_LIST,
-	http://www.teaser.fr/~hfiguiere/linux/digicam.html,
-	camera list with support status)
-
-GP_REF(	URL_JPHOTO_HOME,
-	http://jphoto.sourceforge.net/,
-	jphoto home page)
-
-GP_REF(	URL_USB_MASSSTORAGE,
-	http://www.linux-usb.org/USB-guide/x498.html,
- 	information about using USB mass storage)
-
-GP_REF(	MAIL_GPHOTO_DEVEL,
-	<gphoto-devel@lists.sourceforge.net>,
-	gphoto development mailing list)
-
-GP_REF(	MAIL_GPHOTO_USER,
-	<gphoto-user@lists.sourceforge.net>,
-	gphoto user mailing list)
-
-GP_REF(	MAIL_GPHOTO_TRANSLATION,
-	<gphoto-translation@lists.sourceforge.net>,
-	gphoto translation mailing list)
-
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-stdint.m4 Deleted

@@ -1,732 +0,0 @@
-dnl AC_NEED_STDINT_H ( HEADER-TO-GENERATE )
-dnl Originally written 2001 by Dan Fandrich <dan@coneharvesters.com>
-dnl My contribution is hereby placed into the public domain.
-dnl No warranty is expressed or implied.
-dnl
-dnl Look for a header file that defines size-specific integer types like the
-dnl ones recommended to be in stdint.h in the C99 standard (e.g. uint32_t).
-dnl This is a dumbed-down version of the macro of the same name in the file
-dnl ac_need_stdint_h.m4 which is part of the ac-archive, available at
-dnl <URL:http://ac-archive.sourceforge.net/> (also, another macro
-dnl AC_CREATE_STDINT_H by the same author).  This version is not as smart,
-dnl but works on older autoconf versions and has a different license.
-
-dnl AX_CHECK_DEFINED_TYPE ( TYPE, FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
-dnl This is similar to _AC_CHECK_TYPE_NEW (a.k.a. new syntax version of
-dnl AC_CHECK_TYPE) in autoconf 2.50 but works on older versions
-AC_DEFUN(AX_CHECK_DEFINED_TYPE,
-AC_MSG_CHECKING(for $1 in $2)
-AC_EGREP_CPP(changequote(<<,>>)dnl
-<<(^|^a-zA-Z_0-9)$1^a-zA-Z_0-9>>dnl
-changequote(,), #include <$2>,
-ac_cv_type_$1=yes, ac_cv_type_$1=no)dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = yes; then
-  $3
-else
-  $4
-fi
-)
-
-dnl Look for a header file that defines size-specific integer types
-AC_DEFUN(AX_NEED_STDINT_H,
-
-ac_dir=`AS_DIRNAME("$1")`
-if test "$ac_dir" != "$1" && test "$ac_dir" != .; then
-  # The file is in a subdirectory.
-  test ! -d "$ac_dir" && AS_MKDIR_P("$ac_dir")
-fi
-
-AX_CHECK_DEFINED_TYPE(uint8_t,
-stdint.h,
-
-cat > "$1" <<EOF
-/* This file is generated automatically by configure */
-#include <stdint.h>
-EOF,
-AX_CHECK_DEFINED_TYPE(uint8_t,
-inttypes.h,
-cat > "$1" <<EOF
-/* This file is generated automatically by configure */
-#include <inttypes.h>
-EOF,
-AX_CHECK_DEFINED_TYPE(uint8_t,
-sys/types.h,
-cat > "$1" <<EOF
-/* This file is generated automatically by configure */
-#include <sys/types.h>
-EOF,
-AX_CHECK_DEFINED_TYPE(u_int8_t,
-sys/types.h,
-cat > "$1" <<EOF
-/* This file is generated automatically by configure */
-#ifndef __STDINT_H
-#define __STDINT_H
-#include <sys/types.h>
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-EOF
-
-AX_CHECK_DEFINED_TYPE(u_int64_t,
-sys/types.h,
-cat >> "$1" <<EOF
-typedef u_int64_t uint64_t;
-#endif /*!__STDINT_H*/
-EOF,
-cat >> "$1" <<EOF
-/* 64-bit types are not available on this system */
-/* typedef u_int64_t uint64_t; */
-#endif /*!__STDINT_H*/
-EOF)
-
-,
-AC_MSG_WARN(I can't find size-specific integer definitions on this system)
-if test -e "$1" ; then
-	rm -f "$1"
-fi
-))))dnl
-)
-
-AC_DEFUN(AX_CHECK_DATA_MODEL,
-   AC_CHECK_SIZEOF(char)
-   AC_CHECK_SIZEOF(short)
-   AC_CHECK_SIZEOF(int)
-   AC_CHECK_SIZEOF(long)
-   AC_CHECK_SIZEOF(void*)
-   ac_cv_char_data_model=""
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model=""
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
-   AC_MSG_CHECKING(data model)
-   case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
-    122/242)     ac_cv_data_model="IP16"  ; n="standard 16bit machine" ;;
-    122/244)     ac_cv_data_model="LP32"  ; n="standard 32bit machine" ;;
-    122/*)       ac_cv_data_model="i16"   ; n="unusual int16 model" ;;
-    124/444)     ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
-    124/488)     ac_cv_data_model="LP64"  ; n="standard 64bit unixish" ;;
-    124/448)     ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
-    124/*)       ac_cv_data_model="i32"   ; n="unusual int32 model" ;;
-    128/888)     ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
-    128/*)       ac_cv_data_model="i64"   ; n="unusual int64 model" ;;
-    222/*2)      ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
-    333/*3)      ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
-    444/*4)      ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
-    666/*6)      ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
-    888/*8)      ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
-    222/*|333/*|444/*|666/*|888/*) :
-                 ac_cv_data_model="iDSP"  ; n="unusual dsptype" ;;
-     *)          ac_cv_data_model="none"  ; n="very unusual model" ;;
-   esac
-   AC_MSG_RESULT($ac_cv_data_model ($ac_cv_long_data_model, $n))
-)
-
-dnl AX_CHECK_HEADER_STDINT_X(HEADERLIST,ACTION-IF)
-AC_DEFUN(AX_CHECK_HEADER_STDINT_X,
-AC_CACHE_CHECK(for stdint uintptr_t, ac_cv_header_stdint_x,
- ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
-  AC_MSG_RESULT((..))
-  for i in m4_ifval($1,$1,stdint.h inttypes.h sys/inttypes.h) ; do
-   unset ac_cv_type_uintptr_t
-   unset ac_cv_type_uint64_t
-   AC_CHECK_TYPE(uintptr_t,ac_cv_header_stdint_x=$i,continue,#include <$i>)
-   AC_CHECK_TYPE(uint64_t,and64="/uint64_t",and64="",#include<$i>)
-   m4_ifvaln($1,$1) break
-  done
-  AC_MSG_CHECKING(for stdint uintptr_t)
- )
-)
-
-AC_DEFUN(AX_CHECK_HEADER_STDINT_O,
-AC_CACHE_CHECK(for stdint uint32_t, ac_cv_header_stdint_o,
- ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
-  AC_MSG_RESULT((..))
-  for i in m4_ifval($1,$1,inttypes.h sys/inttypes.h stdint.h) ; do
-   unset ac_cv_type_uint32_t
-   unset ac_cv_type_uint64_t
-   AC_CHECK_TYPE(uint32_t,ac_cv_header_stdint_o=$i,continue,#include <$i>)
-   AC_CHECK_TYPE(uint64_t,and64="/uint64_t",and64="",#include<$i>)
-   m4_ifvaln($1,$1) break
-   break;
-  done
-  AC_MSG_CHECKING(for stdint uint32_t)
- )
-)
-
-AC_DEFUN(AX_CHECK_HEADER_STDINT_U,
-AC_CACHE_CHECK(for stdint u_int32_t, ac_cv_header_stdint_u,
- ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
-  AC_MSG_RESULT((..))
-  for i in m4_ifval($1,$1,sys/types.h inttypes.h sys/inttypes.h) ; do
-   unset ac_cv_type_u_int32_t
-   unset ac_cv_type_u_int64_t
-   AC_CHECK_TYPE(u_int32_t,ac_cv_header_stdint_u=$i,continue,#include <$i>)
-   AC_CHECK_TYPE(u_int64_t,and64="/u_int64_t",and64="",#include<$i>)
-   m4_ifvaln($1,$1) break
-   break;
-  done
-  AC_MSG_CHECKING(for stdint u_int32_t)
- )
-)
-
-AC_DEFUN(AX_CREATE_STDINT_H,
-# ------ AX CREATE STDINT H -------------------------------------
-AC_MSG_CHECKING(for stdint types)
-ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)`
-# try to shortcircuit - if the default include path of the compiler
-# can find a "stdint.h" header then we assume that all compilers can.
-AC_CACHE_VAL(ac_cv_header_stdint_t,
-old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
-old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
-old_CFLAGS="$CFLAGS"     ; CFLAGS=""
-AC_TRY_COMPILE(#include <stdint.h>,int_least32_t v = 0;,
-ac_cv_stdint_result="(assuming C99 compatible system)"
- ac_cv_header_stdint_t="stdint.h"; ,
-ac_cv_header_stdint_t="")
-CXXFLAGS="$old_CXXFLAGS"
-CPPFLAGS="$old_CPPFLAGS"
-CFLAGS="$old_CFLAGS" )
-
-v="... $ac_cv_header_stdint_h"
-if test "$ac_stdint_h" = "stdint.h" ; then
- AC_MSG_RESULT((are you sure you want them in ./stdint.h?))
-elif test "$ac_stdint_h" = "inttypes.h" ; then
- AC_MSG_RESULT((are you sure you want them in ./inttypes.h?))
-elif test "_$ac_cv_header_stdint_t" = "_" ; then
- AC_MSG_RESULT((putting them into $ac_stdint_h)$v)
-else
- ac_cv_header_stdint="$ac_cv_header_stdint_t"
- AC_MSG_RESULT($ac_cv_header_stdint (shortcircuit))
-fi
-
-if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
-
-dnl .....intro message done, now do a few system checks.....
-dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type,
-dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW
-dnl instead that is triggered with 3 or more arguments (see types.m4)
-
-inttype_headers=`echo $2 | sed -e 's/,/ /g'`
-
-ac_cv_stdint_result="(no helpful system typedefs seen)"
-AX_CHECK_HEADER_STDINT_X(dnl
-   stdint.h inttypes.h sys/inttypes.h $inttype_headers,
-   ac_cv_stdint_result="(seen uintptr_t$and64 in $i)")
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-AX_CHECK_HEADER_STDINT_O(dnl,
-   inttypes.h sys/inttypes.h stdint.h $inttype_headers,
-   ac_cv_stdint_result="(seen uint32_t$and64 in $i)")
-fi
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-if test "_$ac_cv_header_stdint_o" = "_" ; then
-AX_CHECK_HEADER_STDINT_U(dnl,
-   sys/types.h inttypes.h sys/inttypes.h $inttype_headers,
-   ac_cv_stdint_result="(seen u_int32_t$and64 in $i)")
-fi fi
-
-dnl if there was no good C99 header file, do some typedef checks...
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-   AC_MSG_CHECKING(for stdint datatype model)
-   AC_MSG_RESULT((..))
-   AX_CHECK_DATA_MODEL
-fi
-
-if test "_$ac_cv_header_stdint_x" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_x"
-elif  test "_$ac_cv_header_stdint_o" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_o"
-elif  test "_$ac_cv_header_stdint_u" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_u"
-else
-   ac_cv_header_stdint="stddef.h"
-fi
-
-AC_MSG_CHECKING(for extra inttypes in chosen header)
-AC_MSG_RESULT(($ac_cv_header_stdint))
-dnl see if int_least and int_fast types are present in _this_ header.
-unset ac_cv_type_int_least32_t
-unset ac_cv_type_int_fast32_t
-AC_CHECK_TYPE(int_least32_t,,,#include <$ac_cv_header_stdint>)
-AC_CHECK_TYPE(int_fast32_t,,,#include<$ac_cv_header_stdint>)
-AC_CHECK_TYPE(intmax_t,,,#include <$ac_cv_header_stdint>)
-
-fi # shortcircut to system "stdint.h"
-# ------------------ PREPARE VARIABLES ------------------------------
-if test "$GCC" = "yes" ; then
-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-else
-ac_cv_stdint_message="using $CC"
-fi
-
-AC_MSG_RESULT(make use of $ac_cv_header_stdint in $ac_stdint_h dnl
-$ac_cv_stdint_result)
-
-dnl -----------------------------------------------------------------
-# ----------------- DONE inttypes.h checks START header -------------
-AC_CONFIG_COMMANDS($ac_stdint_h,
-AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h)
-ac_stdint=$tmp/_stdint.h
-
-echo "#ifndef" $_ac_stdint_h >$ac_stdint
-echo "#define" $_ac_stdint_h "1" >>$ac_stdint
-echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
-echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_t" != "_" ; then
-echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
-echo "#include <stdint.h>" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-else
-
-cat >>$ac_stdint <<STDINT_EOF
-
-/* ................... shortcircuit part ........................... */
-
-#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <stddef.h>
-
-/* .................... configured part ............................ */
-
-STDINT_EOF
-
-echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_x" != "_" ; then
-  ac_header="$ac_cv_header_stdint_x"
-  echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
-fi
-
-echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
-if  test "_$ac_cv_header_stdint_o" != "_" ; then
-  ac_header="$ac_cv_header_stdint_o"
-  echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
-fi
-
-echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
-if  test "_$ac_cv_header_stdint_u" != "_" ; then
-  ac_header="$ac_cv_header_stdint_u"
-  echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
-fi
-
-echo "" >>$ac_stdint
-
-if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
-  echo "#include <$ac_header>" >>$ac_stdint
-  echo "" >>$ac_stdint
-fi fi
-
-echo "/* which 64bit typedef has been found */" >>$ac_stdint
-if test "$ac_cv_type_uint64_t" = "yes" ; then
-echo "#define   _STDINT_HAVE_UINT64_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
-fi
-if test "$ac_cv_type_u_int64_t" = "yes" ; then
-echo "#define   _STDINT_HAVE_U_INT64_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* which type model has been detected */" >>$ac_stdint
-if test "_$ac_cv_char_data_model" != "_" ; then
-echo "#define   _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint
-echo "#define   _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint
-else
-echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
-echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* whether int_least types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_least32_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INT_LEAST32_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
-fi
-echo "/* whether int_fast types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_fast32_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
-fi
-echo "/* whether intmax_t type was detected */" >>$ac_stdint
-if test "$ac_cv_type_intmax_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-  cat >>$ac_stdint <<STDINT_EOF
-/* .................... detections part ............................ */
-
-/* whether we need to define bitspecific types from compiler base types */
-#ifndef _STDINT_HEADER_INTPTR
-#ifndef _STDINT_HEADER_UINT32
-#ifndef _STDINT_HEADER_U_INT32
-#define _STDINT_NEED_INT_MODEL_T
-#else
-#define _STDINT_HAVE_U_INT_TYPES
-#endif
-#endif
-#endif
-
-#ifdef _STDINT_HAVE_U_INT_TYPES
-#undef _STDINT_NEED_INT_MODEL_T
-#endif
-
-#ifdef  _STDINT_CHAR_MODEL
-#if     _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
-#ifndef _STDINT_BYTE_MODEL
-#define _STDINT_BYTE_MODEL 12
-#endif
-#endif
-#endif
-
-#ifndef _STDINT_HAVE_INT_LEAST32_T
-#define _STDINT_NEED_INT_LEAST_T
-#endif
-
-#ifndef _STDINT_HAVE_INT_FAST32_T
-#define _STDINT_NEED_INT_FAST_T
-#endif
-
-#ifndef _STDINT_HEADER_INTPTR
-#define _STDINT_NEED_INTPTR_T
-#ifndef _STDINT_HAVE_INTMAX_T
-#define _STDINT_NEED_INTMAX_T
-#endif
-#endif
-
-
-/* .................... definition part ............................ */
-
-/* some system headers have good uint64_t */
-#ifndef _HAVE_UINT64_T
-#if     defined _STDINT_HAVE_UINT64_T  || defined HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#elif   defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
-#define _HAVE_UINT64_T
-typedef u_int64_t uint64_t;
-#endif
-#endif
-
-#ifndef _HAVE_UINT64_T
-/* .. here are some common heuristics using compiler runtime specifics */
-#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-
-#elif !defined __STRICT_ANSI__
-#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-#define _HAVE_UINT64_T
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
-/* note: all ELF-systems seem to have loff-support which needs 64-bit */
-#if !defined _NO_LONGLONG
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-#endif
-
-#elif defined __alpha || (defined __mips && defined _ABIN32)
-#if !defined _NO_LONGLONG
-typedef long int64_t;
-typedef unsigned long uint64_t;
-#endif
-  /* compiler/cpu type to define int64_t */
-#endif
-#endif
-#endif
-
-#if defined _STDINT_HAVE_U_INT_TYPES
-/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-
-/* glibc compatibility */
-#ifndef __int8_t_defined
-#define __int8_t_defined
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INT_MODEL_T
-/* we must guess all the basic types. Apart from byte-adressable system, */
-/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
-/* (btw, those nibble-addressable systems are way off, or so we assume) */
-
-dnl   /* have a look at "64bit and data size neutrality" at */
-dnl   /* http://unix.org/version2/whatsnew/login_64bit.html */
-dnl   /* (the shorthand "ILP" types always have a "P" part) */
-
-#if defined _STDINT_BYTE_MODEL
-#if _STDINT_LONG_MODEL+0 == 242
-/* 2:4:2 =  IP16 = a normal 16-bit system                */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned long   uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          long    int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
-/* 2:4:4 =  LP32 = a 32-bit system derived from a 16-bit */
-/* 4:4:4 = ILP32 = a normal 32-bit system                */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
-/* 4:8:4 =  IP32 = a 32-bit system prepared for 64-bit    */
-/* 4:8:8 =  LP64 = a normal 64-bit system                 */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-/* this system has a "long" of 64bit */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-typedef unsigned long   uint64_t;
-typedef          long    int64_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 448
-/*      LLP64   a 64-bit system derived from a 32-bit system */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-/* assuming the system has a "long long" */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef unsigned long long uint64_t;
-typedef          long long  int64_t;
-#endif
-#else
-#define _STDINT_NO_INT32_T
-#endif
-#else
-#define _STDINT_NO_INT8_T
-#define _STDINT_NO_INT32_T
-#endif
-#endif
-
-/*
- * quote from SunOS-5.8 sys/inttypes.h:
- * Use at your own risk.  As of February 1996, the committee is squarely
- * behind the fixed sized types; the "least" and "fast" types are still being
- * discussed.  The probability that the "fast" types may be removed before
- * the standard is finalized is high enough that they are not currently
- * implemented.
- */
-
-#if defined _STDINT_NEED_INT_LEAST_T
-typedef  int8_t    int_least8_t;
-typedef  int16_t   int_least16_t;
-typedef  int32_t   int_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef  int64_t   int_least64_t;
-#endif
-
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t  uint_least64_t;
-#endif
-  /* least types */
-#endif
-
-#if defined _STDINT_NEED_INT_FAST_T
-typedef  int8_t    int_fast8_t;
-typedef  int       int_fast16_t;
-typedef  int32_t   int_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef  int64_t   int_fast64_t;
-#endif
-
-typedef uint8_t   uint_fast8_t;
-typedef unsigned  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t  uint_fast64_t;
-#endif
-  /* fast types */
-#endif
-
-#ifdef _STDINT_NEED_INTMAX_T
-#ifdef _HAVE_UINT64_T
-typedef  int64_t       intmax_t;
-typedef uint64_t      uintmax_t;
-#else
-typedef          long  intmax_t;
-typedef unsigned long uintmax_t;
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INTPTR_T
-#ifndef __intptr_t_defined
-#define __intptr_t_defined
-/* we encourage using "long" to store pointer values, never use "int" ! */
-#if   _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
-typedef  unsinged int   uintptr_t;
-typedef           int    intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
-typedef  unsigned long  uintptr_t;
-typedef           long   intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
-typedef        uint64_t uintptr_t;
-typedef         int64_t  intptr_t;
-#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
-typedef  unsigned long  uintptr_t;
-typedef           long   intptr_t;
-#endif
-#endif
-#endif
-
-/* The ISO C99 standard specifies that in C++ implementations these
-   should only be defined if explicitly requested.  */
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
-#ifndef UINT32_C
-
-/* Signed.  */
-# define INT8_C(c)      c
-# define INT16_C(c)     c
-# define INT32_C(c)     c
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define INT64_C(c)    c ## L
-# else
-#  define INT64_C(c)    c ## LL
-# endif
-
-/* Unsigned.  */
-# define UINT8_C(c)     c ## U
-# define UINT16_C(c)    c ## U
-# define UINT32_C(c)    c ## U
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define UINT64_C(c)   c ## UL
-# else
-#  define UINT64_C(c)   c ## ULL
-# endif
-
-/* Maximal type.  */
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define INTMAX_C(c)   c ## L
-#  define UINTMAX_C(c)  c ## UL
-# else
-#  define INTMAX_C(c)   c ## LL
-#  define UINTMAX_C(c)  c ## ULL
-# endif
-
-  /* literalnumbers */
-#endif
-#endif
-
-/* These limits are merily those of a two complement byte-oriented system */
-
-/* Minimum of signed integral types.  */
-# define INT8_MIN               (-128)
-# define INT16_MIN              (-32767-1)
-# define INT32_MIN              (-2147483647-1)
-# define INT64_MIN              (-__INT64_C(9223372036854775807)-1)
-/* Maximum of signed integral types.  */
-# define INT8_MAX               (127)
-# define INT16_MAX              (32767)
-# define INT32_MAX              (2147483647)
-# define INT64_MAX              (__INT64_C(9223372036854775807))
-
-/* Maximum of unsigned integral types.  */
-# define UINT8_MAX              (255)
-# define UINT16_MAX             (65535)
-# define UINT32_MAX             (4294967295U)
-# define UINT64_MAX             (__UINT64_C(18446744073709551615))
-
-/* Minimum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MIN         INT8_MIN
-# define INT_LEAST16_MIN        INT16_MIN
-# define INT_LEAST32_MIN        INT32_MIN
-# define INT_LEAST64_MIN        INT64_MIN
-/* Maximum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MAX         INT8_MAX
-# define INT_LEAST16_MAX        INT16_MAX
-# define INT_LEAST32_MAX        INT32_MAX
-# define INT_LEAST64_MAX        INT64_MAX
-
-/* Maximum of unsigned integral types having a minimum size.  */
-# define UINT_LEAST8_MAX        UINT8_MAX
-# define UINT_LEAST16_MAX       UINT16_MAX
-# define UINT_LEAST32_MAX       UINT32_MAX
-# define UINT_LEAST64_MAX       UINT64_MAX
-
-  /* shortcircuit*/
-#endif
-  /* once */
-#endif
-#endif
-STDINT_EOF
-fi
-    if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
-      AC_MSG_NOTICE($ac_stdint_h is unchanged)
-    else
-      ac_dir=`AS_DIRNAME("$ac_stdint_h")`
-      AS_MKDIR_P("$ac_dir")
-      rm -f $ac_stdint_h
-      mv $ac_stdint $ac_stdint_h
-    fi
-,# variables for create stdint.h replacement
-PACKAGE="$PACKAGE"
-VERSION="$VERSION"
-ac_stdint_h="$ac_stdint_h"
-_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h)
-ac_cv_stdint_message="$ac_cv_stdint_message"
-ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
-ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
-ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
-ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
-ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-ac_cv_char_data_model="$ac_cv_char_data_model"
-ac_cv_long_data_model="$ac_cv_long_data_model"
-ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
-)
-)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-subpackage.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-udev.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gp-va-copy.m4 Deleted

@@ -1,57 +0,0 @@
-dnl @synopsis GP_VA_COPY
-dnl
-dnl Checks whether one of these compiles and links:
-dnl 1. va_copy()
-dnl 2. __va_copy()
-dnl 3. fallback
-dnl
-dnl In case of 1 or 2, AC_DEFINE(HAVE_VA_COPY).
-dnl In case of 2, AC_DEFINE(va_copy,__va_copy)
-dnl
-dnl In code, use it like this
-dnl #ifdef HAVE_VA_COPY
-dnl    ... code with va_copy ...
-dnl #else
-dnl    ... code without va_copy or with error ...
-dnl #endif
-dnl
-AC_DEFUN(GP_VA_COPY,dnl
-dnl
-AC_CHECK_HEADER(stdarg.h,,
-	AC_MSG_ERROR(
-Building $PACKAGE_NAME requires <stdarg.h>.
-)
-)
-dnl
-have_va_copy=no
-AC_TRY_LINK(
-	#include <stdarg.h>
-,
-	va_list a,b;
-	va_copy(a,b);
-,
-	have_va_copy="va_copy"
-,
-	AC_TRY_LINK(
-		#include <stdarg.h>
-	,
-		va_list a,b;
-		__va_copy(a,b);
-	,
-		have_va_copy="__va_copy"
-		AC_DEFINE(va_copy,__va_copy,__va_copy() was the originally proposed name)
-	)
-)
-dnl
-AC_MSG_CHECKING(for va_copy() or replacement)
-AC_MSG_RESULT($have_va_copy)
-dnl
-if test "x$have_va_copy" != "xno"; then
-	AC_DEFINE(HAVE_VA_COPY,1,Whether we have the va_copy() function)
-fi
-)dnl
-dnl
-dnl
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto-m4/gphoto-m4-sync Deleted

@@ -1,551 +0,0 @@
-#!/usr/bin/env python3
-#
-# Usage: gphoto-m4-sync --diff <dir>...
-#        gphoto-m4-sync --help
-#
-# The gphoto-m4-sync script helps with keeping track of which files in
-# which gphoto-m4 tree copy differ from the original gphoto-m4 tree.
-#
-# In normal operation, gphoto-m4-sync will search for gphoto-m4
-# directories anywhere in the directory trees given on the command
-# line and compare the gphoto-m4 tree from which gphoto-m4-sync was
-# started to those other trees.
-#
-# When not given a --diff options, gphoto-m4-sync will print a human
-# readable report on which files are different in which gphoto-m4
-# tree.
-#
-# Options:
-#
-#   --diff   Print a list of 'diff' command lines to compare
-#            the different files instead. Pipe into something like
-#            "| sh | less" to execute.
-#
-#   --help   Print this help message.
-#
-# Exit code:
-#
-#   0    when no  differences have been found among the gphoto-m4 trees
-#   1    when any differences have been found among the gphoto-m4 trees
-#   2    any other error
-
-
-########################################################################
-
-
-import hashlib
-import os
-import sys
-
-
-########################################################################
-
-
-class File(object):
-
-    def __init__(self, tree, fname):
-        self.tree = tree
-        self.fname = fname
-        self.fpath = os.path.join(tree.top, fname)
-
-        self.statinfo = os.stat(self.fpath)
-
-        m = hashlib.sha1()
-        m.update(open(self.fpath, 'rb').read())
-        self.digest = m.hexdigest()
-
-    def __repr__(self):
-        return 'File(%s,%s)' % (repr(self.fname), repr(self.digest))
-
-    def __str__(self):
-        return '%s %s' % (self.digest, self.fname)
-
-
-########################################################################
-
-
-class BaseTree(object):
-
-    def __init__(self, top):
-        self.top = os.path.abspath(top)
-        self._files = self.__scan_files()
-
-    def __repr__(self):
-        return '%s(%s)%s' % (self.__class__.__name__, self.top, self._files)
-
-    def __iter__(self):
-        return sorted(self._files).__iter__()
-
-    def __getitem__(self, key):
-        return self._fileskey
-
-    def __scan_files(self):
-        files = {}
-        for dirpath, dirnames, filenames in os.walk(self.top, topdown=True):
-            try: # do not descend into these directories
-                dirnames.remove('.git')
-            except ValueError:
-                pass
-
-            for fname in filenames:
-                # Ignore a bunch of files
-                if fname-1 == '~':
-                    continue
-                if fname.startswith('.git'):
-                    continue
-                if fname in 'Makefile.in', 'Makefile':
-                    continue
-
-                abs_fname = os.path.join(dirpath, fname)
-                rel_fname = os.path.relpath(abs_fname, start=self.top)
-
-                filesrel_fname = File(self, rel_fname)
-        return files
-
-
-########################################################################
-
-
-class GitTree(BaseTree):
-
-    def __init__(self, top):
-        path = os.path.join(top, '.git')
-        if not os.path.exists(path):
-            raise AssertionError("File or directory does not exist: %s" %
-                                 repr(path))
-        super(GitTree, self).__init__(top)
-
-
-########################################################################
-
-
-class NotGitTree(BaseTree):
-
-    def __init__(self, top):
-        path = os.path.join(top, '.git')
-        if os.path.exists(path):
-            raise AssertionError("File or directory does exist: %s" %
-                                 repr(path))
-        super(NotGitTree, self).__init__(top)
-
-
-########################################################################
-
-
-def scan_tree(top):
-    for dirpath, dirnames, filenames in os.walk(top):
-        if os.path.basename(dirpath) == 'gphoto-m4':
-            if 'gp-camlibs.m4' not in filenames:
-                continue
-            yield (dirpath, NotGitTree(dirpath))
-
-
-########################################################################
-
-
-def print_help():
-    skip_line = True
-    skip_lines = '#', '# '
-    for line in open(__file__, 'r'):
-        if line-1 == '\n':
-            line = line:-1
-
-        if line.startswith('#!'):
-            continue
-        elif skip_line and (line in skip_lines):
-            continue
-        elif skip_line and (line not in skip_lines):
-            skip_line = False
-        elif line == '':
-            break
-
-        if not skip_line:
-            print(line2:)
-
-
-########################################################################
-
-
-class ResultTable(object):
-
-    def __init__(self):
-        self.lines = {}
-        self.files_with_differences = 0
-        self.differences = 0
-
-    def __setitem__(self, key, value):
-        assert(key not in self.lines)
-        self.lineskey = value
-        if value.file_versions > 0:
-            self.files_with_differences += 1
-        self.differences += value.file_versions
-
-    def __getitem__(self, key):
-        assert(self.files_with_differences != None)
-        return self.lineskey
-
-    def items(self):
-        for k in sorted(self.lines.keys()):
-            v = self.linesk
-            yield k,v
-
-    def close(self):
-        pass
-
-
-########################################################################
-
-
-class ResultLine(object):
-
-    def __init__(self, fname):
-        self.fname = fname
-
-        self.__digest_map = {}
-        self.__digests = {}
-        self.__digest_list = None
-
-        self.__flags = {}
-
-        self.__fpaths = {}
-
-    def set_digest(self, index, digest):
-        self.__digest_mapindex = digest
-        self.__digestsdigest = True
-
-    def close(self, file_versions):
-        self.file_versions = file_versions
-        self.__digest_list = sorted(self.__digests.keys())
-        assert(len(self.__digest_list) > 0)
-        if file_versions == 0:
-            # All files are equal, so we do not need different characters
-            # to distinguish different digest values - a space will do as
-            # well.
-            self.__digest_map = {}
-
-    def get_digest(self, index):
-        if self.__digest_list == None:
-            raise RuntimeError("You need to call ResultLine.close() before Result_Line.get_digest()")
-        if index in self.__digest_map:
-            dig = self.__digest_mapindex
-            idx = self.__digest_list.index(dig)
-            return 'abcdefghijklmnopqrstuvwxyz'idx
-        else:
-            return ' '
-
-    def set_flag(self, index, flag, fpath):
-        self.__flagsindex = flag
-        self.__fpathsindex = fpath
-
-    def get_flag(self, index):
-        return self.__flagsindex
-
-    def get_fpath(self, index):
-        return self.__fpathsindex
-
-
-########################################################################
-
-
-def cmd_print_report(result_table, all_files, treelist, trees):
-    # Enumerate list of trees
-    print("Trees (0 is the original tree):")
-    for i, tree in enumerate(treelist):
-        print("  %d. %s" % (i,tree))
-    print()
-
-    # Determine maximum length of file name
-    fn_maxlen = 0
-    for fn in all_files:
-        if len(fn) > fn_maxlen:
-            fn_maxlen = len(fn)
-
-    fmt = "    %%-%ds " % fn_maxlen
-    print("File table:")
-
-    # print table head
-    print(fmt % '', end='')
-    print((' {0:-^%d}' % (3*len(treelist)-1)).format('Tree'))
-    print(fmt % 'file name', end='')
-    for i, tree in enumerate(treelist):
-        print(' %2d' % i, end='')
-    print('  file diffs')
-    sep_line = ('    ' +
-                '-' * (fn_maxlen + 1 + 3*len(treelist) + 2 + len('file diffs')))
-    print(sep_line)
-
-    # print table body
-    for fname in sorted(all_files):
-        result_line = result_tablefname
-        print(fmt % fname, end='')
-        print(" %s%s" % (result_line.get_flag(0),
-                         result_line.get_digest(0)), end='')
-
-        for tree_idx, tree_top in enumerate(sorted(trees.keys()), start=1):
-            tree = treestree_top
-            print(" %s%s" % (result_line.get_flag(tree_idx),
-                             result_line.get_digest(tree_idx)), end='')
-
-        if result_line.file_versions > 0:
-            print('   %3d' % result_line.file_versions)
-        else:
-            print('  ok')
-    print(sep_line)
-    print()
-
-    print("Legend:")
-    legend = 
-        ('N', 'new file'),
-        ('O', 'original file'),
-        ('/', 'no such file'),
-        ('=', 'same content as the original file'),
-        ('<', 'file with different content is younger than original file'),
-        ('>', 'file with different content is older than original file'),
-    
-    for ch, descr in legend:
-        print("    %s  %s" % (ch, descr))
-    print("    ")
-    print("    Small letters identify file contents: Same letter means same content.")
-    print()
-
-    # Determine exit code
-    exit_code = 0
-    if result_table.differences > 0:
-        exit_code = 1
-
-    # Print summary
-    print("Summary:")
-    if result_table.differences > 0:
-        print("  About %d difference(s) found in %d file(s)." %
-              (result_table.differences, result_table.files_with_differences))
-        print("  ")
-        print("  Diff commands for comparing differing files can be obtained with the")
-        print("  '--diff' option.")
-    else:
-        print("  All gphoto-m4 trees are equal.")
-
-    # Finally exit.
-    sys.exit(exit_code)
-
-
-########################################################################
-
-
-def print_diff_commands(diff_commands):
-    print("#!/bin/sh")
-    print("#")
-    print("# This file has been autogenerated by %s" % __file__)
-    print("#")
-    print("# List of diff commands.  You can pipe these into")
-    print("#     | sh | colordiff | less -r '+/comparing '")
-    print("# or")
-    print("#     | sh | less '+/^comparing '")
-    print("# or")
-    print("#     | less")
-    for fname, orig_dig, other_dig, orig_fpath, other_fpath in diff_commands:
-        if orig_fpath:
-            orig_label = "%s (digest '%s')" % (orig_fpath, orig_dig)
-        else:
-            orig_fpath = '/dev/null'
-            orig_label = '(no such file)'
-
-        if other_dig:
-            other_label = "%s (digest '%s')" % (other_fpath, other_dig)
-        else:
-            other_label = other_fpath
-
-        print()
-        print("""echo 'comparing fname %s'""" % fname)
-        print("""diff -u --label "%s" %s --label "%s" %s"""
-              % (orig_label, orig_fpath,
-                 other_label, other_fpath))
-
-
-########################################################################
-
-
-def gphoto_m4_sync(dir_list, print_diffs):
-
-    # List all files in this clone of the `gphoto-m4` repository
-    orig_top = os.path.dirname(os.path.abspath(__file__))
-    orig_tree = GitTree(orig_top)
-
-    # For each `gphoto-m4` directory given on the command line, find
-    # all files.
-    trees = {}
-    for top in dir_list:
-        for dirpath, tree in scan_tree(os.path.abspath(top)):
-            treesdirpath = tree
-
-    if len(trees) == 0:
-        print("No gphoto-m4 trees found in directories given on command line.")
-        sys.exit(2)
-
-
-    # Make a list of all files within all `gphoto-m4` trees
-    all_files = {}
-    for i in orig_tree:
-        all_filesi = True
-    for tree in trees.values():
-        for i in tree:
-            all_filesi = True
-    all_files = sorted(all_files.keys())
-
-    # calculate table values
-    diff_params = 
-    result_table = ResultTable()
-    for fname in sorted(all_files):
-        result_line = ResultLine(fname)
-        file_diffs = 0
-        if fname in orig_tree:
-            result_line.set_flag(0, 'O', orig_treefname.fpath)
-            orig_dig = orig_treefname.digest
-            result_line.set_digest(0, orig_dig)
-        else:
-            result_line.set_flag(0, '/', None)
-            orig_dig = None
-
-        comp_digs = {}
-        for tree_idx, tree_top in enumerate(sorted(trees.keys()), start=1):
-            tree = treestree_top
-            if fname in tree:
-                dig = treefname.digest
-                flag = 'N'
-                if orig_dig == dig:
-                    flag = '='
-                elif orig_dig:
-                    if treefname.statinfo.st_mtime > orig_treefname.statinfo.st_mtime:
-                        flag = '>'
-                    elif treefname.statinfo.st_mtime < orig_treefname.statinfo.st_mtime:
-                        flag = '<'
-                result_line.set_digest(tree_idx, dig)
-            else:
-                flag = '/'
-
-            if fname in tree:
-                _fpath = treefname.fpath
-            else:
-                _fpath = None
-            result_line.set_flag(tree_idx, flag, _fpath)
-
-            if orig_dig:
-                if result_line.get_flag(tree_idx) != '=':
-                    file_diffs += 1
-            else:
-                if result_line.get_flag(tree_idx) != '/':
-                    file_diffs += 1
-
-        result_line.close(file_diffs)
-        del file_diffs
-        result_tablefname = result_line
-    result_table.close()
-
-    if False:
-        # Diff all files - (some comparisons are unnecessary)
-        for fname in sorted(all_files):
-            result_line = result_tablefname
-            orig_dig = result_line.get_digest(0)
-            orig_fpath = result_line.get_fpath(0)
-            for tree_idx, tree_top in enumerate(sorted(trees.keys()), start=1):
-                tree = treestree_top
-                if result_line.get_flag(0) == 'O':
-                    if result_line.get_flag(tree_idx) not in '=', '/':
-                        diff_params.append((fname,
-                                            orig_fpath, orig_dig,
-                                            result_line.get_fpath(tree_idx),
-                                            result_line.get_digest(tree_idx)))
-                else:
-                    if result_line.get_flag(tree_idx) != '/':
-                        diff_params.append((fname,
-                                            None, None,
-                                            result_line.get_fpath(tree_idx),
-                                            None))
-
-    # Print report
-    if not print_diffs:
-        cmd_print_report(result_table, all_files,
-                         orig_top + sorted(trees.keys()),
-                         trees)
-
-    # Print diffs
-    if print_diffs:
-        # print("# Calculate minimum set of diff commands:")
-        diff_commands = 
-        for fname, result_line in result_table.items():
-            line_flags = 
-            if result_line.file_versions > 0:
-                # print("#   -", fname)
-                all_trees = orig_tree +  treesk for k in sorted(trees.keys()) 
-                for idx_a in range(len(all_trees)):
-                    tree_a = all_treesidx_a
-                    dig_a = result_line.get_digest(idx_a)
-                    if dig_a == ' ':
-                        continue
-                    # print("# tree_a", tree_a)
-                    for idx_b in range(len(all_trees)):
-                        tree_b = all_treesidx_b
-                        dig_b = result_line.get_digest(idx_b)
-                        if dig_a == dig_b:
-                            continue
-                        if dig_b == ' ':
-                            continue
-                        # print("# tree_b", tree_b)
-                        flag     = (fname, dig_a, dig_b)
-                        rev_flag = (fname, dig_b, dig_a)
-                        if flag in line_flags:
-                            pass
-                        elif rev_flag in line_flags:
-                            pass
-                        else:
-                            line_flags.append(flag)
-                            cmd = (fname, dig_a, dig_b,
-                                   tree_afname.fpath, tree_bfname.fpath)
-                            diff_commands.append(cmd)
-                    break
-            del line_flags
-        # print("#")
-
-        print_diff_commands(diff_commands)
-        sys.exit(0)
-
-
-#######################################################################
-
-
-def main(args):
-    if (args == ):
-        print_help()
-        sys.exit(0)
-
-    arg_diff = False
-    for i, arg in enumerate(args):
-        if arg == '--':
-            i += 1
-            break
-        elif arg == '--help':
-            print_help()
-            sys.exit(0)
-        elif arg == '--diff':
-            arg_diff = True
-        elif arg.startswith('--'):
-            raise ValueError("Unhandled command line option '%s'" % arg)
-        else:
-            assert(arg:2 != '--')
-            break
-
-    dir_list = argsi:
-    if False:
-        print("Arguments:", dir_list)
-        print()
-
-    gphoto_m4_sync(dir_list, arg_diff)
-
-
-########################################################################
-
-
-if __name__ == '__main__':
-    main(sys.argv1:)
-
-
-########################################################################

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/Makefile.am Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/Makefile.in Deleted

@@ -1,526 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-
-# This is the compatibility Makefile.am - you are probably better off
-# just including the Makefile-files directly from your top-level
-# Makefile.am.
-
-# -*- Makefile -*-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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 = gphoto-m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-pkg-config.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile-files $(srcdir)/Makefile.in \
-	$(top_srcdir)/auto-aux/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-IOLIB_LIST = @IOLIB_LIST@
-IOLIB_LTLIST = @IOLIB_LTLIST@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGPHOTO2_PORT_AGE = @LIBGPHOTO2_PORT_AGE@
-LIBGPHOTO2_PORT_CURRENT = @LIBGPHOTO2_PORT_CURRENT@
-LIBGPHOTO2_PORT_CURRENT_MIN = @LIBGPHOTO2_PORT_CURRENT_MIN@
-LIBGPHOTO2_PORT_REVISION = @LIBGPHOTO2_PORT_REVISION@
-LIBGPHOTO2_PORT_VERSION_INFO = @LIBGPHOTO2_PORT_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBUSB1_CFLAGS = @LIBUSB1_CFLAGS@
-LIBUSB1_CONFIG_PROG = @LIBUSB1_CONFIG_PROG@
-LIBUSB1_LIBS = @LIBUSB1_LIBS@
-LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
-LIBUSB_CONFIG_PROG = @LIBUSB_CONFIG_PROG@
-LIBUSB_LIBS = @LIBUSB_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBUSB = @REQUIREMENTS_FOR_LIBUSB@
-REQUIREMENTS_FOR_LIBUSB1 = @REQUIREMENTS_FOR_LIBUSB1@
-SED = @SED@
-SERIAL_LIBS = @SERIAL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-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@
-iolibdir = @iolibdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-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@
-udevscriptdir = @udevscriptdir@
-EXTRA_DIST = README.md gphoto-m4-sync gp-byteorder.m4 gp-camlibs.m4 \
-	gp-check-doxygen.m4 gp-check-library.m4 gp-check-popt.m4 \
-	gp-check-shell-environment.m4 gp-config-msg.m4 \
-	gp-documentation.m4 gp-dynamic-libraries.m4 gp-gettext-hack.m4 \
-	gp-internal-docs.m4 gp-libltdl.m4 gp-manual-docbook-xml.m4 \
-	gp-manual-documentation.m4 gp-manual-fig2dev.m4 \
-	gp-manual-graphviz.m4 gp-manual-gtk-doc.m4 \
-	gp-manual-pstoimg.m4 gp-manual-w3m.m4 gp-packaging.m4 \
-	gp-pkg-config.m4 gp-references.m4 gp-stdint.m4 \
-	gp-subpackage.m4 gp-udev.m4 gp-va-copy.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile-files $(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 gphoto-m4/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu gphoto-m4/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;
-$(srcdir)/Makefile-files $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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:
-	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 clean-libtool 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 mostlyclean-libtool
-
-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 clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool 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 mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# 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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-dynamic-libraries.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-pkg-config.m4 Deleted

@@ -1,42 +0,0 @@
-dnl @synopsis GP_PKG_CONFIG
-dnl
-dnl If you want to set the PKG_CONFIG_PATH, best do so before
-dnl calling GP_PKG_CONFIG
-AC_DEFUN(GP_PKG_CONFIG,
-#
-# GP_PKG_CONFIG
-#
-AC_ARG_VAR(PKG_CONFIG,pkg-config package config utility)
-export PKG_CONFIG
-AC_ARG_VAR(PKG_CONFIG_PATH,directory where pkg-config looks for *.pc files)
-export PKG_CONFIG_PATH
-
-AC_MSG_CHECKING(PKG_CONFIG_PATH)
-if test "x${PKG_CONFIG_PATH}" = "x"; then
-	AC_MSG_RESULT(empty)
-else
-	AC_MSG_RESULT(${PKG_CONFIG_PATH})
-fi
-
-dnl AC_REQUIRE(PKG_CHECK_MODULES)
-AC_PATH_PROG(PKG_CONFIG,pkg-config,false)
-if test "$PKG_CONFIG" = "false"; then
-AC_MSG_ERROR(
-*** Build requires pkg-config
-***
-*** Possible solutions:
-***   - set PKG_CONFIG to where your pkg-config is located
-***   - set PATH to include the directory where pkg-config is installed
-***   - get it from http://freedesktop.org/software/pkgconfig/ and install it
-)
-fi
-)dnl
-
-dnl Please do not remove this:
-dnl filetype: d87b877b-80ec-447c-b042-21ec4a27c6f0
-dnl I use this to find all the different instances of this file which 
-dnl are supposed to be synchronized.
-
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-stdint.m4 Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/test Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/test/Makefile.am Deleted

@@ -1,33 +0,0 @@
-TESTS =
-INSTALL_TESTS =
-check_PROGRAMS =
-noinst_PROGRAMS =
-
-# When we build all our iolibs in one directory, we can run our checks
-# with IOLIBS set to the iolib build directory.
-TESTS_ENVIRONMENT = env \
-	IOLIBS="$(top_builddir)"
-
-# After installation, this will be IOLIBS = $(DESTDIR)$(iolibdir)
-INSTALL_TESTS_ENVIRONMENT = env \
-	IOLIBS="$(DESTDIR)$(iolibdir)" \
-	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
-
-AM_CPPFLAGS += -I$(top_srcdir)
-
-noinst_PROGRAMS += test-gp-port test-port-list
-test_gp_port_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
-test_gp_port_SOURCE = test-gp-port.c
-test_gp_port_LDFLAGS = $(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) $(INTLLIBS)
-
-TESTS += test-port-list
-INSTALL_TESTS += test-port-list
-check_PROGRAMS += test-port-list
-test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
-test_port_list_SOURCE = test-gp-port.c
-test_port_list_LDFLAGS = \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(INTLLIBS)
-
-include $(top_srcdir)/installcheck.mk

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/test/Makefile.in Deleted

@@ -1,1141 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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@
-TESTS = test-port-list$(EXEEXT)
-check_PROGRAMS = test-port-list$(EXEEXT)
-noinst_PROGRAMS = test-gp-port$(EXEEXT) test-port-list$(EXEEXT)
-subdir = test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-pkg-config.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-test_gp_port_SOURCES = test-gp-port.c
-test_gp_port_OBJECTS = test_gp_port-test-gp-port.$(OBJEXT)
-test_gp_port_LDADD = $(LDADD)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-test_gp_port_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(test_gp_port_LDFLAGS) $(LDFLAGS) -o $@
-test_port_list_SOURCES = test-port-list.c
-test_port_list_OBJECTS = test_port_list-test-port-list.$(OBJEXT)
-test_port_list_LDADD = $(LDADD)
-test_port_list_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(test_port_list_LDFLAGS) $(LDFLAGS) -o \
-	$@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/auto-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = test-gp-port.c test-port-list.c
-DIST_SOURCES = test-gp-port.c test-port-list.c
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red='&#x1b;0;31m'; \
-    grn='&#x1b;0;32m'; \
-    lgn='&#x1b;1;32m'; \
-    blu='&#x1b;1;34m'; \
-    mgn='&#x1b;0;35m'; \
-    brg='&#x1b;1m'; \
-    std='&#x1b;m'; \
-  fi; \
-}
-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__recheck_rx = ^ 	*:recheck: 	*
-am__global_test_result_rx = ^ 	*:global-test-result: 	*
-am__copy_in_global_log_rx = ^ 	*:copy-in-global-log: 	*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)nNOo/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)yYeEsS/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub(" 	*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)nNoO/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/^/*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *\ \	$$f\ \	* | *\ \	$$dir$$f\ \	*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/auto-aux/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/auto-aux/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/auto-aux/depcomp \
-	$(top_srcdir)/auto-aux/mkinstalldirs \
-	$(top_srcdir)/auto-aux/test-driver \
-	$(top_srcdir)/installcheck.mk
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-IOLIB_LIST = @IOLIB_LIST@
-IOLIB_LTLIST = @IOLIB_LTLIST@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGPHOTO2_PORT_AGE = @LIBGPHOTO2_PORT_AGE@
-LIBGPHOTO2_PORT_CURRENT = @LIBGPHOTO2_PORT_CURRENT@
-LIBGPHOTO2_PORT_CURRENT_MIN = @LIBGPHOTO2_PORT_CURRENT_MIN@
-LIBGPHOTO2_PORT_REVISION = @LIBGPHOTO2_PORT_REVISION@
-LIBGPHOTO2_PORT_VERSION_INFO = @LIBGPHOTO2_PORT_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBUSB1_CFLAGS = @LIBUSB1_CFLAGS@
-LIBUSB1_CONFIG_PROG = @LIBUSB1_CONFIG_PROG@
-LIBUSB1_LIBS = @LIBUSB1_LIBS@
-LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
-LIBUSB_CONFIG_PROG = @LIBUSB_CONFIG_PROG@
-LIBUSB_LIBS = @LIBUSB_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBUSB = @REQUIREMENTS_FOR_LIBUSB@
-REQUIREMENTS_FOR_LIBUSB1 = @REQUIREMENTS_FOR_LIBUSB1@
-SED = @SED@
-SERIAL_LIBS = @SERIAL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-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@
-iolibdir = @iolibdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-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@
-udevscriptdir = @udevscriptdir@
-INSTALL_TESTS = test-port-list
-
-# When we build all our iolibs in one directory, we can run our checks
-# with IOLIBS set to the iolib build directory.
-TESTS_ENVIRONMENT = env \
-	IOLIBS="$(top_builddir)"
-
-
-# After installation, this will be IOLIBS = $(DESTDIR)$(iolibdir)
-INSTALL_TESTS_ENVIRONMENT = env \
-	IOLIBS="$(DESTDIR)$(iolibdir)" \
-	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
-
-test_gp_port_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
-test_gp_port_SOURCE = test-gp-port.c
-test_gp_port_LDFLAGS = $(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) $(INTLLIBS)
-test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
-test_port_list_SOURCE = test-gp-port.c
-test_port_list_LDFLAGS = \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(INTLLIBS)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/installcheck.mk $(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 test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu test/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_srcdir)/installcheck.mk $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-test-gp-port$(EXEEXT): $(test_gp_port_OBJECTS) $(test_gp_port_DEPENDENCIES) $(EXTRA_test_gp_port_DEPENDENCIES) 
-	@rm -f test-gp-port$(EXEEXT)
-	$(AM_V_CCLD)$(test_gp_port_LINK) $(test_gp_port_OBJECTS) $(test_gp_port_LDADD) $(LIBS)
-
-test-port-list$(EXEEXT): $(test_port_list_OBJECTS) $(test_port_list_DEPENDENCIES) $(EXTRA_test_port_list_DEPENDENCIES) 
-	@rm -f test-port-list$(EXEEXT)
-	$(AM_V_CCLD)$(test_port_list_LINK) $(test_port_list_OBJECTS) $(test_port_list_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gp_port-test-gp-port.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_port_list-test-port-list.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-test_gp_port-test-gp-port.o: test-gp-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_gp_port-test-gp-port.o -MD -MP -MF $(DEPDIR)/test_gp_port-test-gp-port.Tpo -c -o test_gp_port-test-gp-port.o `test -f 'test-gp-port.c' || echo '$(srcdir)/'`test-gp-port.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gp_port-test-gp-port.Tpo $(DEPDIR)/test_gp_port-test-gp-port.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-gp-port.c' object='test_gp_port-test-gp-port.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_gp_port-test-gp-port.o `test -f 'test-gp-port.c' || echo '$(srcdir)/'`test-gp-port.c
-
-test_gp_port-test-gp-port.obj: test-gp-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_gp_port-test-gp-port.obj -MD -MP -MF $(DEPDIR)/test_gp_port-test-gp-port.Tpo -c -o test_gp_port-test-gp-port.obj `if test -f 'test-gp-port.c'; then $(CYGPATH_W) 'test-gp-port.c'; else $(CYGPATH_W) '$(srcdir)/test-gp-port.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gp_port-test-gp-port.Tpo $(DEPDIR)/test_gp_port-test-gp-port.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-gp-port.c' object='test_gp_port-test-gp-port.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_gp_port-test-gp-port.obj `if test -f 'test-gp-port.c'; then $(CYGPATH_W) 'test-gp-port.c'; else $(CYGPATH_W) '$(srcdir)/test-gp-port.c'; fi`
-
-test_port_list-test-port-list.o: test-port-list.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_port_list-test-port-list.o -MD -MP -MF $(DEPDIR)/test_port_list-test-port-list.Tpo -c -o test_port_list-test-port-list.o `test -f 'test-port-list.c' || echo '$(srcdir)/'`test-port-list.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_port_list-test-port-list.Tpo $(DEPDIR)/test_port_list-test-port-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-port-list.c' object='test_port_list-test-port-list.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_port_list-test-port-list.o `test -f 'test-port-list.c' || echo '$(srcdir)/'`test-port-list.c
-
-test_port_list-test-port-list.obj: test-port-list.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_port_list-test-port-list.obj -MD -MP -MF $(DEPDIR)/test_port_list-test-port-list.Tpo -c -o test_port_list-test-port-list.obj `if test -f 'test-port-list.c'; then $(CYGPATH_W) 'test-port-list.c'; else $(CYGPATH_W) '$(srcdir)/test-port-list.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_port_list-test-port-list.Tpo $(DEPDIR)/test_port_list-test-port-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-port-list.c' object='test_port_list-test-port-list.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_port_list-test-port-list.obj `if test -f 'test-port-list.c'; then $(CYGPATH_W) 'test-port-list.c'; else $(CYGPATH_W) '$(srcdir)/test-port-list.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	elif test -n "$$redo_logs"; then \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws=' 	'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS:
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-test-port-list.log: test-port-list$(EXEEXT)
-	@p='test-port-list$(EXEEXT)'; \
-	b='test-port-list'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-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
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(PROGRAMS)
-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:
-	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:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-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-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-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: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags 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 installcheck-local \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# FIXME: Only run this if not cross-compiling
-installcheck-local: $(INSTALL_TESTS) $(INSTALLCHECK_DEPS)
-	@total=0; failed=0; success=0; ignored=0; \
-	echo "Running \"installcheck\" test cases..."; \
-	for script in $(INSTALL_TESTS); do \
-		echo "Test case: $$script"; \
-		total="$$(expr $$total + 1)"; \
-		if test -f "./$$script"; then dir="./"; \
-		elif test -f "$$script"; then dir=""; \
-		else dir="$(srcdir)/"; fi; \
-		if $(INSTALL_TESTS_ENVIRONMENT) "$$dir/$$script"; then \
-			echo "SUCCEEDED: $$script"; \
-			success="$$(expr $$success + 1)"; \
-		else \
-			s="$$?"; \
-			if test "$$s" = "77"; then \
-				echo "FAILURE IGNORED (return code $$s): $$script"; \
-				ignored="$$(expr $$ignored + 1)"; \
-			else \
-				echo "FAILED (return code $$s): $$script"; \
-				failed="$$(expr $$failed + 1)"; \
-			fi; \
-		fi; \
-	done; \
-	echo "Test summary: $$success succeeded, $$failed failed, $$ignored failures ignored, $$total tests in total."; \
-	if test "$$failed" -gt 0; then \
-		echo "Error: One or more \"installcheck\" testcases have failed."; \
-		exit 1; \
-	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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/test/test-gp-port.c Deleted

@@ -1,177 +0,0 @@
-/* test-gp-port.c
- *
- * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details. 
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gphoto2/gphoto2-port.h>
-#include <gphoto2/gphoto2-port-log.h>
-#include <gphoto2/gphoto2-port-result.h>
-#include <gphoto2/gphoto2-port-info-list.h>
-
-static void
-log_func (GPLogLevel level, const char *domain,
-	  const char *str, void *data)
-{
-	fprintf (stdout, "%s\n", str);
-}
-
-int
-main (int argc, char **argv)
-{
-	GPPort *dev;
-	GPPortSettings settings;
-	char buf32;
-	int ret;
-	GPPortInfoList *il;
-	GPPortInfo info;
-	GPLevel level;
-	unsigned int i;
-	int id1,id2,id3;
-
-	/* test https://github.com/gphoto/libgphoto2/issues/45 */
-	id1 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
-	id2 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
-	if (GP_OK != gp_log_remove_func (id1)) {
-		printf ("id1 not found?\n");
-		return 1;
-	}
-	id3 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
-	if (GP_OK != gp_log_remove_func (id2)) {
-		printf ("id2 not found?\n");
-		return 1;
-	}
-	if (GP_OK != gp_log_remove_func (id3)) {
-		printf ("id3 not found?\n");
-		return 1;
-	}
-	if (GP_ERROR_BAD_PARAMETERS != gp_log_remove_func (id3)) {
-		printf ("id3 was found?\n");
-		return 1;
-	}
-
-	gp_log_add_func (GP_LOG_DATA, log_func, NULL);
-
-	for (i = 0; i < 2; i++) {
-
-		ret = gp_port_info_list_new (&il);
-		if (ret < 0) {
-			printf ("Could not create list of ports: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-	
-		ret = gp_port_info_list_load (il);
-		if (ret < 0) {
-			printf ("Could not load list of ports: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-	
-		printf ("############\n");
-		printf ("############ There are %i IO-drivers "
-			"installed on your system.\n",
-			gp_port_info_list_count (il));
-		printf ("############\n");
-	
-		ret = gp_port_info_list_get_info (il, 0, &info);
-		if (ret < 0) {
-			printf ("Could not get info of first port in "
-				"list: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		ret = gp_port_new (&dev);
-		if (ret < 0) {
-			printf ("Could not create device: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		ret = gp_port_set_info (dev, info);
-		if (ret < 0) {
-			printf ("Could not set port info: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		gp_port_info_list_free (il);
-
-		ret = gp_port_set_timeout (dev, 500);
-		if (ret < 0) {
-			printf ("Could not set timeout: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		strcpy (settings.serial.port, "serial:/dev/ttyS0");
-		settings.serial.speed = 19200;
-		settings.serial.bits = 8;
-		settings.serial.parity = 0;
-		settings.serial.stopbits = 1;
-
-		ret = gp_port_set_settings (dev, settings);
-		if (ret < 0) {
-			printf ("Could not set settings: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		ret = gp_port_open (dev);
-		if (ret < 0) {
-			printf ("Could not open device: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		gp_port_get_settings(dev, &settings);
-		settings.serial.speed = 57600;
-		gp_port_set_settings(dev, settings);
-
-		ret = gp_port_get_pin (dev, GP_PIN_DTR, &level);
-		if (ret < 0) {
-			printf ("Could not get level of pin DTR: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		ret = gp_port_set_pin (dev, GP_PIN_CTS, GP_LEVEL_HIGH);
-		if (ret < 0) {
-			printf ("Could not set level of pin CTS: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-
-		gp_port_write (dev, "AT\n", 3);
-
-		gp_port_read (dev, buf, 3);
-		buf3 = 0;
-		printf("recv: %s\n", buf);
-
-		gp_port_close (dev);
-
-		gp_port_free (dev);
-	}
-
-	return 0;
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/test/test-port-list.c Deleted

@@ -1,134 +0,0 @@
-/* test-port-list.c
- *
- * Copyright (C) 2002 Lutz Mueller <lutz@users.sourceforge.net>
- * Copyright (C) 2007 Hans Ulrich Niedermann <gp@n-dimensional.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details. 
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gphoto2/gphoto2-port.h>
-#include <gphoto2/gphoto2-port-log.h>
-#include <gphoto2/gphoto2-port-result.h>
-#include <gphoto2/gphoto2-port-info-list.h>
-
-
-#ifdef __GNUC__
-#define __unused__ __attribute__((unused))
-#else
-#define __unused__
-#endif
-
-
-static void
-log_func (GPLogLevel level, const char *domain __unused__,
-	  const char *str, void *data __unused__)
-{
-	if (level <= GP_LOG_ERROR) {
-		fprintf (stdout, "%s\n", str);
-		fflush (stdout);
-	}
-}
-
-
-static int
-run_test ()
-{
-	int i;
-	int ret;
-	GPPortInfoList *il;
-
-	int count;
-
-	ret = gp_port_info_list_new (&il);
-	if (ret < 0) {
-		printf ("Could not create list of ports: %s\n",
-			gp_port_result_as_string (ret));
-		return (1);
-	}
-	
-	ret = gp_port_info_list_load (il);
-	if (ret < 0) {
-		printf ("Could not load list of ports: %s\n",
-			gp_port_result_as_string (ret));
-		return (2);
-	}
-	
-	count = gp_port_info_list_count (il);
-	if (count < 0) {
-		printf("gp_port_info_list_count error: %d\n", count);
-		return 1;
-	} else if (count == 0) {
-		/* Unlike gphoto2-abilities-list,
-		 * gphoto2-port-info-list.c does not just load
-		 * the driver libs, but also scans for
-		 * ports. Thus 0 ports are a valid results.
-		 */
-	}
-	/* Non-empty list */
-	printf ("%i ports found on your system.\n", count);
-
-	for (i = 0; i < count; i++) {
-		const char *port_type_str;
-		char *name, *path;
-		GPPortInfo	info;
-		GPPortType	type;
-		ret = gp_port_info_list_get_info (il, i, &info);
-		if (ret < 0) {
-		  	printf ("ERROR getting iolib info: %s\n",
-				gp_port_result_as_string (ret));
-			return (1);
-		}
-		gp_port_info_get_type (info, &type);
-		gp_port_info_get_name (info, &name);
-		gp_port_info_get_path (info, &path);
-		switch (type) {
-		case GP_PORT_NONE:   port_type_str = "NONE"; break;
-		case GP_PORT_SERIAL: port_type_str = "SERIAL"; break;
-		case GP_PORT_USB:    port_type_str = "USB"; break;
-		case GP_PORT_USB_DISK_DIRECT:    port_type_str = "USBDISKDIRECT"; break;
-		case GP_PORT_USB_SCSI:    port_type_str = "USBSCSI"; break;
-		case GP_PORT_DISK:   port_type_str = "DISK"; break;
-		case GP_PORT_PTPIP:  port_type_str = "PTPIP"; break;
-		default:             port_type_str = "UNKNOWN"; return 3; break;
-		}
-		printf ("No:    %d\n"
-			"Type:  %s\n"
-			"Name:  %s\n"
-			"Path:  %s\n",
-			i,
-			port_type_str,
-			name,
-			path
-			);
-	}
-
-
-	gp_port_info_list_free (il);
-	return 0;
-}
-
-
-int
-main ()
-{
-	gp_log_add_func (GP_LOG_DATA, log_func, NULL);
-	return run_test();
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/usb/usb-os2.c Deleted

@@ -1,271 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gphoto2-port-usb.c - USB transport functions
-
-   Copyright 1999-2000 Johannes Erdfelt <johannes@erdfelt.com>
-
-   The GPIO Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GPIO Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GPIO Library; see the file COPYING.LIB.  If not,
-   write to the 
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <dirent.h>
-#include <string.h>
-
-/*#include <usb.h>*/
-#include <gphoto2/gphoto2-port.h>
-
-
-int gp_port_usb_list(gp_port_info *list, int *count);
-int gp_port_usb_init(gp_port *dev);
-int gp_port_usb_exit(gp_port *dev);
-int gp_port_usb_open(gp_port *dev);
-int gp_port_usb_close(gp_port *dev);
-int gp_port_usb_reset(gp_port *dev);
-int gp_port_usb_write(gp_port * dev, char *bytes, int size);
-int gp_port_usb_read(gp_port * dev, char *bytes, int size);
-int gp_port_usb_update(gp_port * dev);
-
-int gp_port_usb_clear_halt_lib(gp_port * dev, int ep);
-int gp_port_usb_msg_read_lib(gp_port * dev, int value, char *bytes, int size);
-int gp_port_usb_msg_write_lib(gp_port * dev, int value, char *bytes, int size);
-int gp_port_usb_find_device_lib(gp_port *dev, int idvendor, int idproduct);
-
-/* Dynamic library functions
-   --------------------------------------------------------------------- */
-
-gp_port_type gp_port_library_type () {
-
-        return (GP_PORT_USB);
-}
-
-gp_port_operations *gp_port_library_operations () {
-
-        gp_port_operations *ops;
-
-        ops = calloc(1, sizeof(gp_port_operations));
-        if (!ops)
-                return NULL;
-
-        ops->init   = gp_port_usb_init;
-        ops->exit   = gp_port_usb_exit;
-        ops->open   = gp_port_usb_open;
-        ops->close  = gp_port_usb_close;
-        ops->read   = gp_port_usb_read;
-        ops->write  = gp_port_usb_write;
-        ops->update = gp_port_usb_update;
-        ops->clear_halt = gp_port_usb_clear_halt_lib;
-        ops->msg_write  = gp_port_usb_msg_write_lib;
-        ops->msg_read   = gp_port_usb_msg_read_lib;
-        ops->find_device = gp_port_usb_find_device_lib;
-
-        return (ops);
-}
-
-int gp_port_library_list(gp_port_info *list, int *count)
-{
-
-        list*count.type = GP_PORT_USB;
-        strcpy(list*count.name, "Universal Serial Bus");
-        strcpy(list*count.path, "usb:");
-        /* list*count.argument_needed = 0; */
-        *count += 1;
-
-        return GP_OK;
-}
-
-int gp_port_usb_init(gp_port *dev)
-{
-/*        usb_init();
-        usb_find_busses();
-        usb_find_devices();*/
-        return (GP_OK);
-}
-
-int gp_port_usb_exit(gp_port *dev)
-{
-        return (GP_OK);
-}
-
-int gp_port_usb_open(gp_port *dev)
-{
-        int ret;
-        void *udev;
-
-        if (dev->debug_level)
-            printf ("gp_port_usb_open() called\n");
-
-        /* Open the device using the previous usb_handle returned by find_device */
-        udev = dev->device_handle;
-        /*dev->device_handle = usb_open(udev);*/
-        if (!dev->device_handle)
-                return GP_ERROR_IO_OPEN;
-
-        /*ret = usb_set_configuration(dev->device_handle, dev->settings.usb.config);*/
-        if (ret < 0) {
-                fprintf(stderr, "gp_port_usb_open: could not set config %d: %s\n",
-                        dev->settings.usb.config, strerror(errno));
-                return GP_ERROR_IO_OPEN;
-        }
-
-        /*ret = usb_claim_interface(dev->device_handle, dev->settings.usb.interface);*/
-        if (ret < 0) {
-                fprintf(stderr, "gp_port_usb_open: could not claim intf %d: %s\n",
-                        dev->settings.usb.interface, strerror(errno));
-                return GP_ERROR_IO_OPEN;
-        }
-
-        /*ret = usb_set_altinterface(dev->device_handle, dev->settings.usb.altsetting);*/
-        if (ret < 0) {
-                fprintf(stderr, "gp_port_usb_open: could not set intf %d/%d: %s\n",
-                        dev->settings.usb.interface,
-                        dev->settings.usb.altsetting, strerror(errno));
-                return GP_ERROR_IO_OPEN;
-        }
-
-        return GP_OK;
-}
-
-int gp_port_usb_close(gp_port *dev)
-{
-        if (dev->debug_level)
-            printf ("gp_port_usb_close() called\n");
-
-        /*if (usb_close(dev->device_handle) < 0)
-                fprintf(stderr, "gp_port_usb_close: %s\n",
-                        strerror(errno));       */
-
-        dev->device_handle = NULL;
-
-        return GP_OK;
-}
-
-int gp_port_usb_reset(gp_port *dev)
-{
-        /*gp_port_usb_close(dev);
-        return gp_port_usb_open(dev);*/
-}
-
-int gp_port_usb_clear_halt_lib(gp_port * dev, int ep)
-{
-        int ret=0;
-
-        switch (ep) {
-                case GP_PORT_USB_ENDPOINT_IN :
-                        /*ret=usb_clear_halt(dev->device_handle, dev->settings.usb.inep);*/
-                        break;
-                case GP_PORT_USB_ENDPOINT_OUT :
-                        /*ret=usb_clear_halt(dev->device_handle, dev->settings.usb.outep);*/
-                case GP_PORT_USB_ENDPOINT_INT :
-                        /*ret=usb_clear_halt(dev->device_handle, dev->settings.usb.intep);*/
-                        break;
-                default:
-                        fprintf(stderr,"gp_port_usb_clear_halt: bad EndPoint argument\n");
-                        return GP_ERROR_IO_USB_CLEAR_HALT;
-        }
-        return (ret ? GP_ERROR_IO_USB_CLEAR_HALT : GP_OK);
-}
-
-int gp_port_usb_write(gp_port * dev, char *bytes, int size)
-{
-        int ret;
-/*
-        if (dev->debug_level) {
-            int i;
-
-            printf("gp_port_usb_write(): ");
-            for (i = 0; i < size; i++)
-                printf("%02x ",(unsigned char)bytesi);
-            printf("\n");
-        }
-*/
-        /*ret = usb_bulk_write(dev->device_handle, dev->settings.usb.outep,
-                           bytes, size, dev->timeout);*/
-        if (ret < 0)
-            return (GP_ERROR_IO_WRITE);
-        return (ret);
-}
-
-int gp_port_usb_read(gp_port * dev, char *bytes, int size)
-{
-        int ret;
-
-        /*ret = usb_bulk_read(dev->device_handle, dev->settings.usb.inep,
-                             bytes, size, dev->timeout);*/
-        if (ret < 0)
-                return GP_ERROR_IO_READ;
-
-/*
-        if (dev->debug_level) {
-            int i;
-
-            printf("gp_port_usb_read(timeout=%d): ", dev->timeout);
-            for (i = 0; i < ret; i++)
-                printf("%02x ",(unsigned char)(bytesi));
-            printf("\n");
-        }
-*/
-
-        return ret;
-}
-
-int gp_port_usb_msg_write_lib(gp_port * dev, int value, char *bytes, int size)
-{
-        /*return usb_control_msg(dev->device_handle,
-                USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                size > 1 ? 0x04 : 0x0c, value, 0, bytes, size, dev->timeout);*/
-}
-
-int gp_port_usb_msg_read_lib(gp_port * dev, int value, char *bytes, int size)
-{
-        /*return usb_control_msg(dev->device_handle,
-                USB_TYPE_VENDOR | USB_RECIP_DEVICE | 0x80,
-                size > 1 ? 0x04 : 0x0c, value, 0, bytes, size, dev->timeout);*/
-}
-
-/*
- * This function applys changes to the device
- * (At this time it does nothing)
- */
-int gp_port_usb_update(gp_port * dev)
-{
-        memcpy(&dev->settings, &dev->settings_pending, sizeof(dev->settings));
-
-        return GP_OK;
-}
-
-int gp_port_usb_find_device_lib(gp_port * d, int idvendor, int idproduct)
-{
-        /*struct usb_bus *bus;
-        struct usb_device *dev;
-        for (bus = usb_busses; bus; bus = bus->next) {
-                for (dev = bus->devices; dev; dev = dev->next) {
-                        if ((dev->descriptor.idVendor == idvendor) &&
-                            (dev->descriptor.idProduct == idproduct)) {
-                                if (d)
-                                    d->device_handle = dev;
-                                return GP_OK;
-                        }
-                }
-        } */
-
-        return GP_ERROR_IO_USB_FIND;
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/90-gphoto-camera-policy.fdi Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/Makefile.am Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/Makefile.in Deleted

@@ -1,598 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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 = packaging/linux-hotplug
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-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)$(hotplugdocdir)"
-DATA = $(hotplugdoc_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/auto-aux/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGD_CFLAGS = @LIBGD_CFLAGS@
-LIBGD_CONFIG_PROG = @LIBGD_CONFIG_PROG@
-LIBGD_LIBS = @LIBGD_LIBS@
-LIBGPHOTO2_AGE = @LIBGPHOTO2_AGE@
-LIBGPHOTO2_CURRENT = @LIBGPHOTO2_CURRENT@
-LIBGPHOTO2_CURRENT_MIN = @LIBGPHOTO2_CURRENT_MIN@
-LIBGPHOTO2_REVISION = @LIBGPHOTO2_REVISION@
-LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNUSED_CFLAGS = @NO_UNUSED_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
-REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-camlibdir = @camlibdir@
-camlibdocdir = @camlibdocdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hotplugdocdir = @hotplugdocdir@
-hotplugusermapdir = @hotplugusermapdir@
-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@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevscriptdir = @udevscriptdir@
-utilsdir = @utilsdir@
-EXTRA_DIST = usbcam.console usbcam.group usbcam.user usbcam.x11-app \
-	90-gphoto-camera-policy.fdi gphoto-set-procperm
-
-
-# FIXME: This should only be built if target system is linux - not if
-#       the building system is linux.
-@HAVE_LINUX_TRUE@hotplugdoc_DATA = usbcam.console usbcam.group usbcam.user usbcam.x11-app
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(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) --foreign packaging/linux-hotplug/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign packaging/linux-hotplug/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:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-hotplugdocDATA: $(hotplugdoc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(hotplugdoc_DATA)'; test -n "$(hotplugdocdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(hotplugdocdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(hotplugdocdir)" || exit 1; \
-	fi; \
-	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)$(hotplugdocdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(hotplugdocdir)" || exit $$?; \
-	done
-
-uninstall-hotplugdocDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(hotplugdoc_DATA)'; test -n "$(hotplugdocdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(hotplugdocdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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)$(hotplugdocdir)"; 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 clean-libtool 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-hotplugdocDATA
-
-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 mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-hotplugdocDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool 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-hotplugdocDATA 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 \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-hotplugdocDATA
-
-.PRECIOUS: Makefile
-
-
-# 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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/gphoto-set-procperm Deleted

@@ -1,39 +0,0 @@
-#!/bin/sh
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details. 
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
-#
-#
-# This is taken from Fedora Core gphoto2 package.
-# http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/gphoto2/gphoto-set-procperm
-
-console_user=$(cat /var/run/console/console.lock)
-
-if  -z "$console_user"  ; then
-  exit 1 
-fi
-
-if  -z "$HAL_PROP_USB_BUS_NUMBER"  ||  -z "$HAL_PROP_USB_LINUX_DEVICE_NUMBER"  ; then
-  exit 1 
-fi
-
-if  "$HAL_PROP_USB_BUS_NUMBER" -lt 0  ||  "$HAL_PROP_USB_LINUX_DEVICE_NUMBER" -lt 0  ; then
-  exit 1 
-fi
-
-
-bus_num=$(printf %.3u "$HAL_PROP_USB_BUS_NUMBER")
-dev_num=$(printf %.3u "$HAL_PROP_USB_LINUX_DEVICE_NUMBER")
-
-chown "$console_user" /proc/bus/usb/"$bus_num"/"$dev_num"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/usbcam.console Deleted

@@ -1,62 +0,0 @@
-#!/bin/sh
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details. 
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
-#
-#
-# $Id$
-#
-# /etc/hotplug/usb/usbcam
-#
-# Sets up newly plugged in USB camera so that the user who owns
-# the console according to pam_console can access it from user space
-#
-# Note that for this script to work, you'll need all of the following:
-# a) a line in the file /etc/hotplug/usermap that corresponds to the 
-#    camera you are using. You can get the correct lines for all cameras 
-#    supported by libgphoto2 by running
-#              $ print-camera-list usb-usermap usbcam
-# b) a setup using pam_console creates the respective lock files
-#    containing the name of the respective user. You can check for that
-#    by executing "echo `cat /var/{run,lock}/console.lock`" and 
-#    verifying the appropriate user is mentioned somewhere there.
-# c) a Linux kernel supporting hotplug and usbdevfs
-# d) the hotplug package (http://linux-hotplug.sourceforge.net/)
-#
-# In the usermap file, the first field "usb module" should be named 
-# "usbcam" like this script.
-# 
-
-if  "${ACTION}" = "add"  &&  -f "${DEVICE}" 
-then
-    # New code, using lock files instead of copying /dev/console permissions
-    # This also works with non-gdm logins (e.g. on a virtual terminal)
-    # Idea and code from Nalin Dahyabhai <nalin@redhat.com>
-    CONSOLEOWNER=""
-    for conlock in \
-        /var/run/console.lock \
-        /var/run/console/console.lock \
-        /var/lock/console.lock
-    do
-        if  -f "$conlock" ; then
-            CONSOLEOWNER=$(cat $conlock)
-        fi
-    done
-    if  -n "$CONSOLEOWNER" 
-    then
-        chmod 0000 "${DEVICE}"
-        chown "$CONSOLEOWNER" "${DEVICE}"
-        chmod 0600 "${DEVICE}"
-    fi
-fi

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/usbcam.group Deleted

@@ -1,51 +0,0 @@
-#!/bin/sh
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details. 
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
-#
-#
-# $Id$
-#
-# /etc/hotplug/usb/usbcam
-#
-# Sets up newly plugged in USB camera so that only members of the 
-# group
-
-GROUP=camera
-
-# can access it from user space. (Replace camera with the name of the
-# group you want to have access to the cameras.)
-#
-# Note that for this script to work, you'll need all of the following:
-# a) a line in the file /etc/hotplug/usermap that corresponds to the 
-#    camera you are using. You can get the correct lines for all cameras 
-#    supported by libgphoto2 by running
-#              $ print-camera-list usb-usermap usbcam
-# b) a group "camera" where all users allowed access to the
-#    camera are listed
-# c) a Linux kernel supporting hotplug and usbdevfs
-# d) the hotplug package (http://linux-hotplug.sourceforge.net/)
-#
-# In the usermap file, the first field "usb module" should be named 
-# "usbcam" like this script.
-# 
-
- -z "${DEVICE}"  && DEVICE="${DEVNAME}"
-
-if  "${ACTION}" = "add"  &&  -e "${DEVICE}" 
-then
-    chmod o-rwx "${DEVICE}"
-    chgrp "${GROUP}" "${DEVICE}"
-    chmod g+rw "${DEVICE}"
-fi

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/usbcam.user Deleted

@@ -1,47 +0,0 @@
-#!/bin/sh
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details. 
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
-#
-#
-# $Id$
-#
-# /etc/hotplug/usb/usbcam
-#
-# Sets up newly plugged in USB camera so that just one certain user
-
-USER=root
-
-# can access it from user space. (Replace root with the user you want
-# to have access to the cameras.)
-#
-# Note that for this script to work, you'll need all of the following:
-# a) a line in the file /etc/hotplug/usermap that corresponds to the 
-#    camera you are using. You can get the correct lines for all cameras 
-#    supported by libgphoto2 by running
-#              $ print-camera-list usb-usermap usbcam
-# b) run your camera software as the user given above
-# c) a Linux kernel supporting hotplug and usbdevfs
-# d) the hotplug package (http://linux-hotplug.sourceforge.net/)
-#
-# In the usermap file, the first field "usb module" should be named 
-# "usbcam" like this script.
-# 
-
-if  "${ACTION}" = "add"  &&  -f "${DEVICE}" 
-then
-    chmod a-rwx "${DEVICE}"
-    chown "${USER}" "${DEVICE}"
-    chmod u+rw "${DEVICE}"
-fi

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/linux-hotplug/usbcam.x11-app Deleted

@@ -1,76 +0,0 @@
-#!/bin/sh
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details. 
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA
-#
-#
-# $Id$
-#
-# /etc/hotplug/usb/usbcam
-#
-# Sets up newly plugged in USB camera so that just one certain user
-
-USER=root
-
-# can access it from user space. (Replace root by the user you want
-# to have access to the cameras.)
-
-# It then runs the X11 application (gtkam is used as an example)
-
-X11_APP=/usr/bin/gtkam
-
-# on the X11 display (:0 should work on most single user workstations)
-
-DISPLAY=:0
-
-# in the directory (~$USER is just the user's home directory)
-
-DIRECTORY=~$USER
-
-#
-# Note that for this script to work, you'll need all of the following:
-# a) a line in the file /etc/hotplug/usermap that corresponds to the 
-#    camera you are using. You can get the correct lines for all cameras 
-#    supported by libgphoto2 by running
-#              $ print-camera-list usb-usermap usbcam
-# b) run your camera software as the user given above
-# c) a Linux kernel supporting hotplug and usbdevfs
-# d) the hotplug package (http://linux-hotplug.sourceforge.net/)
-# e) su
-# f) env
-# g) X11
-#
-# In the usermap file, the first field "usb module" should be named 
-# "usbcam" like this script.
-#
-# Script written by Trevor Woerner but slightly adapted for inclusion
-# into libgphoto2. 
-
-SU=/bin/su
-ENV=/usr/bin/env
-
-if  "${ACTION}" = "add"  &&  -f "${DEVICE}" 
-then
-    chmod a-rwx "${DEVICE}"
-    chown "${USER}" "${DEVICE}"
-    chmod u+rw "${DEVICE}"
-
-    if  "${USER}" != "root" 
-    then
-	# we don't want to run this as root. definitely not.
-	cd "${DIRECTORY}" || exit 1
-	usrhome=~${USER}
-	"${SU}" "${USER}" -c "${ENV} DISPLAY=${DISPLAY} HOME=${usrhome} ${X11_APP}"
-    fi
-fi

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/rpm Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/rpm/Makefile.am Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/rpm/Makefile.in Deleted

@@ -1,568 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-
-# $Id$
-#
-# create an RPM package out of an automake based source distribution
-# © 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-#
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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 = packaging/rpm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = package.spec
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/package.spec.in \
-	$(top_srcdir)/auto-aux/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGD_CFLAGS = @LIBGD_CFLAGS@
-LIBGD_CONFIG_PROG = @LIBGD_CONFIG_PROG@
-LIBGD_LIBS = @LIBGD_LIBS@
-LIBGPHOTO2_AGE = @LIBGPHOTO2_AGE@
-LIBGPHOTO2_CURRENT = @LIBGPHOTO2_CURRENT@
-LIBGPHOTO2_CURRENT_MIN = @LIBGPHOTO2_CURRENT_MIN@
-LIBGPHOTO2_REVISION = @LIBGPHOTO2_REVISION@
-LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNUSED_CFLAGS = @NO_UNUSED_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
-REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-camlibdir = @camlibdir@
-camlibdocdir = @camlibdocdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hotplugdocdir = @hotplugdocdir@
-hotplugusermapdir = @hotplugusermapdir@
-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@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevscriptdir = @udevscriptdir@
-utilsdir = @utilsdir@
-EXTRA_DIST = package.spec.in @PACKAGE@.spec
-DISTCLEANFILES = @PACKAGE@.spec
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(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) --foreign packaging/rpm/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign packaging/rpm/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:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-package.spec: $(top_builddir)/config.status $(srcdir)/package.spec.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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:
-	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)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-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 clean-libtool clean-local 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 mostlyclean-libtool
-
-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 clean-libtool \
-	clean-local cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool 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 mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-clean-local:
-	rm -rf BUILD RPMS SPECS SOURCES SRPMS
-
-@PACKAGE@.spec: package.spec
-	cp $< $@
-
-rpm: Makefile package.spec
-	$(MAKE) clean
-	mkdir -p BUILD SPECS SOURCES SRPMS
-	for arch in i386 i486 i586 i686 alpha noarch; do \
-		mkdir -p "RPMS/$${arch}"; \
-	done
-	$(MAKE) SOURCES/@PACKAGE@-@VERSION@.tar.gz SPECS/@PACKAGE@-@VERSION@.spec
-	@RPMBUILD@ --define "_topdir $$(pwd)" -ba SPECS/@PACKAGE@-@VERSION@.spec
-
-SOURCES/@PACKAGE@-@VERSION@.tar.gz: $(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz
-	ln -f $< $@
-
-SPECS/@PACKAGE@-@VERSION@.spec: package.spec
-	ln -f $< $@
-
-# 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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/rpm/libgphoto2.spec Deleted

@@ -1,333 +0,0 @@
-########################################################################
-#
-# $Id$
-#
-# RPM spec file for libgphoto2
-#
-# TODO list concerning packaging
-# - review and coordinate RPM packaging for libgphoto2, gphoto2, gtkam
-#
-########################################################################
-
-%define debug_package %{nil}
-
-####################################
-Summary: Software for accessing digital cameras
-Name: libgphoto2
-Version: 2.5.18
-Release: 2
-License: LGPL
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-# sources only available from sf.net - but not wgettable.
-# Source: http://www.gphoto.org/dist/libgphoto2-2.5.18.tar.gz
-Source: http://prdownloads.sourceforge.net/gphoto/libgphoto2-2.5.18.tar.gz
-Url: http://www.gphoto.org/
-ExcludeArch: s390 s390x
-Provides: libgphoto2
-Provides: libgphoto2_port
-Requires: libgphoto2_port
-# absolute requirements
-PreReq: hotplug >= 2001_04_24-13
-PreReq: /sbin/ldconfig, grep, fileutils
-BuildRequires: findutils perl
-
-# the following requirements are optional
-#BuildRequires: gtk-doc
-Requires: libusb >= 0.1.8
-BuildRequires: libusb-devel >= 0.1.8
-
-####################################
-%description
-The gPhoto2 project is a universal, free application and library
-framework that lets you download images from several different
-digital camera models, including the newer models with USB
-connections. Note that
-a) for some older camera models you must use the old "gphoto" package.
-b) for USB mass storage models you must use the driver in the kernel
-
-This libgphoto2 package contains only the library that digital 
-camera applications can use.
-
-Frontend like the command-line utility gphoto2 and other (GUI)
-frontends are available seperately.
-
-####################################
-%package devel
-Summary: Headers and libraries to compile against the libgphoto2 library.
-Requires: %{name} = %{version}
-Provides: libgphoto2-devel
-Provides: libgphoto2_port-devel
-Group: Development/Libraries
-
-####################################
-%description devel
-The gPhoto2 project is a universal, free application and library
-framework that lets you download images from several different
-digital camera models, including the newer models with USB
-connections. Note that
-a) for some older camera models you must use the old "gphoto" package.
-b) for USB mass storage models you must use the driver in the kernel
-
-This libgphoto2-devel package contains the files needed to compile 
-frontends like the command-line utility gphoto2 and other (GUI)
-frontends, which are available seperately.
-
-
-########################################################################
-# Building and installing the beast into %{buildroot}
-########################################################################
-
-####################################
-%prep
-rm -rf "${RPM_BUILD_DIR}/%{name}-%{version}"
-%setup -q -n %{name}-%{version}
-
-####################################
-%build
-%define __libtoolize :
-# FIXME: We should copy the disable- arguments here
-##FIXMEPERCENTconfigure --enable-docs --with-docs-dir=%{buildroot}%{_docdir}/%{name}
-%configure --with-docs-dir=%{buildroot}%{_docdir}/%{name}
-make
-
-####################################
-%install
-rm -rf "${RPM_BUILD_ROOT}"
-
-# Convince gphoto2 to be packaged.
-perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \
-	libgphoto2_port/libgphoto2_port/libgphoto2_port.la
-
-%makeinstall
-
-# Fix up libtool libraries.
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g"
-
-#cp -a %{buildroot}%{_docdir}/%{name}-%{version}/html html
-#cp -a %{buildroot}%{_docdir}/libgphoto2_port-0.5.1/html/api/gphoto2-port html/api
-#find html -name '*.sgml' | xargs rm
-
-
-%find_lang libgphoto2-6
-# FIXME: Update this manually as long as libgphoto2_port has a
-#        different build system.
-%find_lang libgphoto2_port-0
-
-# build file list
-find %{buildroot} -type f -or -type l \
-        | sed 's!^%{buildroot}!!' | sort > %{name}-%{version}.all.files
-
-# extract .so libs
-egrep '\.so(\.0-9+)*$' \
-	< %{name}-%{version}.all.files > %{name}-%{version}.so.files
-egrep -v '\.so(\.0-9+)*$' \
-	< %{name}-%{version}.all.files > %{name}-%{version}.no-so.files
-
-# extract files for devel package
-egrep '(-config|\.h|\.la|\.a|\.pc|\.3)$' \
-	< %{name}-%{version}.no-so.files > %{name}-%{version}.devel.files
-egrep -v '(-config|\.h|\.la|\.a|\.pc|\.3)$' \
-	< %{name}-%{version}.no-so.files > %{name}-%{version}.no-devel.files
-
-# extract doc files
-egrep '^%{_docdir}' \
-	< %{name}-%{version}.no-devel.files > %{name}-%{version}.doc.files
-egrep -v '^%{_docdir}' \
-	< %{name}-%{version}.no-devel.files > %{name}-%{version}.no-doc.files
-
-# extract i18n files
-egrep '^%{_datadir}/locale' \
-	< %{name}-%{version}.no-doc.files > %{name}-%{version}.i18n.files
-egrep -v '^%{_datadir}/locale' \
-	< %{name}-%{version}.no-doc.files > %{name}-%{version}.no-i18n.files
-
-# extract misc files for lib package
-egrep '^(%{_libdir}|%{_datadir})/libgphoto2' \
-	< %{name}-%{version}.no-i18n.files > %{name}-%{version}.misc.files
-egrep -v '^(%{_libdir}|%{_datadir})/libgphoto2' \
-	< %{name}-%{version}.no-i18n.files > %{name}-%{version}.rest.files \
-	|| echo "non-zero exit code is not fatal here"
-
-if  -s %{name}-%{version}.rest.files 
-then
-	cat %{name}-%{version}.rest.files
-fi
-
-cat %{name}-%{version}.{so,doc,misc,i18n}.files \
-	> %{name}-%{version}.files
-
-# HACK
-touch debugfiles.list
-
-exit 0
-
-####################################
-%clean
-# FIXME: Cleanup deactiveated for debugging
-# rm -rf "${RPM_BUILD_ROOT}"
-
-########################################################################
-# file list and installation for main package
-########################################################################
-
-####################################
-%files -f %{name}-%{version}.files
-%defattr(-,root,root)
-# FIXME: correct %docxyz markup for doc files
-
-####################################
-%post
-
-# register libraries
-/sbin/ldconfig
-
-# add supported cameras to /etc/hotplug/usb.usermap
-grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.tmp
-%{_libdir}/libgphoto2/print-usb-usermap >> /etc/hotplug/usb.usermap.tmp
-mv /etc/hotplug/usb.usermap.tmp /etc/hotplug/usb.usermap
-
-####################################
-%postun
-
-# unregister libraries
-/sbin/ldconfig
-
-if  "$1" = 0 ; then
-    # remove supported cameras from /etc/hotplug/usb.usermap
-    # if erasing the package not as part of a package update
-    grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.new
-    mv /etc/hotplug/usb.usermap.new /etc/hotplug/usb.usermap
-fi
-
-
-########################################################################
-# file list and installation for -devel subpackage
-########################################################################
-
-####################################
-%files devel -f %{name}-%{version}.devel.files
-%defattr(-,root,root)
-#%doc html/api
-
-
-########################################################################
-# ChangeLog
-########################################################################
-%changelog
-* Thu Jun 20 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.1.4head
-- hack in correct find_lang arguments
-- fix misc. nagging little things preventing "rpmbuild -ta" from working
-
-* Thu Jun 20 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.1.0rc3-1
-- only --enable-docs and copy API docs if GTK_DOC found
-- use --with-doc-formats from local ./configure call
-
-* Tue May 28 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev8-1
-- comment out requirements if not used (gtk-doc, transfig)
-- provide libgphoto2_port - for future compatibility
-- fixed handling of misc HTML docs (API docs and docbook-generated manual)
-- install linux-hotplug scripts into a directory of that name
-- added gphoto2_port(3) man page
-
-* Sat May 18 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev6-1
-- added API HTML docs to the -devel package
-- added man page gphoto2(3), require hotplug >= 2001_04_24-13
-
-* Thu May  9 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev4-1
-- merged changes from current Redhat spec file into gphoto2 distribution
-  as they managed to get the beast to build
-- re-added FAQ to package (Redhat left it out regrettably)
-- only require hotplug 2001_04_24-11 instead of 2001_04_24-13
-
-* Mon Apr 29 2002 Tim Waugh <twaugh@redhat.com> 2.0-6
-- In fact, don't even build for mainframe.
-
-* Mon Apr 29 2002 Florian La Roche <Florian.LaRoche@redhat.de> 2.0-5
-- do not require hotplug for mainframe
-
-* Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0-4
-- Set the owner of the device to the console lock holder, not the owner
-  of /dev/console, in the hotplug agent, fixing access for users who log
-  in at VTs and use startx (#62976).
-
-* Fri Apr 12 2002 Tim Waugh <twaugh@redhat.com> 2.0-3
-- Rebuild (fixed bug #63355).
-
-* Sat Apr 06 2002 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- require libusb >= 0.0.5 and for building require transfig
-
-* Wed Feb 27 2002 Tim Waugh <twaugh@redhat.com> 2.0-2
-- Fix from CVS: close port unconditionally in gp_camera_exit().
-
-* Mon Feb 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-1
-- 2.0 is released.
-- Ship the .so symlinks in the devel package.
-
-* Mon Feb 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc4.1
-- 2.0rc4.
-
-* Fri Feb 22 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc3.1
-- 2.0rc3.  No longer need CVS patch.
-- Build no longer requires xmlto.
-
-* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc2.2
-- Fix DC240 hangs (patch from CVS).
-- Rebuild in new environment.
-
-* Tue Feb 19 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc2.1
-- 2.0rc2 (bug #59993).  No longer need docs patch or man page.
-- Really fix up libtool libraries (bug #60002).
-
-* Fri Feb 15 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta5.2
-- PreReq /sbin/ldconfig, grep, and fileutils (bug #59941).
-
-* Tue Feb 12 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta5.1
-- 2.0beta5.
-- Fix Makefiles so that documentation can be built.
-- Ship pkgconfig file.
-- Add man page.
-
-* Thu Feb  7 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta4.1
-- 2.0beta4.
-- Build requires transfig, and at least version 0.1.5 of libusb.
-- Clean up file lists.
-- Build documentation.
-
-* Fri Jan 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta3.2
-- Rebuild in new environment.
-- Dump docbook-dtd30-sgml requirement; gtk-doc is sufficient.
-
-* Sun Nov 18 2001 Tim Waugh <twaugh@redhat.com> 2.0-0.beta3.1
-- Adapted for Red Hat Linux.
-
-* Sat Oct 27 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- fixed update behaviour for hotplug list (do not erase it when updating)
-
-* Thu Oct 25 2001 Tim Waugh <twaugh@redhat.com>
-- hotplug dependency is a prereq not a requires (the package scripts
-  need it)
-
-* Sun Oct 14 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- integrated spec file into source package
-
-* Sun Oct 14 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- 2.0beta3
-
-* Tue Oct  2 2001 Tim Waugh <twaugh@redhat.com> 2.0beta2-0.1
-- Adapted for Red Hat Linux.
-- 2.0beta2.
-
-* Mon Aug  6 2001 Till Kamppeter <till@mandrakesoft.com> 2.0-0.beta1.2mdk
-- Corrected "Requires:"
-
-* Mon Aug  6 2001 Till Kamppeter <till@mandrakesoft.com> 2.0-0.beta1.1mdk
-- Initial release
-
-
-
-########################################################################
-# Local Variables:
-# mode: rpm-spec
-# End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/rpm/package.spec.in Deleted

@@ -1,333 +0,0 @@
-########################################################################
-#
-# $Id$
-#
-# RPM spec file for @PACKAGE@
-#
-# TODO list concerning packaging
-# - review and coordinate RPM packaging for libgphoto2, gphoto2, gtkam
-#
-########################################################################
-
-%define debug_package %{nil}
-
-####################################
-Summary: Software for accessing digital cameras
-Name: @PACKAGE@
-Version: @VERSION@
-Release: 2
-License: LGPL
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-# sources only available from sf.net - but not wgettable.
-# Source: http://www.gphoto.org/dist/@PACKAGE@-@VERSION@.tar.gz
-Source: http://prdownloads.sourceforge.net/gphoto/@PACKAGE@-@VERSION@.tar.gz
-Url: @URL_GPHOTO_HOME@
-ExcludeArch: s390 s390x
-Provides: libgphoto2
-Provides: libgphoto2_port
-Requires: libgphoto2_port
-# absolute requirements
-PreReq: hotplug >= 2001_04_24-13
-PreReq: /sbin/ldconfig, grep, fileutils
-BuildRequires: findutils perl
-
-# the following requirements are optional
-@ENABLE_GTK_DOC_TRUE@BuildRequires: gtk-doc
-Requires: libusb >= 0.1.8
-BuildRequires: libusb-devel >= 0.1.8
-
-####################################
-%description
-The gPhoto2 project is a universal, free application and library
-framework that lets you download images from several different
-digital camera models, including the newer models with USB
-connections. Note that
-a) for some older camera models you must use the old "gphoto" package.
-b) for USB mass storage models you must use the driver in the kernel
-
-This libgphoto2 package contains only the library that digital 
-camera applications can use.
-
-Frontend like the command-line utility gphoto2 and other (GUI)
-frontends are available seperately.
-
-####################################
-%package devel
-Summary: Headers and libraries to compile against the libgphoto2 library.
-Requires: %{name} = %{version}
-Provides: libgphoto2-devel
-Provides: libgphoto2_port-devel
-Group: Development/Libraries
-
-####################################
-%description devel
-The gPhoto2 project is a universal, free application and library
-framework that lets you download images from several different
-digital camera models, including the newer models with USB
-connections. Note that
-a) for some older camera models you must use the old "gphoto" package.
-b) for USB mass storage models you must use the driver in the kernel
-
-This libgphoto2-devel package contains the files needed to compile 
-frontends like the command-line utility gphoto2 and other (GUI)
-frontends, which are available seperately.
-
-
-########################################################################
-# Building and installing the beast into %{buildroot}
-########################################################################
-
-####################################
-%prep
-rm -rf "${RPM_BUILD_DIR}/%{name}-%{version}"
-%setup -q -n %{name}-%{version}
-
-####################################
-%build
-%define __libtoolize :
-# FIXME: We should copy the disable- arguments here
-#@ENABLE_GTK_DOC_TRUE@FIXMEPERCENTconfigure --enable-docs --with-docs-dir=%{buildroot}%{_docdir}/%{name}
-%configure --with-docs-dir=%{buildroot}%{_docdir}/%{name}
-make
-
-####################################
-%install
-rm -rf "${RPM_BUILD_ROOT}"
-
-# Convince gphoto2 to be packaged.
-perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \
-	libgphoto2_port/libgphoto2_port/libgphoto2_port.la
-
-%makeinstall
-
-# Fix up libtool libraries.
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g"
-
-@ENABLE_GTK_DOC_TRUE@cp -a %{buildroot}%{_docdir}/%{name}-%{version}/html html
-@ENABLE_GTK_DOC_TRUE@cp -a %{buildroot}%{_docdir}/libgphoto2_port-0.5.1/html/api/gphoto2-port html/api
-@ENABLE_GTK_DOC_TRUE@find html -name '*.sgml' | xargs rm
-
-
-%find_lang @GETTEXT_PACKAGE@
-# FIXME: Update this manually as long as libgphoto2_port has a
-#        different build system.
-%find_lang libgphoto2_port-0
-
-# build file list
-find %{buildroot} -type f -or -type l \
-        | sed 's!^%{buildroot}!!' | sort > %{name}-%{version}.all.files
-
-# extract .so libs
-egrep '\.so(\.0-9+)*$' \
-	< %{name}-%{version}.all.files > %{name}-%{version}.so.files
-egrep -v '\.so(\.0-9+)*$' \
-	< %{name}-%{version}.all.files > %{name}-%{version}.no-so.files
-
-# extract files for devel package
-egrep '(-config|\.h|\.la|\.a|\.pc|\.3)$' \
-	< %{name}-%{version}.no-so.files > %{name}-%{version}.devel.files
-egrep -v '(-config|\.h|\.la|\.a|\.pc|\.3)$' \
-	< %{name}-%{version}.no-so.files > %{name}-%{version}.no-devel.files
-
-# extract doc files
-egrep '^%{_docdir}' \
-	< %{name}-%{version}.no-devel.files > %{name}-%{version}.doc.files
-egrep -v '^%{_docdir}' \
-	< %{name}-%{version}.no-devel.files > %{name}-%{version}.no-doc.files
-
-# extract i18n files
-egrep '^%{_datadir}/locale' \
-	< %{name}-%{version}.no-doc.files > %{name}-%{version}.i18n.files
-egrep -v '^%{_datadir}/locale' \
-	< %{name}-%{version}.no-doc.files > %{name}-%{version}.no-i18n.files
-
-# extract misc files for lib package
-egrep '^(%{_libdir}|%{_datadir})/libgphoto2' \
-	< %{name}-%{version}.no-i18n.files > %{name}-%{version}.misc.files
-egrep -v '^(%{_libdir}|%{_datadir})/libgphoto2' \
-	< %{name}-%{version}.no-i18n.files > %{name}-%{version}.rest.files \
-	|| echo "non-zero exit code is not fatal here"
-
-if  -s %{name}-%{version}.rest.files 
-then
-	cat %{name}-%{version}.rest.files
-fi
-
-cat %{name}-%{version}.{so,doc,misc,i18n}.files \
-	> %{name}-%{version}.files
-
-# HACK
-touch debugfiles.list
-
-exit 0
-
-####################################
-%clean
-# FIXME: Cleanup deactiveated for debugging
-# rm -rf "${RPM_BUILD_ROOT}"
-
-########################################################################
-# file list and installation for main package
-########################################################################
-
-####################################
-%files -f %{name}-%{version}.files
-%defattr(-,root,root)
-# FIXME: correct %docxyz markup for doc files
-
-####################################
-%post
-
-# register libraries
-/sbin/ldconfig
-
-# add supported cameras to /etc/hotplug/usb.usermap
-grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.tmp
-%{_libdir}/@PACKAGE@/print-usb-usermap >> /etc/hotplug/usb.usermap.tmp
-mv /etc/hotplug/usb.usermap.tmp /etc/hotplug/usb.usermap
-
-####################################
-%postun
-
-# unregister libraries
-/sbin/ldconfig
-
-if  "$1" = 0 ; then
-    # remove supported cameras from /etc/hotplug/usb.usermap
-    # if erasing the package not as part of a package update
-    grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.new
-    mv /etc/hotplug/usb.usermap.new /etc/hotplug/usb.usermap
-fi
-
-
-########################################################################
-# file list and installation for -devel subpackage
-########################################################################
-
-####################################
-%files devel -f %{name}-%{version}.devel.files
-%defattr(-,root,root)
-@ENABLE_GTK_DOC_TRUE@%doc html/api
-
-
-########################################################################
-# ChangeLog
-########################################################################
-%changelog
-* Thu Jun 20 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.1.4head
-- hack in correct find_lang arguments
-- fix misc. nagging little things preventing "rpmbuild -ta" from working
-
-* Thu Jun 20 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.1.0rc3-1
-- only --enable-docs and copy API docs if GTK_DOC found
-- use --with-doc-formats from local ./configure call
-
-* Tue May 28 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev8-1
-- comment out requirements if not used (gtk-doc, transfig)
-- provide libgphoto2_port - for future compatibility
-- fixed handling of misc HTML docs (API docs and docbook-generated manual)
-- install linux-hotplug scripts into a directory of that name
-- added gphoto2_port(3) man page
-
-* Sat May 18 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev6-1
-- added API HTML docs to the -devel package
-- added man page gphoto2(3), require hotplug >= 2001_04_24-13
-
-* Thu May  9 2002 Hans Ulrich Niedermann <gp@n-dimensional.de> 2.0.1dev4-1
-- merged changes from current Redhat spec file into gphoto2 distribution
-  as they managed to get the beast to build
-- re-added FAQ to package (Redhat left it out regrettably)
-- only require hotplug 2001_04_24-11 instead of 2001_04_24-13
-
-* Mon Apr 29 2002 Tim Waugh <twaugh@redhat.com> 2.0-6
-- In fact, don't even build for mainframe.
-
-* Mon Apr 29 2002 Florian La Roche <Florian.LaRoche@redhat.de> 2.0-5
-- do not require hotplug for mainframe
-
-* Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0-4
-- Set the owner of the device to the console lock holder, not the owner
-  of /dev/console, in the hotplug agent, fixing access for users who log
-  in at VTs and use startx (#62976).
-
-* Fri Apr 12 2002 Tim Waugh <twaugh@redhat.com> 2.0-3
-- Rebuild (fixed bug #63355).
-
-* Sat Apr 06 2002 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- require libusb >= 0.0.5 and for building require transfig
-
-* Wed Feb 27 2002 Tim Waugh <twaugh@redhat.com> 2.0-2
-- Fix from CVS: close port unconditionally in gp_camera_exit().
-
-* Mon Feb 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-1
-- 2.0 is released.
-- Ship the .so symlinks in the devel package.
-
-* Mon Feb 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc4.1
-- 2.0rc4.
-
-* Fri Feb 22 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc3.1
-- 2.0rc3.  No longer need CVS patch.
-- Build no longer requires xmlto.
-
-* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc2.2
-- Fix DC240 hangs (patch from CVS).
-- Rebuild in new environment.
-
-* Tue Feb 19 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.rc2.1
-- 2.0rc2 (bug #59993).  No longer need docs patch or man page.
-- Really fix up libtool libraries (bug #60002).
-
-* Fri Feb 15 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta5.2
-- PreReq /sbin/ldconfig, grep, and fileutils (bug #59941).
-
-* Tue Feb 12 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta5.1
-- 2.0beta5.
-- Fix Makefiles so that documentation can be built.
-- Ship pkgconfig file.
-- Add man page.
-
-* Thu Feb  7 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta4.1
-- 2.0beta4.
-- Build requires transfig, and at least version 0.1.5 of libusb.
-- Clean up file lists.
-- Build documentation.
-
-* Fri Jan 25 2002 Tim Waugh <twaugh@redhat.com> 2.0-0.beta3.2
-- Rebuild in new environment.
-- Dump docbook-dtd30-sgml requirement; gtk-doc is sufficient.
-
-* Sun Nov 18 2001 Tim Waugh <twaugh@redhat.com> 2.0-0.beta3.1
-- Adapted for Red Hat Linux.
-
-* Sat Oct 27 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- fixed update behaviour for hotplug list (do not erase it when updating)
-
-* Thu Oct 25 2001 Tim Waugh <twaugh@redhat.com>
-- hotplug dependency is a prereq not a requires (the package scripts
-  need it)
-
-* Sun Oct 14 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- integrated spec file into source package
-
-* Sun Oct 14 2001 Hans Ulrich Niedermann <gp@n-dimensional.de>
-- 2.0beta3
-
-* Tue Oct  2 2001 Tim Waugh <twaugh@redhat.com> 2.0beta2-0.1
-- Adapted for Red Hat Linux.
-- 2.0beta2.
-
-* Mon Aug  6 2001 Till Kamppeter <till@mandrakesoft.com> 2.0-0.beta1.2mdk
-- Corrected "Requires:"
-
-* Mon Aug  6 2001 Till Kamppeter <till@mandrakesoft.com> 2.0-0.beta1.1mdk
-- Initial release
-
-
-
-########################################################################
-# Local Variables:
-# mode: rpm-spec
-# End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/Makefile.am Deleted

@@ -1,51 +0,0 @@
-if ENABLED_GP2DDB
-flexbison_PROGRAMS_ = test-ddb
-flexbison_check_SCRIPTS_ = check-ddb.sh
-flexbison_BUILT_SOURCES_ = ddb-txt.tab.c ddb-txt.tab.h ddb-txt.yy.c
-flexbison_CLEANFILES_ = ddb-txt.output
-endif
-
-check_PROGRAMS = $(flexbison_PROGRAMS_)
-
-check_SCRIPTS = \
-	$(flexbison_check_SCRIPTS_)
-
-EXTRA_DIST = \
-	README.ddb \
-	check-ddb.sh.in \
-	ddb-txt.l \
-	ddb-txt.y
-
-INSTALL_TESTS = $(check_SCRIPTS)
-
-# TESTS = $(check_SCRIPTS)
-
-BUILT_SOURCES = $(flexbison_BUILT_SOURCES_)
-CLEANFILES = $(check_SCRIPTS) $(BUILT_SOURCES) $(flexbison_CLEANFILES_) gp2ddb.txt
-
-test_ddb_SOURCES = $(flexbison_BUILT_SOURCES_) test-ddb.c ddb-common.c ddb-common.h
-test_ddb_LDADD = \
-	-lfl \
-	$(top_builddir)/libgphoto2/libgphoto2.la \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(LIBEXIF_LIBS) \
-	$(INTLLIBS)
-
-ddb-txt.yy.c: ddb-txt.l ddb-txt.tab.h
-	$(FLEX) -o$@ $<
-
-ddb-txt.tab.h: ddb-txt.tab.c
-ddb-txt.tab.c ddb-txt.tab.h: ddb-txt.y
-	$(BISON) -v $<
-
-check-ddb.sh: check-ddb.sh.in $(top_builddir)/packaging/generic/print-camera-list test-ddb
-
-clean-local:
-	rm -f *.s *.i
-
-$(top_builddir)/packaging/generic/print-camera-list:
-	cd $(top_builddir)/packaging/generic && $(MAKE) print-camera-list
-
-include $(top_srcdir)/installcheck.mk
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/Makefile.in Deleted

@@ -1,779 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 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@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -dEDm) skip_next=yes;; \
-      -JT) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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@
-check_PROGRAMS = $(am__EXEEXT_1)
-subdir = tests/ddb
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
-	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
-	$(top_srcdir)/auto-m4/lib-link.m4 \
-	$(top_srcdir)/auto-m4/lib-prefix.m4 \
-	$(top_srcdir)/auto-m4/libtool.m4 \
-	$(top_srcdir)/auto-m4/ltoptions.m4 \
-	$(top_srcdir)/auto-m4/ltsugar.m4 \
-	$(top_srcdir)/auto-m4/ltversion.m4 \
-	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
-	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
-	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = check-ddb.sh
-CONFIG_CLEAN_VPATH_FILES =
-@ENABLED_GP2DDB_TRUE@am__EXEEXT_1 = test-ddb$(EXEEXT)
-am__test_ddb_SOURCES_DIST = ddb-txt.tab.c ddb-txt.tab.h ddb-txt.yy.c \
-	test-ddb.c ddb-common.c ddb-common.h
-@ENABLED_GP2DDB_TRUE@am__objects_1 = ddb-txt.tab.$(OBJEXT) \
-@ENABLED_GP2DDB_TRUE@	ddb-txt.yy.$(OBJEXT)
-am_test_ddb_OBJECTS = $(am__objects_1) test-ddb.$(OBJEXT) \
-	ddb-common.$(OBJEXT)
-test_ddb_OBJECTS = $(am_test_ddb_OBJECTS)
-am__DEPENDENCIES_1 =
-test_ddb_DEPENDENCIES = $(top_builddir)/libgphoto2/libgphoto2.la \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-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_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/auto-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(test_ddb_SOURCES)
-DIST_SOURCES = $(am__test_ddb_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items$$0 = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/check-ddb.sh.in \
-	$(top_srcdir)/auto-aux/depcomp \
-	$(top_srcdir)/auto-aux/mkinstalldirs \
-	$(top_srcdir)/installcheck.mk
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_OUTPUT_DIR = @DOXYGEN_OUTPUT_DIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTKDOC = @GTKDOC@
-HAVE_DOT = @HAVE_DOT@
-HTML_APIDOC_DIR = @HTML_APIDOC_DIR@
-HTML_APIDOC_INTERNALS_DIR = @HTML_APIDOC_INTERNALS_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
-LIBEXIF_LIBS = @LIBEXIF_LIBS@
-LIBGD_CFLAGS = @LIBGD_CFLAGS@
-LIBGD_CONFIG_PROG = @LIBGD_CONFIG_PROG@
-LIBGD_LIBS = @LIBGD_LIBS@
-LIBGPHOTO2_AGE = @LIBGPHOTO2_AGE@
-LIBGPHOTO2_CURRENT = @LIBGPHOTO2_CURRENT@
-LIBGPHOTO2_CURRENT_MIN = @LIBGPHOTO2_CURRENT_MIN@
-LIBGPHOTO2_REVISION = @LIBGPHOTO2_REVISION@
-LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
-LIBLTDL = @LIBLTDL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTDLINCL = @LTDLINCL@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
-MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
-MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNUSED_CFLAGS = @NO_UNUSED_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-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@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
-REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
-REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
-URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
-URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
-URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
-URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-apidocdir = @apidocdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-camlibdir = @camlibdir@
-camlibdocdir = @camlibdocdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hotplugdocdir = @hotplugdocdir@
-hotplugusermapdir = @hotplugusermapdir@
-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@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevscriptdir = @udevscriptdir@
-utilsdir = @utilsdir@
-@ENABLED_GP2DDB_TRUE@flexbison_PROGRAMS_ = test-ddb
-@ENABLED_GP2DDB_TRUE@flexbison_check_SCRIPTS_ = check-ddb.sh
-@ENABLED_GP2DDB_TRUE@flexbison_BUILT_SOURCES_ = ddb-txt.tab.c ddb-txt.tab.h ddb-txt.yy.c
-@ENABLED_GP2DDB_TRUE@flexbison_CLEANFILES_ = ddb-txt.output
-check_SCRIPTS = \
-	$(flexbison_check_SCRIPTS_)
-
-EXTRA_DIST = \
-	README.ddb \
-	check-ddb.sh.in \
-	ddb-txt.l \
-	ddb-txt.y
-
-INSTALL_TESTS = $(check_SCRIPTS)
-
-# TESTS = $(check_SCRIPTS)
-BUILT_SOURCES = $(flexbison_BUILT_SOURCES_)
-CLEANFILES = $(check_SCRIPTS) $(BUILT_SOURCES) $(flexbison_CLEANFILES_) gp2ddb.txt
-test_ddb_SOURCES = $(flexbison_BUILT_SOURCES_) test-ddb.c ddb-common.c ddb-common.h
-test_ddb_LDADD = \
-	-lfl \
-	$(top_builddir)/libgphoto2/libgphoto2.la \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(LIBEXIF_LIBS) \
-	$(INTLLIBS)
-
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/installcheck.mk $(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) --foreign tests/ddb/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tests/ddb/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_srcdir)/installcheck.mk $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-check-ddb.sh: $(top_builddir)/config.status $(srcdir)/check-ddb.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-test-ddb$(EXEEXT): $(test_ddb_OBJECTS) $(test_ddb_DEPENDENCIES) $(EXTRA_test_ddb_DEPENDENCIES) 
-	@rm -f test-ddb$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_ddb_OBJECTS) $(test_ddb_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb-txt.tab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb-txt.yy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ddb.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-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
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile
-installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) 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:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-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."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-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: installcheck-local
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all check check-am install install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags 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 installcheck-local installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-ddb-txt.yy.c: ddb-txt.l ddb-txt.tab.h
-	$(FLEX) -o$@ $<
-
-ddb-txt.tab.h: ddb-txt.tab.c
-ddb-txt.tab.c ddb-txt.tab.h: ddb-txt.y
-	$(BISON) -v $<
-
-check-ddb.sh: check-ddb.sh.in $(top_builddir)/packaging/generic/print-camera-list test-ddb
-
-clean-local:
-	rm -f *.s *.i
-
-$(top_builddir)/packaging/generic/print-camera-list:
-	cd $(top_builddir)/packaging/generic && $(MAKE) print-camera-list
-
-# FIXME: Only run this if not cross-compiling
-installcheck-local: $(INSTALL_TESTS) $(INSTALLCHECK_DEPS)
-	@total=0; failed=0; success=0; ignored=0; \
-	echo "Running \"installcheck\" test cases..."; \
-	for script in $(INSTALL_TESTS); do \
-		echo "Test case: $$script"; \
-		total="$$(expr $$total + 1)"; \
-		if test -f "./$$script"; then dir="./"; \
-		elif test -f "$$script"; then dir=""; \
-		else dir="$(srcdir)/"; fi; \
-		if $(INSTALL_TESTS_ENVIRONMENT) "$$dir/$$script"; then \
-			echo "SUCCEEDED: $$script"; \
-			success="$$(expr $$success + 1)"; \
-		else \
-			s="$$?"; \
-			if test "$$s" = "77"; then \
-				echo "FAILURE IGNORED (return code $$s): $$script"; \
-				ignored="$$(expr $$ignored + 1)"; \
-			else \
-				echo "FAILED (return code $$s): $$script"; \
-				failed="$$(expr $$failed + 1)"; \
-			fi; \
-		fi; \
-	done; \
-	echo "Test summary: $$success succeeded, $$failed failed, $$ignored failures ignored, $$total tests in total."; \
-	if test "$$failed" -gt 0; then \
-		echo "Error: One or more \"installcheck\" testcases have failed."; \
-		exit 1; \
-	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:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/README.ddb Deleted

@@ -1,158 +0,0 @@
-========================================================================
-The gphoto2 device database (gp2ddb)
-========================================================================
-
-Important: This is a prototype the developers can play with. The final
-           version will probably look much different, so don't invest
-           too much in it (yet).
-
-References:
-  1 http://article.gmane.org/gmane.comp.multimedia.gphoto.devel/2262
-      Hubert's posting from 2006-01-01 proposing storage in XML.
-
-
-Note: We try to talk of "devices" and "drivers" instead of "cameras"
-      and "camlibs" since we also support digital audio players.
-
-
-=============================================
-The idea
-========
-
- * Maintain a device database (DDB) of cameras (and audio players),
-   their abilities etc. independently from the libgphoto2 drivers.
-
- * Updates to the database are much easier to publish than updates to
-   the drivers which need to be compiled.
-
- * libgphoto2 uses the DDB to find out which driver to load for a
-   given device.
-
- * drivers use the DDB to read special driver specific information on
-   that device.
-
- * Other software (HAL, udev, hotplug, etc.) is served by converters
-   from DDB.
-
-
-=============================================
-The implementation
-==================
-
- * A flex/bison based parser for text based config.
-
- * The specific details of the text format is not completely ironed
-   out yet.
-
- * It is possible to use some HAL device database instead, but do we
-   really want to require HAL/XML/...? Depends whether we target
-   embedded or desktop environments.
-
- * print-camera-list prints the current config in the new format
-   (minus driver internal settings ?)
-
- * driver specific settings can be accommodated using the
-   driver_options { ... }; section.
-
- * The binary code (stripped) for the test case is about 22KByte. I
-   suppose we could implement this database in about 35 to 40 KByte.
-   However, we can probably get rid of some code in the drivers to
-   compensate. 
-   For comparison:
-    * The current libgphoto2.so is about 120 KByte stripped. 
-    * libxml2.so is 1.2MB (stripped).
-
-
-=============================================
-The testcase
-============
-
- * The testcase check-ddb.sh checks that the CameraAbilitiesList read
-   from the text database is the same one read from the drivers via
-   gp_abilities_list_load() - for all 700something cameras.
-
-
-=============================================
-How to test it
-==============
-
- * Add --enable-gp2ddb to your ./configure parameters.
-
- * Run "make check".
-
- * Have a look into tests/ddb/.
-
-
-=============================================
-TODO
-====
-
-What would need to be done to go into production with this:
-
- * Find a way to integrate the gphoto2 DDB with the HAL device 
-   database, possibly using a sub/superset of the HAL device
-   database. However, HAL does its stuff in XML, and we probably don't
-   want libgphoto2 to depend on an XML parser.
-
- * Add driver specific parameters to DDB.
-
- * Rewrite gp_abilities_list_load() to read the data currently stored
-   in the CameryAbilities records and all driver specific information
-   from the DDB.
-
-   This should probably use a caching approach, i.e. it should check
-   the mtime of (the files in) /etc/libgphoto2.d/ and compare that to
-   the mtime of a binary cache file in ~/.gphoto/ddb-cache.
-
-   The compiler which creates this cache file needs to be embedded in
-   libgphoto2 itself (so that libgphoto2 can "just work") but should
-   also be available as a separate tool for embedded use cases. These
-   embedded systems could then compile the ddb-cache at build time,
-   just read in the cache, and not ship the parser/compiler at all.
-
-   Another possibility would be to statically compile the binary
-   version of the database into libgphoto2 for small-footprint
-   applications.
-
- * Rewrite all drivers to read their device specific parameters from
-   the new CameraAbilities record.
-
- * Maintain binary compatibility for applications.
-
- * Administration utilities convert the DDB to something HAL, udev, and
-   other similar hotplug-device-management systems use to figure out
-   the device type, what program to launch to handle such devices, and
-   how to set up permissions. This is partly done in print-camera-list.
-
- * Administration utilities to maintain the DDB in the face of
-
-     - updates from the gphoto project
-     - updates by the user
-     - update by third parties
-
-   One solution to the problem could be a directory structure like
-
-      /etc/libgphoto2.d/camlib-agfa.ddb # the devices from the agfa camlib
-      /etc/libgphoto2.d/camlib-canon.ddb # the devices from the canon camlib
-      /etc/libgphoto2.d/camlib-ptp2.ddb # the devices from the ptp2 camlib
-      /etc/libgphoto2.d/foo.ddb # devices the user got from somewhere
-      /etc/libgphoto2.d/bar.ddb # devices the user got from somewhere
-
- * Check whether there wouldn't be an XML parsing library with a much
-   smaller footprint than the 1.2MB of libxml2.
-
- * The DDB device names should be Unicode strings.
-
- * There must be structured information on device names, e.g. the
-   vendor must be readable without parsing strings.
-
- * Store other device information in the DDB which may be of interest
-   for a libgphoto2 frontend, e.g.
-    - thumbnail images of the devices themselves.
-    - camera features like capture modes, can delete single files, can
-      delete all files, can mark downloaded files, can upload files
-
-
-========================================================================
-End of file README.ddb.
-========================================================================

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/check-ddb.sh.in Deleted

@@ -1,38 +0,0 @@
-#!/bin/sh
-# "make installcheck" testcase:
-# Compares camera list printed by by print-camera-list and parsed by
-#test-ddb with the camera list from gp_abilities_list_load().
-# Fails if differences are found.
-
-set -ex
-
-debug=:
-#debug=false
-
-PACKAGE_TARNAME="${PACKAGE_TARNAME-"@PACKAGE_TARNAME@"}"
-prefix="${prefix-"@prefix@"}"
-exec_prefix="${exec_prefix-"@exec_prefix@"}"
-libdir="${libdir-"@libdir@"}"
-libexecdir="${libexecdir-"@libexecdir@"}"
-camlibdir="${camlibdir-"@camlibdir@"}"
-utilsdir="${utilsdir-"@utilsdir@"}"
-CAMLIBS="${DESTDIR}${camlibdir}"
-export CAMLIBS
-LD_LIBRARY_PATH="${DESTDIR}/${libdir}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
-export LD_LIBRARY_PATH
-
-if "$debug"; then
-    echo "====================="
-    pwd
-    echo "camlibdir=$camlibdir"
-    echo "libdir=$libdir"
-    echo "utilsdir=$utilsdir"
-    echo "DESTDIR=$DESTDIR"
-    echo "CAMLIBS=$CAMLIBS"
-    echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-    echo "#####################"
-fi
-
-${DESTDIR}${utilsdir}/print-camera-list gp2ddb > gp2ddb.txt
-
-./test-ddb --compare < gp2ddb.txt

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-common.c Deleted

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-common.h Deleted

@@ -1,86 +0,0 @@
-/** \file ddb-common.h
- * \author Copyright (C) 2006 Hans Ulrich Niedermann
- *
- * \note
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * \note
- * This library 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
- * Lesser General Public License for more details. 
- *
- * \note
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef __DDB_TXT_H__
-#define __DDB_TXT_H__
-
-#include <stdio.h>
-#include <gphoto2/gphoto2-abilities-list.h>
-
-typedef union {
-  char *str_val;
-  unsigned int ui_val;
-} symtype;
-
-#define YYSTYPE symtype
-
-extern int yylineno;
-
-void
-yyerror (const char *filename, CameraAbilitiesList *al, 
-	 const char *str);
-
-int
-yyparse (const char *filenname, CameraAbilitiesList *al);
-
-#define YYLTYPE my_yyltype
-
-typedef struct {
-  int lineno;
-  int column;
-  const char *filename;
-} FilePosition;
-
-typedef struct YYLTYPE {
-  FilePosition begin, end;
-} YYLTYPE;
-
-
-#define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-  do									\
-    if (N)								\
-      {									\
-	(Current).begin.lineno = YYRHSLOC(Rhs, 1).begin.lineno;		\
-	(Current).begin.column = YYRHSLOC(Rhs, 1).begin.column;		\
-	(Current).end.lineno   = YYRHSLOC(Rhs, N).end.lineno;		\
-	(Current).end.lineno   = YYRHSLOC(Rhs, N).end.column;		\
-      }									\
-    else								\
-      {									\
-	(Current).begin.lineno = (Current).end.lineno =		\
-	  YYRHSLOC(Rhs, 0).end.lineno;					\
-	(Current).begin.column = (Current).end.column =		\
-	  YYRHSLOC(Rhs, 0).end.column;					\
-      }									\
-  while (0)
-
-#define YY_DECL int yylex (void)
-YY_DECL;
-/* #define YYLEX_PARAM void */
-
-/* #define YYDEBUG 1 */
-
-extern FILE *yyin;
-
-void lexer_reset(const char *_filename);
-
-#endif /* !__DDB_TXT_H__ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-txt.l Deleted

@@ -1,114 +0,0 @@
-/** \file ddb-txt.l
- * \author Copyright (C) 2006 Hans Ulrich Niedermann
- *
- * \note
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * \note
- * This library 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
- * Lesser General Public License for more details. 
- *
- * \note
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-%option nounput
-%option noyywrap
-%option yylineno
-%option nobackup
-
-%{
-#include <stdlib.h>
-#include <errno.h>
-#define _GNU_SOURCE
-#include <string.h>
-#include "ddb-common.h"
-#include "ddb-txt.tab.h"
-
-//#if !(YYDEBUG)
-# define ECHO do {} while (0)
-//#endif
-
-extern char *strndup(const char *s, size_t n);
-
-static char *filename = NULL;
-
-YYSTYPE yylval = { str_val: NULL };
-
-static void lexer_error(const char *msg);
-
-%}
-
-%%
-\#.*$            { /* ignore comment */ }
-"interface"	 { ECHO; return TOK_INTERFACE; }
-"{"		 { ECHO; return TOK_BEGIN; }
-"driver"	 { ECHO; return TOK_DRIVER; }
-"device"	 { ECHO; return TOK_DEVICE; }
-"}"              { ECHO; return TOK_END; }
-"serial"         { ECHO; return TOK_SERIAL; }
-"usb"            { ECHO; return TOK_USB; }
-"disk"           { ECHO; return TOK_DISK; }
-"ptpip"          { ECHO; return TOK_PTPIP; }
-"class"          { ECHO; return TOK_CLASS; }
-"subclass"       { ECHO; return TOK_SUBCLASS; }
-"protocol"       { ECHO; return TOK_PROTOCOL; }
-"vendor"         { ECHO; return TOK_VENDOR; }
-"product"        { ECHO; return TOK_PRODUCT; }
-"speeds"         { ECHO; return TOK_SPEEDS; }
-"operations"     { ECHO; return TOK_OPERATIONS; }
-"driver_options" { ECHO; return TOK_DRIVER_OPTIONS; }
-"option"         { ECHO; return TOK_OPTION; }
-"file_operations" { ECHO; return TOK_FILE_OPERATIONS; }
-"folder_operations" { ECHO; return TOK_FOLDER_OPERATIONS; }
-"driver_status"  { ECHO; return TOK_DRIVER_STATUS; }
-"device_type"    { ECHO; return TOK_DEVICE_TYPE; }
-("none"|"config"|"capture_image"|"capture_video"|"capture_audio"|"capture_preview"|"delete"|"preview"|"raw"|"audio"|"exif"|"delete_all"|"put_file"|"make_dir"|"remove_dir"|"production"|"testing"|"experimental"|"deprecated"|"still_camera"|"audio_player") {
-                  ECHO;
-                  yylval.str_val = strndup(yytext, yyleng);
-                  return VAL_FLAG;
-                }
-";"             { ECHO; return TOK_SEP; }
-","             { ECHO; return TOK_COMMA; }
-\"A-Za-z0-9\.\+\-<>\|_/()!:,;=\\\$\'@&%\{\}\\+#~\* +\"    { ECHO; 
-			yylval.str_val = strndup(yytext, yyleng);
-			return TOK_STRING;
-		}
-(0x)?0-9a-fA-F+    {ECHO;
-			yylval.ui_val = strtoul(yytext, NULL, 0);
-			if ((ERANGE == errno) && 
-			    (ULONG_MAX == yylval.ui_val)) {
-				lexer_error("Number out of range");
-			} else if (EINVAL == errno) {
-				lexer_error("Invalid number");
-			}
-			return TOK_NUMBER;
-		}
-\n              { ECHO; /* ignore newlines */ }
- \t\r+        { ECHO; /* ignore whitespace */ }
-.               {
-			static char msg = "unexpected character (in string?) '?'";
-			msgstrlen(msg)-2 = yytext0;
-			lexer_error(msg);
-		}
-%%
-
-void lexer_reset(const char *_filename)
-{
-  filename = (char *) _filename;
-}
-
-static void lexer_error(const char *msg)
-{
-  fprintf(stderr, "%s:%d: lexer error: %s\n",
-		  filename, yylineno, msg);
-  exit(4);
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-txt.tab.c Deleted

@@ -1,1966 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 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
-   the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 23 "ddb-txt.y" /* yacc.c:339  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gphoto2/gphoto2-abilities-list.h>
-
-#include "ddb-common.h"
-#include "ddb-txt.tab.h"
-
-
-extern char *yytext;
-
-
-char *current_driver = NULL;
-char *current_device_name = NULL;
-CameraAbilities ca;
-unsigned int speed_index = 0;
-
-char *alloc_parse_string(char *s);
-
-char *error_string = NULL;
-     
-static void reset_ca(void);
-
-
-#ifdef __GNUC__
-#define __unused__ __attribute__((unused))
-#else
-#define __unused__
-#endif
-
-
-static int
-compare_camera_abilities(const CameraAbilities *a, 
-			 const CameraAbilities *b);
-
-
-
-#line 106 "ddb-txt.tab.c" /* yacc.c:339  */
-
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* In a future release of Bison, this section will be replaced
-   by #include "ddb-txt.tab.h".  */
-#ifndef YY_YY_DDB_TXT_TAB_H_INCLUDED
-# define YY_YY_DDB_TXT_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    TOK_SEP = 258,
-    TOK_COMMA = 259,
-    TOK_WHITESPACE = 260,
-    TOK_NEWLINE = 261,
-    TOK_NUMBER = 262,
-    TOK_STRING = 263,
-    TOK_INTERFACE = 264,
-    TOK_DRIVER = 265,
-    TOK_DEVICE = 266,
-    TOK_BEGIN = 267,
-    TOK_END = 268,
-    TOK_SERIAL = 269,
-    TOK_SPEEDS = 270,
-    TOK_USB = 271,
-    TOK_PRODUCT = 272,
-    TOK_VENDOR = 273,
-    TOK_CLASS = 274,
-    TOK_SUBCLASS = 275,
-    TOK_PROTOCOL = 276,
-    TOK_DISK = 277,
-    TOK_PTPIP = 278,
-    TOK_DEVICE_TYPE = 279,
-    TOK_DRIVER_STATUS = 280,
-    TOK_OPERATIONS = 281,
-    TOK_FILE_OPERATIONS = 282,
-    TOK_FOLDER_OPERATIONS = 283,
-    TOK_DRIVER_OPTIONS = 284,
-    TOK_OPTION = 285,
-    VAL_FLAG = 286
-  };
-#endif
-
-/* Value type.  */
-
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-extern YYSTYPE yylval;
-extern YYLTYPE yylloc;
-int yyparse (char const *file_name, CameraAbilitiesList *al);
-
-#endif /* !YY_YY_DDB_TXT_TAB_H_INCLUDED  */
-
-/* Copy the second part of user declarations.  */
-
-#line 198 "ddb-txt.tab.c" /* yacc.c:358  */
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
-             && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-  YYLTYPE yyls_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
-      + 2 * YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)yyi = (Src)yyi;            \
-        }                                       \
-      while (0)
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  2
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   76
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  32
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  38
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  60
-/* YYNSTATES -- Number of states.  */
-#define YYNSTATES  107
-
-/* YYTRANSLATEYYX -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   286
-
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslateYYX : YYUNDEFTOK)
-
-/* YYTRANSLATETOKEN-NUM -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
-static const yytype_uint8 yytranslate =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31
-};
-
-#if YYDEBUG
-  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline =
-{
-       0,   135,   135,   137,   142,   158,   141,   169,   171,   176,
-     178,   182,   183,   186,   188,   200,   213,   215,   226,   228,
-     231,   233,   236,   238,   242,   243,   247,   248,   252,   253,
-     257,   269,   281,   293,   295,   299,   300,   301,   304,   311,
-     310,   323,   325,   336,   337,   341,   356,   354,   368,   372,
-     374,   379,   386,   392,   395,   394,   401,   404,   403,   410,
-     412
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || 1
-/* YYTNAMESYMBOL-NUM -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname =
-{
-  "$end", "error", "$undefined", "TOK_SEP", "TOK_COMMA", "TOK_WHITESPACE",
-  "TOK_NEWLINE", "TOK_NUMBER", "TOK_STRING", "TOK_INTERFACE", "TOK_DRIVER",
-  "TOK_DEVICE", "TOK_BEGIN", "TOK_END", "TOK_SERIAL", "TOK_SPEEDS",
-  "TOK_USB", "TOK_PRODUCT", "TOK_VENDOR", "TOK_CLASS", "TOK_SUBCLASS",
-  "TOK_PROTOCOL", "TOK_DISK", "TOK_PTPIP", "TOK_DEVICE_TYPE",
-  "TOK_DRIVER_STATUS", "TOK_OPERATIONS", "TOK_FILE_OPERATIONS",
-  "TOK_FOLDER_OPERATIONS", "TOK_DRIVER_OPTIONS", "TOK_OPTION", "VAL_FLAG",
-  "$accept", "devices", "device", "$@1", "$@2", "driver_options",
-  "driver_option_list", "driver_option_item", "device_type",
-  "driver_definition", "driver_status", "folder_operations",
-  "file_operations", "operations", "folder_operations_list",
-  "file_operations_list", "operations_list", "folder_operation",
-  "file_operation", "operation", "interfaces", "interface",
-  "interface_serial", "$@3", "interface_serial_internal",
-  "speed_number_list", "speed_list_number", "interface_usb", "$@4",
-  "interface_usb_internal", "interface_usb_vendprod_optional",
-  "interface_usb_vendor", "interface_usb_product",
-  "interface_usb_class_optional", "$@5", "interface_usb_subclass_optional",
-  "$@6", "interface_usb_protocol_optional", YY_NULLPTR
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUMNUM -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286
-};
-# endif
-
-#define YYPACT_NINF -25
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-25)))
-
-#define YYTABLE_NINF -1
-
-#define yytable_value_is_error(Yytable_value) \
-  0
-
-  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int8 yypact =
-{
-     -25,     2,   -25,     0,   -25,    -2,   -25,    -5,    -8,    14,
-      22,    19,     4,   -25,    23,    -3,     5,   -25,    27,     6,
-       7,   -25,   -25,     3,   -25,     8,    10,   -25,     6,   -25,
-      11,   -25,     9,   -25,   -25,   -25,     8,   -25,    13,   -25,
-      -9,   -25,   -25,     9,   -11,    20,    28,    30,   -25,   -25,
-     -25,   -25,    24,   -25,   -25,   -25,   -25,   -25,    31,   -25,
-     -12,    32,    29,    33,    39,    37,   -25,   -25,    40,    35,
-      42,    41,    34,    38,   -25,     1,   -25,    18,   -25,   -25,
-      43,   -25,    45,   -25,    49,   -25,   -25,    47,   -25,    40,
-     -25,    54,    55,   -25,   -25,   -25,   -25,    44,    52,   -25,
-      57,   -25,    46,    56,   -25,    58,   -25
-};
-
-  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint8 yydefact =
-{
-       2,     0,     1,     0,     3,     0,     4,    13,     0,     0,
-       0,     0,    16,    14,     0,     0,    22,    15,     0,     0,
-      20,    17,    32,     0,    29,     0,    18,    23,     0,    31,
-       0,    27,     0,    33,    28,    21,     0,    30,     0,    25,
-       7,    26,    19,     0,     0,     0,     0,     0,    35,    36,
-      24,    39,     0,    37,    38,     9,     5,    34,     0,    46,
-       0,     0,    41,    49,     0,     0,    10,     6,     0,     0,
-       0,     0,    53,     0,     8,     0,    45,     0,    44,    40,
-       0,    47,     0,    48,     0,    50,    11,     0,    42,     0,
-      51,     0,     0,    12,    43,    54,    52,    56,     0,    55,
-       0,    57,    59,     0,    58,     0,    60
-};
-
-  /* YYPGOTONTERM-NUM.  */
-static const yytype_int8 yypgoto =
-{
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,    25,    26,    48,
-     -25,   -25,   -25,   -25,   -25,   -25,   -24,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25
-};
-
-  /* YYDEFGOTONTERM-NUM.  */
-static const yytype_int8 yydefgoto =
-{
-      -1,     1,     4,     7,    61,    46,    60,    66,     9,    12,
-      16,    33,    26,    20,    38,    30,    23,    39,    31,    24,
-      40,    47,    48,    58,    69,    77,    78,    49,    63,    71,
-      72,    73,    85,    83,    97,    99,   102,   104
-};
-
-  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint8 yytable =
-{
-      44,    64,     2,    51,    86,    52,    27,    28,     5,    87,
-       6,    53,    54,     3,    35,    36,    42,    43,    65,     8,
-      45,    88,    89,    10,    11,    13,    17,    14,    18,    15,
-      21,    19,    55,    57,    25,    67,    59,    22,    32,    29,
-      37,    56,    74,    62,    68,    75,    90,    76,    79,    80,
-      93,    70,    91,    82,    81,    84,    92,    95,    96,   100,
-     101,   106,    41,   105,    98,    94,     0,   103,    50,     0,
-       0,     0,     0,     0,     0,     0,    34
-};
-
-static const yytype_int8 yycheck =
-{
-       9,    13,     0,    14,     3,    16,     3,     4,     8,     8,
-      12,    22,    23,    11,     3,     4,     3,     4,    30,    24,
-      29,     3,     4,    31,    10,     3,     3,     8,    31,    25,
-       3,    26,    12,     3,    27,     3,    12,    31,    28,    31,
-      31,    13,     3,    12,    15,     8,     3,     7,    13,     7,
-       3,    18,     7,    19,    13,    17,     7,     3,     3,     7,
-       3,     3,    36,     7,    20,    89,    -1,    21,    43,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    28
-};
-
-  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos =
-{
-       0,    33,     0,    11,    34,     8,    12,    35,    24,    40,
-      31,    10,    41,     3,     8,    25,    42,     3,    31,    26,
-      45,     3,    31,    48,    51,    27,    44,     3,     4,    31,
-      47,    50,    28,    43,    51,     3,     4,    31,    46,    49,
-      52,    50,     3,     4,     9,    29,    37,    53,    54,    59,
-      49,    14,    16,    22,    23,    12,    13,     3,    55,    12,
-      38,    36,    12,    60,    13,    30,    39,     3,    15,    56,
-      18,    61,    62,    63,     3,     8,     7,    57,    58,    13,
-       7,    13,    19,    65,    17,    64,     3,     8,     3,     4,
-       3,     7,     7,     3,    58,     3,     3,    66,    20,    67,
-       7,     3,    68,    21,    69,     7,     3
-};
-
-  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1 =
-{
-       0,    32,    33,    33,    35,    36,    34,    37,    37,    38,
-      38,    39,    39,    40,    40,    41,    42,    42,    43,    43,
-      44,    44,    45,    45,    46,    46,    47,    47,    48,    48,
-      49,    50,    51,    52,    52,    53,    53,    53,    53,    55,
-      54,    56,    56,    57,    57,    58,    60,    59,    61,    62,
-      62,    63,    64,    65,    66,    65,    67,    68,    67,    69,
-      69
-};
-
-  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2 =
-{
-       0,     2,     0,     2,     0,     0,    15,     0,     5,     0,
-       2,     3,     4,     0,     3,     3,     0,     3,     0,     3,
-       0,     3,     0,     3,     3,     1,     3,     1,     3,     1,
-       1,     1,     1,     0,     3,     1,     1,     2,     2,     0,
-       6,     0,     3,     3,     1,     1,     0,     6,     2,     0,
-       2,     3,     3,     0,     0,     5,     0,     0,     5,     0,
-       3
-};
-
-
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (file_name, al, YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
-
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS1 to RHSN.
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS0 (always defined).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (N)                                                            \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
-    while (0)
-#endif
-
-#define YYRHSLOC(Rhs, K) ((Rhs)K)
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-
-/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
-
-YY_ATTRIBUTE_UNUSED
-static unsigned
-yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
-{
-  unsigned res = 0;
-  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
-  if (0 <= yylocp->first_line)
-    {
-      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
-      if (0 <= yylocp->first_column)
-        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
-    }
-  if (0 <= yylocp->last_line)
-    {
-      if (yylocp->first_line < yylocp->last_line)
-        {
-          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
-          if (0 <= end_col)
-            res += YYFPRINTF (yyo, ".%d", end_col);
-        }
-      else if (0 <= end_col && yylocp->first_column < end_col)
-        res += YYFPRINTF (yyo, "-%d", end_col);
-    }
-  return res;
- }
-
-#  define YY_LOCATION_PRINT(File, Loc)          \
-  yy_location_print_ (File, &(Loc))
-
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value, Location, file_name, al); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-
-
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
-
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, char const *file_name, CameraAbilitiesList *al)
-{
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  YYUSE (yylocationp);
-  YYUSE (file_name);
-  YYUSE (al);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknumyytype, *yyvaluep);
-# endif
-  YYUSE (yytype);
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, char const *file_name, CameraAbilitiesList *al)
-{
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytnameyytype);
-
-  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPRINTF (yyoutput, ": ");
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, file_name, al);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, char const *file_name, CameraAbilitiesList *al)
-{
-  unsigned long int yylno = yyrlineyyrule;
-  int yynrhs = yyr2yyrule;
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystosyysspyyi + 1 - yynrhs,
-                       &(yyvsp(yyi + 1) - (yynrhs))
-                       , &(yylsp(yyi + 1) - (yynrhs))                       , file_name, al);
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, yylsp, Rule, file_name, al); \
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystryylen; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyresyyn = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyresyyn = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
-{
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytnameyytoken);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyargYYERROR_VERBOSE_ARGS_MAXIMUM;
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact*yyssp;
-      yyargyycount++ = yytnameyytoken;
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheckyyx + yyn == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytableyyx + yyn))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyargyycount++ = yytnameyyx;
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytnameyyx);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat1 == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyargyyi++);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, char const *file_name, CameraAbilitiesList *al)
-{
-  YYUSE (yyvaluep);
-  YYUSE (yylocationp);
-  YYUSE (file_name);
-  YYUSE (al);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}
-
-
-
-
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-  = { 1, 1, 1, 1 }
-# endif
-;
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-int
-yyparse (char const *file_name, CameraAbilitiesList *al)
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-       'yyls': related to locations.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssaYYINITDEPTH;
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsaYYINITDEPTH;
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    /* The location stack.  */
-    YYLTYPE yylsaYYINITDEPTH;
-    YYLTYPE *yyls;
-    YYLTYPE *yylsp;
-
-    /* The locations where the error started and ended.  */
-    YYLTYPE yyerror_range3;
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-  YYLTYPE yyloc;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf128;
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yylsp = yyls = yylsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-
-/* User initialization code.  */
-#line 83 "ddb-txt.y" /* yacc.c:1429  */
-{
-  lexer_reset(file_name);
-  yyloc.begin.filename = yyloc.end.filename = file_name;
-  yyloc.begin.column = yyloc.end.column = -1;
-  yyloc.begin.lineno = yyloc.end.lineno = -1;
-  yylloc.begin.filename = yylloc.end.filename = file_name;
-  error_string = NULL;
-}
-
-#line 1277 "ddb-txt.tab.c" /* yacc.c:1429  */
-  yylsp0 = yylloc;
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-        YYLTYPE *yyls1 = yyls;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yyls1, yysize * sizeof (*yylsp),
-                    &yystacksize);
-
-        yyls = yyls1;
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-        YYSTACK_RELOCATE (yyls_alloc, yyls);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-      yylsp = yyls + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypactyystate;
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheckyyn != yytoken)
-    goto yydefault;
-  yyn = yytableyyn;
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-  *++yylsp = yylloc;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefactyystate;
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2yyn;
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp1-yylen;
-
-  /* Default location.  */
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 4:
-#line 142 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  current_device_name = alloc_parse_string((yyvsp-1.str_val));
-	  /* printf("BEGIN_DEVICE <<%s>>\n", current_device_name); */
-	  reset_ca();
-	  strncpy(ca.model, current_device_name, sizeof(ca.model));
-	  ca.modelsizeof(ca.model)-1='\0';
-	}
-#line 1472 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 5:
-#line 158 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  //printf("END_DEVICE <<%s>>\n", current_device_name);
-	  free(current_device_name);  current_device_name = NULL;
-	  if (current_driver != NULL) {
-	    free(current_driver);  current_driver = NULL;
-	  }
-	  gp_abilities_list_append(al, ca);
-	}
-#line 1485 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 14:
-#line 189 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (gpi_string_to_enum((yyvsp-1.str_val), &ca.device_type,
-				 gpi_gphoto_device_type_map)) {
-	    error_string = (yyvsp-1.str_val);
-	    yyerror(file_name, al,
-		    "illegal device_type value");
-	  }
-	}
-#line 1498 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 15:
-#line 201 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  const char *camlib_env = getenv(CAMLIBDIR_ENV);
-	  const char *camlibs = (camlib_env != NULL)?camlib_env:CAMLIBS;
-	  current_driver = alloc_parse_string((yyvsp-1.str_val));
-	  strncpy(ca.library, camlibs, sizeof(ca.library));
-	  strncat(ca.library, "/", sizeof(ca.library)-strlen(ca.library)-1);
-	  strncat(ca.library, current_driver, sizeof(ca.library)-strlen(ca.library)-1);
-	  ca.librarysizeof(ca.library)-1 = '\0';
-	  //printf("   DRIVER <<%s>>\n", current_driver);
-	}
-#line 1513 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 17:
-#line 216 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (gpi_string_to_enum((yyvsp-1.str_val), &ca.status,
-				 gpi_camera_driver_status_map)) {
-	    error_string = (yyvsp-1.str_val);
-	    yyerror(file_name, al,
-		    "illegal driver_status value");
-	  }
-	}
-#line 1526 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 30:
-#line 258 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (gpi_string_or_to_flags((yyvsp0.str_val), &ca.folder_operations,
-				     gpi_folder_operation_map)) {
-	    error_string = (yyvsp0.str_val);
-	    yyerror(file_name, al, 
-		    "illegal folder_operation flag");
-	  }
-	}
-#line 1539 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 31:
-#line 270 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (gpi_string_or_to_flags((yyvsp0.str_val), &ca.file_operations,
-				     gpi_file_operation_map)) {
-	    error_string = (yyvsp0.str_val);
-	    yyerror(file_name, al, 
-		    "illegal file_operation flag");
-	  }
-	}
-#line 1552 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 32:
-#line 282 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (gpi_string_or_to_flags((yyvsp0.str_val),
-				     &ca.operations,
-				     gpi_camera_operation_map)) {
-	    error_string = (yyvsp0.str_val);
-	    yyerror(file_name, al,
-		    "illegal operation flag");
-	  }
-	}
-#line 1566 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 37:
-#line 301 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.port |= GP_PORT_DISK;
-	}
-#line 1574 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 38:
-#line 304 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.port |= GP_PORT_PTPIP;
-	}
-#line 1582 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 39:
-#line 311 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.port |= GP_PORT_SERIAL;
-	  /* Ideally: Prepare serial entry. */
-	}
-#line 1591 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 40:
-#line 318 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  /* Ideally: Add serial entry to database. */
-        }
-#line 1599 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 42:
-#line 326 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (speed_index < (sizeof(ca.speed)/sizeof(ca.speed0))) {
-	    ca.speedspeed_index++ = 0;
-	  } else {
-	    ca.speed(sizeof(ca.speed)/sizeof(ca.speed0))-1 = 0;
-	  }
-	}
-#line 1611 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 45:
-#line 342 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  if (speed_index < (sizeof(ca.speed)/sizeof(ca.speed0))) {
-	    ca.speedspeed_index++ = (yyvsp0.ui_val);
-	  }
-	}
-#line 1621 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 46:
-#line 356 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.port |= GP_PORT_USB;
-	  /* Ideally: Prepare USB entry for this camera */
-	}
-#line 1630 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 47:
-#line 362 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  /* Ideally: Commit prepared USB entry to database */
-	}
-#line 1638 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 51:
-#line 380 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.usb_vendor = (yyvsp-1.ui_val);
-	}
-#line 1646 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 52:
-#line 387 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.usb_product = (yyvsp-1.ui_val);
-	}
-#line 1654 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 54:
-#line 395 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.usb_class = (yyvsp-1.ui_val);
-	}
-#line 1662 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 57:
-#line 404 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.usb_subclass = (yyvsp-1.ui_val);
-	}
-#line 1670 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 60:
-#line 413 "ddb-txt.y" /* yacc.c:1646  */
-    {
-	  ca.usb_protocol = (yyvsp-1.ui_val);
-	}
-#line 1678 "ddb-txt.tab.c" /* yacc.c:1646  */
-    break;
-
-
-#line 1682 "ddb-txt.tab.c" /* yacc.c:1646  */
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1yyn, &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-  *++yylsp = yyloc;
-
-  /* Now 'shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1yyn;
-
-  yystate = yypgotoyyn - YYNTOKENS + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheckyystate == *yyssp)
-    yystate = yytableyystate;
-  else
-    yystate = yydefgotoyyn - YYNTOKENS;
-
-  goto yynewstate;
-
-
-/*--------------------------------------.
-| yyerrlab -- here on detecting error.  |
-`--------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (file_name, al, YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (file_name, al, yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
-    }
-
-  yyerror_range1 = yylloc;
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval, &yylloc, file_name, al);
-          yychar = YYEMPTY;
-        }
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  yyerror_range1 = yylsp1-yylen;
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypactyystate;
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheckyyn == YYTERROR)
-            {
-              yyn = yytableyyn;
-              if (0 < yyn)
-                break;
-            }
-        }
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-
-      yyerror_range1 = *yylsp;
-      yydestruct ("Error: popping",
-                  yystosyystate, yyvsp, yylsp, file_name, al);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-  yyerror_range2 = yylloc;
-  /* Using YYLLOC is tempting, but would change the location of
-     the lookahead.  YYLOC is available though.  */
-  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
-  *++yylsp = yyloc;
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystosyyn, yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (file_name, al, YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval, &yylloc, file_name, al);
-    }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos*yyssp, yyvsp, yylsp, file_name, al);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  return yyresult;
-}
-#line 418 "ddb-txt.y" /* yacc.c:1906  */
-
-
-
-char *alloc_parse_string(char *s)
-  {
-    if (s0 == '"') {
-      int len = strlen(s);
-      if (slen-1 == '"') {
-	char *ret = malloc(len-2+1);
-	strncpy(ret, &s1, len-2);
-	retlen-2 = '\0';
-	free(s);
-	return ret;
-      } else {
-	fprintf(stderr, "Error: string does not end with quote: <<%s>>\n", s);
-	exit(2);
-      }
-    } else {
-      fprintf(stderr, "Error: string does not start with quote: <<%s>>\n", s);
-      exit(2);
-    }
-  }
-
-
-void yyerror(const char *filename, 
-	     CameraAbilitiesList __unused__ *al, 
-	     const char *str)
-{
-  fprintf(stderr, "%s:%d: parse error: %s\n", 
-	  filename, yylineno, str);
-  fprintf(stderr, "%s:%d- near: `%s'\n", 
-	  filename, yylineno, yytext);
-  if (NULL != error_string) {
-    fprintf(stderr, "%s:%d-              <<%s>>\n",
-	    filename, yylineno, error_string);
-    error_string = NULL;
-  }
-  exit(4);
-}
-
-
-static void 
-reset_ca(void)
-{
-  memset(&ca, 0, sizeof(ca));
-  speed_index = 0;
-  /* FIXME: These defaults are of dubious quality. */
-  ca.usb_subclass = -1;
-  ca.usb_protocol = -1;
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-txt.tab.h Deleted

@@ -1,101 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 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
-   the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-#ifndef YY_YY_DDB_TXT_TAB_H_INCLUDED
-# define YY_YY_DDB_TXT_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    TOK_SEP = 258,
-    TOK_COMMA = 259,
-    TOK_WHITESPACE = 260,
-    TOK_NEWLINE = 261,
-    TOK_NUMBER = 262,
-    TOK_STRING = 263,
-    TOK_INTERFACE = 264,
-    TOK_DRIVER = 265,
-    TOK_DEVICE = 266,
-    TOK_BEGIN = 267,
-    TOK_END = 268,
-    TOK_SERIAL = 269,
-    TOK_SPEEDS = 270,
-    TOK_USB = 271,
-    TOK_PRODUCT = 272,
-    TOK_VENDOR = 273,
-    TOK_CLASS = 274,
-    TOK_SUBCLASS = 275,
-    TOK_PROTOCOL = 276,
-    TOK_DISK = 277,
-    TOK_PTPIP = 278,
-    TOK_DEVICE_TYPE = 279,
-    TOK_DRIVER_STATUS = 280,
-    TOK_OPERATIONS = 281,
-    TOK_FILE_OPERATIONS = 282,
-    TOK_FOLDER_OPERATIONS = 283,
-    TOK_DRIVER_OPTIONS = 284,
-    TOK_OPTION = 285,
-    VAL_FLAG = 286
-  };
-#endif
-
-/* Value type.  */
-
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-extern YYSTYPE yylval;
-extern YYLTYPE yylloc;
-int yyparse (char const *file_name, CameraAbilitiesList *al);
-
-#endif /* !YY_YY_DDB_TXT_TAB_H_INCLUDED  */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-txt.y Deleted

@@ -1,467 +0,0 @@
-/** \file ddb-txt.y
- * \author Copyright (C) 2006 Hans Ulrich Niedermann
- *
- * \note
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * \note
- * This library 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
- * Lesser General Public License for more details. 
- *
- * \note
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-%{
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gphoto2/gphoto2-abilities-list.h>
-
-#include "ddb-common.h"
-#include "ddb-txt.tab.h"
-
-
-extern char *yytext;
-
-
-char *current_driver = NULL;
-char *current_device_name = NULL;
-CameraAbilities ca;
-unsigned int speed_index = 0;
-
-char *alloc_parse_string(char *s);
-
-char *error_string = NULL;
-     
-static void reset_ca(void);
-
-
-#ifdef __GNUC__
-#define __unused__ __attribute__((unused))
-#else
-#define __unused__
-#endif
-
-
-static int
-compare_camera_abilities(const CameraAbilities *a, 
-			 const CameraAbilities *b);
-
-
-%}
-
-%defines
-
-/* This is supposed to track linenumbers and stuff, but I don't know how to
- * make it work. */
-%locations
-
-/* Pure yylex.  */
-//%pure-parser
-
-/* More than "syntax error" */
-%error-verbose
-
-/* parameters to yyparse() and yyerror() */
-%parse-param { char const *file_name };
-%parse-param { CameraAbilitiesList *al };
-
-/* parameters to yylex() */
-/* %lex-param { CameraAbilitiesList *al }; */
-
-%initial-action
-{
-  lexer_reset(file_name);
-  yyloc.begin.filename = yyloc.end.filename = file_name;
-  yyloc.begin.column = yyloc.end.column = -1;
-  yyloc.begin.lineno = yyloc.end.lineno = -1;
-  @$.begin.filename = @$.end.filename = file_name;
-  error_string = NULL;
-};
-
-%token TOK_SEP TOK_COMMA
-%token TOK_WHITESPACE TOK_NEWLINE
-
-%token <ui_val> TOK_NUMBER
-%token <str_val> TOK_STRING
-
-%token TOK_INTERFACE
-%token TOK_DRIVER
-%token TOK_DEVICE
-%token TOK_BEGIN
-%token TOK_END
-
-%token TOK_SERIAL
-%token TOK_SPEEDS
-
-%token TOK_USB
-%token TOK_PRODUCT
-%token TOK_VENDOR
-%token TOK_CLASS
-%token TOK_SUBCLASS
-%token TOK_PROTOCOL
-
-%token TOK_DISK
-%token TOK_PTPIP
-
-%token TOK_DEVICE_TYPE
-%token TOK_DRIVER_STATUS
-%token TOK_OPERATIONS
-%token TOK_FILE_OPERATIONS
-%token TOK_FOLDER_OPERATIONS
-
-%token TOK_DRIVER_OPTIONS
-%token TOK_OPTION
-
-%token <str_val> VAL_FLAG
-
- /* %type <ui_val> interface_usb_vendor */
- /* %type <ui_val> interface_usb_product */
-
-%start devices
-
-%%
-
-devices:
-	/* empty */
-	| devices device
-	;
-
-device:
-	TOK_DEVICE TOK_STRING TOK_BEGIN
-	{
-	  current_device_name = alloc_parse_string($<str_val>2);
-	  /* printf("BEGIN_DEVICE <<%s>>\n", current_device_name); */
-	  reset_ca();
-	  strncpy(ca.model, current_device_name, sizeof(ca.model));
-	  ca.modelsizeof(ca.model)-1='\0';
-	}
-	device_type
-	driver_definition
-	driver_status
-	operations
-	file_operations
-	folder_operations
-	interfaces
-	driver_options
-	TOK_END
-	{
-	  //printf("END_DEVICE <<%s>>\n", current_device_name);
-	  free(current_device_name);  current_device_name = NULL;
-	  if (current_driver != NULL) {
-	    free(current_driver);  current_driver = NULL;
-	  }
-	  gp_abilities_list_append(al, ca);
-	}
-	TOK_SEP
-	;
-
-driver_options:
-	/* empty */
-	| TOK_DRIVER_OPTIONS TOK_BEGIN 
-	driver_option_list
-	TOK_END TOK_SEP
-	;
-
-driver_option_list:
-	/* empty */
-	| driver_option_list driver_option_item
-	;
-
-driver_option_item:
-	TOK_OPTION TOK_STRING TOK_SEP
-	| TOK_OPTION TOK_STRING TOK_STRING TOK_SEP
-	;
-
-device_type:
-	/* empty */
-	| TOK_DEVICE_TYPE VAL_FLAG TOK_SEP
-	{
-	  if (gpi_string_to_enum($<str_val>2, &ca.device_type,
-				 gpi_gphoto_device_type_map)) {
-	    error_string = $<str_val>2;
-	    yyerror(file_name, al,
-		    "illegal device_type value");
-	  }
-	}
-	;
-
-driver_definition:
-        TOK_DRIVER TOK_STRING TOK_SEP
-	{
-	  const char *camlib_env = getenv(CAMLIBDIR_ENV);
-	  const char *camlibs = (camlib_env != NULL)?camlib_env:CAMLIBS;
-	  current_driver = alloc_parse_string($<str_val>2);
-	  strncpy(ca.library, camlibs, sizeof(ca.library));
-	  strncat(ca.library, "/", sizeof(ca.library)-strlen(ca.library)-1);
-	  strncat(ca.library, current_driver, sizeof(ca.library)-strlen(ca.library)-1);
-	  ca.librarysizeof(ca.library)-1 = '\0';
-	  //printf("   DRIVER <<%s>>\n", current_driver);
-	}
-	;
-
-driver_status:
-	/* empty */
-        | TOK_DRIVER_STATUS VAL_FLAG TOK_SEP
-	{
-	  if (gpi_string_to_enum($<str_val>2, &ca.status,
-				 gpi_camera_driver_status_map)) {
-	    error_string = $<str_val>2;
-	    yyerror(file_name, al,
-		    "illegal driver_status value");
-	  }
-	}
-	;
-
-folder_operations:
-	/* empty */
-	| TOK_FOLDER_OPERATIONS folder_operations_list TOK_SEP
-	;
-
-file_operations:
-	/* empty */
-	| TOK_FILE_OPERATIONS file_operations_list TOK_SEP
-	;
-
-operations:
-	/* empty */
-	| TOK_OPERATIONS operations_list TOK_SEP
-	;
-
-folder_operations_list:
-        folder_operations_list TOK_COMMA folder_operation
-	| folder_operation
-	;
-
-file_operations_list:
-        file_operations_list TOK_COMMA file_operation
-	| file_operation
-	;
-
-operations_list:
-        operations_list TOK_COMMA operation
-	| operation
-	;
-
-folder_operation:
-	VAL_FLAG
-	{
-	  if (gpi_string_or_to_flags($<str_val>1, &ca.folder_operations,
-				     gpi_folder_operation_map)) {
-	    error_string = $<str_val>1;
-	    yyerror(file_name, al, 
-		    "illegal folder_operation flag");
-	  }
-	}
-	;
-
-file_operation:
-	VAL_FLAG
-	{
-	  if (gpi_string_or_to_flags($<str_val>1, &ca.file_operations,
-				     gpi_file_operation_map)) {
-	    error_string = $<str_val>1;
-	    yyerror(file_name, al, 
-		    "illegal file_operation flag");
-	  }
-	}
-	;
-
-operation:
-	VAL_FLAG
-	{
-	  if (gpi_string_or_to_flags($<str_val>1,
-				     &ca.operations,
-				     gpi_camera_operation_map)) {
-	    error_string = $<str_val>1;
-	    yyerror(file_name, al,
-		    "illegal operation flag");
-	  }
-	}
-	;
-
-interfaces:
-	/* empty */
-	| interfaces interface TOK_SEP
-	;
-
-interface:
-	interface_serial
-	| interface_usb
-	| TOK_INTERFACE TOK_DISK {
-	  ca.port |= GP_PORT_DISK;
-	}
-	| TOK_INTERFACE TOK_PTPIP {
-	  ca.port |= GP_PORT_PTPIP;
-	}
-	;
-
-interface_serial:
-	TOK_INTERFACE TOK_SERIAL
-	{
-	  ca.port |= GP_PORT_SERIAL;
-	  /* Ideally: Prepare serial entry. */
-	}
-	TOK_BEGIN
-	interface_serial_internal
-	TOK_END
-        {
-	  /* Ideally: Add serial entry to database. */
-        }
-	;
-
-interface_serial_internal:
-	/* empty */
-	| TOK_SPEEDS speed_number_list TOK_SEP
-	{
-	  if (speed_index < (sizeof(ca.speed)/sizeof(ca.speed0))) {
-	    ca.speedspeed_index++ = 0;
-	  } else {
-	    ca.speed(sizeof(ca.speed)/sizeof(ca.speed0))-1 = 0;
-	  }
-	}
-	;
-
-speed_number_list:
-	speed_number_list TOK_COMMA speed_list_number
-	| speed_list_number
-	;
-
-speed_list_number:
-	TOK_NUMBER
-	{
-	  if (speed_index < (sizeof(ca.speed)/sizeof(ca.speed0))) {
-	    ca.speedspeed_index++ = $<ui_val>1;
-	  }
-	}
-	;
-
-/* FIXME: Make sure that the CameraAbilities usb_* fields are not
- *  overwritten by multiple definitions 
- */
-
-interface_usb:
-	TOK_INTERFACE TOK_USB
-	TOK_BEGIN 
-	{
-	  ca.port |= GP_PORT_USB;
-	  /* Ideally: Prepare USB entry for this camera */
-	}
-	interface_usb_internal
-	TOK_END
-	{
-	  /* Ideally: Commit prepared USB entry to database */
-	}
-	;
-
-interface_usb_internal:
-	interface_usb_vendprod_optional
-	interface_usb_class_optional
-	;
-
-interface_usb_vendprod_optional:
-	/* empty */
-	| interface_usb_vendor
-	  interface_usb_product
-	;
-
-interface_usb_vendor:
-	TOK_VENDOR TOK_NUMBER TOK_SEP
-	{
-	  ca.usb_vendor = $<ui_val>2;
-	}
-	;
-
-interface_usb_product:
-	TOK_PRODUCT TOK_NUMBER TOK_SEP
-	{
-	  ca.usb_product = $<ui_val>2;
-	}
-	;
-
-interface_usb_class_optional:
-	/* empty */
-	| TOK_CLASS TOK_NUMBER TOK_SEP
-	{
-	  ca.usb_class = $<ui_val>2;
-	}
-	interface_usb_subclass_optional
-	;
-
-interface_usb_subclass_optional:
-	/* empty */
-	| TOK_SUBCLASS TOK_NUMBER TOK_SEP
-	{
-	  ca.usb_subclass = $<ui_val>2;
-	}
-	interface_usb_protocol_optional
-	;
-
-interface_usb_protocol_optional:
-	/* empty */
-	| TOK_PROTOCOL TOK_NUMBER TOK_SEP
-	{
-	  ca.usb_protocol = $<ui_val>2;
-	}
-	;
-
-%%
-
-
-char *alloc_parse_string(char *s)
-  {
-    if (s0 == '"') {
-      int len = strlen(s);
-      if (slen-1 == '"') {
-	char *ret = malloc(len-2+1);
-	strncpy(ret, &s1, len-2);
-	retlen-2 = '\0';
-	free(s);
-	return ret;
-      } else {
-	fprintf(stderr, "Error: string does not end with quote: <<%s>>\n", s);
-	exit(2);
-      }
-    } else {
-      fprintf(stderr, "Error: string does not start with quote: <<%s>>\n", s);
-      exit(2);
-    }
-  }
-
-
-void yyerror(const char *filename, 
-	     CameraAbilitiesList __unused__ *al, 
-	     const char *str)
-{
-  fprintf(stderr, "%s:%d: parse error: %s\n", 
-	  filename, yylineno, str);
-  fprintf(stderr, "%s:%d- near: `%s'\n", 
-	  filename, yylineno, yytext);
-  if (NULL != error_string) {
-    fprintf(stderr, "%s:%d-              <<%s>>\n",
-	    filename, yylineno, error_string);
-    error_string = NULL;
-  }
-  exit(4);
-}
-
-
-static void 
-reset_ca(void)
-{
-  memset(&ca, 0, sizeof(ca));
-  speed_index = 0;
-  /* FIXME: These defaults are of dubious quality. */
-  ca.usb_subclass = -1;
-  ca.usb_protocol = -1;
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/ddb-txt.yy.c Deleted

@@ -1,2116 +0,0 @@
-#line 2 "ddb-txt.yy.c"
-
-#line 4 "ddb-txt.yy.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern int yyleng;
-
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
-     *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE yylex. 
-     *       One obvious solution it to make yy_act a global. I tried that, and saw
-     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
-     *       normally declared as a register variable-- so it is not worth it.
-     */
-    #define  YY_LESS_LINENO(n) \
-            do { \
-                int yyl;\
-                for ( yyl = n; yyl < yyleng; ++yyl )\
-                    if ( yytextyyl == '\n' )\
-                        --yylineno;\
-            }while(0)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	yy_size_t yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)(yy_buffer_stack_top) \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)(yy_buffer_stack_top)
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define yywrap() 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg  );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 32
-#define YY_END_OF_BUFFER 33
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept273 =
-    {   0,
-        0,    0,   33,   31,   30,   29,   31,   31,   26,   28,
-       28,   25,   28,   28,   28,   28,   28,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,    3,    6,   30,
-        0,    0,    1,   28,    0,    0,   28,    0,    0,   28,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   27,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   24,    0,    0,    0,    0,    0,
-        0,    8,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        9,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   24,    0,   11,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   10,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       24,    0,    5,    4,    0,    0,    0,    0,    0,    0,
-       19,    0,    0,    0,    0,    0,    7,   16,    0,    0,
-        0,   14,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   15,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,   13,    0,    0,   12,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        2,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   17,    0,    0,    0,
-        0,    0,    0,   23,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       22,    0,    0,    0,   18,    0,    0,   20,    0,    0,
-       21,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec256 =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    5,    6,    7,    5,    5,    5,    5,    5,
-        5,    5,    5,    8,    5,    5,    5,    9,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,    5,   11,    5,
-        5,    5,    1,    5,   10,   10,   10,   10,   10,   10,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    1,   12,    1,   13,   14,   15,   16,
-
-       17,   18,   19,    5,   20,    5,   21,   22,   23,   24,
-       25,   26,    5,   27,   28,   29,   30,   31,   32,   33,
-       34,    5,   35,    5,   36,    5,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta37 =
-    {   0,
-        1,    1,    1,    2,    2,    1,    2,    2,    3,    3,
-        2,    2,    3,    3,    3,    3,    3,    3,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    3,    2,    2,    2
-    } ;
-
-static yyconst flex_int16_t yy_base276 =
-    {   0,
-        0,    0,  312,  313,   35,  313,    0,  308,  313,  277,
-      276,  313,    8,   27,   26,  275,   22,  283,  293,  280,
-      278,   21,   41,   39,  286,  274,  284,  313,  313,   59,
-      294,  296,  313,  265,  264,  280,   31,  282,  270,   40,
-      265,  272,   47,  269,  268,  260,  267,  263,   53,   55,
-      260,  256,  252,  260,  255,  264,  260,  265,  250,  263,
-      252,  313,  255,  245,  245,  254,  254,  243,  249,  247,
-      236,  248,  248,  247,  247,  245,  244,  243,  232,  238,
-      226,   58,  236,  243,  313,  229,  233,  235,  229,  235,
-      220,  313,  232,  222,  216,  217,  224,  214,  225,  226,
-
-      313,  223,  212,  226,  220,  209,  223,  221,  208,  212,
-      201,  205,  203,  210,  196,  213,  209,  202,  201,  202,
-      196,  208,  192,  313,  199,  200,  201,  198,  187,  193,
-      187,  184,  192,  193,  179,  183,  189,  190,  189,  313,
-      183,  185,  179,  172,  187,  185,  173,  169,  169,  177,
-      181,  179,  179,  178,  166,  162,  175,  173,  165,  164,
-      313,  151,  153,  156,  158,  167,  313,  313,  163,  149,
-      157,  313,  153,  162,  160,  143,  142,   50,  153,  152,
-      143,  152,  139,  140,  144,  141,  145,  145,  147,  131,
-      145,   63,  135,  139,  121,  128,  124,  128,  124,  124,
-
-      132,  124,  122,  313,  126,  122,  313,  110,  113,  119,
-      114,  120,  117,  122,  111,  107,  122,  105,  120,  115,
-      313,  103,  106,  102,  111,  110,  110,  112,  107,  107,
-      105,  101,   91,  106,   89,   90,  313,   89,   88,   94,
-       94,   81,   94,  313,   85,   79,   86,   87,   93,   92,
-       79,   86,   82,   76,   76,   65,   67,   62,   73,   60,
-      313,   62,   65,   52,  313,   53,   54,  313,   53,   17,
-      313,  313,   93,   96,   41
-    } ;
-
-static yyconst flex_int16_t yy_def276 =
-    {   0,
-      272,    1,  272,  272,  272,  272,  273,  274,  272,  275,
-      275,  272,  275,  275,  275,  275,  275,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      273,  274,  272,  275,  275,  272,  275,  272,  272,   37,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,    0,  272,  272,  272
-    } ;
-
-static yyconst flex_int16_t yy_nxt350 =
-    {   0,
-        4,    5,    6,    5,    4,    7,    8,    9,   10,   11,
-       12,    4,   13,   11,   14,   15,   16,   17,    4,   18,
-        4,    4,   19,   20,   21,   22,   23,   24,   25,   26,
-       27,    4,    4,    4,   28,   29,   30,   36,   30,   37,
-      272,   44,   40,   34,  271,   41,   45,   50,   38,   51,
-       52,   39,   42,   53,  272,   55,   64,   54,  272,  272,
-       30,   67,   30,  272,   56,   68,   72,   57,   58,   79,
-       69,   81,   73,  111,  196,  209,  270,  197,  269,   82,
-      268,   80,  210,   85,  267,  266,  112,  265,  211,  264,
-      263,  262,  261,  212,   31,   31,   32,   32,   32,  260,
-
-       85,  259,   85,   85,   85,  258,  257,   85,  256,  255,
-      254,  253,  252,  251,   85,  250,  249,  248,  247,  246,
-      245,  244,  243,  242,  241,  240,  239,  238,   85,   85,
-      237,  236,  235,  234,  233,  232,  231,   85,   85,  230,
-      229,  228,  227,  226,  225,  224,  223,  222,  221,  220,
-      219,  218,  217,  216,  215,  214,  213,  208,  207,  206,
-      205,   85,  204,  203,  202,   85,  201,  200,  199,  198,
-      195,  194,  193,  192,  191,   85,  190,  189,  188,  187,
-      186,  185,   85,  184,  183,  182,  181,  180,  179,  178,
-      177,  176,  175,  174,  173,  172,  171,  170,  169,  168,
-
-      167,  166,  165,  164,  163,  162,  161,  160,  159,  158,
-      157,  156,  155,  154,  153,  152,  151,   85,  150,  149,
-      148,  147,  146,  145,  144,  143,  142,  141,  140,  139,
-      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
-      128,  127,  126,  125,  124,  123,  122,  121,  120,  119,
-      118,  117,  116,  115,  114,  113,  110,  109,  108,   85,
-      107,  106,  105,  104,  103,   85,  102,  101,  100,   99,
-       98,   97,   96,   95,   94,   93,   92,   91,   90,   89,
-       88,   87,   86,   85,   84,   83,   78,   77,   76,   75,
-       74,   71,   70,   66,   65,   63,  272,  272,   33,   62,
-
-       61,   60,   59,   49,   48,   47,   46,   43,  272,   35,
-       33,  272,    3,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272
-    } ;
-
-static yyconst flex_int16_t yy_chk350 =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    5,   13,    5,   14,
-       13,   17,   15,  275,  270,   15,   17,   22,   14,   22,
-       22,   14,   15,   23,   17,   24,   37,   23,   15,   14,
-       30,   40,   30,   37,   24,   40,   43,   24,   24,   49,
-       40,   50,   43,   82,  178,  192,  269,  178,  267,   50,
-      266,   49,  192,  264,  263,  262,   82,  260,  192,  259,
-      258,  257,  256,  192,  273,  273,  274,  274,  274,  255,
-
-      254,  253,  252,  251,  250,  249,  248,  247,  246,  245,
-      243,  242,  241,  240,  239,  238,  236,  235,  234,  233,
-      232,  231,  230,  229,  228,  227,  226,  225,  224,  223,
-      222,  220,  219,  218,  217,  216,  215,  214,  213,  212,
-      211,  210,  209,  208,  206,  205,  203,  202,  201,  200,
-      199,  198,  197,  196,  195,  194,  193,  191,  190,  189,
-      188,  187,  186,  185,  184,  183,  182,  181,  180,  179,
-      177,  176,  175,  174,  173,  171,  170,  169,  166,  165,
-      164,  163,  162,  160,  159,  158,  157,  156,  155,  154,
-      153,  152,  151,  150,  149,  148,  147,  146,  145,  144,
-
-      143,  142,  141,  139,  138,  137,  136,  135,  134,  133,
-      132,  131,  130,  129,  128,  127,  126,  125,  123,  122,
-      121,  120,  119,  118,  117,  116,  115,  114,  113,  112,
-      111,  110,  109,  108,  107,  106,  105,  104,  103,  102,
-      100,   99,   98,   97,   96,   95,   94,   93,   91,   90,
-       89,   88,   87,   86,   84,   83,   81,   80,   79,   78,
-       77,   76,   75,   74,   73,   72,   71,   70,   69,   68,
-       67,   66,   65,   64,   63,   61,   60,   59,   58,   57,
-       56,   55,   54,   53,   52,   51,   48,   47,   46,   45,
-       44,   42,   41,   39,   38,   36,   35,   34,   32,   31,
-
-       27,   26,   25,   21,   20,   19,   18,   16,   11,   10,
-        8,    3,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272,  272,
-      272,  272,  272,  272,  272,  272,  272,  272,  272
-    } ;
-
-/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol33 =
-    {   0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,     };
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "ddb-txt.l"
-/** \file ddb-txt.l
- * \author Copyright (C) 2006 Hans Ulrich Niedermann
- *
- * \note
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * \note
- * This library 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
- * Lesser General Public License for more details. 
- *
- * \note
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-#line 29 "ddb-txt.l"
-#include <stdlib.h>
-#include <errno.h>
-#define _GNU_SOURCE
-#include <string.h>
-#include "ddb-common.h"
-#include "ddb-txt.tab.h"
-
-//#if !(YYDEBUG)
-# define ECHO do {} while (0)
-//#endif
-
-extern char *strndup(const char *s, size_t n);
-
-static char *filename = NULL;
-
-YYSTYPE yylval = { str_val: NULL };
-
-static void lexer_error(const char *msg);
-
-#line 678 "ddb-txt.yy.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag  );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *yyget_in (void );
-
-void yyset_in  (FILE * in_str  );
-
-FILE *yyget_out (void );
-
-void yyset_out  (FILE * out_str  );
-
-int yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number  );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			bufn = (char) c; \
-		if ( c == '\n' ) \
-			bufn++ = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    
-#line 50 "ddb-txt.l"
-
-#line 860 "ddb-txt.yy.c"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
-
-		yy_load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ecYY_SC_TO_UI(*yy_cp);
-			if ( yy_acceptyy_current_state )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-				{
-				yy_current_state = (int) yy_defyy_current_state;
-				if ( yy_current_state >= 273 )
-					yy_c = yy_meta(unsigned int) yy_c;
-				}
-			yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-			++yy_cp;
-			}
-		while ( yy_baseyy_current_state != 313 );
-
-yy_find_action:
-		yy_act = yy_acceptyy_current_state;
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			yy_act = yy_acceptyy_current_state;
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eolyy_act )
-			{
-			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytextyyl == '\n' )
-					   
-    yylineno++;
-;
-			}
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 51 "ddb-txt.l"
-{ /* ignore comment */ }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 52 "ddb-txt.l"
-{ ECHO; return TOK_INTERFACE; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 53 "ddb-txt.l"
-{ ECHO; return TOK_BEGIN; }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 54 "ddb-txt.l"
-{ ECHO; return TOK_DRIVER; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 55 "ddb-txt.l"
-{ ECHO; return TOK_DEVICE; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 56 "ddb-txt.l"
-{ ECHO; return TOK_END; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 57 "ddb-txt.l"
-{ ECHO; return TOK_SERIAL; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 58 "ddb-txt.l"
-{ ECHO; return TOK_USB; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 59 "ddb-txt.l"
-{ ECHO; return TOK_DISK; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 60 "ddb-txt.l"
-{ ECHO; return TOK_PTPIP; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 61 "ddb-txt.l"
-{ ECHO; return TOK_CLASS; }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 62 "ddb-txt.l"
-{ ECHO; return TOK_SUBCLASS; }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 63 "ddb-txt.l"
-{ ECHO; return TOK_PROTOCOL; }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 64 "ddb-txt.l"
-{ ECHO; return TOK_VENDOR; }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 65 "ddb-txt.l"
-{ ECHO; return TOK_PRODUCT; }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 66 "ddb-txt.l"
-{ ECHO; return TOK_SPEEDS; }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 67 "ddb-txt.l"
-{ ECHO; return TOK_OPERATIONS; }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 68 "ddb-txt.l"
-{ ECHO; return TOK_DRIVER_OPTIONS; }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 69 "ddb-txt.l"
-{ ECHO; return TOK_OPTION; }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 70 "ddb-txt.l"
-{ ECHO; return TOK_FILE_OPERATIONS; }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 71 "ddb-txt.l"
-{ ECHO; return TOK_FOLDER_OPERATIONS; }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 72 "ddb-txt.l"
-{ ECHO; return TOK_DRIVER_STATUS; }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 73 "ddb-txt.l"
-{ ECHO; return TOK_DEVICE_TYPE; }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 74 "ddb-txt.l"
-{
-                  ECHO;
-                  yylval.str_val = strndup(yytext, yyleng);
-                  return VAL_FLAG;
-                }
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 79 "ddb-txt.l"
-{ ECHO; return TOK_SEP; }
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 80 "ddb-txt.l"
-{ ECHO; return TOK_COMMA; }
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 81 "ddb-txt.l"
-{ ECHO; 
-			yylval.str_val = strndup(yytext, yyleng);
-			return TOK_STRING;
-		}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 85 "ddb-txt.l"
-{ECHO;
-			yylval.ui_val = strtoul(yytext, NULL, 0);
-			if ((ERANGE == errno) && 
-			    (ULONG_MAX == yylval.ui_val)) {
-				lexer_error("Number out of range");
-			} else if (EINVAL == errno) {
-				lexer_error("Invalid number");
-			}
-			return TOK_NUMBER;
-		}
-	YY_BREAK
-case 29:
-/* rule 29 can match eol */
-YY_RULE_SETUP
-#line 95 "ddb-txt.l"
-{ ECHO; /* ignore newlines */ }
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 96 "ddb-txt.l"
-{ ECHO; /* ignore whitespace */ }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 97 "ddb-txt.l"
-{
-			static char msg = "unexpected character (in string?) '?'";
-			msgstrlen(msg)-2 = yytext0;
-			lexer_error(msg);
-		}
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 102 "ddb-txt.l"
-ECHO;
-	YY_BREAK
-#line 1137 "ddb-txt.yy.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars);
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			yy_size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				yy_size_t new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_bufyy_c_buf_p_offset;
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_bufnumber_to_move),
-			(yy_n_chars), num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) + 1 = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf0;
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (void)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ecYY_SC_TO_UI(*yy_cp) : 1);
-		if ( yy_acceptyy_current_state )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-			{
-			yy_current_state = (int) yy_defyy_current_state;
-			if ( yy_current_state >= 273 )
-				yy_c = yy_meta(unsigned int) yy_c;
-			}
-		yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_acceptyy_current_state )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chkyy_baseyy_current_state + yy_c != yy_current_state )
-		{
-		yy_current_state = (int) yy_defyy_current_state;
-		if ( yy_current_state >= 273 )
-			yy_c = yy_meta(unsigned int) yy_c;
-		}
-	yy_current_state = yy_nxtyy_baseyy_current_state + (unsigned int) yy_c;
-	yy_is_jam = (yy_current_state == 272);
-
-		return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf(yy_n_chars) )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart(yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	if ( c == '\n' )
-		   
-    yylineno++;
-;
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
-	}
-
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
-
-	yyfree((void *) b  );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf0 = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf1 = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf0;
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	yy_size_t num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     basesize-2 != YY_END_OF_BUFFER_CHAR ||
-	     basesize-1 != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer(b  );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-	return yy_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		bufi = yybytesi;
-
-	buf_yybytes_len = buf_yybytes_len+1 = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytextyyleng = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *yyget_text  (void)
-{
-        return yytext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
-
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
-
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-
-    /* We do not touch yylineno unless the option is enabled. */
-    yylineno =  1;
-    
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1i = s2i;
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; sn; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t  size )
-{
-	return (void *) malloc( size );
-}
-
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 102 "ddb-txt.l"
-
-
-
-void lexer_reset(const char *_filename)
-{
-  filename = (char *) _filename;
-}
-
-static void lexer_error(const char *msg)
-{
-  fprintf(stderr, "%s:%d: lexer error: %s\n",
-		  filename, yylineno, msg);
-  exit(4);
-}
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/ddb/test-ddb.c Deleted

@@ -1,218 +0,0 @@
-/** \file test-ddb.c
- * \author Copyright (C) 2006 Hans Ulrich Niedermann
- *
- * \note
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * \note
- * This library 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
- * Lesser General Public License for more details. 
- *
- * \note
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gphoto2/gphoto2-abilities-list.h>
-
-#include "ddb-common.h"
-#include "ddb-txt.tab.h"
-
-static int
-compare_camera_abilities(const CameraAbilities *a, 
-			 const CameraAbilities *b);
-
-CameraAbilitiesList *
-read_abilities_list(const char *filename);
-CameraAbilitiesList *
-read_abilities_list(const char *filename)
-{
-  CameraAbilitiesList *al = NULL;
-  int retval;
-  if (0!=(retval = gp_abilities_list_new(&al))) { return NULL; }
-  if (0!=(retval = yyparse(filename, al))) { goto error; }
-  return al;
- error:
-  if (al!=NULL)
-    gp_abilities_list_free(al);
-  return NULL;
-}
-
-
-static int
-compare_lists (void)
-{
-  unsigned int errors = 0;
-  CameraAbilitiesList *ddb = read_abilities_list(NULL);
-  CameraAbilitiesList *clb;
-  unsigned int i, j, n_ddb, n_clb;
-  gp_abilities_list_new(&clb);
-  gp_abilities_list_load(clb, NULL);
-  n_ddb = gp_abilities_list_count(ddb);
-  n_clb = gp_abilities_list_count(clb);
-  fprintf(stderr, "## Comparing ddb with clb ##\n");
-  for (i=0, j=0; (i<n_ddb) && (j<n_clb); ) {
-    CameraAbilities a, b;
-    gp_abilities_list_get_abilities(ddb, i, &a);
-    gp_abilities_list_get_abilities(clb, j, &b);
-    if ((b.port & GP_PORT_USB) && (b.usb_class == 666)) {
-      /* ignore this camera */
-      j++;
-      continue;
-    }
-    if (compare_camera_abilities(&a, &b)) {
-      errors++;
-    }
-    i++, j++;
-  }
-  gp_abilities_list_free(clb);
-  gp_abilities_list_free(ddb);
-  return (errors == 0)? 0 : 1;
-}
-
-
-int main(int argc, char *argv)
-{
-  int i;
-  int retval;
-  CameraAbilitiesList *al;
-#if YYDEBUG
-  yydebug = 1;
-#endif
-  if (0!=(retval=gp_abilities_list_new(&al))) {
-    fprintf(stderr, "Could not create CameraAbilitiesList\n");
-    return 6;
-  }
-  if (argc > 1) {
-    for (i=1; i<argc; i++) {
-      if (0==strcmp("--compare", argvi)) {
-	return compare_lists();
-      } else {
-	const char *filename = argvi;
-	yyin = fopen(filename, "r");
-	if (NULL == yyin) {
-	  fprintf(stderr, "File %s does not exist. Aborting.\n", filename);
-	  return 5;
-	}
-	retval = yyparse(filename, al);
-	fclose(yyin);
-	if (retval != 0) {
-	  return retval;
-	}
-      }
-    }
-    return 0;
-  } else {
-    yyin = stdin;
-    return yyparse("<stdin>", al);
-  }
-}
-
-
-
-
-#define CMP_RET_S(cmp_func, field)					\
-  do {									\
-    int retval = cmp_func(a->field, b->field);				\
-    if (retval != 0) {							\
-      fprintf(stderr, "    difference in .%s: <<%s>> vs <<%s>>\n",		\
-	      #field, a->field, b->field);				\
-      errors++;								\
-    }									\
-  } while (0)
-
-#define CMP_RET_UI(cmp_func, field)					\
-  do {									\
-    int retval = cmp_func((unsigned int) (a->field),			\
-			  (unsigned int) (b->field));			\
-    if (retval != 0) {							\
-      fprintf(stderr, "    difference in .%s: 0x%x vs 0x%x\n",		\
-	      #field, (unsigned int) (a->field),			\
-	      (unsigned int) (b->field));				\
-      errors++;								\
-    }									\
-  } while (0)
-
-
-static int
-uicmp(unsigned int a, unsigned int b)
-{
-  if (a < b) return -1;
-  else if (a > b) return 1;
-  else return 0;
-}
-
-static int
-strcmp_colon(const char *a, const char *b)
-{
-  unsigned int i = 0;
-  while (1) {
-    if ((ai == '\0') && (bi == '\0'))
-      return 0;
-    if (ai == '\0')
-      return -1;
-    if (bi == '\0')
-      return 1;
-    if (ai == bi)
-      goto next;
-    if (((ai == ' ') && (bi == ':')) ||
-	((ai == ':') && (ai == ' ')))
-      goto next;
-    if (ai < bi)
-      return -1;
-    if (ai > bi)
-      return 1;
-    fprintf(stderr, "Internal error in strcmp_colon\n");
-    exit(13);
-  next:
-    ++i;
-  }
-}
-
-
-static int
-compare_camera_abilities(const CameraAbilities *a, 
-			 const CameraAbilities *b)
-{
-  unsigned int errors = 0;
-  int i;
-  CMP_RET_S(strcmp_colon, model);
-  CMP_RET_S(strcmp, library);
-  /* CMP_RET_S(strcmp, id); */
-  CMP_RET_UI(uicmp, port);
-  if ((a->port & GP_PORT_SERIAL)) {
-    for (i=0; (a->speedi != 0) && (a->speedi != 0); i++) {
-      CMP_RET_UI(uicmp, speedi);
-    }
-  }
-  CMP_RET_UI(uicmp, operations);
-  CMP_RET_UI(uicmp, file_operations);
-  CMP_RET_UI(uicmp, folder_operations);
-  if ((a->port & GP_PORT_USB)) {
-    CMP_RET_UI(uicmp, usb_vendor);
-    CMP_RET_UI(uicmp, usb_product);
-    CMP_RET_UI(uicmp, usb_class);
-    if (a->usb_class != 0) {
-      CMP_RET_UI(uicmp, usb_subclass);
-      CMP_RET_UI(uicmp, usb_protocol);
-    }
-  }
-  CMP_RET_UI(uicmp, device_type);
-  if (errors == 0) {
-    return 0;
-  } else {
-    fprintf(stderr, "Difference for <<%s>>\n", a->model);
-    return 1;
-  }
-}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/ABOUT-NLS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/ABOUT-NLS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/AUTHORS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/AUTHORS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/COPYING -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/COPYING Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/ChangeLog Changed

@@ -542,7 +542,7 @@
 
 	* libgphoto2/gphoto2-version.c: Use HAVE_CC only if defined.
 
-2002-11-10  Lutz Müller <lutz@users.sourceforge.net>
+2002-11-10  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-widget.c,h (gp_widget_set_value): Make the
 	  argument const.
@@ -575,7 +575,7 @@
 	* *.am, libgphoto2_port/m4/packaging.m4, libgphoto2_port/m4/packaging.m4: moved definition of docdir from Makefile.am to m4 macros
 	* configure.in: 2.1.1dev7
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-abilities-list.c,h (gp_abilities_list_reset):
 	  New.
@@ -590,14 +590,14 @@
 
 	* configure.in: 2.1.1dev6
 
-2002-08-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-08-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-filesys.c: Cosmetic changes. Made code consistent
 	  to reflect the assumption that only GP_FILE_TYPE_RAW,AUDIO,NORMAL
 	  contain a significant amount of data that needs to be removed from
 	  cache.
 
-2002-08-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-08-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto-file.c (gp_file_get_data_and_size): If data or
 	  size is NULL, ignore it.
@@ -617,12 +617,12 @@
 	* configure.in: added largan/lmini driver
 	* camlibs/largan/lmini: new driver for Largan Lmini
 
-2002-08-22  Christophe Barbé <christophe.barbe@ufies.org>
+2002-08-22  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* configure.in: test for /proc/meminfo (HAVE_PROCMEMINFO).
 	* libgphoto2/gphoto2-filesys.c: Use HAVE_PROCMEMINFO.
 
-2002-08-22  Christophe Barbé <christophe.barbe@ufies.org>
+2002-08-22  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* libgphoto2/gphoto2-filesys.c: Implemented code to free cached data when
 	  we are going out of memory. 
@@ -634,7 +634,7 @@
 	* camlibs/agfa/: Rename agfa files to new soundvision scheme
 	* camlibs/agfa/: Minor fixes for Tiger Fast Flicks support
 
-2002-08-14  Christophe Barbé <christophe.barbe@ufies.org>
+2002-08-14  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* libgphoto2/gphoto2-filesys.c: LRU implementation for the filesystem
 	  cache. 
@@ -649,11 +649,11 @@
 
 	* MAINTAINERS: Add myself as camlibs/gsmart maintainer.
 
-2002-08-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-08-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Create camlibs/gsmart/Makefile.
 
-2002-08-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-08-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in
 	* camlibs/gsmart: New driver by Till Adam <till@adam-lilienthal.de>.
@@ -663,11 +663,11 @@
 	* libgphoto2/gphoto2-list.c (exchange): changed strcpy with memcpy
 	that prevents unterminated strings overflow.
 
-2002-09-01  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-01  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* MAINTAINERS: Uli does the mailing lists.
 
-2002-09-01  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-01  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* MAINTAINERS: Arnaud is now responsible for autogen.sh. Added 
 	  myself on top of Scott regarding libgphoto2(_port).
@@ -677,11 +677,11 @@
 	* autogen.sh: new package name: libgphoto2
 	* configure.in: 2.1.1dev3 -> 2.1.1dev4
 
-2002-07-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* README: First attempt to separate gphoto2 from libgphoto2.
 
-2002-07-28  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-28  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Detect new version of libexif (forgot to check 
 	  that in the last time).
@@ -691,13 +691,13 @@
 
 	* configure.in: new package name: libgphoto2
 
-2002-07-25  Christophe Barbé <christophe.barbe@ufies.org>
+2002-07-25  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    po files from Stefan Bj|rnelund <stefanb@update.uu.se>
 
 	* po/sv.po: Update Swedish translation.
 			
-2002-07-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Detect new version of libexif.
 	* frontends/command-line/actions.c:
@@ -710,7 +710,7 @@
 	* doc/gphoto2.xml: added reference to CSS stylesheet
 	* doc/docbook-xml.css: added CSS stylesheet for Docbook XML
 
-2002-07-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/libgphoto2.pc.in: Add driverdir variable.
 
@@ -719,7 +719,7 @@
 	* autogen.sh: explicitly delete autogenerated files and dirs not in CVS
 	* configure.in: 2.1.1dev2, fixed typo in message
 	
-2002-07-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Use ltdl if available.
 
@@ -727,37 +727,37 @@
 
 	* MAINTAINERS: Add myself to camlibs/sierra
 
-2002-07-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Add camlibs/sx330z.
 
-2002-06-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch from Arnaud Launay <asl@launay.org>:
 
 	* autogen.sh: Call libtoolize - newer automakes don't call it
 	  automatically.
 
-2002-06-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch from Arnaud Launay <asl@launay.org>:
 
 	* Makefile.am: /$(TAR)/tar/
 
-2002-06-24  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-24  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	Patch for FreeBSD from Arnaud Launay <asl@launay.org>
 
 	* configure.in: Use -pthread instead of -lc_r, libtool 1.4.2a doesn't
 		like -lc_r (unlike plain 1.4.2).
 
-2002-06-21  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-21  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    po files from Takeshi AIHANA <aihana@jcom.home.ne.jp>
 
 	* po/ja.po: Update Japan translation.
 
-2002-06-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ABOUT-NLS: Remove this file, it is generated by gettextize.
 
@@ -766,77 +766,77 @@
 	* camlibs/minolta/NEWER_MINOLTAS (UPDATE): updated the statement
 	  about newer Minolta camera support.
 
-2002-06-19  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-19  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* Makefile.am: Added CHANGES in EXTRA_DIST.
 
-2002-06-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Make the check for cdk.h search in $ac_default_prefix.
 	  Make checks for libjpeg, libexif, libcdk, etc. consistent.
 
-2002-06-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Suggestion from Hans Ulrich Niedermann <gp@n-dimensional.de>:
 
 	* autogen.sh: Remove the call to configure.
 
-2002-06-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Suggestion from Arnaud Launay <asl@launay.org>:
 
 	* configure.in: Let users specify where to look for libjpeg
 	  (--with-jpeg-prefix).
 
-2002-06-18  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-18  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	po file from Fabian Mandelbaum <fabman@mandrakesoft.com>
 
 	* po/es.po: Spanish translation.
 
-2002-06-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: AC_PREREQ(2.50), because otherwise,
 	  --enable-maintainer-mode will fail somehow.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>:
 
 	* doc/gphoto2.xml: Add missing '>'.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Marcus Meissner <meissner@suse.de> explained me how what
 	--enable-maintainer-mode is for:
 
 	* Makefile.am: Uncomment the automake and aclocal flags.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>, which corrects the
 	previous patch:
 
 	* Makefile.am: Correct the flags to tar.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>, slightly modified:
 
 	* Makefile.am: Get rid of the automake flags, use --bzip2 instead of
 	  -j.
 
-2002-06-17  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-17  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	Patch by Arnaud Launay <asl@launay.org>
 
 	* doc/Makefile.am : Don't try to move figures when fig2dev is not there.
 
-2002-06-17  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-17  Christophe BarbÃ© <christophe.barbe@ufies.org>
   
 	* Makefile.am: Removed autogen.sh from EXTRA_DIST.
 
-2002-06-17  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-17  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* configure.in: 2.1.0 branch created, main branch version 2.1.1dev1.
 
@@ -844,39 +844,39 @@
 
 	* doc/FAQ: Added "gphoto2 does not work..." general question
 
-2002-06-15  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-15  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Fix readline error message.
 
-2002-06-15  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-15  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	Patch by Arnaud Launay <asl@launay.org>
 
 	* autogen.sh: Copy po/Makevars.template to po/Makevars when necessary.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
         * libgphoto2/gphoto2-abilities-list.c: Cleanup the ltdl-specific
           part.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>, slightly enhanced:
 
 	* autogen.sh: If gettext --version is something like 0.11.*, 
 	  add the --intl option to gettextize.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/Makefile.am:
 	* configure.in: Fix (?) -version-info
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Given the pending release, it is safer to disable
 	  the use of the buggy libltdl.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Suggested by Arnaud Launay <asl@launay.org>, slightly modified:
 
@@ -893,7 +893,7 @@
 	  - added symlink in manual/ to enable people to view manual in src tree
 	  - use $(AMTAR) and install only the png and html files for the html manual
 
-2002-06-13  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-13  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>, slightly corrected:
 
@@ -905,32 +905,32 @@
 	* doc/figures/Makefile.am: only install png images, but still build jpg and eps
 	* doc/Makefile.am: use $(XMLTO) instead of xmlto everywhere
 
-2002-06-12  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-12  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* doc/Makefile.am: no more figures link. install only png files for the
 	  user manual.
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
         * configure.in:
         * libgphoto2/gphoto2-abilities-list.c: Make libgphoto2
           use ltdl.h. I needed to introduce a global variable - code is
           marked as UGLY_HACK. If you know how to fix it, please tell me.
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in:
 	* libgphoto2/gphoto2-camera.c:
 	* libgphoto2/gphoto2-abilities-list.c: Fixes for HAVE_LTDL. Still
 	  doesn't work.
 
-2002-06-12  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-12  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* libgphoto2_port/m4/documentation.m4: Added --with-doc-formats option and
 		removed xmlto tests to find the available formats.
 	* libgphoto2_port/configure.in: Duplicated tr hack from main configure.in.
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* doc/FAQ: New entry.
 
@@ -938,24 +938,24 @@
 
 	* configure.in: 2.0.1dev11 (because of build changes)
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* autogen.sh: No need for configuring the whole thing 3 times...
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* autogen.sh: Fix the order of processing libgphoto2_port and .
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* intl: Remove these files - they should be generated by gettextize.
 	* autogen.sh: Check for and run gettextize.
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* INSTALL: Fix the aclocal command.
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
         * acconfig.h: According to
           http://www.gnu.org/manual/autoconf-2.53/html_mono/autoconf.html,
@@ -970,7 +970,7 @@
 	* INSTALL: autogen.sh works for me, also with older autotools than
 		Lutz mentioned, so I added note about that
 
-2002-06-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* INSTALL: Add note about outdated autogen.sh.
 
@@ -1047,25 +1047,25 @@
 	* configure.in: 2.0.1dev5, added comment to AC_DEFINE
 	* configure.in: hopefully fixed readline detection when -lncurses needed
 	
-2002-05-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line: Remove more globals.
 
-2002-05-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* acconfig.h: #undef HAVE_PTHREAD
 	* configure.in: Check for pthread.
 	* frontends/command-line: Support for gp_camera_set_timeout_funcs.
 
-2002-05-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-camera.c: Fix bug.
 
-2002-05-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-camera.c: Fix mem-leak.
 
-2002-05-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-camera.c,h (gp_camera_start,stop_timeout),
 	  (gp_camera_set_timeout_funcs): New
@@ -1076,7 +1076,7 @@
 	* libgphoto2/gphoto2-filesys.c: memset() filesys to 0 so
 	  we do not forget to initialize members. (sf bug #549958)
 
-2002-04-28  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-28  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/main.c: %s/licence/license
 
@@ -1084,7 +1084,7 @@
 
 	* README: Small tweaks in the "Reporting bugs" section.
 
-2002-04-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Add fuji.
 
@@ -1105,7 +1105,7 @@
 
 	* TESTERS: added explicit usage permissions and improved wording some
 
-2002-03-24  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-24  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Patrick Mansfield <patman@aracnet.com> (without ChangeLog
 	entry, therefore I am just quoting the e-mail):
@@ -1122,7 +1122,7 @@
 	  trying to go from 0 -> 8000000 in chunks of 10. It is clunky in
 	  that the page increment is not always a multiple of the increment.
 
-2002-03-23  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-23  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Cliff Wright <cliff@snipe444.org> (comments quoted from 
 	the e-mails):
@@ -1146,7 +1146,7 @@
 	* doc/gphoto2.txt: clarification that /proc/bus/usb has to 
 	  be mounted in any case
 
-2002-03-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/Makefile.am: Remove "-g" from C,LDFLAGS. If
 	  you need it, please add it again in configure.in.
@@ -1170,16 +1170,16 @@
 	* frontends/command-line/main.c: removed decoding of numeric debug message priorities
 	* frontends/command-line/main.c: timestamped logs
 
-2002-03-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/Makefile.am:
 	* frontends/command-line/main.c: Add --authors and --licence.
 
-2002-03-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Check for rl_completion_matches.
 
-2002-03-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/globals.h:
 	* frontends/command-line/main.c: 1 global variable less.
@@ -1189,7 +1189,7 @@
 	* frontends/command-line/main.c: you can now specify --filename
 	  while uploading, thx to Lutz.
 
-2002-03-09  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-09  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/shell.c: Fix readline stuff (automatic 
 	  completion).
@@ -1200,14 +1200,14 @@
 
 2002-02-26  Marcus Meissner <marcus@jet.franken.de>
 	
-	* libgphoto2/gphoto-camera.c: do gp_close_port() unconditionaly
+	* libgphoto2/gphoto-camera.c: do gp_close_port() unconditionally
 	  in gp_camera_exit().
 
-2002-02-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: We are currently working on libgphoto2-2.0.1.
 
-2002-02-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/foreach.c (for_each_file_in_range): If 
 	  deleting files not recursively, adjust the image ID for subsequent
@@ -1216,7 +1216,7 @@
 	  it in reverse order such that above case does never occur. Fixes
 	  #522796.
 
-2002-02-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/shell.c: Patch from Rob Hillis
 	  <rob@hillis.dyndns.org>: Use SHELL_PROMPT instead of 
@@ -1224,7 +1224,7 @@
 	* frontends/command-line/actions.c: Use %li instead of %i to kill
 	  some warnings.
 
-2002-02-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* acconfig.h:
 	* configure.in: Add optional readline support.
@@ -1233,11 +1233,11 @@
 	* frontends/command-line/shell.c,h: Clean up and add (optional)
 	  readline support. Support deletion of files.
 
-2002-02-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Version 2.0
 
-2002-02-23  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-23  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch from Patrick Mansfield <patman@aracnet.com>:
 
@@ -1253,19 +1253,19 @@
 
 	* configure.in: Added zh_CN.GB2312 to ALL_LINGUAS.
 
-2002-02-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Bug reported by Marcus Meissner <marcus@jet.franken.de>:
 
 	* frontends/command-line/options.c: The option "-" is invalid.
 
-2002-02-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-filesys.c: If a file is requested, look for
 	  mtime first in the file, then in the info, then in the (EXIF) data of
 	  the file, and finally in GP_FILE_TYPE_EXIF.
 
-2002-02-15 Christophe Barbé <christophe.barbe@ufies.org>
+2002-02-15 Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    * libgphoto2_port/doc/DocRules.am: change rule to 
      build in the builddir (!= srcdir) and to install from buildir.
@@ -1292,7 +1292,7 @@
 	numbered from 1, and that quotes should be used for camera models.
 	* frontends/command-line/gphoto2.1: Regenerated.
 
-2002-02-13  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-13  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/Makefile.am:
 	* configure.in: Introduce versions.
@@ -1302,7 +1302,7 @@
 	* libgphoto2/gphoto2-filesys.c: Fix month off-by-one bug in
 	  Lutz's fix of get_exif_mtime.
 
-2002-02-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-filesys.c: Fix (get_exif_mtime).
 
@@ -1313,12 +1313,12 @@
 	* frontends/command-line/gphoto2.1: New file.
 	* frontends/command-line/Makefile.am: Install man page.
 
-2002-02-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Ok, not everybody likes pkg-config. Offer an
 	  alternative check, too.
 
-2002-02-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto-filesys.c: Previously, we searched thumbnails in
 	  EXIF data if GP_FILE_TYPE_PREVIEW is not supported by the driver. 
@@ -1326,7 +1326,7 @@
 	  not supported by the driver, get the thumbnail and search for
 	  EXIF data there.
 
-2002-02-10  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-10  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/actions.c,h:
 	* frontends/command-line/main.c: Implement --show-info.
@@ -1337,11 +1337,11 @@
 	  for_each_subfolder() did not descend into subfolders of
 	  subfolders when recursive.
 
-	* frontends/command-line/main.c: Be even more carefull in
+	* frontends/command-line/main.c: Be even more careful in
 	  checking the ID passed to the context functions by camera
 	  drivers.
 
-2002-02-08  Christophe Barbé <christophe.barbe@ufies.org>
+2002-02-08  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* frontends/command-line/main.c: Add usbid option to override 
 	  vendorID and deviceID for a given vendorID/deviceID couple in
@@ -1351,40 +1351,40 @@
 	  This requires from the camlib driver to not use the IDs directly
 	  but the device name instead.
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/main.c: Implement a progress bar (code
 	  adapted from e2fsck).
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line: s/image/file and s/picture/file with 
 	  the exception of capture-image.
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-filesys.c: Make it robust against folders
 	  with trailing slashes.
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/commend-line/main.c:
 	* frontends/command-line/actionsc,h:
 	* frontends/command-line/foreachc,h: Clean up, simplify.
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-filesys.c: Add support for getting the 
 	  mtime out of the file data.
 
-2002-02-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line: Fix my previous (broken) patch and hide
 	  all that recursive id look-up stuff.
 	* frontends/command-line/gphoto2-cmd-exif.c,h: Removed. Now in 
 	  actions.c,h
 
-2002-02-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/foreach.c,h: Pass CameraList as parameter.
 	  This be where the const filename is allocated. Before, the string
@@ -1395,7 +1395,7 @@
 
 	* frontends/command-line/foreach.c: Check return values
 	  of recursive calls to for_each_subfolder(). Fixes bug
-	  where errors was not detected if they occured in
+	  where errors was not detected if they occurred in
 	  subfolders of subfolders when doing recursive actions
 	  (like -P).
 
@@ -1405,7 +1405,7 @@
 
 	* configure.in (ALL_LINGUAS): Added zh_CN.
 
-2002-02-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/m4/Documentation.m4: Fix copy & paste error
 	* doc/api/Makefile.am
@@ -1423,11 +1423,11 @@
 
 	* configure.in: felt like 2.0beta5dev2 - nothing more
 
-2002-02-02  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-02  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line: Let --show-exif accept image numbers, too.
 
-2002-02-01  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-01  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/gphoto2-cmd-exif.c,h: New
 	* frontends/command-line/main.c: Hook it up.
@@ -1440,7 +1440,7 @@
 	the name of the device required to read the camera's memory stick
 	is more inline with current tradition.
 
-2002-02-01  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-01  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Only call aalib-config if it exists.
 
@@ -1449,16 +1449,16 @@
 	*configure.in: beta4 has already been released.
 	               we are now at beta5dev1
 
-2002-01-31  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-31  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* camlibs/ricoh:
 	* configure.in: Initial version. Not working.
 
-2002-01-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Tell users where to get additional libraries.
 
-2002-01-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am
 	* configure.in
@@ -1468,7 +1468,7 @@
 	* libexif: Remove libexif and check in configure.in if there is a
 	  libexif installed on the system.
 
-2002-01-28 Christophe Barbé <christophe.barbe@ufies.org>
+2002-01-28 Christophe BarbÃ© <christophe.barbe@ufies.org>
 
 	* CHANGES: Added with content from beta4 release.
 	* *: Tagged all files included in beta4.
@@ -1478,12 +1478,12 @@
 	* frontends/command-line/gphoto2-cmd-capture.c: Fixed security problem
 	  in creating temporary file for JPEG preview.
 
-2002-01-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-widget.c: Size of CameraWidget->labelname is
 	  now 256 instead of 32. Fixes long strings (esp. german translation).
 
-2002-01-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Hans Ulrich Niedermann <gp@n-dimensional.de> (slightly
 	adapted):
@@ -1491,7 +1491,7 @@
 	* frontends/command-line/main.c: Only report progress information
 	  if the user can see it. Same with confirmation of status messages.
 
-2002-01-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Fixes #506075:
 
@@ -1508,11 +1508,11 @@
 	* libgphoto2/pattrec.c
 	* libgphoto2/jpeg.c: Added include of config.h
 
-2002-01-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* frontends/command-line: Fix image numbering when --recurse.
 
-2002-01-19  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-19  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c: Check for cancellation.
 
@@ -1520,35 +1520,35 @@
 
 	* configure.in: 2.0beta4dev9 (progress is inevitable)
 
-2002-01-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libexif: New
 	* libgphoto2/gphoto2-filesys.c: Use libexif
 
-2002-01-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/gphoto2-file.c,h (gp_file_get,set_mod_time): New.
 
 2002-01-16  Colin Marquardt  <colin@marquardt-home.de>
 
-	*  libgphoto2_port/po/fr.po: Update from Jérôme.
-	*  po/fr.po: Update from Jérôme.
+	*  libgphoto2_port/po/fr.po: Update from JÃ©rÃ´me.
+	*  po/fr.po: Update from JÃ©rÃ´me.
 
-2002-01-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Black magic by Marcus Meissner <marcus@jet.franken.de>:
 
 	find . -type f | xargs grep -l gp_debug_printf | xargs perl -pi -e 's/gp_debug_printf\(\s*GP_DEBUG^,*,^,*,(.*)$/GP_DEBUG(\1/'
 
-2002-01-15  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-15  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2/*.h: Fix headers: no config.h, ifdef __cplusplus ...
 
-2002-01-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.h: Clean up.
 
-2002-01-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	More GPContext changes:
 
@@ -1562,15 +1562,15 @@
 	  this should be changed to checks of unrealistic lengths instead,
 	  but at least this makes us not dump core.
 
-2002-01-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: If the user presses 2 times 
 	  <ctrl>-c, abort.
 
 2002-01-14  Colin Marquardt  <colin@marquardt-home.de>
 
-	*  libgphoto2_port/po/fr.po: Update from Jérôme (is ISO-8859-1 now).
-	*  po/fr.po: Update from Jérôme.
+	*  libgphoto2_port/po/fr.po: Update from JÃ©rÃ´me (is ISO-8859-1 now).
+	*  po/fr.po: Update from JÃ©rÃ´me.
 
 2002-01-14  Fredrik <fredrik@krixor.xy.org>
 
@@ -1578,21 +1578,21 @@
 	  Kept --recurse but made it a no-op with a warning to stderr
 	  and added --no-recurse to turn recursion off.
 
-2002-01-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c:
 	* frontends/command-line/main.c: Translation fixes.
 	
 2002-01-13  Colin Marquardt  <colin@marquardt-home.de>
 
-	*  libgphoto2_port/po/fr.po: New translation from Jérôme.
-	*  po/fr.po: Update from Jérôme (help screen fits in 80 chars now).
+	*  libgphoto2_port/po/fr.po: New translation from JÃ©rÃ´me.
+	*  po/fr.po: Update from JÃ©rÃ´me (help screen fits in 80 chars now).
 
 2002-01-13  Hans Ulrich Niedermann <gp@n-dimensional.de>
 
 	* configure.in: 2.0beta4dev8 (to detect old/new canon camlib :-)
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c,h: Remove last references
 	  to gp_camera_get,set error.
@@ -1601,7 +1601,7 @@
 
 	* configure.in: Add fr to ALL_LINGUAS.
 	* po/de.po: Update. 
-	* po/fr.po: New file from Jérôme Fenal <jerome@fenal.org>. Thanks.
+	* po/fr.po: New file from JÃ©rÃ´me Fenal <jerome@fenal.org>. Thanks.
 
 2002-01-13 Dan Fandrich <dan@coneharvesters.com>
 
@@ -1609,7 +1609,7 @@
 	* libgphoto2/gphoto2-list.h
 	* libgphoto2/gphoto2-result.h: Put #ifdef HAVE_CONFIG_H around include
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Finished the GPContext stuff - changes all over the place. Basically,
 	gp_file,camera_progress has been replaced by gp_context_progress_*.
@@ -1622,12 +1622,12 @@
 	  to report multiple errors during execution of a command, offers 
 	  several (nested) progress reports, and many other goodies.
 
-2002-01-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-context.c,h: Support for multiple progress
 	  reports at once (especially sub-progress reports).
 
-2002-01-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c,h: Add a GPContext to all functions 
 	  that potentially access the camera. This makes cancelling of 
@@ -1636,7 +1636,7 @@
 	* libgphoto2/gphoto2-camera.c:
 	* camlibs: Adjust to reflect above changes
 
-2002-01-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/Makefile.am
 	* libgphoto2/gphoto2-context.c,h: New files
@@ -1661,12 +1661,12 @@
 	* frontends/command-line/gphoto2-cmd-config.c
 	* configure.in: Allow cdk.h to be found outside a cdk directory.
 
-2002-01-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Substitute AM_PROG_LIBTOOL by AC_PROG_LIBTOOL (first
 	  is deprecated).
 
-2002-01-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Correctly shut down the camera even
 	  in case of error.
@@ -1681,7 +1681,7 @@
 
 	* doc/FAQ: Added a few FAQs
 	
-2002-01-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: $prefix is set to NONE if no --prefix=/some/dir is
 	  specified.
@@ -1707,13 +1707,13 @@
 	* INSTALL: Added note about libusb requirements (CVS or 0.1.5)
 	+ configure.in: time for 2.0beta4dev6 IMHO
 
-2002-01-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/Makefile.am
 	* camlibs/ * /Makefile.am: Install drivers into versioned
 	  subdirectories.
 
-2002-01-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Implement proper cancelling of file
 	  down- and upload.
@@ -1724,12 +1724,12 @@
 	  users to mail the gphoto-devel mailing list when something
 	  goes wrong.
 
-2001-12-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c,h (gp_filesystem_delete_file_noop):
 	  New.
 
-2001-12-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Give users the possibility to specify the location
 	  of cdk
@@ -1743,7 +1743,7 @@
 	  Replaced wrong index into list->abilities by correct one.
 	  Should make USB autodetection work again.
 
-2001-12-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-abilities-list.c (gp_abilities_list_detect_usb):
 	  Declare this function static - we don't want to advertise it.
@@ -1753,17 +1753,17 @@
 	* MAINTAINERS: Added myself to stv680 entry.
 	* AUTHORS: Added myself.
 
-2001-12-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Show file-specific progress on
 	  upload, too.
 
-2001-12-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.h: Add a note about
 	  gp_camera_progress being deprecated.
 
-2001-12-28  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-28  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-file.c,h: Implement progress reporting here.
 	  That makes file upload and file download cancellable.
@@ -1789,30 +1789,30 @@
 	* libgphoto2_port/m4/byteorder.m4
 	* configure.in: added AC_NEED_BYTEORDER_H macro to generate _byteorder.h
 
-2001-12-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Comment out check for ltdl.h. See comment in there.
 
-2001-12-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in:
 	* acconfig.h: Put the --disable-debugging option back in.
 
-2001-12-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Fix no-ltdl.h case.
 
-2001-12-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2: Use ltdl.h if available
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/Makefile.am: It seems we need to 
 	  LDADD libgphoto2_port.la here, too, although we LIBADDed it in
 	  libgphoto2/Makefile.am to libgphoto2.la?
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs: Remove references to GP_ERROR_IO_TIMEOUT - we use
 	  GP_ERROR_TIMEOUT instead.
@@ -1851,7 +1851,7 @@
 	* doc/api/gphoto2-sections.txt: added misc. functions and constants
 	* doc/api/*: reflect changed gphoto2-sections.txt
 	
-2001-12-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in:
 	* acconfig.h: ENABLE_DEBUGGING -> DISABLE_DEBUGGING. If you don't, 
@@ -1862,22 +1862,22 @@
 	* configure.in: it is time for 2.0beta4dev4
 	* gphoto2-config.in: made it work again
 
-2001-12-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Even more cleanup.
 
-2001-12-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Remove dotlib hack
 	* camlibs: Do it "the right way"
 
-2001-12-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Remove some cruft that survived my automake,conf 
 	  cleanup
 	* libgphoto2/Makefile.am: LIBADD libgphoto2_port.la
 
-2001-12-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Use () instead of {}. That produces a warning in 
 	  configure, but at least works when linking.
@@ -1895,16 +1895,16 @@
 	* camlibs/panasonic/l859/l859.h: add AC_NEED_STDINT_H to configure.in
 	  and change camera libraries to use C99-style size-specific integer types
 
-2001-12-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	$builddir != $srcdir fixes.
 
-2001-12-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2: Support for GP_FILE_TYPE_EXIF. Not that there is not
 	  support for it in the frontends (yet).
 
-2001-12-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c: Don't exit the camera if it is 
 	  currently in use.
@@ -1941,7 +1941,7 @@
 	* configure.in: renamed PGK_* to GPKG_*
 	* doc/figures/Makefile.am: build jpg and png figures iff ENABLE_FIGURES is set
 	
-2001-11-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2:
 	* doc/api: Move documentation out of the header files into the
@@ -1967,11 +1967,11 @@
 	* configure.in: init RPM packaging
 	* libgphoto2_port/m4/packaging.m4: added packaging macro
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c: Update documentation.
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-file.h: Fix formatting of comments: Should
 	  always be
@@ -1994,12 +1994,12 @@
 	* camlibs/canon/library.c: cleaned up the "switch off" stuff
 	* camlibs/konica/lowlevel.c: set_timeout, not timeout_set
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.h: On Mariusz request, add a 
 	  GP_FILE_INFO_TIME
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c: Recover from errors during
 	  file-deletion.
@@ -2008,7 +2008,7 @@
 	  fix that.
 	* camlibs/konica/library.c: Here, too.
 
-2001-11-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/directory/directory.c (set_info_func): Rewrite
 	* camlibs/ptp/library.c:
@@ -2025,7 +2025,7 @@
 	* libgphoto2_port/configure.in: libintl fix
 	* doc/figures/*: added figures about software architecture
 	
-2001-11-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.h: Support "downloaded"-flag through
 	  CameraFileStatus.
@@ -2055,7 +2055,7 @@
 
 	* configure.in: hopefully really correct checks for libdl and libintl
 
-2001-11-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Check for mcheck.h
 	* tests: #ifdef HAVE_MCHECK_H
@@ -2070,7 +2070,7 @@
 	* camlibs/stv0680/stv680.html: Some documentation fixes regarding 
 	  Capture Image.
 	   
-2001-11-23  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-23  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c: Don't free a camera if it is 
 	  currently in use. This fixes reentrancy crashes in gtkam on
@@ -2098,18 +2098,18 @@
 	    Fix bug whereby hexadecimal output is erroneously 
             shown in decimal format.
 
-2001-11-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in:
 	* acconfig.h: No need for --with-multi any more
 	* libgphoto2/gphoto2-camera.c: Add some comments about the 
 	  problems with HAVE_MULTI.
 
-2001-11-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c,h: Expose gp_camera_exit to the world.
 
-2001-11-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Mark more strings for translation
 
@@ -2134,7 +2134,7 @@
 
 	* po/POTFILES.in: Removed ../camlibs/canon/psa50.c
 
-2001-11-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	I quote from an e-mail: "You (Lutz) should remove the code you added
 	that broke (at least) two of the supported 'libgphoto2' camera
@@ -2145,7 +2145,7 @@
 	  people who don't use it will run into troubles when using Nautilus
 	  or Konqueror for browsing their camera.
 
-2001-11-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c,h: Add a pre_func and a post_func 
 	  that gets called before and after each access to the camera driver.
@@ -2173,7 +2173,7 @@
 
 	* HACKING: covertly introducing important policy changes :-)
 
-2001-11-20  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-20  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Put gettext hack in again. Someone complained...
 
@@ -2188,7 +2188,7 @@
 	* camlibs/ptp: basic (and hacked) ptp camera functionality:
 	  only JPG image and thumbnails downloading supported
 
-2001-11-19  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-19  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Remove gettext hack. Let's see if someone complains...
 
@@ -2208,20 +2208,20 @@
 	* configure.in: upped version to dev1 to map build errors to the
 	  changes I just introduced
 
-2001-11-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Ole Aamot <Ole.Aamot@nr.no>:
 
 	* tests: Use mcheck.h (useful when searching for mem-leaks).
 
-2001-11-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Bill Marr <marr@shianet.org>:
 
 	* camlibs/digita/commands.c: Fix bug causing 8 bad trailing 
 	  pixels in Digita thumbnail image download.
 
-2001-11-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/options.c: Mark some more strings for
 	  translation.
@@ -2235,7 +2235,7 @@
 	* libgphoto2_port/intl/Makefile.in
 	* intl/Makefile.in: fixed incorrect location of config.h
 
-2001-11-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line: Fix translation. You use N_(...) to _mark_ a
 	  string for translation. In order to convert it, you need to call
@@ -2243,7 +2243,7 @@
 	  and after that, convert this string using _(...) before displaying
 	  it.
 
-2001-11-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/ptp/ptp.c,h: Hide some internals
 	* frontends/command-line/main.c: Fix translation by calling
@@ -2266,36 +2266,36 @@
 	  the last number every time you made some changes that could
 	  break or fix something of interest.
 
-2001-11-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/ptp: Remove a whole lot of warnings, remove unnecessary
 	  PTPResult (we've got PTP_RC_*), flesh out library.c a bit - still
 	  not functional, though.
 
-2001-11-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Greg Ingram <ingram@symsys.com>, slightly reworked:
 
 	* camlibs/polaroid/pdc700.c: Make the assumption that we need to 
 	  deal with multiple packets only on PDC700_PIC and PDC700_THUMB.
 
-2001-11-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* MAINTAINERS: Move camlibs/ptp up to regain alphabetical order.
 
 2001-11-15  Mariusz Woloszyn <emsi@ipartners.pl>
 
-	* camlibs/ptp/: Started PTP support library developement
+	* camlibs/ptp/: Started PTP support library development
 
 2001-11-15  Colin Marquardt  <colin@marquardt-home.de>
 
 	* po/de.po: Update.
 
-2001-11-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/ptp: Basic structure for a new driver.
 
-2001-11-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: Introduce enum PDCConf for better
 	  readability (instead of #define).
@@ -2316,7 +2316,7 @@
 	  - added some delaying tactics in pdc700_capture()
 	  - added usb vendor/product ids (no, usb doesn't work yet)
 	
-2001-11-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* cammlibs/agfa/agfa.c: Initialize a.speed0 to 0 instead of 
 	  leaving it uninitialized.
@@ -2329,12 +2329,12 @@
 	  within the 1500ms timeout. Handle that properly with 2 read. (patch by
 	  Peter Fales <psfales@lucent.com>)
 
-2001-11-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-13 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c: Adjust filename only for thumbnails,
 	  audio files, etc, not for normal pictures.
 
-2001-11-12 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-12 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in:
 	* libgphoto2/libgphoto-2.0.pc.in: Renamed to ...
@@ -2342,7 +2342,7 @@
 	  really want our project to be called libgphoto2 and not libgphoto...
 	  Therefore, be consistent here, too.
 
-2001-11-11 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-11 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Add a switch for GP_FILE_TYPE_AUDIO.
 
@@ -2365,7 +2365,7 @@
 	  receive buffer in psa50_get_disk(). This caused us to dump
 	  core when accessing serial canon cameras.
 
-2001-11-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: PPM-thumbnails are 9600 bytes, not
 	  4800. Sorry, guys. Should work again.
@@ -2376,20 +2376,20 @@
 	  memory size, power source, mode, and auto-power-off time  
 	  in the camera_summary.
 
-2001-11-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
-	Patch from Greg Ingram <ingram@symsys.com>, unfortunatelly without
+	Patch from Greg Ingram <ingram@symsys.com>, unfortunately without
 	ChangeLog entry...
 
 	* camlibs/polaroid/pdc700.c: Report lcd state and caption (?) in 
 	  the camera_summary.
 
-2001-11-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra: Clean up header files (hide internals, make
 	  functions static)
 
-2001-11-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra: Improve error reporting. Use register 47 for 
 	  pic-info retrieval. Support GP_FILE_TYPE_AUDIO.
@@ -2404,42 +2404,42 @@
 	  from MMC card.  Changed summary info to show support for v2 cameras.
 	  Fixed gp_camera_progress percentage argument to be >0 and <1.
 
-2001-11-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.h: Expand CameraFileInfo to include 
 	  information about audio data, too.
 
-2001-11-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patches from Greg Ingram <ingram@symsys.com>:
 
 	* camlibs/polaroid/pdc700.c: Lots of new stuff
 
-2001-11-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-file.c: Added GP_FILE_TYPE_AUDIO for cameras that can
 	  attach audio data to a picture.
 
-2001-11-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch by Peter Jay Salzmann <p@dirac.org> (slightly adapted):
 
 	* camlibs/polaroid/pdc700.c: Tell the user about the current image
 	  quality setting.
 
-2001-11-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c: Don't trust the camera libraries,
 	  set name, type, and adjust name for mime type after getting a file.
 
-2001-11-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Chris Pinkham <cpinkham@corp.infi.net> decoded the thumbnails:
 
 	* camlibs/polaroid/pdc700.c: Convert the thumbnails from YUV 2:1:1
 	  to PPM.
 
-2001-11-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: Fix memmove (third parameter is # of
 	  bytes to be moved). Display version information in camera_summary.
@@ -2462,7 +2462,7 @@
 
 	* camlibs/jd11: Implemented progress reporting.
 
-2001-11-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: Checksum is only 1 byte long.
 
@@ -2474,15 +2474,15 @@
 	  camlibs/jamcam/library.c: added support for gp_camera_progress().
 	  Fixed bug in jamcam driver jamcam_file_count() routine.
 
-2001-11-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: Timeout = 2sec, try each speed 2 times.
 
-2001-11-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/PROTOCOL: Updated (upload).
 
-2001-11-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: While searching the archives, I found
 	  some dumps and saw that there is something wrong with the logic in
@@ -2574,11 +2574,11 @@
 	* frontends/command-line/main.c: x was not set to 0 before listing
 	  serial speeds leading to corrupt output.
 
-2001-11-01 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-01 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-filesys.c: Fix bug (folder deletion)
 
-2001-11-01 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-01 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Chris <adapt@ihug.co.nz>:
 
@@ -2621,7 +2621,7 @@
 	* libgphoto2_port/usb/Makefile.am: added -module flag to libtool link 
 	  command for each library that is dlopen'ed
 
-2001-10-31 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-31 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/bayer.c: Remove unused variable
 	* libgphoto2/gphoto2-camera.c: Use the library handle in order
@@ -2637,12 +2637,12 @@
 
 	* README: added a few USB Mass storage cameras.
 
-2001-10-30 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-30 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc640.c: If you malloc memory for camera->pl, 
 	  free it in camera_exit.
 
-2001-10-30 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-30 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/gphoto2-cmd-config.c:
 	  Implement GP_WIDGET_TEXT and GP_WIDGET_TOGGLE
@@ -2654,16 +2654,16 @@
 	* frontends/command-line/interface.c: Since status messages are
 	  now written to stderr, flush stderr instead of stdout.
 
-2001-10-30 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-30 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Be more elaborate about wrong ports.
 	  Fixes #475320
 
-2001-10-30 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-30 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c,h: Fix --capture-image
 
-2001-10-29 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-29 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/interface.c: Suppress empty status
 	  messages. Those indicate that we should _clear_ the status and 
@@ -2673,7 +2673,7 @@
 	* libgphoto2/gphoto2-camera.c: Make sure the camera is 
 	  initialized.
 
-2001-10-29 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-29 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-abilities-list.c: Additional debug message. Spews
 	  a lot of output, but people get segfaults when loading camera 
@@ -2703,7 +2703,7 @@
 	* configure.in: added jd11 subdirs
 	* MAINTAINERS: added myself
 
-2001-10-27 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-27 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/canon.c: rmdir/mkdir support
 	* camlibs/canon/psa50.c (psa50_directory_operations): Consistently
@@ -2726,7 +2726,7 @@
 	* packaging/rpm/README.rpm: added new this-is-how-our-RPM-works-internally docs
 	* libgphoto2_port/po/POTFILES.in: gphoto2-port.c, not gp_port.c
 
-2001-10-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/serial.c: gp_port_pin_get -> gp_port_get_pin
 
@@ -2765,16 +2765,16 @@
 	  Cleaned out some superfluous debugging I forgot in my last
 	  big patch.
 
-2001-10-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include: Move everything from here ...
 	* libgphoto2: ... to here.
 
-2001-10-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2: Adapt to changes in libgphoto2_port
 
-2001-10-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/gphoto2-cmd-capture.c: Adjust brighness
 	  and contrast with arrow keys
@@ -2788,7 +2788,7 @@
 	* libgphoto2/jpeg.c:
 	  Preliminary support for OS X/Darwin
 
-2001-10-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Check for jpeglib and aalib.
 	* frontends/command-line/main.c
@@ -2801,7 +2801,7 @@
 	* gphoto.spec.in: hotplug dependency is a prereq not a requires
 	  (patch by Tim Waugh <twaugh@redhat.com>)
 
-2001-10-25 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-25 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/serial.c,h: No need to set the port path anywhere.
 	  This is fully handled by gphoto2. That is: gp_settings_get, 
@@ -2809,16 +2809,16 @@
 	* camlibs/canon/canon.c: Adjust parameters to canon_serial_init
 	* camlibs/digita/serial.c: there is no dev->device_fd any more
 
-2001-10-25 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-25 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Remember --camera and --port
 
-2001-10-25 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-25 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Adapt to changes in gphoto2-port
 	* libgphoto2: Here, too.
 
-2001-10-24 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-24 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in
 	* acconfig.h: Check for CDK
@@ -2860,14 +2860,14 @@
 	* packaging/Makefile.am: add README.rpm
 	* packaging/README.rpm: added RPM build instructions
 
-2001-10-23 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Bug reported by David Robert <david@ombrepixel.com>:
 
 	* frontends/command-line/shell.c: Fix bug (leading blanks with
 	  filenames)
 
-2001-10-23 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-core.c,h: Removed. All functions redirected
 	  to gphoto2-abilities-list. Caching of this list should be done 
@@ -2876,7 +2876,7 @@
 	* libgphoto2/setting.c: Move some initialization stuff from 
 	  gphoto2-core to here.
 
-2001-10-23 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs: Remove every reference to gp_camera_result_as_string
 	  including camera->functions->result_as_string. It was mostly
@@ -2889,13 +2889,13 @@
 	* camlibs/canon/util.c: made canon debug use gp_log. 
 	  this makes canon drv to compile again
 
-2001-10-23 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Fredrik <fredrik@krixor.xy.org>:
 
 	* libgphoto2/gphoto2-debug.c: Bug fix
 
-2001-10-23 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Carsten Weinholz <c.weinholz@netcologne.de>, slightly
 	modified (removed unnecessary //-comments, indentation):
@@ -2913,30 +2913,30 @@
 	* configure.in: added packaging/
 	* Makefile.am: added packaging/, added .tar.bz2 dist support
 
-2001-10-22 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Don't use gphoto2-core.h - use
 	  gphoto2-abilities-list.h.
 
-2001-10-22 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Adjust to changes in
 	  gphoto2-port-log.h.
 
-2001-10-22 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon: Use camera->pl instead of camera->camlib_data.
 	  Add warning about use of global variables.
 	* libgphoto2/gphoto2-camera.h: Remove camera->camlib_data.
 
-2001-10-22 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/canon.c: Use the CameraFilesystem. Declare some
 	  functions static.
 	* libgphoto2/gphoto2-camera.c,h: We now use the CameraFilesystem
 	  exclusively - major cleanup. 
 
-2001-10-22 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c: Autodetect also in case of 
 	  camera->port != NULL.
@@ -2955,7 +2955,7 @@
 	and made a new psa50_usb_long_dialogue() that handles these correctly.
 	This should fix a number of problems with those kinds of transfers (I
 	previously fixed this for get_file, now it is fixed for all functions
-	using this). Large directorys filling more than one USB bulk packet
+	using this). Large directories filling more than one USB bulk packet
 	probably never worked before, but should work now.
 
 	* camlibs/canon/canon.c:
@@ -2974,7 +2974,7 @@
 
 	Changed a bunch of fprintf() and perror() to gp_debug_printf().
 
-2001-10-21 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-21 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* doc/api: Some additions
 	* libgphoto2/Makefile.am
@@ -2985,21 +2985,21 @@
 
 	* libgphoto2_port/libgphoto2_port/gp_port.c: log USB IDs in hex instead of decimal
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc120: Prepare for camera->camlib_data removal. Fix
 	  compile warnings
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc3200: Prepare for camera->camlib_data removal.
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic: Prepare for camera->camlib_data removal. Fix lots
 	  of compile warnings. Remove gp_port_close,free,new (sic).
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa/commands.h: Unused -> removed.
 	* camlibs/agfa/Makefile.am: Reflect above.
@@ -3007,22 +3007,22 @@
 	  camera->camlib_data. Fix small memory leak in camera_init (in case
 	  of error).
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/minolta/dimagev/dimagev.c,h: Prepare for removal of
 	  camera->camlib_data. Fix memory leaks (in case of errors).
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/digita:
 	* camlibs/dimera: Prepare for elimination of camera->camlib_data.
 	* camlibs/konica: Some additional debugging messages
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c,h (gp_camera_get_port_speed): New
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc240/library.c: Don't access a CameraFile directly.
 	  This lets us ...
@@ -3030,7 +3030,7 @@
 	  private. Header file moved from include over to here in order to
 	  prepare for documentation
 
-2001-10-20 Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20 Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs: Instead of camera->port_info->speed, use
 	  settings.serial.speed. That lets us ...
@@ -3107,7 +3107,7 @@
     * frontends/command-line/main.c: Added automatic port type guessing
       when the type isn't specified
 
-2001-10-19  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-19  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/casio
 	* camlibs/polaroid
@@ -3117,7 +3117,7 @@
 	* camlibs/panasonic/coolshot
 	* camlibs/samsung: Use camera-fs and get_file_func
 
-2001-10-19  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-19  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc240: Use camera->fs - this should fix file deletion
 	  that I broke earlier.
@@ -3125,13 +3125,13 @@
 	  gp_port_new,free,open,close. Declare some functions static in
 	  order to fix compile warnings.
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Port to gp_log
 	* libgphoto2/gphoto2-debug.c,h: Clean up even more.
 	* po/POTFILES.in: Add frontends/command-line/main.c
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/digita/digita.c: Fix compile warnings ("static ..."). Use
 	  camera->fs.
@@ -3142,60 +3142,60 @@
 	  begins with 'serial' since gp_camera_set_port_speed() now fails
 	  if called for non-serial port.
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon.c: Don't use camera->model.
 	* libgphoto2/gphoto2-camera.c,h: Remove camera->model.
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc320.c,h: Don't use camera->model.
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sonydscf55: Use camera->pl, fix compile warnings
 
-2001-10-18  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-18  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic/l859
 	* camlibs/sierra: Use camera->pl
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs: Don't use camera->port_info->path. This one has already
 	  be set by gphoto2
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/directory/directory.c: Use camera->fs exclusively.
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/jd350e: Use camera->port directly. 
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/stv0680: Make direct use of camera->port. Kill compile 
 	  warnings by declaring some functions static.
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/library.c: Use camera->pl
 	* libgphoto2/gphoto2-camera.c,h: Move lots of internals into 
 	  camera->pc (for core use only) and offer hook for camera libraries
 	  (camera->pl) and frontends (camera->pf)
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Use gp_log.
 	* libgphoto2/gphoto2-debug.c,h: Use gp_log.
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-debug.c: Make tranition to gp_log_*
 	* camlibs/sierra: Adjust parameters of camera_capture
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* README: no glib-dependency any more
 	* camlibs: gp_abilities_new doesn't exist any more
@@ -3203,14 +3203,14 @@
 	* libgphoto2/gphoto2-abiltiies.h: Cleaned up.
 	* libgphoto2/gphoto2-abilities-list.c: Documented
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Dan Fandrich <dan@coneharvesters.com>:
 
 	* libgphoto2/gphoto2-abilities-list.c:
 	* libgphoto2/gphoto2-camera.c: Make models case-insensitive.
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-camera.c,h: Documented
 
@@ -3239,18 +3239,18 @@
 	* frontends/command-line/main.c: added --print-usb-usermap command
 	* frontends/command-line/main.h: added definition name of hotplug script
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Use gp_camera_set_abilities.
 	* include/gphoto2-camera.h:
 	* libgphoto2/camera.c:Introduce gp_camera_set,get_abilities.
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-result.c,h: GP_ERROR_NOT_SUPPORTED now in
 	  libgphoto2_port.
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c:
 	* camlibs/konica/library.c:
@@ -3261,24 +3261,24 @@
 	  libgphoto2_port/libgphoto2_port
 	* include/gphoto2-camera.h: Use the new GPPort and GPPortInfo
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Bug found by Fredrik <fredrik@krixor.xy.org>:
 
 	* doc/api/Makefile.am: Don't if-out everything.
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Bug found by Colin Marquardt <colin@marquardt-home.de>:
 
 	* doc/api/Makefile.am: Don't generate documentation if not
 	  ENABLE_GTK_DOC
 
-2001-10-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-debug.c,h: Documented.
 
-2001-10-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch approved by Gus Hartmann <hartmann@madison-expat.net>:
 
@@ -3286,25 +3286,25 @@
 	* camlibs/minolta/dimagev/upload.c: Don't access the CameraFile struct
 	  directly.
 
-2001-10-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-library.h: Moved to ...
 	* libgphoto2/gphoto2-libary.h: ... here.
 
-2001-10-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
-	* camlibs/polaroid/pdc640.c: Remove non-existant
+	* camlibs/polaroid/pdc640.c: Remove non-existent
 	  GP_ERROR_NO_CAMERA_FOUND.
 
-2001-10-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-result.c,h: Documented.
 
-2001-10-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-list.c,h: Documented.
 
-2001-10-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/gphoto2-abilities-list.c,h: Simplified, expose fewer
 	functions.
@@ -3346,12 +3346,12 @@
 	  psa50_usb_dialogue() and cleanups to psa50_get_file_usb()
 	  (fixes downloading of small files (read: thumbnails)).
 
-2001-10-12  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-12  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include
 	* libgphoto2: More renaming in order to make gtk-doc happy.
 
-2001-10-12  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-12  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-widget.h
 	* include/gphoto2-filesys.h: Moved to ...
@@ -3365,16 +3365,16 @@
 	* libgphoto2/Makefile.am: Updated.
 	* camlibs/.../Makefile.am: Updated to reflect changes above
 
-2001-10-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/libgphoto-2.0.pc.in: -I${includedir}
 
-2001-10-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/directory/directory.h: Removed.
 	* camlibs/directory/directory.c: Remove cruft
 
-2001-10-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/psa50.c
 	* camlibs/dimera/dimera3500.c:
@@ -3393,30 +3393,30 @@
 	* docs/, doc/: moved all documentation to doc/
 	* doc/gphoto2.txt, doc/gphoto2-cli.txt: added to distribution
 
-2001-10-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-widget.h
 	* libgphoto2/exif.c,h
 	* libgphoto2/widget.c: Fix stuff gtk-doc was complaining about.
 	
-2001-10-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Give some feedback (gtk-doc: yes/no?)
 
-2001-10-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/filesys.c: Documented.
 
-2001-10-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/template/template.c: Updated.
 
-2001-10-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/interface.c: Don't jump to the next line
 	  for status messages - this disturbs the nice formatting of listings.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/casio/casio-qv.c: On capture, append the file to the 
 	  filesystem
@@ -3426,7 +3426,7 @@
 	* include/gphoto2-filesys.h: We don't need to expose
 	  gp_filesystem_folder_number, that doesn't make sense
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Shift the whole library towards exclusively using the
 	CameraFilesystem:
@@ -3463,39 +3463,39 @@
 	* libgphoto2/jpeg.c: Kill unused variable
 	* tests/test-filesys.c: Update
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sonydscf1:
 	  Clean up a bit. This camera uses globals and won't work with
 	  big frontends...
 	  Use camera->port and camera->fs.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/stv0680/stv0680.c,h:
 	  Fix compile warnings by declaring some functions static.
 	  Use camera->port and camera->fs.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sonydscf55/camera.c:
 	  Fix compile warnings by declaring some functions static.
 	  Use camera->port and camera->fs.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/minolta/dimagev/dimagev.c,h:
 	  Fix compile warnings by declaring some functions static.
 	  Use camera->port and camera->fs.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic/l859/l859.c,h:
 	  Fix compile warnings by declaring some functions static.
 	  Use camera->port and camera->fs.
 	  (l859_debug): Removed. Now in libgphoto2_port
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/jd3503/library.c: Fix compile warnings by declaring some
 	  functions static.
@@ -3504,11 +3504,11 @@
 	  and second for caching.
 	* camlibs/jd350e.h: No filesystem here. Use camera->fs.
 
-2001-10-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/library.c: Remove reference to gphoto2-frontend.h.
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-frontend.h
 	* libgphoto2/frontend.c: Removed
@@ -3516,47 +3516,47 @@
 	* include/Makefile.am
 	* libgphoto2: Remove references to above
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic/dc.c: gp_frontend_status ->
 	  gp_camera_status
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc240/library.c: gp_frontend_status ->
 	  gp_camera_status
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-camera,frontend.h
 	* libgphoto2/camera,frontend.c: gp_frontend_message ->
 	  gp_camera_message
 	* camlibs: Reflect above
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc640.c: Patch from Chris. Don't know what's
 	  inside...
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-frontend.h
 	* libgphoto2/frontend.c
 	* camlibs: gp_frontend_progress -> gp_camera_progress,
 	gp_frontend_status -> gp_camera_status
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Correctly initialize on gp_camera_new
 	* frontends/command-line: Use the new gp_camera_status,progress
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c
 	* include/gphoto2-camera.h (gp_camera_status*), (gp_camera_progress*):
 	New
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-frontend.h
 	* libgphoto2/frontend.c: Remove gp_frontend_prompt. This and the other
@@ -3566,16 +3566,16 @@
 
 	* configure.in: remove unnecessary variables at the beginning
 
-2001-10-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Additional debugging messages
 
-2001-10-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/jamcam: Use libgphoto2/bayer.h and libgphoto2/gamma.h
 	* libgphoto2/Makefile.am: LIBADD -lm
 
-2001-10-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: -lm
 	* libgphoto2/Makefile.am
@@ -3583,44 +3583,44 @@
 	* libgphoto2/gamma.c,h: New
 	* camlibs/polaroid/pdc640.c: Use above
 
-2001-10-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Chris Byrne <adapt@ihug.co.nz>:
 
 	* camlibs/polaroid/pdc640.c: Updated
 
-2001-10-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from David Faure <david@mandrakesoft.com>
 
 	* libgphoto2/core.c: Fix logic
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Bump version up to 2.0beta3
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Hans Ulrich Niedermann <gp@n-dimensional.de>:
 
 	* frontends/command-line: Add --version
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-list.h
 	* libgphoto2/list.c (gp_list_ref), (gp_list_unref): New
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-debug.h
 	* libgphoto2/debug.c (gp_debug_history_get_size): New
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/debug.c: Use the debug level from libgphoto2_port instead
 	of keeping an own global variable
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Check for vsnprintf, too.
 	* libgphoto2/debug.c: Use vsnprintf if available.
@@ -3641,7 +3641,7 @@
 	with --get-all-thumbnails, --get-all-images, --get-all-raw-data,
 	--list-files and --list-folders.
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/filesys.c: Only spew debugging messages in case of error -
 	there don't seem to be serious bugs in there any more.
@@ -3651,18 +3651,18 @@
 	* camlibs/kodak/dc240/library.c: patch by Peter Fales <peter@fales.com>
 	compute the packet checksum and ask to resend it.
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-debug.h: #include <gphoto2-port-debug.h>
 	* include/gphoto2-result.h: #include <gphoto2-port-result.h>
 	* libgphoto2/debug.c: #include <gphoto2-port.h>
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/debug.c: Move debugging stuff to libgphoto2_port so
 	that those messages get saved, too.
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/library.c: const
 	* frontents/command-line/main.c: Print out last debugging messages
@@ -3672,7 +3672,7 @@
 	* include/gphoto2-result.h:
 	* libgphoto2/result.c: Revert the result_as_description thing
 	
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/result.c:
 	* libgphoto2/camera.c:
@@ -3683,32 +3683,32 @@
 
 	* camlibs/kodak/CAMERAS: added latest Kodak DX models.
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: Print out additional information
 	on error.
 	* include/gphoto2-result.h:
 	* libgphoto2/result.c (gp_result_as_description): New.
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Check the result of gp_port_open.
 
-2001-10-01  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-01  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/localization/Makefile.am: EXTRA_DIST the localization
 	data to get the stuff included in the dist tarball.
 
-2001-10-01  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-01  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica: Rejoice, we no longer have a glib dependency!
 
-2001-10-01  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-01  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/konica.c,h:
 	* camlibs/konica/library.c: Moving towards glib-free code...
 
-2001-09-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/protocol.c:
 	* camlibs/sierra/sierra.c: Gilles Grandou <gilles@grandou.net>
@@ -3716,7 +3716,7 @@
 	* configure.in:
 	* camlibs/jd350e: New driver from Michael Trawny <trawny99@yahoo.com>
 
-2001-09-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/jpeg.h: Fix a warning
 	* libgphoto2/camera.c: Fix locking problem in
@@ -3730,31 +3730,31 @@
 	* libgphoto2/jpeg.c: Can now create and write jpeg files
 	(except for actual encoding of compressed data)
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/jpeg.h:
 	* camlibs/polaroid/pdc320.c: Adapt to changes jpeg_* -> gp_jpeg_*
 	* libgphoto2/jpeg.h: Kill yet another warning.
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/jpeg.c,h: Respect the namespace of libjpeg. Otherwise,
 	gtkam and other graphical frontends will horribly fail.
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/core.c: have_initted is no longer needed.
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sonydscf1/sonydscf1.c:
 	* libgphoto2/debug.c: glob_debug is now static in libgphoto2
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/main.c: glob_debug is now static in libgphoto2
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/jpeg.c: #define CHECK_RESULT(...) (...)
 
@@ -3769,11 +3769,11 @@
 	  camlibs/jamcam/library.h
 	  camlibs/jamcam/library.c: Added support for low-res images.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/filesys.c: Fix two small bugs.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/jamcam/.cvsignore:
 	* camlibs/sonydscf55/.cvsignore: New
@@ -3791,7 +3791,7 @@
 
 	* camlibs/sonydscf55/*: Fixes & eliminated compiler warnings.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Carsten Pfeiffer <carpdjih@sp.zrz.tu-berlin.de>
 
@@ -3803,7 +3803,7 @@
 	* libgphoto2/file.c:
 	* libgphoto2/filesys.c: char *whatever -> const char *whatever.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Ilya Konstantinov <future@shiny.co.il>:
 
@@ -3834,7 +3834,7 @@
 	  camlibs/jamcam/library.c
 	  camlibs/jamcam/library.h: added camera library for KBGear JamCam v3.0
 
-2001-09-12  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-12  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/core.c: Add some CHECK_INITs.
 
@@ -3848,12 +3848,12 @@
 	* libgphoto2_port/usb/libusb.c (gp_port_usb_find_device_lib): if
 	device and vendor IDs are 0, return not found.
 
-2001-09-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/kodak/dc240/dc240.c (camera_init): Don't open/close the port.
 	This is done by libgphoto2.
 
-2001-09-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c
 	(gp_camera_init): Do a simple CHECK_RESULT_OPEN_CLOSE on the init_func
@@ -3874,7 +3874,7 @@
 	* camlibs/agfa-cl18/agfa.c: Don't open the port. This is always done
 	by libgphoto2.
 
-2001-09-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c (gp_camera_list_folders), (gp_camera_list_files):
 	Return the result instead of GP_OK if anything goes wrong
@@ -3883,15 +3883,15 @@
 	* libgphoto2/result.c:
 	* include/gphoto2-result.h: GP_ERROR_PATH_NOT_ABSOLUTE: New error.
 
-2001-09-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c (get_info_func): Fix copy & paste bug.
 
-2001-09-10  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-10  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/core.c: Additional debugging stuff.
 
-2001-09-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/core.c: Use "... == GP_OK" instead of "!...". That should
 	prevent that every USB camera shows up on gp_autodetect...
@@ -3901,17 +3901,17 @@
 	* libgphoto2_port/usb/libusb.c (gp_port_usb_close): Fixed a
 	segfault when passed device handle was NULL.
 
-2001-09-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/filesys.c (gp_filesystem_format): Don't request any
 	listings here.
 
-2001-09-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc640.c: New
 	* camlibs/polaroid/Makefile.am: Added pdc640
 
-2001-09-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* MAINTAINERS: Added Marius for panasonic
 	* camlibs/panasonic/coolshot/Makefile.am: @dotlibs
@@ -3924,7 +3924,7 @@
 	  properly decode thumbnails after discovering they are encoded in
 	  YUV 4:1:1 format.
 
-2001-09-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc320.c: Bug fixes from Nathan Stenzel
 	<nathanstenzel@motion.net>
@@ -3942,7 +3942,7 @@
 	  camlibs/panasonic/coolshot/library.c: code cleanup
 	* camlibs/panasonic/coolshot/README: added TODO list for driver
 
-2001-09-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-filesys.h:
 	* libgphoto2/filesys.c: Cache files, too.
@@ -3950,18 +3950,18 @@
 	* camlibs/konica/library.c:
 	* camlibs/sierra/sierra.c: Cache files in the filesystem.
 
-2001-09-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic/coolshot/coolshot.c: Use gp_list_populate instead
 	of accessing the filesystem. The filesystem is clever enough to do
 	that itself.
 
-2001-09-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/stv0680/pattrec.c,h: Move those files ...
 	* libgphoto2/pattrec.c,: ...here.
 
-2001-09-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/options.c: #include <config.h>
 
@@ -3978,18 +3978,18 @@
 	* camlibs/panasonic/coolshot/library.c,h:added files to support
 	Panasonic Coolshot KXL-600A & KXL-601A digital cameras.
 
-2001-09-01  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-01  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/casio: New
 	* configure.in: Add casio. Like the polaroid and samsung, those drivers
 	DON'T WORK and therefore are signed as EXPERIMENTAL. I add those only
 	to give you a basic framework on which to build.
 
-2001-08-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/polaroid/pdc700.c: New
 
-2001-08-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Added polaroid.
 	* camlibs/samsung/samsung.c: Added GP_DRIVER_STATUS_EXPERIMENTAL;
@@ -3999,18 +3999,18 @@
 	* camlibs/polaroid/pdc320.c:
 	* camlibs/polaroid/Makefile.am: New
 
-2001-08-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/samsung/Makefile.am:
 	* camlibs/samsung/samsung.c: New but untested. (Just ported it from
 	old gphoto).
 	* configure.in: Added samsung
 
-2001-08-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Add debugging messages
 
-2001-08-31  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-31  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa-cl18/agfa.c: Remove gp_port_usb_find_device, that's in
 	libgphoto2/camera.c now.
@@ -4040,21 +4040,21 @@
 	* camlibs/dimera/dimera3500.c: removed traces of the PNM
 	pseudo-file type and added PGM.
 
-2001-08-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/dimera/dimera3500.c (camera_file_get): Use
 	gp_file_adjust_name_for_mime_type
 	* libgphoto2/file.c (gp_file_adjust_name_for_mime_type):
 	GP_MIME_RAW -> *.raw
 
-2001-08-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa.c:
 	* camlibs/commands.c:
 	* camlibs/commands.h: Use a macro CHECK for most of the simple
 	error checks. That makes the code much cleaner.
 
-2001-08-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa-cl18/agfa.h: Renamed to
 	* camlibs/agfa-cl18/commands.h
@@ -4062,11 +4062,11 @@
 	* camlibs/commands.c:
 	* camlibs/agfa.c: Improve error reporting.
 
-2001-08-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa-cl18/*: Bring it up to date (camera->port and camera->fs)
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/barbie/*: Use camera->port and camera->fs.
 	* camlibs/dimera/dimera3500.c
@@ -4087,7 +4087,7 @@
 	* libgphoto2/filesys.c: Don't remove the dirty flag on folders 
 	on gp_filesystem_append (thanks, Dan!)
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/template/*: Updated
 	* include/gphoto2-camera.h: Add a note about c_folder_list_folders and
@@ -4095,7 +4095,7 @@
 	* include/gphoto2-filesys.h: Remove an uneeded typedef.
 	* libgphoto2/filesys.c: Here, too.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Dan Fandrich <dan@coneharvesters.com> found this bug:
 
@@ -4103,19 +4103,19 @@
 	gp_filesystem_list_files returns 0 files, try the old method. Same with
 	folders.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Fabrice did it again:
 
 	* camlibs/sierra/*: Actually use camera->fs.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphotoos2.h:
 	* include/gphoto2-portability-os2.h: Removed. Contents are now ...
 	* include/gphoto2.h: ... here.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-library.h: Clean up this file.
 	* gphoto2-camera.h: We don't need camera_init, camera_abilities, and
@@ -4126,14 +4126,14 @@
 	driver authors, could you please declare the functions above static?
 	Except camera_id and camera_abilities.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	All work from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:
 
 	* libgphoto2/filesys.c (gp_filesystem_number): Check if the folder
 	is dirty (like in gp_filesystem_folder_number).
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/*:
 	* camlibs/directory/directory.c (camera_folder_list_folders),
@@ -4148,7 +4148,7 @@
 
 	* include/gphoto2-file.h (GP_MIME_BMP): added this mime type.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-file.h: Add a note about the crappy API
 	* include/gphoto2-abilities-list.h:
@@ -4156,14 +4156,14 @@
 	* libgphoto2/core.c: Don't access the CameraAbilitiesList directly
 	any more.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Another patch from Ilya Konstantinov <future@shiny.co.il>:
 
 	* libgphoto2/camera.c (gp_camera_new): Correctly initialize the speed
 	to 0
 
-2001-08-28  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-28  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/canon/psa50.c:
 	* camlibs/kodak/dc120/library.c:
@@ -4173,7 +4173,7 @@
 	* camlibs/sonydscf1/sonydscf1.c: Remove direct accesses to the 
 	CameraFile struct.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:
 
@@ -4188,17 +4188,17 @@
 	called, scan the whole filesystem.
 	* tests/test-filesys.c: Test gp_filesystem_get_folder, too.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: Now that libgphoto2_port is patched, we
 	can revert the quick fix from two hours ago.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c
 	* libgphoto2/file.c: strcpy -> strncpy
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-filesys.h:
 	* libgphoto2/filesys.c: Cache folders and files, too (that is, only
@@ -4209,17 +4209,17 @@
 	* camlibs/directory/directory.c,h: Use the filesystem
 	* tests/test-filesys.c: Demonstrate the use of the new functions.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: And correctly use the macros CHECK (won't
 	stop the camera) and CHECK_STOP (after the connection has been started).
 
-2001-08-27  Lutz MÜller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: Until I can fix the bug in
 	libgphoto2_port, don't close the USB port.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Suggestion from Ilya Konstantinov <gphoto-devel@future.galanet.net>:
 
@@ -4228,7 +4228,7 @@
 	(gp_camera_get,set_port_path): New
 	* frontends/command-line/main.c: Call those functions.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-filesys.h:
 	* libgphoto2/filesys.c: Implement caching for file information.
@@ -4236,7 +4236,7 @@
 	* camlibs/konica/library.c: Use gp_filesystem_get,set_info. This
 	stuff is really incredibly fast.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Daniel Resare <noa@metamatrix.se> suggested using AC_CONFIG_SUBDIRS:
 
@@ -4247,7 +4247,7 @@
 	* doc/Makefile.am: Removed OVERVIEW and NOTES. This should have 
 	happened a long time ago.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Ilya Konstantinov <gphoto-devel@future.galanet.net> pointed me to
 	this bug:
@@ -4256,7 +4256,7 @@
 	switch statement so that people can download files instead of getting
 	errors.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-core.h:
 	* libgphoto2/core.c (gp_autodetect): Revert an API change I committed
@@ -4264,7 +4264,7 @@
 	* libgphoto2/camera.c:
 	* frontends/command-line/main.c: Here too.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 	
 	Suggestions from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:
 
@@ -4278,7 +4278,7 @@
 
 	* configure.in: fixed a typo in the dotlibs value.
 
-2001-08-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-camera.h:
 	* libgphoto2/camera.c: Add gp_camera_set,get_model. Please use
@@ -4286,7 +4286,7 @@
 	* libgphoto2/core.c: On exit, set glob_abilities_list = NULL
 	* tests/test-gphoto2.c: Add lots of documentation.
 
-2001-08-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/dimera/dimera3500.c: explicitly set the conversion method
 	to GP_FILE_CONVERSION_METHOD_CHUCK.
@@ -4296,7 +4296,7 @@
 	* include/gphoto2-filesystem.h:
 	* libgphoto2/filesys.c: Implement "dirty" folders.
 
-2001-08-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/dimera3500.c: Move the raw->pnm conversion ...
 	* include/gphoto2-file.h:
@@ -4307,7 +4307,7 @@
 	* frontends/command-line/main.c: Add possibility for download of raw
 	data.
 
-2001-08-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-file.h:
 	* include/gphoto2-library.h:
@@ -4321,7 +4321,7 @@
 	and file_get_preview...). I hope everything works as it did before.
 	* frontend/command-line/*: Prepare support for download of raw data
 
-2001-08-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/abilities.c:
 	* include/gphoto2-abilities.h: Let gp_abilities_new return an error 
@@ -4329,7 +4329,7 @@
 	* camlibs/*: Adjust to above change.
 	* camlibs/canon/canon.c: #if 0 some code to kill some warnings
 
-2001-08-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-abilities-list.h: Make gp_abilities_list_new
 	return an error code. Introduce gp_abilities_list_sort and
@@ -4338,7 +4338,7 @@
 	* libgphoto2/core.c: Sorting code now is in abilibies-list.
 	* libgphoto2/file.c: "image/x-png" -> "image/png"
 
-2001-08-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/library.c: Remove some unnecessary casts, put in some
 	CHECKs
@@ -4349,7 +4349,7 @@
 	* libgphoto2/filesys.c: Remove lots of redundancy, always check if
 	folder has a trailing slash (and ignore it if this is the case).
 
-2001-08-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/agfa-cl18/agfa.c: Use gp_file_* instead of directly
 	accessing the struct.
@@ -4365,12 +4365,12 @@
 	* libgphoto2/file.c:
 	* include/gphoto2-file.h: Introduce some more gp_file_* functions.
 
-2001-08-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-file.h: Make gp_file_new return an error code.
 	* */*: Adjust everything for above change.
 
-2001-08-23  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-23  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/list.c (gp_list_new): memset on *list instead of list.
 
@@ -4387,20 +4387,20 @@
 	* frontends/command-line/main.c : fix option --debug so that it
 	  really put the GP_DEBUG_HIGH mode.
 
-2001-08-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* */*: Small parameter changes to make gphoto2 API more consistent.
 	More to follow.
 
-2001-08-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* README: Update USB Mass Storage list
 
-2001-08-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c (gp_camera_file_get_info): Fix logic.
 
-2001-08-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c:
 	* libgphoto2/core.c:
@@ -4417,12 +4417,12 @@
 	* camlibs/kodak/dc240/dc240.c (camera_init): activate capture_image
 	(camera_capture): reimplemented and updated prototype
 
-2001-08-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c (gp_camera_file_get_info): Make sure the field
 	name is always set.
 
-2001-08-21  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-21  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* README: Updated list of USB Mass Storage cameras. Thanks Hubert!
 
@@ -4470,7 +4470,7 @@
 	not removed, or the memory card is full).
 	* Start documenting routines.
 
-2001-08-20  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-20  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* doc/OVERVIEW: Cruft, not up to date, incorrect. Removed.
 	* doc/NOTES: Redundant. Removed.
@@ -4479,26 +4479,26 @@
 	* libgphoto2/core.c: Same here with gp_autodetect and gp_camera_count.
 	* include/gphoto2-core.h: Kill compile warning
 
-2001-08-20  Lutz MÜller  <urc8@rz.uni-karlsruhe.de>
+2001-08-20  Lutz MÃller  <urc8@rz.uni-karlsruhe.de>
 
 	* libpghoto2/camera.c: Kill compile warning by declaring gp_camera_exit
 	static
 
-2001-08-20  Lutz MÜller  <urc8@rz.uni-karlsruhe.de>
+2001-08-20  Lutz MÃller  <urc8@rz.uni-karlsruhe.de>
 
 	* MAINTAINERS: New
 
-2001-08-20  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-20  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c (camera_file_get_generic): Documentation
 	update
 
-2001-08-20  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-20  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c (camera_file_get_generic): Fix detection
 	of TIFF images
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: -Wmissing-prototypes -Wmissing-declarations
 	* camlibs/agfa-cl18/commands.c:
@@ -4512,57 +4512,57 @@
 	* include/gphoto2-file.h:
 	* libgphoto2/file.c: First step towards a compilation with -Werror
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/library.c: Format the filesystem before updating it.
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* tests/test-filesys.c: Even more tests
 	* libgphoto2/filesys.c: Fix remaining bugs. It should work now...
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* tests/test-filesys.c: New
 	* tests/Makefile.am: Compile test-filesys.c
 	* libgphoto2/filesys.c: Several bugfixes - there are still bugs in
 	there.
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Don't generate camlibs/template/Makefile
 	* libgphoto2/filesys.c:
 	* include/gphoto2-filesys.h (gp_filesystem_delete_all): New
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/filesys.c (gp_filesystem_format): Fix bug found by 
-	Stéphane Castejon.
+	StÃ©phane Castejon.
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/globals.h: Unused. Removed.
 
-2001-08-19  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-19  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-filesys.h:
 	* libgphoto2/filesys.c (gp_filesystem_get_folder): New
 	* libgphoto2/widget.c (gp_widget_get_parent): Corrected typo
 
-2001-08-18  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-18  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-widget.h:
 	* libgphoto2/widget.c (gp_widget_get_parent): New function
 
-2001-08-18  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-18  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* include/Makefile.am: Oops, add gphoto2-result.h.
 
-2001-08-18  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-18  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* po/POTFILES.in: Add core.c, camera.c and result.c
 
-2001-08-18  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-18  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* README: Add notice about USB Mass Storage cameras.
 	* include/*:
@@ -4571,7 +4571,7 @@
 	* camlibs/konica/Makefile.am: There's no ChangeLog here...
 	* tests/test-gphoto2.c: Adjust headers
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-camera.h:
 	* include/gphoto2-file.h:
@@ -4579,7 +4579,7 @@
 	* libgphoto2/widget.c: Hide CameraWidget internals here. No need to
 	publish all that stuff.
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-datatypes.h: Move the declaration of the lists to ...
 	* include/gphoto2-lists.h: ... here. This is a first step towards 
@@ -4593,7 +4593,7 @@
 	* libgphoto2/lists.c:
 	* camlibs/*: Reflect above changes
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Add libgphoto-2.0.pc
 	* libgphoto2/Makefile.am: Remove the old GNOME configuration stuff. 
@@ -4601,7 +4601,7 @@
 	* libgphoto2/libgphoto2Conf.sh.in: Removed
 	* libgphoto2/libgphoto-2.0.pc.in: New
 	
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* tests/*: New
 	* configure.in:
@@ -4610,22 +4610,22 @@
 	* frontends/command-line/main.c:
 	* frontents/command-line/Makefile.am: Reflect changes
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* frontents/gtk/macros/*: Removed.
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* frontents/Makefile.am: Remove libpghoto2_frontend from SUBDIRS.
 	* frontents/gtk/*: Removed those ancient files. For GUI frontends, 
 	refer to gtkam or GnoCam. They are distributed separately.
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* frontends/command-line/Makefile.am: Remove reference to
 	libgphoto2_frontend.la which wasn't needed anyways.
 
-2001-08-17  Lutz Müller  <urc8@rz.uni-karlsruhe.de>
+2001-08-17  Lutz MÃ¼ller  <urc8@rz.uni-karlsruhe.de>
 
 	* frontents/libgphoto2_frontend/*: Removed. Those files were mainly
 	empty functions and nowhere needed.
@@ -4650,7 +4650,7 @@
 	camlibs/stv0680/Makefile.am, camlibs/template/Makefile.am: It 
 	adds code in configure.in to detect when '.libs' is not detected 
 	and in this case defined a variable "dotlibs" which is then 
-	substitued in all Makefile.in. This fix a build problem with 
+	substitute in all Makefile.in. This fix a build problem with 
 	newer libtool (1.4)
 
 2001-08-15  Hubert Figuiere  <hfiguiere@teaser.fr>
@@ -4658,10 +4658,10 @@
 	* camlibs/kodak/dc240/dc240.c (camera_about): Changed a typo in
 	supported camera models.
 
-2001-08-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: Set timeout to TIMEOUT before updating 
-	folder. Thanks to Stéphane Castejon who found this bug.
+	folder. Thanks to StÃ©phane Castejon who found this bug.
 
 2001-08-13  Hubert Figuiere  <hfiguiere@teaser.fr>
 
@@ -4672,7 +4672,7 @@
 
 	* camlibs/kodak/dc240/library.c (dc240_file_action): fix bug #440162
 
-2001-08-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/library.c: (sierra_delete_all): Move notice about 
 	cameras ignoring delete_all to ...
@@ -4680,18 +4680,18 @@
 	update the filesystem - without that, gphoto2 won't be able to 
 	fix the behaviour of some cameras (ignoring delete_all).
 
-2001-08-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/panasonic/Makefile.am: SUBDIRS = l859
 
-2001-08-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/konica/library.c: (camera_init): Update the filesystem once
 	at camera_init
 	(camera_folder_list_folders): Use gp_filesystem_list_folders
 	(camera_folder_list_files): Use gp_filesystem_list_files
 
-2001-08-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/library.c,h: (do_capture): Return the right location
 	of the picture (on my camera, it is in /DCIM/100OLYMP)
@@ -4711,32 +4711,32 @@
 	(gp_filesystem_list_files): New
 	(gp_filesystem_list_folders): New
 
-2001-08-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: The C-2100UZ is supported, too.
-	Unfortunatelly, the product id is the same for the C-2100UZ, the
+	Unfortunately, the product id is the same for the C-2100UZ, the
 	C-3000Z, and the C-3030Z. This results in three entries for this camera
 	("gphoto2 --auto-detect"). This has to be fixed somehow, sometime.
 
-2001-08-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/sierra.c: Remove the Panasonic Coolshot KXI-600A
 	from the list of supported cameras - Chris Pinkham 
 	<cpinkham@infi.net> figured out that this camera uses a totally 
 	different protocol.
 
-2001-08-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* camlibs/sierra/library.c: Add a note that the Nikon CoolPix 880 
 	simply ignores (!) the delete_all command. Thanks to Mick Grant 
 	<mickgr@drahthaar.clara.net> for figuring this out.
 
-2001-08-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Even if the camera reports success on 
 	delete_all, check if all pictures have been deleted.
 
-2001-08-03	Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-03	Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2/camera.c: Not all cameras implement delete_all - fall back
 	to deletion one by one then.
@@ -4786,7 +4786,7 @@
 
 2000-08-19 11:53  jgangemi
 
-	* frontends/gtk/src/main.c:   - gphoto-backend correctly initalized
+	* frontends/gtk/src/main.c:   - gphoto-backend correctly initialized
 
 2000-08-19 11:52  jgangemi
 
@@ -4817,18 +4817,18 @@
 2000-08-18 20:47  jgangemi
 
 	* frontends/gtk/src/main.c:   - adding gnome support (by by
-	Lutz_Müller)
+	Lutz_MÃ¼ller)
 
 2000-08-18 20:45  jgangemi
 
 	* frontends/gtk/src/Makefile.am:   - adding gnome support (by
-	Lutz_Müller)
+	Lutz_MÃ¼ller)
 	  - now uses gpio-config
 
 2000-08-18 20:44  jgangemi
 
 	* frontends/gtk/: acconfig.h, configure.in:   - adding gnome
-	support (by Lutz_Müller)
+	support (by Lutz_MÃ¼ller)
 
 2000-08-18 17:24  scottf
 
@@ -5137,7 +5137,7 @@
 2000-08-06 06:01  mariusz
 
 	* camlibs/panasonic/: README, dc1000.c, dc1580.c: abilities
-	accomodated to the new API
+	accommodated to the new API
 
 2000-08-05 09:57  mariusz
 
@@ -5824,7 +5824,7 @@
 
 2000-07-19 13:08  scottf
 
-	* libgphoto2/file.c: null terminater the file->data in gp_file_open
+	* libgphoto2/file.c: null terminator the file->data in gp_file_open
 
 2000-07-19 11:35  scottf

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/HACKING.md Added

@@ -0,0 +1,363 @@
+HACKING
+=======
+
+If you want to hack on gphoto2 (or a camera driver for gphoto2),
+please follow some rules to make our work easier.
+
+ Note from 2019-10: Some of these rules are from the early 2000s and
+  may make less sense now than they did fifteen years plus earlier. 
+
+
+Licensing
+=========
+
+We urge you to license your contributions under the LGPL so we can
+distribute gphoto2 under the LGPL as well.
+
+
+Patches
+=======
+
+... are always welcome.
+
+We prefer patches against the current git master very much over
+patches against old released versions, but these are also welcome :-)
+
+
+Source Repository Directory Structure
+=====================================
+
+The source repository structure as of libgphoto2-2.5.23 (2019-10):
+
+  * `libgphoto2_port/gphoto2/*.h`(libgphoto2_port/gphoto2/)
+
+    The header files with the interface to `libgphoto2_port`.
+
+  * `libgphoto2_port/libgphoto2_port/*.ch`(libgphoto2_port/libgphoto2_port/)
+
+    Implementation of the `libgphoto2_port` library used internally by
+    `libgphoto2`.
+
+  * `libgphoto2_port/{disk,libusb1,ptpip,serial,usb,usbdiskdirect,usbscsi,vusb}/*.ch`(libgphoto2_port/)
+
+    The port driver code for the `iolibs`. Dynamically loaded by `libgphoto2_port`.
+
+  * `libgphoto2/*.ch`(libgphoto2/)
+
+    The source code of the actual `libgphoto2` library.
+
+  * `gphoto2/*.h`(gphoto2/)
+
+    The header files with the interface to `libgphoto2`.
+
+  * `camlibs/<CAMLIB>/*.ch`(camlibs/)
+
+    The camera drivers (`camlibs`). Dynamically loaded by `libgphoto2`.
+
+The buildsystem is based on automake, i.e. `configure.ac`,
+`Makefile.am` and `Makefile-files` have their standard functions.
+
+
+Source Files
+============
+
+Every source file (`file_name.c`) should have the following layout:
+
+    /* Licence, author, etc. */
+    #include "config.h"
+    #include "file_name.h"
+
+    #include <std*.h> (i.e. stdlib, stdio, string, etc.)
+
+    #include <gphoto2/gphoto2-*.h> (what you need)
+
+    /* Source code here. */
+
+
+Header Files
+============
+
+Please use the following layout:
+
+    /* Licence, author, etc. */
+    #ifndef LIBGPHOTO2_FILE_NAME_H
+    #define LIBGPHOTO2_FILE_NAME_H
+
+    #include <whatever is needed for the _header_>
+
+    /* Declarations */
+
+    #endif /* !defined(LIBGPHOTO2_FILE_NAME_H) */
+
+The include guard macro starting with the project name should avoid
+potential naming conflicts with another project's `file_name.h`.
+
+
+Camlib
+======
+
+Camera libraries are often very sensitive to changes. Therefore,
+before you commit any changes, double check with the author that your
+changes won't break the driver.
+
+If you want to write a driver for gphoto2, the easiest way to do so
+would be to copy over the contents of `camlibs/template/` and fill in
+your code.
+
+Use something like `CHECK_RESULT` (see for example
+`libgphoto2/gphoto2-filesys.c`).
+
+Let's say you write a driver called sillycam. Please set up a file
+called `library.c` containing all gphoto2-specific code (like
+`camera_init`) and another two files called `sillycam.c` and
+`sillycam.h` containing the "magic", that is all
+`gp_port_read,write` functions and the basic logic of the
+communication. This makes it easier for us to adapt your code if
+anything should change in the gphoto2-API.
+
+Use the port provided by `camera->port`.
+
+Use the filesystem provided by `camera->fs` and set up the callbacks so
+that libgphoto2 can cache listings and file-information.
+
+Please keep track of the changes to the sillycam camlib in the file
+`camlib/sillycam/ChangeLog`.
+
+For test compiling and installing only the sillycam and doofuscam
+camlibs, you can use
+
+    make -C camlibs sillycam.la doofuscam.la
+
+and
+
+    make GP_CAMLIB_SET="sillycam.la doofuscam.la" install-camlibs
+
+respectively or
+
+    make -C camlibs GP_CAMLIB_SET="sillycam.la doofuscam.la" all
+    make -C camlibs GP_CAMLIB_SET="sillycam.la doofuscam.la" install
+
+Compiling all camlibs is sped up considerably on *N* CPU core
+computers using `make -j`*N*.
+
+
+libgphoto2
+==========
+
+If you add code, use the coding style of that file. This is, code like
+
+```
+int
+my_func (int arg)
+{
+	int var, res;
+
+	/*
+	 * This is a multiline
+	 * comment. Use TAB for
+	 * indentation!
+	 */
+	res = gp_some_action (var);
+
+	/* This is a simple one-line comment */
+	if (res < 0) {
+		gp_log (GP_LOG_DEBUG, "Error happened!");
+
+		/* Note that we _don't_ indent the case statements */
+		switch (res) {
+		case GP_ERROR:
+			gp_log (GP_LOG_DEBUG, "Generic error");
+			break;
+		default:
+			gp_log (GP_LOG_DEBUG, "Not a generic error");
+		}
+		return (res);
+	}
+
+	return (GP_OK);
+}
+```
+
+Please always check the return value of `gp_`-functions! We have
+defined some handy macros all over the place (like `CHECK_RESULT`) -
+by using those, you'll avoid lots of `if () {} else {}`.
+
+Emacs users may define and use a `gphoto-c-mode` by putting the
+following stuff into their `.emacs` file:
+
+
+    ;;* gphoto-c-mode
+    ;;*=====================================================================
+    (defun gphoto-c-mode ()
+      "C mode with adjusted defaults for gphoto hacking"
+      (interactive)
+      (c-mode)
+      (c-set-style "linux")
+      (setq indent-tabs-mode t)
+      (font-lock-mode))
+
+    ;;
+    (setq auto-mode-alist (cons '("/home/user/src/gphoto.*\\.ch$" . gphoto-c-mode)
+                           auto-mode-alist))
+
+
+
+Compatibility
+=============
+
+Once gphoto2 has been officially launched as a 2.0 version, it is important
+that the API does not change frequently.  It is annoying to users when they
+have to upgrade all sort of libraries and applications just to get an
+upgraded camera driver.  Once the 2.0 release has been made, try to
+follow these guidelines:
+
+  - New versions of the gphoto2 core libraries in the 2.0 series shall
+    work with all older 2.0 camera libraries
+
+  - New versions of the gphoto2 camera libraries in the 2.0 series shall
+    work with all older 2.0 core libraries (this one may be relaxed)
+
+  - Before fixing 2.0 in stone, look for weaknesses in the current
+    APIs that may preclude enhancements in the future.  For instance,
+    there should be some filler entries added to the end of `struct
+    _CameraFunctions` so that a newer camera library that tries to
+    fill in an entry that is added in gphoto2 ver. 2.1 that doesn't
+    exist there now won't overwrite something important.
+
+  - Try to work using the existing API instead of making minor
+    changes here and there; think about whether the change you're proposing
+    will demonstratively benefit gphoto2 or it's just a "nice to have"
+
+  - Instead of adding a new parameter to a function, create a new function
+    that enhances the other one (where appropriate)
+
+  - If a new parameter is absolutely needed in an existing function
+    call, rename the function with the new parameter, but leave the
+    existing function as is, calling the new function with a default value
+    for the new parameter
+
+  - When adding entries to a common structure, add them to the end of the
+    `struct` so that the other members aren't shifted around.  Consider what
+    will happen if that member is not filled in by an older application.
+
+  - Don't delete entries from a common struct; instead, just rename them
+    into filler entries.
+
+  - If there is a very good reason to break compatibility, wait until
+    release 3.0 to make those changes
+
+  - Delay the release of 3.0 until the benefits outweigh the consequences
+    to the user of an incompatible library version.
+
+
+Portability
+===========
+
+Please remember that people will be running gphoto2 on a wide variety
+of operating systems and CPUs and will be compiling it on a wide
+variety of C compilers.  As you write your code, be sure not to make
+any assumptions in your code that aren't in the C99 standard.
+
+If your code absolutely needs some feature or header file that isn't
+available everywhere, write an autoconf test so that the configure
+script will detect if that feature is available at compile time and
+provide an alternative for those compilers that don't support it.
+
+There are lots of subtle portability issues that you should keep in
+the back of your mind.  Following are some of the major ones that affect
+gphoto2.  See the paper "Notes on Writing Portable Programs in C" at
+<URL:http://www.literateprogramming.com/portableC.pdf> or "Writing
+Portable C with GNU Autotools" at
+<URL:http://sources.redhat.com/autobook/autobook/autobook_110.html#SEC110>
+for more details.
+
+
+* A char can be signed or unsigned.
+
+  Use `signed char` or `unsigned char`, or `int8_t` or `uint8_t` from
+  `stdint.h`, to be sure to get the type you want when it is
+  important.
+
+
+* A pointer is not necessarily an `int`.
+
+  Don't cast a pointer to an `int` and vice-versa.
+
+
+* An `int` can be almost any width.
+
+  Don't assume that it's 32 or 16 bits or any other value.  Instead,
+  if you need a variable of a certain size, include the header file
+  `stdint.h` (or `gphoto2-endian.h`) and use the C99-style fixed-width
+  types declared therein.  If you don't really care about the size of a
+  variable (e.g. as the index variable in a small for loop), you can
+  still use an `int` as it's often the most efficient type for each
+  processor.  It's usually the case that a char is 8 bits, `int` is at
+  least 16 bits, and a long is at least 32 bits. Never assume that
+  `int` or `long` (or `char`, for that matter) have a specific size, or
+  that they will overflow at a particular point. Use a size-specific
+  type (e.g. `uint32_t`) if necessary.
+
+
+* The sequence of bytes received from a camera isn't necessarily the
+  same as how those bytes are stored in a C `struct` in memory.
+
+  Many compilers will place padding bytes between the elements of a C
+  `struct` to improve run-time efficiency on the target processor.
+  This means that if you read a camera packet directly into such a
+  struct, the bytes will not line up and your program will use the
+  wrong values.
+
+  A similar problem occurs even if you read just a couple of bytes
+  into an `int`, if gphoto is running on a processor with a different
+  "endianness" than the camera.
+
+  The most portable solution is to use the macros available in the
+  `gphoto2-endian.h` header file.  When you read a packet from a
+  camera (writing is similar), use a `uint8_t` array or heap space to
+  store the raw packet.  Extract each member of the packet out of the
+  array one at a time using a macro like `be32atoh` from
+  `gphoto2-endian.h`.  Those macros take care of both those problems
+  at once.
+
+  The macros have the form `AANNatoh` or `htoAANNa`, where `AA` is
+  `le` (little-endian) or `be` (big-endian), `NN` is `16`, `32`, or `64`
+  (bits in the word) and `a`, if present, means that the preceding
+  type is located in a byte array, not an integer. `h` refers to
+  `host`, and could be big or little-endian depending on the current
+  CPU.  Upper-case versions of these macros (where appropriate) do the
+  conversion in place.  Do a `man ntohl` to find out more about why
+  these are needed, and the generated `gphoto2-endian.h` file for more
+  descriptions.
+
+
+* Your code won't necessarily be compiled with gcc.
+
+  gcc is a great C compiler, but it isn't installed on everybody's
+  systems (yet!).  Avoid use of proprietary gcc language extensions
+  and features that aren't available in C99 compilers.  Sure,
+  there's probably some code that would be more elegant using a gcc
+  language extension, but somebody, somewhere will be denied the use
+  of the best digital camera application in existence because of it.
+
+  This also applies to new standard C features that appeared in later
+  specification of the C language.  There is varying support in the
+  installed base of C compilers to allow unrestricted use, but this
+  will change as time goes by.  In the meantime, use `autoconf` to
+  detect if the feature is available at run-time and act
+  appropriately.
+
+  Although one-line comments starting with `//` have been available in
+  most compilers for several years, they were only officially added to
+  the C99 spec and some compilers out there still don't support
+  them.  The `inline` keyword also falls into the same category, but
+  configure tests for this feature at compile time and supplies the
+  appropriate inline keyword as a macro.  Finally, don't add
+  compiler-specific flags to make files directly, as many of them are
+  specific to one compiler and will cause the build to fail when using
+  another.
+
+
+* printf(3) format strings containing "%m" should only be used in
+  system specific code for systems which actually support "%m", like
+  Linux/glibc or FreeBSD. MacOSX for example does NOT support "%m".

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/INSTALL -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/INSTALL Changed

@@ -32,6 +32,7 @@
 
 	automake
 	autoconf
+	pkg-config (to detect additional library dependencies)
 	autopoint (needed if installing from github)
 	gettext  (possibly from -dev or -devel package)
 	libtool  (possibly from -dev or -devel package)
@@ -68,6 +69,7 @@
 	gettext (ver. >= 0.10.40) -- internationalization using shared library
 
 	gtk-doc -- documentation built in doc/api/
+	           (Debian package name gtk-doc-tools)
 
 	libexif - EXIF tag support
 	    <URL:http://www.sourceforge.net/projects/libexif>
@@ -116,7 +118,7 @@
 
 If you want to install only one or two specific camlibs, run something like
 
-    $ make CAMLIBS="canon.la ptp2.la" install-camlibs
+    $ make GP_CAMLIB_SET="canon.la ptp2.la" install-camlibs
 
 On Linux, the installed libtool .la files are not needed and can be removed.
 
@@ -146,7 +148,7 @@
 libgphoto2 has been successfully used on many system.  Some systems
 where it has been reported to successfully compile are listed
 below. Not all, or even any, camera libraries have been tested on
-these systems, so there may be endian other other issues that prevent
+these systems, so there may be endian other issues that prevent
 some camera libraries from working.
 
 Please report any changes to this list to the gphoto developer mailing

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/MAINTAINERS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/MAINTAINERS Changed

@@ -4,13 +4,13 @@
 
 libgphoto2_port:
 	Marcus Meissner <marcus@jet.franken.de>
-	Lutz Müller <lutz@users.sourceforge.net> (old maintainer)
+	Lutz MÃ¼ller <lutz@users.sourceforge.net> (old maintainer)
 	Scott Fritzinger <scottf@unr.edu>	(old maintainer)
 	Hubert Figuiere <hfiguiere@teaser.fr>	(old maintainer)
 
 libgphoto2:
 	Marcus Meissner <marcus@jet.franken.de>
-	Lutz Müller <lutz@users.sourceforge.net> (old maintainer)
+	Lutz MÃ¼ller <lutz@users.sourceforge.net> (old maintainer)
 	Scott Fritzinger <scottf@unr.edu>	(old maintainer)
 	Hubert Figuiere <hfiguiere@teaser.fr>	(old maintainer)
 
@@ -18,8 +18,6 @@
 				     PORTS
 --------------------------------------------------------------------------------
 
-OS/2:
-	Bart van Leeuwen <bart_van_leeuwen@netage.nl>
 *BSD:
 	Arnaud Launay <asl@launay.org>
 
@@ -59,7 +57,7 @@
 	Till Adam <till@adam-lilienthal.de>
 
 camlibs/gsmart300:
-	Jérôme Lodewyck <lodewyck@clipper.ens.fr>
+	JÃ©rÃ´me Lodewyck <lodewyck@clipper.ens.fr>
 	Till Adam <till@adam-lilienthal.de>
 
 camlibs/hp215:
@@ -81,7 +79,7 @@
 	Theodore Kilgore <kilgota@auburn.edu>
 
 camlibs/konica:
-	Lutz Müller <lutz@users.sf.net>
+	Lutz MÃ¼ller <lutz@users.sf.net>
 
 camlibs/kodak/dc120:
 	Scott Fritzinger <scottf@unr.edu>
@@ -113,6 +111,9 @@
 camlibs/pccam600:
 	Peter Kajberg <pbk@odense.kollegienet.dk>
 
+camlibs/pentax:
+	Marcus Meissner <marcus@jet.franken.de>
+
 camlibs/polaroid/pdc320.c:
 	Nathan Stenzel <nathanstenzel@users.sourceforge.net>
 
@@ -199,11 +200,11 @@
 
 gtkam (http://www.topfrose.de):
 	Simple GTK front-end.
-	Lutz Müller <lutz@users.sourceforge.net>
+	Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 GnoCam (http://www.uni-karlsruhe.de/~urc8/GnoCam):
 	GNOME integration (nautilus)
-	Lutz Müller <lutz@users.sf.net>
+	Lutz MÃ¼ller <lutz@users.sf.net>
 
 QtKam (?):
 	Front-end for KDE
@@ -230,13 +231,12 @@
 Releases:
 	Marcus Meissner <marcus@jet.franken.de>
 
-Packaging (RPM):
-	Hans Ulrich Niedermann <gp@n-dimensional.de>
-
 Translation:
-	We use http://translationproject.org/
+	For most languages, we use http://translationproject.org/
 	packages: libgphoto2, libgphoto2_port, gphoto2, gtkam
 
+	For the "de" language, we maintain the translation ourselves.
+
 	Marcus Meissner <marcus@jet.franken.de>
 
 Manual pages:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/Makefile.am Changed

@@ -5,10 +5,11 @@
 
 bin_SCRIPTS = gphoto2-config
 
-EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk
+EXTRA_DIST = MAINTAINERS TESTERS installcheck.mk
+EXTRA_DIST += HACKING.md SECURITY.md
 
-# Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
+# Note: $(subdirs) lists all the directories from AC_CONFIG_SUBDIRS()
+SUBDIRS = $(subdirs) libgphoto2 camlibs tests examples po packaging doc
 
 EXTRA_DIST    += libgphoto2.pc.in
 pkgconfig_DATA = libgphoto2.pc
@@ -18,12 +19,16 @@
 
 EXTRA_DIST += ChangeLog
 EXTRA_DIST += INSTALL
+EXTRA_DIST += OUTDATED.txt
 doc_DATA = AUTHORS COPYING NEWS
 doc_DATA += ABOUT-NLS ChangeLog
 
 EXTRA_DIST += README.md
 doc_DATA   += README.md
 
+EXTRA_DIST += RELEASE-HOWTO.md
+doc_DATA   += RELEASE-HOWTO.md
+
 EXTRA_DIST += README.packaging
 doc_DATA   += README.packaging
 
@@ -45,7 +50,7 @@
 
 # we use just ONE .PHONY target in order not to confuse automake
 
-.PHONY: rpm cvs-tags source-code-check install-drivers
+.PHONY: source-code-check install-drivers
 
 ########################################################################
 # source code check maintenance task
@@ -59,11 +64,11 @@
 
 source-code-check:
 	@echo "######## Finding // comments"
-	find . -type f -name '*.ch' -exec egrep -H '(^//|^://)' {} \;
+	find $(srcdir) -type f -name '*.ch' -exec egrep -H '(^//|^://)' {} \;
 	@echo "######## Finding remainders of Arnaud's comment replacement"
-	find . -type f -name '*.ch' -exec egrep -H 'http:/\*' {} \;
+	find $(srcdir) -type f -name '*.ch' -exec egrep -H 'http:/\*' {} \;
 	@echo "######## Finding explicit libintl.h references"
-	find . -type f -name '*.ch' -exec egrep -H '^#.*include.*libintl\.h' {} \;
+	find $(srcdir) -type f -name '*.ch' -exec egrep -H '^#.*include.*libintl\.h' {} \;
 
 
 ########################################################################
@@ -71,35 +76,60 @@
 # Usage: make CAMLIBS="canon.la ptp2.la" install-camlibs
 
 install-camlibs:
-	cd camlibs && $(MAKE) CAMLIBS="$(CAMLIBS)" install-camlibs
+	cd camlibs && $(MAKE) $(AM_MAKEFLAGS) CAMLIBS="$(CAMLIBS)" install-camlibs
 
 
 ########################################################################
-# The following default options for aclocal and automake
-# are required in the top level Makefile.am for the automatic 
-# re-building of the build system files.
+# Convenience shortcuts to update the *.po translation files in both
+# po/ subdirs at once and to reset the *.po translation files to "git
+# HEAD" in both po/ subdirs at once.
+
+PO_SUBDIRS =
+PO_SUBDIRS += libgphoto2_port/po
+PO_SUBDIRS += po
+
+# Run "git checkout *.po" in all po/ subdirs
+# which is quite useful after "make dist" to clean up "git status".
+.PHONY: git-checkout-po
+git-checkout-po:
+	set -e; cd "$(top_srcdir)" && if test -d .git; then \
+		for d in $(PO_SUBDIRS); do \
+			(cd "$$d" && git checkout *.po); \
+		done; \
+	fi
+
+.PHONY: pull-translations
+if HAVE_RSYNC
+pull-translations:
+	$(RSYNC) -Lrtvz translationproject.org::tp/latest/libgphoto2/ $(top_srcdir)/po
+	$(RSYNC) -Lrtvz translationproject.org::tp/latest/libgphoto2_port/ $(top_srcdir)/libgphoto2_port/po
+else
+pull-translations:
+	echo "Error: Cannot pull translations: Could not find rsync at configure time."
+	exit 1
+endif
 
-ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
+# Run "make update-po" in all po/ subdirs
+.PHONY: update-po
+update-po:
+	@for d in $(PO_SUBDIRS); do (cd "$$d" && $(MAKE) $(AM_MAKEFLAGS) update-po)  || exit 1; done
 
+@GP_GETTEXT_SETUP_MK@
 
-########################################################################
-# The following rules are only interesting if you want to create
-# distribution packages (as source tarballs or system specific packages)
+# Dummy target to force Automake to make the all target depend on it
+all-local:
+	@:
 
-if ENABLE_RPM
+# Dummy target to force Automake to make the distclean target depend on it
+distclean-local:
+	@:
 
-# create RPM packages
-rpm: Makefile
-	$(MAKE) dist
-	$(MAKE) -C packaging/rpm rpm
-	@echo "The RPM packages should now be found in packaging/rpm/RPMS"
 
-else
-rpm:
-	@echo "Dummy $@ target"
-endif
+########################################################################
+# The following default options for aclocal and automake
+# are required in the top level Makefile.am for the automatic
+# re-building of the build system files.
+
+ACLOCAL_AMFLAGS = -I auto-m4 -I libgphoto2_port/gphoto-m4
 
-# add CVS tags - used only by the project maintainer to tag the files of a
-# released version
-cvs-tags: Makefile
-	@echo cvs tag "@PACKAGE@-$$(echo '@VERSION@' | sed -e 's/\./_/g' -e 's/rc/-rc/g')"
+include libgphoto2_port/gphoto-m4/Makefile-files

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/NEWS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/NEWS Changed

@@ -1,3 +1,438 @@
+libgphoto2 2.5.31 release
+
+pentax:
+* added Pentax KP id
+
+ptp2:
+* do better event queueing during capture (makes capture faster, avoids losing events)
+* Canon EOS: OLC logic rewritten to be table driven, more debugging of the content,
+  config "testolc" to generate debugoutput. Supports more cameras better.
+* Canon EOS: various bugfixes
+* Sony Alpha: Added config options: focusarea, liveviewsettingeffect
+* Olympus: Enabled OM-1 capture
+* Battery Level: also support ENUM style battery reporting for Canon
+* Nikon 1: S1 also does not support everything
+* Sony Alpha: small changes in config setters
+* merged some improvements from NorthOfYou fork for Canon EOS, Nikon and Sony
+* New ids:
+  - Canon EOS 850D, R7, R10, R5 C, R6m2
+  - Fuji X-H2, X-T5
+  - GOPRO HERO 11 BLACK, 11 BLACK mini
+  - new ids also imported from libmtp
+  - Nikon Z30, Z8
+  - OMSYSTEM OM-1
+  - Pentax KP (PTP mode)
+  - Ricoh GR IIIx
+  - Sigma fp L
+  - Sony A7S III, ILCE-1, ILME-FX3, 7RM5 aka A7-RV,
+
+digigr8:
+* fixed init to not switch to webcam mode
+
+pentax:
+* Added Pentax KP
+
+general:
+* disable log formatting when we are not logging (speeds up large downloads, as
+  we are not hex dumping the whole data and immediately discard the result)
+* libltdl usage now thread-safe. (some other library pieces are not threadsafe yet)
+* some time_t 32bit vs 64bit fixes
+* some cleanups and warning fixes
+
+translations:
+* updated swedish, spanish
+* added georgian, friulian
+------------------------------------------------------------------------------
+libgphoto2 2.5.30 release
+
+ptp2:
+* Canon: fixed display locking/unlocking after exit
+* generic: avoid potential crash on image addition
+* Sony: Add image information when wait_for_event, some config values added
+* Added IDs:
+  * Nikon Zfc, Z9
+  * Sony DSC-WX220, Alpha-A7 IV
+  * Nikon P950
+  * Canon EOS Rebel T8i
+  * Fuji Fujifilm X-E4
+  * GoPro HERO10 Black
+
+general:
+* fix parallel builds by requiring gettext 0.19.1 for builds from git (PR #797)
+* add gp_init_localedir() function to allow for non-standard installations (PR #796)
+
+translations:
+* updated traditional chinese, swedish
+------------------------------------------------------------------------------
+libgphoto2 2.5.29 release
+
+general:
+* fixes build failures of libgphoto2 frontends and builds using the
+  wrong libgphoto2 headers (issue #717)
+
+ptp2:
+* fixed a regression in Fuji preview capture which would lead to crashes
+* made the wait-event property extractor more robust (it sometimes gets NULL ptrs), hopefully fixing Sony crashes
+* sony: fixed a crash in sony f-number
+* panasonic: added more configs adjustgm, adjustab, colortemp, afmode, mfadjust, expmode, recording
+* fixed some bugs caused by refactoring / memory leak fixes
+* added:
+  - Kodak m531
+  - HP Photosmart E331
+  - Nikon DSC 6
+
+translations:
+* updated polish, ukrainian, russian, serbian
+* added romanian
+------------------------------------------------------------------------------
+libgphoto2 2.5.28 release
+
+general:
+* OS/2 support removed (broken and unused since at least 2006)
+* remove built-in rpm packaging (use distro packaging instead)
+* remove linux-hotplug rule creation (removed from distros around 2006)
+* remaining text which was iso-8859 is UTF-8 now (except one po file)
+* To override docdir and htmldir, use configure arguments --docdir=
+  and --htmldir= instead of --with-doc-dir= and --with-html-dir=
+* some code cleanups, especially handling of include files and i18n handling
+
+ptp2:
+* wait event
+  * property changes now reported with "'name' to 'value'" added
+  * object info changes now reported as FILE_CHANGED events (e.g. if you change protection flags)
+* Nikon J1: capture fixed
+* Olympus: fixed that wait time was twice as long as required if no events arrived
+* Sigma Fp: added basic beta support for capture, live view and config.
+* Sony:
+  * mark all widgets as read-write again, read-only logic was not 100% correct
+  * speed-ups and fixes to the stepping based config setting
+* Canon EOS
+  * handle newer EOS R series reporting of configs (ISO, Aperture, Shutterspeed)
+  * track UI lock state to avoid device busy reports
+  * fixed "zoom" range settings (for lenses with powered zoom, also for today Powershot)
+* Fuji:
+  * ptpip improvements
+  * bug fixes
+  * some Fuji cameras have now liveview only for webcam (need new firmware)
+* various small fixes and code cleanups
+* New ids:
+  * Sony Alpha-RX1R II, ILCE-7C, ZV-E10, A6600, DSC HX-80, ILCE-7RM3A, ILCE-7RM4A, DSC-A7S III
+  * Nikon Coolpix B500, Zfc
+  * Canon EOS M50m2, Digital IXUS 132
+  * Fuji X-Pro3, GFX 100S, X100V
+
+canon:
+* fixed wait event crashes
+* correctly mark read only config widgets as read-only
+
+pentax:
+* fix PEF raw files for non-K100D
+
+translations:
+* updated german, french, polish, ukrainian
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.27 release
+
+ptp2:
+* report filesizes larger than 4GB correctly
+* download files larger than 4GB
+* empty ptp strings are reported as "", not as NULL
+* report more MTP object properties
+* Nikon
+  * download of files larger than 4GB using getpartial object method
+  * handle new application mode
+  * handle new eventex fetcher on Z series
+  * fixed movie on recent Z series
+  * report liveview and movie prohibit conditions, as errors and also in configuration tree
+  * some Nikon 1 V1 enhancements (the first camera of the 1 series is a bit special)
+* report filesize > 4GB correctly, if possible
+* Canon EOS:
+  * EOS M6 Mark 2 is actually more like a EOS DSLR and fully capable, added some work
+  * Handle OLCINFO for M6 Mark 2 and EOS R5 and new cameras
+  * added current list of autoexposuremode to expose also Fv and friends
+  * Canon Liveview size is encoded in "output" (PC / MOBILE / MOBILE2 variants are the different livesizes), try to expose seperately as "liveviewsize"
+  * decode more options, nickname, eosmoviemode (color/bw), strobofiring, eventmode, flashcharged, oneshotrawon
+  * bugfixes
+* Sony Alpha:
+  * report f-numbers enum with fixed list
+  * fixed liveview taking on a new model
+* Panasonic
+  * implement liveviewsize
+  * implement movie recording ( using --set-config movie=1/0 )
+  * more doc and minor fixes
+* ptp/ip: allow building on Windows
+* New IDS:
+  * Sony DSC-A7S III
+  * Nikon Coolpix P1000, Z6_2, Z7_2
+  * Olympus E-M1 MII
+  * Canon PowerShot G12, EOS M200
+  * Fuji Fujifilm X-S10
+  * Ricoh Theta V, Z1
+
+canon:
+* more shutterspeed reported
+
+translations:
+* updated french
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.26 release
+
+ptp2:
+* Olympus OMD: fixed the 65 second wait after capture.
+* Canon EOS:
+  * bugfixes
+* Nikon 
+  * D3000, D3100, and D3200 "static opcode list" reduced after reports what works and what not
+  * Nikon 1 series cameras had some commands listed too much.
+  * Nikon 1 J5 improvements
+  * "liveviewsize" can change liveviewsize
+* Sony:
+  * Modern Sony cameras seem to require a 3 second wait on startup. Seems needed on ZV-1, A7 R4, RX100 M7 so far... Unsure why.
+  * correct shutterspeed, iso and exposurebias decoding for Sony A7r4 and other new models
+  * some bugfixes in property settings, trying to speed it up
+  * ZV-1 support, some additional startup wait hack to make it work.
+  * partial Sony QX support added, can do preview... close to having capture (but not there yet) (also added "liveviewsize")
+  * report read/write and read/only of properties correctly
+* Fuji X:
+  * stabilized normal capture code
+  * added bulb capture, added autofocusdrive
+  * lots of properties listed now, some also decoded
+  * added "liveviewsize", "shuttercounter", "colortemperature",
+    "lensname", "devicename", "imagecomment", "filmsimulation", "colorspace"
+  * Added very experimental Wifi support.
+* synced new libmtp device ids
+* Cameras added to id list: 
+  * Sony QX30U, ZV-1, DSC-RX100M7
+  * Nikon D780, Z5, Coolpix B700
+  * Panasonic GMC-GX8
+  * Canon EOS 1D X Mark III, R5, R6
+  * Canon PowerShot SX70HS
+  * Fuji FinePix X-E1
+  * Sigma fp
+
+pentax:
+* small changes synced from pktriggercord, added Pentax 645Z
+
+docupen:
+* new experimental driver, supports the docupen scanner pen.
+
+all:
+* more fuzzing related stability fixes, largely to "outdated" driver set.
+* lots of compiler warnings fixes across the codebase
+
+translations:
+
+* update pl, sv, uk, zh_CN, fr
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.25 release
+
+ptp2:
+* Liveview support for Leica SL
+* PTP 1.1 Streaming parameters added. 
+* Olympus OMD capture fixes
+* Nikon DSLR/Z:
+  * various improvements to liveview error reporting.
+  * much more properties added, some values added
+  * allow downloading of "large thumbnails" instead of "regular thumbnails",
+    can be selected by "thumbsize" gphoto2 local setting.
+  * fixes for D3000, D3100 methods
+  * maximum capture wait extended to 1000 seconds (as the D870 has 900 seconds max now)
+* Canon EOS
+  * initialization fixes (if it breaks your EOS M or PowerShot, please report)
+  * liveview enablement fixed
+  * maximum capture wait extended to 90seconds
+  * EOS R shutterspeed , aperture reporting fixed
+* various bugfixes
+* Cameras added to id list:
+  * Sony NEX 5
+  * Canon EOS 90D
+  * Fuji XT-4
+  * Sanyo VPC-FH1
+  * Leica SL Typ 601
+
+lumix:
+* fixed initialization, might help capture
+
+all:
+* ongoing stability fixes from AFL fuzzing
+
+translation updates:
+* sv
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.24 release
+
+ptp2:
+* GoPro: fixed all images not visible bug
+* Canon EOS: lock/unlock ui before more operations
+* Canon Powershot SX / EOS M: some setup adjustments to make powershot sx work better
+* Nikon Keymission 170: try override opcodes to allow capture
+* Nikon DSLR: fixed a regression where 5 seconds was longer image capture shutterspeed
+* Sony: adjusted manualfocusing not to autofocus
+* Fuji: access ISO config
+* Sony: fixed manual focusing
+* Sony: specify capturetarget on camera, available on current 2019/2020 Sony
+* bugfixes
+* New ids added:
+  * Sony Alpha RX100V, A7s, RX0 II,
+  * Nikon Z50, Coolpix L810, KeyMission 170
+  * Canon PowerShot SX530HS, SX 620HS, 
+  * Canon EOS 2000D, 1500D, R2, M6 Mark 2, 250D,
+  * Fuji X-A5, X-E3, GFX100
+  * GoPro Hero 7 White, 7 Silver, 7 Black, 8 Black
+
+lumix:
+
+* New WIFI Lumix camera driver was added, using curl and libxml2.
+
+  Lots of abilities supported already, also capture preview.
+  However capture itself is not yet working.
+  This driver needs libxml2 and libcurl to be built.
+
+all:
+
+* Selecting camera libraries has changed a bit.
+
+
+  --camlibs=everything will select all and outdated drivers
+  --camlibs=standard  will select "current day" drivers
+  --camlibs=standard,outdated  will select "current day" and "outdated" drivers
+
+  You can now also use modifiers like +canon or -canon to enable/disable selected camera libraries.
+
+  The default is "standard", same as before.
+
+* fixed some issues found by AFL fuzzing, mostly in "outdated" drivers.
+
+* SECURITY.md: Small document added describing security properties of the library.
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.23 release
+
+ptp2:
+* Sony capture stability and speed improvements
+* Canon EOS capture stability improvements, reduce partial read blobs from 5MB to 1MB
+* Canon EOS M image format unpacking adjustments
+* Olympus OMD: bulb capture added, trigger capture capable
+* Panasonic GH5: added manualfocusdrive, capturetarget
+* Canon PowerShot X work ... trying to support / improve stability of capture
+* PTP string packing adjusted to standard (empty and null strings)
+* New ids added:
+  * Sony Alpha A68, RX100M6, DSC-WX350
+  * Nikon Coolpix L100
+  * Canon PowerShot G7X, G9X Mark II
+  * Canon Rebel T6, EOS 2000D
+  * Fuji X-A2, GFX 50R, XT-30
+  * Ricoh WG-M2
+* libmtp ids synced.
+
+pentax:
+* synced smaller parts with pktriggercord
+
+translations:
+* updated danish
+
+fuzzing:
+* vusb and sample-afl now able to fuzz all USB cameras (even if slow)
+
+all:
+* Various crashes fixed that were found during AFL fuzzing the USB drivers
+
+* The camlibs for cameras (and driver) older than 15 years have been
+  default disabled for installation, to speed up libgphoto2 startup
+  and also reduce attack surface against malicious USB devices.
+
+  See OUTDATED.txt in git for notes.
+
+  You can reenable them using:
+
+	./configure --with-camlibs=all,outdated
+
+  or by the camlib driver name (sample: jd11):
+
+	./configure --with-camlibs=all,jd11
+
+  To get the lists of all camera libraries use:
+
+	./configure --help
+
+  If you still have an old camera using one of these camlibs in active
+  use, please report this to the devteam so we can reenable it per
+  default.
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.22 release
+
+ptp2:
+* Canon EOS M / PowerShot capture problem solved
+* Sony shutterspeed - provide a static list as the camera does not provide one, you can set also different values
+* Canon SDRAM capture, try to support more than 500MB of images at once
+* New USB Ids added:
+  * Canon EOS R, 800D
+  * Canon PowerShot SX600HS, SX740HS
+  * Sony DSC RX0, RX100-M5A
+  * Nikon DSC D3500
+
+generic:
+* handle new "bind" udev event in udev rule generator.
+
+translations:
+* updated polish, ukrainian
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.21 release
+
+ptp2:
+* Nikon Z series support added
+* New Canon Powershot SX / GX also support capture, ALPHA support added
+* Canon EOS bugfixes
+* imported IDs from libmtp
+* Added:
+  * Nikon Z6, Z7
+  * Canon Powershot SX720HS, G5X
+  * Canon IXUS 185
+
+------------------------------------------------------------------------------
+libgphoto2 2.5.20 release
+
+ptp2:
+* Canon EOS: fixed regression for some EOS series in OLC decoding
+* Apple iPhone: disabled PTP Manifest reading again, as IOS seems not to follow the standard
+* bugfixes
+* new IDs added:
+  * Sony Alpha-RX10M4
+  * Canon EOS M50, 4000D
+  * Fuji XT-3
+  * synced new MTP ids from libmtp
+
+pentax:
+* refreshed from pktriggercord
+
+translations:
+* updated polish, ukrainian, swedish, danish
+------------------------------------------------------------------------------
+libgphoto2 2.5.19 release
+
+ptp2:
+* Canon EOS: handle OLC versions of newer models, which gave incorrect aperture/shutterspeed values
+* Fuji X series capture improvements.
+* Fuji X series live view support added.
+* Panasonic GH5 liveview and capture support. (Needs camera firmware 2.3 or newer)
+* Olympus E-M5 Mark II and E-M1 Mark II liveview and capture support added.
+* USB IDs added:
+  * Sony Alpha A99 M2, A7 III, A9
+  * Nikon Coolpix A900
+  * Panasonic GH5
+  * Olympus E-M1 Mark 2
+  * Fuji X-H1, X-M1, X70, X30
+
+all:
+* various fixes for warnings from compilers and the coverity scanner
+
+------------------------------------------------------------------------------
 libgphoto2 2.5.18 release
 
 ptp2:
@@ -1133,7 +1568,7 @@
 
 PTP2 driver:
    * Increased timeout for Canon Viewfinder enable.
-   * Fixed intial Canon timeout (0.5 -> 1.5 seconds), was too small
+   * Fixed initial Canon timeout (0.5 -> 1.5 seconds), was too small
      for some Canons.
    * Canon EOS capture mode and tethered mode bugfixes.
    * Nikon DSLR LiveView support, with Autofocus and ManualFocus Drive possibility.
@@ -1739,8 +2174,8 @@
        do not have a USB class id.
 
      * Now supports a "fast filesystem" mode on newer Nikon PTP cameras.
-     
-       This speeds up initialisation notably on cameras with lots (>50)
+
+       This speeds up initialization notably on cameras with lots (>50)
        of images.
 
        However, this mode does not find the special files on the camera

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/OUTDATED.txt Added

@@ -0,0 +1,77 @@
+Old to be obsoleted:
+
+serial only:
+	adc65	- added in 2005, might have been outdated even then.	
+		256x256 pixels
+	barbie	- is from 2000
+	casio	- last functional change 2005
+	dimera	- last functional change in 2003
+	fuji	- last functional change 2002
+	jd11	- is from 2001
+	kodak_dc120  - last bugreport from 2006
+	kodak_dc210  - last report from 2005
+	kodak_dc3200 - last functional change 2002
+	konica_qm150 - last functional change 2003 (not even googlable)
+	konica		- from 2001
+	largan_lmini	- last functional change 2004
+	minolta_dimage	- last functional change 2007
+	panasonic_coolshot - last reports in 2002
+	panasonic_dc1000 - last reports in 2002
+	panasonic_dc1580 - last reports in 2002
+	panasonic_l859 - last reports in 2002
+	polaroid_pdc320 - old serial, last change in 2003
+	ricoh		- from 2003
+	samsung		- last changes in 2002
+	sonydscf1	- 1997 camera
+	sonydscf55	- 1999 camera, changes from 2002
+
+agfa_cl20	- last functional change 2004
+clicksmart310	- last functional change 2006
+digita		- last cameras released in 2001
+enigma13	- last functional change in 2004
+gsmart300	- last functional change 2004
+hp215		- last functional changes 2005
+iclick		- last functional change 2004
+jamcam		- last functional change 2002
+kodak_ez200	- last changes in 2007 by me
+lg_gsm		- last functional change 2005
+mustek		- last changes in 2002, ported from gphoto 0
+pccam300	- last functional change 2004
+pccam600	- last functional change 2004
+polaroid_pdc640	- last report from 2005
+polaroid_pdc700 - last work around 2004
+ricoh_g3	- last reports from 2005
+sipix_blink	- was never working well i think
+sipix_blink2	- last functional change 2003
+sipix_web2	- last functional change 2002
+smal		- last functional change 2003
+soundvision	- last functional changes in 2003
+spca50x		- last additions in 2004
+stv0674		- last functional changes from 2002
+stv0680		- last functional changes from 2003
+sx330z		- last functional changes from 2003
+toshiba_pdrm11	- last functional changes from 2003
+
+
+Keep:
+
+aox		- last functional change 2008
+ax203		- last functional change 2014
+canon		- still has known users, active 2019
+digigr8		- functional changes in 2012
+directory	- generic directory driver, keep
+jl2005a		- last functional change 2010
+jl2005c		- last functional change 2012
+mars		- last functional change 2010
+pentax		- pentax slr, active 2019
+ptp2		- PTP, active
+sierra		- still has users, also some cameras
+sonix		- last functional changes in 2008
+sq905		- last functional change 2010
+st2205		- changes in 2014
+topfield	- last changes in 2008, (HD recorder, might still be in use)
+tp6801		- last changes in 2011
+
+kodak_dc240	- last report from 2004
+	Reply from a user in 5.2019 its in active use.
+ricoh_g3	- report in 2019 https://github.com/gphoto/libgphoto2/issues/454

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/README -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/README Changed

@@ -1,28 +1,20 @@
-libgphoto2 2.5.17 release
+libgphoto2 2.5.30 release
 
 ptp2:
-* Apple iOSX: handle root directory objects that have ParentObject==StorageID instead of 0
-* implement PTP 1.1 Manifest reading and hook into filesystem. currently only supported
-  by Apple iOS.
-* Canon PowerShot CHDK live view support.
-* Canon EOS: prepare capture needs to wait a bit on a crucial place to get all events.
-  might fix some PTP Device Busy reports.
-* Canon EOS: split bulk downloads into pieces of partial downloads. This might cure the Error 70.
-* Canon EOS: Improved EOS M capture
-* Canon CHDK: live preview capture support added
-* Added USB IDs:
-  * Sony A7r III
-  * Nikon CoolPix L430
-  * Nikon D850
-  * Canon EOS M2, M6, M100
-  * Canon EOS 6D Mark II
-  * Fuji Film X-Pro 2
+* Canon: fixed display locking/unlocking after exit
+* generic: avoid potential crash on image addition
+* Sony: Add image information when wait_for_event, some config values added
+* Added IDs:
+  * Nikon Zfc, Z9
+  * Sony DSC-WX220, Alpha-A7 IV
+  * Nikon P950
+  * Canon EOS Rebel T8i
+  * Fuji Fujifilm X-E4
+  * GoPro HERO10 Black
 
-pentax:
-* Code updates imported from pkremote
-
-libgphoto2:
-* Report file changes via GP_EVENT_FILE_CHANGED (hooked up for Canon EOS currently)
+general:
+* fix parallel builds by requiring gettext 0.19.1 for builds from git (PR #797)
+* add gp_init_localedir() function to allow for non-standard installations (PR #796)
 
 translations:
-* updates spanish, chinese
+* updated traditional chinese

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/README.md -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/README.md Changed

@@ -135,12 +135,14 @@
     output if it is small. If it is more than a few kilobytes, please
     don't post the complete debug output on the list.
 
-
-gphoto project home page: http://www.gphoto.org/
-gphoto github project page: https://github.com/gphoto
-camera list with support status: http://www.teaser.fr/~hfiguiere/linux/digicam.html
-jphoto home page: http://jphoto.sourceforge.net/
-information about using USB mass storage: http://www.linux-usb.org/USB-guide/x498.html
-gphoto development mailing list: gphoto-devel@lists.sourceforge.net
-gphoto user mailing list: gphoto-user@lists.sourceforge.net
-gphoto translation mailing list: gphoto-translation@lists.sourceforge.net
+## Links
+
+* gphoto project home page(http://www.gphoto.org/)
+* gphoto github project page(https://github.com/gphoto)
+* gphoto camera list(http://gphoto.org/proj/libgphoto2/support.php)
+* gphoto camera remote control list and doc(http://gphoto.org/doc/remote/)
+* jphoto home page(http://jphoto.sourceforge.net/)
+* Information about using USB mass storage(http://www.linux-usb.org/USB-guide/x498.html)
+* gphoto development mailing list(mailto:gphoto-devel@lists.sourceforge.net)
+* gphoto user mailing list(mailto:gphoto-user@lists.sourceforge.net)
+* gphoto translation mailing list(mailto:gphoto-translation@lists.sourceforge.net)

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/RELEASE-HOWTO.md Added

@@ -0,0 +1,204 @@
+# How to prepare a release
+
+## update the locally maintained translation(s)
+
+   Run `make update-po`, then find which `**/po/*.po` files are
+   maintained locally (see the `MAINTAINERS` file), then edit and
+   commit those.
+
+## sync translations from translationproject
+
+   Run `make pull-translations` or manually run in the toplevel
+   directory (of which `po/` is a subdirectory)
+
+    rsync -Lrtvz  translationproject.org::tp/latest/libgphoto2/  po
+    rsync -Lrtvz  translationproject.org::tp/latest/libgphoto2_port/  libgphoto2_port/po
+
+   If gphoto2 is released too:
+
+    rsync -Lrtvz  translationproject.org::tp/latest/gphoto2/  po
+
+   For each updated '**/po/*.po' file, use
+
+    git commit LANG.po --author="Last translator from the po file"
+
+   to make it clear who did the change.
+
+## sync music-players.h from libmtp
+
+   We ship the `music-players.h` file from libmtp to give additional
+   device support for distributions that might update libmtp less
+   frequently.
+
+   Copy over from libmtp and commit.
+
+## test cameras
+
+   Run: `make check`
+
+   In the gphoto2 checkout I am running `perl tests/testcamera.pl` for
+   several cameras that might have been affected by the current
+   release.
+
+## update libtool library version(s), hopefully keeping the soname(s)
+
+   Ensure the libtool library version (from which the soname is derived)
+   have been updated relative to the last release.
+
+  * LIBGPHOTO2_{AGE,REVISION,CURRENT} in configure.ac and
+  * LIBGPHOTO2_PORT_{AGE,REVISION,CURRENT} in libgphoto2_port/configure.ac
+
+   If no functions have been added since the last release,
+   incrementing *_REVISION will do.
+
+   If functions have been added since the last release, update
+   _AGE and _CHANGES and reset _REVISION to 0.
+
+   If functions have been removed, a lot of other work results besides
+   updating the libtool library version.
+
+## update NEWS
+
+    git diff libgphoto2-2\_5\_21-release.. | less
+
+   summarize changes
+
+## tag release
+
+   bump version in `configure.ac`, `NEWS`, commit and push.
+
+    make clean
+    make
+    sudo make install
+
+## build and sign release ŧarballs
+
+    make distcheck
+
+   this builds `.gz`, `.bz2` and `.xz` tarballs currently.
+
+   GPG detach sign:
+
+    gpg --detach-sign -a libgphoto2-2.5.27.tar.bz2
+    gpg --detach-sign -a libgphoto2-2.5.27.tar.gz
+    gpg --detach-sign -a libgphoto2-2.5.27.tar.xz
+
+   this will create `.asc` files alongside the tarballs.
+
+   Similar when doing the gphoto2 release.
+
+## tag git
+
+   Do old style and new style GIT tagging (new style for github largely)
+
+    git tag libgphoto2-2\_5\_27-release
+    git tag v2.5.27
+    git push --tags
+
+## create a README for sourceforge
+
+   Paste the `NEWS` blob from this release into `README` for uploading.
+
+## SF upload
+
+   Create a new folder below `libgphoto2` with the release number in it (Add Folder).
+
+   Inside that "Add File" of the tarballs, the `.asc` files and the `README`.
+
+   After upload, select "Info" on the `.tar.bz2` tarball, and "Select All" for the Default download.
+   This will make it point the "default download" link to this tarball.
+ 
+   If you are uploading gphoto2, do the same ... but do not select it for the default download.
+
+## Github tagging
+
+   https://github.com/gphoto/libgphoto2/releases
+
+   "Draft a new release"
+
+   Select the new release tag. Name is "2.5.27 release",
+   paste in the `NEWS` blob into the textfield.
+
+## Edit the website
+
+### index.php
+
+   Use a entry similar to the current ones. Drop older ones occasionally.
+
+### news/index.php
+
+   Paste in the `NEWS` blob, htmlify with h2 - h3 and ul/li lists, same as the ones before
+
+### proj/libgphoto2/support.php
+
+   Adjust the date (`env LANG=C date`).
+
+   Adjust the `gphoto2 --version` blob (`env LANG=C gphoto2 --version`). Make sure you have the correct versions in there.
+
+   Replace the table with fresh output of:
+
+    /usr/lib64/libgphoto2/print-camera-list html
+
+### Upload via sftp
+
+   see `upload.sh` ... html tree starts below `htdocs/` on the server.
+
+   Do not forget to "svn ci" the changes.
+
+### Verify website.
+
+   Check the pages render OK and no HTML error was introduced.
+
+## Announce to mailing list
+
+   Write a summary email to `gphoto-user@lists.sourceforge.net`, `gphoto-devel@lists.sourceforge.net`.
+
+   Add download links to either SF or GITHUB.
+
+## Announce to freshcode.club
+
+   https://freshcode.club/, look for libgphoto2
+
+   Fill out the "New release" form. It is pretty straight forward. As text use the NEWS blob again.
+
+   Same for gphoto2.
+
+## Announce to twitter / facebook / etc.
+
+   e.g.:
+
+   I have just released libgphoto2 2.5.22 ( http://gphoto.org/news/  )
+   ... Fixed Canon EOS M and PowerShot SX capture, added Sony Alpha RX0
+   and RX100M5A, added Canon EOS R, and some bugfixes.
+
+## change IRC topic of #gphoto in libera.chat
+
+   /msg Chanserv topic #gphoto Digital cameras for Linux/UNIX/MacOS | http://gphoto.org/ | just ask | no webcams | newest 2.5.27
+
+## Announce to translation project
+
+   See https://translationproject.org/html/maintainers.html
+
+   Write an email to coordinator@translationproject.org
+
+   Subject: libgphoto2-2.5.28.pot
+
+
+   	Hi,
+	
+	libgphoto2 and libgphoto2_port translations domains are updated to 2.5.28.
+
+	Download location: https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.28/libgphoto2-2.5.28.tar.bz2/download
+
+
+	Also gphoto2 was updated to 2.5.28:
+	https://sourceforge.net/projects/gphoto/files/gphoto/2.5.28/gphoto2-2.5.28.tar.bz2/download
+
+	Ciao, Marcus
+
+	Ciao, Marcus
+   
+
+## Prepare git repo for further development
+
+   Rev `NEWS` and `configure.ac` versions to 2.5.27.1 devel release.

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/SECURITY.md Added

@@ -0,0 +1,70 @@
+# Security overview
+
+## General
+
+libgphoto2 is a software library to allow accessing USB devices (cameras,
+media players), allowing file system operations (list, download,
+upload, delete), and control operations (get and set settings, and
+remote control).
+
+It consists of a core library, and drivers for both "port" protocols
+like USB, serial, IP and devices (camera drivers).
+
+libgphoto2 only processes images to provide standard formats. For JPEG
+images the libexif library is used for extraction of EXIF data.
+
+Callers of the library can be assumed trusted, also input coming into
+the library via API calls is considered trusted.
+
+Data coming from port drivers (USB, serial, IP, etc) is considered untrusted.
+
+Historically the primary development goals was "make it work", without
+security in mind.
+
+## Attack Surface
+
+The primary attack scenario is a kiosk style photo access computer, where people
+can plug in USB devices in an unattended fashion.
+
+Attack impacts are achieving control over this computer, or blocking its use.
+
+## Bugs considered security issues
+
+(Mostly for CVE assigments rules.)
+
+In scope of a security attack are the autodetecting protocols support,
+like USB.
+
+Also IP (TCP and UDP) based drivers are considered in scope, with
+malicious target devices or man in the middle attacks.
+
+Current day camera drivers are in scope (e.g. all drivers not marked as "outdated").
+
+Triggering memory corruption is considered in scope.
+Triggering endless loops is considered in scope. (would block kiosk style operation)
+
+## Bugs not considered security issues
+
+Serial cameras are not in scope, as they cannot be autodetected and need
+special configuration which makes other attack vectors likely.
+
+Outdated drivers... We have classified a number of older drivers as
+"outdated", and do not recommend to build them by default anymore.
+
+Denial of service attacks of class "crash" or "resource consumption
+(disk)" are not in scope.
+
+- Frontends should auto-recover (restart) after crashes.
+- Resource consumption in terms of diskspace is not in scope, as the
+  library is meant to download large amounts of data (Gigabytes) in
+  regular operation.
+
+Information disclosure is not a relevant attack scenario.
+
+## Bugreports
+
+Bugreports can be filed as github issues.
+
+If you want to report an embargoed security bug report, reach out to marcus@jet.franken.de
+or Report a vulnerability(https://github.com/gphoto/libgphoto2/security/advisories/new)
+on Github.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/aclocal.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,14 +14,14 @@
 m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
-m4_warning(this file was generated for autoconf 2.69.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.71,,
+m4_warning(this file was generated for autoconf 2.71.
 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'.))
 
 # pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# serial 11 (pkg-config-0.29.1)
 
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -63,7 +63,7 @@
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun(PKG_PREREQ,
-m4_define(PKG_MACROS_VERSION, 0.29.2)
+m4_define(PKG_MACROS_VERSION, 0.29.1)
 m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
     m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
 )dnl PKG_PREREQ
@@ -164,7 +164,7 @@
 AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
 
 pkg_failed=no
-AC_MSG_CHECKING(for $2)
+AC_MSG_CHECKING(for $1)
 
 _PKG_CONFIG($1_CFLAGS, cflags, $2)
 _PKG_CONFIG($1_LIBS, libs, $2)
@@ -174,11 +174,11 @@
 See the pkg-config man page for more details.)
 
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT(no)
+   	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
+        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
@@ -195,7 +195,7 @@
 _PKG_TEXT)dnl
         )
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT(no)
+     	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
@@ -296,7 +296,75 @@
 AS_VAR_IF($1, "", $5, $4)dnl
 )dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   ACTION-IF-FOUND,ACTION-IF-NOT-FOUND,
+dnl   DESCRIPTION, DEFAULT)
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl VARIABLE-PREFIX name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN(PKG_WITH_MODULES,
+
+m4_pushdef(with_arg, m4_tolower($1))
+
+m4_pushdef(description,
+           m4_default($5, build with with_arg support))
+
+m4_pushdef(def_arg, m4_default($6, auto))
+m4_pushdef(def_action_if_found, AS_TR_SH(with_with_arg)=yes)
+m4_pushdef(def_action_if_not_found, AS_TR_SH(with_with_arg)=no)
+
+m4_case(def_arg,
+            yes,m4_pushdef(with_without, --without-with_arg),
+            m4_pushdef(with_without,--with-with_arg))
+
+AC_ARG_WITH(with_arg,
+     AS_HELP_STRING(with_without, description @<:@default=def_arg@:>@),,
+    AS_TR_SH(with_with_arg)=def_arg)
+
+AS_CASE($AS_TR_SH(with_with_arg),
+            yes,PKG_CHECK_MODULES($1,$2,$3,$4),
+            auto,PKG_CHECK_MODULES($1,$2,
+                                        m4_n(def_action_if_found) $3,
+                                        m4_n(def_action_if_not_found) $4))
+
+m4_popdef(with_arg)
+m4_popdef(description)
+m4_popdef(def_arg)
+
+)dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   DESCRIPTION, DEFAULT)
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._VARIABLE-PREFIX is exported as make variable.
+AC_DEFUN(PKG_HAVE_WITH_MODULES,
+
+PKG_WITH_MODULES($1,$2,,,$3,$4)
+
+AM_CONDITIONAL(HAVE_$1,
+               test "$AS_TR_SH(with_m4_tolower($1))" = "yes")
+)dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   DESCRIPTION, DEFAULT)
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_VARIABLE-PREFIX is exported as make
+dnl and preprocessor variable.
+AC_DEFUN(PKG_HAVE_DEFINE_WITH_MODULES,
+
+PKG_HAVE_WITH_MODULES($1,$2,$3,$4)
+
+AS_IF(test "$AS_TR_SH(with_m4_tolower($1))" = "yes",
+        AC_DEFINE(HAVE_$1, 1, Enable m4_tolower($1) support))
+)dnl PKG_HAVE_DEFINE_WITH_MODULES
+
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -308,10 +376,10 @@
 # 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.15'
+am__api_version='1.16'
 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.15.1, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -327,12 +395,12 @@
 # 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.15.1)dnl
+AM_AUTOMAKE_VERSION(1.16.5)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -394,7 +462,7 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -444,9 +512,46 @@
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 )
 
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2021 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_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define(_AM_COND_IF)
+m4_define(_AM_COND_ELSE)
+m4_define(_AM_COND_ENDIF)
+
+# AM_COND_IF(COND, IF-TRUE, IF-FALSE)
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN(AM_COND_IF,
+m4_ifndef(_AM_COND_VALUE_$1,
+	   m4_fatal($0: no such condition "$1"))dnl
+_AM_COND_IF($1)dnl
+if test -z "$$1_TRUE"; then :
+  m4_n($2)dnl
+m4_ifval($3,
+_AM_COND_ELSE($1)dnl
+else
+  $3
+)dnl
+_AM_COND_ENDIF($1)dnl
+fidnl
+)
+
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -477,7 +582,7 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -668,13 +773,12 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
@@ -682,49 +786,43 @@
   # Older Autoconf 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
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE($CONFIG_FILES,
+          *\'*, eval set x "$CONFIG_FILES",
+          *, set x $CONFIG_FILES)
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_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
+    am_mf=`AS_ECHO("$am_mf") | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: 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"`
-    # 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'`; 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
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME("$am_mf")`
+    am_filepart=`AS_BASENAME("$am_mf")`
+    AM_RUN_LOG(cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE(Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).)
+  fi
+  AS_UNSET(am_dirpart)
+  AS_UNSET(am_filepart)
+  AS_UNSET(am_mf)
+  AS_UNSET(am_rc)
+  rm -f conftest-deps.mk
 }
 )# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -733,18 +831,17 @@
 # -----------------------------
 # 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.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll 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")
-)
+     AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"))
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,6 +869,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))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
@@ -808,7 +909,7 @@
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(AC_PACKAGE_VERSION, ok),
   ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
@@ -831,8 +932,8 @@
 AC_REQUIRE(AC_PROG_MKDIR_P)dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST(mkdir_p, '$(MKDIR_P)')
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -860,6 +961,20 @@
 		  m4_define(AC_PROG_OBJCXX,
 			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
 )
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST(CTAGS)
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST(ETAGS)
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST(CSCOPE)
+
 AC_REQUIRE(AM_SILENT_RULES)dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -899,7 +1014,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -941,7 +1056,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -962,7 +1077,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -983,7 +1098,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -991,49 +1106,42 @@
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN(AM_MAKE_INCLUDE,
-am_make=${MAKE-make}
-cat > confinc << 'END'
+AC_MSG_CHECKING(whether ${MAKE-make} supports the include directive)
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .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
-)
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG(${MAKE-make} -f confmf.$s && cat confinc.out)
+  AS_CASE($?:`cat confinc.out 2>/dev/null`,
+      '0:this is the am__doit target',
+      AS_CASE($s,
+          BSD, am__include='.include' am__quote='"',
+          am__include='include' am__quote=''))
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT(${_am_result})
+AC_SUBST(am__include))
+AC_SUBST(am__quote))
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1054,12 +1162,7 @@
 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
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -1072,7 +1175,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1101,7 +1204,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1148,7 +1251,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1167,7 +1270,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1248,7 +1351,7 @@
 rm -f conftest.file
 )
 
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1308,7 +1411,7 @@
 _AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
 )
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1336,7 +1439,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1355,7 +1458,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1486,23 +1589,32 @@
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR
 
-m4_include(gphoto-m4/gp-byteorder.m4)
-m4_include(gphoto-m4/gp-camlibs.m4)
-m4_include(gphoto-m4/gp-check-doxygen.m4)
-m4_include(gphoto-m4/gp-check-library.m4)
-m4_include(gphoto-m4/gp-check-shell-environment.m4)
-m4_include(gphoto-m4/gp-config-msg.m4)
-m4_include(gphoto-m4/gp-documentation.m4)
-m4_include(gphoto-m4/gp-gettext-hack.m4)
-m4_include(gphoto-m4/gp-internal-docs.m4)
-m4_include(gphoto-m4/gp-libltdl.m4)
-m4_include(gphoto-m4/gp-packaging.m4)
-m4_include(gphoto-m4/gp-references.m4)
-m4_include(gphoto-m4/gp-stdint.m4)
-m4_include(gphoto-m4/gp-udev.m4)
-m4_include(gphoto-m4/gp-va-copy.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-asm-symver-ifelse.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-asm-symver-support.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-byteorder.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-camlibs.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-check-doxygen.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-check-library.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-check-prog.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-check-shell-environment.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-config-msg.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-documentation.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-driverdir.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-gettext-setup.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-internal-docs.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-libjpeg.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-libltdl.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-packaging.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-pedantic-compiler-flags.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-progs.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-references.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-set.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-sleep.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-udev.m4)
+m4_include(libgphoto2_port/gphoto-m4/gp-va-copy.m4)
 m4_include(auto-m4/gettext.m4)
 m4_include(auto-m4/iconv.m4)
+m4_include(auto-m4/intlmacosx.m4)
 m4_include(auto-m4/lib-ld.m4)
 m4_include(auto-m4/lib-link.m4)
 m4_include(auto-m4/lib-prefix.m4)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/ar-lib -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/ar-lib Changed

@@ -2,9 +2,9 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2012-03-01.08; # UTC
+scriptversion=2019-07-04.01; # UTC
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -65,7 +65,7 @@
 	mingw)
 	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
 	  ;;
-	cygwin)
+	cygwin | msys)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine)
@@ -224,10 +224,11 @@
       esac
     done
   else
-    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
-    do
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
-    done
+    $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \
+      | while read member
+        do
+          $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+        done
   fi
 
 elif test -n "$quick$replace"; then

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/compile -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/compile Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | */\\cl | cl.exe | */\\cl.exe )
+  cl | */\\cl | cl.exe | */\\cl.exe | \
+  icl | */\\icl | icl.exe | */\\icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/config.guess -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/config.guess Changed

@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2021 Free Software Foundation, Inc.
 
-timestamp='2014-11-04'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-06-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,11 +29,19 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -39,7 +49,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2021 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,60 +107,84 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if  "$LIBC" = unknown  &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if  "$LIBC" = unknown ; then
+		LIBC=gnu
+	fi
 	;;
 esac
 
@@ -162,10 +197,11 @@
      ;;
 esac
 test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+test -f /etc/os-release && grep -q suse /etc/os-release && VENDOR=suse
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -177,22 +213,32 @@
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    echo unknown)`
+	case $UNAME_MACHINE_ARCH in
+	    aarch64eb) machine=aarch64_be-unknown ;;
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	    earmv*)
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
+	# to ELF recently (or will in the future) and ABI.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -207,45 +253,80 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		expr='s/^earmv0-9/-eabi/;s/eb$//'
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case $UNAME_VERSION in
 	    Debian*)
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/-_.*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
+	GUESS=$machine-${os}${release}${abi-}
+	;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-bitrig$UNAME_RELEASE
+	;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-openbsd$UNAME_RELEASE
+	;;
+    *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-secbsd$UNAME_RELEASE
+	;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-libertybsd$UNAME_RELEASE
+	;;
+    *:MidnightBSD:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-midnightbsd$UNAME_RELEASE
+	;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-ekkobsd$UNAME_RELEASE
+	;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-solidbsd$UNAME_RELEASE
+	;;
+    *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-os108_$UNAME_RELEASE
+	;;
     macppc:MirBSD:*:*)
-	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-${VENDOR}-mirbsd$UNAME_RELEASE
+	;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-mirbsd$UNAME_RELEASE
+	;;
+    *:Sortix:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-sortix
+	;;
+    *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-twizzler
+	;;
+    *:Redox:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-redox
+	;;
+    mips:OSF1:*.*)
+	GUESS=mips-dec-osf1
+	;;
     alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -259,163 +340,158 @@
 	# covers most systems running today.  This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
+	case $ALPHA_CPU_TYPE in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-${VENDOR}-sysv4
-	exit ;;
+	GUESS=m68k-${VENDOR}-sysv4
+	;;
     *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-amigaos
+	;;
     *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-morphos
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-morphos
+	;;
     *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
+	GUESS=i370-ibm-openedition
+	;;
     *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	GUESS=s390-ibm-zvmoe
+	;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	GUESS=powerpc-ibm-os400
+	;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-${VENDOR}-riscos
-	exit ;;
+	GUESS=arm-${VENDOR}-riscos
+	;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
+	case `(/bin/universe) 2>/dev/null` in
+	    att) GUESS=pyramid-pyramid-sysv3 ;;
+	    *)   GUESS=pyramid-pyramid-bsd   ;;
+	esac
+	;;
     NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
+	GUESS=pyramid-pyramid-svr4
+	;;
     DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
+	GUESS=sparc-icl-nx6
+	;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	    sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
     s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
     sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	set_cc_for_build
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if  "$CC_FOR_BUILD" != 'no_compiler_found' ; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
     sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
+	case `/usr/bin/arch -k` in
 	    Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
     sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case `/bin/arch` in
 	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
 		;;
 	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
 		;;
 	esac
-	exit ;;
+	;;
     aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -425,44 +501,44 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-${VENDOR}-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-${VENDOR}-mint$UNAME_RELEASE
+	;;
     m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
     powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
     RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
+	GUESS=mips-dec-mach_bsd4.3
+	;;
     RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
     VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv) {
@@ -471,95 +547,96 @@
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%ssysv\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%ssvr4\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv1); exit (0);
+	  printf ("mips-mips-riscos%sbsd\\n", argv1); exit (0);
 	#endif
 	#endif
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$0-9*$.*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
     Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
+	GUESS=powerpc-motorola-powermax
+	;;
     Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
+	GUESS=powerpc-harris-powerunix
+	;;
     m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
+	GUESS=m88k-harris-cxux7
+	;;
     m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
+	GUESS=m88k-motorola-sysv4
+	;;
     m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if  $UNAME_PROCESSOR = mc88100  ||  $UNAME_PROCESSOR = mc88110 
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	    if  ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx  || \
-	        ${TARGET_BINARY_INTERFACE}x = x 
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
 	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
 	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
 	    fi
 	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
+	    GUESS=i586-dg-dgux$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
+	GUESS=m88k-dolphin-sysv3
+	;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
+	GUESS=m88k-tektronix-sysv3
+	;;
     Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
+	GUESS=m68k-tektronix-bsd
+	;;
     *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
     ????????:AIX?:12.1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
+	GUESS=i386-ibm-aix
+	;;
     ia64:AIX:*:*)
-	if  -x /usr/bin/oslevel  ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
@@ -570,77 +647,77 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			echo "$SYSTEM_NAME"
+			GUESS=$SYSTEM_NAME
 		else
-			echo rs6000-ibm-aix3.2.5
+			GUESS=rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
+		GUESS=rs6000-ibm-aix3.2.4
 	else
-		echo rs6000-ibm-aix3.2
+		GUESS=rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	;;
     *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if  -x /usr/bin/lslpp  ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
 			   awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
     *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
+	GUESS=rs6000-ibm-aix
+	;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	GUESS=romp-ibm-bsd4.4
+	;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+	;;                                  # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
+	GUESS=rs6000-bull-bosx
+	;;
     DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
+	GUESS=m68k-bull-sysv3
+	;;
     9000/34??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
+	GUESS=m68k-hp-bsd
+	;;
     hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
+	GUESS=m68k-hp-bsd4.4
+	;;
     9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/34?? )         HP_ARCH=m68k ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	case $UNAME_MACHINE in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/34??)         HP_ARCH=m68k ;;
 	    9000/6780-90-9)
-		if  -x /usr/bin/getconf ; then
+		if test -x /usr/bin/getconf; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		    case $sc_cpu_version in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			case $sc_kernel_bits in
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
-		if  "${HP_ARCH}" = "" ; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		if test "$HP_ARCH" = ""; then
+		    set_cc_for_build
+		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
 		#include <stdlib.h>
@@ -673,13 +750,13 @@
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if  ${HP_ARCH} = "hppa2.0w" 
+	if test "$HP_ARCH" = hppa2.0w
 	then
-	    eval $set_cc_for_build
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -690,23 +767,23 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
     ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
@@ -731,38 +808,38 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
+    9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
+	GUESS=hppa1.1-hp-bsd
+	;;
     9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
+	GUESS=hppa1.0-hp-bsd
+	;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?79:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-mpeix
+	;;
+    hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
+	GUESS=hppa1.1-hp-osf
+	;;
     hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-osf
+	;;
     i*86:OSF1:*:*)
-	if  -x /usr/sbin/sysversion  ; then
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+	if test -x /usr/sbin/sysversion ; then
+	    GUESS=$UNAME_MACHINE-${VENDOR}-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
+	    GUESS=$UNAME_MACHINE-${VENDOR}-osf1
 	fi
-	exit ;;
+	;;
     parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
+	GUESS=hppa1.1-hp-lites
+	;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
+	GUESS=c1-convex-bsd
+	;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -770,139 +847,145 @@
 	fi
 	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
+	GUESS=c34-convex-bsd
+	;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
+	GUESS=c38-convex-bsd
+	;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
+	GUESS=c4-convex-bsd
+	;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
     CRAY*A-Z90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*$A-Z90$/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.^.*$/.X/'
 	exit ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
     CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
     F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
     sparc*:BSD/OS:*:*)
-	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-${VENDOR}-bsdi$UNAME_RELEASE
+	;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-bsdi$UNAME_RELEASE
+	;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	    GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabi
+	else
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	    GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case $UNAME_PROCESSOR in
 	    amd64)
-		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
-	exit ;;
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL
+	;;
     i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
     *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
     *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
     *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
     i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
     *:Interix*:*)
-	case ${UNAME_MACHINE} in
+	case $UNAME_MACHINE in
 	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=x86_64-${VENDOR}-interix$UNAME_RELEASE
+		;;
 	    IA64)
-		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=ia64-${VENDOR}-interix$UNAME_RELEASE
+		;;
 	esac ;;
-    34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-${VENDOR}-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-${VENDOR}-cygwin
-	exit ;;
+	GUESS=x86_64-pc-cygwin
+	;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=powerpcle-${VENDOR}-solaris2$SUN_REL
+	;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,-/.*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-${VENDOR}-$LIBC$GNU_REL
+	;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-${VENDOR}-$GNU_SYS$GNU_REL-$LIBC
+	;;
+    *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-minix
+	;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -912,172 +995,226 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+	    GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
+		GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
+		GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabihf
 	    fi
 	fi
-	exit ;;
+	;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
+    e2k:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
+    k1om:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-${VENDOR}-linux-$LIBCABI"; exit; }
+	;;
+    mips64el:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
     openrisc*:Linux:*:*)
-	echo or1k-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=or1k-${VENDOR}-linux-$LIBC
+	;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     padre:Linux:*:*)
-	echo sparc-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=sparc-${VENDOR}-linux-$LIBC
+	;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=hppa64-${VENDOR}-linux-$LIBC
+	;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
-	  *)    echo hppa-${VENDOR}-linux-${LIBC} ;;
+	  PA7*) GUESS=hppa1.1-${VENDOR}-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-${VENDOR}-linux-$LIBC ;;
+	  *)    GUESS=hppa-${VENDOR}-linux-$LIBC ;;
 	esac
-	exit ;;
+	;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64-${VENDOR}-linux-$LIBC
+	;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc-${VENDOR}-linux-$LIBC
+	;;
     ppc64le:Linux:*:*)
-	echo powerpc64le-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64le-${VENDOR}-linux-$LIBC
+	;;
     ppcle:Linux:*:*)
-	echo powerpcle-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=powerpcle-${VENDOR}-linux-$LIBC
+	;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		LIBCABI=${LIBC}x32
+	    fi
+	fi
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBCABI
+	;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
+	GUESS=i386-sequent-sysv4
+	;;
     i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-${VENDOR}-stop
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-stop
+	;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-atheos
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-atheos
+	;;
     i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	echo i386-${VENODR}-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-${VENDOR}-lynxos$UNAME_RELEASE
+	;;
     i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
 	fi
-	exit ;;
+	;;
     i*86:*:5:678*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1085,12 +1222,12 @@
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1100,43 +1237,43 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		GUESS=$UNAME_MACHINE-pc-sysv32
 	fi
-	exit ;;
+	;;
     pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+	GUESS=i586-pc-msdosdjgpp
+	;;
     Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
+	GUESS=i386-pc-mach3
+	;;
     paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
+	GUESS=i860-intel-osf1
+	;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-${VENODR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  GUESS=i860-${VENDOR}-sysv$UNAME_RELEASE     # Unknown i860-SVR4
 	fi
-	exit ;;
+	;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
+	GUESS=m68010-convergent-sysv
+	;;
     mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
+	GUESS=m68k-convergent-sysv
+	;;
     M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
+	GUESS=m68k-diab-dnix
+	;;
     M68*:*:R3V5678*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
@@ -1144,9 +1281,9 @@
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     334??:*:4.0:* | 334??,*:*:4.0:*)
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	  && { echo i486-ncr-sysv4; exit; } ;;
@@ -1155,248 +1292,438 @@
 	test -r /etc/.relid \
 	    && OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-${VENDOR}-lynxos$UNAME_RELEASE
+	;;
     mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
+	GUESS=m68k-atari-sysv4
+	;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-${VENDOR}-lynxos$UNAME_RELEASE
+	;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=rs6000-${VENDOR}-lynxos$UNAME_RELEASE
+	;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-${VENDOR}-lynxos$UNAME_RELEASE
+	;;
     SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
     RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
+		GUESS=$UNAME_MACHINE-sni-sysv4
 	else
-		echo ns32k-sni-sysv
+		GUESS=ns32k-sni-sysv
 	fi
-	exit ;;
+	;;
     PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+	GUESS=i586-unisys-sysv4
+	;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
+	GUESS=hppa1.1-stratus-sysv4
+	;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
+	GUESS=i860-stratus-sysv4
+	;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
+	GUESS=hppa1.1-stratus-vos
+	;;
     mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
     news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
+	GUESS=mips-sony-newsos6
+	;;
     R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if  -d /usr/nec ; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+		GUESS=mips-${VENDOR}-sysv$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
+	GUESS=powerpc-be-beos
+	;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
+	GUESS=powerpc-apple-beos
+	;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
+	GUESS=i586-pc-beos
+	;;
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
+	GUESS=i586-pc-haiku
+	;;
     x86_64:Haiku:*:*)
-	echo x86_64-${VENDOR}-haiku
-	exit ;;
+	GUESS=x86_64-${VENDOR}-haiku
+	;;
     SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
     SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
     SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
     SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
     SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
     SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
+    SX-ACE:SUPER-UX:*:*)
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
     Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
     *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+    arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
 	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if  "$CC_FOR_BUILD" != 'no_compiler_found' ; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
     *:procnto*:*:* | *:QNX:0123456789*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
     *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-qnx
+	;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
     NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
     *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
+	GUESS=mips-compaq-nonstopux
+	;;
     BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
+	GUESS=bs2000-siemens-sysv
+	;;
     DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "${cputype-}" = 386; then
 	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
+	elif test "x${cputype-}" != x; then
+	    UNAME_MACHINE=$cputype
 	fi
-	echo ${UNAME_MACHINE}-${VENDOR}-plan9
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-plan9
+	;;
     *:TOPS-10:*:*)
-	echo pdp10-${VENDOR}-tops10
-	exit ;;
+	GUESS=pdp10-${VENDOR}-tops10
+	;;
     *:TENEX:*:*)
-	echo pdp10-${VENDOR}-tenex
-	exit ;;
+	GUESS=pdp10-${VENDOR}-tenex
+	;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
+	GUESS=pdp10-dec-tops20
+	;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
+	GUESS=pdp10-xkl-tops20
+	;;
     *:TOPS-20:*:*)
-	echo pdp10-${VENDOR}-tops20
-	exit ;;
+	GUESS=pdp10-${VENDOR}-tops20
+	;;
     *:ITS:*:*)
-	echo pdp10-${VENDOR}-its
-	exit ;;
+	GUESS=pdp10-${VENDOR}-its
+	;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
-	exit ;;
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-${VENDOR}-dragonfly$DRAGONFLY_REL
+	;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
+	case $UNAME_MACHINE in
+	    A*) GUESS=alpha-dec-vms ;;
+	    I*) GUESS=ia64-dec-vms ;;
+	    V*) GUESS=vax-dec-vms ;;
 	esac ;;
     *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
+	GUESS=i386-pc-xenix
+	;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
     i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+    *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-aros
+	;;
     x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-esx
-	exit ;;
+	GUESS=$UNAME_MACHINE-${VENDOR}-esx
+	;;
+    amd64:Isilon\ OneFS:*:*)
+	GUESS=x86_64-${VENDOR}-onefs
+	;;
+    *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE
+	;;
+esac
+
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
 esac
 
 cat >&2 <<EOF
-$0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
@@ -1415,16 +1742,17 @@
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/config.rpath -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/config.rpath Changed

@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Copyright 1996-2014 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   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.
+#   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.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -40,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -50,7 +35,19 @@
 host_vendor=`echo "$host" | sed 's/^$^-*$-$^-*$-$.*$$/\2/'`
 host_os=`echo "$host" | sed 's/^$^-*$-$^-*$-$.*$$/\3/'`
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *\\/compile | ccache | *\\/ccache ) ;;
+    distcc | *\\/distcc | purify | *\\/purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
 
 wl=
 if test "$GCC" = yes; then
@@ -60,7 +57,7 @@
     aix*)
       wl='-Wl,'
       ;;
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       ;;
     hpux9* | hpux10* | hpux11*)
       wl='-Wl,'
@@ -68,40 +65,83 @@
     irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
-    newsos6)
-      ;;
-    linux*)
-      case $CC in
-        icc|ecc)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
           wl='-Wl,'
           ;;
-        ccc)
+        xl* | bgxl* | bgf* | mpixl*)
           wl='-Wl,'
           ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
       esac
       ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
-    sco3.2v5*)
+    rdos*)
       ;;
     solaris*)
-      wl='-Wl,'
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
       ;;
     sunos4*)
       wl='-Qoption ld '
       ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       wl='-Wl,'
       ;;
     sysv4*MP*)
       ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
     uts4*)
       ;;
   esac
 fi
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@@ -109,7 +149,7 @@
 hardcode_minus_L=no
 
 case "$host_os" in
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
@@ -117,6 +157,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -124,23 +168,28 @@
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix3-9*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
         ld_shlibs=no
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
-      # them.
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
     beos*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -149,7 +198,7 @@
         ld_shlibs=no
       fi
       ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
@@ -159,9 +208,22 @@
         ld_shlibs=no
       fi
       ;;
+    haiku*)
+      ;;
+    interix3-9*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     netbsd*)
       ;;
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -170,6 +232,20 @@
         ld_shlibs=no
       fi
       ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
       ;;
@@ -181,10 +257,8 @@
       fi
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
   case "$host_os" in
@@ -198,7 +272,7 @@
         hardcode_direct=unsupported
       fi
       ;;
-    aix4* | aix5*)
+    aix4-9*)
       if test "$host_cpu" = ia64; then
         # On IA64, the linker does run time linking by default, so we don't
         # have to do anything special.
@@ -208,13 +282,14 @@
         # Test if we are trying to use run time linking or normal
         # AIX style linking. If -brtl is somewhere in LDFLAGS, we
         # need to do runtime linking.
-        case $host_os in aix4.23|aix4.23.*|aix5*)
+        case $host_os in aix4.23|aix4.23.*|aix5-9*)
           for ld_flag in $LDFLAGS; do
             if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
               aix_use_runtimelinking=yes
               break
             fi
           done
+          ;;
         esac
       fi
       hardcode_direct=yes
@@ -226,7 +301,7 @@
             strings "$collect2name" | grep resolve_lib_name >/dev/null
           then
             # We have reworked collect2
-            hardcode_direct=yes
+            :
           else
             # We have old collect2
             hardcode_direct=unsupported
@@ -234,6 +309,7 @@
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
       # Begin _LT_AC_SYS_LIBPATH_AIX.
@@ -261,14 +337,18 @@
       fi
       ;;
     amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
       ;;
-    bsdi4*)
+    bsdi45*)
       ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -277,16 +357,16 @@
       libext=lib
       ;;
     darwin* | rhapsody*)
-      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-        hardcode_direct=no
+      hardcode_direct=no
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
       fi
       ;;
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
     freebsd2.2*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -295,7 +375,7 @@
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -307,24 +387,25 @@
       # but as the default location of the library.
       hardcode_minus_L=yes
       ;;
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$with_gnu_ld" = no; then
-        case "$host_cpu" in
-          hppa*64*)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
-            hardcode_direct=no
-            ;;
-          ia64*)
-            hardcode_libdir_flag_spec='-L$libdir'
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
             hardcode_direct=no
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
             ;;
           *)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
             hardcode_direct=yes
             # hardcode_minus_L: Not really in the search PATH,
             # but as the default location of the library.
@@ -346,19 +427,25 @@
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
+    *nto* | *qnx*)
+      ;;
     openbsd*)
-      hardcode_direct=yes
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
       else
-        case "$host_os" in
-          openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-        esac
+        ld_shlibs=no
       fi
       ;;
     os2*)
@@ -378,8 +465,6 @@
       fi
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
       ;;
@@ -408,14 +493,11 @@
         ld_shlibs=yes
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw78* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
       ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
       ;;
     uts4*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -427,35 +509,61 @@
 fi
 
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
 libname_spec='lib$name'
 case "$host_os" in
   aix3*)
+    library_names_spec='$libname.a'
     ;;
-  aix4* | aix5*)
+  aix4-9*)
+    library_names_spec='$libname$shrext'
     ;;
   amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
     ;;
   beos*)
+    library_names_spec='$libname$shrext'
     ;;
-  bsdi4*)
+  bsdi45*)
+    library_names_spec='$libname$shrext'
     ;;
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
     ;;
   darwin* | rhapsody*)
     shrext=.dylib
+    library_names_spec='$libname$shrext'
     ;;
   dgux*)
+    library_names_spec='$libname$shrext'
     ;;
-  freebsd1*)
-    ;;
-  freebsd*)
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd123*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
     ;;
   gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
     ;;
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
+    case $host_cpu in
       ia64*)
         shrext=.so
         ;;
@@ -466,8 +574,13 @@
         shrext=.sl
         ;;
     esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix3-9*)
+    library_names_spec='$libname$shrext'
     ;;
   irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
     case "$host_os" in
       irix5* | nonstopux*)
         libsuff= shlibsuff=
@@ -484,42 +597,65 @@
     ;;
   linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux*)
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
     ;;
   netbsd*)
+    library_names_spec='$libname$shrext'
     ;;
   newsos6)
+    library_names_spec='$libname$shrext'
     ;;
-  nto-qnx)
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
     ;;
   openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
     ;;
   os2*)
     libname_spec='$name'
     shrext=.dll
+    library_names_spec='$libname.a'
     ;;
   osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
     ;;
-  sco3.2v5*)
+  rdos*)
     ;;
   solaris*)
+    library_names_spec='$libname$shrext'
     ;;
   sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
     ;;
   sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
     ;;
   uts4*)
+    library_names_spec='$libname$shrext'
     ;;
 esac
 
 sed_quote_subst='s/$"`$\\$/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^$a-zA-Z0-9_*$=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^$a-zA-Z0-9_*$=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
@@ -530,6 +666,12 @@
 # Shared library suffix (normally "so").
 shlibext="$shlibext"
 
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/config.sub -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/config.sub Changed

@@ -1,8 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2021 Free Software Foundation, Inc.
 
-timestamp='2014-12-03'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-08-14'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +35,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,15 +52,21 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 OPTION CPU-MFR-OPSYS
-       $0 OPTION ALIAS
+Usage: $0 OPTION CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -68,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2021 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -90,12 +98,12 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -111,1228 +119,1181 @@
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-^-*$//'`
-    if  $basic_machine != $1 
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun234* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c123* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint0-9*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh45000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
-	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | armble | armelb | armv2-8 | armv3-8lb | armv7arm \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh34eb | sheb | shbe | shle | sh1234le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon3-9)
-		basic_machine=sparc-$basic_machine
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	m88110 | m680123460 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	ms1)
-		basic_machine=mt-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
-	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
-	| alphapca567-* | alpha64pca567-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c123* | c30-* | cjt90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
-	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
+		cpu=m68k
+		vendor=motorola
 		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	hp3k90-90-9 | hp90-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k20-90-9 | hp9k310-9)
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k32-90-9)
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k60-90-9 | hp60-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k70-790-9 | hp70-790-9)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k780-9 | hp780-9)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8671 | hp8671 | hp9k8024 | hp8024 | hp9k8789 | hp8789 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-913679 | hp80-913679)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-90-9 | hp80-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
 		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		    irix*)
 			;;
 		    *)
-			os=-irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon3-9-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint0-9* | *MiNT | *MiNT0-9*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
+		cpu=m68000
+		vendor=convergent
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint0-9* | *MiNT | *MiNT0-9*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
-		    -ns2*)
-		      os=-nextstep2
+		    ns2*)
+		      basic_os=nextstep2
 			;;
 		    *)
-		      os=-nextstep3
+		      basic_os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh45000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
+		cpu=m68k
+		vendor=tti
 		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^^-*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+		cpu=pn
+		vendor=gould
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^^-*-//'`
+	power)
+		cpu=power
+		vendor=ibm
 		;;
 	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+		cpu=i386
+		vendor=ibm
 		;;
 	rm4600)
-		basic_machine=mips-siemens
+		cpu=mips
+		vendor=siemens
 		;;
 	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
+		cpu=romp
+		vendor=ibm
 		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	none)
+		cpu=none
+		vendor=none
 		;;
-	sh64)
-		basic_machine=sh64-unknown
+	leon|leon3-9)
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+	leon-*|leon3-9-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
 		;;
-	spur)
-		basic_machine=spur-unknown
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^^-*-//'`
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	sun2)
-		basic_machine=m68000-sun
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	fx80-unknown)
+		vendor=alliant
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	romp-unknown)
+		vendor=ibm
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	mmix-unknown)
+		vendor=knuth
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	vax-unknown)
+		vendor=dec
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	pdp11-unknown)
+		vendor=dec
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	we32k-unknown)
+		vendor=att
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	i370-ibm*)
+		vendor=ibm
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	orion-unknown)
+		vendor=highlevel
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	c54x-*)
+		cpu=tic54x
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	c55x-*)
+		cpu=tic55x
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	c6x-*)
+		cpu=tic6x
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	e500v12-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	mips3*-*)
+		cpu=mips64
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	ms1-*)
+		cpu=mt
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	openrisc-*)
+		cpu=or32
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	pentium4-*)
+		cpu=i786
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	pc98-*)
+		cpu=i386
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	xscale-* | xscaleebl-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	sh5elb-*)
+		cpu=`echo "$cpu" | sed 's/^$sh.$e$.$$/\1\2e/'`
 		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	spur-*)
+		cpu=spur
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	tx39-*)
+		cpu=mipstx39
 		;;
-	romp)
-		basic_machine=romp-ibm
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	x64-*)
+		cpu=x86_64
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	xscale-* | xscaleebl-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	vax)
-		basic_machine=vax-dec
+	arm64-*)
+		cpu=aarch64
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	we32k)
-		basic_machine=we32k-att
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	sh1234 | sh24a | sh24aeb | sh34eb | sh1234le | sh23ele)
-		basic_machine=sh-unknown
+	crx-*)
+		basic_os=${basic_os:-elf}
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev4-8 | alphaev56 | alphaev678 \
+			| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 \
+			| alphapca567 | alpha64pca567 \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | armlbe | armelb | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c123* | c30 | cjt90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f3001 | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m6800123460 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh1234 | sh24a | sh24aelb | sh23e | shelb | shlbe \
+			| sh1234elb |  sh12345lbe | sh23ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1340,200 +1301,215 @@
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if  x"$os" != x"" 
+if test x$basic_os != x
 then
+
+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+		;;
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+	# First match some system type aliases that might get confused
+	# with valid system types.
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+	bluegene*)
+		os=cnk
 		;;
-	-solaris)
-		os=-solaris2
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
 		;;
-	-svr4*)
-		os=-sysv4
+	solaris)
+		os=solaris2
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	unixware*)
+		os=sysv4.2uw
 		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
 		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos34*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
 		;;
-	-nto-qnx*)
+	isc)
+		os=isc2.2
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	sco6)
+		os=sco5v6
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	sco5)
+		os=sco3.2v5
 		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+	sco4)
+		os=sco3.2v4
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	sco3.2.4-9*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	sco*v* | scout)
+		# Don't match below
 		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+	sco*)
+		os=sco3.2v2
 		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+	psos*)
+		os=psos
 		;;
-	-opened*)
-		os=-openedition
+	qnx*)
+		os=qnx
 		;;
-	-os400*)
-		os=-os400
+	hiux*)
+		os=hiuxwe2
 		;;
-	-wince*)
-		os=-wince
+	lynx*178)
+		os=lynxos178
 		;;
-	-osfrose*)
-		os=-osfrose
+	lynx*5)
+		os=lynxos5
 		;;
-	-osf*)
-		os=-osf
+	lynxos*)
+		# don't get caught up in next wildcard
 		;;
-	-utek*)
-		os=-bsd
+	lynx*)
+		os=lynxos
 		;;
-	-dynix*)
-		os=-bsd
+	mac0-9*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-acis*)
-		os=-aos
+	opened*)
+		os=openedition
 		;;
-	-atheos*)
-		os=-atheos
+	os400*)
+		os=os400
 		;;
-	-syllable*)
-		os=-syllable
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-386bsd)
-		os=-bsd
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	wince*)
+		os=wince
 		;;
-	-nova*)
-		os=-rtmk-nova
+	utek*)
+		os=bsd
 		;;
-	-ns2 )
-		os=-nextstep2
+	dynix*)
+		os=bsd
 		;;
-	-nsk*)
-		os=-nsk
+	acis*)
+		os=aos
 		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
+	atheos*)
+		os=atheos
 		;;
-	-sinix*)
-		os=-sysv4
+	syllable*)
+		os=syllable
 		;;
-	-tpf*)
-		os=-tpf
+	386bsd)
+		os=bsd
 		;;
-	-triton*)
-		os=-sysv3
+	ctix* | uts*)
+		os=sysv
 		;;
-	-oss*)
-		os=-sysv3
+	nova*)
+		os=rtmk-nova
 		;;
-	-svr4)
-		os=-sysv4
+	ns2)
+		os=nextstep2
 		;;
-	-svr3)
-		os=-sysv3
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
 		;;
-	-sysvr4)
-		os=-sysv4
+	sinix*)
+		os=sysv4
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	tpf*)
+		os=tpf
 		;;
-	-ose*)
-		os=-ose
+	triton*)
+		os=sysv3
 		;;
-	-es1800*)
-		os=-ose
+	oss*)
+		os=sysv3
 		;;
-	-xenix)
-		os=-xenix
+	svr4*)
+		os=sysv4
 		;;
-	-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
-		os=-mint
+	svr3)
+		os=sysv3
 		;;
-	-aros*)
-		os=-aros
+	sysvr4)
+		os=sysv4
 		;;
-	-zvmoe)
-		os=-zvmoe
+	ose*)
+		os=ose
 		;;
-	-dicos*)
-		os=-dicos
+	*mint | mint0-9* | *MiNT | MiNT0-9*)
+		os=mint
 		;;
-	-nacl*)
+	dicos*)
+		os=dicos
 		;;
-	-none)
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/^-*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1546,261 +1522,362 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
-	*-be)
-		os=-beos
+	pru-*)
+		os=elf
 		;;
-	*-haiku)
-		os=-haiku
+	*-be)
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
-	*-next )
-		os=-nextstep
+	*-next)
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f3001-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos34* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v4-9* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			*-beos*)
 				vendor=be
 				;;
-			-hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			-genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
 				vendor=ibm
 				;;
-			-os400*)
+			s390-* | s390x-*)
 				vendor=ibm
 				;;
-			-ptx*)
+			*-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			-hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
+			*-*mint | *-mint0-9* | *-*MiNT | *-MiNT0-9*)
 				vendor=atari
 				;;
-			-vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo $basic_machine$os
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/depcomp -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/depcomp Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
@@ -16,7 +16,7 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/install-sh -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2020-11-14.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@
 # Desired mode of installed file.
 mode=0755
 
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -99,18 +104,28 @@
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
+  -C            install only if different (preserve data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -137,8 +152,13 @@
     -o) chowncmd="$chownprog $2"
         shift;;
 
+    -p) cpprog="$cpprog -p";;
+
     -s) stripcmd=$stripprog;;
 
+    -S) backupsuffix="$2"
+        shift;;
+
     -t)
         is_target_a_directory=always
         dst_arg=$2
@@ -255,6 +275,10 @@
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -271,15 +295,18 @@
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -288,27 +315,16 @@
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *23672367) mkdir_umask=$umask;;
-          .*00202 | .0202 | .02) mkdir_umask=22;;
-
-          *0-7)
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
         # With -d, create the new directory with the user-specified mode.
         # Otherwise, rely on $mkdir_umask.
         if test -n "$dir_arg"; then
@@ -318,43 +334,49 @@
         fi
 
         posix_mkdir=false
-        case $umask in
-          *1235670-70-7)
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/d" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
     esac
 
     if
@@ -365,7 +387,7 @@
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
@@ -394,7 +416,7 @@
           prefixes=
         else
           if $posix_mkdir; then
-            (umask=$mkdir_umask &&
+            (umask $mkdir_umask &&
              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
             # Don't fail if two instances are running concurrently.
             test -d "$prefix" || exit 1
@@ -427,14 +449,25 @@
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -460,6 +493,13 @@
     then
       rm -f "$dsttmp"
     else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -474,9 +514,9 @@
         # file should still install successfully.
         {
           test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
           } ||
           { echo "$0: cannot unlink or rename $dst" >&2
             (exit 1); exit 1
@@ -493,9 +533,9 @@
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/ltmain.sh -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/ltmain.sh Changed

@@ -1,12 +1,12 @@
-#! /bin/sh
+#! /usr/bin/env sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2014-01-03.01
+##               by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.4.6
+# libtool (GNU libtool) 2.4.7
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.6
-package_revision=2.4.6
+VERSION=2.4.7
+package_revision=2.4.7
 
 
 ## ------ ##
@@ -64,34 +64,25 @@
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2019-02-19.15; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# 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 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>.
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
 
-# Please report bugs or propose patches to gary@gnu.org.
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
 
 
 ## ------ ##
@@ -139,9 +130,12 @@
 	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those
+# in case the environment reset is needed later and the $save_* variant is not
+# defined (see the code above).
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 # Make sure IFS has a sensible default
 sp=' '
@@ -159,6 +153,26 @@
 fi
 
 
+# func_unset VAR
+# --------------
+# Portably unset VAR.
+# In some shells, an 'unset VAR' statement leaves a non-zero return
+# status if VAR is already unset, which might be problematic if the
+# statement is used at the end of a function (thus poisoning its return
+# value) or when 'set -e' is active (causing even a spurious abort of
+# the script in this case).
+func_unset ()
+{
+    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
+}
+
+
+# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
+func_unset CDPATH
+
+# Make sure ${,E,F}GREP behave sanely.
+func_unset GREP_OPTIONS
+
 
 ## ------------------------- ##
 ## Locate command utilities. ##
@@ -259,7 +273,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
   rm -f conftest.sed
   SED=$func_path_progs_result
 }
@@ -295,7 +309,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
   GREP=$func_path_progs_result
 }
 
@@ -360,6 +374,35 @@
   s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
   s/\n//g"
 
+# require_check_ifs_backslash
+# ---------------------------
+# Check if we can use backslash as IFS='\' separator, and set
+# $check_ifs_backshlash_broken to ':' or 'false'.
+require_check_ifs_backslash=func_require_check_ifs_backslash
+func_require_check_ifs_backslash ()
+{
+  _G_save_IFS=$IFS
+  IFS='\'
+  _G_check_ifs_backshlash='a\\b'
+  for _G_i in $_G_check_ifs_backshlash
+  do
+  case $_G_i in
+  a)
+    check_ifs_backshlash_broken=false
+    ;;
+  '')
+    break
+    ;;
+  *)
+    check_ifs_backshlash_broken=:
+    break
+    ;;
+  esac
+  done
+  IFS=$_G_save_IFS
+  require_check_ifs_backslash=:
+}
+
 
 ## ----------------- ##
 ## Global variables. ##
@@ -580,16 +623,16 @@
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
   }'
 else
   func_append_quoted ()
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
   }
 fi
 
@@ -1091,85 +1134,203 @@
 }
 
 
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-#   i) func_quote_for_eval_result
-#      double-quoted, suitable for a subsequent eval
-#  ii) func_quote_for_eval_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.
-func_quote_for_eval ()
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg.  Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
 {
     $debug_cmd
 
-    func_quote_for_eval_unquoted_result=
-    func_quote_for_eval_result=
-    while test 0 -lt $#; do
-      case $1 in
-        *\\\`\"\$*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
-      if test -n "$func_quote_for_eval_unquoted_result"; then
-	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-      else
-        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+    $require_check_ifs_backslash
+
+    func_quote_portable_result=$2
+
+    # one-time-loop (easy break)
+    while true
+    do
+      if $1; then
+        func_quote_portable_result=`$ECHO "$2" | $SED \
+          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+        break
       fi
 
-      case $_G_unquoted_arg in
-        # Double-quote args containing shell metacharacters to delay
-        # word splitting, command substitution and variable expansion
-        # for a subsequent eval.
-        # Many Bourne shells cannot handle close brackets correctly
-        # in scan sets, so we specify it separately.
-        *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-          _G_quoted_arg=\"$_G_unquoted_arg\"
+      # Quote for eval.
+      case $func_quote_portable_result in
+        *\\\`\"\$*)
+          # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
+          # contains the shell wildcard characters.
+          case $check_ifs_backshlash_broken$func_quote_portable_result in
+            :*|*\\*\?*)
+              func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
+                  | $SED "$sed_quote_subst"`
+              break
+              ;;
+          esac
+
+          func_quote_portable_old_IFS=$IFS
+          for _G_char in '\' '`' '"' '$'
+          do
+            # STATE($1) PREV($2) SEPARATOR($3)
+            set start "" ""
+            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+            IFS=$_G_char
+            for _G_part in $func_quote_portable_result
+            do
+              case $1 in
+              quote)
+                func_append func_quote_portable_result "$3$2"
+                set quote "$_G_part" "\\$_G_char"
+                ;;
+              start)
+                set first "" ""
+                func_quote_portable_result=
+                ;;
+              first)
+                set quote "$_G_part" ""
+                ;;
+              esac
+            done
+          done
+          IFS=$func_quote_portable_old_IFS
           ;;
-        *)
-          _G_quoted_arg=$_G_unquoted_arg
-	  ;;
+        *) ;;
       esac
-
-      if test -n "$func_quote_for_eval_result"; then
-	func_append func_quote_for_eval_result " $_G_quoted_arg"
-      else
-        func_append func_quote_for_eval_result "$_G_quoted_arg"
-      fi
-      shift
+      break
     done
+
+    func_quote_portable_unquoted_result=$func_quote_portable_result
+    case $func_quote_portable_result in
+      # double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
+      # many bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+        func_quote_portable_result=\"$func_quote_portable_result\"
+        ;;
+    esac
 }
 
 
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    $debug_cmd
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed.  Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+  printf -v _GL_test_printf_tilde %q '~'
+  if test '\~' = "$_GL_test_printf_tilde"; then
+    func_quotefast_eval ()
+    {
+      printf -v func_quotefast_eval_result %q "$1"
+    }
+  else
+    # Broken older Bash implementations.  Make those faster too if possible.
+    func_quotefast_eval ()
+    {
+      case $1 in
+        '~'*)
+          func_quote_portable false "$1"
+          func_quotefast_eval_result=$func_quote_portable_result
+          ;;
+        *)
+          printf -v func_quotefast_eval_result %q "$1"
+          ;;
+      esac
+    }
+  fi
+else
+  func_quotefast_eval ()
+  {
+    func_quote_portable false "$1"
+    func_quotefast_eval_result=$func_quote_portable_result
+  }
+fi
 
-    case $1 in
-      *\\\`\"*)
-	_G_arg=`$ECHO "$1" | $SED \
-	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        _G_arg=$1 ;;
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later.  MODEs argument may contain zero or more
+# specifiers listed below separated by ',' character.  This function returns two
+# values:
+#   i) func_quote_arg_result
+#      double-quoted (when needed), suitable for a subsequent eval
+#  ii) func_quote_arg_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.  Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+#       - escape shell special characters
+# 'expand'
+#       - the same as 'eval';  but do not quote variable references
+# 'pretty'
+#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
+#         be used later in func_quote to get output like: 'echo "a b"' instead
+#         of 'echo a\ b'.  This is slower than default on some shells.
+# 'unquoted'
+#       - produce also $func_quote_arg_unquoted_result which does not contain
+#         wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+#   string      | *_result              | *_unquoted_result
+#   ------------+-----------------------+-------------------
+#   "           | \"                    | \"
+#   a b         | "a b"                 | a b
+#   "a b"       | "\"a b\""             | \"a b\"
+#   *           | "*"                   | *
+#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+#   string        |   *_result          |  *_unquoted_result
+#   --------------+---------------------+--------------------
+#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
+func_quote_arg ()
+{
+    _G_quote_expand=false
+    case ,$1, in
+      *,expand,*)
+        _G_quote_expand=:
+        ;;
     esac
 
-    case $_G_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
-        _G_arg=\"$_G_arg\"
+    case ,$1, in
+      *,pretty,*|*,expand,*|*,unquoted,*)
+        func_quote_portable $_G_quote_expand "$2"
+        func_quote_arg_result=$func_quote_portable_result
+        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+        ;;
+      *)
+        # Faster quote-for-eval for some shells.
+        func_quotefast_eval "$2"
+        func_quote_arg_result=$func_quotefast_eval_result
         ;;
     esac
+}
 
-    func_quote_for_expand_result=$_G_arg
+
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command.  See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+    $debug_cmd
+    _G_func_quote_mode=$1 ; shift
+    func_quote_result=
+    while test 0 -lt $#; do
+      func_quote_arg "$_G_func_quote_mode" "$1"
+      if test -n "$func_quote_result"; then
+        func_append func_quote_result " $func_quote_arg_result"
+      else
+        func_append func_quote_result "$func_quote_arg_result"
+      fi
+      shift
+    done
 }
 
 
@@ -1215,8 +1376,8 @@
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
-    func_quote_for_expand "$_G_cmd"
-    eval "func_notquiet $func_quote_for_expand_result"
+    func_quote_arg pretty,expand "$_G_cmd"
+    eval "func_notquiet $func_quote_arg_result"
 
     $opt_dry_run || {
       eval "$_G_cmd"
@@ -1241,8 +1402,8 @@
     _G_fail_exp=${2-':'}
 
     $opt_quiet || {
-      func_quote_for_expand "$_G_cmd"
-      eval "func_echo $func_quote_for_expand_result"
+      func_quote_arg expand,pretty "$_G_cmd"
+      eval "func_echo $func_quote_arg_result"
     }
 
     $opt_dry_run || {
@@ -1369,30 +1530,26 @@
 # End:
 #! /bin/sh
 
-# Set a version string for this script.
-scriptversion=2014-01-07.03; # UTC
-
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# 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 3 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.
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2010-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
 
-# Please report bugs or propose patches to gary@gnu.org.
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
 
 
 ## ------ ##
@@ -1415,7 +1572,7 @@
 #
 # In order for the '--version' option to work, you will need to have a
 # suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# warranty; '.
+# starting with '# Written by ' and ending with '# Copyright'.
 #
 # For '-h' and '--help' to work, you will also need a one line
 # description of your script's purpose in a comment directly above the
@@ -1427,7 +1584,7 @@
 # to display verbose messages only when your user has specified
 # '--verbose'.
 #
-# After sourcing this file, you can plug processing for additional
+# After sourcing this file, you can plug in processing for additional
 # options by amending the variables from the 'Configuration' section
 # below, and following the instructions in the 'Option parsing'
 # section further down.
@@ -1476,8 +1633,8 @@
 ## ------------------------- ##
 
 # This section contains functions for adding, removing, and running hooks
-# to the main code.  A hook is just a named list of of function, that can
-# be run in order later on.
+# in the main code.  A hook is just a list of function names that can be
+# run in order later on.
 
 # func_hookable FUNC_NAME
 # -----------------------
@@ -1510,7 +1667,8 @@
 
 # func_remove_hook FUNC_NAME HOOK_FUNC
 # ------------------------------------
-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+# Remove HOOK_FUNC from the list of hook functions to be called by
+# FUNC_NAME.
 func_remove_hook ()
 {
     $debug_cmd
@@ -1519,10 +1677,28 @@
 }
 
 
+# func_propagate_result FUNC_NAME_A FUNC_NAME_B
+# ---------------------------------------------
+# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
+# *_result variable of FUNC_NAME_B.
+func_propagate_result ()
+{
+    $debug_cmd
+
+    func_propagate_result_result=:
+    if eval "test \"\${${1}_result+set}\" = set"
+    then
+      eval "${2}_result=\$${1}_result"
+    else
+      func_propagate_result_result=false
+    fi
+}
+
+
 # func_run_hooks FUNC_NAME ARG...
 # ---------------------------------
 # Run all hook functions registered to FUNC_NAME.
-# It is assumed that the list of hook functions contains nothing more
+# It's assumed that the list of hook functions contains nothing more
 # than a whitespace-delimited list of legal shell function names, and
 # no effort is wasted trying to catch shell meta-characters or preserve
 # whitespace.
@@ -1532,22 +1708,19 @@
 
     case " $hookable_fns " in
       *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+      *) func_fatal_error "'$1' does not support hook functions." ;;
     esac
 
     eval _G_hook_fns=\$$1_hooks; shift
 
     for _G_hook in $_G_hook_fns; do
-      eval $_G_hook '"$@"'
-
-      # store returned options list back into positional
-      # parameters for next 'cmd' execution.
-      eval _G_hook_result=\$${_G_hook}_result
-      eval set dummy "$_G_hook_result"; shift
+      func_unset "${_G_hook}_result"
+      eval $_G_hook '${1+"$@"}'
+      func_propagate_result $_G_hook func_run_hooks
+      if $func_propagate_result_result; then
+        eval set dummy "$func_run_hooks_result"; shift
+      fi
     done
-
-    func_quote_for_eval ${1+"$@"}
-    func_run_hooks_result=$func_quote_for_eval_result
 }
 
 
@@ -1557,10 +1730,18 @@
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, remove any
-# options that you action, and then pass back the remaining unprocessed
-# options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  Like this:
+# full positional parameter list from your hook function.  You may remove
+# or edit any options that you action, and then pass back the remaining
+# unprocessed options in '<hooked_function_name>_result', escaped
+# suitably for 'eval'.
+#
+# The '<hooked_function_name>_result' variable is automatically unset
+# before your hook gets called; for best performance, only set the
+# *_result variable when necessary (i.e. don't call the 'func_quote'
+# function unnecessarily because it can be an expensive operation on some
+# machines).
+#
+# Like this:
 #
 #    my_options_prep ()
 #    {
@@ -1570,9 +1751,8 @@
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
-#
-#        func_quote_for_eval ${1+"$@"}
-#        my_options_prep_result=$func_quote_for_eval_result
+#        # No change in '$@' (ignored completely by this hook).  Leave
+#        # my_options_prep_result variable intact.
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@@ -1581,25 +1761,36 @@
 #    {
 #        $debug_cmd
 #
-#        # Note that for efficiency, we parse as many options as we can
+#        args_changed=false
+#
+#        # Note that, for efficiency, we parse as many options as we can
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
 #          opt=$1; shift
 #          case $opt in
-#            --silent|-s) opt_silent=: ;;
+#            --silent|-s) opt_silent=:
+#                         args_changed=:
+#                         ;;
 #            # Separate non-argument short options:
 #            -s*)         func_split_short_opt "$_G_opt"
 #                         set dummy "$func_split_short_opt_name" \
 #                             "-$func_split_short_opt_arg" ${1+"$@"}
 #                         shift
+#                         args_changed=:
 #                         ;;
-#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#            *)           # Make sure the first unrecognised option "$_G_opt"
+#                         # is added back to "$@" in case we need it later,
+#                         # if $args_changed was set to 'true'.
+#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
 #          esac
 #        done
 #
-#        func_quote_for_eval ${1+"$@"}
-#        my_silent_option_result=$func_quote_for_eval_result
+#        # Only call 'func_quote' here if we processed at least one argument.
+#        if $args_changed; then
+#          func_quote eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_result
+#        fi
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@@ -1610,17 +1801,26 @@
 #
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
-#
-#        func_quote_for_eval ${1+"$@"}
-#        my_option_validation_result=$func_quote_for_eval_result
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
-# You'll alse need to manually amend $usage_message to reflect the extra
+# You'll also need to manually amend $usage_message to reflect the extra
 # options you parse.  It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 
 
+# func_options_finish ARG...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+    $debug_cmd
+
+    func_run_hooks func_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_finish
+}
+
+
 # func_options ARG...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@@ -1630,17 +1830,27 @@
 {
     $debug_cmd
 
-    func_options_prep ${1+"$@"}
-    eval func_parse_options \
-        ${func_options_prep_result+"$func_options_prep_result"}
-    eval func_validate_options \
-        ${func_parse_options_result+"$func_parse_options_result"}
+    _G_options_quoted=false
 
-    eval func_run_hooks func_options \
-        ${func_validate_options_result+"$func_validate_options_result"}
+    for my_func in options_prep parse_options validate_options options_finish
+    do
+      func_unset func_${my_func}_result
+      func_unset func_run_hooks_result
+      eval func_$my_func '${1+"$@"}'
+      func_propagate_result func_$my_func func_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_options_result"; shift
+        _G_options_quoted=:
+      fi
+    done
 
-    # save modified positional parameters for caller
-    func_options_result=$func_run_hooks_result
+    $_G_options_quoted || {
+      # As we (func_options) are top-level options-parser function and
+      # nobody quoted "$@" for us yet, we need to do it explicitly for
+      # caller.
+      func_quote eval ${1+"$@"}
+      func_options_result=$func_quote_result
+    }
 }
 
 
@@ -1649,9 +1859,8 @@
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
-# needs to propogate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before
-# returning.
+# needs to propagate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before returning.
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1662,9 +1871,7 @@
     opt_warning_types=
 
     func_run_hooks func_options_prep ${1+"$@"}
-
-    # save modified positional parameters for caller
-    func_options_prep_result=$func_run_hooks_result
+    func_propagate_result func_run_hooks func_options_prep
 }
 
 
@@ -1676,25 +1883,32 @@
 {
     $debug_cmd
 
-    func_parse_options_result=
-
+    _G_parse_options_requote=false
     # this just eases exit handling
     while test $# -gt 0; do
       # Defer to hook functions for initial option parsing, so they
       # get priority in the event of reusing an option name.
       func_run_hooks func_parse_options ${1+"$@"}
-
-      # Adjust func_parse_options positional parameters to match
-      eval set dummy "$func_run_hooks_result"; shift
+      func_propagate_result func_run_hooks func_parse_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_parse_options_result"; shift
+        # Even though we may have changed "$@", we passed the "$@" array
+        # down into the hook and it quoted it for us (because we are in
+        # this if-branch).  No need to quote it again.
+        _G_parse_options_requote=false
+      fi
 
       # Break out of the loop if we already parsed every option.
       test $# -gt 0 || break
 
+      # We expect that one of the options parsed in this function matches
+      # and thus we remove _G_opt from "$@" and need to re-quote.
+      _G_match_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
         --debug|-x)   debug_cmd='set -x'
-                      func_echo "enabling shell trace mode"
+                      func_echo "enabling shell trace mode" >&2
                       $debug_cmd
                       ;;
 
@@ -1704,7 +1918,10 @@
 		      ;;
 
         --warnings|--warning|-W)
-                      test $# = 0 && func_missing_arg $_G_opt && break
+                      if test $# = 0 && func_missing_arg $_G_opt; then
+                        _G_parse_options_requote=:
+                        break
+                      fi
                       case " $warning_categories $1" in
                         *" $1 "*)
                           # trailing space prevents matching last $1 above
@@ -1757,15 +1974,24 @@
                       shift
                       ;;
 
-        --)           break ;;
+        --)           _G_parse_options_requote=: ; break ;;
         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+                      _G_match_parse_options=false
+                      break
+                      ;;
       esac
+
+      if $_G_match_parse_options; then
+        _G_parse_options_requote=:
+      fi
     done
 
-    # save modified positional parameters for caller
-    func_quote_for_eval ${1+"$@"}
-    func_parse_options_result=$func_quote_for_eval_result
+    if $_G_parse_options_requote; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      func_parse_options_result=$func_quote_result
+    fi
 }
 
 
@@ -1782,12 +2008,10 @@
     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
     func_run_hooks func_validate_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_validate_options
 
     # Bail if the options were screwed!
     $exit_cmd $EXIT_FAILURE
-
-    # save modified positional parameters for caller
-    func_validate_options_result=$func_run_hooks_result
 }
 
 
@@ -1843,8 +2067,8 @@
 
 # func_split_equals STRING
 # ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
-# splitting STRING at the '=' sign.
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables
+# after splitting STRING at the '=' sign.
 test -z "$_G_HAVE_XSI_OPS" \
     && (eval 'x=a/b/c;
       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@@ -1859,8 +2083,9 @@
 
       func_split_equals_lhs=${1%%=*}
       func_split_equals_rhs=${1#*=}
-      test "x$func_split_equals_lhs" = "x$1" \
-        && func_split_equals_rhs=
+      if test "x$func_split_equals_lhs" = "x$1"; then
+        func_split_equals_rhs=
+      fi
   }'
 else
   # ...otherwise fall back to using expr, which is often a shell builtin.
@@ -1870,7 +2095,7 @@
 
       func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
       func_split_equals_rhs=
-      test "x$func_split_equals_lhs" = "x$1" \
+      test "x$func_split_equals_lhs=" = "x$1" \
         || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
   }
 fi #func_split_equals
@@ -1896,7 +2121,7 @@
   {
       $debug_cmd
 
-      func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
+      func_split_short_opt_name=`expr "x$1" : 'x$-.$'`
       func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
   }
 fi #func_split_short_opt
@@ -1938,31 +2163,44 @@
 # func_version
 # ------------
 # Echo version message to standard output and exit.
+# The version message is extracted from the calling file's header
+# comments, with leading '# ' stripped:
+#   1. First display the progname and version
+#   2. Followed by the header comment line matching  /^# Written by /
+#   3. Then a blank line followed by the first following line matching
+#      /^# Copyright /
+#   4. Immediately followed by any lines between the previous matches,
+#      except lines preceding the intervening completely blank line.
+# For example, see the header comments of this file.
 func_version ()
 {
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
     $SED -n '
-        /(C)/!b go
-        :more
-        /\./!{
-          N
-          s|\n# | |
-          b more
-        }
-        :go
-        /^# Written by /,/# warranty; / {
-          s|^# ||
-          s|^# *$||
-          s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
-          p
+        /^# Written by /!b
+        s|^# ||; p; n
+
+        :fwd2blnk
+        /./ {
+          n
+          b fwd2blnk
         }
-        /^# Written by / {
-          s|^# ||
-          p
+        p; n
+
+        :holdwrnt
+        s|^# ||
+        s|^# *$||
+        /^Copyright /!{
+          /./H
+          n
+          b holdwrnt
         }
-        /^warranty; /q' < "$progpath"
+
+        s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
+        G
+        s|$\n$\n*|\1|g
+        p; q' < "$progpath"
 
     exit $?
 }
@@ -1972,12 +2210,12 @@
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.6'
+scriptversion='(GNU libtool) 2.4.7'
 
 
 # func_echo ARG...
@@ -2068,7 +2306,7 @@
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6
+       version:        $progname (GNU libtool) 2.4.7
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
@@ -2124,7 +2362,7 @@
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func__fatal_error ${1+"$@"} \
+    func_fatal_error ${1+"$@"} \
       "See the $PACKAGE documentation for more information." \
       "Fatal configuration error."
 }
@@ -2270,6 +2508,8 @@
     nonopt=
     preserve_args=
 
+    _G_rc_lt_options_prep=:
+
     # Shorthand for --mode=foo, only valid as the first argument
     case $1 in
     clean|clea|cle|cl)
@@ -2293,11 +2533,16 @@
     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
       shift; set dummy --mode uninstall ${1+"$@"}; shift
       ;;
+    *)
+      _G_rc_lt_options_prep=false
+      ;;
     esac
 
-    # Pass back the list of options.
-    func_quote_for_eval ${1+"$@"}
-    libtool_options_prep_result=$func_quote_for_eval_result
+    if $_G_rc_lt_options_prep; then
+      # Pass back the list of options.
+      func_quote eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_result
+    fi
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2309,9 +2554,12 @@
 {
     $debug_cmd
 
+    _G_rc_lt_parse_options=false
+
     # Perform our own loop to consume as many options as possible in
     # each iteration.
     while test $# -gt 0; do
+      _G_match_lt_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
@@ -2386,15 +2634,20 @@
                         func_append preserve_args " $_G_opt"
                         ;;
 
-	# An option not handled by this hook function:
-        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+                        _G_match_lt_parse_options=false
+                        break
+                        ;;
       esac
+      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
     done
 
-
-    # save modified positional parameters for caller
-    func_quote_for_eval ${1+"$@"}
-    libtool_parse_options_result=$func_quote_for_eval_result
+    if $_G_rc_lt_parse_options; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_result
+    fi
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -2451,8 +2704,8 @@
     }
 
     # Pass back the unparsed argument list
-    func_quote_for_eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_for_eval_result
+    func_quote eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_result
 }
 func_add_hook func_validate_options libtool_validate_options
 
@@ -3418,8 +3671,8 @@
       esac
     done
 
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
+    func_quote_arg pretty "$libobj"
+    test "X$libobj" != "X$func_quote_arg_result" \
       && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
       && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
@@ -3492,8 +3745,8 @@
 
     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
+    func_quote_arg pretty "$srcfile"
+    qsrcfile=$func_quote_arg_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test yes = "$build_libtool_libs"; then
@@ -3648,7 +3901,8 @@
   -prefer-non-pic   try to build non-PIC objects only
   -shared           do not build a '.o' file suitable for static linking
   -static           only build a '.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
+  -Wc,FLAG
+  -Xcompiler FLAG   pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
@@ -3754,6 +4008,8 @@
   -weak LIBNAME     declare that the target provides the LIBNAME interface
   -Wc,FLAG
   -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wa,FLAG
+  -Xassembler FLAG  pass linker-specific FLAG directly to the assembler
   -Wl,FLAG
   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
@@ -4096,8 +4352,8 @@
        case $nonopt in *shtool*) :;; *) false;; esac
     then
       # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
+      func_quote_arg pretty "$nonopt"
+      install_prog="$func_quote_arg_result "
       arg=$1
       shift
     else
@@ -4107,8 +4363,8 @@
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
+    func_quote_arg pretty "$arg"
+    func_append install_prog "$func_quote_arg_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *\\\ /cp\ *) install_cp=: ;;
@@ -4165,12 +4421,12 @@
       esac
 
       # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
+      func_quote_arg pretty "$arg"
+      func_append install_prog " $func_quote_arg_result"
       if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
+	func_quote_arg pretty "$arg2"
       fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_arg_result"
     done
 
     test -z "$install_prog" && \
@@ -4181,8 +4437,8 @@
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
+	func_quote_arg pretty "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_arg_result"
       fi
     fi
 
@@ -4478,8 +4734,8 @@
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_quiet || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
+	          func_quote_arg expand,pretty "$relink_command"
+		  eval "func_echo $func_quote_arg_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
@@ -5258,7 +5514,8 @@
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
     file=\"\$0\""
 
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    func_quote_arg pretty "$ECHO"
+    qECHO=$func_quote_arg_result
     $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -5268,7 +5525,7 @@
 \$1
 _LTECHO_EOF'
 }
-    ECHO=\"$qECHO\"
+    ECHO=$qECHO
   fi
 
 # Very basic option parsing. These options are (a) specific to
@@ -6611,9 +6868,9 @@
     while test "$#" -gt 0; do
       arg=$1
       shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
+      func_quote_arg pretty,unquoted "$arg"
+      qarg=$func_quote_arg_unquoted_result
+      func_append libtool_args " $func_quote_arg_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
@@ -6849,6 +7106,13 @@
 	  prev=
 	  continue
 	  ;;
+	xassembler)
+	  func_append compiler_flags " -Xassembler $qarg"
+	  prev=
+	  func_append compile_command " -Xassembler $qarg"
+	  func_append finalize_command " -Xassembler $qarg"
+	  continue
+	  ;;
 	xcclinker)
 	  func_append linker_flags " $qarg"
 	  func_append compiler_flags " $qarg"
@@ -7019,7 +7283,7 @@
 	    # These systems don't actually have a C library (as such)
 	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test X-lc = "X$arg" && continue
 	    ;;
@@ -7039,7 +7303,7 @@
 	  esac
 	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -7069,8 +7333,20 @@
 	prev=xcompiler
 	continue
 	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+     -pthread)
+	case $host in
+	  *solaris2*) ;;
+	  *)
+	    case "$new_inherited_linker_flags " in
+	        *" $arg "*) ;;
+	        * ) func_append new_inherited_linker_flags " $arg" ;;
+	    esac
+	  ;;
+	esac
+	continue
+	;;
+      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
@@ -7211,9 +7487,9 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $func_quote_arg_result"
+	  func_append compiler_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7227,16 +7503,21 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $wl$func_quote_arg_result"
+	  func_append compiler_flags " $wl$func_quote_arg_result"
+	  func_append linker_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
 
+      -Xassembler)
+        prev=xassembler
+        continue
+        ;;
+
       -Xcompiler)
 	prev=xcompiler
 	continue
@@ -7254,8 +7535,8 @@
 
       # -msg_* for osf cc
       -msg_*)
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -7272,12 +7553,17 @@
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
+      # -fuse-ld=*           Linker select flags for GCC
+      # -Wa,*                Pass flags directly to the assembler
       -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
@@ -7298,15 +7584,15 @@
 	  continue
         else
 	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_for_eval "$arg"
-	  arg=$func_quote_for_eval_result
+	  func_quote_arg pretty "$arg"
+	  arg=$func_quote_arg_result
         fi
 	;;
 
       # Some other compiler flag.
       -* | +*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       *.$objext)
@@ -7426,8 +7712,8 @@
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
       esac # arg
 
@@ -8632,7 +8918,7 @@
       test CXX = "$tagname" && {
         case $host_os in
         linux*)
-          case `$CC -V 2>&1 | sed 5q` in
+          case `$CC -V 2>&1 | $SED 5q` in
           *Sun\ C*) # Sun C++ 5.9
             func_suncc_cstd_abi
 
@@ -8805,7 +9091,7 @@
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|freebsd-elf|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age=$number_minor
@@ -8896,7 +9182,7 @@
 	  versuffix=.$current.$revision
 	  ;;
 
-	freebsd-elf)
+	freebsd-elf | midnightbsd-elf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix=$major.$age.$revision
@@ -9122,7 +9408,7 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -9933,8 +10219,8 @@
 	    for cmd in $concat_cmds; do
 	      IFS=$save_ifs
 	      $opt_quiet || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
+		  func_quote_arg expand,pretty "$cmd"
+		  eval "func_echo $func_quote_arg_result"
 	      }
 	      $opt_dry_run || eval "$cmd" || {
 		lt_exit=$?
@@ -10027,8 +10313,8 @@
 	  eval cmd=\"$cmd\"
 	  IFS=$save_ifs
 	  $opt_quiet || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
+	    func_quote_arg expand,pretty "$cmd"
+	    eval "func_echo $func_quote_arg_result"
 	  }
 	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
@@ -10502,12 +10788,13 @@
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	    func_quote_arg pretty "$var_value"
+	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
 	  fi
 	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	func_quote eval cd "`pwd`"
+	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
+	relink_command=$func_quote_arg_unquoted_result
       fi
 
       # Only actually do things if not in dry run mode.
@@ -10747,13 +11034,15 @@
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  func_quote_arg pretty,unquoted "$var_value"
+	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      func_quote eval cd "`pwd`"
+      relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      func_quote_arg pretty,unquoted "$relink_command"
+      relink_command=$func_quote_arg_unquoted_result
       if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/missing -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/missing Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/mkinstalldirs -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/mkinstalldirs Changed

@@ -1,21 +1,36 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2020-07-26.22; # UTC
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
-Usage: mkinstalldirs -h --help -m mode dir ..."
+Usage: mkinstalldirs -h --help --version -m MODE DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
+      echo "$usage"
+      exit $?
       ;;
     -m)                         # -m PERM arg
       shift
@@ -23,6 +38,10 @@
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,30 +69,63 @@
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the 'mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because '.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "umask 22"
+      umask 22
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
 
+echo "umask 22"
+umask 22
+
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -84,22 +136,17 @@
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	errstatus=$lasterr
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
+
+  if test ! -z "$dirmode"; then
+    echo "chmod $dirmode $file"
+    chmod "$dirmode" "$file" || errstatus=$?
+  fi
 done
 
 exit $errstatus
@@ -107,5 +154,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
 # End:
-# mkinstalldirs ends here

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-aux/test-driver -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-aux/test-driver Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -16,7 +16,7 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -42,11 +42,13 @@
 {
   cat <<END
 Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              --expect-failure={yes|no} --color-tests={yes|no}
-              --enable-hard-errors={yes|no} --
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              --expect-failure {yes|no} --color-tests {yes|no}
+              --enable-hard-errors {yes|no} --
               TEST-SCRIPT TEST-SCRIPT-ARGUMENTS
+
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
 END
 }
 
@@ -56,21 +58,26 @@
 expect_failure=no
 color_tests=no
 enable_hard_errors=yes
-while test $# -gt 0; do
-  case $1 in
+while test $# -gt 1; do
+ arg=${1%=*}
+ val=${1#*=}
+ if  $arg = $val ; then
+   val=$2
+   shift
+ fi
+ case $arg in
   --help) print_usage; exit $?;;
   --version) echo "test-driver $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) enable_hard_errors=$2; shift;;
-  --) shift; break;;
+  --test-name) test_name=$val;;
+  --log-file) log_file=$val;;
+  --trs-file) trs_file=$val;;
+  --color-tests) color_tests=$val;;
+  --expect-failure) expect_failure=$val;;
+  --enable-hard-errors) enable_hard_errors=$val;;
+  --) break;;
   -*) usage_error "invalid option: '$1'";;
-   *) break;;
   esac
-  shift
+   $arg != $val  && shift
 done
 
 missing_opts=
@@ -103,8 +110,11 @@
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -126,7 +136,7 @@
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
@@ -140,9 +150,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/gettext.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/gettext.m4 Changed

@@ -1,10 +1,8 @@
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -17,7 +15,7 @@
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
 
 dnl Macro to add for using GNU gettext.
 
@@ -37,7 +35,7 @@
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
+dnl    the value '$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -62,11 +60,18 @@
   ifelse($1, , , ifelse($1, external, , ifelse($1, no-libtool, , ifelse($1, use-libtool, ,
     errprint(ERROR: invalid first argument to AM_GNU_GETTEXT
 )))))
+  ifelse(ifelse($1, , old)ifelse($1, no-libtool, old), old,
+    AC_DIAGNOSE(obsolete, Use of AM_GNU_GETTEXT without external argument is deprecated.))
   ifelse($2, , , ifelse($2, need-ngettext, , ifelse($2, need-formatstring-macros, ,
     errprint(ERROR: invalid second argument to AM_GNU_GETTEXT
 ))))
-  define(gt_included_intl, ifelse($1, external, no, yes))
-  define(gt_libtool_suffix_prefix, ifelse($1, use-libtool, l, ))
+  define(gt_included_intl,
+    ifelse($1, external,
+      ifdef(AM_GNU_GETTEXT_INTL_SUBDIR, yes, no),
+      yes))
+  define(gt_libtool_suffix_prefix, ifelse($1, use-libtool, l, ))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED($2)
 
   AC_REQUIRE(AM_PO_SUBDIRS)dnl
   ifelse(gt_included_intl, yes, 
@@ -80,7 +85,7 @@
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -92,8 +97,11 @@
     AC_REQUIRE(AM_ICONV_LINKFLAGS_BODY)
   )
 
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
   dnl Set USE_NLS.
-  AM_NLS
+  AC_REQUIRE(AM_NLS)
 
   ifelse(gt_included_intl, yes, 
     BUILD_INCLUDED_LIBINTL=no
@@ -103,16 +111,25 @@
   LTLIBINTL=
   POSUB=
 
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
     ifelse(gt_included_intl, yes, 
       AC_MSG_CHECKING(whether included gettext is requested)
-      AC_ARG_WITH(included-gettext,
+      AC_ARG_WITH(included-gettext,
           --with-included-gettext use the GNU gettext library included here,
         nls_cv_force_use_gnu_gettext=$withval,
         nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -121,28 +138,41 @@
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        dnl Add a version number to the cache macros.
-        define(gt_api_version, ifelse($2, need-formatstring-macros, 3, ifelse($2, need-ngettext, 2, 1)))
-        define(gt_cv_func_gnugettext_libc, gt_cv_func_gnugettextgt_api_version_libc)
-        define(gt_cv_func_gnugettext_libintl, gt_cv_func_gnugettextgt_api_version_libintl)
-
-        AC_CACHE_CHECK(for GNU gettext in libc, gt_cv_func_gnugettext_libc,
-         AC_TRY_LINK(#include <libintl.h>
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
 changequote(,)dnl
-, )extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;,
-            bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + _nl_msg_cat_cntr + *_nl_domain_bindings,
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no))
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK(for GNU gettext in libc, $gt_func_gnugettext_libc,
+         AC_LINK_IFELSE(
+            AC_LANG_PROGRAM(
+               
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+               ,
+               
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+               ),
+            eval "$gt_func_gnugettext_libc=yes",
+            eval "$gt_func_gnugettext_libc=no"))
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
           ifelse(gt_included_intl, yes, , 
             AM_ICONV_LINK
@@ -153,53 +183,53 @@
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY(intl)
           AC_CACHE_CHECK(for GNU gettext in libintl,
-            gt_cv_func_gnugettext_libintl,
+            $gt_func_gnugettext_libintl,
            gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK(#include <libintl.h>
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
-changequote(,)dnl
-, )extern int _nl_msg_cat_cntr;
+            AC_LINK_IFELSE(
+              AC_LANG_PROGRAM(
+                 
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();,
-              bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + _nl_msg_cat_cntr + *_nl_expand_alias (0),
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
+const char *_nl_expand_alias (const char *);
+                 ,
+                 
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                 ),
+              eval "$gt_func_gnugettext_libintl=yes",
+              eval "$gt_func_gnugettext_libintl=no")
             dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK(#include <libintl.h>
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
-changequote(,)dnl
-, )extern int _nl_msg_cat_cntr;
+              AC_LINK_IFELSE(
+                AC_LANG_PROGRAM(
+                   
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();,
-                bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + _nl_msg_cat_cntr + *_nl_expand_alias (0),
-               LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               )
+const char *_nl_expand_alias (const char *);
+                   ,
+                   
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                   ),
+                LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                )
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS")
@@ -209,8 +239,8 @@
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -233,11 +263,12 @@
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LIBICONV"
-        LTLIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LTLIBICONV"
+        LIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse($3,,\${top_builddir}/intl,$3)/libintl.gt_libtool_suffix_prefixa $LTLIBICONV $LTLIBTHREAD"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions to use GNU gettext tools.
@@ -245,9 +276,18 @@
       fi
     )
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
+      AC_DEFINE(ENABLE_NLS, 1,
         Define to 1 if translation of program messages to the user's native language
    is requested.)
     else
@@ -260,7 +300,7 @@
   if test "$USE_NLS" = "yes"; then
     AC_MSG_CHECKING(where the gettext function comes from)
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -274,16 +314,16 @@
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         AC_MSG_CHECKING(how to link with libintl)
         AC_MSG_RESULT($LIBINTL)
         AC_LIB_APPENDTOVAR(CPPFLAGS, $INCINTL)
       fi
 
       dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
+      AC_DEFINE(HAVE_GETTEXT, 1,
        Define if the GNU gettext() function is already present or preinstalled.)
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
+      AC_DEFINE(HAVE_DCGETTEXT, 1,
        Define if the GNU dcgettext() function is already present or preinstalled.)
     fi
 
@@ -299,9 +339,9 @@
     fi
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATOBJEXT)
 
     dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=
@@ -309,177 +349,51 @@
 
     dnl For backward compatibility. Some Makefiles may be using this.
     DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
+    AC_SUBST(DATADIRNAME)
 
     dnl For backward compatibility. Some Makefiles may be using this.
     INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INSTOBJEXT)
 
     dnl For backward compatibility. Some Makefiles may be using this.
     GENCAT=gencat
-    AC_SUBST(GENCAT)
+    AC_SUBST(GENCAT)
 
     dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
     if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
-    AC_SUBST(INTLOBJS)
+    AC_SUBST(INTLOBJS)
 
     dnl Enable libtool support if the surrounding package wishes it.
     INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
   )
 
   dnl For backward compatibility. Some Makefiles may be using this.
   INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
+  AC_SUBST(INTLLIBS)
 
   dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
+  AC_SUBST(LIBINTL)
+  AC_SUBST(LTLIBINTL)
+  AC_SUBST(POSUB)
 )
 
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN(AM_INTL_SUBDIR,
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define(gt_NEEDS_INIT,
 
-  AC_REQUIRE(AC_PROG_INSTALL)dnl
-  AC_REQUIRE(AM_MKINSTALLDIRS)dnl
-  AC_REQUIRE(AC_PROG_CC)dnl
-  AC_REQUIRE(AC_CANONICAL_HOST)dnl
-  AC_REQUIRE(AC_PROG_RANLIB)dnl
-  AC_REQUIRE(AC_ISC_POSIX)dnl
-  AC_REQUIRE(AC_HEADER_STDC)dnl
-  AC_REQUIRE(AC_C_CONST)dnl
-  AC_REQUIRE(bh_C_SIGNED)dnl
-  AC_REQUIRE(AC_C_INLINE)dnl
-  AC_REQUIRE(AC_TYPE_OFF_T)dnl
-  AC_REQUIRE(AC_TYPE_SIZE_T)dnl
-  AC_REQUIRE(jm_AC_TYPE_LONG_LONG)dnl
-  AC_REQUIRE(gt_TYPE_LONGDOUBLE)dnl
-  AC_REQUIRE(gt_TYPE_WCHAR_T)dnl
-  AC_REQUIRE(gt_TYPE_WINT_T)dnl
-  AC_REQUIRE(jm_AC_HEADER_INTTYPES_H)
-  AC_REQUIRE(jm_AC_HEADER_STDINT_H)
-  AC_REQUIRE(gt_TYPE_INTMAX_T)
-  AC_REQUIRE(gt_PRINTF_POSIX)
-  AC_REQUIRE(AC_FUNC_ALLOCA)dnl
-  AC_REQUIRE(AC_FUNC_MMAP)dnl
-  AC_REQUIRE(jm_GLIBC21)dnl
-  AC_REQUIRE(gt_INTDIV0)dnl
-  AC_REQUIRE(jm_AC_TYPE_UINTMAX_T)dnl
-  AC_REQUIRE(gt_HEADER_INTTYPES_H)dnl
-  AC_REQUIRE(gt_INTTYPES_PRI)dnl
-  AC_REQUIRE(gl_XSIZE)dnl
-
-  AC_CHECK_TYPE(ptrdiff_t, ,
-    AC_DEFINE(ptrdiff_t, long,
-       Define as the type of the result of subtracting two pointers, if the system doesn't define it.)
-    )
-  AC_CHECK_HEADERS(argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h)
-  AC_CHECK_FUNCS(asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking)
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, #include <stdio.h>)
-  gt_CHECK_DECL(_snwprintf, #include <stdio.h>)
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, #include <stdio.h>)
-  gt_CHECK_DECL(fgets_unlocked, #include <stdio.h>)
-  gt_CHECK_DECL(getc_unlocked, #include <stdio.h>)
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST(HAVE_POSIX_PRINTF)
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST(HAVE_ASPRINTF)
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST(HAVE_SNPRINTF)
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST(HAVE_WPRINTF)
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS(INTLBISON, bison)
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING(version of bison)
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* $0-9*\.0-9.*$.*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.26-9* | 1.3-90-9* | 2-9.*)
-changequote(,)dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT($ac_prog_version)
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
+  m4_divert_text(DEFAULTS, gt_needs=)
+  m4_define(gt_NEEDS_INIT, )
 )
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN(gt_CHECK_DECL,
+dnl Usage: AM_GNU_GETTEXT_NEED(NEEDSYMBOL)
+AC_DEFUN(AM_GNU_GETTEXT_NEED,
 
-  AC_CACHE_CHECK(whether $1 is declared, ac_cv_have_decl_$1,
-    AC_TRY_COMPILE($2, 
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-, ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no))
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED(HAVE_DECL_translit($1, a-z, A-Z), $gt_value,
-    Define to 1 if you have the declaration of `$1', and to 0 if you don't.)
+  m4_divert_text(INIT_PREPARE, gt_needs="$gt_needs $1")
 )

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/iconv.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/iconv.m4 Changed

@@ -1,10 +1,8 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# iconv.m4 serial 18 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -23,6 +21,7 @@
 
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
@@ -31,34 +30,170 @@
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR(CPPFLAGS, $INCICONV)
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, 
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_TRY_LINK(#include <stdlib.h>
-#include <iconv.h>,
-      iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);,
-      am_cv_func_iconv=yes)
+    AC_LINK_IFELSE(
+      AC_LANG_PROGRAM(
+         
+#include <stdlib.h>
+#include <iconv.h>
+         ,
+         iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);),
+      am_cv_func_iconv=yes)
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK(#include <stdlib.h>
-#include <iconv.h>,
-        iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);,
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
+      AC_LINK_IFELSE(
+        AC_LANG_PROGRAM(
+           
+#include <stdlib.h>
+#include <iconv.h>
+           ,
+           iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);),
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
       LIBS="$am_save_LIBS"
     fi
   )
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, Define if you have the iconv() function.)
+    AC_CACHE_CHECK(for working iconv, am_cv_func_iconv_works, 
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_RUN_IFELSE(
+        AC_LANG_SOURCE(
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\342\202\254"; /* EURO SIGN */
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\263";
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304";
+        static char buf2 = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf1 != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf50;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}),
+        am_cv_func_iconv_works=yes,
+        am_cv_func_iconv_works=no,
+        
+changequote(,)dnl
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+changequote(,)dnl
+        )
+      LIBS="$am_save_LIBS"
+    )
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      Define if you have the iconv() function and it works.)
   fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING(how to link with libiconv)
@@ -70,34 +205,64 @@
     LIBICONV=
     LTLIBICONV=
   fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
 )
 
-AC_DEFUN(AM_ICONV,
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define(gl_iconv_AC_DEFUN,
+  m4_version_prereq(2.64,
+    AC_DEFUN_ONCE(
+        $1, $2),
+    m4_ifdef(gl_00GNULIB,
+       AC_DEFUN_ONCE(
+           $1, $2),
+       AC_DEFUN(
+           $1, $2))))
+gl_iconv_AC_DEFUN(AM_ICONV,
 
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING(for iconv declaration)
-    AC_CACHE_VAL(am_cv_proto_iconv, 
-      AC_TRY_COMPILE(
+    AC_CACHE_VAL(am_cv_proto_iconv, 
+      AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM(
+           
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-, , am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+           ,
+           ),
+        am_cv_proto_iconv_arg1="",
+        am_cv_proto_iconv_arg1="const")
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);")
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT(${ac_t:-
-         }$am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+    AC_MSG_RESULT(
+         $am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
       Define as const if the declaration of iconv() needs const.)
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef(gl_ICONV_H_DEFAULTS,
+      AC_REQUIRE(gl_ICONV_H_DEFAULTS)
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      )
   fi
 )

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/intlmacosx.m4 Added

@@ -0,0 +1,56 @@
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN(gt_INTL_MACOSX,
+
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK(for CFPreferencesCopyAppValue,
+    gt_cv_func_CFPreferencesCopyAppValue,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFPreferences.h>,
+          CFPreferencesCopyAppValue(NULL, NULL)),
+       gt_cv_func_CFPreferencesCopyAppValue=yes,
+       gt_cv_func_CFPreferencesCopyAppValue=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE(HAVE_CFPREFERENCESCOPYAPPVALUE, 1,
+      Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.)
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK(for CFLocaleCopyCurrent, gt_cv_func_CFLocaleCopyCurrent,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFLocale.h>,
+          CFLocaleCopyCurrent();),
+       gt_cv_func_CFLocaleCopyCurrent=yes,
+       gt_cv_func_CFLocaleCopyCurrent=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE(HAVE_CFLOCALECOPYCURRENT, 1,
+      Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.)
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST(INTL_MACOSX_LIBS)
+)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/lib-ld.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/lib-ld.m4 Changed

@@ -1,52 +1,56 @@
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
 
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN(AC_LIB_PROG_LD_GNU,
-AC_CACHE_CHECK(if the linker ($LD) is GNU ld, acl_cv_prog_gnu_ld,
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+AC_CACHE_CHECK(if the linker ($LD) is GNU ld, acl_cv_prog_gnu_ld,
+# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac)
 with_gnu_ld=$acl_cv_prog_gnu_ld
 )
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN(AC_LIB_PROG_LD,
-AC_ARG_WITH(gnu-ld,
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no,
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE(AC_PROG_CC)dnl
+AC_REQUIRE(AC_PROG_CC)dnl
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
+
+AC_ARG_WITH(gnu-ld,
+    AS_HELP_STRING(--with-gnu-ld,
+        assume the C compiler uses GNU ld default=no),
+    test "$withval" = no || with_gnu_ld=yes,
+    with_gnu_ld=no)dnl
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING(for ld used by GCC)
+  AC_MSG_CHECKING(for ld used by $CC)
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -56,12 +60,12 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    \\/* | A-Za-z:\\/*)
-      re_direlt='/^/^/*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+    \\/* | ?:\\/*)
+      re_direlt='/^/^/*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -79,33 +83,36 @@
 else
   AC_MSG_CHECKING(for non-GNU ld)
 fi
-AC_CACHE_VAL(acl_cv_path_LD,
+AC_CACHE_VAL(acl_cv_path_LD,
 if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi)
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
+  AC_MSG_RESULT($LD)
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
 AC_LIB_PROG_LD_GNU

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/lib-link.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/lib-link.m4 Changed

@@ -1,58 +1,66 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.54)
+
 dnl AC_LIB_LINKFLAGS(name , dependencies) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
 dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN(AC_LIB_LINKFLAGS,
 
   AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
   AC_REQUIRE(AC_LIB_RPATH)
-  define(Name,translit($1,./-, ___))
-  define(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                               ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
+  pushdef(Name,m4_translit($1,./+-, ____))
+  pushdef(NAME,m4_translit($1,abcdefghijklmnopqrstuvwxyz./+-,
+                                   ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
   AC_CACHE_CHECK(how to link with lib$1, ac_cv_libName_libs, 
     AC_LIB_LINKFLAGS_BODY($1, $2)
     ac_cv_libName_libs="$LIBNAME"
     ac_cv_libName_ltlibs="$LTLIBNAME"
     ac_cv_libName_cppflags="$INCNAME"
+    ac_cv_libName_prefix="$LIBNAME_PREFIX"
   )
   LIBNAME="$ac_cv_libName_libs"
   LTLIBNAME="$ac_cv_libName_ltlibs"
   INCNAME="$ac_cv_libName_cppflags"
+  LIBNAME_PREFIX="$ac_cv_libName_prefix"
   AC_LIB_APPENDTOVAR(CPPFLAGS, $INCNAME)
   AC_SUBST(LIBNAME)
   AC_SUBST(LTLIBNAME)
+  AC_SUBST(LIBNAME_PREFIX)
   dnl Also set HAVE_LIBNAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
   dnl results of this search when this library appears as a dependency.
   HAVE_LIBNAME=yes
-  undefine(Name)
-  undefine(NAME)
+  popdef(NAME)
+  popdef(Name)
 )
 
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, missing-message)
 dnl searches for libname and the libraries corresponding to explicit and
 dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN(AC_LIB_HAVE_LINKFLAGS,
 
   AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
   AC_REQUIRE(AC_LIB_RPATH)
-  define(Name,translit($1,./-, ___))
-  define(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                               ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
+  pushdef(Name,m4_translit($1,./+-, ____))
+  pushdef(NAME,m4_translit($1,abcdefghijklmnopqrstuvwxyz./+-,
+                                   ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
 
   dnl Search for libName and define LIBNAME, LTLIBNAME and INCNAME
   dnl accordingly.
@@ -66,13 +74,26 @@
 
   AC_CACHE_CHECK(for lib$1, ac_cv_libName, 
     ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIBNAME"
-    AC_TRY_LINK($3, $4, ac_cv_libName=yes, ac_cv_libName=no)
+    dnl If $LIBNAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIBNAME" in
+      *" -l"*) LIBS="$LIBS $LIBNAME" ;;
+      *)       LIBS="$LIBNAME $LIBS" ;;
+    esac
+    AC_LINK_IFELSE(
+      AC_LANG_PROGRAM($3, $4),
+      ac_cv_libName=yes,
+      ac_cv_libName='m4_if($5, , no, $5)')
     LIBS="$ac_save_LIBS"
   )
   if test "$ac_cv_libName" = yes; then
     HAVE_LIBNAME=yes
-    AC_DEFINE(HAVE_LIBNAME, 1, Define if you have the $1 library.)
+    AC_DEFINE(HAVE_LIBNAME, 1, Define if you have the lib$1 library.)
     AC_MSG_CHECKING(how to link with lib$1)
     AC_MSG_RESULT($LIBNAME)
   else
@@ -82,24 +103,34 @@
     CPPFLAGS="$ac_save_CPPFLAGS"
     LIBNAME=
     LTLIBNAME=
+    LIBNAME_PREFIX=
   fi
   AC_SUBST(HAVE_LIBNAME)
   AC_SUBST(LIBNAME)
   AC_SUBST(LTLIBNAME)
-  undefine(Name)
-  undefine(NAME)
+  AC_SUBST(LIBNAME_PREFIX)
+  popdef(NAME)
+  popdef(Name)
 )
 
 dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
 AC_DEFUN(AC_LIB_RPATH,
 
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(config.rpath))
   AC_REQUIRE(AC_PROG_CC)                dnl we use $CC, $GCC, $LDFLAGS
   AC_REQUIRE(AC_LIB_PROG_LD)            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE(AC_CANONICAL_HOST)         dnl we use $host
   AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK(for shared library run path origin, acl_cv_rpath, 
+  AC_CACHE_CHECK(for shared library run path origin, acl_cv_rpath, 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
@@ -107,34 +138,66 @@
     acl_cv_rpath=done
   )
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE(rpath,
       --disable-rpath         do not hardcode runtime library paths,
     :, enable_rpath=yes)
 )
 
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN(AC_LIB_FROMPACKAGE,
+
+  pushdef(NAME,m4_translit($1,abcdefghijklmnopqrstuvwxyz./+-,
+                                   ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
+  define(acl_frompackage_NAME, $2)
+  popdef(NAME)
+  pushdef(PACK,$2)
+  pushdef(PACKUP,m4_translit(PACK,abcdefghijklmnopqrstuvwxyz./+-,
+                                     ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
+  define(acl_libsinpackage_PACKUP,
+    m4_ifdef(acl_libsinpackage_PACKUP, m4_defn(acl_libsinpackage_PACKUP), ,)lib$1)
+  popdef(PACKUP)
+  popdef(PACK)
+)
+
 dnl AC_LIB_LINKFLAGS_BODY(name , dependencies) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN(AC_LIB_LINKFLAGS_BODY,
 
-  define(NAME,translit($1,abcdefghijklmnopqrstuvwxyz./-,
-                               ABCDEFGHIJKLMNOPQRSTUVWXYZ___))
+  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
+  pushdef(NAME,m4_translit($1,abcdefghijklmnopqrstuvwxyz./+-,
+                                   ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
+  pushdef(PACK,m4_ifdef(acl_frompackage_NAME, acl_frompackage_NAME, lib$1))
+  pushdef(PACKUP,m4_translit(PACK,abcdefghijklmnopqrstuvwxyz./+-,
+                                     ABCDEFGHIJKLMNOPQRSTUVWXYZ____))
+  pushdef(PACKLIBS,m4_ifdef(acl_frompackage_NAME, acl_libsinpackage_PACKUP, lib$1))
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef(P_A_C_K,m4_if(m4_version_compare(m4_defn(m4_PACKAGE_VERSION),2.61),-1,m4_translit(PACK,.,_),PACK))
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX(
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   )
-  AC_LIB_ARG_WITH(lib$1-prefix,
-  --with-lib$1-prefix=DIR  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir,
+  AC_ARG_WITH(P_A_C_K-prefix,
+  --with-P_A_C_K-prefix=DIR  search for PACKLIBS in DIR/include and DIR/lib
+  --without-P_A_C_K-prefix     don't search for PACKLIBS in includedir and libdir,
 
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -146,7 +209,11 @@
         )
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 )
@@ -155,6 +222,10 @@
   LIBNAME=
   LTLIBNAME=
   INCNAME=
+  LIBNAME_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIBNAME=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -174,7 +245,7 @@
         names_already_handled="$names_already_handled $name"
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -194,22 +265,55 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBNAME; do
@@ -217,21 +321,46 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -246,7 +375,9 @@
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                 dnl No hardcoding is needed.
                 LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
               else
@@ -265,12 +396,12 @@
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
                 dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
+                if test "$acl_hardcode_direct" = yes; then
                   dnl Using DIR/libNAME.so during linking hardcodes DIR into the
                   dnl resulting binary.
                   LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                     dnl Use an explicit option to hardcode DIR into the resulting
                     dnl binary.
                     LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
@@ -301,13 +432,13 @@
                     if test -z "$haveit"; then
                       LIBNAME="${LIBNAME}${LIBNAME:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                       dnl FIXME: Not sure whether we should use
                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
                       dnl here.
                       LIBNAME="${LIBNAME}${LIBNAME:+ }$found_so"
                     else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
                       dnl here, because this doesn't fit in flags passed to the
                       dnl compiler. So give up. No hardcoding. This affects only
                       dnl very old systems.
@@ -332,8 +463,18 @@
             dnl Assume the include files are nearby.
             additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIBNAME_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIBNAME_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -350,7 +491,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -394,12 +535,14 @@
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -495,18 +638,18 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
       dnl Weird platform: only the last -rpath option counts, the user must
       dnl pass all path elements in one option. We can arrange that for a
       dnl single library, but not when more than one $LIBNAMEs are used.
       alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
     else
@@ -514,7 +657,7 @@
       for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
       done
@@ -527,6 +670,11 @@
       LTLIBNAME="${LTLIBNAME}${LTLIBNAME:+ }-R$found_dir"
     done
   fi
+  popdef(P_A_C_K)
+  popdef(PACKLIBS)
+  popdef(PACKUP)
+  popdef(PACK)
+  popdef(NAME)
 )
 
 dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
@@ -549,3 +697,81 @@
     fi
   done
 )
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS(LDADDVAR, LIBSVALUE, USE-LIBTOOL)
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN(AC_LIB_LINKFLAGS_FROM_LIBS,
+
+  AC_REQUIRE(AC_LIB_RPATH)
+  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST($1)
+)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/lib-prefix.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/lib-prefix.m4 Changed

@@ -1,10 +1,8 @@
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -26,6 +24,7 @@
   AC_BEFORE($0, AC_LIB_LINKFLAGS)
   AC_REQUIRE(AC_PROG_CC)
   AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(AC_LIB_PREPARE_MULTILIB)
   AC_REQUIRE(AC_LIB_PREPARE_PREFIX)
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -47,7 +46,7 @@
         )
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 )
@@ -71,7 +70,7 @@
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux*) haveit=yes;;
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
             esac
           fi
         fi
@@ -89,7 +88,7 @@
     dnl   2. if it's already present in $LDFLAGS,
     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
     dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
       haveit=
       for x in $LDFLAGS; do
         AC_LIB_WITH_FINAL_PREFIX(eval x=\"$x\")
@@ -99,7 +98,7 @@
         fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
           if test -n "$GCC"; then
             case $host_os in
               linux*) haveit=yes;;
@@ -153,3 +152,73 @@
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 )
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN(AC_LIB_PREPARE_MULTILIB,
+
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK(for 64-bit host, gl_cv_solaris_64bit,
+        AC_EGREP_CPP(sixtyfour bits, 
+#ifdef _LP64
+sixtyfour bits
+#endif
+           , gl_cv_solaris_64bit=yes, gl_cv_solaris_64bit=no)
+        )
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/libtool.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/libtool.m4 Changed

@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
 m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
+m4_require(_LT_DECL_FILECMD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
 m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
@@ -219,8 +221,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -777,7 +779,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -1041,8 +1043,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -1066,17 +1068,12 @@
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -1125,12 +1122,12 @@
     output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if($1, CXX,
    if test yes != "$lt_cv_apple_cc_single_mod"; then
       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ,)
   else
@@ -1244,7 +1241,8 @@
 # _LT_WITH_SYSROOT
 # ----------------
 AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
+m4_require(_LT_DECL_SED)dnl
+AC_MSG_CHECKING(for sysroot)
 AC_ARG_WITH(sysroot,
 AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
   Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1261,7 +1259,7 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
@@ -1291,7 +1289,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -1308,7 +1306,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -1320,7 +1318,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -1342,7 +1340,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -1350,7 +1348,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -1358,7 +1356,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -1378,14 +1376,14 @@
   # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -1453,7 +1451,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -1492,9 +1490,22 @@
 m4_defun(_LT_PROG_AR,
 AC_CHECK_TOOLS(AR, ar, false)
 : ${AR=ar}
-: ${AR_FLAGS=cru}
 _LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL(, lt_ar_flags, 0, Flags to create an archive (by configure))
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL(, AR_FLAGS, \@S|@{ARFLAGS-"\@S|@lt_ar_flags"},
+         Flags to create an archive)
 
 AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
   lt_cv_ar_at_file=no
@@ -1713,7 +1724,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1756,7 +1767,7 @@
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -2206,26 +2217,35 @@
 striplib=
 old_striplib=
 AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT(yes)
+if test -z "$STRIP"; then
+  AC_MSG_RESULT(no)
 else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    AC_MSG_RESULT(yes)
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT(yes)
-    else
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+      fi
+      ;;
+    *)
       AC_MSG_RESULT(no)
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac
+      ;;
+    esac
+  fi
 fi
 _LT_DECL(, old_striplib, 1, Commands to strip libraries)
 _LT_DECL(, striplib, 1)
@@ -2548,7 +2568,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 m4_if($1, ,
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
       ;;
@@ -2558,14 +2578,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -2584,7 +2604,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -2621,7 +2641,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -2654,7 +2674,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -3453,7 +3473,7 @@
 
 bsdi45*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -3487,14 +3507,14 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -3508,7 +3528,7 @@
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -3555,7 +3575,7 @@
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -3682,13 +3702,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -3714,7 +3734,7 @@
     # Let the user override the test.
   else
     AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -3954,7 +3974,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
@@ -3972,20 +3992,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
@@ -4009,7 +4029,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -4027,9 +4047,9 @@
 "     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4316,7 +4336,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4399,7 +4419,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4735,7 +4755,7 @@
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4918,7 +4938,7 @@
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -4926,7 +4946,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
+    cl* | icl*)
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -4983,15 +5003,15 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -5043,7 +5063,7 @@
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5155,6 +5175,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     interix3-9*)
@@ -5169,7 +5190,7 @@
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -5212,7 +5233,7 @@
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
@@ -5224,7 +5245,7 @@
 
         if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
@@ -5240,7 +5261,7 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -5372,7 +5393,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -5555,12 +5576,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5601,7 +5622,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -5649,7 +5670,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -5860,6 +5881,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     osf3*)
@@ -6630,8 +6652,8 @@
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6729,6 +6751,7 @@
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
 
       dgux*)
@@ -6759,7 +6782,7 @@
         _LT_TAGVAR(archive_cmds_need_lc, $1)=no
         ;;
 
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -6896,7 +6919,7 @@
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
@@ -7036,13 +7059,13 @@
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
                 echo "local: *; };" >> $output_objdir/$libname.ver~
                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -8188,6 +8211,14 @@
 AC_SUBST(DLLTOOL)
 )
 
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun(_LT_DECL_FILECMD,
+AC_CHECK_TOOL(FILECMD, file, :)
+_LT_DECL(, FILECMD, 1, A file(cmd) program that detects file types)
+)# _LD_DECL_FILECMD
+
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/ltoptions.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/ltoptions.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/ltsugar.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/ltsugar.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/ltversion.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/ltversion.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/lt~obsolete.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/lt~obsolete.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/nls.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/nls.m4 Changed

@@ -1,10 +1,9 @@
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -19,31 +18,15 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
+AC_PREREQ(2.50)
+
 AC_DEFUN(AM_NLS,
 
   AC_MSG_CHECKING(whether NLS is requested)
   dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
+  AC_ARG_ENABLE(nls,
       --disable-nls           do not use Native Language Support,
     USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-)
-
-AC_DEFUN(AM_MKINSTALLDIRS,
-
-  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 it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
 )

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/po.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/po.m4 Changed

@@ -1,10 +1,8 @@
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# po.m4 serial 22 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -19,14 +17,21 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
+AC_PREREQ(2.60)
+
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN(AM_PO_SUBDIRS,
 
   AC_REQUIRE(AC_PROG_MAKE_SET)dnl
   AC_REQUIRE(AC_PROG_INSTALL)dnl
-  AC_REQUIRE(AM_MKINSTALLDIRS)dnl
+  AC_REQUIRE(AC_PROG_MKDIR_P)dnl
+  AC_REQUIRE(AC_PROG_SED)dnl
   AC_REQUIRE(AM_NLS)dnl
 
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST(GETTEXT_MACRO_VERSION, 0.19)
+
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
 
@@ -34,59 +39,61 @@
   dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
   dnl The second test excludes FreeBSD msgfmt.
   AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+    $ac_dir/$ac_word --statistics /dev/null >&AS_MESSAGE_LOG_FD 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi),
     :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote(,)dnl
+  AC_SUBST(MSGFMT_015)
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote(,)dnl
+  AC_SUBST(GMSGFMT_015)
 
   dnl Search for GNU xgettext 0.12 or newer in the PATH.
   dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
   dnl The second test excludes FreeBSD xgettext.
   AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+    $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&AS_MESSAGE_LOG_FD 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi),
     :)
   dnl Remove leftover from FreeBSD xgettext call.
   rm -f messages.po
 
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote(,)dnl
+  AC_SUBST(XGETTEXT_015)
+
   dnl Search for GNU msgmerge 0.11 or newer in the PATH.
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1, :)
+    $ac_dir/$ac_word --update -q /dev/null /dev/null >&AS_MESSAGE_LOG_FD 2>&1, :)
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        found $GMSGFMT program is not GNU msgfmt; ignore it)
-      GMSGFMT=":"
-    fi
-  fi
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST(localedir)
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        found xgettext program is not GNU xgettext; ignore it)
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST(XGETTEXT_EXTRA_OPTIONS)
 
-  AC_OUTPUT_COMMANDS(
+  AC_CONFIG_COMMANDS(po-directories, 
     for ac_file in $CONFIG_FILES; do
       # Support "outfile:infile:infile..."
       case "$ac_file" in
@@ -96,7 +103,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -106,10 +113,14 @@
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ ${gt_tab}*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -119,12 +130,13 @@
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -194,10 +206,10 @@
         fi
         ;;
       esac
-    done,
+    done,
    # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -216,7 +228,7 @@
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
@@ -244,6 +256,7 @@
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -251,9 +264,9 @@
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^	 *VARIABLE	 *=/{
+/^'"${tab}"' *VARIABLE'"${tab}"' *=/{
   # Seen the first line of the variable definition.
-  s/^	 *VARIABLE	 *=//
+  s/^'"${tab}"' *VARIABLE'"${tab}"' *=//
   ba
 }
 bd
@@ -283,7 +296,7 @@
 changequote(,)dnl
 
   # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
   POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
   # Compute POTFILES_DEPS as
   #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -298,14 +311,14 @@
   fi
   if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
     # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake.
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -348,7 +361,7 @@
     QMFILES="$QMFILES $srcdirpre$lang.qm"
     frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
     RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
   done
   # CATALOGS depends on both $ac_dir and the user's LINGUAS
@@ -389,31 +402,32 @@
       QTCATALOGS="$QTCATALOGS $lang.qm"
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
     done
   fi
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
   if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -424,3 +438,16 @@
   fi
   mv "$ac_file.tmp" "$ac_file"
 )
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN(AM_XGETTEXT_OPTION_INIT,
+
+  XGETTEXT_EXTRA_OPTIONS=
+)
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN(AM_XGETTEXT_OPTION,
+
+  AC_REQUIRE(AM_XGETTEXT_OPTION_INIT)
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/auto-m4/progtest.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/auto-m4/progtest.m4 Changed

@@ -1,10 +1,8 @@
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -18,6 +16,8 @@
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
+AC_PREREQ(2.50)
+
 # Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -27,15 +27,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -55,7 +54,7 @@
 # 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,
+AC_CACHE_VAL(ac_cv_path_$1,
 case "$$1" in
   \\/* | ?:\\/*)
     ac_cv_path_$1="$$1" # Let the user override the test with a path.
@@ -67,6 +66,7 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
           if $3; then
             ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -83,9 +83,9 @@
 esac)dnl
 $1="$ac_cv_path_$1"
 if test ifelse($4, , -n "$$1", "$$1" != "$4"); then
-  AC_MSG_RESULT($$1)
+  AC_MSG_RESULT($$1)
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT(no)
 fi
-AC_SUBST($1)dnl
+AC_SUBST($1)dnl
 )

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/Makefile.am Changed

@@ -6,8 +6,8 @@
 # or
 #     ( cd camlibs && make agfa_cl20.la )
 #
-# If you only want to install a single camlib or two, run
-#     make BUILD_THESE_CAMLIBS="canon.la agfa_cl20.la" install
+# If you only want to build/install a single camlib or two, run
+#     make GP_CAMLIB_SET="canon.la agfa_cl20.la" install
 # in the camlibs/ subdir or in the libgphoto2 top-level directory.
 ########################################################################
 
@@ -19,13 +19,13 @@
 #
 # Building the camlibs itself is defined in the Makefile-files
 # included below.
-SUBDIRS = . canon/doc konica/localization
+SUBDIRS = .
 
 
 ########################################################################
 # Define the common variables added to in the included Makefile-files
 CLEANFILES =
-EXTRA_DIST = camlib.sym
+EXTRA_DIST =
 camlibdoc_DATA =
 localization_DATA =
 localizationdir =
@@ -35,28 +35,59 @@
 
 
 ########################################################################
+# We pass the list of camlibs through this set of variables in order
+# to remain compatible with older calling conventions.
+
+# Actually implement BUILD_THESE_CAMLIBS as documented
+BUILD_THESE_CAMLIBS = $(GP_CAMLIB_SET)
+
+# while keeping compatibility with the variable which has been working
+# for so long
+INSTALL_THESE_CAMLIBS = $(BUILD_THESE_CAMLIBS)
+
+
+########################################################################
 # All camlibs are defined as EXTRA_LTLIBRARIES. This requires that
 # all camlibs have -rpath set explicitly in foobar_la_LDFLAGS.
 # You're probably best off by using the camlib_* variables defined
 # below.
-camlib_LTLIBRARIES = $(BUILD_THESE_CAMLIBS)
+camlib_LTLIBRARIES = $(INSTALL_THESE_CAMLIBS)
 
 
 ########################################################################
 # Define the compile/link/etc. flags common to all camlibs in one place,
 # i.e. here.
 
-camlib_dependencies = $(top_srcdir)/camlibs/camlib.sym
-camlib_ldflags = -module -no-undefined -avoid-version -export-dynamic \
-	-export-symbols '$(top_srcdir)/camlibs/camlib.sym' \
-	-rpath '$(camlibdir)'
-camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la 
+camlib_dependencies =
+
+camlib_ldflags =
+camlib_ldflags += -module
+camlib_ldflags += -no-undefined
+camlib_ldflags += -avoid-version
+camlib_ldflags += -export-dynamic
+
+EXTRA_DIST          += camlib.sym
+camlib_dependencies += $(top_srcdir)/camlibs/camlib.sym
+camlib_ldflags      += -export-symbols '$(top_srcdir)/camlibs/camlib.sym'
+
+camlib_ldflags += -rpath '$(camlibdir)'
+
+camlib_libadd =
+camlib_libadd += $(top_builddir)/libgphoto2/libgphoto2.la
+camlib_libadd += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+
+camlib_cflags  =
+
+camlib_cppflags  =
+camlib_cppflags += $(AM_CPPFLAGS)
+camlib_cppflags += -I$(top_srcdir)
+camlib_cppflags += -I$(top_builddir)
+camlib_cppflags += -I$(top_srcdir)/libgphoto2_port
 
-AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)  -I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/libgphoto2 -I$(top_builddir)/libgphoto2
 
 ########################################################################
 # You can generate this Makefile-files include list by running
-# find . -name Makefile-files -exec echo include {} \; | sort | sed 's| ./| |g' 
+# find . -name Makefile-files -exec echo include {} \; | sort | sed 's| ./| |g'
 include adc65/Makefile-files
 include agfa-cl20/Makefile-files
 include aox/Makefile-files
@@ -69,6 +100,7 @@
 include digita/Makefile-files
 include dimera/Makefile-files
 include directory/Makefile-files
+include docupen/Makefile-files
 include enigma13/Makefile-files
 include fuji/Makefile-files
 include gsmart300/Makefile-files
@@ -87,6 +119,7 @@
 include konica/Makefile-files
 include largan/lmini/Makefile-files
 include lg_gsm/Makefile-files
+include lumix/Makefile-files
 include mars/Makefile-files
 include minolta/dimagev/Makefile-files
 include minolta/Makefile-files
@@ -135,17 +168,33 @@
 # Make sure that the list of camlibs defined in configure.ac using
 # GP_CAMLIB(...) and the list of camlibs defined in */Makefile-files
 # match.
-CLEANFILES += all-src-camlibs all-def-camlibs
-all-local: Makefile
-	@:; \
-	(for x in $(EXTRA_LTLIBRARIES) template.la; do echo "$$(basename "$$x" ".la")"; done) \
-		| sort > all-src-camlibs; \
-	(for x in $(ALL_DEFINED_CAMLIBS); do echo "$$x"; done) \
-		| sort > all-def-camlibs; \
-	if cmp all-def-camlibs all-src-camlibs; then :; else \
-		diff -u all-def-camlibs all-src-camlibs; \
-		echo "List of camlibs in configure.ac is out of date."; \
-		echo "Have a developer update it using \"make -C camlibs print-camlibs\"."; \
+
+# List all camlibs defined in configure.ac
+CLEANFILES += all-cfg-camlibs
+all-cfg-camlibs: Makefile
+	@(for x in $(GP_CAMLIB_SET_EVERYTHING); do echo "$$x"; done) \
+		| LC_ALL=C $(SORT) > all-cfg-camlibs
+
+# List all camlibs defined in the camlibs/ source subtree Makefile-files
+CLEANFILES += all-mkf-camlibs
+all-mkf-camlibs: Makefile
+	@(for x in $(EXTRA_LTLIBRARIES) $(noinst_LTLIBRARIES); do echo "$$(basename "$$x" ".la")"; done) \
+		| LC_ALL=C $(SORT) > all-mkf-camlibs
+
+.PHONY: all-local
+all-local: all-cfg-camlibs all-mkf-camlibs
+	@if $(CMP) all-cfg-camlibs all-mkf-camlibs > /dev/null 2>&1; then :; else \
+		echo "#"; \
+		for camlib in $$($(COMM) -23 all-cfg-camlibs all-mkf-camlibs); do \
+			echo "#   - '$${camlib}' camlib in 'configure.ac', but not in Makefiles."; \
+		done; \
+		for camlib in $$($(COMM) -13 all-cfg-camlibs all-mkf-camlibs); do \
+			echo "#   - '$${camlib}' camlib in Makefiles, but not in 'configure.ac'"; \
+		done; \
+		echo "#"; \
+		echo "# The camlib set definitions in 'configure.ac' and Makefiles are inconsistent"; \
+		echo "# Have a developer sync them, maybe using \"make -C camlibs print-camlibs\"."; \
+		echo "#"; \
 		exit 1; \
 	fi
 
@@ -154,8 +203,8 @@
 # Shortcut for installation of a subset of camlibs
 # Usage: make CAMLIBS="canon.la ptp2.la" install-camlibs
 
-install-camlibs:
-	$(MAKE) BUILD_THESE_CAMLIBS="$(CAMLIBS)" install-camlibLTLIBRARIES
+install-camlibs: $(GP_CAMLIB_SET)
+	$(MAKE) $(AM_MAKEFLAGS) GP_CAMLIB_SET="$(GP_CAMLIB_SET)" install-camlibLTLIBRARIES
 
 
 ########################################################################

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -22,128 +22,132 @@
 # or
 #     ( cd camlibs && make agfa_cl20.la )
 #
-# If you only want to install a single camlib or two, run
-#     make BUILD_THESE_CAMLIBS="canon.la agfa_cl20.la" install
+# If you only want to build/install a single camlib or two, run
+#     make GP_CAMLIB_SET="canon.la agfa_cl20.la" install
 # in the camlibs/ subdir or in the libgphoto2 top-level directory.
 ########################################################################
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# SUBDIRS = dc120 dc210 dc240 dc3200 ez200
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# SUBDIRS = coolshot l859
+
+# -*- Makefile-automake -*-
+
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
 # If you use this as template for a real camlib (say 'foobar.la'),
 # make sure to change the "noinst_" at the beginning of the following
@@ -151,18 +155,21 @@
 #   * "noinst_DATA" into "camlibdoc_DATA"
 #   * "noinst_LTLIBRARIES" into "EXTRA_LTLIBRARIES"
 #
-# Additionally, you must add add an include line to the Makefile-files
+# Additionally, you must add an include line to the Makefile-files
 # of the new camlib to camlibs/Makefile.am:
 #   * "include my-new-camlib/Makefile-files"
 #
 # And as the last step, you need to add it to configure.ac:
 #   * GP_CAMLIB(foobar)dnl
+#
+# Also, do not forget to add any *.c source files containing
+# translated strings to POTFILES.in.
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
 
 VPATH = @srcdir@
@@ -241,23 +248,33 @@
 host_triplet = @host@
 subdir = camlibs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-byteorder.m4 \
-	$(top_srcdir)/gphoto-m4/gp-camlibs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-doxygen.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
-	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
-	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
-	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
-	$(top_srcdir)/gphoto-m4/gp-gettext-hack.m4 \
-	$(top_srcdir)/gphoto-m4/gp-internal-docs.m4 \
-	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
-	$(top_srcdir)/gphoto-m4/gp-packaging.m4 \
-	$(top_srcdir)/gphoto-m4/gp-references.m4 \
-	$(top_srcdir)/gphoto-m4/gp-stdint.m4 \
-	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
-	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/libgphoto2_port/gphoto-m4/gp-asm-symver-ifelse.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-asm-symver-support.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-byteorder.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-camlibs.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-check-doxygen.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-check-library.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-check-prog.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-check-shell-environment.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-config-msg.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-documentation.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-driverdir.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-internal-docs.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-libltdl.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-packaging.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-pedantic-compiler-flags.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-progs.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-references.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-set.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-sleep.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-udev.m4 \
+	$(top_srcdir)/libgphoto2_port/gphoto-m4/gp-va-copy.m4 \
 	$(top_srcdir)/auto-m4/gettext.m4 \
-	$(top_srcdir)/auto-m4/iconv.m4 $(top_srcdir)/auto-m4/lib-ld.m4 \
+	$(top_srcdir)/auto-m4/iconv.m4 \
+	$(top_srcdir)/auto-m4/intlmacosx.m4 \
+	$(top_srcdir)/auto-m4/lib-ld.m4 \
 	$(top_srcdir)/auto-m4/lib-link.m4 \
 	$(top_srcdir)/auto-m4/lib-prefix.m4 \
 	$(top_srcdir)/auto-m4/libtool.m4 \
@@ -269,7 +286,8 @@
 	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_konicalocalization_DATA) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -302,409 +320,430 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(camlibdir)" "$(DESTDIR)$(camlibdocdir)" \
+	"$(DESTDIR)$(konicalocalizationdir)" \
 	"$(DESTDIR)$(localizationdir)"
 LTLIBRARIES = $(camlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__dirstamp = $(am__leading_dot)dirstamp
-am_adc65_la_OBJECTS = adc65/adc65.lo
+am_adc65_la_OBJECTS = adc65/la-adc65.lo
 adc65_la_OBJECTS = $(am_adc65_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 adc65_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(adc65_la_LDFLAGS) $(LDFLAGS) -o $@
-am_agfa_cl20_la_OBJECTS = agfa-cl20/agfa_cl20.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(adc65_la_CFLAGS) \
+	$(CFLAGS) $(adc65_la_LDFLAGS) $(LDFLAGS) -o $@
+am_agfa_cl20_la_OBJECTS = agfa-cl20/la-agfa_cl20.lo
 agfa_cl20_la_OBJECTS = $(am_agfa_cl20_la_OBJECTS)
 agfa_cl20_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(agfa_cl20_la_LDFLAGS) $(LDFLAGS) -o $@
-am_aox_la_OBJECTS = aox/library.lo aox/aox.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(agfa_cl20_la_CFLAGS) \
+	$(CFLAGS) $(agfa_cl20_la_LDFLAGS) $(LDFLAGS) -o $@
+am_aox_la_OBJECTS = aox/la-library.lo aox/la-aox.lo
 aox_la_OBJECTS = $(am_aox_la_OBJECTS)
 aox_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(aox_la_CFLAGS) $(CFLAGS) \
 	$(aox_la_LDFLAGS) $(LDFLAGS) -o $@
-am_ax203_la_OBJECTS = ax203/ax203_la-library.lo \
-	ax203/ax203_la-ax203.lo ax203/ax203_la-ax203_decode_yuv.lo \
-	ax203/ax203_la-ax203_decode_yuv_delta.lo \
-	ax203/ax203_la-ax203_compress_jpeg.lo \
-	ax203/ax203_la-jpeg_memsrcdest.lo ax203/ax203_la-tinyjpeg.lo \
-	ax203/ax203_la-jidctflt.lo
+am__DEPENDENCIES_1 =
+am_ax203_la_OBJECTS = ax203/la-library.lo ax203/la-ax203.lo \
+	ax203/la-ax203_decode_yuv.lo \
+	ax203/la-ax203_decode_yuv_delta.lo \
+	ax203/la-ax203_compress_jpeg.lo ax203/la-jpeg_memsrcdest.lo \
+	ax203/la-tinyjpeg.lo ax203/la-jidctflt.lo
 ax203_la_OBJECTS = $(am_ax203_la_OBJECTS)
 ax203_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ax203_la_CFLAGS) \
 	$(CFLAGS) $(ax203_la_LDFLAGS) $(LDFLAGS) -o $@
-am_barbie_la_OBJECTS = barbie/barbie.lo
+am_barbie_la_OBJECTS = barbie/la-barbie.lo
 barbie_la_OBJECTS = $(am_barbie_la_OBJECTS)
 barbie_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(barbie_la_LDFLAGS) $(LDFLAGS) -o $@
-am__DEPENDENCIES_1 =
-am_canon_la_OBJECTS = canon/canon_la-canon.lo \
-	canon/canon_la-library.lo canon/canon_la-serial.lo \
-	canon/canon_la-usb.lo canon/canon_la-crc.lo \
-	canon/canon_la-util.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(barbie_la_CFLAGS) \
+	$(CFLAGS) $(barbie_la_LDFLAGS) $(LDFLAGS) -o $@
+am_canon_la_OBJECTS = canon/la-canon.lo canon/la-library.lo \
+	canon/la-serial.lo canon/la-usb.lo canon/la-crc.lo \
+	canon/la-util.lo
 canon_la_OBJECTS = $(am_canon_la_OBJECTS)
 canon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(canon_la_LDFLAGS) $(LDFLAGS) -o $@
-am_casio_qv_la_OBJECTS = casio/casio-qv.lo casio/casio-qv-commands.lo \
-	casio/camtojpeg.lo casio/ycctoppm.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(canon_la_CFLAGS) \
+	$(CFLAGS) $(canon_la_LDFLAGS) $(LDFLAGS) -o $@
+am_casio_qv_la_OBJECTS = casio/qv_la-casio-qv.lo \
+	casio/qv_la-casio-qv-commands.lo casio/qv_la-camtojpeg.lo \
+	casio/qv_la-ycctoppm.lo
 casio_qv_la_OBJECTS = $(am_casio_qv_la_OBJECTS)
 casio_qv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(casio_qv_la_LDFLAGS) $(LDFLAGS) -o $@
-clicksmart310_la_DEPENDENCIES = $(camlib_libadd)
-am_clicksmart310_la_OBJECTS = clicksmart310/library.lo \
-	clicksmart310/clicksmart.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(casio_qv_la_CFLAGS) \
+	$(CFLAGS) $(casio_qv_la_LDFLAGS) $(LDFLAGS) -o $@
+am_clicksmart310_la_OBJECTS = clicksmart310/la-library.lo \
+	clicksmart310/la-clicksmart.lo
 clicksmart310_la_OBJECTS = $(am_clicksmart310_la_OBJECTS)
 clicksmart310_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(clicksmart310_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_digigr8_la_OBJECTS = digigr8/library.lo digigr8/digigr8.lo \
-	digigr8/digi_postprocess.lo
+	$(clicksmart310_la_CFLAGS) $(CFLAGS) \
+	$(clicksmart310_la_LDFLAGS) $(LDFLAGS) -o $@
+am_digigr8_la_OBJECTS = digigr8/la-library.lo digigr8/la-digigr8.lo \
+	digigr8/la-digi_postprocess.lo
 digigr8_la_OBJECTS = $(am_digigr8_la_OBJECTS)
 digigr8_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(digigr8_la_LDFLAGS) $(LDFLAGS) -o $@
-am_digita_la_OBJECTS = digita/digita.lo digita/serial.lo digita/usb.lo \
-	digita/commands.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(digigr8_la_CFLAGS) \
+	$(CFLAGS) $(digigr8_la_LDFLAGS) $(LDFLAGS) -o $@
+am_digita_la_OBJECTS = digita/la-digita.lo digita/la-serial.lo \
+	digita/la-usb.lo digita/la-commands.lo
 digita_la_OBJECTS = $(am_digita_la_OBJECTS)
 digita_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(digita_la_LDFLAGS) $(LDFLAGS) -o $@
-am_dimagev_la_OBJECTS = minolta/dimagev/capture.lo \
-	minolta/dimagev/data.lo minolta/dimagev/delete.lo \
-	minolta/dimagev/dimagev.lo minolta/dimagev/download.lo \
-	minolta/dimagev/info.lo minolta/dimagev/packet.lo \
-	minolta/dimagev/status.lo minolta/dimagev/upload.lo \
-	minolta/dimagev/util.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(digita_la_CFLAGS) \
+	$(CFLAGS) $(digita_la_LDFLAGS) $(LDFLAGS) -o $@
+am_dimagev_la_OBJECTS = minolta/dimagev/dimagev_la-capture.lo \
+	minolta/dimagev/dimagev_la-data.lo \
+	minolta/dimagev/dimagev_la-delete.lo \
+	minolta/dimagev/dimagev_la-dimagev.lo \
+	minolta/dimagev/dimagev_la-download.lo \
+	minolta/dimagev/dimagev_la-info.lo \
+	minolta/dimagev/dimagev_la-packet.lo \
+	minolta/dimagev/dimagev_la-status.lo \
+	minolta/dimagev/dimagev_la-upload.lo \
+	minolta/dimagev/dimagev_la-util.lo
 dimagev_la_OBJECTS = $(am_dimagev_la_OBJECTS)
 dimagev_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(dimagev_la_LDFLAGS) $(LDFLAGS) -o $@
-am_dimera3500_la_OBJECTS = dimera/dimera3500.lo dimera/mesalib.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dimagev_la_CFLAGS) \
+	$(CFLAGS) $(dimagev_la_LDFLAGS) $(LDFLAGS) -o $@
+am_dimera3500_la_OBJECTS = dimera/dimera3500_la-dimera3500.lo \
+	dimera/dimera3500_la-mesalib.lo
 dimera3500_la_OBJECTS = $(am_dimera3500_la_OBJECTS)
 dimera3500_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(dimera3500_la_LDFLAGS) $(LDFLAGS) -o $@
-am_directory_la_OBJECTS = directory/directory_la-directory.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dimera3500_la_CFLAGS) \
+	$(CFLAGS) $(dimera3500_la_LDFLAGS) $(LDFLAGS) -o $@
+am_directory_la_OBJECTS = directory/la-directory.lo
 directory_la_OBJECTS = $(am_directory_la_OBJECTS)
 directory_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(directory_la_LDFLAGS) $(LDFLAGS) -o $@
-am_enigma13_la_OBJECTS = enigma13/enigma13.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(directory_la_CFLAGS) \
+	$(CFLAGS) $(directory_la_LDFLAGS) $(LDFLAGS) -o $@
+am_docupen_la_OBJECTS = docupen/la-cache.lo docupen/la-calibration.lo \
+	docupen/la-docupen.lo docupen/la-huffman.lo \
+	docupen/la-image.lo
+docupen_la_OBJECTS = $(am_docupen_la_OBJECTS)
+docupen_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(docupen_la_CFLAGS) \
+	$(CFLAGS) $(docupen_la_LDFLAGS) $(LDFLAGS) -o $@
+am_enigma13_la_OBJECTS = enigma13/la-enigma13.lo
 enigma13_la_OBJECTS = $(am_enigma13_la_OBJECTS)
 enigma13_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(enigma13_la_LDFLAGS) $(LDFLAGS) -o $@
-am_fuji_la_OBJECTS = fuji/library.lo fuji/fuji.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(enigma13_la_CFLAGS) \
+	$(CFLAGS) $(enigma13_la_LDFLAGS) $(LDFLAGS) -o $@
+am_fuji_la_OBJECTS = fuji/la-library.lo fuji/la-fuji.lo
 fuji_la_OBJECTS = $(am_fuji_la_OBJECTS)
 fuji_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(fuji_la_LDFLAGS) $(LDFLAGS) -o $@
-am_gsmart300_la_OBJECTS = gsmart300/gsmart300.lo gsmart300/library.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(fuji_la_CFLAGS) \
+	$(CFLAGS) $(fuji_la_LDFLAGS) $(LDFLAGS) -o $@
+am_gsmart300_la_OBJECTS = gsmart300/la-gsmart300.lo \
+	gsmart300/la-library.lo
 gsmart300_la_OBJECTS = $(am_gsmart300_la_OBJECTS)
 gsmart300_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(gsmart300_la_LDFLAGS) $(LDFLAGS) -o $@
-am_hp215_la_OBJECTS = hp215/hp215.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gsmart300_la_CFLAGS) \
+	$(CFLAGS) $(gsmart300_la_LDFLAGS) $(LDFLAGS) -o $@
+am_hp215_la_OBJECTS = hp215/la-hp215.lo
 hp215_la_OBJECTS = $(am_hp215_la_OBJECTS)
 hp215_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(hp215_la_LDFLAGS) $(LDFLAGS) -o $@
-am_iclick_la_OBJECTS = iclick/library.lo iclick/iclick.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(hp215_la_CFLAGS) \
+	$(CFLAGS) $(hp215_la_LDFLAGS) $(LDFLAGS) -o $@
+am_iclick_la_OBJECTS = iclick/la-library.lo iclick/la-iclick.lo
 iclick_la_OBJECTS = $(am_iclick_la_OBJECTS)
 iclick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(iclick_la_LDFLAGS) $(LDFLAGS) -o $@
-am_jamcam_la_OBJECTS = jamcam/jamcam.lo jamcam/library.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(iclick_la_CFLAGS) \
+	$(CFLAGS) $(iclick_la_LDFLAGS) $(LDFLAGS) -o $@
+am_jamcam_la_OBJECTS = jamcam/la-jamcam.lo jamcam/la-library.lo
 jamcam_la_OBJECTS = $(am_jamcam_la_OBJECTS)
 jamcam_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jamcam_la_LDFLAGS) $(LDFLAGS) -o $@
-am_jd11_la_OBJECTS = jd11/jd11.lo jd11/serial.lo jd11/decomp.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jamcam_la_CFLAGS) \
+	$(CFLAGS) $(jamcam_la_LDFLAGS) $(LDFLAGS) -o $@
+am_jd11_la_OBJECTS = jd11/la-jd11.lo jd11/la-serial.lo \
+	jd11/la-decomp.lo
 jd11_la_OBJECTS = $(am_jd11_la_OBJECTS)
 jd11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jd11_la_LDFLAGS) $(LDFLAGS) -o $@
-am_jl2005a_la_OBJECTS = jl2005a/library.lo jl2005a/jl2005a.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jd11_la_CFLAGS) \
+	$(CFLAGS) $(jd11_la_LDFLAGS) $(LDFLAGS) -o $@
+am_jl2005a_la_OBJECTS = jl2005a/la-library.lo jl2005a/la-jl2005a.lo
 jl2005a_la_OBJECTS = $(am_jl2005a_la_OBJECTS)
 jl2005a_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jl2005a_la_LDFLAGS) $(LDFLAGS) -o $@
-am_jl2005c_la_OBJECTS = jl2005c/library.lo jl2005c/jl2005c.lo \
-	jl2005c/jpeg_memsrcdest.lo jl2005c/jl2005bcd_decompress.lo \
-	jl2005c/img_enhance.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jl2005a_la_CFLAGS) \
+	$(CFLAGS) $(jl2005a_la_LDFLAGS) $(LDFLAGS) -o $@
+am_jl2005c_la_OBJECTS = jl2005c/la-library.lo jl2005c/la-jl2005c.lo \
+	jl2005c/la-jpeg_memsrcdest.lo \
+	jl2005c/la-jl2005bcd_decompress.lo jl2005c/la-img_enhance.lo
 jl2005c_la_OBJECTS = $(am_jl2005c_la_OBJECTS)
 jl2005c_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jl2005c_la_LDFLAGS) $(LDFLAGS) -o $@
-am_kodak_dc120_la_OBJECTS = kodak/dc120/dc120.lo \
-	kodak/dc120/library.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jl2005c_la_CFLAGS) \
+	$(CFLAGS) $(jl2005c_la_LDFLAGS) $(LDFLAGS) -o $@
+am_kodak_dc120_la_OBJECTS = kodak/dc120/la-dc120.lo \
+	kodak/dc120/la-library.lo
 kodak_dc120_la_OBJECTS = $(am_kodak_dc120_la_OBJECTS)
 kodak_dc120_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(kodak_dc120_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_kodak_dc210_la_OBJECTS = kodak/dc210/dc210.lo \
-	kodak/dc210/library.lo
+	$(kodak_dc120_la_CFLAGS) $(CFLAGS) $(kodak_dc120_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_kodak_dc210_la_OBJECTS = kodak/dc210/la-dc210.lo \
+	kodak/dc210/la-library.lo
 kodak_dc210_la_OBJECTS = $(am_kodak_dc210_la_OBJECTS)
 kodak_dc210_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(kodak_dc210_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_kodak_dc240_la_OBJECTS = kodak/dc240/dc240.lo \
-	kodak/dc240/library.lo
+	$(kodak_dc210_la_CFLAGS) $(CFLAGS) $(kodak_dc210_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_kodak_dc240_la_OBJECTS = kodak/dc240/la-dc240.lo \
+	kodak/dc240/la-library.lo
 kodak_dc240_la_OBJECTS = $(am_kodak_dc240_la_OBJECTS)
 kodak_dc240_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(kodak_dc240_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_kodak_dc3200_la_OBJECTS = kodak/dc3200/dc3200.lo \
-	kodak/dc3200/library.lo
+	$(kodak_dc240_la_CFLAGS) $(CFLAGS) $(kodak_dc240_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_kodak_dc3200_la_OBJECTS = kodak/dc3200/la-dc3200.lo \
+	kodak/dc3200/la-library.lo
 kodak_dc3200_la_OBJECTS = $(am_kodak_dc3200_la_OBJECTS)
 kodak_dc3200_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(kodak_dc3200_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_kodak_ez200_la_OBJECTS = kodak/ez200/ez200.lo
+	$(kodak_dc3200_la_CFLAGS) $(CFLAGS) $(kodak_dc3200_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_kodak_ez200_la_OBJECTS = kodak/ez200/la-ez200.lo
 kodak_ez200_la_OBJECTS = $(am_kodak_ez200_la_OBJECTS)
 kodak_ez200_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(kodak_ez200_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_konica_la_OBJECTS = konica/konica_la-lowlevel.lo \
-	konica/konica_la-konica.lo konica/konica_la-library.lo
+	$(kodak_ez200_la_CFLAGS) $(CFLAGS) $(kodak_ez200_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_konica_la_OBJECTS = konica/la-lowlevel.lo konica/la-konica.lo \
+	konica/la-library.lo
 konica_la_OBJECTS = $(am_konica_la_OBJECTS)
 konica_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(konica_la_LDFLAGS) $(LDFLAGS) -o $@
-am_konica_qm150_la_OBJECTS = konica/konica_qm150_la-qm150.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(konica_la_CFLAGS) \
+	$(CFLAGS) $(konica_la_LDFLAGS) $(LDFLAGS) -o $@
+am_konica_qm150_la_OBJECTS = konica/qm150_la-qm150.lo
 konica_qm150_la_OBJECTS = $(am_konica_qm150_la_OBJECTS)
 konica_qm150_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(konica_qm150_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_largan_la_OBJECTS = largan/lmini/largan.lo largan/lmini/lmini.lo \
-	largan/lmini/lmini_ccd.lo
+	$(konica_qm150_la_CFLAGS) $(CFLAGS) $(konica_qm150_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_largan_la_OBJECTS = largan/lmini/la-largan.lo \
+	largan/lmini/la-lmini.lo largan/lmini/la-lmini_ccd.lo
 largan_la_OBJECTS = $(am_largan_la_OBJECTS)
 largan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(largan_la_LDFLAGS) $(LDFLAGS) -o $@
-am_lg_gsm_la_OBJECTS = lg_gsm/library.lo lg_gsm/lg_gsm.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(largan_la_CFLAGS) \
+	$(CFLAGS) $(largan_la_LDFLAGS) $(LDFLAGS) -o $@
+am_lg_gsm_la_OBJECTS = lg_gsm/la-library.lo lg_gsm/la-lg_gsm.lo
 lg_gsm_la_OBJECTS = $(am_lg_gsm_la_OBJECTS)
 lg_gsm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(lg_gsm_la_LDFLAGS) $(LDFLAGS) -o $@
-am_mars_la_OBJECTS = mars/library.lo mars/mars.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lg_gsm_la_CFLAGS) \
+	$(CFLAGS) $(lg_gsm_la_LDFLAGS) $(LDFLAGS) -o $@
+am_lumix_la_OBJECTS = lumix/la-lumix.lo
+lumix_la_OBJECTS = $(am_lumix_la_OBJECTS)
+lumix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lumix_la_CFLAGS) \
+	$(CFLAGS) $(lumix_la_LDFLAGS) $(LDFLAGS) -o $@
+am_mars_la_OBJECTS = mars/la-library.lo mars/la-mars.lo
 mars_la_OBJECTS = $(am_mars_la_OBJECTS)
 mars_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(mars_la_LDFLAGS) $(LDFLAGS) -o $@
-am_mustek_la_OBJECTS = mustek/mdc800.lo mustek/core.lo mustek/image.lo \
-	mustek/io.lo mustek/rs232.lo mustek/usb.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mars_la_CFLAGS) \
+	$(CFLAGS) $(mars_la_LDFLAGS) $(LDFLAGS) -o $@
+am_mustek_la_OBJECTS = mustek/la-mdc800.lo mustek/la-core.lo \
+	mustek/la-image.lo mustek/la-io.lo mustek/la-rs232.lo \
+	mustek/la-usb.lo
 mustek_la_OBJECTS = $(am_mustek_la_OBJECTS)
 mustek_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(mustek_la_LDFLAGS) $(LDFLAGS) -o $@
-am_panasonic_coolshot_la_OBJECTS = panasonic/coolshot/coolshot.lo \
-	panasonic/coolshot/library.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mustek_la_CFLAGS) \
+	$(CFLAGS) $(mustek_la_LDFLAGS) $(LDFLAGS) -o $@
+am_panasonic_coolshot_la_OBJECTS = panasonic/coolshot/la-coolshot.lo \
+	panasonic/coolshot/la-library.lo
 panasonic_coolshot_la_OBJECTS = $(am_panasonic_coolshot_la_OBJECTS)
 panasonic_coolshot_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(panasonic_coolshot_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_panasonic_dc1000_la_OBJECTS = panasonic/dc1000.lo panasonic/dc.lo
+	$(panasonic_coolshot_la_CFLAGS) $(CFLAGS) \
+	$(panasonic_coolshot_la_LDFLAGS) $(LDFLAGS) -o $@
+am_panasonic_dc1000_la_OBJECTS = panasonic/dc1000_la-dc1000.lo \
+	panasonic/dc1000_la-dc.lo
 panasonic_dc1000_la_OBJECTS = $(am_panasonic_dc1000_la_OBJECTS)
 panasonic_dc1000_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(panasonic_dc1000_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_panasonic_dc1580_la_OBJECTS = panasonic/dc1580.lo panasonic/dc.lo
+	$(panasonic_dc1000_la_CFLAGS) $(CFLAGS) \
+	$(panasonic_dc1000_la_LDFLAGS) $(LDFLAGS) -o $@
+am_panasonic_dc1580_la_OBJECTS = panasonic/dc1580_la-dc1580.lo \
+	panasonic/dc1580_la-dc.lo
 panasonic_dc1580_la_OBJECTS = $(am_panasonic_dc1580_la_OBJECTS)
 panasonic_dc1580_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(panasonic_dc1580_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_panasonic_l859_la_OBJECTS = panasonic/l859/l859.lo
+	$(panasonic_dc1580_la_CFLAGS) $(CFLAGS) \
+	$(panasonic_dc1580_la_LDFLAGS) $(LDFLAGS) -o $@
+am_panasonic_l859_la_OBJECTS = panasonic/l859/la-l859.lo
 panasonic_l859_la_OBJECTS = $(am_panasonic_l859_la_OBJECTS)
 panasonic_l859_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(panasonic_l859_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_pccam300_la_OBJECTS = pccam300/pccam300.lo pccam300/library.lo
+	$(panasonic_l859_la_CFLAGS) $(CFLAGS) \
+	$(panasonic_l859_la_LDFLAGS) $(LDFLAGS) -o $@
+am_pccam300_la_OBJECTS = pccam300/la-pccam300.lo \
+	pccam300/la-library.lo
 pccam300_la_OBJECTS = $(am_pccam300_la_OBJECTS)
 pccam300_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(pccam300_la_LDFLAGS) $(LDFLAGS) -o $@
-am_pccam600_la_OBJECTS = pccam600/pccam600.lo pccam600/library.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pccam300_la_CFLAGS) \
+	$(CFLAGS) $(pccam300_la_LDFLAGS) $(LDFLAGS) -o $@
+am_pccam600_la_OBJECTS = pccam600/la-pccam600.lo \
+	pccam600/la-library.lo
 pccam600_la_OBJECTS = $(am_pccam600_la_OBJECTS)
 pccam600_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(pccam600_la_LDFLAGS) $(LDFLAGS) -o $@
-am_pentax_la_OBJECTS = pentax/pentax_la-pslr.lo \
-	pentax/pentax_la-library.lo pentax/pentax_la-pslr_enum.lo \
-	pentax/pentax_la-pslr_lens.lo pentax/pentax_la-pslr_model.lo \
-	pentax/pentax_la-js0n.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pccam600_la_CFLAGS) \
+	$(CFLAGS) $(pccam600_la_LDFLAGS) $(LDFLAGS) -o $@
+am_pentax_la_OBJECTS = pentax/la-pslr.lo pentax/la-library.lo \
+	pentax/la-pslr_enum.lo pentax/la-pslr_lens.lo \
+	pentax/la-pslr_model.lo pentax/la-js0n.lo
 pentax_la_OBJECTS = $(am_pentax_la_OBJECTS)
 pentax_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pentax_la_CFLAGS) \
 	$(CFLAGS) $(pentax_la_LDFLAGS) $(LDFLAGS) -o $@
-am_polaroid_pdc320_la_OBJECTS = polaroid/pdc320.lo
+am_polaroid_pdc320_la_OBJECTS = polaroid/pdc320_la-pdc320.lo
 polaroid_pdc320_la_OBJECTS = $(am_polaroid_pdc320_la_OBJECTS)
 polaroid_pdc320_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(polaroid_pdc320_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_polaroid_pdc640_la_OBJECTS = polaroid/pdc640.lo polaroid/jd350e.lo \
-	polaroid/dlink350f.lo
+	$(polaroid_pdc320_la_CFLAGS) $(CFLAGS) \
+	$(polaroid_pdc320_la_LDFLAGS) $(LDFLAGS) -o $@
+am_polaroid_pdc640_la_OBJECTS = polaroid/pdc640_la-pdc640.lo \
+	polaroid/pdc640_la-jd350e.lo polaroid/pdc640_la-dlink350f.lo
 polaroid_pdc640_la_OBJECTS = $(am_polaroid_pdc640_la_OBJECTS)
 polaroid_pdc640_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(polaroid_pdc640_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_polaroid_pdc700_la_OBJECTS = polaroid/pdc700.lo
+	$(polaroid_pdc640_la_CFLAGS) $(CFLAGS) \
+	$(polaroid_pdc640_la_LDFLAGS) $(LDFLAGS) -o $@
+am_polaroid_pdc700_la_OBJECTS = polaroid/pdc700_la-pdc700.lo
 polaroid_pdc700_la_OBJECTS = $(am_polaroid_pdc700_la_OBJECTS)
 polaroid_pdc700_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(polaroid_pdc700_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_ptp2_la_OBJECTS = ptp2/ptp2_la-ptp.lo ptp2/ptp2_la-library.lo \
-	ptp2/ptp2_la-usb.lo ptp2/ptp2_la-ptpip.lo \
-	ptp2/ptp2_la-config.lo ptp2/ptp2_la-olympus-wrap.lo \
-	ptp2/ptp2_la-chdk.lo
+	$(polaroid_pdc700_la_CFLAGS) $(CFLAGS) \
+	$(polaroid_pdc700_la_LDFLAGS) $(LDFLAGS) -o $@
+am_ptp2_la_OBJECTS = ptp2/la-ptp.lo ptp2/la-library.lo ptp2/la-usb.lo \
+	ptp2/la-ptpip.lo ptp2/la-config.lo ptp2/la-olympus-wrap.lo \
+	ptp2/la-chdk.lo ptp2/la-fujiptpip.lo
 ptp2_la_OBJECTS = $(am_ptp2_la_OBJECTS)
 ptp2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ptp2_la_CFLAGS) \
 	$(CFLAGS) $(ptp2_la_LDFLAGS) $(LDFLAGS) -o $@
-am_ricoh_la_OBJECTS = ricoh/library.lo ricoh/ricoh.lo
+am_ricoh_la_OBJECTS = ricoh/la-library.lo ricoh/la-ricoh.lo
 ricoh_la_OBJECTS = $(am_ricoh_la_OBJECTS)
 ricoh_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ricoh_la_LDFLAGS) $(LDFLAGS) -o $@
-am_ricoh_g3_la_OBJECTS = ricoh/g3.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ricoh_la_CFLAGS) \
+	$(CFLAGS) $(ricoh_la_LDFLAGS) $(LDFLAGS) -o $@
+am_ricoh_g3_la_OBJECTS = ricoh/g3_la-g3.lo
 ricoh_g3_la_OBJECTS = $(am_ricoh_g3_la_OBJECTS)
 ricoh_g3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ricoh_g3_la_LDFLAGS) $(LDFLAGS) -o $@
-am_samsung_la_OBJECTS = samsung/samsung.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ricoh_g3_la_CFLAGS) \
+	$(CFLAGS) $(ricoh_g3_la_LDFLAGS) $(LDFLAGS) -o $@
+am_samsung_la_OBJECTS = samsung/la-samsung.lo
 samsung_la_OBJECTS = $(am_samsung_la_OBJECTS)
 samsung_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(samsung_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sierra_la_OBJECTS = sierra/sierra_la-sierra.lo \
-	sierra/sierra_la-library.lo sierra/sierra_la-sierra-usbwrap.lo \
-	sierra/sierra_la-sierra-desc.lo sierra/sierra_la-nikon-desc.lo \
-	sierra/sierra_la-olympus-desc.lo \
-	sierra/sierra_la-epson-desc.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(samsung_la_CFLAGS) \
+	$(CFLAGS) $(samsung_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sierra_la_OBJECTS = sierra/la-sierra.lo sierra/la-library.lo \
+	sierra/la-sierra-usbwrap.lo sierra/la-sierra-desc.lo \
+	sierra/la-nikon-desc.lo sierra/la-olympus-desc.lo \
+	sierra/la-epson-desc.lo
 sierra_la_OBJECTS = $(am_sierra_la_OBJECTS)
 sierra_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sierra_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sipix_blink_la_OBJECTS = sipix/blink.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sierra_la_CFLAGS) \
+	$(CFLAGS) $(sierra_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sipix_blink_la_OBJECTS = sipix/blink_la-blink.lo
 sipix_blink_la_OBJECTS = $(am_sipix_blink_la_OBJECTS)
 sipix_blink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(sipix_blink_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_sipix_blink2_la_OBJECTS = sipix/blink2.lo
+	$(sipix_blink_la_CFLAGS) $(CFLAGS) $(sipix_blink_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_sipix_blink2_la_OBJECTS = sipix/blink2_la-blink2.lo
 sipix_blink2_la_OBJECTS = $(am_sipix_blink2_la_OBJECTS)
 sipix_blink2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(sipix_blink2_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_sipix_web2_la_OBJECTS = sipix/web2.lo
+	$(sipix_blink2_la_CFLAGS) $(CFLAGS) $(sipix_blink2_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_sipix_web2_la_OBJECTS = sipix/web2_la-web2.lo
 sipix_web2_la_OBJECTS = $(am_sipix_web2_la_OBJECTS)
 sipix_web2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sipix_web2_la_LDFLAGS) $(LDFLAGS) -o $@
-am_smal_la_OBJECTS = smal/smal.lo smal/ultrapocket.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sipix_web2_la_CFLAGS) \
+	$(CFLAGS) $(sipix_web2_la_LDFLAGS) $(LDFLAGS) -o $@
+am_smal_la_OBJECTS = smal/la-smal.lo smal/la-ultrapocket.lo
 smal_la_OBJECTS = $(am_smal_la_OBJECTS)
 smal_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(smal_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sonix_la_OBJECTS = sonix/library.lo sonix/sonix.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(smal_la_CFLAGS) \
+	$(CFLAGS) $(smal_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sonix_la_OBJECTS = sonix/la-library.lo sonix/la-sonix.lo
 sonix_la_OBJECTS = $(am_sonix_la_OBJECTS)
 sonix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sonix_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sony_dscf1_la_OBJECTS = sonydscf1/command.lo sonydscf1/sonydscf1.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sonix_la_CFLAGS) \
+	$(CFLAGS) $(sonix_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sony_dscf1_la_OBJECTS = sonydscf1/sony_dscf1_la-command.lo \
+	sonydscf1/sony_dscf1_la-sonydscf1.lo
 sony_dscf1_la_OBJECTS = $(am_sony_dscf1_la_OBJECTS)
 sony_dscf1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sony_dscf1_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sony_dscf55_la_OBJECTS = sonydscf55/sony.lo sonydscf55/camera.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sony_dscf1_la_CFLAGS) \
+	$(CFLAGS) $(sony_dscf1_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sony_dscf55_la_OBJECTS = sonydscf55/sony_dscf55_la-sony.lo \
+	sonydscf55/sony_dscf55_la-camera.lo
 sony_dscf55_la_OBJECTS = $(am_sony_dscf55_la_OBJECTS)
 sony_dscf55_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(sony_dscf55_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_soundvision_la_OBJECTS = soundvision/soundvision.lo \
-	soundvision/agfa_cl18.lo soundvision/tiger_fastflicks.lo \
-	soundvision/commands.lo
+	$(sony_dscf55_la_CFLAGS) $(CFLAGS) $(sony_dscf55_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_soundvision_la_OBJECTS = soundvision/la-soundvision.lo \
+	soundvision/la-agfa_cl18.lo soundvision/la-tiger_fastflicks.lo \
+	soundvision/la-commands.lo
 soundvision_la_OBJECTS = $(am_soundvision_la_OBJECTS)
 soundvision_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(soundvision_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_spca50x_la_OBJECTS = spca50x/spca50x.lo spca50x/spca50x-flash.lo \
-	spca50x/spca50x-sdram.lo spca50x/library.lo
+	$(soundvision_la_CFLAGS) $(CFLAGS) $(soundvision_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_spca50x_la_OBJECTS = spca50x/la-spca50x.lo \
+	spca50x/la-spca50x-flash.lo spca50x/la-spca50x-sdram.lo \
+	spca50x/la-library.lo
 spca50x_la_OBJECTS = $(am_spca50x_la_OBJECTS)
 spca50x_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(spca50x_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sq905_la_OBJECTS = sq905/library.lo sq905/sq905.lo \
-	sq905/postprocess.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(spca50x_la_CFLAGS) \
+	$(CFLAGS) $(spca50x_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sq905_la_OBJECTS = sq905/la-library.lo sq905/la-sq905.lo \
+	sq905/la-postprocess.lo
 sq905_la_OBJECTS = $(am_sq905_la_OBJECTS)
 sq905_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sq905_la_LDFLAGS) $(LDFLAGS) -o $@
-am_st2205_la_OBJECTS = st2205/st2205_la-library.lo \
-	st2205/st2205_la-st2205.lo st2205/st2205_la-st2205_decode.lo \
-	st2205/st2205_la-st2205_tables.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sq905_la_CFLAGS) \
+	$(CFLAGS) $(sq905_la_LDFLAGS) $(LDFLAGS) -o $@
+am_st2205_la_OBJECTS = st2205/la-library.lo st2205/la-st2205.lo \
+	st2205/la-st2205_decode.lo st2205/la-st2205_tables.lo
 st2205_la_OBJECTS = $(am_st2205_la_OBJECTS)
 st2205_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(st2205_la_CFLAGS) \
 	$(CFLAGS) $(st2205_la_LDFLAGS) $(LDFLAGS) -o $@
-am_stv0674_la_OBJECTS = stv0674/stv0674.lo stv0674/library.lo
+am_stv0674_la_OBJECTS = stv0674/la-stv0674.lo stv0674/la-library.lo
 stv0674_la_OBJECTS = $(am_stv0674_la_OBJECTS)
 stv0674_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(stv0674_la_LDFLAGS) $(LDFLAGS) -o $@
-am_stv0680_la_OBJECTS = stv0680/stv0680.lo stv0680/library.lo \
-	stv0680/bayer.lo stv0680/sharpen.lo stv0680/saturate.lo \
-	stv0680/demosaic_sharpen.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(stv0674_la_CFLAGS) \
+	$(CFLAGS) $(stv0674_la_LDFLAGS) $(LDFLAGS) -o $@
+am_stv0680_la_OBJECTS = stv0680/la-stv0680.lo stv0680/la-library.lo \
+	stv0680/la-stv0680-bayer.lo stv0680/la-sharpen.lo \
+	stv0680/la-saturate.lo stv0680/la-demosaic_sharpen.lo
 stv0680_la_OBJECTS = $(am_stv0680_la_OBJECTS)
 stv0680_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(stv0680_la_LDFLAGS) $(LDFLAGS) -o $@
-am_sx330z_la_OBJECTS = sx330z/library.lo sx330z/sx330z.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(stv0680_la_CFLAGS) \
+	$(CFLAGS) $(stv0680_la_LDFLAGS) $(LDFLAGS) -o $@
+am_sx330z_la_OBJECTS = sx330z/la-library.lo sx330z/la-sx330z.lo
 sx330z_la_OBJECTS = $(am_sx330z_la_OBJECTS)
 sx330z_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(sx330z_la_LDFLAGS) $(LDFLAGS) -o $@
-am_template_la_OBJECTS = template/template_la-template.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sx330z_la_CFLAGS) \
+	$(CFLAGS) $(sx330z_la_LDFLAGS) $(LDFLAGS) -o $@
+am_template_la_OBJECTS = template/la-template.lo
 template_la_OBJECTS = $(am_template_la_OBJECTS)
 template_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(template_la_CFLAGS) \
 	$(CFLAGS) $(template_la_LDFLAGS) $(LDFLAGS) -o $@
-am_topfield_la_OBJECTS = topfield/crc16.lo topfield/tf_bytes.lo \
-	topfield/mjd.lo topfield/puppy.lo topfield/usb_io.lo
+am_topfield_la_OBJECTS = topfield/la-crc16.lo topfield/la-tf_bytes.lo \
+	topfield/la-mjd.lo topfield/la-puppy.lo topfield/la-usb_io.lo
 topfield_la_OBJECTS = $(am_topfield_la_OBJECTS)
 topfield_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(topfield_la_LDFLAGS) $(LDFLAGS) -o $@
-am_toshiba_pdrm11_la_OBJECTS = toshiba/pdrm11/library.lo \
-	toshiba/pdrm11/pdrm11.lo
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(topfield_la_CFLAGS) \
+	$(CFLAGS) $(topfield_la_LDFLAGS) $(LDFLAGS) -o $@
+am_toshiba_pdrm11_la_OBJECTS = toshiba/pdrm11/la-library.lo \
+	toshiba/pdrm11/la-pdrm11.lo
 toshiba_pdrm11_la_OBJECTS = $(am_toshiba_pdrm11_la_OBJECTS)
 toshiba_pdrm11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(toshiba_pdrm11_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_tp6801_la_OBJECTS = tp6801/tp6801_la-library.lo \
-	tp6801/tp6801_la-tp6801.lo
+	$(toshiba_pdrm11_la_CFLAGS) $(CFLAGS) \
+	$(toshiba_pdrm11_la_LDFLAGS) $(LDFLAGS) -o $@
+am_tp6801_la_OBJECTS = tp6801/la-library.lo tp6801/la-tp6801.lo
 tp6801_la_OBJECTS = $(am_tp6801_la_OBJECTS)
 tp6801_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(tp6801_la_CFLAGS) \
@@ -723,7 +762,159 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/auto-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = adc65/$(DEPDIR)/la-adc65.Plo \
+	agfa-cl20/$(DEPDIR)/la-agfa_cl20.Plo aox/$(DEPDIR)/la-aox.Plo \
+	aox/$(DEPDIR)/la-library.Plo ax203/$(DEPDIR)/la-ax203.Plo \
+	ax203/$(DEPDIR)/la-ax203_compress_jpeg.Plo \
+	ax203/$(DEPDIR)/la-ax203_decode_yuv.Plo \
+	ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Plo \
+	ax203/$(DEPDIR)/la-jidctflt.Plo \
+	ax203/$(DEPDIR)/la-jpeg_memsrcdest.Plo \
+	ax203/$(DEPDIR)/la-library.Plo ax203/$(DEPDIR)/la-tinyjpeg.Plo \
+	barbie/$(DEPDIR)/la-barbie.Plo canon/$(DEPDIR)/la-canon.Plo \
+	canon/$(DEPDIR)/la-crc.Plo canon/$(DEPDIR)/la-library.Plo \
+	canon/$(DEPDIR)/la-serial.Plo canon/$(DEPDIR)/la-usb.Plo \
+	canon/$(DEPDIR)/la-util.Plo \
+	casio/$(DEPDIR)/qv_la-camtojpeg.Plo \
+	casio/$(DEPDIR)/qv_la-casio-qv-commands.Plo \
+	casio/$(DEPDIR)/qv_la-casio-qv.Plo \
+	casio/$(DEPDIR)/qv_la-ycctoppm.Plo \
+	clicksmart310/$(DEPDIR)/la-clicksmart.Plo \
+	clicksmart310/$(DEPDIR)/la-library.Plo \
+	digigr8/$(DEPDIR)/la-digi_postprocess.Plo \
+	digigr8/$(DEPDIR)/la-digigr8.Plo \
+	digigr8/$(DEPDIR)/la-library.Plo \
+	digita/$(DEPDIR)/la-commands.Plo \
+	digita/$(DEPDIR)/la-digita.Plo digita/$(DEPDIR)/la-serial.Plo \
+	digita/$(DEPDIR)/la-usb.Plo \
+	dimera/$(DEPDIR)/dimera3500_la-dimera3500.Plo \
+	dimera/$(DEPDIR)/dimera3500_la-mesalib.Plo \
+	directory/$(DEPDIR)/la-directory.Plo \
+	docupen/$(DEPDIR)/la-cache.Plo \
+	docupen/$(DEPDIR)/la-calibration.Plo \
+	docupen/$(DEPDIR)/la-docupen.Plo \
+	docupen/$(DEPDIR)/la-huffman.Plo \
+	docupen/$(DEPDIR)/la-image.Plo \
+	enigma13/$(DEPDIR)/la-enigma13.Plo fuji/$(DEPDIR)/la-fuji.Plo \
+	fuji/$(DEPDIR)/la-library.Plo \
+	gsmart300/$(DEPDIR)/la-gsmart300.Plo \
+	gsmart300/$(DEPDIR)/la-library.Plo \
+	hp215/$(DEPDIR)/la-hp215.Plo iclick/$(DEPDIR)/la-iclick.Plo \
+	iclick/$(DEPDIR)/la-library.Plo jamcam/$(DEPDIR)/la-jamcam.Plo \
+	jamcam/$(DEPDIR)/la-library.Plo jd11/$(DEPDIR)/la-decomp.Plo \
+	jd11/$(DEPDIR)/la-jd11.Plo jd11/$(DEPDIR)/la-serial.Plo \
+	jl2005a/$(DEPDIR)/la-jl2005a.Plo \
+	jl2005a/$(DEPDIR)/la-library.Plo \
+	jl2005c/$(DEPDIR)/la-img_enhance.Plo \
+	jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Plo \
+	jl2005c/$(DEPDIR)/la-jl2005c.Plo \
+	jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Plo \
+	jl2005c/$(DEPDIR)/la-library.Plo \
+	kodak/dc120/$(DEPDIR)/la-dc120.Plo \
+	kodak/dc120/$(DEPDIR)/la-library.Plo \
+	kodak/dc210/$(DEPDIR)/la-dc210.Plo \
+	kodak/dc210/$(DEPDIR)/la-library.Plo \
+	kodak/dc240/$(DEPDIR)/la-dc240.Plo \
+	kodak/dc240/$(DEPDIR)/la-library.Plo \
+	kodak/dc3200/$(DEPDIR)/la-dc3200.Plo \
+	kodak/dc3200/$(DEPDIR)/la-library.Plo \
+	kodak/ez200/$(DEPDIR)/la-ez200.Plo \
+	konica/$(DEPDIR)/la-konica.Plo konica/$(DEPDIR)/la-library.Plo \
+	konica/$(DEPDIR)/la-lowlevel.Plo \
+	konica/$(DEPDIR)/qm150_la-qm150.Plo \
+	largan/lmini/$(DEPDIR)/la-largan.Plo \
+	largan/lmini/$(DEPDIR)/la-lmini.Plo \
+	largan/lmini/$(DEPDIR)/la-lmini_ccd.Plo \
+	lg_gsm/$(DEPDIR)/la-lg_gsm.Plo lg_gsm/$(DEPDIR)/la-library.Plo \
+	lumix/$(DEPDIR)/la-lumix.Plo mars/$(DEPDIR)/la-library.Plo \
+	mars/$(DEPDIR)/la-mars.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-data.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-download.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-info.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-status.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Plo \
+	minolta/dimagev/$(DEPDIR)/dimagev_la-util.Plo \
+	mustek/$(DEPDIR)/la-core.Plo mustek/$(DEPDIR)/la-image.Plo \
+	mustek/$(DEPDIR)/la-io.Plo mustek/$(DEPDIR)/la-mdc800.Plo \
+	mustek/$(DEPDIR)/la-rs232.Plo mustek/$(DEPDIR)/la-usb.Plo \
+	panasonic/$(DEPDIR)/dc1000_la-dc.Plo \
+	panasonic/$(DEPDIR)/dc1000_la-dc1000.Plo \
+	panasonic/$(DEPDIR)/dc1580_la-dc.Plo \
+	panasonic/$(DEPDIR)/dc1580_la-dc1580.Plo \
+	panasonic/coolshot/$(DEPDIR)/la-coolshot.Plo \
+	panasonic/coolshot/$(DEPDIR)/la-library.Plo \
+	panasonic/l859/$(DEPDIR)/la-l859.Plo \
+	pccam300/$(DEPDIR)/la-library.Plo \
+	pccam300/$(DEPDIR)/la-pccam300.Plo \
+	pccam600/$(DEPDIR)/la-library.Plo \
+	pccam600/$(DEPDIR)/la-pccam600.Plo \
+	pentax/$(DEPDIR)/la-js0n.Plo pentax/$(DEPDIR)/la-library.Plo \
+	pentax/$(DEPDIR)/la-pslr.Plo pentax/$(DEPDIR)/la-pslr_enum.Plo \
+	pentax/$(DEPDIR)/la-pslr_lens.Plo \
+	pentax/$(DEPDIR)/la-pslr_model.Plo \
+	polaroid/$(DEPDIR)/pdc320_la-pdc320.Plo \
+	polaroid/$(DEPDIR)/pdc640_la-dlink350f.Plo \
+	polaroid/$(DEPDIR)/pdc640_la-jd350e.Plo \
+	polaroid/$(DEPDIR)/pdc640_la-pdc640.Plo \
+	polaroid/$(DEPDIR)/pdc700_la-pdc700.Plo \
+	ptp2/$(DEPDIR)/la-chdk.Plo ptp2/$(DEPDIR)/la-config.Plo \
+	ptp2/$(DEPDIR)/la-fujiptpip.Plo ptp2/$(DEPDIR)/la-library.Plo \
+	ptp2/$(DEPDIR)/la-olympus-wrap.Plo ptp2/$(DEPDIR)/la-ptp.Plo \
+	ptp2/$(DEPDIR)/la-ptpip.Plo ptp2/$(DEPDIR)/la-usb.Plo \
+	ricoh/$(DEPDIR)/g3_la-g3.Plo ricoh/$(DEPDIR)/la-library.Plo \
+	ricoh/$(DEPDIR)/la-ricoh.Plo samsung/$(DEPDIR)/la-samsung.Plo \
+	sierra/$(DEPDIR)/la-epson-desc.Plo \
+	sierra/$(DEPDIR)/la-library.Plo \
+	sierra/$(DEPDIR)/la-nikon-desc.Plo \
+	sierra/$(DEPDIR)/la-olympus-desc.Plo \
+	sierra/$(DEPDIR)/la-sierra-desc.Plo \
+	sierra/$(DEPDIR)/la-sierra-usbwrap.Plo \
+	sierra/$(DEPDIR)/la-sierra.Plo \
+	sipix/$(DEPDIR)/blink2_la-blink2.Plo \
+	sipix/$(DEPDIR)/blink_la-blink.Plo \
+	sipix/$(DEPDIR)/web2_la-web2.Plo smal/$(DEPDIR)/la-smal.Plo \
+	smal/$(DEPDIR)/la-ultrapocket.Plo \
+	sonix/$(DEPDIR)/la-library.Plo sonix/$(DEPDIR)/la-sonix.Plo \
+	sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Plo \
+	sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Plo \
+	sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Plo \
+	sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Plo \
+	soundvision/$(DEPDIR)/la-agfa_cl18.Plo \
+	soundvision/$(DEPDIR)/la-commands.Plo \
+	soundvision/$(DEPDIR)/la-soundvision.Plo \
+	soundvision/$(DEPDIR)/la-tiger_fastflicks.Plo \
+	spca50x/$(DEPDIR)/la-library.Plo \
+	spca50x/$(DEPDIR)/la-spca50x-flash.Plo \
+	spca50x/$(DEPDIR)/la-spca50x-sdram.Plo \
+	spca50x/$(DEPDIR)/la-spca50x.Plo \
+	sq905/$(DEPDIR)/la-library.Plo \
+	sq905/$(DEPDIR)/la-postprocess.Plo \
+	sq905/$(DEPDIR)/la-sq905.Plo st2205/$(DEPDIR)/la-library.Plo \
+	st2205/$(DEPDIR)/la-st2205.Plo \
+	st2205/$(DEPDIR)/la-st2205_decode.Plo \
+	st2205/$(DEPDIR)/la-st2205_tables.Plo \
+	stv0674/$(DEPDIR)/la-library.Plo \
+	stv0674/$(DEPDIR)/la-stv0674.Plo \
+	stv0680/$(DEPDIR)/la-demosaic_sharpen.Plo \
+	stv0680/$(DEPDIR)/la-library.Plo \
+	stv0680/$(DEPDIR)/la-saturate.Plo \
+	stv0680/$(DEPDIR)/la-sharpen.Plo \
+	stv0680/$(DEPDIR)/la-stv0680-bayer.Plo \
+	stv0680/$(DEPDIR)/la-stv0680.Plo \
+	sx330z/$(DEPDIR)/la-library.Plo sx330z/$(DEPDIR)/la-sx330z.Plo \
+	template/$(DEPDIR)/la-template.Plo \
+	topfield/$(DEPDIR)/la-crc16.Plo topfield/$(DEPDIR)/la-mjd.Plo \
+	topfield/$(DEPDIR)/la-puppy.Plo \
+	topfield/$(DEPDIR)/la-tf_bytes.Plo \
+	topfield/$(DEPDIR)/la-usb_io.Plo \
+	toshiba/pdrm11/$(DEPDIR)/la-library.Plo \
+	toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Plo \
+	tp6801/$(DEPDIR)/la-library.Plo tp6801/$(DEPDIR)/la-tp6801.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -749,16 +940,16 @@
 	$(clicksmart310_la_SOURCES) $(digigr8_la_SOURCES) \
 	$(digita_la_SOURCES) $(dimagev_la_SOURCES) \
 	$(dimera3500_la_SOURCES) $(directory_la_SOURCES) \
-	$(enigma13_la_SOURCES) $(fuji_la_SOURCES) \
-	$(gsmart300_la_SOURCES) $(hp215_la_SOURCES) \
+	$(docupen_la_SOURCES) $(enigma13_la_SOURCES) \
+	$(fuji_la_SOURCES) $(gsmart300_la_SOURCES) $(hp215_la_SOURCES) \
 	$(iclick_la_SOURCES) $(jamcam_la_SOURCES) $(jd11_la_SOURCES) \
 	$(jl2005a_la_SOURCES) $(jl2005c_la_SOURCES) \
 	$(kodak_dc120_la_SOURCES) $(kodak_dc210_la_SOURCES) \
 	$(kodak_dc240_la_SOURCES) $(kodak_dc3200_la_SOURCES) \
 	$(kodak_ez200_la_SOURCES) $(konica_la_SOURCES) \
 	$(konica_qm150_la_SOURCES) $(largan_la_SOURCES) \
-	$(lg_gsm_la_SOURCES) $(mars_la_SOURCES) $(mustek_la_SOURCES) \
-	$(panasonic_coolshot_la_SOURCES) \
+	$(lg_gsm_la_SOURCES) $(lumix_la_SOURCES) $(mars_la_SOURCES) \
+	$(mustek_la_SOURCES) $(panasonic_coolshot_la_SOURCES) \
 	$(panasonic_dc1000_la_SOURCES) $(panasonic_dc1580_la_SOURCES) \
 	$(panasonic_l859_la_SOURCES) $(pccam300_la_SOURCES) \
 	$(pccam600_la_SOURCES) $(pentax_la_SOURCES) \
@@ -781,16 +972,16 @@
 	$(clicksmart310_la_SOURCES) $(digigr8_la_SOURCES) \
 	$(digita_la_SOURCES) $(dimagev_la_SOURCES) \
 	$(dimera3500_la_SOURCES) $(directory_la_SOURCES) \
-	$(enigma13_la_SOURCES) $(fuji_la_SOURCES) \
-	$(gsmart300_la_SOURCES) $(hp215_la_SOURCES) \
+	$(docupen_la_SOURCES) $(enigma13_la_SOURCES) \
+	$(fuji_la_SOURCES) $(gsmart300_la_SOURCES) $(hp215_la_SOURCES) \
 	$(iclick_la_SOURCES) $(jamcam_la_SOURCES) $(jd11_la_SOURCES) \
 	$(jl2005a_la_SOURCES) $(jl2005c_la_SOURCES) \
 	$(kodak_dc120_la_SOURCES) $(kodak_dc210_la_SOURCES) \
 	$(kodak_dc240_la_SOURCES) $(kodak_dc3200_la_SOURCES) \
 	$(kodak_ez200_la_SOURCES) $(konica_la_SOURCES) \
 	$(konica_qm150_la_SOURCES) $(largan_la_SOURCES) \
-	$(lg_gsm_la_SOURCES) $(mars_la_SOURCES) $(mustek_la_SOURCES) \
-	$(panasonic_coolshot_la_SOURCES) \
+	$(lg_gsm_la_SOURCES) $(lumix_la_SOURCES) $(mars_la_SOURCES) \
+	$(mustek_la_SOURCES) $(panasonic_coolshot_la_SOURCES) \
 	$(panasonic_dc1000_la_SOURCES) $(panasonic_dc1580_la_SOURCES) \
 	$(panasonic_l859_la_SOURCES) $(pccam300_la_SOURCES) \
 	$(pccam600_la_SOURCES) $(pentax_la_SOURCES) \
@@ -820,7 +1011,8 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(camlibdoc_DATA) $(localization_DATA) $(noinst_DATA)
+DATA = $(camlibdoc_DATA) $(dist_konicalocalization_DATA) \
+	$(localization_DATA) $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -828,7 +1020,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -846,8 +1038,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/adc65/Makefile-files \
 	$(srcdir)/agfa-cl20/Makefile-files \
@@ -859,6 +1049,7 @@
 	$(srcdir)/digita/Makefile-files \
 	$(srcdir)/dimera/Makefile-files \
 	$(srcdir)/directory/Makefile-files \
+	$(srcdir)/docupen/Makefile-files \
 	$(srcdir)/enigma13/Makefile-files \
 	$(srcdir)/fuji/Makefile-files \
 	$(srcdir)/gsmart300/Makefile-files \
@@ -874,8 +1065,8 @@
 	$(srcdir)/kodak/ez200/Makefile-files \
 	$(srcdir)/konica/Makefile-files \
 	$(srcdir)/largan/lmini/Makefile-files \
-	$(srcdir)/lg_gsm/Makefile-files $(srcdir)/mars/Makefile-files \
-	$(srcdir)/minolta/Makefile-files \
+	$(srcdir)/lg_gsm/Makefile-files $(srcdir)/lumix/Makefile-files \
+	$(srcdir)/mars/Makefile-files $(srcdir)/minolta/Makefile-files \
 	$(srcdir)/minolta/dimagev/Makefile-files \
 	$(srcdir)/mustek/Makefile-files \
 	$(srcdir)/panasonic/Makefile-files \
@@ -929,13 +1120,9 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALL_DEFAULT_CAMLIBS = @ALL_DEFAULT_CAMLIBS@
-ALL_DEFINED_CAMLIBS = @ALL_DEFINED_CAMLIBS@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir) -I$(top_builddir) \
-	-I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/libgphoto2 \
-	-I$(top_builddir)/libgphoto2
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
@@ -945,18 +1132,21 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BISON = @BISON@
-BUILD_THESE_CAMLIBS = @BUILD_THESE_CAMLIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CMP = @CMP@
+COMM = @COMM@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_CAMLIBS = @DEFAULT_CAMLIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -969,11 +1159,26 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
+EXPR = @EXPR@
 FGREP = @FGREP@
-FLEX = @FLEX@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+FILECMD = @FILECMD@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE_LIBGPHOTO2 = @GETTEXT_PACKAGE_LIBGPHOTO2@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GP_CAMLIB_SET = @GP_CAMLIB_SET@
+GP_CAMLIB_SET_EVERYTHING = @GP_CAMLIB_SET_EVERYTHING@
+GP_PEDANTIC_CFLAGS_C11 = @GP_PEDANTIC_CFLAGS_C11@
+GP_PEDANTIC_CFLAGS_C2X = @GP_PEDANTIC_CFLAGS_C2X@
+GP_PEDANTIC_CFLAGS_C90 = @GP_PEDANTIC_CFLAGS_C90@
+GP_PEDANTIC_CFLAGS_C99 = @GP_PEDANTIC_CFLAGS_C99@
+GP_PEDANTIC_CXXFLAGS_CXX11 = @GP_PEDANTIC_CXXFLAGS_CXX11@
+GP_PEDANTIC_CXXFLAGS_CXX14 = @GP_PEDANTIC_CXXFLAGS_CXX14@
+GP_PEDANTIC_CXXFLAGS_CXX17 = @GP_PEDANTIC_CXXFLAGS_CXX17@
+GP_PEDANTIC_CXXFLAGS_CXX20 = @GP_PEDANTIC_CXXFLAGS_CXX20@
+GP_PEDANTIC_CXXFLAGS_CXX98 = @GP_PEDANTIC_CXXFLAGS_CXX98@
 GREP = @GREP@
 GTKDOC = @GTKDOC@
 HAVE_DOT = @HAVE_DOT@
@@ -985,8 +1190,12 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_CONFIG_PROG = @LIBCURL_CONFIG_PROG@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
 LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
 LIBEXIF_LIBS = @LIBEXIF_LIBS@
@@ -1000,11 +1209,14 @@
 LIBGPHOTO2_VERSION_INFO = @LIBGPHOTO2_VERSION_INFO@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBJPEG = @LIBJPEG@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
 LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBWS232_CFLAGS = @LIBWS232_CFLAGS@
+LIBWS232_LIBS = @LIBWS232_LIBS@
 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
 LIBXML2_CONFIG_PROG = @LIBXML2_CONFIG_PROG@
 LIBXML2_LIBS = @LIBXML2_LIBS@
@@ -1021,8 +1233,9 @@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MMAP_LIBS = @MMAP_LIBS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -1044,14 +1257,19 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+REQUIREMENTS_FOR_LIBCURL = @REQUIREMENTS_FOR_LIBCURL@
 REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
 REQUIREMENTS_FOR_LIBGD = @REQUIREMENTS_FOR_LIBGD@
 REQUIREMENTS_FOR_LIBXML2 = @REQUIREMENTS_FOR_LIBXML2@
-RPMBUILD = @RPMBUILD@
+RSYNC = @RSYNC@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SLEEP = @SLEEP@
+SORT = @SORT@
 STRIP = @STRIP@
+TR = @TR@
+UNIQ = @UNIQ@
 URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
 URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
 URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
@@ -1059,8 +1277,9 @@
 URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-VERSIONMAPLDFLAGS = @VERSIONMAPLDFLAGS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -1113,6 +1332,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1132,7 +1352,7 @@
 #
 # Building the camlibs itself is defined in the Makefile-files
 # included below.
-SUBDIRS = . canon/doc konica/localization
+SUBDIRS = . canon/doc
 
 ########################################################################
 # Define the common variables added to in the included Makefile-files
@@ -1141,81 +1361,84 @@
 # Make sure that the list of camlibs defined in configure.ac using
 # GP_CAMLIB(...) and the list of camlibs defined in */Makefile-files
 # match.
-CLEANFILES = all-src-camlibs all-def-camlibs
 
-# SUBDIRS = coolshot l859
-EXTRA_DIST = camlib.sym adc65/README.adc65 adc65/TODO adc65/Changelog \
+# List all camlibs defined in configure.ac
+
+# List all camlibs defined in the camlibs/ source subtree Makefile-files
+CLEANFILES = all-cfg-camlibs all-mkf-camlibs
+EXTRA_DIST = camlib.sym adc65/Changelog adc65/README.adc65 adc65/TODO \
+	agfa-cl20/ChangeLog agfa-cl20/RANDOM \
 	agfa-cl20/README.agfa-cl20 agfa-cl20/STATUS \
-	agfa-cl20/ChangeLog agfa-cl20/protocol.txt \
-	agfa-cl20/protocol2.txt agfa-cl20/commands.txt \
-	agfa-cl20/pic-header.txt agfa-cl20/RANDOM aox/README.aox \
-	aox/ChangeLog ax203/README.ax203-compression \
-	ax203/README.ax203 barbie/Protocol.txt barbie/ChangeLog \
+	agfa-cl20/commands.txt agfa-cl20/pic-header.txt \
+	agfa-cl20/protocol.txt agfa-cl20/protocol2.txt aox/ChangeLog \
+	aox/README.aox ax203/README.ax203-compression \
+	ax203/README.ax203 barbie/ChangeLog barbie/Protocol.txt \
 	canon/.indent.pro canon/ChangeLog canon/urb-interpret \
-	canon/README.canon canon/TODO casio/PROTOCOL.txt \
-	casio/ChangeLog clicksmart310/README.clicksmart310 \
-	digigr8/README.905C digigr8/README.9050 digigr8/README.9051 \
-	digigr8/README.9052 digigr8/README.913D digigr8/ChangeLog \
-	digita/ChangeLog dimera/CREDITS dimera/Protocol.txt \
-	dimera/ChangeLog dimera/TODO directory/ChangeLog \
-	enigma13/STATUS enigma13/protocol.txt enigma13/README.enigma13 \
-	enigma13/ChangeLog fuji/PROTOCOL fuji/ChangeLog \
-	gsmart300/README.gsmart300 gsmart300/ChangeLog hp215/ChangeLog \
-	hp215/PROTOCOL iclick/README.iclick iclick/ChangeLog \
-	jamcam/README.jamcam jamcam/ChangeLog jd11/jd11.html \
-	jd11/ChangeLog jl2005a/README.jl2005a jl2005a/ChangeLog \
-	jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression \
-	jl2005c/ChangeLog kodak/dc120/ChangeLog kodak/dc210/ChangeLog \
-	kodak/dc210/TODO kodak/dc240/ChangeLog kodak/dc3200/ChangeLog \
-	kodak/ez200/Protocol.txt kodak/ez200/ez200-lsusb.txt \
-	kodak/ez200/ChangeLog kodak/CAMERAS konica/EXPERTS \
-	konica/qm150.txt konica/README.konica konica/ChangeLog \
-	konica/COPYING konica/TODO largan/lmini/README.largan-lmini \
-	largan/lmini/ChangeLog lg_gsm/README.lg_gsm lg_gsm/ChangeLog \
-	mars/protocol.txt mars/README.mars mars/ChangeLog \
-	minolta/dimagev/README.minolta-dimagev minolta/dimagev/COPYING \
-	minolta/NEWER_MINOLTAS mustek/AUTHOR mustek/README.mustek \
-	mustek/ChangeLog mustek/STATUS \
+	canon/TODO canon/README.canon casio/ChangeLog \
+	casio/PROTOCOL.txt clicksmart310/README.clicksmart310 \
+	digigr8/ChangeLog digigr8/README.9050 digigr8/README.9051 \
+	digigr8/README.9052 digigr8/README.905C digigr8/README.913D \
+	digita/ChangeLog dimera/CREDITS dimera/ChangeLog \
+	dimera/Protocol.txt dimera/TODO directory/ChangeLog \
+	docupen/ChangeLog enigma13/ChangeLog enigma13/README.enigma13 \
+	enigma13/STATUS enigma13/protocol.txt fuji/ChangeLog \
+	fuji/PROTOCOL gsmart300/ChangeLog gsmart300/README.gsmart300 \
+	hp215/ChangeLog hp215/PROTOCOL iclick/ChangeLog \
+	iclick/README.iclick jamcam/ChangeLog jamcam/README.jamcam \
+	jd11/ChangeLog jd11/jd11.html jl2005a/ChangeLog \
+	jl2005a/README.jl2005a jl2005c/README.jl2005c \
+	jl2005c/README.jl2005bcd-compression jl2005c/ChangeLog \
+	kodak/dc120/ChangeLog kodak/dc210/ChangeLog kodak/dc210/TODO \
+	kodak/dc240/ChangeLog kodak/dc3200/ChangeLog \
+	kodak/ez200/ChangeLog kodak/ez200/Protocol.txt \
+	kodak/ez200/ez200-lsusb.txt kodak/CAMERAS konica/COPYING \
+	konica/ChangeLog konica/EXPERTS konica/TODO konica/qm150.txt \
+	konica/README.konica largan/lmini/ChangeLog \
+	largan/lmini/README.largan-lmini lg_gsm/ChangeLog \
+	lg_gsm/README.lg_gsm lumix/README.lumix mars/ChangeLog \
+	mars/protocol.txt mars/README.mars minolta/dimagev/COPYING \
+	minolta/dimagev/README.minolta-dimagev minolta/NEWER_MINOLTAS \
+	mustek/AUTHOR mustek/ChangeLog mustek/STATUS \
+	mustek/README.mustek panasonic/coolshot/ChangeLog \
 	panasonic/coolshot/README.panasonic-coolshot \
-	panasonic/coolshot/ChangeLog \
-	panasonic/l859/README.panasonic-l859 panasonic/l859/ChangeLog \
-	panasonic/l859/TODO panasonic/README.panasonic \
-	panasonic/ChangeLog pccam300/README.pccam300 \
-	pccam300/pccam300-lsusb.txt pccam300/ChangeLog \
-	pccam600/README.pccam600 pccam600/ChangeLog \
-	pentax/README.pentax pentax/ChangeLog \
-	pentax/exiftool_pentax_lens.txt polaroid/jpeg.txt \
-	polaroid/jpeghead.h polaroid/pdc320.html polaroid/gt98x.html \
-	polaroid/ChangeLog ptp2/ptp-pack.c ptp2/PTPIP.TXT \
-	ptp2/README.ptp2 ptp2/TODO ptp2/ChangeLog ptp2/ptpip.html \
-	ptp2/TESTPLAN.ptp2 ricoh/g3.txt ricoh/ChangeLog \
-	samsung/ChangeLog sierra/PROTOCOL sierra/ChangeLog \
-	sierra/MC-EU1-Protocol.txt sipix/web2.html sipix/blink.c \
-	sipix/blink.txt sipix/xjpeg.c sipix/blink2.txt sipix/ChangeLog \
-	smal/README.smal smal/ChangeLog sonix/README.sonix \
-	sonix/ChangeLog sonydscf1/README.sonydscf1 sonydscf1/ChangeLog \
-	sonydscf55/ChangeLog sonydscf55/TODO \
-	soundvision/README.soundvision soundvision/BUGS \
-	soundvision/ChangeLog spca50x/ChangeLog.benq \
+	panasonic/l859/ChangeLog panasonic/l859/TODO \
+	panasonic/l859/README.panasonic-l859 panasonic/ChangeLog \
+	panasonic/README.panasonic pccam300/ChangeLog \
+	pccam300/pccam300-lsusb.txt pccam300/README.pccam300 \
+	pccam600/ChangeLog pccam600/README.pccam600 pentax/ChangeLog \
+	pentax/exiftool_pentax_lens.txt pentax/README.pentax \
+	polaroid/ChangeLog polaroid/gt98x.html polaroid/jpeg.txt \
+	polaroid/jpeghead.h polaroid/pdc320.html ptp2/ChangeLog \
+	ptp2/PTPIP.TXT ptp2/TESTPLAN.ptp2 ptp2/TODO \
+	ptp2/canon-eos-olc.txt ptp2/ptp-pack.c ptp2/ptpip.html \
+	ptp2/README.ptp2 ricoh/ChangeLog ricoh/g3.txt \
+	samsung/ChangeLog sierra/ChangeLog sierra/MC-EU1-Protocol.txt \
+	sierra/PROTOCOL sipix/ChangeLog sipix/blink.c sipix/blink.txt \
+	sipix/blink2.txt sipix/web2.html sipix/xjpeg.c smal/ChangeLog \
+	smal/README.smal sonix/ChangeLog sonix/README.sonix \
+	sonydscf1/ChangeLog sonydscf1/README.sonydscf1 \
+	sonydscf55/ChangeLog sonydscf55/TODO soundvision/BUGS \
+	soundvision/ChangeLog soundvision/README.soundvision \
+	spca50x/ChangeLog spca50x/ChangeLog.benq \
 	spca50x/ChangeLog.gsmart spca50x/ChangeLog.spca504_flash \
-	spca50x/lsusb-v spca50x/README.spca50x spca50x/ChangeLog \
-	sq905/README.913C sq905/README.sq905 sq905/ChangeLog \
-	sq905/TODO st2205/README.st2205-compression \
-	st2205/README.st2205 stv0674/Protocol stv0674/Changelog \
-	stv0680/CREDITS stv0680/ChangeLog stv0680/LICENCE \
-	stv0680/README.pdf \
+	spca50x/lsusb-v spca50x/README.spca50x sq905/ChangeLog \
+	sq905/TODO sq905/README.913C sq905/README.sq905 \
+	st2205/README.st2205-compression st2205/README.st2205 \
+	stv0674/Changelog stv0674/Protocol \
 	stv0680/680_commands_and_communication_sdk.pdf.gz \
-	sx330z/ChangeLog template/README.template template/ChangeLog \
-	topfield/ChangeLog toshiba/pdrm11/README.toshiba-pdrm11 \
-	tp6801/README.tp6801 tp6801/tp6801-dump.c
+	stv0680/CREDITS stv0680/ChangeLog stv0680/LICENCE \
+	stv0680/README.pdf sx330z/ChangeLog template/ChangeLog \
+	template/README.template topfield/ChangeLog \
+	toshiba/pdrm11/README.toshiba-pdrm11 tp6801/tp6801-dump.c \
+	tp6801/README.tp6801
 camlibdoc_DATA = adc65/README.adc65 agfa-cl20/README.agfa-cl20 \
 	aox/README.aox ax203/README.ax203-compression \
 	ax203/README.ax203 canon/README.canon \
-	clicksmart310/README.clicksmart310 digigr8/README.905C \
-	digigr8/README.9050 digigr8/README.9051 digigr8/README.9052 \
+	clicksmart310/README.clicksmart310 digigr8/README.9050 \
+	digigr8/README.9051 digigr8/README.9052 digigr8/README.905C \
 	digigr8/README.913D enigma13/README.enigma13 \
 	gsmart300/README.gsmart300 iclick/README.iclick \
-	jamcam/README.jamcam jl2005a/README.jl2005a jl2005a/ChangeLog \
+	jamcam/README.jamcam jl2005a/README.jl2005a \
 	jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression \
 	konica/README.konica largan/lmini/README.largan-lmini \
 	lg_gsm/README.lg_gsm mars/README.mars \
@@ -1231,489 +1454,581 @@
 	toshiba/pdrm11/README.toshiba-pdrm11 tp6801/README.tp6801
 localization_DATA = 
 localizationdir = 
-noinst_DATA = template/README.template
+noinst_DATA = lumix/README.lumix template/README.template
 noinst_LTLIBRARIES = template.la
 
+# "ideal" version:
+# + only export the 3 symbols
+# + -no-undefined, (i.e. Win32 support)
+# - needs lengthy definition in every camlib's Makefile.am
+# + nice short name
+#   + makes renaming the exported symbols to canon_LTX_<symbol> realistic
+#     without ## macros
+#   + makes it possible to have the same name the module filename and
+#     the camlib name returned by camera_id()
+
+#EXTRA_DIST             += docupen/README.docupen
+#camlibdoc_DATA         += docupen/README.docupen
+
 # Seems to be obsolete
 EXTRA_LTLIBRARIES = adc65.la agfa_cl20.la aox.la ax203.la barbie.la \
 	canon.la casio_qv.la clicksmart310.la digigr8.la digita.la \
-	dimera3500.la directory.la enigma13.la fuji.la gsmart300.la \
-	hp215.la iclick.la jamcam.la jd11.la jl2005a.la jl2005c.la \
-	kodak_dc120.la kodak_dc210.la kodak_dc240.la kodak_dc3200.la \
-	kodak_ez200.la konica.la konica_qm150.la largan.la lg_gsm.la \
-	mars.la dimagev.la mustek.la panasonic_coolshot.la \
-	panasonic_l859.la panasonic_dc1000.la panasonic_dc1580.la \
-	pccam300.la pccam600.la pentax.la polaroid_pdc320.la \
-	polaroid_pdc640.la polaroid_pdc700.la ptp2.la ricoh.la \
-	ricoh_g3.la samsung.la sierra.la sipix_blink.la \
-	sipix_blink2.la sipix_web2.la smal.la sonix.la sony_dscf1.la \
-	sony_dscf55.la soundvision.la spca50x.la sq905.la st2205.la \
-	stv0674.la stv0680.la sx330z.la topfield.la toshiba_pdrm11.la \
-	tp6801.la
+	dimera3500.la directory.la docupen.la enigma13.la fuji.la \
+	gsmart300.la hp215.la iclick.la jamcam.la jd11.la jl2005a.la \
+	jl2005c.la kodak_dc120.la kodak_dc210.la kodak_dc240.la \
+	kodak_dc3200.la kodak_ez200.la konica.la konica_qm150.la \
+	largan.la lg_gsm.la lumix.la mars.la dimagev.la mustek.la \
+	panasonic_coolshot.la panasonic_l859.la panasonic_dc1000.la \
+	panasonic_dc1580.la pccam300.la pccam600.la pentax.la \
+	polaroid_pdc320.la polaroid_pdc640.la polaroid_pdc700.la \
+	ptp2.la ricoh.la ricoh_g3.la samsung.la sierra.la \
+	sipix_blink.la sipix_blink2.la sipix_web2.la smal.la sonix.la \
+	sony_dscf1.la sony_dscf55.la soundvision.la spca50x.la \
+	sq905.la st2205.la stv0674.la stv0680.la sx330z.la topfield.la \
+	toshiba_pdrm11.la tp6801.la
+
+########################################################################
+# We pass the list of camlibs through this set of variables in order
+# to remain compatible with older calling conventions.
+
+# Actually implement BUILD_THESE_CAMLIBS as documented
+BUILD_THESE_CAMLIBS = $(GP_CAMLIB_SET)
+
+# while keeping compatibility with the variable which has been working
+# for so long
+INSTALL_THESE_CAMLIBS = $(BUILD_THESE_CAMLIBS)
 
 ########################################################################
 # All camlibs are defined as EXTRA_LTLIBRARIES. This requires that
 # all camlibs have -rpath set explicitly in foobar_la_LDFLAGS.
 # You're probably best off by using the camlib_* variables defined
 # below.
-camlib_LTLIBRARIES = $(BUILD_THESE_CAMLIBS)
+camlib_LTLIBRARIES = $(INSTALL_THESE_CAMLIBS)
 
 ########################################################################
 # Define the compile/link/etc. flags common to all camlibs in one place,
 # i.e. here.
 camlib_dependencies = $(top_srcdir)/camlibs/camlib.sym
 camlib_ldflags = -module -no-undefined -avoid-version -export-dynamic \
-	-export-symbols '$(top_srcdir)/camlibs/camlib.sym' \
-	-rpath '$(camlibdir)'
-
-camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la 
+	-export-symbols '$(top_srcdir)/camlibs/camlib.sym' -rpath \
+	'$(camlibdir)'
+camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+camlib_cflags = 
+camlib_cppflags = $(AM_CPPFLAGS) -I$(top_srcdir) -I$(top_builddir) \
+	-I$(top_srcdir)/libgphoto2_port
 adc65_la_SOURCES = adc65/adc65.c
-adc65_la_LDFLAGS = $(camlib_ldflags)
+adc65_la_CFLAGS = $(camlib_cflags)
+adc65_la_CPPFLAGS = $(camlib_cppflags)
 adc65_la_DEPENDENCIES = $(camlib_dependencies)
+adc65_la_LDFLAGS = $(camlib_ldflags)
 adc65_la_LIBADD = $(camlib_libadd)
 agfa_cl20_la_SOURCES = agfa-cl20/agfa_cl20.c
-agfa_cl20_la_LDFLAGS = $(camlib_ldflags)
+agfa_cl20_la_CFLAGS = $(camlib_cflags)
+agfa_cl20_la_CPPFLAGS = $(camlib_cppflags)
 agfa_cl20_la_DEPENDENCIES = $(camlib_dependencies)
+agfa_cl20_la_LDFLAGS = $(camlib_ldflags)
 agfa_cl20_la_LIBADD = $(camlib_libadd)
 aox_la_SOURCES = aox/library.c aox/aox.c aox/aox.h
+aox_la_CFLAGS = $(camlib_cflags)
+aox_la_CPPFLAGS = $(camlib_cppflags)
+aox_la_DEPENDENCIES = $(camlib_dependencies)
 aox_la_LDFLAGS = $(camlib_ldflags)
-aox_la_DEPENDENCIES = $(camlib_dependencies) 
 aox_la_LIBADD = $(camlib_libadd)
-ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h ax203/tinyjpeg-internal.h ax203/jidctflt.c
-ax203_la_LDFLAGS = $(camlib_ldflags)
+ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h \
+	ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c \
+	ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h \
+	ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h \
+	ax203/tinyjpeg-internal.h ax203/jidctflt.c
+ax203_la_CFLAGS = $(camlib_cflags)
+ax203_la_CPPFLAGS = $(camlib_cppflags) $(LIBGD_CFLAGS) \
+	$(LIBJPEG_CFLAGS)
 ax203_la_DEPENDENCIES = $(camlib_dependencies)
-ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ @LIBJPEG@
-ax203_la_CFLAGS = @LIBGD_CFLAGS@
+ax203_la_LDFLAGS = $(camlib_ldflags)
+ax203_la_LIBADD = $(camlib_libadd) $(LIBGD_LIBS) $(LIBJPEG_LIBS)
 barbie_la_SOURCES = barbie/barbie.c
-barbie_la_LDFLAGS = $(camlib_ldflags)
+barbie_la_CFLAGS = $(camlib_cflags)
+barbie_la_CPPFLAGS = $(camlib_cppflags)
 barbie_la_DEPENDENCIES = $(camlib_dependencies)
+barbie_la_LDFLAGS = $(camlib_ldflags)
 barbie_la_LIBADD = $(camlib_libadd)
-
-# "ideal" version:
-# + only export the 3 symbols
-# + -no-undefined, (i.e. Win32 support)
-# - needs lengthy definition in every camlib's Makefile.am
-# + nice short name
-#   + makes renaming the exported symbols to canon_LTX_<symbol> realistic
-#     without ## macros
-#   + makes it possible to have the same name the module filename and
-#     the camlib name returned by camera_id()
-canon_la_SOURCES = \
-	canon/canon.c canon/canon.h		\
-	canon/library.c canon/library.h	\
-	canon/serial.c canon/serial.h	\
-	canon/usb.c canon/usb.h		\
-	canon/crc.c canon/crc.h		\
-	canon/util.c canon/util.h
-
-canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-canon_la_LDFLAGS = $(camlib_ldflags)
+canon_la_SOURCES = canon/canon.c canon/canon.h canon/library.c \
+	canon/library.h canon/serial.c canon/serial.h canon/usb.c \
+	canon/usb.h canon/crc.c canon/crc.h canon/util.c canon/util.h
+canon_la_CFLAGS = $(camlib_cflags)
+canon_la_CPPFLAGS = $(camlib_cppflags) $(LIBEXIF_CFLAGS)
 canon_la_DEPENDENCIES = $(camlib_dependencies)
+canon_la_LDFLAGS = $(camlib_ldflags)
 canon_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
-casio_qv_la_SOURCES = \
-	casio/casio-qv.c				\
-	casio/casio-qv-commands.c casio/casio-qv-commands.h \
-	casio/camtojpeg.c casio/camtojpeg.h			\
-	casio/cam2jpgtab.h casio/jpegtab_f.h		\
-	casio/ycctoppm.c casio/ycctoppm.h
-
-casio_qv_la_LDFLAGS = $(camlib_ldflags)
+casio_qv_la_SOURCES = casio/casio-qv.c casio/casio-qv-commands.c \
+	casio/casio-qv-commands.h casio/camtojpeg.c casio/camtojpeg.h \
+	casio/cam2jpgtab.h casio/jpegtab_f.h casio/ycctoppm.c \
+	casio/ycctoppm.h
+casio_qv_la_CFLAGS = $(camlib_cflags)
+casio_qv_la_CPPFLAGS = $(camlib_cppflags)
 casio_qv_la_DEPENDENCIES = $(camlib_dependencies)
+casio_qv_la_LDFLAGS = $(camlib_ldflags)
 casio_qv_la_LIBADD = $(camlib_libadd)
-clicksmart310_la_SOURCES = \
-	clicksmart310/library.c \
+clicksmart310_la_SOURCES = clicksmart310/library.c \
 	clicksmart310/clicksmart.c clicksmart310/clicksmart.h \
 	clicksmart310/spca50x-jpeg-header.h
-
+clicksmart310_la_CFLAGS = $(camlib_cflags)
+clicksmart310_la_CPPFLAGS = $(camlib_cppflags)
+clicksmart310_la_DEPENDENCIES = $(camlib_dependencies)
 clicksmart310_la_LDFLAGS = $(camlib_ldflags)
 clicksmart310_la_LIBADD = $(camlib_libadd)
-digigr8_la_SOURCES = \
-	digigr8/library.c \
-	digigr8/digigr8.c digigr8/digigr8.h \
-	digigr8/digi_postprocess.c 
-
-digigr8_la_LDFLAGS = $(camlib_ldflags)
+digigr8_la_SOURCES = digigr8/library.c digigr8/digigr8.c \
+	digigr8/digigr8.h digigr8/digi_postprocess.c
+digigr8_la_CFLAGS = $(camlib_cflags)
+digigr8_la_CPPFLAGS = $(camlib_cppflags)
 digigr8_la_DEPENDENCIES = $(camlib_dependencies)
+digigr8_la_LDFLAGS = $(camlib_ldflags)
 digigr8_la_LIBADD = $(camlib_libadd)
-digita_la_SOURCES = \
-	digita/digita.c \
-	digita/serial.c \
-	digita/usb.c \
-	digita/commands.c \
-	digita/digita.h
-
-digita_la_LDFLAGS = $(camlib_ldflags)
+digita_la_SOURCES = digita/digita.c digita/serial.c digita/usb.c \
+	digita/commands.c digita/digita.h
+digita_la_CFLAGS = $(camlib_cflags)
+digita_la_CPPFLAGS = $(camlib_cppflags)
 digita_la_DEPENDENCIES = $(camlib_dependencies)
+digita_la_LDFLAGS = $(camlib_ldflags)
 digita_la_LIBADD = $(camlib_libadd)
-dimera3500_la_SOURCES = \
-	dimera/dimera3500.c \
-	dimera/mesalib.c dimera/mesalib.h\
-	dimera/dimeratab.h
-
-dimera3500_la_LDFLAGS = $(camlib_ldflags)
+dimera3500_la_SOURCES = dimera/dimera3500.c dimera/mesalib.c \
+	dimera/mesalib.h dimera/dimeratab.h
+dimera3500_la_CFLAGS = $(camlib_cflags)
+dimera3500_la_CPPFLAGS = $(camlib_cppflags)
 dimera3500_la_DEPENDENCIES = $(camlib_dependencies)
+dimera3500_la_LDFLAGS = $(camlib_ldflags)
 dimera3500_la_LIBADD = $(camlib_libadd)
 directory_la_SOURCES = directory/directory.c
-directory_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-directory_la_LDFLAGS = $(camlib_ldflags)
+directory_la_CFLAGS = $(camlib_cflags)
+directory_la_CPPFLAGS = $(camlib_cppflags) $(LIBEXIF_CFLAGS)
 directory_la_DEPENDENCIES = $(camlib_dependencies)
+directory_la_LDFLAGS = $(camlib_ldflags)
 directory_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
+docupen_la_SOURCES = docupen/cache.c docupen/calibration.c \
+	docupen/docupen.c docupen/docupen.h docupen/huffman.c \
+	docupen/huffman.h docupen/image.c
+docupen_la_CFLAGS = $(camlib_cflags) $(NO_UNUSED_CFLAGS) \
+	$(LIBGD_CFLAGS)
+docupen_la_CPPFLAGS = $(camlib_cppflags)
+docupen_la_DEPENDENCIES = $(camlib_dependencies)
+docupen_la_LDFLAGS = $(camlib_ldflags)
+docupen_la_LIBADD = $(camlib_libadd) $(LIBGD_LIBS)
 enigma13_la_SOURCES = enigma13/enigma13.c
-enigma13_la_LDFLAGS = $(camlib_ldflags)
+enigma13_la_CFLAGS = $(camlib_cflags)
+enigma13_la_CPPFLAGS = $(camlib_cppflags)
 enigma13_la_DEPENDENCIES = $(camlib_dependencies)
+enigma13_la_LDFLAGS = $(camlib_ldflags)
 enigma13_la_LIBADD = $(camlib_libadd)
 fuji_la_SOURCES = fuji/library.c fuji/fuji.c fuji/fuji.h
-fuji_la_LDFLAGS = $(camlib_ldflags)
+fuji_la_CFLAGS = $(camlib_cflags)
+fuji_la_CPPFLAGS = $(camlib_cppflags)
 fuji_la_DEPENDENCIES = $(camlib_dependencies)
+fuji_la_LDFLAGS = $(camlib_ldflags)
 fuji_la_LIBADD = $(camlib_libadd)
-gsmart300_la_SOURCES = \
-	gsmart300/gsmart300.c gsmart300/gsmart300.h \
-	gsmart300/library.c \
-	gsmart300/gsmart300-jpeg-header.h 
-
-gsmart300_la_LDFLAGS = $(camlib_ldflags)
+gsmart300_la_SOURCES = gsmart300/gsmart300.c gsmart300/gsmart300.h \
+	gsmart300/library.c gsmart300/gsmart300-jpeg-header.h
+gsmart300_la_CFLAGS = $(camlib_cflags)
+gsmart300_la_CPPFLAGS = $(camlib_cppflags)
 gsmart300_la_DEPENDENCIES = $(camlib_dependencies)
+gsmart300_la_LDFLAGS = $(camlib_ldflags)
 gsmart300_la_LIBADD = $(camlib_libadd)
 hp215_la_SOURCES = hp215/hp215.c hp215/hp215.h hp215/crctab.h
-hp215_la_LDFLAGS = $(camlib_ldflags)
+hp215_la_CFLAGS = $(camlib_cflags)
+hp215_la_CPPFLAGS = $(camlib_cppflags)
 hp215_la_DEPENDENCIES = $(camlib_dependencies)
+hp215_la_LDFLAGS = $(camlib_ldflags)
 hp215_la_LIBADD = $(camlib_libadd)
-iclick_la_SOURCES = iclick/library.c iclick/iclick.c iclick/iclick.h  
-iclick_la_LDFLAGS = $(camlib_ldflags)
+iclick_la_SOURCES = iclick/library.c iclick/iclick.c iclick/iclick.h
+iclick_la_CFLAGS = $(camlib_cflags)
+iclick_la_CPPFLAGS = $(camlib_cppflags)
 iclick_la_DEPENDENCIES = $(camlib_dependencies)
+iclick_la_LDFLAGS = $(camlib_ldflags)
 iclick_la_LIBADD = $(camlib_libadd)
 jamcam_la_SOURCES = jamcam/jamcam.c jamcam/library.c jamcam/library.h
-jamcam_la_LDFLAGS = $(camlib_ldflags)
+jamcam_la_CFLAGS = $(camlib_cflags)
+jamcam_la_CPPFLAGS = $(camlib_cppflags)
 jamcam_la_DEPENDENCIES = $(camlib_dependencies)
+jamcam_la_LDFLAGS = $(camlib_ldflags)
 jamcam_la_LIBADD = $(camlib_libadd)
-jd11_la_SOURCES = \
-	jd11/jd11.c \
-	jd11/serial.h jd11/serial.c \
+jd11_la_SOURCES = jd11/jd11.c jd11/serial.h jd11/serial.c \
 	jd11/decomp.h jd11/decomp.c
-
-jd11_la_LDFLAGS = $(camlib_ldflags)
+jd11_la_CFLAGS = $(camlib_cflags)
+jd11_la_CPPFLAGS = $(camlib_cppflags)
 jd11_la_DEPENDENCIES = $(camlib_dependencies)
+jd11_la_LDFLAGS = $(camlib_ldflags)
 jd11_la_LIBADD = $(camlib_libadd)
-jl2005a_la_SOURCES = jl2005a/library.c\
-		    jl2005a/jl2005a.c\
-		    jl2005a/jl2005a.h
-
-jl2005a_la_LDFLAGS = $(camlib_ldflags)
+jl2005a_la_SOURCES = jl2005a/library.c jl2005a/jl2005a.c \
+	jl2005a/jl2005a.h
+jl2005a_la_CFLAGS = $(camlib_cflags)
+jl2005a_la_CPPFLAGS = $(camlib_cppflags)
 jl2005a_la_DEPENDENCIES = $(camlib_dependencies)
+jl2005a_la_LDFLAGS = $(camlib_ldflags)
 jl2005a_la_LIBADD = $(camlib_libadd)
-jl2005c_la_SOURCES = jl2005c/library.c\
-		    jl2005c/jl2005c.c\
-		    jl2005c/jpeg_memsrcdest.c \
-		    jl2005c/jpeg_memsrcdest.h \
-		    jl2005c/jl2005bcd_decompress.c\
-		    jl2005c/jl2005bcd_decompress.h\
-		    jl2005c/jl2005c.h\
-		    jl2005c/img_enhance.c\
-		    jl2005c/img_enhance.h
-
-jl2005c_la_LDFLAGS = $(camlib_ldflags)
+jl2005c_la_SOURCES = jl2005c/library.c jl2005c/jl2005c.c \
+	jl2005c/jpeg_memsrcdest.c jl2005c/jpeg_memsrcdest.h \
+	jl2005c/jl2005bcd_decompress.c jl2005c/jl2005bcd_decompress.h \
+	jl2005c/jl2005c.h jl2005c/img_enhance.c jl2005c/img_enhance.h
+jl2005c_la_CFLAGS = $(camlib_cflags)
+jl2005c_la_CPPFLAGS = $(camlib_cppflags) $(LIBJPEG_CFLAGS)
 jl2005c_la_DEPENDENCIES = $(camlib_dependencies)
-jl2005c_la_LIBADD = $(camlib_libadd) @LIBJPEG@
-kodak_dc120_la_SOURCES = \
-	kodak/dc120/dc120.c kodak/dc120/dc120.h \
+jl2005c_la_LDFLAGS = $(camlib_ldflags)
+jl2005c_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS)
+kodak_dc120_la_SOURCES = kodak/dc120/dc120.c kodak/dc120/dc120.h \
 	kodak/dc120/library.c kodak/dc120/library.h
-
-kodak_dc120_la_LDFLAGS = $(camlib_ldflags)
+kodak_dc120_la_CFLAGS = $(camlib_cflags)
+kodak_dc120_la_CPPFLAGS = $(camlib_cppflags)
 kodak_dc120_la_DEPENDENCIES = $(camlib_dependencies)
+kodak_dc120_la_LDFLAGS = $(camlib_ldflags)
 kodak_dc120_la_LIBADD = $(camlib_libadd)
-kodak_dc210_la_SOURCES = \
-	kodak/dc210/dc210.c kodak/dc210/dc210.h \
+kodak_dc210_la_SOURCES = kodak/dc210/dc210.c kodak/dc210/dc210.h \
 	kodak/dc210/library.c kodak/dc210/library.h
-
-kodak_dc210_la_LDFLAGS = $(camlib_ldflags)
+kodak_dc210_la_CFLAGS = $(camlib_cflags)
+kodak_dc210_la_CPPFLAGS = $(camlib_cppflags)
 kodak_dc210_la_DEPENDENCIES = $(camlib_dependencies)
+kodak_dc210_la_LDFLAGS = $(camlib_ldflags)
 kodak_dc210_la_LIBADD = $(camlib_libadd)
-kodak_dc240_la_SOURCES = \
-	kodak/dc240/dc240.c kodak/dc240/dc240.h \
+kodak_dc240_la_SOURCES = kodak/dc240/dc240.c kodak/dc240/dc240.h \
 	kodak/dc240/library.c kodak/dc240/library.h
-
-kodak_dc240_la_LDFLAGS = $(camlib_ldflags)
+kodak_dc240_la_CFLAGS = $(camlib_cflags)
+kodak_dc240_la_CPPFLAGS = $(camlib_cppflags)
 kodak_dc240_la_DEPENDENCIES = $(camlib_dependencies)
+kodak_dc240_la_LDFLAGS = $(camlib_ldflags)
 kodak_dc240_la_LIBADD = $(camlib_libadd)
-kodak_dc3200_la_SOURCES = \
-	kodak/dc3200/dc3200.c kodak/dc3200/dc3200.h \
+kodak_dc3200_la_SOURCES = kodak/dc3200/dc3200.c kodak/dc3200/dc3200.h \
 	kodak/dc3200/library.c kodak/dc3200/library.h
-
-kodak_dc3200_la_LDFLAGS = $(camlib_ldflags)
+kodak_dc3200_la_CFLAGS = $(camlib_cflags)
+kodak_dc3200_la_CPPFLAGS = $(camlib_cppflags)
 kodak_dc3200_la_DEPENDENCIES = $(camlib_dependencies)
+kodak_dc3200_la_LDFLAGS = $(camlib_ldflags)
 kodak_dc3200_la_LIBADD = $(camlib_libadd)
-kodak_ez200_la_SOURCES = kodak/ez200/ez200.c 
-kodak_ez200_la_LDFLAGS = $(camlib_ldflags)
+kodak_ez200_la_SOURCES = kodak/ez200/ez200.c
+kodak_ez200_la_CFLAGS = $(camlib_cflags)
+kodak_ez200_la_CPPFLAGS = $(camlib_cppflags)
 kodak_ez200_la_DEPENDENCIES = $(camlib_dependencies)
+kodak_ez200_la_LDFLAGS = $(camlib_ldflags)
 kodak_ez200_la_LIBADD = $(camlib_libadd)
-konica_defs = \
-	-DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\"
-
-konica_la_SOURCES = \
-	konica/lowlevel.c konica/lowlevel.h \
-	konica/konica.c konica/konica.h \
-	konica/library.c
-
-konica_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS)
-konica_la_LDFLAGS = $(camlib_ldflags)
+konicalocalizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica
+dist_konicalocalization_DATA = konica/localization/english \
+	konica/localization/french konica/localization/german \
+	konica/localization/japanese konica/localization/korean \
+	konica/localization/spanish
+konica_defs = -DLOCALIZATION=\"$(konicalocalizationdir)\"
+konica_la_SOURCES = konica/lowlevel.c konica/lowlevel.h \
+	konica/konica.c konica/konica.h konica/library.c
+konica_la_CFLAGS = $(camlib_cflags)
+konica_la_CPPFLAGS = $(camlib_cppflags) $(konica_defs)
 konica_la_DEPENDENCIES = $(camlib_dependencies)
+konica_la_LDFLAGS = $(camlib_ldflags)
 konica_la_LIBADD = $(camlib_libadd)
 konica_qm150_la_SOURCES = konica/qm150.c
-konica_qm150_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS)
-konica_qm150_la_LDFLAGS = $(camlib_ldflags)
+konica_qm150_la_CFLAGS = $(camlib_cflags)
+konica_qm150_la_CPPFLAGS = $(camlib_cppflags) $(konica_defs) \
+	$(LIBEXIF_CFLAGS)
 konica_qm150_la_DEPENDENCIES = $(camlib_dependencies)
-konica_qm150_la_LIBADD = $(camlib_libadd)
-largan_la_SOURCES = \
-	largan/lmini/largan.c \
-	largan/lmini/lmini.c largan/lmini/lmini.h \
-	largan/lmini/lmini_ccd.c largan/lmini/lmini_ccd.h
-
-largan_la_LDFLAGS = $(camlib_ldflags)
+konica_qm150_la_LDFLAGS = $(camlib_ldflags)
+konica_qm150_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
+largan_la_SOURCES = largan/lmini/largan.c largan/lmini/lmini.c \
+	largan/lmini/lmini.h largan/lmini/lmini_ccd.c \
+	largan/lmini/lmini_ccd.h
+largan_la_CFLAGS = $(camlib_cflags)
+largan_la_CPPFLAGS = $(camlib_cppflags)
 largan_la_DEPENDENCIES = $(camlib_dependencies)
+largan_la_LDFLAGS = $(camlib_ldflags)
 largan_la_LIBADD = $(camlib_libadd)
 lg_gsm_la_SOURCES = lg_gsm/library.c lg_gsm/lg_gsm.c lg_gsm/lg_gsm.h
-lg_gsm_la_LDFLAGS = $(camlib_ldflags)
+lg_gsm_la_CFLAGS = $(camlib_cflags)
+lg_gsm_la_CPPFLAGS = $(camlib_cppflags)
 lg_gsm_la_DEPENDENCIES = $(camlib_dependencies)
+lg_gsm_la_LDFLAGS = $(camlib_ldflags)
 lg_gsm_la_LIBADD = $(camlib_libadd)
+lumix_la_SOURCES = lumix/lumix.c
+lumix_la_CFLAGS = $(camlib_cflags) $(NO_UNUSED_CFLAGS) \
+	$(LIBCURL_CFLAGS) $(LIBXML2_CFLAGS) $(LIBWS232_CFLAGS)
+lumix_la_CPPFLAGS = $(camlib_cppflags)
+lumix_la_DEPENDENCIES = $(camlib_dependencies)
+lumix_la_LDFLAGS = $(camlib_ldflags)
+lumix_la_LIBADD = $(camlib_libadd) $(LIBCURL_LIBS) $(LIBXML2_LIBS) \
+	$(LIBWS232_LIBS)
 mars_la_SOURCES = mars/library.c mars/mars.c mars/mars.h
-mars_la_LDFLAGS = $(camlib_ldflags)
+mars_la_CFLAGS = $(camlib_cflags)
+mars_la_CPPFLAGS = $(camlib_cppflags)
 mars_la_DEPENDENCIES = $(camlib_dependencies)
+mars_la_LDFLAGS = $(camlib_ldflags)
 mars_la_LIBADD = $(camlib_libadd)
-dimagev_la_SOURCES = \
-	minolta/dimagev/capture.c \
-	minolta/dimagev/data.c \
-	minolta/dimagev/delete.c \
-	minolta/dimagev/dimagev.c \
-	minolta/dimagev/dimagev.h \
-	minolta/dimagev/download.c \
-	minolta/dimagev/info.c \
-	minolta/dimagev/packet.c \
-	minolta/dimagev/status.c \
-	minolta/dimagev/upload.c \
+dimagev_la_SOURCES = minolta/dimagev/capture.c minolta/dimagev/data.c \
+	minolta/dimagev/delete.c minolta/dimagev/dimagev.c \
+	minolta/dimagev/dimagev.h minolta/dimagev/download.c \
+	minolta/dimagev/info.c minolta/dimagev/packet.c \
+	minolta/dimagev/status.c minolta/dimagev/upload.c \
 	minolta/dimagev/util.c
-
-dimagev_la_LDFLAGS = $(camlib_ldflags)
+dimagev_la_CFLAGS = $(camlib_cflags)
+dimagev_la_CPPFLAGS = $(camlib_cppflags)
 dimagev_la_DEPENDENCIES = $(camlib_dependencies)
+dimagev_la_LDFLAGS = $(camlib_ldflags)
 dimagev_la_LIBADD = $(camlib_libadd)
-mustek_la_SOURCES = \
-	mustek/mdc800.c mustek/core.c mustek/image.c \
-	mustek/io.c mustek/rs232.c mustek/usb.c mustek/core.h mustek/image.h \
-	mustek/io.h mustek/mdc800_spec.h mustek/print.h mustek/rs232.h mustek/usb.h
-
-mustek_la_LDFLAGS = $(camlib_ldflags)
+mustek_la_SOURCES = mustek/mdc800.c mustek/core.c mustek/image.c \
+	mustek/io.c mustek/rs232.c mustek/usb.c mustek/core.h \
+	mustek/image.h mustek/io.h mustek/mdc800_spec.h mustek/print.h \
+	mustek/rs232.h mustek/usb.h
+mustek_la_CFLAGS = $(camlib_cflags)
+mustek_la_CPPFLAGS = $(camlib_cppflags)
 mustek_la_DEPENDENCIES = $(camlib_dependencies)
+mustek_la_LDFLAGS = $(camlib_ldflags)
 mustek_la_LIBADD = $(camlib_libadd)
-panasonic_coolshot_la_SOURCES = \
-	panasonic/coolshot/coolshot.c \
+panasonic_coolshot_la_SOURCES = panasonic/coolshot/coolshot.c \
 	panasonic/coolshot/library.c panasonic/coolshot/library.h
-
-panasonic_coolshot_la_LDFLAGS = $(camlib_ldflags)
+panasonic_coolshot_la_CFLAGS = $(camlib_cflags)
+panasonic_coolshot_la_CPPFLAGS = $(camlib_cppflags)
 panasonic_coolshot_la_DEPENDENCIES = $(camlib_dependencies)
+panasonic_coolshot_la_LDFLAGS = $(camlib_ldflags)
 panasonic_coolshot_la_LIBADD = $(camlib_libadd)
-panasonic_l859_la_SOURCES = panasonic/l859/l859.c panasonic/l859/l859.h
-panasonic_l859_la_LDFLAGS = $(camlib_ldflags)
+panasonic_l859_la_SOURCES = panasonic/l859/l859.c \
+	panasonic/l859/l859.h
+panasonic_l859_la_CFLAGS = $(camlib_cflags)
+panasonic_l859_la_CPPFLAGS = $(camlib_cppflags)
 panasonic_l859_la_DEPENDENCIES = $(camlib_dependencies)
+panasonic_l859_la_LDFLAGS = $(camlib_ldflags)
 panasonic_l859_la_LIBADD = $(camlib_libadd)
-panasonic_dc1000_la_SOURCES = \
-	panasonic/dc1000.c panasonic/dc1000.h \
+panasonic_dc1000_la_SOURCES = panasonic/dc1000.c panasonic/dc1000.h \
 	panasonic/dc.c panasonic/dc.h
-
-panasonic_dc1000_la_LDFLAGS = $(camlib_ldflags)
+panasonic_dc1000_la_CFLAGS = $(camlib_cflags)
+panasonic_dc1000_la_CPPFLAGS = $(camlib_cppflags)
 panasonic_dc1000_la_DEPENDENCIES = $(camlib_dependencies)
+panasonic_dc1000_la_LDFLAGS = $(camlib_ldflags)
 panasonic_dc1000_la_LIBADD = $(camlib_libadd)
-panasonic_dc1580_la_SOURCES = \
-	panasonic/dc1580.c panasonic/dc1580.h \
-	panasonic/dc.c panasonic/dc.h \
-	panasonic/dc1000.h
-
-panasonic_dc1580_la_LDFLAGS = $(camlib_ldflags)
+panasonic_dc1580_la_SOURCES = panasonic/dc1580.c panasonic/dc1580.h \
+	panasonic/dc.c panasonic/dc.h panasonic/dc1000.h
+panasonic_dc1580_la_CFLAGS = $(camlib_cflags)
+panasonic_dc1580_la_CPPFLAGS = $(camlib_cppflags)
 panasonic_dc1580_la_DEPENDENCIES = $(camlib_dependencies)
+panasonic_dc1580_la_LDFLAGS = $(camlib_ldflags)
 panasonic_dc1580_la_LIBADD = $(camlib_libadd)
-pccam300_la_SOURCES = pccam300/pccam300.c pccam300/pccam300.h pccam300/library.c 
-pccam300_la_LDFLAGS = $(camlib_ldflags)
+pccam300_la_SOURCES = pccam300/pccam300.c pccam300/pccam300.h \
+	pccam300/library.c
+pccam300_la_CFLAGS = $(camlib_cflags)
+pccam300_la_CPPFLAGS = $(camlib_cppflags)
 pccam300_la_DEPENDENCIES = $(camlib_dependencies)
+pccam300_la_LDFLAGS = $(camlib_ldflags)
 pccam300_la_LIBADD = $(camlib_libadd)
-pccam600_la_SOURCES = pccam600/pccam600.c pccam600/pccam600.h pccam600/library.c 
-pccam600_la_LDFLAGS = $(camlib_ldflags)
+pccam600_la_SOURCES = pccam600/pccam600.c pccam600/pccam600.h \
+	pccam600/library.c
+pccam600_la_CFLAGS = $(camlib_cflags)
+pccam600_la_CPPFLAGS = $(camlib_cppflags)
 pccam600_la_DEPENDENCIES = $(camlib_dependencies)
+pccam600_la_LDFLAGS = $(camlib_ldflags)
 pccam600_la_LIBADD = $(camlib_libadd)
-pentax_la_SOURCES = pentax/pslr.c pentax/library.c pentax/pslr_enum.c pentax/pslr_lens.c pentax/pslr_model.c pentax/pslr_enum.h pentax/pslr.h pentax/pslr_lens.h pentax/pslr_model.h pentax/pslr_scsi.h pentax/exiftool_pentax_lens.txt pentax/js0n.c pentax/js0n.h
-pentax_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) -DLIBGPHOTO2 -DPKTDATADIR='"/"'
-pentax_la_LDFLAGS = $(camlib_ldflags)
+pentax_la_SOURCES = pentax/pslr.c pentax/library.c pentax/pslr_enum.c \
+	pentax/pslr_lens.c pentax/pslr_model.c pentax/pslr_enum.h \
+	pentax/pslr.h pentax/pslr_lens.h pentax/pslr_model.h \
+	pentax/pslr_scsi.h pentax/exiftool_pentax_lens.txt \
+	pentax/js0n.c pentax/js0n.h
+pentax_la_CFLAGS = $(camlib_cflags) $(NO_UNUSED_CFLAGS) -DLIBGPHOTO2 \
+	-DPKTDATADIR='"/"'
+pentax_la_CPPFLAGS = $(camlib_cppflags)
 pentax_la_DEPENDENCIES = $(camlib_dependencies)
+pentax_la_LDFLAGS = $(camlib_ldflags)
 pentax_la_LIBADD = $(camlib_libadd)
 polaroid_pdc320_la_SOURCES = polaroid/pdc320.c polaroid/pdc320.h
-polaroid_pdc320_la_LDFLAGS = $(camlib_ldflags)
+polaroid_pdc320_la_CFLAGS = $(camlib_cflags)
+polaroid_pdc320_la_CPPFLAGS = $(camlib_cppflags)
 polaroid_pdc320_la_DEPENDENCIES = $(camlib_dependencies)
+polaroid_pdc320_la_LDFLAGS = $(camlib_ldflags)
 polaroid_pdc320_la_LIBADD = $(camlib_libadd)
-polaroid_pdc640_la_SOURCES = polaroid/pdc640.c \
-	polaroid/jd350e.h polaroid/jd350e.c \
-	polaroid/jd350e_red.h polaroid/jd350e_blue.h \
+polaroid_pdc640_la_SOURCES = polaroid/pdc640.c polaroid/jd350e.h \
+	polaroid/jd350e.c polaroid/jd350e_red.h polaroid/jd350e_blue.h \
 	polaroid/dlink350f.c polaroid/dlink350f.h
-
-polaroid_pdc640_la_LDFLAGS = $(camlib_ldflags)
+polaroid_pdc640_la_CFLAGS = $(camlib_cflags)
+polaroid_pdc640_la_CPPFLAGS = $(camlib_cppflags)
 polaroid_pdc640_la_DEPENDENCIES = $(camlib_dependencies)
+polaroid_pdc640_la_LDFLAGS = $(camlib_ldflags)
 polaroid_pdc640_la_LIBADD = $(camlib_libadd)
 polaroid_pdc700_la_SOURCES = polaroid/pdc700.c
-polaroid_pdc700_la_LDFLAGS = $(camlib_ldflags)
+polaroid_pdc700_la_CFLAGS = $(camlib_cflags)
+polaroid_pdc700_la_CPPFLAGS = $(camlib_cppflags)
 polaroid_pdc700_la_DEPENDENCIES = $(camlib_dependencies)
+polaroid_pdc700_la_LDFLAGS = $(camlib_ldflags)
 polaroid_pdc700_la_LIBADD = $(camlib_libadd)
-ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS)
-ptp2_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) -Wshadow
-ptp2_la_SOURCES = \
-	ptp2/ptp.c ptp2/ptp.h ptp2/chdk_ptp.h ptp2/chdk_live_view.h \
-	ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \
-	ptp2/ptp-private.h ptp2/ptpip.c ptp2/config.c \
-	ptp2/music-players.h ptp2/device-flags.h \
-	ptp2/olympus-wrap.c ptp2/olympus-wrap.h \
-	ptp2/chdk.c
-
-ptp2_la_LDFLAGS = $(camlib_ldflags)
+ptp2_la_SOURCES = ptp2/ptp.c ptp2/ptp.h ptp2/chdk_ptp.h \
+	ptp2/chdk_live_view.h ptp2/library.c ptp2/usb.c \
+	ptp2/ptp-bugs.h ptp2/ptp-private.h ptp2/ptpip.c ptp2/config.c \
+	ptp2/music-players.h ptp2/device-flags.h ptp2/olympus-wrap.c \
+	ptp2/olympus-wrap.h ptp2/chdk.c ptp2/fujiptpip.c \
+	ptp2/ptpip-private.h
+ptp2_la_CFLAGS = $(camlib_cflags) -Wshadow
+ptp2_la_CPPFLAGS = $(camlib_cppflags) $(LIBXML2_CFLAGS) \
+	$(LIBJPEG_CFLAGS) $(LIBWS232_CFLAGS)
 ptp2_la_DEPENDENCIES = $(camlib_dependencies)
-ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) @LIBJPEG@
-ricoh_la_SOURCES = ricoh/library.c ricoh/ricoh.c ricoh/ricoh.h ricoh/crctab.h
-ricoh_la_LDFLAGS = $(camlib_ldflags)
+ptp2_la_LDFLAGS = $(camlib_ldflags)
+ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) \
+	$(LIBJPEG_LIBS) $(LIBWS232_LIBS)
+ricoh_la_SOURCES = ricoh/library.c ricoh/ricoh.c ricoh/ricoh.h \
+	ricoh/crctab.h
+ricoh_la_CFLAGS = $(camlib_cflags)
+ricoh_la_CPPFLAGS = $(camlib_cppflags)
 ricoh_la_DEPENDENCIES = $(camlib_dependencies)
+ricoh_la_LDFLAGS = $(camlib_ldflags)
 ricoh_la_LIBADD = $(camlib_libadd)
 ricoh_g3_la_SOURCES = ricoh/g3.c
-ricoh_g3_la_LDFLAGS = $(camlib_ldflags)
+ricoh_g3_la_CFLAGS = $(camlib_cflags)
+ricoh_g3_la_CPPFLAGS = $(camlib_cppflags)
 ricoh_g3_la_DEPENDENCIES = $(camlib_dependencies)
+ricoh_g3_la_LDFLAGS = $(camlib_ldflags)
 ricoh_g3_la_LIBADD = $(camlib_libadd)
 samsung_la_SOURCES = samsung/samsung.c
-samsung_la_LDFLAGS = $(camlib_ldflags)
+samsung_la_CFLAGS = $(camlib_cflags)
+samsung_la_CPPFLAGS = $(camlib_cppflags)
 samsung_la_DEPENDENCIES = $(camlib_dependencies)
+samsung_la_LDFLAGS = $(camlib_ldflags)
 samsung_la_LIBADD = $(camlib_libadd)
-sierra_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-sierra_la_SOURCES = \
-	sierra/sierra.c sierra/sierra.h \
-	sierra/library.c sierra/library.h \
-	sierra/sierra-usbwrap.c sierra/sierra-usbwrap.h \
-	sierra/sierra-desc.h sierra/sierra-desc.c \
-	sierra/nikon-desc.c sierra/olympus-desc.c sierra/epson-desc.c
-
-sierra_la_LDFLAGS = $(camlib_ldflags)
+sierra_la_SOURCES = sierra/sierra.c sierra/sierra.h sierra/library.c \
+	sierra/library.h sierra/sierra-usbwrap.c \
+	sierra/sierra-usbwrap.h sierra/sierra-desc.h \
+	sierra/sierra-desc.c sierra/nikon-desc.c sierra/olympus-desc.c \
+	sierra/epson-desc.c
+sierra_la_CFLAGS = $(camlib_cflags)
+sierra_la_CPPFLAGS = $(camlib_cppflags) $(LIBEXIF_CFLAGS)
 sierra_la_DEPENDENCIES = $(camlib_dependencies)
+sierra_la_LDFLAGS = $(camlib_ldflags)
 sierra_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
 sipix_blink_la_SOURCES = sipix/blink.c
-sipix_blink_la_LDFLAGS = $(camlib_ldflags)
+sipix_blink_la_CFLAGS = $(camlib_cflags)
+sipix_blink_la_CPPFLAGS = $(camlib_cppflags)
 sipix_blink_la_DEPENDENCIES = $(camlib_dependencies)
+sipix_blink_la_LDFLAGS = $(camlib_ldflags)
 sipix_blink_la_LIBADD = $(camlib_libadd)
 sipix_blink2_la_SOURCES = sipix/blink2.c
-sipix_blink2_la_LDFLAGS = $(camlib_ldflags)
+sipix_blink2_la_CFLAGS = $(camlib_cflags)
+sipix_blink2_la_CPPFLAGS = $(camlib_cppflags) $(LIBJPEG_CFLAGS)
 sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies)
-sipix_blink2_la_LIBADD = $(camlib_libadd) @LIBJPEG@
+sipix_blink2_la_LDFLAGS = $(camlib_ldflags)
+sipix_blink2_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS)
 sipix_web2_la_SOURCES = sipix/web2.c
-sipix_web2_la_LDFLAGS = $(camlib_ldflags)
+sipix_web2_la_CFLAGS = $(camlib_cflags)
+sipix_web2_la_CPPFLAGS = $(camlib_cppflags)
 sipix_web2_la_DEPENDENCIES = $(camlib_dependencies)
+sipix_web2_la_LDFLAGS = $(camlib_ldflags)
 sipix_web2_la_LIBADD = $(camlib_libadd)
-smal_la_SOURCES = \
-	smal/smal.c smal/ultrapocket.c \
-	smal/smal.h smal/ultrapocket.h
-
-smal_la_LDFLAGS = $(camlib_ldflags)
+smal_la_SOURCES = smal/smal.c smal/smal.h smal/ultrapocket.c \
+	smal/ultrapocket.h
+smal_la_CFLAGS = $(camlib_cflags)
+smal_la_CPPFLAGS = $(camlib_cppflags)
 smal_la_DEPENDENCIES = $(camlib_dependencies)
+smal_la_LDFLAGS = $(camlib_ldflags)
 smal_la_LIBADD = $(camlib_libadd)
-sonix_la_SOURCES = \
-	sonix/library.c \
-	sonix/sonix.c sonix/sonix.h \
+sonix_la_SOURCES = sonix/library.c sonix/sonix.c sonix/sonix.h \
 	sonix/sakar-avi-header.h
-
-sonix_la_LDFLAGS = $(camlib_ldflags)
+sonix_la_CFLAGS = $(camlib_cflags)
+sonix_la_CPPFLAGS = $(camlib_cppflags)
 sonix_la_DEPENDENCIES = $(camlib_dependencies)
+sonix_la_LDFLAGS = $(camlib_ldflags)
 sonix_la_LIBADD = $(camlib_libadd)
-sony_dscf1_la_SOURCES = \
-	sonydscf1/command.c sonydscf1/command.h \
-	sonydscf1/sonydscf1.c sonydscf1/pmp.h 
-
-sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
+sony_dscf1_la_SOURCES = sonydscf1/command.c sonydscf1/command.h \
+	sonydscf1/sonydscf1.c sonydscf1/pmp.h
+sony_dscf1_la_CFLAGS = $(camlib_cflags)
+sony_dscf1_la_CPPFLAGS = $(camlib_cppflags)
 sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies)
+sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
 sony_dscf1_la_LIBADD = $(camlib_libadd)
-sony_dscf55_la_SOURCES = \
-	sonydscf55/sony.c sonydscf55/sony.h \
-	sonydscf55/camera.c sonydscf55/nls.h
-
-sony_dscf55_la_LDFLAGS = $(camlib_ldflags)
+sony_dscf55_la_SOURCES = sonydscf55/sony.c sonydscf55/sony.h \
+	sonydscf55/camera.c
+sony_dscf55_la_CFLAGS = $(camlib_cflags)
+sony_dscf55_la_CPPFLAGS = $(camlib_cppflags)
 sony_dscf55_la_DEPENDENCIES = $(camlib_dependencies)
+sony_dscf55_la_LDFLAGS = $(camlib_ldflags)
 sony_dscf55_la_LIBADD = $(camlib_libadd)
-soundvision_la_SOURCES = \
-	soundvision/soundvision.c soundvision/agfa_cl18.c \
-	soundvision/tiger_fastflicks.c \
+soundvision_la_SOURCES = soundvision/soundvision.c \
+	soundvision/agfa_cl18.c soundvision/tiger_fastflicks.c \
 	soundvision/commands.c soundvision/commands.h \
 	soundvision/soundvision.h
-
-soundvision_la_LDFLAGS = $(camlib_ldflags)
+soundvision_la_CFLAGS = $(camlib_cflags)
+soundvision_la_CPPFLAGS = $(camlib_cppflags)
 soundvision_la_DEPENDENCIES = $(camlib_dependencies)
+soundvision_la_LDFLAGS = $(camlib_ldflags)
 soundvision_la_LIBADD = $(camlib_libadd)
-spca50x_la_SOURCES = \
-	spca50x/spca50x.c spca50x/spca50x.h \
+spca50x_la_SOURCES = spca50x/spca50x.c spca50x/spca50x.h \
 	spca50x/spca50x-flash.c spca50x/spca50x-flash.h \
 	spca50x/spca50x-sdram.c spca50x/spca50x-sdram.h \
-	spca50x/library.c \
-	spca50x/spca50x-jpeg-header.h spca50x/spca50x-registers.h \
-	spca50x/spca50x-avi-header.h
-
-spca50x_la_LDFLAGS = $(camlib_ldflags)
+	spca50x/library.c spca50x/spca50x-jpeg-header.h \
+	spca50x/spca50x-registers.h spca50x/spca50x-avi-header.h
+spca50x_la_CFLAGS = $(camlib_cflags)
+spca50x_la_CPPFLAGS = $(camlib_cppflags)
 spca50x_la_DEPENDENCIES = $(camlib_dependencies)
+spca50x_la_LDFLAGS = $(camlib_ldflags)
 spca50x_la_LIBADD = $(camlib_libadd)
-sq905_la_SOURCES = sq905/library.c sq905/sq905.c sq905/sq905.h sq905/postprocess.c 
-sq905_la_LDFLAGS = $(camlib_ldflags)
+sq905_la_SOURCES = sq905/library.c sq905/sq905.c sq905/sq905.h \
+	sq905/postprocess.c
+sq905_la_CFLAGS = $(camlib_cflags)
+sq905_la_CPPFLAGS = $(camlib_cppflags)
 sq905_la_DEPENDENCIES = $(camlib_dependencies)
+sq905_la_LDFLAGS = $(camlib_ldflags)
 sq905_la_LIBADD = $(camlib_libadd)
-st2205_la_SOURCES = st2205/library.c st2205/st2205.c st2205/st2205.h st2205/st2205_decode.c st2205/st2205_tables.c
-st2205_la_LDFLAGS = $(camlib_ldflags)
+st2205_la_SOURCES = st2205/library.c st2205/st2205.c st2205/st2205.h \
+	st2205/st2205_decode.c st2205/st2205_tables.c
+st2205_la_CFLAGS = $(camlib_cflags) $(LIBGD_CFLAGS)
+st2205_la_CPPFLAGS = $(camlib_cppflags)
 st2205_la_DEPENDENCIES = $(camlib_dependencies)
-st2205_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LTLIBICONV)
-st2205_la_CFLAGS = @LIBGD_CFLAGS@
-stv0674_la_SOURCES = \
-	stv0674/stv0674.c stv0674/stv0674.h \
-	stv0674/library.c stv0674/library.h
+st2205_la_LDFLAGS = $(camlib_ldflags)
 
-stv0674_la_LDFLAGS = $(camlib_ldflags)
+# On systems such as mingw/Windows, mmap(2) is not part of the
+# standard library and needs an explicit library to link against.
+st2205_la_LIBADD = $(camlib_libadd) $(LIBGD_LIBS) $(LTLIBICONV) \
+	$(MMAP_LIBS)
+stv0674_la_SOURCES = stv0674/stv0674.c stv0674/stv0674.h \
+	stv0674/library.c stv0674/library.h
+stv0674_la_CFLAGS = $(camlib_cflags)
+stv0674_la_CPPFLAGS = $(camlib_cppflags)
 stv0674_la_DEPENDENCIES = $(camlib_dependencies)
+stv0674_la_LDFLAGS = $(camlib_ldflags)
 stv0674_la_LIBADD = $(camlib_libadd)
-stv0680_la_SOURCES = \
-	stv0680/stv0680.c stv0680/stv0680.h \
-	stv0680/library.c stv0680/library.h \
-	stv0680/bayer.c stv0680/bayer.h \
-	stv0680/sharpen.c stv0680/sharpen.h \
+stv0680_la_SOURCES = stv0680/stv0680.c stv0680/stv0680.h \
+	stv0680/library.c stv0680/library.h stv0680/stv0680-bayer.c \
+	stv0680/stv0680-bayer.h stv0680/sharpen.c stv0680/sharpen.h \
 	stv0680/saturate.c stv0680/saturate.h \
 	stv0680/demosaic_sharpen.h stv0680/demosaic_sharpen.c
-
-stv0680_la_LDFLAGS = $(camlib_ldflags)
+stv0680_la_CFLAGS = $(camlib_cflags)
+stv0680_la_CPPFLAGS = $(camlib_cppflags)
 stv0680_la_DEPENDENCIES = $(camlib_dependencies)
+stv0680_la_LDFLAGS = $(camlib_ldflags)
 stv0680_la_LIBADD = $(camlib_libadd)
 sx330z_la_SOURCES = sx330z/library.c sx330z/sx330z.c sx330z/sx330z.h
-sx330z_la_LDFLAGS = $(camlib_ldflags)
+sx330z_la_CFLAGS = $(camlib_cflags)
+sx330z_la_CPPFLAGS = $(camlib_cppflags)
 sx330z_la_DEPENDENCIES = $(camlib_dependencies)
+sx330z_la_LDFLAGS = $(camlib_ldflags)
 sx330z_la_LIBADD = $(camlib_libadd)
 template_la_SOURCES = template/template.c
-template_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS)
-template_la_LDFLAGS = $(camlib_ldflags)
+template_la_CFLAGS = $(camlib_cflags) $(NO_UNUSED_CFLAGS)
+template_la_CPPFLAGS = $(camlib_cppflags)
 template_la_DEPENDENCIES = $(camlib_dependencies)
+template_la_LDFLAGS = $(camlib_ldflags)
 template_la_LIBADD = $(camlib_libadd)
-topfield_la_SOURCES = topfield/crc16.c topfield/crc16.h topfield/tf_bytes.c topfield/tf_bytes.h topfield/mjd.c topfield/mjd.h \
-			topfield/puppy.c topfield/usb_io.h topfield/usb_io.c
-
-topfield_la_LDFLAGS = $(camlib_ldflags)
+topfield_la_SOURCES = topfield/crc16.c topfield/crc16.h \
+	topfield/tf_bytes.c topfield/tf_bytes.h topfield/mjd.c \
+	topfield/mjd.h topfield/puppy.c topfield/usb_io.h \
+	topfield/usb_io.c
+topfield_la_CFLAGS = $(camlib_cflags)
+topfield_la_CPPFLAGS = $(camlib_cppflags)
 topfield_la_DEPENDENCIES = $(camlib_dependencies)
+topfield_la_LDFLAGS = $(camlib_ldflags)
 topfield_la_LIBADD = $(camlib_libadd) $(LTLIBICONV)
-toshiba_pdrm11_la_SOURCES = \
-	toshiba/pdrm11/library.c \
-	 toshiba/pdrm11/pdrm11.c toshiba/pdrm11/pdrm11.h
-
-toshiba_pdrm11_la_LDFLAGS = $(camlib_ldflags)
+toshiba_pdrm11_la_SOURCES = toshiba/pdrm11/library.c \
+	toshiba/pdrm11/pdrm11.c toshiba/pdrm11/pdrm11.h
+toshiba_pdrm11_la_CFLAGS = $(camlib_cflags)
+toshiba_pdrm11_la_CPPFLAGS = $(camlib_cppflags)
 toshiba_pdrm11_la_DEPENDENCIES = $(camlib_dependencies)
+toshiba_pdrm11_la_LDFLAGS = $(camlib_ldflags)
 toshiba_pdrm11_la_LIBADD = $(camlib_libadd)
 tp6801_la_SOURCES = tp6801/library.c tp6801/tp6801.c tp6801/tp6801.h
-tp6801_la_LDFLAGS = $(camlib_ldflags)
+tp6801_la_CFLAGS = $(camlib_cflags)
+tp6801_la_CPPFLAGS = $(camlib_cppflags) $(LIBGD_CFLAGS)
 tp6801_la_DEPENDENCIES = $(camlib_dependencies)
-tp6801_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@
-tp6801_la_CFLAGS = @LIBGD_CFLAGS@
+tp6801_la_LDFLAGS = $(camlib_ldflags)
+tp6801_la_LIBADD = $(camlib_libadd) $(LIBGD_LIBS)
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/adc65/Makefile-files $(srcdir)/agfa-cl20/Makefile-files $(srcdir)/aox/Makefile-files $(srcdir)/ax203/Makefile-files $(srcdir)/barbie/Makefile-files $(srcdir)/canon/Makefile-files $(srcdir)/casio/Makefile-files $(srcdir)/clicksmart310/Makefile-files $(srcdir)/digigr8/Makefile-files $(srcdir)/digita/Makefile-files $(srcdir)/dimera/Makefile-files $(srcdir)/directory/Makefile-files $(srcdir)/enigma13/Makefile-files $(srcdir)/fuji/Makefile-files $(srcdir)/gsmart300/Makefile-files $(srcdir)/hp215/Makefile-files $(srcdir)/iclick/Makefile-files $(srcdir)/jamcam/Makefile-files $(srcdir)/jd11/Makefile-files $(srcdir)/jl2005a/Makefile-files $(srcdir)/jl2005c/Makefile-files $(srcdir)/kodak/dc120/Makefile-files $(srcdir)/kodak/dc210/Makefile-files $(srcdir)/kodak/dc240/Makefile-files $(srcdir)/kodak/dc3200/Makefile-files $(srcdir)/kodak/ez200/Makefile-files $(srcdir)/kodak/Makefile-files $(srcdir)/konica/Makefile-files $(srcdir)/largan/lmini/Makefile-files $(srcdir)/lg_gsm/Makefile-files $(srcdir)/mars/Makefile-files $(srcdir)/minolta/dimagev/Makefile-files $(srcdir)/minolta/Makefile-files $(srcdir)/mustek/Makefile-files $(srcdir)/panasonic/coolshot/Makefile-files $(srcdir)/panasonic/l859/Makefile-files $(srcdir)/panasonic/Makefile-files $(srcdir)/pccam300/Makefile-files $(srcdir)/pccam600/Makefile-files $(srcdir)/pentax/Makefile-files $(srcdir)/polaroid/Makefile-files $(srcdir)/ptp2/Makefile-files $(srcdir)/ricoh/Makefile-files $(srcdir)/samsung/Makefile-files $(srcdir)/sierra/Makefile-files $(srcdir)/sipix/Makefile-files $(srcdir)/smal/Makefile-files $(srcdir)/sonix/Makefile-files $(srcdir)/sonydscf1/Makefile-files $(srcdir)/sonydscf55/Makefile-files $(srcdir)/soundvision/Makefile-files $(srcdir)/spca50x/Makefile-files $(srcdir)/sq905/Makefile-files $(srcdir)/st2205/Makefile-files $(srcdir)/stv0674/Makefile-files $(srcdir)/stv0680/Makefile-files $(srcdir)/sx330z/Makefile-files $(srcdir)/template/Makefile-files $(srcdir)/topfield/Makefile-files $(srcdir)/toshiba/pdrm11/Makefile-files $(srcdir)/tp6801/Makefile-files $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/adc65/Makefile-files $(srcdir)/agfa-cl20/Makefile-files $(srcdir)/aox/Makefile-files $(srcdir)/ax203/Makefile-files $(srcdir)/barbie/Makefile-files $(srcdir)/canon/Makefile-files $(srcdir)/casio/Makefile-files $(srcdir)/clicksmart310/Makefile-files $(srcdir)/digigr8/Makefile-files $(srcdir)/digita/Makefile-files $(srcdir)/dimera/Makefile-files $(srcdir)/directory/Makefile-files $(srcdir)/docupen/Makefile-files $(srcdir)/enigma13/Makefile-files $(srcdir)/fuji/Makefile-files $(srcdir)/gsmart300/Makefile-files $(srcdir)/hp215/Makefile-files $(srcdir)/iclick/Makefile-files $(srcdir)/jamcam/Makefile-files $(srcdir)/jd11/Makefile-files $(srcdir)/jl2005a/Makefile-files $(srcdir)/jl2005c/Makefile-files $(srcdir)/kodak/dc120/Makefile-files $(srcdir)/kodak/dc210/Makefile-files $(srcdir)/kodak/dc240/Makefile-files $(srcdir)/kodak/dc3200/Makefile-files $(srcdir)/kodak/ez200/Makefile-files $(srcdir)/kodak/Makefile-files $(srcdir)/konica/Makefile-files $(srcdir)/largan/lmini/Makefile-files $(srcdir)/lg_gsm/Makefile-files $(srcdir)/lumix/Makefile-files $(srcdir)/mars/Makefile-files $(srcdir)/minolta/dimagev/Makefile-files $(srcdir)/minolta/Makefile-files $(srcdir)/mustek/Makefile-files $(srcdir)/panasonic/coolshot/Makefile-files $(srcdir)/panasonic/l859/Makefile-files $(srcdir)/panasonic/Makefile-files $(srcdir)/pccam300/Makefile-files $(srcdir)/pccam600/Makefile-files $(srcdir)/pentax/Makefile-files $(srcdir)/polaroid/Makefile-files $(srcdir)/ptp2/Makefile-files $(srcdir)/ricoh/Makefile-files $(srcdir)/samsung/Makefile-files $(srcdir)/sierra/Makefile-files $(srcdir)/sipix/Makefile-files $(srcdir)/smal/Makefile-files $(srcdir)/sonix/Makefile-files $(srcdir)/sonydscf1/Makefile-files $(srcdir)/sonydscf55/Makefile-files $(srcdir)/soundvision/Makefile-files $(srcdir)/spca50x/Makefile-files $(srcdir)/sq905/Makefile-files $(srcdir)/st2205/Makefile-files $(srcdir)/stv0674/Makefile-files $(srcdir)/stv0680/Makefile-files $(srcdir)/sx330z/Makefile-files $(srcdir)/template/Makefile-files $(srcdir)/topfield/Makefile-files $(srcdir)/toshiba/pdrm11/Makefile-files $(srcdir)/tp6801/Makefile-files $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1730,10 +2045,10 @@
 	  *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);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(srcdir)/adc65/Makefile-files $(srcdir)/agfa-cl20/Makefile-files $(srcdir)/aox/Makefile-files $(srcdir)/ax203/Makefile-files $(srcdir)/barbie/Makefile-files $(srcdir)/canon/Makefile-files $(srcdir)/casio/Makefile-files $(srcdir)/clicksmart310/Makefile-files $(srcdir)/digigr8/Makefile-files $(srcdir)/digita/Makefile-files $(srcdir)/dimera/Makefile-files $(srcdir)/directory/Makefile-files $(srcdir)/enigma13/Makefile-files $(srcdir)/fuji/Makefile-files $(srcdir)/gsmart300/Makefile-files $(srcdir)/hp215/Makefile-files $(srcdir)/iclick/Makefile-files $(srcdir)/jamcam/Makefile-files $(srcdir)/jd11/Makefile-files $(srcdir)/jl2005a/Makefile-files $(srcdir)/jl2005c/Makefile-files $(srcdir)/kodak/dc120/Makefile-files $(srcdir)/kodak/dc210/Makefile-files $(srcdir)/kodak/dc240/Makefile-files $(srcdir)/kodak/dc3200/Makefile-files $(srcdir)/kodak/ez200/Makefile-files $(srcdir)/kodak/Makefile-files $(srcdir)/konica/Makefile-files $(srcdir)/largan/lmini/Makefile-files $(srcdir)/lg_gsm/Makefile-files $(srcdir)/mars/Makefile-files $(srcdir)/minolta/dimagev/Makefile-files $(srcdir)/minolta/Makefile-files $(srcdir)/mustek/Makefile-files $(srcdir)/panasonic/coolshot/Makefile-files $(srcdir)/panasonic/l859/Makefile-files $(srcdir)/panasonic/Makefile-files $(srcdir)/pccam300/Makefile-files $(srcdir)/pccam600/Makefile-files $(srcdir)/pentax/Makefile-files $(srcdir)/polaroid/Makefile-files $(srcdir)/ptp2/Makefile-files $(srcdir)/ricoh/Makefile-files $(srcdir)/samsung/Makefile-files $(srcdir)/sierra/Makefile-files $(srcdir)/sipix/Makefile-files $(srcdir)/smal/Makefile-files $(srcdir)/sonix/Makefile-files $(srcdir)/sonydscf1/Makefile-files $(srcdir)/sonydscf55/Makefile-files $(srcdir)/soundvision/Makefile-files $(srcdir)/spca50x/Makefile-files $(srcdir)/sq905/Makefile-files $(srcdir)/st2205/Makefile-files $(srcdir)/stv0674/Makefile-files $(srcdir)/stv0680/Makefile-files $(srcdir)/sx330z/Makefile-files $(srcdir)/template/Makefile-files $(srcdir)/topfield/Makefile-files $(srcdir)/toshiba/pdrm11/Makefile-files $(srcdir)/tp6801/Makefile-files $(am__empty):
+$(srcdir)/adc65/Makefile-files $(srcdir)/agfa-cl20/Makefile-files $(srcdir)/aox/Makefile-files $(srcdir)/ax203/Makefile-files $(srcdir)/barbie/Makefile-files $(srcdir)/canon/Makefile-files $(srcdir)/casio/Makefile-files $(srcdir)/clicksmart310/Makefile-files $(srcdir)/digigr8/Makefile-files $(srcdir)/digita/Makefile-files $(srcdir)/dimera/Makefile-files $(srcdir)/directory/Makefile-files $(srcdir)/docupen/Makefile-files $(srcdir)/enigma13/Makefile-files $(srcdir)/fuji/Makefile-files $(srcdir)/gsmart300/Makefile-files $(srcdir)/hp215/Makefile-files $(srcdir)/iclick/Makefile-files $(srcdir)/jamcam/Makefile-files $(srcdir)/jd11/Makefile-files $(srcdir)/jl2005a/Makefile-files $(srcdir)/jl2005c/Makefile-files $(srcdir)/kodak/dc120/Makefile-files $(srcdir)/kodak/dc210/Makefile-files $(srcdir)/kodak/dc240/Makefile-files $(srcdir)/kodak/dc3200/Makefile-files $(srcdir)/kodak/ez200/Makefile-files $(srcdir)/kodak/Makefile-files $(srcdir)/konica/Makefile-files $(srcdir)/largan/lmini/Makefile-files $(srcdir)/lg_gsm/Makefile-files $(srcdir)/lumix/Makefile-files $(srcdir)/mars/Makefile-files $(srcdir)/minolta/dimagev/Makefile-files $(srcdir)/minolta/Makefile-files $(srcdir)/mustek/Makefile-files $(srcdir)/panasonic/coolshot/Makefile-files $(srcdir)/panasonic/l859/Makefile-files $(srcdir)/panasonic/Makefile-files $(srcdir)/pccam300/Makefile-files $(srcdir)/pccam600/Makefile-files $(srcdir)/pentax/Makefile-files $(srcdir)/polaroid/Makefile-files $(srcdir)/ptp2/Makefile-files $(srcdir)/ricoh/Makefile-files $(srcdir)/samsung/Makefile-files $(srcdir)/sierra/Makefile-files $(srcdir)/sipix/Makefile-files $(srcdir)/smal/Makefile-files $(srcdir)/sonix/Makefile-files $(srcdir)/sonydscf1/Makefile-files $(srcdir)/sonydscf55/Makefile-files $(srcdir)/soundvision/Makefile-files $(srcdir)/spca50x/Makefile-files $(srcdir)/sq905/Makefile-files $(srcdir)/st2205/Makefile-files $(srcdir)/stv0674/Makefile-files $(srcdir)/stv0680/Makefile-files $(srcdir)/sx330z/Makefile-files $(srcdir)/template/Makefile-files $(srcdir)/topfield/Makefile-files $(srcdir)/toshiba/pdrm11/Makefile-files $(srcdir)/tp6801/Makefile-files $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1795,7 +2110,8 @@
 adc65/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) adc65/$(DEPDIR)
 	@: > adc65/$(DEPDIR)/$(am__dirstamp)
-adc65/adc65.lo: adc65/$(am__dirstamp) adc65/$(DEPDIR)/$(am__dirstamp)
+adc65/la-adc65.lo: adc65/$(am__dirstamp) \
+	adc65/$(DEPDIR)/$(am__dirstamp)
 
 adc65.la: $(adc65_la_OBJECTS) $(adc65_la_DEPENDENCIES) $(EXTRA_adc65_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(adc65_la_LINK)  $(adc65_la_OBJECTS) $(adc65_la_LIBADD) $(LIBS)
@@ -1805,7 +2121,7 @@
 agfa-cl20/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) agfa-cl20/$(DEPDIR)
 	@: > agfa-cl20/$(DEPDIR)/$(am__dirstamp)
-agfa-cl20/agfa_cl20.lo: agfa-cl20/$(am__dirstamp) \
+agfa-cl20/la-agfa_cl20.lo: agfa-cl20/$(am__dirstamp) \
 	agfa-cl20/$(DEPDIR)/$(am__dirstamp)
 
 agfa_cl20.la: $(agfa_cl20_la_OBJECTS) $(agfa_cl20_la_DEPENDENCIES) $(EXTRA_agfa_cl20_la_DEPENDENCIES) 
@@ -1816,8 +2132,8 @@
 aox/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) aox/$(DEPDIR)
 	@: > aox/$(DEPDIR)/$(am__dirstamp)
-aox/library.lo: aox/$(am__dirstamp) aox/$(DEPDIR)/$(am__dirstamp)
-aox/aox.lo: aox/$(am__dirstamp) aox/$(DEPDIR)/$(am__dirstamp)
+aox/la-library.lo: aox/$(am__dirstamp) aox/$(DEPDIR)/$(am__dirstamp)
+aox/la-aox.lo: aox/$(am__dirstamp) aox/$(DEPDIR)/$(am__dirstamp)
 
 aox.la: $(aox_la_OBJECTS) $(aox_la_DEPENDENCIES) $(EXTRA_aox_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(aox_la_LINK)  $(aox_la_OBJECTS) $(aox_la_LIBADD) $(LIBS)
@@ -1827,21 +2143,21 @@
 ax203/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ax203/$(DEPDIR)
 	@: > ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-library.lo: ax203/$(am__dirstamp) \
+ax203/la-library.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-ax203.lo: ax203/$(am__dirstamp) \
+ax203/la-ax203.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-ax203_decode_yuv.lo: ax203/$(am__dirstamp) \
+ax203/la-ax203_decode_yuv.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-ax203_decode_yuv_delta.lo: ax203/$(am__dirstamp) \
+ax203/la-ax203_decode_yuv_delta.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-ax203_compress_jpeg.lo: ax203/$(am__dirstamp) \
+ax203/la-ax203_compress_jpeg.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-jpeg_memsrcdest.lo: ax203/$(am__dirstamp) \
+ax203/la-jpeg_memsrcdest.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-tinyjpeg.lo: ax203/$(am__dirstamp) \
+ax203/la-tinyjpeg.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
-ax203/ax203_la-jidctflt.lo: ax203/$(am__dirstamp) \
+ax203/la-jidctflt.lo: ax203/$(am__dirstamp) \
 	ax203/$(DEPDIR)/$(am__dirstamp)
 
 ax203.la: $(ax203_la_OBJECTS) $(ax203_la_DEPENDENCIES) $(EXTRA_ax203_la_DEPENDENCIES) 
@@ -1852,7 +2168,7 @@
 barbie/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) barbie/$(DEPDIR)
 	@: > barbie/$(DEPDIR)/$(am__dirstamp)
-barbie/barbie.lo: barbie/$(am__dirstamp) \
+barbie/la-barbie.lo: barbie/$(am__dirstamp) \
 	barbie/$(DEPDIR)/$(am__dirstamp)
 
 barbie.la: $(barbie_la_OBJECTS) $(barbie_la_DEPENDENCIES) $(EXTRA_barbie_la_DEPENDENCIES) 
@@ -1863,17 +2179,15 @@
 canon/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) canon/$(DEPDIR)
 	@: > canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-canon.lo: canon/$(am__dirstamp) \
-	canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-library.lo: canon/$(am__dirstamp) \
-	canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-serial.lo: canon/$(am__dirstamp) \
+canon/la-canon.lo: canon/$(am__dirstamp) \
 	canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-usb.lo: canon/$(am__dirstamp) \
+canon/la-library.lo: canon/$(am__dirstamp) \
 	canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-crc.lo: canon/$(am__dirstamp) \
+canon/la-serial.lo: canon/$(am__dirstamp) \
 	canon/$(DEPDIR)/$(am__dirstamp)
-canon/canon_la-util.lo: canon/$(am__dirstamp) \
+canon/la-usb.lo: canon/$(am__dirstamp) canon/$(DEPDIR)/$(am__dirstamp)
+canon/la-crc.lo: canon/$(am__dirstamp) canon/$(DEPDIR)/$(am__dirstamp)
+canon/la-util.lo: canon/$(am__dirstamp) \
 	canon/$(DEPDIR)/$(am__dirstamp)
 
 canon.la: $(canon_la_OBJECTS) $(canon_la_DEPENDENCIES) $(EXTRA_canon_la_DEPENDENCIES) 
@@ -1884,13 +2198,13 @@
 casio/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) casio/$(DEPDIR)
 	@: > casio/$(DEPDIR)/$(am__dirstamp)
-casio/casio-qv.lo: casio/$(am__dirstamp) \
+casio/qv_la-casio-qv.lo: casio/$(am__dirstamp) \
 	casio/$(DEPDIR)/$(am__dirstamp)
-casio/casio-qv-commands.lo: casio/$(am__dirstamp) \
+casio/qv_la-casio-qv-commands.lo: casio/$(am__dirstamp) \
 	casio/$(DEPDIR)/$(am__dirstamp)
-casio/camtojpeg.lo: casio/$(am__dirstamp) \
+casio/qv_la-camtojpeg.lo: casio/$(am__dirstamp) \
 	casio/$(DEPDIR)/$(am__dirstamp)
-casio/ycctoppm.lo: casio/$(am__dirstamp) \
+casio/qv_la-ycctoppm.lo: casio/$(am__dirstamp) \
 	casio/$(DEPDIR)/$(am__dirstamp)
 
 casio_qv.la: $(casio_qv_la_OBJECTS) $(casio_qv_la_DEPENDENCIES) $(EXTRA_casio_qv_la_DEPENDENCIES) 
@@ -1901,9 +2215,9 @@
 clicksmart310/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) clicksmart310/$(DEPDIR)
 	@: > clicksmart310/$(DEPDIR)/$(am__dirstamp)
-clicksmart310/library.lo: clicksmart310/$(am__dirstamp) \
+clicksmart310/la-library.lo: clicksmart310/$(am__dirstamp) \
 	clicksmart310/$(DEPDIR)/$(am__dirstamp)
-clicksmart310/clicksmart.lo: clicksmart310/$(am__dirstamp) \
+clicksmart310/la-clicksmart.lo: clicksmart310/$(am__dirstamp) \
 	clicksmart310/$(DEPDIR)/$(am__dirstamp)
 
 clicksmart310.la: $(clicksmart310_la_OBJECTS) $(clicksmart310_la_DEPENDENCIES) $(EXTRA_clicksmart310_la_DEPENDENCIES) 
@@ -1914,11 +2228,11 @@
 digigr8/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) digigr8/$(DEPDIR)
 	@: > digigr8/$(DEPDIR)/$(am__dirstamp)
-digigr8/library.lo: digigr8/$(am__dirstamp) \
+digigr8/la-library.lo: digigr8/$(am__dirstamp) \
 	digigr8/$(DEPDIR)/$(am__dirstamp)
-digigr8/digigr8.lo: digigr8/$(am__dirstamp) \
+digigr8/la-digigr8.lo: digigr8/$(am__dirstamp) \
 	digigr8/$(DEPDIR)/$(am__dirstamp)
-digigr8/digi_postprocess.lo: digigr8/$(am__dirstamp) \
+digigr8/la-digi_postprocess.lo: digigr8/$(am__dirstamp) \
 	digigr8/$(DEPDIR)/$(am__dirstamp)
 
 digigr8.la: $(digigr8_la_OBJECTS) $(digigr8_la_DEPENDENCIES) $(EXTRA_digigr8_la_DEPENDENCIES) 
@@ -1929,12 +2243,13 @@
 digita/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) digita/$(DEPDIR)
 	@: > digita/$(DEPDIR)/$(am__dirstamp)
-digita/digita.lo: digita/$(am__dirstamp) \
+digita/la-digita.lo: digita/$(am__dirstamp) \
 	digita/$(DEPDIR)/$(am__dirstamp)
-digita/serial.lo: digita/$(am__dirstamp) \
+digita/la-serial.lo: digita/$(am__dirstamp) \
 	digita/$(DEPDIR)/$(am__dirstamp)
-digita/usb.lo: digita/$(am__dirstamp) digita/$(DEPDIR)/$(am__dirstamp)
-digita/commands.lo: digita/$(am__dirstamp) \
+digita/la-usb.lo: digita/$(am__dirstamp) \
+	digita/$(DEPDIR)/$(am__dirstamp)
+digita/la-commands.lo: digita/$(am__dirstamp) \
 	digita/$(DEPDIR)/$(am__dirstamp)
 
 digita.la: $(digita_la_OBJECTS) $(digita_la_DEPENDENCIES) $(EXTRA_digita_la_DEPENDENCIES) 
@@ -1945,25 +2260,28 @@
 minolta/dimagev/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) minolta/dimagev/$(DEPDIR)
 	@: > minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/capture.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-capture.lo:  \
+	minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/data.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-data.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/delete.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-delete.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/dimagev.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-dimagev.lo:  \
+	minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/download.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-download.lo:  \
+	minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/info.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-info.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/packet.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-packet.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/status.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-status.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/upload.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-upload.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
-minolta/dimagev/util.lo: minolta/dimagev/$(am__dirstamp) \
+minolta/dimagev/dimagev_la-util.lo: minolta/dimagev/$(am__dirstamp) \
 	minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
 
 dimagev.la: $(dimagev_la_OBJECTS) $(dimagev_la_DEPENDENCIES) $(EXTRA_dimagev_la_DEPENDENCIES) 
@@ -1974,9 +2292,9 @@
 dimera/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) dimera/$(DEPDIR)
 	@: > dimera/$(DEPDIR)/$(am__dirstamp)
-dimera/dimera3500.lo: dimera/$(am__dirstamp) \
+dimera/dimera3500_la-dimera3500.lo: dimera/$(am__dirstamp) \
 	dimera/$(DEPDIR)/$(am__dirstamp)
-dimera/mesalib.lo: dimera/$(am__dirstamp) \
+dimera/dimera3500_la-mesalib.lo: dimera/$(am__dirstamp) \
 	dimera/$(DEPDIR)/$(am__dirstamp)
 
 dimera3500.la: $(dimera3500_la_OBJECTS) $(dimera3500_la_DEPENDENCIES) $(EXTRA_dimera3500_la_DEPENDENCIES) 
@@ -1987,18 +2305,37 @@
 directory/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) directory/$(DEPDIR)
 	@: > directory/$(DEPDIR)/$(am__dirstamp)
-directory/directory_la-directory.lo: directory/$(am__dirstamp) \
+directory/la-directory.lo: directory/$(am__dirstamp) \
 	directory/$(DEPDIR)/$(am__dirstamp)
 
 directory.la: $(directory_la_OBJECTS) $(directory_la_DEPENDENCIES) $(EXTRA_directory_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(directory_la_LINK)  $(directory_la_OBJECTS) $(directory_la_LIBADD) $(LIBS)
+docupen/$(am__dirstamp):
+	@$(MKDIR_P) docupen
+	@: > docupen/$(am__dirstamp)
+docupen/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) docupen/$(DEPDIR)
+	@: > docupen/$(DEPDIR)/$(am__dirstamp)
+docupen/la-cache.lo: docupen/$(am__dirstamp) \
+	docupen/$(DEPDIR)/$(am__dirstamp)
+docupen/la-calibration.lo: docupen/$(am__dirstamp) \
+	docupen/$(DEPDIR)/$(am__dirstamp)
+docupen/la-docupen.lo: docupen/$(am__dirstamp) \
+	docupen/$(DEPDIR)/$(am__dirstamp)
+docupen/la-huffman.lo: docupen/$(am__dirstamp) \
+	docupen/$(DEPDIR)/$(am__dirstamp)
+docupen/la-image.lo: docupen/$(am__dirstamp) \
+	docupen/$(DEPDIR)/$(am__dirstamp)
+
+docupen.la: $(docupen_la_OBJECTS) $(docupen_la_DEPENDENCIES) $(EXTRA_docupen_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(docupen_la_LINK)  $(docupen_la_OBJECTS) $(docupen_la_LIBADD) $(LIBS)
 enigma13/$(am__dirstamp):
 	@$(MKDIR_P) enigma13
 	@: > enigma13/$(am__dirstamp)
 enigma13/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) enigma13/$(DEPDIR)
 	@: > enigma13/$(DEPDIR)/$(am__dirstamp)
-enigma13/enigma13.lo: enigma13/$(am__dirstamp) \
+enigma13/la-enigma13.lo: enigma13/$(am__dirstamp) \
 	enigma13/$(DEPDIR)/$(am__dirstamp)
 
 enigma13.la: $(enigma13_la_OBJECTS) $(enigma13_la_DEPENDENCIES) $(EXTRA_enigma13_la_DEPENDENCIES) 
@@ -2009,8 +2346,9 @@
 fuji/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) fuji/$(DEPDIR)
 	@: > fuji/$(DEPDIR)/$(am__dirstamp)
-fuji/library.lo: fuji/$(am__dirstamp) fuji/$(DEPDIR)/$(am__dirstamp)
-fuji/fuji.lo: fuji/$(am__dirstamp) fuji/$(DEPDIR)/$(am__dirstamp)
+fuji/la-library.lo: fuji/$(am__dirstamp) \
+	fuji/$(DEPDIR)/$(am__dirstamp)
+fuji/la-fuji.lo: fuji/$(am__dirstamp) fuji/$(DEPDIR)/$(am__dirstamp)
 
 fuji.la: $(fuji_la_OBJECTS) $(fuji_la_DEPENDENCIES) $(EXTRA_fuji_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(fuji_la_LINK)  $(fuji_la_OBJECTS) $(fuji_la_LIBADD) $(LIBS)
@@ -2020,9 +2358,9 @@
 gsmart300/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) gsmart300/$(DEPDIR)
 	@: > gsmart300/$(DEPDIR)/$(am__dirstamp)
-gsmart300/gsmart300.lo: gsmart300/$(am__dirstamp) \
+gsmart300/la-gsmart300.lo: gsmart300/$(am__dirstamp) \
 	gsmart300/$(DEPDIR)/$(am__dirstamp)
-gsmart300/library.lo: gsmart300/$(am__dirstamp) \
+gsmart300/la-library.lo: gsmart300/$(am__dirstamp) \
 	gsmart300/$(DEPDIR)/$(am__dirstamp)
 
 gsmart300.la: $(gsmart300_la_OBJECTS) $(gsmart300_la_DEPENDENCIES) $(EXTRA_gsmart300_la_DEPENDENCIES) 
@@ -2033,7 +2371,8 @@
 hp215/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) hp215/$(DEPDIR)
 	@: > hp215/$(DEPDIR)/$(am__dirstamp)
-hp215/hp215.lo: hp215/$(am__dirstamp) hp215/$(DEPDIR)/$(am__dirstamp)
+hp215/la-hp215.lo: hp215/$(am__dirstamp) \
+	hp215/$(DEPDIR)/$(am__dirstamp)
 
 hp215.la: $(hp215_la_OBJECTS) $(hp215_la_DEPENDENCIES) $(EXTRA_hp215_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(hp215_la_LINK)  $(hp215_la_OBJECTS) $(hp215_la_LIBADD) $(LIBS)
@@ -2043,9 +2382,9 @@
 iclick/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) iclick/$(DEPDIR)
 	@: > iclick/$(DEPDIR)/$(am__dirstamp)
-iclick/library.lo: iclick/$(am__dirstamp) \
+iclick/la-library.lo: iclick/$(am__dirstamp) \
 	iclick/$(DEPDIR)/$(am__dirstamp)
-iclick/iclick.lo: iclick/$(am__dirstamp) \
+iclick/la-iclick.lo: iclick/$(am__dirstamp) \
 	iclick/$(DEPDIR)/$(am__dirstamp)
 
 iclick.la: $(iclick_la_OBJECTS) $(iclick_la_DEPENDENCIES) $(EXTRA_iclick_la_DEPENDENCIES) 
@@ -2056,9 +2395,9 @@
 jamcam/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) jamcam/$(DEPDIR)
 	@: > jamcam/$(DEPDIR)/$(am__dirstamp)
-jamcam/jamcam.lo: jamcam/$(am__dirstamp) \
+jamcam/la-jamcam.lo: jamcam/$(am__dirstamp) \
 	jamcam/$(DEPDIR)/$(am__dirstamp)
-jamcam/library.lo: jamcam/$(am__dirstamp) \
+jamcam/la-library.lo: jamcam/$(am__dirstamp) \
 	jamcam/$(DEPDIR)/$(am__dirstamp)
 
 jamcam.la: $(jamcam_la_OBJECTS) $(jamcam_la_DEPENDENCIES) $(EXTRA_jamcam_la_DEPENDENCIES) 
@@ -2069,9 +2408,9 @@
 jd11/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) jd11/$(DEPDIR)
 	@: > jd11/$(DEPDIR)/$(am__dirstamp)
-jd11/jd11.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
-jd11/serial.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
-jd11/decomp.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
+jd11/la-jd11.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
+jd11/la-serial.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
+jd11/la-decomp.lo: jd11/$(am__dirstamp) jd11/$(DEPDIR)/$(am__dirstamp)
 
 jd11.la: $(jd11_la_OBJECTS) $(jd11_la_DEPENDENCIES) $(EXTRA_jd11_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(jd11_la_LINK)  $(jd11_la_OBJECTS) $(jd11_la_LIBADD) $(LIBS)
@@ -2081,9 +2420,9 @@
 jl2005a/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) jl2005a/$(DEPDIR)
 	@: > jl2005a/$(DEPDIR)/$(am__dirstamp)
-jl2005a/library.lo: jl2005a/$(am__dirstamp) \
+jl2005a/la-library.lo: jl2005a/$(am__dirstamp) \
 	jl2005a/$(DEPDIR)/$(am__dirstamp)
-jl2005a/jl2005a.lo: jl2005a/$(am__dirstamp) \
+jl2005a/la-jl2005a.lo: jl2005a/$(am__dirstamp) \
 	jl2005a/$(DEPDIR)/$(am__dirstamp)
 
 jl2005a.la: $(jl2005a_la_OBJECTS) $(jl2005a_la_DEPENDENCIES) $(EXTRA_jl2005a_la_DEPENDENCIES) 
@@ -2094,15 +2433,15 @@
 jl2005c/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) jl2005c/$(DEPDIR)
 	@: > jl2005c/$(DEPDIR)/$(am__dirstamp)
-jl2005c/library.lo: jl2005c/$(am__dirstamp) \
+jl2005c/la-library.lo: jl2005c/$(am__dirstamp) \
 	jl2005c/$(DEPDIR)/$(am__dirstamp)
-jl2005c/jl2005c.lo: jl2005c/$(am__dirstamp) \
+jl2005c/la-jl2005c.lo: jl2005c/$(am__dirstamp) \
 	jl2005c/$(DEPDIR)/$(am__dirstamp)
-jl2005c/jpeg_memsrcdest.lo: jl2005c/$(am__dirstamp) \
+jl2005c/la-jpeg_memsrcdest.lo: jl2005c/$(am__dirstamp) \
 	jl2005c/$(DEPDIR)/$(am__dirstamp)
-jl2005c/jl2005bcd_decompress.lo: jl2005c/$(am__dirstamp) \
+jl2005c/la-jl2005bcd_decompress.lo: jl2005c/$(am__dirstamp) \
 	jl2005c/$(DEPDIR)/$(am__dirstamp)
-jl2005c/img_enhance.lo: jl2005c/$(am__dirstamp) \
+jl2005c/la-img_enhance.lo: jl2005c/$(am__dirstamp) \
 	jl2005c/$(DEPDIR)/$(am__dirstamp)
 
 jl2005c.la: $(jl2005c_la_OBJECTS) $(jl2005c_la_DEPENDENCIES) $(EXTRA_jl2005c_la_DEPENDENCIES) 
@@ -2113,9 +2452,9 @@
 kodak/dc120/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) kodak/dc120/$(DEPDIR)
 	@: > kodak/dc120/$(DEPDIR)/$(am__dirstamp)
-kodak/dc120/dc120.lo: kodak/dc120/$(am__dirstamp) \
+kodak/dc120/la-dc120.lo: kodak/dc120/$(am__dirstamp) \
 	kodak/dc120/$(DEPDIR)/$(am__dirstamp)
-kodak/dc120/library.lo: kodak/dc120/$(am__dirstamp) \
+kodak/dc120/la-library.lo: kodak/dc120/$(am__dirstamp) \
 	kodak/dc120/$(DEPDIR)/$(am__dirstamp)
 
 kodak_dc120.la: $(kodak_dc120_la_OBJECTS) $(kodak_dc120_la_DEPENDENCIES) $(EXTRA_kodak_dc120_la_DEPENDENCIES) 
@@ -2126,9 +2465,9 @@
 kodak/dc210/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) kodak/dc210/$(DEPDIR)
 	@: > kodak/dc210/$(DEPDIR)/$(am__dirstamp)
-kodak/dc210/dc210.lo: kodak/dc210/$(am__dirstamp) \
+kodak/dc210/la-dc210.lo: kodak/dc210/$(am__dirstamp) \
 	kodak/dc210/$(DEPDIR)/$(am__dirstamp)
-kodak/dc210/library.lo: kodak/dc210/$(am__dirstamp) \
+kodak/dc210/la-library.lo: kodak/dc210/$(am__dirstamp) \
 	kodak/dc210/$(DEPDIR)/$(am__dirstamp)
 
 kodak_dc210.la: $(kodak_dc210_la_OBJECTS) $(kodak_dc210_la_DEPENDENCIES) $(EXTRA_kodak_dc210_la_DEPENDENCIES) 
@@ -2139,9 +2478,9 @@
 kodak/dc240/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) kodak/dc240/$(DEPDIR)
 	@: > kodak/dc240/$(DEPDIR)/$(am__dirstamp)
-kodak/dc240/dc240.lo: kodak/dc240/$(am__dirstamp) \
+kodak/dc240/la-dc240.lo: kodak/dc240/$(am__dirstamp) \
 	kodak/dc240/$(DEPDIR)/$(am__dirstamp)
-kodak/dc240/library.lo: kodak/dc240/$(am__dirstamp) \
+kodak/dc240/la-library.lo: kodak/dc240/$(am__dirstamp) \
 	kodak/dc240/$(DEPDIR)/$(am__dirstamp)
 
 kodak_dc240.la: $(kodak_dc240_la_OBJECTS) $(kodak_dc240_la_DEPENDENCIES) $(EXTRA_kodak_dc240_la_DEPENDENCIES) 
@@ -2152,9 +2491,9 @@
 kodak/dc3200/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) kodak/dc3200/$(DEPDIR)
 	@: > kodak/dc3200/$(DEPDIR)/$(am__dirstamp)
-kodak/dc3200/dc3200.lo: kodak/dc3200/$(am__dirstamp) \
+kodak/dc3200/la-dc3200.lo: kodak/dc3200/$(am__dirstamp) \
 	kodak/dc3200/$(DEPDIR)/$(am__dirstamp)
-kodak/dc3200/library.lo: kodak/dc3200/$(am__dirstamp) \
+kodak/dc3200/la-library.lo: kodak/dc3200/$(am__dirstamp) \
 	kodak/dc3200/$(DEPDIR)/$(am__dirstamp)
 
 kodak_dc3200.la: $(kodak_dc3200_la_OBJECTS) $(kodak_dc3200_la_DEPENDENCIES) $(EXTRA_kodak_dc3200_la_DEPENDENCIES) 
@@ -2165,7 +2504,7 @@
 kodak/ez200/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) kodak/ez200/$(DEPDIR)
 	@: > kodak/ez200/$(DEPDIR)/$(am__dirstamp)
-kodak/ez200/ez200.lo: kodak/ez200/$(am__dirstamp) \
+kodak/ez200/la-ez200.lo: kodak/ez200/$(am__dirstamp) \
 	kodak/ez200/$(DEPDIR)/$(am__dirstamp)
 
 kodak_ez200.la: $(kodak_ez200_la_OBJECTS) $(kodak_ez200_la_DEPENDENCIES) $(EXTRA_kodak_ez200_la_DEPENDENCIES) 
@@ -2176,16 +2515,16 @@
 konica/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) konica/$(DEPDIR)
 	@: > konica/$(DEPDIR)/$(am__dirstamp)
-konica/konica_la-lowlevel.lo: konica/$(am__dirstamp) \
+konica/la-lowlevel.lo: konica/$(am__dirstamp) \
 	konica/$(DEPDIR)/$(am__dirstamp)
-konica/konica_la-konica.lo: konica/$(am__dirstamp) \
+konica/la-konica.lo: konica/$(am__dirstamp) \
 	konica/$(DEPDIR)/$(am__dirstamp)
-konica/konica_la-library.lo: konica/$(am__dirstamp) \
+konica/la-library.lo: konica/$(am__dirstamp) \
 	konica/$(DEPDIR)/$(am__dirstamp)
 
 konica.la: $(konica_la_OBJECTS) $(konica_la_DEPENDENCIES) $(EXTRA_konica_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(konica_la_LINK)  $(konica_la_OBJECTS) $(konica_la_LIBADD) $(LIBS)
-konica/konica_qm150_la-qm150.lo: konica/$(am__dirstamp) \
+konica/qm150_la-qm150.lo: konica/$(am__dirstamp) \
 	konica/$(DEPDIR)/$(am__dirstamp)
 
 konica_qm150.la: $(konica_qm150_la_OBJECTS) $(konica_qm150_la_DEPENDENCIES) $(EXTRA_konica_qm150_la_DEPENDENCIES) 
@@ -2196,11 +2535,11 @@
 largan/lmini/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) largan/lmini/$(DEPDIR)
 	@: > largan/lmini/$(DEPDIR)/$(am__dirstamp)
-largan/lmini/largan.lo: largan/lmini/$(am__dirstamp) \
+largan/lmini/la-largan.lo: largan/lmini/$(am__dirstamp) \
 	largan/lmini/$(DEPDIR)/$(am__dirstamp)
-largan/lmini/lmini.lo: largan/lmini/$(am__dirstamp) \
+largan/lmini/la-lmini.lo: largan/lmini/$(am__dirstamp) \
 	largan/lmini/$(DEPDIR)/$(am__dirstamp)
-largan/lmini/lmini_ccd.lo: largan/lmini/$(am__dirstamp) \
+largan/lmini/la-lmini_ccd.lo: largan/lmini/$(am__dirstamp) \
 	largan/lmini/$(DEPDIR)/$(am__dirstamp)
 
 largan.la: $(largan_la_OBJECTS) $(largan_la_DEPENDENCIES) $(EXTRA_largan_la_DEPENDENCIES) 
@@ -2211,21 +2550,33 @@
 lg_gsm/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) lg_gsm/$(DEPDIR)
 	@: > lg_gsm/$(DEPDIR)/$(am__dirstamp)
-lg_gsm/library.lo: lg_gsm/$(am__dirstamp) \
+lg_gsm/la-library.lo: lg_gsm/$(am__dirstamp) \
 	lg_gsm/$(DEPDIR)/$(am__dirstamp)
-lg_gsm/lg_gsm.lo: lg_gsm/$(am__dirstamp) \
+lg_gsm/la-lg_gsm.lo: lg_gsm/$(am__dirstamp) \
 	lg_gsm/$(DEPDIR)/$(am__dirstamp)
 
 lg_gsm.la: $(lg_gsm_la_OBJECTS) $(lg_gsm_la_DEPENDENCIES) $(EXTRA_lg_gsm_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(lg_gsm_la_LINK)  $(lg_gsm_la_OBJECTS) $(lg_gsm_la_LIBADD) $(LIBS)
+lumix/$(am__dirstamp):
+	@$(MKDIR_P) lumix
+	@: > lumix/$(am__dirstamp)
+lumix/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) lumix/$(DEPDIR)
+	@: > lumix/$(DEPDIR)/$(am__dirstamp)
+lumix/la-lumix.lo: lumix/$(am__dirstamp) \
+	lumix/$(DEPDIR)/$(am__dirstamp)
+
+lumix.la: $(lumix_la_OBJECTS) $(lumix_la_DEPENDENCIES) $(EXTRA_lumix_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(lumix_la_LINK)  $(lumix_la_OBJECTS) $(lumix_la_LIBADD) $(LIBS)
 mars/$(am__dirstamp):
 	@$(MKDIR_P) mars
 	@: > mars/$(am__dirstamp)
 mars/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) mars/$(DEPDIR)
 	@: > mars/$(DEPDIR)/$(am__dirstamp)
-mars/library.lo: mars/$(am__dirstamp) mars/$(DEPDIR)/$(am__dirstamp)
-mars/mars.lo: mars/$(am__dirstamp) mars/$(DEPDIR)/$(am__dirstamp)
+mars/la-library.lo: mars/$(am__dirstamp) \
+	mars/$(DEPDIR)/$(am__dirstamp)
+mars/la-mars.lo: mars/$(am__dirstamp) mars/$(DEPDIR)/$(am__dirstamp)
 
 mars.la: $(mars_la_OBJECTS) $(mars_la_DEPENDENCIES) $(EXTRA_mars_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(mars_la_LINK)  $(mars_la_OBJECTS) $(mars_la_LIBADD) $(LIBS)
@@ -2235,16 +2586,18 @@
 mustek/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) mustek/$(DEPDIR)
 	@: > mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/mdc800.lo: mustek/$(am__dirstamp) \
+mustek/la-mdc800.lo: mustek/$(am__dirstamp) \
+	mustek/$(DEPDIR)/$(am__dirstamp)
+mustek/la-core.lo: mustek/$(am__dirstamp) \
 	mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/core.lo: mustek/$(am__dirstamp) \
+mustek/la-image.lo: mustek/$(am__dirstamp) \
 	mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/image.lo: mustek/$(am__dirstamp) \
+mustek/la-io.lo: mustek/$(am__dirstamp) \
 	mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/io.lo: mustek/$(am__dirstamp) mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/rs232.lo: mustek/$(am__dirstamp) \
+mustek/la-rs232.lo: mustek/$(am__dirstamp) \
+	mustek/$(DEPDIR)/$(am__dirstamp)
+mustek/la-usb.lo: mustek/$(am__dirstamp) \
 	mustek/$(DEPDIR)/$(am__dirstamp)
-mustek/usb.lo: mustek/$(am__dirstamp) mustek/$(DEPDIR)/$(am__dirstamp)
 
 mustek.la: $(mustek_la_OBJECTS) $(mustek_la_DEPENDENCIES) $(EXTRA_mustek_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(mustek_la_LINK)  $(mustek_la_OBJECTS) $(mustek_la_LIBADD) $(LIBS)
@@ -2254,9 +2607,9 @@
 panasonic/coolshot/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) panasonic/coolshot/$(DEPDIR)
 	@: > panasonic/coolshot/$(DEPDIR)/$(am__dirstamp)
-panasonic/coolshot/coolshot.lo: panasonic/coolshot/$(am__dirstamp) \
+panasonic/coolshot/la-coolshot.lo: panasonic/coolshot/$(am__dirstamp) \
 	panasonic/coolshot/$(DEPDIR)/$(am__dirstamp)
-panasonic/coolshot/library.lo: panasonic/coolshot/$(am__dirstamp) \
+panasonic/coolshot/la-library.lo: panasonic/coolshot/$(am__dirstamp) \
 	panasonic/coolshot/$(DEPDIR)/$(am__dirstamp)
 
 panasonic_coolshot.la: $(panasonic_coolshot_la_OBJECTS) $(panasonic_coolshot_la_DEPENDENCIES) $(EXTRA_panasonic_coolshot_la_DEPENDENCIES) 
@@ -2267,14 +2620,16 @@
 panasonic/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) panasonic/$(DEPDIR)
 	@: > panasonic/$(DEPDIR)/$(am__dirstamp)
-panasonic/dc1000.lo: panasonic/$(am__dirstamp) \
+panasonic/dc1000_la-dc1000.lo: panasonic/$(am__dirstamp) \
 	panasonic/$(DEPDIR)/$(am__dirstamp)
-panasonic/dc.lo: panasonic/$(am__dirstamp) \
+panasonic/dc1000_la-dc.lo: panasonic/$(am__dirstamp) \
 	panasonic/$(DEPDIR)/$(am__dirstamp)
 
 panasonic_dc1000.la: $(panasonic_dc1000_la_OBJECTS) $(panasonic_dc1000_la_DEPENDENCIES) $(EXTRA_panasonic_dc1000_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(panasonic_dc1000_la_LINK)  $(panasonic_dc1000_la_OBJECTS) $(panasonic_dc1000_la_LIBADD) $(LIBS)
-panasonic/dc1580.lo: panasonic/$(am__dirstamp) \
+panasonic/dc1580_la-dc1580.lo: panasonic/$(am__dirstamp) \
+	panasonic/$(DEPDIR)/$(am__dirstamp)
+panasonic/dc1580_la-dc.lo: panasonic/$(am__dirstamp) \
 	panasonic/$(DEPDIR)/$(am__dirstamp)
 
 panasonic_dc1580.la: $(panasonic_dc1580_la_OBJECTS) $(panasonic_dc1580_la_DEPENDENCIES) $(EXTRA_panasonic_dc1580_la_DEPENDENCIES) 
@@ -2285,7 +2640,7 @@
 panasonic/l859/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) panasonic/l859/$(DEPDIR)
 	@: > panasonic/l859/$(DEPDIR)/$(am__dirstamp)
-panasonic/l859/l859.lo: panasonic/l859/$(am__dirstamp) \
+panasonic/l859/la-l859.lo: panasonic/l859/$(am__dirstamp) \
 	panasonic/l859/$(DEPDIR)/$(am__dirstamp)
 
 panasonic_l859.la: $(panasonic_l859_la_OBJECTS) $(panasonic_l859_la_DEPENDENCIES) $(EXTRA_panasonic_l859_la_DEPENDENCIES) 
@@ -2296,9 +2651,9 @@
 pccam300/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) pccam300/$(DEPDIR)
 	@: > pccam300/$(DEPDIR)/$(am__dirstamp)
-pccam300/pccam300.lo: pccam300/$(am__dirstamp) \
+pccam300/la-pccam300.lo: pccam300/$(am__dirstamp) \
 	pccam300/$(DEPDIR)/$(am__dirstamp)
-pccam300/library.lo: pccam300/$(am__dirstamp) \
+pccam300/la-library.lo: pccam300/$(am__dirstamp) \
 	pccam300/$(DEPDIR)/$(am__dirstamp)
 
 pccam300.la: $(pccam300_la_OBJECTS) $(pccam300_la_DEPENDENCIES) $(EXTRA_pccam300_la_DEPENDENCIES) 
@@ -2309,9 +2664,9 @@
 pccam600/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) pccam600/$(DEPDIR)
 	@: > pccam600/$(DEPDIR)/$(am__dirstamp)
-pccam600/pccam600.lo: pccam600/$(am__dirstamp) \
+pccam600/la-pccam600.lo: pccam600/$(am__dirstamp) \
 	pccam600/$(DEPDIR)/$(am__dirstamp)
-pccam600/library.lo: pccam600/$(am__dirstamp) \
+pccam600/la-library.lo: pccam600/$(am__dirstamp) \
 	pccam600/$(DEPDIR)/$(am__dirstamp)
 
 pccam600.la: $(pccam600_la_OBJECTS) $(pccam600_la_DEPENDENCIES) $(EXTRA_pccam600_la_DEPENDENCIES) 
@@ -2322,17 +2677,17 @@
 pentax/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) pentax/$(DEPDIR)
 	@: > pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-pslr.lo: pentax/$(am__dirstamp) \
+pentax/la-pslr.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-library.lo: pentax/$(am__dirstamp) \
+pentax/la-library.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-pslr_enum.lo: pentax/$(am__dirstamp) \
+pentax/la-pslr_enum.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-pslr_lens.lo: pentax/$(am__dirstamp) \
+pentax/la-pslr_lens.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-pslr_model.lo: pentax/$(am__dirstamp) \
+pentax/la-pslr_model.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
-pentax/pentax_la-js0n.lo: pentax/$(am__dirstamp) \
+pentax/la-js0n.lo: pentax/$(am__dirstamp) \
 	pentax/$(DEPDIR)/$(am__dirstamp)
 
 pentax.la: $(pentax_la_OBJECTS) $(pentax_la_DEPENDENCIES) $(EXTRA_pentax_la_DEPENDENCIES) 
@@ -2343,21 +2698,21 @@
 polaroid/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) polaroid/$(DEPDIR)
 	@: > polaroid/$(DEPDIR)/$(am__dirstamp)
-polaroid/pdc320.lo: polaroid/$(am__dirstamp) \
+polaroid/pdc320_la-pdc320.lo: polaroid/$(am__dirstamp) \
 	polaroid/$(DEPDIR)/$(am__dirstamp)
 
 polaroid_pdc320.la: $(polaroid_pdc320_la_OBJECTS) $(polaroid_pdc320_la_DEPENDENCIES) $(EXTRA_polaroid_pdc320_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(polaroid_pdc320_la_LINK)  $(polaroid_pdc320_la_OBJECTS) $(polaroid_pdc320_la_LIBADD) $(LIBS)
-polaroid/pdc640.lo: polaroid/$(am__dirstamp) \
+polaroid/pdc640_la-pdc640.lo: polaroid/$(am__dirstamp) \
 	polaroid/$(DEPDIR)/$(am__dirstamp)
-polaroid/jd350e.lo: polaroid/$(am__dirstamp) \
+polaroid/pdc640_la-jd350e.lo: polaroid/$(am__dirstamp) \
 	polaroid/$(DEPDIR)/$(am__dirstamp)
-polaroid/dlink350f.lo: polaroid/$(am__dirstamp) \
+polaroid/pdc640_la-dlink350f.lo: polaroid/$(am__dirstamp) \
 	polaroid/$(DEPDIR)/$(am__dirstamp)
 
 polaroid_pdc640.la: $(polaroid_pdc640_la_OBJECTS) $(polaroid_pdc640_la_DEPENDENCIES) $(EXTRA_polaroid_pdc640_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(polaroid_pdc640_la_LINK)  $(polaroid_pdc640_la_OBJECTS) $(polaroid_pdc640_la_LIBADD) $(LIBS)
-polaroid/pdc700.lo: polaroid/$(am__dirstamp) \
+polaroid/pdc700_la-pdc700.lo: polaroid/$(am__dirstamp) \
 	polaroid/$(DEPDIR)/$(am__dirstamp)
 
 polaroid_pdc700.la: $(polaroid_pdc700_la_OBJECTS) $(polaroid_pdc700_la_DEPENDENCIES) $(EXTRA_polaroid_pdc700_la_DEPENDENCIES) 
@@ -2368,19 +2723,16 @@
 ptp2/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ptp2/$(DEPDIR)
 	@: > ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-ptp.lo: ptp2/$(am__dirstamp) \
-	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-library.lo: ptp2/$(am__dirstamp) \
-	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-usb.lo: ptp2/$(am__dirstamp) \
-	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-ptpip.lo: ptp2/$(am__dirstamp) \
+ptp2/la-ptp.lo: ptp2/$(am__dirstamp) ptp2/$(DEPDIR)/$(am__dirstamp)
+ptp2/la-library.lo: ptp2/$(am__dirstamp) \
 	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-config.lo: ptp2/$(am__dirstamp) \
+ptp2/la-usb.lo: ptp2/$(am__dirstamp) ptp2/$(DEPDIR)/$(am__dirstamp)
+ptp2/la-ptpip.lo: ptp2/$(am__dirstamp) ptp2/$(DEPDIR)/$(am__dirstamp)
+ptp2/la-config.lo: ptp2/$(am__dirstamp) ptp2/$(DEPDIR)/$(am__dirstamp)
+ptp2/la-olympus-wrap.lo: ptp2/$(am__dirstamp) \
 	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-olympus-wrap.lo: ptp2/$(am__dirstamp) \
-	ptp2/$(DEPDIR)/$(am__dirstamp)
-ptp2/ptp2_la-chdk.lo: ptp2/$(am__dirstamp) \
+ptp2/la-chdk.lo: ptp2/$(am__dirstamp) ptp2/$(DEPDIR)/$(am__dirstamp)
+ptp2/la-fujiptpip.lo: ptp2/$(am__dirstamp) \
 	ptp2/$(DEPDIR)/$(am__dirstamp)
 
 ptp2.la: $(ptp2_la_OBJECTS) $(ptp2_la_DEPENDENCIES) $(EXTRA_ptp2_la_DEPENDENCIES) 
@@ -2391,13 +2743,15 @@
 ricoh/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ricoh/$(DEPDIR)
 	@: > ricoh/$(DEPDIR)/$(am__dirstamp)
-ricoh/library.lo: ricoh/$(am__dirstamp) \
+ricoh/la-library.lo: ricoh/$(am__dirstamp) \
+	ricoh/$(DEPDIR)/$(am__dirstamp)
+ricoh/la-ricoh.lo: ricoh/$(am__dirstamp) \
 	ricoh/$(DEPDIR)/$(am__dirstamp)
-ricoh/ricoh.lo: ricoh/$(am__dirstamp) ricoh/$(DEPDIR)/$(am__dirstamp)
 
 ricoh.la: $(ricoh_la_OBJECTS) $(ricoh_la_DEPENDENCIES) $(EXTRA_ricoh_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(ricoh_la_LINK)  $(ricoh_la_OBJECTS) $(ricoh_la_LIBADD) $(LIBS)
-ricoh/g3.lo: ricoh/$(am__dirstamp) ricoh/$(DEPDIR)/$(am__dirstamp)
+ricoh/g3_la-g3.lo: ricoh/$(am__dirstamp) \
+	ricoh/$(DEPDIR)/$(am__dirstamp)
 
 ricoh_g3.la: $(ricoh_g3_la_OBJECTS) $(ricoh_g3_la_DEPENDENCIES) $(EXTRA_ricoh_g3_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(ricoh_g3_la_LINK)  $(ricoh_g3_la_OBJECTS) $(ricoh_g3_la_LIBADD) $(LIBS)
@@ -2407,7 +2761,7 @@
 samsung/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) samsung/$(DEPDIR)
 	@: > samsung/$(DEPDIR)/$(am__dirstamp)
-samsung/samsung.lo: samsung/$(am__dirstamp) \
+samsung/la-samsung.lo: samsung/$(am__dirstamp) \
 	samsung/$(DEPDIR)/$(am__dirstamp)
 
 samsung.la: $(samsung_la_OBJECTS) $(samsung_la_DEPENDENCIES) $(EXTRA_samsung_la_DEPENDENCIES) 
@@ -2418,19 +2772,19 @@
 sierra/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sierra/$(DEPDIR)
 	@: > sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-sierra.lo: sierra/$(am__dirstamp) \
+sierra/la-sierra.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-library.lo: sierra/$(am__dirstamp) \
+sierra/la-library.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-sierra-usbwrap.lo: sierra/$(am__dirstamp) \
+sierra/la-sierra-usbwrap.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-sierra-desc.lo: sierra/$(am__dirstamp) \
+sierra/la-sierra-desc.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-nikon-desc.lo: sierra/$(am__dirstamp) \
+sierra/la-nikon-desc.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-olympus-desc.lo: sierra/$(am__dirstamp) \
+sierra/la-olympus-desc.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
-sierra/sierra_la-epson-desc.lo: sierra/$(am__dirstamp) \
+sierra/la-epson-desc.lo: sierra/$(am__dirstamp) \
 	sierra/$(DEPDIR)/$(am__dirstamp)
 
 sierra.la: $(sierra_la_OBJECTS) $(sierra_la_DEPENDENCIES) $(EXTRA_sierra_la_DEPENDENCIES) 
@@ -2441,15 +2795,18 @@
 sipix/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sipix/$(DEPDIR)
 	@: > sipix/$(DEPDIR)/$(am__dirstamp)
-sipix/blink.lo: sipix/$(am__dirstamp) sipix/$(DEPDIR)/$(am__dirstamp)
+sipix/blink_la-blink.lo: sipix/$(am__dirstamp) \
+	sipix/$(DEPDIR)/$(am__dirstamp)
 
 sipix_blink.la: $(sipix_blink_la_OBJECTS) $(sipix_blink_la_DEPENDENCIES) $(EXTRA_sipix_blink_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(sipix_blink_la_LINK)  $(sipix_blink_la_OBJECTS) $(sipix_blink_la_LIBADD) $(LIBS)
-sipix/blink2.lo: sipix/$(am__dirstamp) sipix/$(DEPDIR)/$(am__dirstamp)
+sipix/blink2_la-blink2.lo: sipix/$(am__dirstamp) \
+	sipix/$(DEPDIR)/$(am__dirstamp)
 
 sipix_blink2.la: $(sipix_blink2_la_OBJECTS) $(sipix_blink2_la_DEPENDENCIES) $(EXTRA_sipix_blink2_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(sipix_blink2_la_LINK)  $(sipix_blink2_la_OBJECTS) $(sipix_blink2_la_LIBADD) $(LIBS)
-sipix/web2.lo: sipix/$(am__dirstamp) sipix/$(DEPDIR)/$(am__dirstamp)
+sipix/web2_la-web2.lo: sipix/$(am__dirstamp) \
+	sipix/$(DEPDIR)/$(am__dirstamp)
 
 sipix_web2.la: $(sipix_web2_la_OBJECTS) $(sipix_web2_la_DEPENDENCIES) $(EXTRA_sipix_web2_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(sipix_web2_la_LINK)  $(sipix_web2_la_OBJECTS) $(sipix_web2_la_LIBADD) $(LIBS)
@@ -2459,8 +2816,8 @@
 smal/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) smal/$(DEPDIR)
 	@: > smal/$(DEPDIR)/$(am__dirstamp)
-smal/smal.lo: smal/$(am__dirstamp) smal/$(DEPDIR)/$(am__dirstamp)
-smal/ultrapocket.lo: smal/$(am__dirstamp) \
+smal/la-smal.lo: smal/$(am__dirstamp) smal/$(DEPDIR)/$(am__dirstamp)
+smal/la-ultrapocket.lo: smal/$(am__dirstamp) \
 	smal/$(DEPDIR)/$(am__dirstamp)
 
 smal.la: $(smal_la_OBJECTS) $(smal_la_DEPENDENCIES) $(EXTRA_smal_la_DEPENDENCIES) 
@@ -2471,9 +2828,10 @@
 sonix/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sonix/$(DEPDIR)
 	@: > sonix/$(DEPDIR)/$(am__dirstamp)
-sonix/library.lo: sonix/$(am__dirstamp) \
+sonix/la-library.lo: sonix/$(am__dirstamp) \
+	sonix/$(DEPDIR)/$(am__dirstamp)
+sonix/la-sonix.lo: sonix/$(am__dirstamp) \
 	sonix/$(DEPDIR)/$(am__dirstamp)
-sonix/sonix.lo: sonix/$(am__dirstamp) sonix/$(DEPDIR)/$(am__dirstamp)
 
 sonix.la: $(sonix_la_OBJECTS) $(sonix_la_DEPENDENCIES) $(EXTRA_sonix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(sonix_la_LINK)  $(sonix_la_OBJECTS) $(sonix_la_LIBADD) $(LIBS)
@@ -2483,9 +2841,9 @@
 sonydscf1/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sonydscf1/$(DEPDIR)
 	@: > sonydscf1/$(DEPDIR)/$(am__dirstamp)
-sonydscf1/command.lo: sonydscf1/$(am__dirstamp) \
+sonydscf1/sony_dscf1_la-command.lo: sonydscf1/$(am__dirstamp) \
 	sonydscf1/$(DEPDIR)/$(am__dirstamp)
-sonydscf1/sonydscf1.lo: sonydscf1/$(am__dirstamp) \
+sonydscf1/sony_dscf1_la-sonydscf1.lo: sonydscf1/$(am__dirstamp) \
 	sonydscf1/$(DEPDIR)/$(am__dirstamp)
 
 sony_dscf1.la: $(sony_dscf1_la_OBJECTS) $(sony_dscf1_la_DEPENDENCIES) $(EXTRA_sony_dscf1_la_DEPENDENCIES) 
@@ -2496,9 +2854,9 @@
 sonydscf55/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sonydscf55/$(DEPDIR)
 	@: > sonydscf55/$(DEPDIR)/$(am__dirstamp)
-sonydscf55/sony.lo: sonydscf55/$(am__dirstamp) \
+sonydscf55/sony_dscf55_la-sony.lo: sonydscf55/$(am__dirstamp) \
 	sonydscf55/$(DEPDIR)/$(am__dirstamp)
-sonydscf55/camera.lo: sonydscf55/$(am__dirstamp) \
+sonydscf55/sony_dscf55_la-camera.lo: sonydscf55/$(am__dirstamp) \
 	sonydscf55/$(DEPDIR)/$(am__dirstamp)
 
 sony_dscf55.la: $(sony_dscf55_la_OBJECTS) $(sony_dscf55_la_DEPENDENCIES) $(EXTRA_sony_dscf55_la_DEPENDENCIES) 
@@ -2509,13 +2867,13 @@
 soundvision/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) soundvision/$(DEPDIR)
 	@: > soundvision/$(DEPDIR)/$(am__dirstamp)
-soundvision/soundvision.lo: soundvision/$(am__dirstamp) \
+soundvision/la-soundvision.lo: soundvision/$(am__dirstamp) \
 	soundvision/$(DEPDIR)/$(am__dirstamp)
-soundvision/agfa_cl18.lo: soundvision/$(am__dirstamp) \
+soundvision/la-agfa_cl18.lo: soundvision/$(am__dirstamp) \
 	soundvision/$(DEPDIR)/$(am__dirstamp)
-soundvision/tiger_fastflicks.lo: soundvision/$(am__dirstamp) \
+soundvision/la-tiger_fastflicks.lo: soundvision/$(am__dirstamp) \
 	soundvision/$(DEPDIR)/$(am__dirstamp)
-soundvision/commands.lo: soundvision/$(am__dirstamp) \
+soundvision/la-commands.lo: soundvision/$(am__dirstamp) \
 	soundvision/$(DEPDIR)/$(am__dirstamp)
 
 soundvision.la: $(soundvision_la_OBJECTS) $(soundvision_la_DEPENDENCIES) $(EXTRA_soundvision_la_DEPENDENCIES) 
@@ -2526,13 +2884,13 @@
 spca50x/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) spca50x/$(DEPDIR)
 	@: > spca50x/$(DEPDIR)/$(am__dirstamp)
-spca50x/spca50x.lo: spca50x/$(am__dirstamp) \
+spca50x/la-spca50x.lo: spca50x/$(am__dirstamp) \
 	spca50x/$(DEPDIR)/$(am__dirstamp)
-spca50x/spca50x-flash.lo: spca50x/$(am__dirstamp) \
+spca50x/la-spca50x-flash.lo: spca50x/$(am__dirstamp) \
 	spca50x/$(DEPDIR)/$(am__dirstamp)
-spca50x/spca50x-sdram.lo: spca50x/$(am__dirstamp) \
+spca50x/la-spca50x-sdram.lo: spca50x/$(am__dirstamp) \
 	spca50x/$(DEPDIR)/$(am__dirstamp)
-spca50x/library.lo: spca50x/$(am__dirstamp) \
+spca50x/la-library.lo: spca50x/$(am__dirstamp) \
 	spca50x/$(DEPDIR)/$(am__dirstamp)
 
 spca50x.la: $(spca50x_la_OBJECTS) $(spca50x_la_DEPENDENCIES) $(EXTRA_spca50x_la_DEPENDENCIES) 
@@ -2543,10 +2901,11 @@
 sq905/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sq905/$(DEPDIR)
 	@: > sq905/$(DEPDIR)/$(am__dirstamp)
-sq905/library.lo: sq905/$(am__dirstamp) \
+sq905/la-library.lo: sq905/$(am__dirstamp) \
 	sq905/$(DEPDIR)/$(am__dirstamp)
-sq905/sq905.lo: sq905/$(am__dirstamp) sq905/$(DEPDIR)/$(am__dirstamp)
-sq905/postprocess.lo: sq905/$(am__dirstamp) \
+sq905/la-sq905.lo: sq905/$(am__dirstamp) \
+	sq905/$(DEPDIR)/$(am__dirstamp)
+sq905/la-postprocess.lo: sq905/$(am__dirstamp) \
 	sq905/$(DEPDIR)/$(am__dirstamp)
 
 sq905.la: $(sq905_la_OBJECTS) $(sq905_la_DEPENDENCIES) $(EXTRA_sq905_la_DEPENDENCIES) 
@@ -2557,13 +2916,13 @@
 st2205/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) st2205/$(DEPDIR)
 	@: > st2205/$(DEPDIR)/$(am__dirstamp)
-st2205/st2205_la-library.lo: st2205/$(am__dirstamp) \
+st2205/la-library.lo: st2205/$(am__dirstamp) \
 	st2205/$(DEPDIR)/$(am__dirstamp)
-st2205/st2205_la-st2205.lo: st2205/$(am__dirstamp) \
+st2205/la-st2205.lo: st2205/$(am__dirstamp) \
 	st2205/$(DEPDIR)/$(am__dirstamp)
-st2205/st2205_la-st2205_decode.lo: st2205/$(am__dirstamp) \
+st2205/la-st2205_decode.lo: st2205/$(am__dirstamp) \
 	st2205/$(DEPDIR)/$(am__dirstamp)
-st2205/st2205_la-st2205_tables.lo: st2205/$(am__dirstamp) \
+st2205/la-st2205_tables.lo: st2205/$(am__dirstamp) \
 	st2205/$(DEPDIR)/$(am__dirstamp)
 
 st2205.la: $(st2205_la_OBJECTS) $(st2205_la_DEPENDENCIES) $(EXTRA_st2205_la_DEPENDENCIES) 
@@ -2574,9 +2933,9 @@
 stv0674/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) stv0674/$(DEPDIR)
 	@: > stv0674/$(DEPDIR)/$(am__dirstamp)
-stv0674/stv0674.lo: stv0674/$(am__dirstamp) \
+stv0674/la-stv0674.lo: stv0674/$(am__dirstamp) \
 	stv0674/$(DEPDIR)/$(am__dirstamp)
-stv0674/library.lo: stv0674/$(am__dirstamp) \
+stv0674/la-library.lo: stv0674/$(am__dirstamp) \
 	stv0674/$(DEPDIR)/$(am__dirstamp)
 
 stv0674.la: $(stv0674_la_OBJECTS) $(stv0674_la_DEPENDENCIES) $(EXTRA_stv0674_la_DEPENDENCIES) 
@@ -2587,17 +2946,17 @@
 stv0680/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) stv0680/$(DEPDIR)
 	@: > stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/stv0680.lo: stv0680/$(am__dirstamp) \
+stv0680/la-stv0680.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/library.lo: stv0680/$(am__dirstamp) \
+stv0680/la-library.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/bayer.lo: stv0680/$(am__dirstamp) \
+stv0680/la-stv0680-bayer.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/sharpen.lo: stv0680/$(am__dirstamp) \
+stv0680/la-sharpen.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/saturate.lo: stv0680/$(am__dirstamp) \
+stv0680/la-saturate.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
-stv0680/demosaic_sharpen.lo: stv0680/$(am__dirstamp) \
+stv0680/la-demosaic_sharpen.lo: stv0680/$(am__dirstamp) \
 	stv0680/$(DEPDIR)/$(am__dirstamp)
 
 stv0680.la: $(stv0680_la_OBJECTS) $(stv0680_la_DEPENDENCIES) $(EXTRA_stv0680_la_DEPENDENCIES) 
@@ -2608,9 +2967,9 @@
 sx330z/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) sx330z/$(DEPDIR)
 	@: > sx330z/$(DEPDIR)/$(am__dirstamp)
-sx330z/library.lo: sx330z/$(am__dirstamp) \
+sx330z/la-library.lo: sx330z/$(am__dirstamp) \
 	sx330z/$(DEPDIR)/$(am__dirstamp)
-sx330z/sx330z.lo: sx330z/$(am__dirstamp) \
+sx330z/la-sx330z.lo: sx330z/$(am__dirstamp) \
 	sx330z/$(DEPDIR)/$(am__dirstamp)
 
 sx330z.la: $(sx330z_la_OBJECTS) $(sx330z_la_DEPENDENCIES) $(EXTRA_sx330z_la_DEPENDENCIES) 
@@ -2621,7 +2980,7 @@
 template/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) template/$(DEPDIR)
 	@: > template/$(DEPDIR)/$(am__dirstamp)
-template/template_la-template.lo: template/$(am__dirstamp) \
+template/la-template.lo: template/$(am__dirstamp) \
 	template/$(DEPDIR)/$(am__dirstamp)
 
 template.la: $(template_la_OBJECTS) $(template_la_DEPENDENCIES) $(EXTRA_template_la_DEPENDENCIES) 
@@ -2632,15 +2991,15 @@
 topfield/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) topfield/$(DEPDIR)
 	@: > topfield/$(DEPDIR)/$(am__dirstamp)
-topfield/crc16.lo: topfield/$(am__dirstamp) \
+topfield/la-crc16.lo: topfield/$(am__dirstamp) \
 	topfield/$(DEPDIR)/$(am__dirstamp)
-topfield/tf_bytes.lo: topfield/$(am__dirstamp) \
+topfield/la-tf_bytes.lo: topfield/$(am__dirstamp) \
 	topfield/$(DEPDIR)/$(am__dirstamp)
-topfield/mjd.lo: topfield/$(am__dirstamp) \
+topfield/la-mjd.lo: topfield/$(am__dirstamp) \
 	topfield/$(DEPDIR)/$(am__dirstamp)
-topfield/puppy.lo: topfield/$(am__dirstamp) \
+topfield/la-puppy.lo: topfield/$(am__dirstamp) \
 	topfield/$(DEPDIR)/$(am__dirstamp)
-topfield/usb_io.lo: topfield/$(am__dirstamp) \
+topfield/la-usb_io.lo: topfield/$(am__dirstamp) \
 	topfield/$(DEPDIR)/$(am__dirstamp)
 
 topfield.la: $(topfield_la_OBJECTS) $(topfield_la_DEPENDENCIES) $(EXTRA_topfield_la_DEPENDENCIES) 
@@ -2651,9 +3010,9 @@
 toshiba/pdrm11/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) toshiba/pdrm11/$(DEPDIR)
 	@: > toshiba/pdrm11/$(DEPDIR)/$(am__dirstamp)
-toshiba/pdrm11/library.lo: toshiba/pdrm11/$(am__dirstamp) \
+toshiba/pdrm11/la-library.lo: toshiba/pdrm11/$(am__dirstamp) \
 	toshiba/pdrm11/$(DEPDIR)/$(am__dirstamp)
-toshiba/pdrm11/pdrm11.lo: toshiba/pdrm11/$(am__dirstamp) \
+toshiba/pdrm11/la-pdrm11.lo: toshiba/pdrm11/$(am__dirstamp) \
 	toshiba/pdrm11/$(DEPDIR)/$(am__dirstamp)
 
 toshiba_pdrm11.la: $(toshiba_pdrm11_la_OBJECTS) $(toshiba_pdrm11_la_DEPENDENCIES) $(EXTRA_toshiba_pdrm11_la_DEPENDENCIES) 
@@ -2664,9 +3023,9 @@
 tp6801/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) tp6801/$(DEPDIR)
 	@: > tp6801/$(DEPDIR)/$(am__dirstamp)
-tp6801/tp6801_la-library.lo: tp6801/$(am__dirstamp) \
+tp6801/la-library.lo: tp6801/$(am__dirstamp) \
 	tp6801/$(DEPDIR)/$(am__dirstamp)
-tp6801/tp6801_la-tp6801.lo: tp6801/$(am__dirstamp) \
+tp6801/la-tp6801.lo: tp6801/$(am__dirstamp) \
 	tp6801/$(DEPDIR)/$(am__dirstamp)
 
 tp6801.la: $(tp6801_la_OBJECTS) $(tp6801_la_DEPENDENCIES) $(EXTRA_tp6801_la_DEPENDENCIES) 
@@ -2698,6 +3057,8 @@
 	-rm -f dimera/*.lo
 	-rm -f directory/*.$(OBJEXT)
 	-rm -f directory/*.lo
+	-rm -f docupen/*.$(OBJEXT)
+	-rm -f docupen/*.lo
 	-rm -f enigma13/*.$(OBJEXT)
 	-rm -f enigma13/*.lo
 	-rm -f fuji/*.$(OBJEXT)
@@ -2732,6 +3093,8 @@
 	-rm -f largan/lmini/*.lo
 	-rm -f lg_gsm/*.$(OBJEXT)
 	-rm -f lg_gsm/*.lo
+	-rm -f lumix/*.$(OBJEXT)
+	-rm -f lumix/*.lo
 	-rm -f mars/*.$(OBJEXT)
 	-rm -f mars/*.lo
 	-rm -f minolta/dimagev/*.$(OBJEXT)
@@ -2796,182 +3159,196 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@adc65/$(DEPDIR)/adc65.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@agfa-cl20/$(DEPDIR)/agfa_cl20.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@aox/$(DEPDIR)/aox.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@aox/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-ax203.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-ax203_compress_jpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv_delta.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-jidctflt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-jpeg_memsrcdest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/ax203_la-tinyjpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@barbie/$(DEPDIR)/barbie.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-canon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-crc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-serial.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-usb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/canon_la-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/camtojpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/casio-qv-commands.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/casio-qv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/ycctoppm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clicksmart310/$(DEPDIR)/clicksmart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clicksmart310/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/digi_postprocess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/digigr8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/commands.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/digita.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/serial.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/usb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dimera/$(DEPDIR)/dimera3500.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dimera/$(DEPDIR)/mesalib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@directory/$(DEPDIR)/directory_la-directory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@enigma13/$(DEPDIR)/enigma13.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@fuji/$(DEPDIR)/fuji.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@fuji/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gsmart300/$(DEPDIR)/gsmart300.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gsmart300/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@hp215/$(DEPDIR)/hp215.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@iclick/$(DEPDIR)/iclick.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@iclick/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jamcam/$(DEPDIR)/jamcam.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jamcam/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/decomp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/jd11.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/serial.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005a/$(DEPDIR)/jl2005a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005a/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/img_enhance.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/jl2005bcd_decompress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/jl2005c.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/jpeg_memsrcdest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc120/$(DEPDIR)/dc120.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc120/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc210/$(DEPDIR)/dc210.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc210/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc240/$(DEPDIR)/dc240.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc240/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc3200/$(DEPDIR)/dc3200.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc3200/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@kodak/ez200/$(DEPDIR)/ez200.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/konica_la-konica.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/konica_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/konica_la-lowlevel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/konica_qm150_la-qm150.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/largan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/lmini.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/lmini_ccd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lg_gsm/$(DEPDIR)/lg_gsm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lg_gsm/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mars/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mars/$(DEPDIR)/mars.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/capture.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/delete.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/download.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/packet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/status.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/upload.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/mdc800.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/rs232.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/usb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1000.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1580.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/coolshot/$(DEPDIR)/coolshot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/coolshot/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@panasonic/l859/$(DEPDIR)/l859.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pccam300/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pccam300/$(DEPDIR)/pccam300.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pccam600/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pccam600/$(DEPDIR)/pccam600.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-js0n.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-pslr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-pslr_enum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-pslr_lens.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/pentax_la-pslr_model.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/dlink350f.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/jd350e.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc320.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc640.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc700.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-chdk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-olympus-wrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-ptp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-ptpip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/ptp2_la-usb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/g3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/ricoh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@samsung/$(DEPDIR)/samsung.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-epson-desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-nikon-desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-olympus-desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-sierra-desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-sierra-usbwrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/sierra_la-sierra.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/blink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/blink2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/web2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@smal/$(DEPDIR)/smal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@smal/$(DEPDIR)/ultrapocket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonix/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonix/$(DEPDIR)/sonix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonydscf1/$(DEPDIR)/command.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonydscf1/$(DEPDIR)/sonydscf1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonydscf55/$(DEPDIR)/camera.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sonydscf55/$(DEPDIR)/sony.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/agfa_cl18.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/commands.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/soundvision.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/tiger_fastflicks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/spca50x-flash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/spca50x-sdram.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/spca50x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/postprocess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/sq905.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/st2205_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/st2205_la-st2205.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/st2205_la-st2205_decode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/st2205_la-st2205_tables.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0674/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0674/$(DEPDIR)/stv0674.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/bayer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/demosaic_sharpen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/saturate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/sharpen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/stv0680.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sx330z/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sx330z/$(DEPDIR)/sx330z.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@template/$(DEPDIR)/template_la-template.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/crc16.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/mjd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/puppy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/tf_bytes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/usb_io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@toshiba/pdrm11/$(DEPDIR)/library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@toshiba/pdrm11/$(DEPDIR)/pdrm11.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tp6801/$(DEPDIR)/tp6801_la-library.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tp6801/$(DEPDIR)/tp6801_la-tp6801.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@adc65/$(DEPDIR)/la-adc65.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@agfa-cl20/$(DEPDIR)/la-agfa_cl20.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@aox/$(DEPDIR)/la-aox.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@aox/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-ax203.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-ax203_compress_jpeg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-ax203_decode_yuv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-jidctflt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-jpeg_memsrcdest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ax203/$(DEPDIR)/la-tinyjpeg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@barbie/$(DEPDIR)/la-barbie.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-canon.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-crc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-serial.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-usb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@canon/$(DEPDIR)/la-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/qv_la-camtojpeg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/qv_la-casio-qv-commands.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/qv_la-casio-qv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@casio/$(DEPDIR)/qv_la-ycctoppm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clicksmart310/$(DEPDIR)/la-clicksmart.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clicksmart310/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/la-digi_postprocess.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/la-digigr8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digigr8/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/la-commands.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/la-digita.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/la-serial.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@digita/$(DEPDIR)/la-usb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@dimera/$(DEPDIR)/dimera3500_la-dimera3500.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@dimera/$(DEPDIR)/dimera3500_la-mesalib.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@directory/$(DEPDIR)/la-directory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@docupen/$(DEPDIR)/la-cache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@docupen/$(DEPDIR)/la-calibration.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@docupen/$(DEPDIR)/la-docupen.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@docupen/$(DEPDIR)/la-huffman.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@docupen/$(DEPDIR)/la-image.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@enigma13/$(DEPDIR)/la-enigma13.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@fuji/$(DEPDIR)/la-fuji.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@fuji/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@gsmart300/$(DEPDIR)/la-gsmart300.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@gsmart300/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@hp215/$(DEPDIR)/la-hp215.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@iclick/$(DEPDIR)/la-iclick.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@iclick/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jamcam/$(DEPDIR)/la-jamcam.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jamcam/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/la-decomp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/la-jd11.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jd11/$(DEPDIR)/la-serial.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005a/$(DEPDIR)/la-jl2005a.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005a/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/la-img_enhance.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/la-jl2005c.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@jl2005c/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc120/$(DEPDIR)/la-dc120.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc120/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc210/$(DEPDIR)/la-dc210.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc210/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc240/$(DEPDIR)/la-dc240.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc240/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc3200/$(DEPDIR)/la-dc3200.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/dc3200/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@kodak/ez200/$(DEPDIR)/la-ez200.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/la-konica.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/la-lowlevel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@konica/$(DEPDIR)/qm150_la-qm150.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/la-largan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/la-lmini.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@largan/lmini/$(DEPDIR)/la-lmini_ccd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@lg_gsm/$(DEPDIR)/la-lg_gsm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@lg_gsm/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@lumix/$(DEPDIR)/la-lumix.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mars/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mars/$(DEPDIR)/la-mars.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-download.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-info.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-status.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@minolta/dimagev/$(DEPDIR)/dimagev_la-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-core.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-image.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-io.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-mdc800.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-rs232.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mustek/$(DEPDIR)/la-usb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1000_la-dc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1000_la-dc1000.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1580_la-dc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/$(DEPDIR)/dc1580_la-dc1580.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/coolshot/$(DEPDIR)/la-coolshot.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/coolshot/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@panasonic/l859/$(DEPDIR)/la-l859.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pccam300/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pccam300/$(DEPDIR)/la-pccam300.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pccam600/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pccam600/$(DEPDIR)/la-pccam600.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-js0n.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-pslr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-pslr_enum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-pslr_lens.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@pentax/$(DEPDIR)/la-pslr_model.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc320_la-pdc320.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc640_la-dlink350f.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc640_la-jd350e.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc640_la-pdc640.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@polaroid/$(DEPDIR)/pdc700_la-pdc700.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-chdk.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-fujiptpip.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-olympus-wrap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-ptp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-ptpip.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ptp2/$(DEPDIR)/la-usb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/g3_la-g3.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ricoh/$(DEPDIR)/la-ricoh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@samsung/$(DEPDIR)/la-samsung.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-epson-desc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-nikon-desc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-olympus-desc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-sierra-desc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-sierra-usbwrap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sierra/$(DEPDIR)/la-sierra.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/blink2_la-blink2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/blink_la-blink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sipix/$(DEPDIR)/web2_la-web2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@smal/$(DEPDIR)/la-smal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@smal/$(DEPDIR)/la-ultrapocket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonix/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonix/$(DEPDIR)/la-sonix.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/la-agfa_cl18.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/la-commands.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/la-soundvision.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@soundvision/$(DEPDIR)/la-tiger_fastflicks.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/la-spca50x-flash.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/la-spca50x-sdram.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@spca50x/$(DEPDIR)/la-spca50x.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/la-postprocess.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sq905/$(DEPDIR)/la-sq905.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/la-st2205.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/la-st2205_decode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@st2205/$(DEPDIR)/la-st2205_tables.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0674/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0674/$(DEPDIR)/la-stv0674.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-demosaic_sharpen.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-saturate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-sharpen.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-stv0680-bayer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@stv0680/$(DEPDIR)/la-stv0680.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sx330z/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@sx330z/$(DEPDIR)/la-sx330z.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@template/$(DEPDIR)/la-template.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/la-crc16.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/la-mjd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/la-puppy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/la-tf_bytes.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@topfield/$(DEPDIR)/la-usb_io.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@toshiba/pdrm11/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tp6801/$(DEPDIR)/la-library.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tp6801/$(DEPDIR)/la-tp6801.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -2997,327 +3374,1293 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-ax203/ax203_la-library.lo: ax203/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-library.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-library.Tpo -c -o ax203/ax203_la-library.lo `test -f 'ax203/library.c' || echo '$(srcdir)/'`ax203/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-library.Tpo ax203/$(DEPDIR)/ax203_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/library.c' object='ax203/ax203_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+adc65/la-adc65.lo: adc65/adc65.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(adc65_la_CPPFLAGS) $(CPPFLAGS) $(adc65_la_CFLAGS) $(CFLAGS) -MT adc65/la-adc65.lo -MD -MP -MF adc65/$(DEPDIR)/la-adc65.Tpo -c -o adc65/la-adc65.lo `test -f 'adc65/adc65.c' || echo '$(srcdir)/'`adc65/adc65.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) adc65/$(DEPDIR)/la-adc65.Tpo adc65/$(DEPDIR)/la-adc65.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='adc65/adc65.c' object='adc65/la-adc65.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(adc65_la_CPPFLAGS) $(CPPFLAGS) $(adc65_la_CFLAGS) $(CFLAGS) -c -o adc65/la-adc65.lo `test -f 'adc65/adc65.c' || echo '$(srcdir)/'`adc65/adc65.c
+
+agfa-cl20/la-agfa_cl20.lo: agfa-cl20/agfa_cl20.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(agfa_cl20_la_CPPFLAGS) $(CPPFLAGS) $(agfa_cl20_la_CFLAGS) $(CFLAGS) -MT agfa-cl20/la-agfa_cl20.lo -MD -MP -MF agfa-cl20/$(DEPDIR)/la-agfa_cl20.Tpo -c -o agfa-cl20/la-agfa_cl20.lo `test -f 'agfa-cl20/agfa_cl20.c' || echo '$(srcdir)/'`agfa-cl20/agfa_cl20.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) agfa-cl20/$(DEPDIR)/la-agfa_cl20.Tpo agfa-cl20/$(DEPDIR)/la-agfa_cl20.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='agfa-cl20/agfa_cl20.c' object='agfa-cl20/la-agfa_cl20.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(agfa_cl20_la_CPPFLAGS) $(CPPFLAGS) $(agfa_cl20_la_CFLAGS) $(CFLAGS) -c -o agfa-cl20/la-agfa_cl20.lo `test -f 'agfa-cl20/agfa_cl20.c' || echo '$(srcdir)/'`agfa-cl20/agfa_cl20.c
+
+aox/la-library.lo: aox/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aox_la_CPPFLAGS) $(CPPFLAGS) $(aox_la_CFLAGS) $(CFLAGS) -MT aox/la-library.lo -MD -MP -MF aox/$(DEPDIR)/la-library.Tpo -c -o aox/la-library.lo `test -f 'aox/library.c' || echo '$(srcdir)/'`aox/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) aox/$(DEPDIR)/la-library.Tpo aox/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='aox/library.c' object='aox/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aox_la_CPPFLAGS) $(CPPFLAGS) $(aox_la_CFLAGS) $(CFLAGS) -c -o aox/la-library.lo `test -f 'aox/library.c' || echo '$(srcdir)/'`aox/library.c
+
+aox/la-aox.lo: aox/aox.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aox_la_CPPFLAGS) $(CPPFLAGS) $(aox_la_CFLAGS) $(CFLAGS) -MT aox/la-aox.lo -MD -MP -MF aox/$(DEPDIR)/la-aox.Tpo -c -o aox/la-aox.lo `test -f 'aox/aox.c' || echo '$(srcdir)/'`aox/aox.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) aox/$(DEPDIR)/la-aox.Tpo aox/$(DEPDIR)/la-aox.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='aox/aox.c' object='aox/la-aox.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-library.lo `test -f 'ax203/library.c' || echo '$(srcdir)/'`ax203/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aox_la_CPPFLAGS) $(CPPFLAGS) $(aox_la_CFLAGS) $(CFLAGS) -c -o aox/la-aox.lo `test -f 'aox/aox.c' || echo '$(srcdir)/'`aox/aox.c
 
-ax203/ax203_la-ax203.lo: ax203/ax203.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-ax203.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-ax203.Tpo -c -o ax203/ax203_la-ax203.lo `test -f 'ax203/ax203.c' || echo '$(srcdir)/'`ax203/ax203.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-ax203.Tpo ax203/$(DEPDIR)/ax203_la-ax203.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203.c' object='ax203/ax203_la-ax203.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-library.lo: ax203/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-library.lo -MD -MP -MF ax203/$(DEPDIR)/la-library.Tpo -c -o ax203/la-library.lo `test -f 'ax203/library.c' || echo '$(srcdir)/'`ax203/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-library.Tpo ax203/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/library.c' object='ax203/la-library.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-ax203.lo `test -f 'ax203/ax203.c' || echo '$(srcdir)/'`ax203/ax203.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-library.lo `test -f 'ax203/library.c' || echo '$(srcdir)/'`ax203/library.c
 
-ax203/ax203_la-ax203_decode_yuv.lo: ax203/ax203_decode_yuv.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-ax203_decode_yuv.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv.Tpo -c -o ax203/ax203_la-ax203_decode_yuv.lo `test -f 'ax203/ax203_decode_yuv.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv.Tpo ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_decode_yuv.c' object='ax203/ax203_la-ax203_decode_yuv.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-ax203.lo: ax203/ax203.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-ax203.lo -MD -MP -MF ax203/$(DEPDIR)/la-ax203.Tpo -c -o ax203/la-ax203.lo `test -f 'ax203/ax203.c' || echo '$(srcdir)/'`ax203/ax203.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-ax203.Tpo ax203/$(DEPDIR)/la-ax203.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203.c' object='ax203/la-ax203.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-ax203_decode_yuv.lo `test -f 'ax203/ax203_decode_yuv.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-ax203.lo `test -f 'ax203/ax203.c' || echo '$(srcdir)/'`ax203/ax203.c
 
-ax203/ax203_la-ax203_decode_yuv_delta.lo: ax203/ax203_decode_yuv_delta.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-ax203_decode_yuv_delta.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv_delta.Tpo -c -o ax203/ax203_la-ax203_decode_yuv_delta.lo `test -f 'ax203/ax203_decode_yuv_delta.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv_delta.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv_delta.Tpo ax203/$(DEPDIR)/ax203_la-ax203_decode_yuv_delta.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_decode_yuv_delta.c' object='ax203/ax203_la-ax203_decode_yuv_delta.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-ax203_decode_yuv.lo: ax203/ax203_decode_yuv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-ax203_decode_yuv.lo -MD -MP -MF ax203/$(DEPDIR)/la-ax203_decode_yuv.Tpo -c -o ax203/la-ax203_decode_yuv.lo `test -f 'ax203/ax203_decode_yuv.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-ax203_decode_yuv.Tpo ax203/$(DEPDIR)/la-ax203_decode_yuv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_decode_yuv.c' object='ax203/la-ax203_decode_yuv.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-ax203_decode_yuv_delta.lo `test -f 'ax203/ax203_decode_yuv_delta.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv_delta.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-ax203_decode_yuv.lo `test -f 'ax203/ax203_decode_yuv.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv.c
 
-ax203/ax203_la-ax203_compress_jpeg.lo: ax203/ax203_compress_jpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-ax203_compress_jpeg.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-ax203_compress_jpeg.Tpo -c -o ax203/ax203_la-ax203_compress_jpeg.lo `test -f 'ax203/ax203_compress_jpeg.c' || echo '$(srcdir)/'`ax203/ax203_compress_jpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-ax203_compress_jpeg.Tpo ax203/$(DEPDIR)/ax203_la-ax203_compress_jpeg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_compress_jpeg.c' object='ax203/ax203_la-ax203_compress_jpeg.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-ax203_decode_yuv_delta.lo: ax203/ax203_decode_yuv_delta.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-ax203_decode_yuv_delta.lo -MD -MP -MF ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Tpo -c -o ax203/la-ax203_decode_yuv_delta.lo `test -f 'ax203/ax203_decode_yuv_delta.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv_delta.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Tpo ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_decode_yuv_delta.c' object='ax203/la-ax203_decode_yuv_delta.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-ax203_compress_jpeg.lo `test -f 'ax203/ax203_compress_jpeg.c' || echo '$(srcdir)/'`ax203/ax203_compress_jpeg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-ax203_decode_yuv_delta.lo `test -f 'ax203/ax203_decode_yuv_delta.c' || echo '$(srcdir)/'`ax203/ax203_decode_yuv_delta.c
 
-ax203/ax203_la-jpeg_memsrcdest.lo: ax203/jpeg_memsrcdest.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-jpeg_memsrcdest.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-jpeg_memsrcdest.Tpo -c -o ax203/ax203_la-jpeg_memsrcdest.lo `test -f 'ax203/jpeg_memsrcdest.c' || echo '$(srcdir)/'`ax203/jpeg_memsrcdest.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-jpeg_memsrcdest.Tpo ax203/$(DEPDIR)/ax203_la-jpeg_memsrcdest.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/jpeg_memsrcdest.c' object='ax203/ax203_la-jpeg_memsrcdest.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-ax203_compress_jpeg.lo: ax203/ax203_compress_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-ax203_compress_jpeg.lo -MD -MP -MF ax203/$(DEPDIR)/la-ax203_compress_jpeg.Tpo -c -o ax203/la-ax203_compress_jpeg.lo `test -f 'ax203/ax203_compress_jpeg.c' || echo '$(srcdir)/'`ax203/ax203_compress_jpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-ax203_compress_jpeg.Tpo ax203/$(DEPDIR)/la-ax203_compress_jpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/ax203_compress_jpeg.c' object='ax203/la-ax203_compress_jpeg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-jpeg_memsrcdest.lo `test -f 'ax203/jpeg_memsrcdest.c' || echo '$(srcdir)/'`ax203/jpeg_memsrcdest.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-ax203_compress_jpeg.lo `test -f 'ax203/ax203_compress_jpeg.c' || echo '$(srcdir)/'`ax203/ax203_compress_jpeg.c
 
-ax203/ax203_la-tinyjpeg.lo: ax203/tinyjpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-tinyjpeg.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-tinyjpeg.Tpo -c -o ax203/ax203_la-tinyjpeg.lo `test -f 'ax203/tinyjpeg.c' || echo '$(srcdir)/'`ax203/tinyjpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-tinyjpeg.Tpo ax203/$(DEPDIR)/ax203_la-tinyjpeg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/tinyjpeg.c' object='ax203/ax203_la-tinyjpeg.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-jpeg_memsrcdest.lo: ax203/jpeg_memsrcdest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-jpeg_memsrcdest.lo -MD -MP -MF ax203/$(DEPDIR)/la-jpeg_memsrcdest.Tpo -c -o ax203/la-jpeg_memsrcdest.lo `test -f 'ax203/jpeg_memsrcdest.c' || echo '$(srcdir)/'`ax203/jpeg_memsrcdest.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-jpeg_memsrcdest.Tpo ax203/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/jpeg_memsrcdest.c' object='ax203/la-jpeg_memsrcdest.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-tinyjpeg.lo `test -f 'ax203/tinyjpeg.c' || echo '$(srcdir)/'`ax203/tinyjpeg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-jpeg_memsrcdest.lo `test -f 'ax203/jpeg_memsrcdest.c' || echo '$(srcdir)/'`ax203/jpeg_memsrcdest.c
 
-ax203/ax203_la-jidctflt.lo: ax203/jidctflt.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/ax203_la-jidctflt.lo -MD -MP -MF ax203/$(DEPDIR)/ax203_la-jidctflt.Tpo -c -o ax203/ax203_la-jidctflt.lo `test -f 'ax203/jidctflt.c' || echo '$(srcdir)/'`ax203/jidctflt.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/ax203_la-jidctflt.Tpo ax203/$(DEPDIR)/ax203_la-jidctflt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/jidctflt.c' object='ax203/ax203_la-jidctflt.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-tinyjpeg.lo: ax203/tinyjpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-tinyjpeg.lo -MD -MP -MF ax203/$(DEPDIR)/la-tinyjpeg.Tpo -c -o ax203/la-tinyjpeg.lo `test -f 'ax203/tinyjpeg.c' || echo '$(srcdir)/'`ax203/tinyjpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-tinyjpeg.Tpo ax203/$(DEPDIR)/la-tinyjpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/tinyjpeg.c' object='ax203/la-tinyjpeg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/ax203_la-jidctflt.lo `test -f 'ax203/jidctflt.c' || echo '$(srcdir)/'`ax203/jidctflt.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-tinyjpeg.lo `test -f 'ax203/tinyjpeg.c' || echo '$(srcdir)/'`ax203/tinyjpeg.c
 
-canon/canon_la-canon.lo: canon/canon.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-canon.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-canon.Tpo -c -o canon/canon_la-canon.lo `test -f 'canon/canon.c' || echo '$(srcdir)/'`canon/canon.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-canon.Tpo canon/$(DEPDIR)/canon_la-canon.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/canon.c' object='canon/canon_la-canon.lo' libtool=yes @AMDEPBACKSLASH@
+ax203/la-jidctflt.lo: ax203/jidctflt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -MT ax203/la-jidctflt.lo -MD -MP -MF ax203/$(DEPDIR)/la-jidctflt.Tpo -c -o ax203/la-jidctflt.lo `test -f 'ax203/jidctflt.c' || echo '$(srcdir)/'`ax203/jidctflt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ax203/$(DEPDIR)/la-jidctflt.Tpo ax203/$(DEPDIR)/la-jidctflt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ax203/jidctflt.c' object='ax203/la-jidctflt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-canon.lo `test -f 'canon/canon.c' || echo '$(srcdir)/'`canon/canon.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ax203_la_CPPFLAGS) $(CPPFLAGS) $(ax203_la_CFLAGS) $(CFLAGS) -c -o ax203/la-jidctflt.lo `test -f 'ax203/jidctflt.c' || echo '$(srcdir)/'`ax203/jidctflt.c
 
-canon/canon_la-library.lo: canon/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-library.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-library.Tpo -c -o canon/canon_la-library.lo `test -f 'canon/library.c' || echo '$(srcdir)/'`canon/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-library.Tpo canon/$(DEPDIR)/canon_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/library.c' object='canon/canon_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+barbie/la-barbie.lo: barbie/barbie.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(barbie_la_CPPFLAGS) $(CPPFLAGS) $(barbie_la_CFLAGS) $(CFLAGS) -MT barbie/la-barbie.lo -MD -MP -MF barbie/$(DEPDIR)/la-barbie.Tpo -c -o barbie/la-barbie.lo `test -f 'barbie/barbie.c' || echo '$(srcdir)/'`barbie/barbie.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) barbie/$(DEPDIR)/la-barbie.Tpo barbie/$(DEPDIR)/la-barbie.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='barbie/barbie.c' object='barbie/la-barbie.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-library.lo `test -f 'canon/library.c' || echo '$(srcdir)/'`canon/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(barbie_la_CPPFLAGS) $(CPPFLAGS) $(barbie_la_CFLAGS) $(CFLAGS) -c -o barbie/la-barbie.lo `test -f 'barbie/barbie.c' || echo '$(srcdir)/'`barbie/barbie.c
 
-canon/canon_la-serial.lo: canon/serial.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-serial.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-serial.Tpo -c -o canon/canon_la-serial.lo `test -f 'canon/serial.c' || echo '$(srcdir)/'`canon/serial.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-serial.Tpo canon/$(DEPDIR)/canon_la-serial.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/serial.c' object='canon/canon_la-serial.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-canon.lo: canon/canon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-canon.lo -MD -MP -MF canon/$(DEPDIR)/la-canon.Tpo -c -o canon/la-canon.lo `test -f 'canon/canon.c' || echo '$(srcdir)/'`canon/canon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-canon.Tpo canon/$(DEPDIR)/la-canon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/canon.c' object='canon/la-canon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-serial.lo `test -f 'canon/serial.c' || echo '$(srcdir)/'`canon/serial.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-canon.lo `test -f 'canon/canon.c' || echo '$(srcdir)/'`canon/canon.c
 
-canon/canon_la-usb.lo: canon/usb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-usb.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-usb.Tpo -c -o canon/canon_la-usb.lo `test -f 'canon/usb.c' || echo '$(srcdir)/'`canon/usb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-usb.Tpo canon/$(DEPDIR)/canon_la-usb.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/usb.c' object='canon/canon_la-usb.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-library.lo: canon/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-library.lo -MD -MP -MF canon/$(DEPDIR)/la-library.Tpo -c -o canon/la-library.lo `test -f 'canon/library.c' || echo '$(srcdir)/'`canon/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-library.Tpo canon/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/library.c' object='canon/la-library.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-usb.lo `test -f 'canon/usb.c' || echo '$(srcdir)/'`canon/usb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-library.lo `test -f 'canon/library.c' || echo '$(srcdir)/'`canon/library.c
 
-canon/canon_la-crc.lo: canon/crc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-crc.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-crc.Tpo -c -o canon/canon_la-crc.lo `test -f 'canon/crc.c' || echo '$(srcdir)/'`canon/crc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-crc.Tpo canon/$(DEPDIR)/canon_la-crc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/crc.c' object='canon/canon_la-crc.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-serial.lo: canon/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-serial.lo -MD -MP -MF canon/$(DEPDIR)/la-serial.Tpo -c -o canon/la-serial.lo `test -f 'canon/serial.c' || echo '$(srcdir)/'`canon/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-serial.Tpo canon/$(DEPDIR)/la-serial.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/serial.c' object='canon/la-serial.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-crc.lo `test -f 'canon/crc.c' || echo '$(srcdir)/'`canon/crc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-serial.lo `test -f 'canon/serial.c' || echo '$(srcdir)/'`canon/serial.c
 
-canon/canon_la-util.lo: canon/util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT canon/canon_la-util.lo -MD -MP -MF canon/$(DEPDIR)/canon_la-util.Tpo -c -o canon/canon_la-util.lo `test -f 'canon/util.c' || echo '$(srcdir)/'`canon/util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/canon_la-util.Tpo canon/$(DEPDIR)/canon_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/util.c' object='canon/canon_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-usb.lo: canon/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-usb.lo -MD -MP -MF canon/$(DEPDIR)/la-usb.Tpo -c -o canon/la-usb.lo `test -f 'canon/usb.c' || echo '$(srcdir)/'`canon/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-usb.Tpo canon/$(DEPDIR)/la-usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/usb.c' object='canon/la-usb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o canon/canon_la-util.lo `test -f 'canon/util.c' || echo '$(srcdir)/'`canon/util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-usb.lo `test -f 'canon/usb.c' || echo '$(srcdir)/'`canon/usb.c
 
-directory/directory_la-directory.lo: directory/directory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(directory_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT directory/directory_la-directory.lo -MD -MP -MF directory/$(DEPDIR)/directory_la-directory.Tpo -c -o directory/directory_la-directory.lo `test -f 'directory/directory.c' || echo '$(srcdir)/'`directory/directory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) directory/$(DEPDIR)/directory_la-directory.Tpo directory/$(DEPDIR)/directory_la-directory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='directory/directory.c' object='directory/directory_la-directory.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-crc.lo: canon/crc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-crc.lo -MD -MP -MF canon/$(DEPDIR)/la-crc.Tpo -c -o canon/la-crc.lo `test -f 'canon/crc.c' || echo '$(srcdir)/'`canon/crc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-crc.Tpo canon/$(DEPDIR)/la-crc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/crc.c' object='canon/la-crc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(directory_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o directory/directory_la-directory.lo `test -f 'directory/directory.c' || echo '$(srcdir)/'`directory/directory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-crc.lo `test -f 'canon/crc.c' || echo '$(srcdir)/'`canon/crc.c
 
-konica/konica_la-lowlevel.lo: konica/lowlevel.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT konica/konica_la-lowlevel.lo -MD -MP -MF konica/$(DEPDIR)/konica_la-lowlevel.Tpo -c -o konica/konica_la-lowlevel.lo `test -f 'konica/lowlevel.c' || echo '$(srcdir)/'`konica/lowlevel.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/konica_la-lowlevel.Tpo konica/$(DEPDIR)/konica_la-lowlevel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/lowlevel.c' object='konica/konica_la-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@
+canon/la-util.lo: canon/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -MT canon/la-util.lo -MD -MP -MF canon/$(DEPDIR)/la-util.Tpo -c -o canon/la-util.lo `test -f 'canon/util.c' || echo '$(srcdir)/'`canon/util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) canon/$(DEPDIR)/la-util.Tpo canon/$(DEPDIR)/la-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='canon/util.c' object='canon/la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o konica/konica_la-lowlevel.lo `test -f 'konica/lowlevel.c' || echo '$(srcdir)/'`konica/lowlevel.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(canon_la_CPPFLAGS) $(CPPFLAGS) $(canon_la_CFLAGS) $(CFLAGS) -c -o canon/la-util.lo `test -f 'canon/util.c' || echo '$(srcdir)/'`canon/util.c
 
-konica/konica_la-konica.lo: konica/konica.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT konica/konica_la-konica.lo -MD -MP -MF konica/$(DEPDIR)/konica_la-konica.Tpo -c -o konica/konica_la-konica.lo `test -f 'konica/konica.c' || echo '$(srcdir)/'`konica/konica.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/konica_la-konica.Tpo konica/$(DEPDIR)/konica_la-konica.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/konica.c' object='konica/konica_la-konica.lo' libtool=yes @AMDEPBACKSLASH@
+casio/qv_la-casio-qv.lo: casio/casio-qv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -MT casio/qv_la-casio-qv.lo -MD -MP -MF casio/$(DEPDIR)/qv_la-casio-qv.Tpo -c -o casio/qv_la-casio-qv.lo `test -f 'casio/casio-qv.c' || echo '$(srcdir)/'`casio/casio-qv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) casio/$(DEPDIR)/qv_la-casio-qv.Tpo casio/$(DEPDIR)/qv_la-casio-qv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='casio/casio-qv.c' object='casio/qv_la-casio-qv.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o konica/konica_la-konica.lo `test -f 'konica/konica.c' || echo '$(srcdir)/'`konica/konica.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -c -o casio/qv_la-casio-qv.lo `test -f 'casio/casio-qv.c' || echo '$(srcdir)/'`casio/casio-qv.c
 
-konica/konica_la-library.lo: konica/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT konica/konica_la-library.lo -MD -MP -MF konica/$(DEPDIR)/konica_la-library.Tpo -c -o konica/konica_la-library.lo `test -f 'konica/library.c' || echo '$(srcdir)/'`konica/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/konica_la-library.Tpo konica/$(DEPDIR)/konica_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/library.c' object='konica/konica_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+casio/qv_la-casio-qv-commands.lo: casio/casio-qv-commands.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -MT casio/qv_la-casio-qv-commands.lo -MD -MP -MF casio/$(DEPDIR)/qv_la-casio-qv-commands.Tpo -c -o casio/qv_la-casio-qv-commands.lo `test -f 'casio/casio-qv-commands.c' || echo '$(srcdir)/'`casio/casio-qv-commands.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) casio/$(DEPDIR)/qv_la-casio-qv-commands.Tpo casio/$(DEPDIR)/qv_la-casio-qv-commands.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='casio/casio-qv-commands.c' object='casio/qv_la-casio-qv-commands.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o konica/konica_la-library.lo `test -f 'konica/library.c' || echo '$(srcdir)/'`konica/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -c -o casio/qv_la-casio-qv-commands.lo `test -f 'casio/casio-qv-commands.c' || echo '$(srcdir)/'`casio/casio-qv-commands.c
 
-konica/konica_qm150_la-qm150.lo: konica/qm150.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_qm150_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT konica/konica_qm150_la-qm150.lo -MD -MP -MF konica/$(DEPDIR)/konica_qm150_la-qm150.Tpo -c -o konica/konica_qm150_la-qm150.lo `test -f 'konica/qm150.c' || echo '$(srcdir)/'`konica/qm150.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/konica_qm150_la-qm150.Tpo konica/$(DEPDIR)/konica_qm150_la-qm150.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/qm150.c' object='konica/konica_qm150_la-qm150.lo' libtool=yes @AMDEPBACKSLASH@
+casio/qv_la-camtojpeg.lo: casio/camtojpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -MT casio/qv_la-camtojpeg.lo -MD -MP -MF casio/$(DEPDIR)/qv_la-camtojpeg.Tpo -c -o casio/qv_la-camtojpeg.lo `test -f 'casio/camtojpeg.c' || echo '$(srcdir)/'`casio/camtojpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) casio/$(DEPDIR)/qv_la-camtojpeg.Tpo casio/$(DEPDIR)/qv_la-camtojpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='casio/camtojpeg.c' object='casio/qv_la-camtojpeg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_qm150_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o konica/konica_qm150_la-qm150.lo `test -f 'konica/qm150.c' || echo '$(srcdir)/'`konica/qm150.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -c -o casio/qv_la-camtojpeg.lo `test -f 'casio/camtojpeg.c' || echo '$(srcdir)/'`casio/camtojpeg.c
 
-pentax/pentax_la-pslr.lo: pentax/pslr.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-pslr.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-pslr.Tpo -c -o pentax/pentax_la-pslr.lo `test -f 'pentax/pslr.c' || echo '$(srcdir)/'`pentax/pslr.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-pslr.Tpo pentax/$(DEPDIR)/pentax_la-pslr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr.c' object='pentax/pentax_la-pslr.lo' libtool=yes @AMDEPBACKSLASH@
+casio/qv_la-ycctoppm.lo: casio/ycctoppm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -MT casio/qv_la-ycctoppm.lo -MD -MP -MF casio/$(DEPDIR)/qv_la-ycctoppm.Tpo -c -o casio/qv_la-ycctoppm.lo `test -f 'casio/ycctoppm.c' || echo '$(srcdir)/'`casio/ycctoppm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) casio/$(DEPDIR)/qv_la-ycctoppm.Tpo casio/$(DEPDIR)/qv_la-ycctoppm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='casio/ycctoppm.c' object='casio/qv_la-ycctoppm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-pslr.lo `test -f 'pentax/pslr.c' || echo '$(srcdir)/'`pentax/pslr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(casio_qv_la_CPPFLAGS) $(CPPFLAGS) $(casio_qv_la_CFLAGS) $(CFLAGS) -c -o casio/qv_la-ycctoppm.lo `test -f 'casio/ycctoppm.c' || echo '$(srcdir)/'`casio/ycctoppm.c
 
-pentax/pentax_la-library.lo: pentax/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-library.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-library.Tpo -c -o pentax/pentax_la-library.lo `test -f 'pentax/library.c' || echo '$(srcdir)/'`pentax/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-library.Tpo pentax/$(DEPDIR)/pentax_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/library.c' object='pentax/pentax_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+clicksmart310/la-library.lo: clicksmart310/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clicksmart310_la_CPPFLAGS) $(CPPFLAGS) $(clicksmart310_la_CFLAGS) $(CFLAGS) -MT clicksmart310/la-library.lo -MD -MP -MF clicksmart310/$(DEPDIR)/la-library.Tpo -c -o clicksmart310/la-library.lo `test -f 'clicksmart310/library.c' || echo '$(srcdir)/'`clicksmart310/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clicksmart310/$(DEPDIR)/la-library.Tpo clicksmart310/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clicksmart310/library.c' object='clicksmart310/la-library.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-library.lo `test -f 'pentax/library.c' || echo '$(srcdir)/'`pentax/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clicksmart310_la_CPPFLAGS) $(CPPFLAGS) $(clicksmart310_la_CFLAGS) $(CFLAGS) -c -o clicksmart310/la-library.lo `test -f 'clicksmart310/library.c' || echo '$(srcdir)/'`clicksmart310/library.c
 
-pentax/pentax_la-pslr_enum.lo: pentax/pslr_enum.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-pslr_enum.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-pslr_enum.Tpo -c -o pentax/pentax_la-pslr_enum.lo `test -f 'pentax/pslr_enum.c' || echo '$(srcdir)/'`pentax/pslr_enum.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-pslr_enum.Tpo pentax/$(DEPDIR)/pentax_la-pslr_enum.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_enum.c' object='pentax/pentax_la-pslr_enum.lo' libtool=yes @AMDEPBACKSLASH@
+clicksmart310/la-clicksmart.lo: clicksmart310/clicksmart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clicksmart310_la_CPPFLAGS) $(CPPFLAGS) $(clicksmart310_la_CFLAGS) $(CFLAGS) -MT clicksmart310/la-clicksmart.lo -MD -MP -MF clicksmart310/$(DEPDIR)/la-clicksmart.Tpo -c -o clicksmart310/la-clicksmart.lo `test -f 'clicksmart310/clicksmart.c' || echo '$(srcdir)/'`clicksmart310/clicksmart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clicksmart310/$(DEPDIR)/la-clicksmart.Tpo clicksmart310/$(DEPDIR)/la-clicksmart.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clicksmart310/clicksmart.c' object='clicksmart310/la-clicksmart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-pslr_enum.lo `test -f 'pentax/pslr_enum.c' || echo '$(srcdir)/'`pentax/pslr_enum.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clicksmart310_la_CPPFLAGS) $(CPPFLAGS) $(clicksmart310_la_CFLAGS) $(CFLAGS) -c -o clicksmart310/la-clicksmart.lo `test -f 'clicksmart310/clicksmart.c' || echo '$(srcdir)/'`clicksmart310/clicksmart.c
 
-pentax/pentax_la-pslr_lens.lo: pentax/pslr_lens.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-pslr_lens.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-pslr_lens.Tpo -c -o pentax/pentax_la-pslr_lens.lo `test -f 'pentax/pslr_lens.c' || echo '$(srcdir)/'`pentax/pslr_lens.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-pslr_lens.Tpo pentax/$(DEPDIR)/pentax_la-pslr_lens.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_lens.c' object='pentax/pentax_la-pslr_lens.lo' libtool=yes @AMDEPBACKSLASH@
+digigr8/la-library.lo: digigr8/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -MT digigr8/la-library.lo -MD -MP -MF digigr8/$(DEPDIR)/la-library.Tpo -c -o digigr8/la-library.lo `test -f 'digigr8/library.c' || echo '$(srcdir)/'`digigr8/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digigr8/$(DEPDIR)/la-library.Tpo digigr8/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digigr8/library.c' object='digigr8/la-library.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-pslr_lens.lo `test -f 'pentax/pslr_lens.c' || echo '$(srcdir)/'`pentax/pslr_lens.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -c -o digigr8/la-library.lo `test -f 'digigr8/library.c' || echo '$(srcdir)/'`digigr8/library.c
 
-pentax/pentax_la-pslr_model.lo: pentax/pslr_model.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-pslr_model.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-pslr_model.Tpo -c -o pentax/pentax_la-pslr_model.lo `test -f 'pentax/pslr_model.c' || echo '$(srcdir)/'`pentax/pslr_model.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-pslr_model.Tpo pentax/$(DEPDIR)/pentax_la-pslr_model.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_model.c' object='pentax/pentax_la-pslr_model.lo' libtool=yes @AMDEPBACKSLASH@
+digigr8/la-digigr8.lo: digigr8/digigr8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -MT digigr8/la-digigr8.lo -MD -MP -MF digigr8/$(DEPDIR)/la-digigr8.Tpo -c -o digigr8/la-digigr8.lo `test -f 'digigr8/digigr8.c' || echo '$(srcdir)/'`digigr8/digigr8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digigr8/$(DEPDIR)/la-digigr8.Tpo digigr8/$(DEPDIR)/la-digigr8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digigr8/digigr8.c' object='digigr8/la-digigr8.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-pslr_model.lo `test -f 'pentax/pslr_model.c' || echo '$(srcdir)/'`pentax/pslr_model.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -c -o digigr8/la-digigr8.lo `test -f 'digigr8/digigr8.c' || echo '$(srcdir)/'`digigr8/digigr8.c
 
-pentax/pentax_la-js0n.lo: pentax/js0n.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/pentax_la-js0n.lo -MD -MP -MF pentax/$(DEPDIR)/pentax_la-js0n.Tpo -c -o pentax/pentax_la-js0n.lo `test -f 'pentax/js0n.c' || echo '$(srcdir)/'`pentax/js0n.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/pentax_la-js0n.Tpo pentax/$(DEPDIR)/pentax_la-js0n.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/js0n.c' object='pentax/pentax_la-js0n.lo' libtool=yes @AMDEPBACKSLASH@
+digigr8/la-digi_postprocess.lo: digigr8/digi_postprocess.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -MT digigr8/la-digi_postprocess.lo -MD -MP -MF digigr8/$(DEPDIR)/la-digi_postprocess.Tpo -c -o digigr8/la-digi_postprocess.lo `test -f 'digigr8/digi_postprocess.c' || echo '$(srcdir)/'`digigr8/digi_postprocess.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digigr8/$(DEPDIR)/la-digi_postprocess.Tpo digigr8/$(DEPDIR)/la-digi_postprocess.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digigr8/digi_postprocess.c' object='digigr8/la-digi_postprocess.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/pentax_la-js0n.lo `test -f 'pentax/js0n.c' || echo '$(srcdir)/'`pentax/js0n.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digigr8_la_CPPFLAGS) $(CPPFLAGS) $(digigr8_la_CFLAGS) $(CFLAGS) -c -o digigr8/la-digi_postprocess.lo `test -f 'digigr8/digi_postprocess.c' || echo '$(srcdir)/'`digigr8/digi_postprocess.c
 
-ptp2/ptp2_la-ptp.lo: ptp2/ptp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-ptp.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-ptp.Tpo -c -o ptp2/ptp2_la-ptp.lo `test -f 'ptp2/ptp.c' || echo '$(srcdir)/'`ptp2/ptp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-ptp.Tpo ptp2/$(DEPDIR)/ptp2_la-ptp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/ptp.c' object='ptp2/ptp2_la-ptp.lo' libtool=yes @AMDEPBACKSLASH@
+digita/la-digita.lo: digita/digita.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -MT digita/la-digita.lo -MD -MP -MF digita/$(DEPDIR)/la-digita.Tpo -c -o digita/la-digita.lo `test -f 'digita/digita.c' || echo '$(srcdir)/'`digita/digita.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digita/$(DEPDIR)/la-digita.Tpo digita/$(DEPDIR)/la-digita.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digita/digita.c' object='digita/la-digita.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-ptp.lo `test -f 'ptp2/ptp.c' || echo '$(srcdir)/'`ptp2/ptp.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -c -o digita/la-digita.lo `test -f 'digita/digita.c' || echo '$(srcdir)/'`digita/digita.c
 
-ptp2/ptp2_la-library.lo: ptp2/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-library.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-library.Tpo -c -o ptp2/ptp2_la-library.lo `test -f 'ptp2/library.c' || echo '$(srcdir)/'`ptp2/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-library.Tpo ptp2/$(DEPDIR)/ptp2_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/library.c' object='ptp2/ptp2_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+digita/la-serial.lo: digita/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -MT digita/la-serial.lo -MD -MP -MF digita/$(DEPDIR)/la-serial.Tpo -c -o digita/la-serial.lo `test -f 'digita/serial.c' || echo '$(srcdir)/'`digita/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digita/$(DEPDIR)/la-serial.Tpo digita/$(DEPDIR)/la-serial.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digita/serial.c' object='digita/la-serial.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-library.lo `test -f 'ptp2/library.c' || echo '$(srcdir)/'`ptp2/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -c -o digita/la-serial.lo `test -f 'digita/serial.c' || echo '$(srcdir)/'`digita/serial.c
 
-ptp2/ptp2_la-usb.lo: ptp2/usb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-usb.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-usb.Tpo -c -o ptp2/ptp2_la-usb.lo `test -f 'ptp2/usb.c' || echo '$(srcdir)/'`ptp2/usb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-usb.Tpo ptp2/$(DEPDIR)/ptp2_la-usb.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/usb.c' object='ptp2/ptp2_la-usb.lo' libtool=yes @AMDEPBACKSLASH@
+digita/la-usb.lo: digita/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -MT digita/la-usb.lo -MD -MP -MF digita/$(DEPDIR)/la-usb.Tpo -c -o digita/la-usb.lo `test -f 'digita/usb.c' || echo '$(srcdir)/'`digita/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digita/$(DEPDIR)/la-usb.Tpo digita/$(DEPDIR)/la-usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digita/usb.c' object='digita/la-usb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-usb.lo `test -f 'ptp2/usb.c' || echo '$(srcdir)/'`ptp2/usb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -c -o digita/la-usb.lo `test -f 'digita/usb.c' || echo '$(srcdir)/'`digita/usb.c
 
-ptp2/ptp2_la-ptpip.lo: ptp2/ptpip.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-ptpip.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-ptpip.Tpo -c -o ptp2/ptp2_la-ptpip.lo `test -f 'ptp2/ptpip.c' || echo '$(srcdir)/'`ptp2/ptpip.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-ptpip.Tpo ptp2/$(DEPDIR)/ptp2_la-ptpip.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/ptpip.c' object='ptp2/ptp2_la-ptpip.lo' libtool=yes @AMDEPBACKSLASH@
+digita/la-commands.lo: digita/commands.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -MT digita/la-commands.lo -MD -MP -MF digita/$(DEPDIR)/la-commands.Tpo -c -o digita/la-commands.lo `test -f 'digita/commands.c' || echo '$(srcdir)/'`digita/commands.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) digita/$(DEPDIR)/la-commands.Tpo digita/$(DEPDIR)/la-commands.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='digita/commands.c' object='digita/la-commands.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-ptpip.lo `test -f 'ptp2/ptpip.c' || echo '$(srcdir)/'`ptp2/ptpip.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(digita_la_CPPFLAGS) $(CPPFLAGS) $(digita_la_CFLAGS) $(CFLAGS) -c -o digita/la-commands.lo `test -f 'digita/commands.c' || echo '$(srcdir)/'`digita/commands.c
 
-ptp2/ptp2_la-config.lo: ptp2/config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-config.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-config.Tpo -c -o ptp2/ptp2_la-config.lo `test -f 'ptp2/config.c' || echo '$(srcdir)/'`ptp2/config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-config.Tpo ptp2/$(DEPDIR)/ptp2_la-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/config.c' object='ptp2/ptp2_la-config.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-capture.lo: minolta/dimagev/capture.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-capture.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Tpo -c -o minolta/dimagev/dimagev_la-capture.lo `test -f 'minolta/dimagev/capture.c' || echo '$(srcdir)/'`minolta/dimagev/capture.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/capture.c' object='minolta/dimagev/dimagev_la-capture.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-config.lo `test -f 'ptp2/config.c' || echo '$(srcdir)/'`ptp2/config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-capture.lo `test -f 'minolta/dimagev/capture.c' || echo '$(srcdir)/'`minolta/dimagev/capture.c
 
-ptp2/ptp2_la-olympus-wrap.lo: ptp2/olympus-wrap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-olympus-wrap.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-olympus-wrap.Tpo -c -o ptp2/ptp2_la-olympus-wrap.lo `test -f 'ptp2/olympus-wrap.c' || echo '$(srcdir)/'`ptp2/olympus-wrap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-olympus-wrap.Tpo ptp2/$(DEPDIR)/ptp2_la-olympus-wrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/olympus-wrap.c' object='ptp2/ptp2_la-olympus-wrap.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-data.lo: minolta/dimagev/data.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-data.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-data.Tpo -c -o minolta/dimagev/dimagev_la-data.lo `test -f 'minolta/dimagev/data.c' || echo '$(srcdir)/'`minolta/dimagev/data.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-data.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-data.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/data.c' object='minolta/dimagev/dimagev_la-data.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-olympus-wrap.lo `test -f 'ptp2/olympus-wrap.c' || echo '$(srcdir)/'`ptp2/olympus-wrap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-data.lo `test -f 'minolta/dimagev/data.c' || echo '$(srcdir)/'`minolta/dimagev/data.c
 
-ptp2/ptp2_la-chdk.lo: ptp2/chdk.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/ptp2_la-chdk.lo -MD -MP -MF ptp2/$(DEPDIR)/ptp2_la-chdk.Tpo -c -o ptp2/ptp2_la-chdk.lo `test -f 'ptp2/chdk.c' || echo '$(srcdir)/'`ptp2/chdk.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/ptp2_la-chdk.Tpo ptp2/$(DEPDIR)/ptp2_la-chdk.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/chdk.c' object='ptp2/ptp2_la-chdk.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-delete.lo: minolta/dimagev/delete.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-delete.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Tpo -c -o minolta/dimagev/dimagev_la-delete.lo `test -f 'minolta/dimagev/delete.c' || echo '$(srcdir)/'`minolta/dimagev/delete.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/delete.c' object='minolta/dimagev/dimagev_la-delete.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/ptp2_la-chdk.lo `test -f 'ptp2/chdk.c' || echo '$(srcdir)/'`ptp2/chdk.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-delete.lo `test -f 'minolta/dimagev/delete.c' || echo '$(srcdir)/'`minolta/dimagev/delete.c
 
-sierra/sierra_la-sierra.lo: sierra/sierra.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-sierra.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-sierra.Tpo -c -o sierra/sierra_la-sierra.lo `test -f 'sierra/sierra.c' || echo '$(srcdir)/'`sierra/sierra.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-sierra.Tpo sierra/$(DEPDIR)/sierra_la-sierra.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra.c' object='sierra/sierra_la-sierra.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-dimagev.lo: minolta/dimagev/dimagev.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-dimagev.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Tpo -c -o minolta/dimagev/dimagev_la-dimagev.lo `test -f 'minolta/dimagev/dimagev.c' || echo '$(srcdir)/'`minolta/dimagev/dimagev.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/dimagev.c' object='minolta/dimagev/dimagev_la-dimagev.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-sierra.lo `test -f 'sierra/sierra.c' || echo '$(srcdir)/'`sierra/sierra.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-dimagev.lo `test -f 'minolta/dimagev/dimagev.c' || echo '$(srcdir)/'`minolta/dimagev/dimagev.c
 
-sierra/sierra_la-library.lo: sierra/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-library.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-library.Tpo -c -o sierra/sierra_la-library.lo `test -f 'sierra/library.c' || echo '$(srcdir)/'`sierra/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-library.Tpo sierra/$(DEPDIR)/sierra_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/library.c' object='sierra/sierra_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-download.lo: minolta/dimagev/download.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-download.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-download.Tpo -c -o minolta/dimagev/dimagev_la-download.lo `test -f 'minolta/dimagev/download.c' || echo '$(srcdir)/'`minolta/dimagev/download.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-download.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-download.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/download.c' object='minolta/dimagev/dimagev_la-download.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-library.lo `test -f 'sierra/library.c' || echo '$(srcdir)/'`sierra/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-download.lo `test -f 'minolta/dimagev/download.c' || echo '$(srcdir)/'`minolta/dimagev/download.c
 
-sierra/sierra_la-sierra-usbwrap.lo: sierra/sierra-usbwrap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-sierra-usbwrap.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-sierra-usbwrap.Tpo -c -o sierra/sierra_la-sierra-usbwrap.lo `test -f 'sierra/sierra-usbwrap.c' || echo '$(srcdir)/'`sierra/sierra-usbwrap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-sierra-usbwrap.Tpo sierra/$(DEPDIR)/sierra_la-sierra-usbwrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra-usbwrap.c' object='sierra/sierra_la-sierra-usbwrap.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-info.lo: minolta/dimagev/info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-info.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-info.Tpo -c -o minolta/dimagev/dimagev_la-info.lo `test -f 'minolta/dimagev/info.c' || echo '$(srcdir)/'`minolta/dimagev/info.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-info.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/info.c' object='minolta/dimagev/dimagev_la-info.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-sierra-usbwrap.lo `test -f 'sierra/sierra-usbwrap.c' || echo '$(srcdir)/'`sierra/sierra-usbwrap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-info.lo `test -f 'minolta/dimagev/info.c' || echo '$(srcdir)/'`minolta/dimagev/info.c
 
-sierra/sierra_la-sierra-desc.lo: sierra/sierra-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-sierra-desc.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-sierra-desc.Tpo -c -o sierra/sierra_la-sierra-desc.lo `test -f 'sierra/sierra-desc.c' || echo '$(srcdir)/'`sierra/sierra-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-sierra-desc.Tpo sierra/$(DEPDIR)/sierra_la-sierra-desc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra-desc.c' object='sierra/sierra_la-sierra-desc.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-packet.lo: minolta/dimagev/packet.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-packet.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Tpo -c -o minolta/dimagev/dimagev_la-packet.lo `test -f 'minolta/dimagev/packet.c' || echo '$(srcdir)/'`minolta/dimagev/packet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/packet.c' object='minolta/dimagev/dimagev_la-packet.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-sierra-desc.lo `test -f 'sierra/sierra-desc.c' || echo '$(srcdir)/'`sierra/sierra-desc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-packet.lo `test -f 'minolta/dimagev/packet.c' || echo '$(srcdir)/'`minolta/dimagev/packet.c
 
-sierra/sierra_la-nikon-desc.lo: sierra/nikon-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-nikon-desc.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-nikon-desc.Tpo -c -o sierra/sierra_la-nikon-desc.lo `test -f 'sierra/nikon-desc.c' || echo '$(srcdir)/'`sierra/nikon-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-nikon-desc.Tpo sierra/$(DEPDIR)/sierra_la-nikon-desc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/nikon-desc.c' object='sierra/sierra_la-nikon-desc.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-status.lo: minolta/dimagev/status.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-status.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-status.Tpo -c -o minolta/dimagev/dimagev_la-status.lo `test -f 'minolta/dimagev/status.c' || echo '$(srcdir)/'`minolta/dimagev/status.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-status.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-status.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/status.c' object='minolta/dimagev/dimagev_la-status.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-nikon-desc.lo `test -f 'sierra/nikon-desc.c' || echo '$(srcdir)/'`sierra/nikon-desc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-status.lo `test -f 'minolta/dimagev/status.c' || echo '$(srcdir)/'`minolta/dimagev/status.c
 
-sierra/sierra_la-olympus-desc.lo: sierra/olympus-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-olympus-desc.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-olympus-desc.Tpo -c -o sierra/sierra_la-olympus-desc.lo `test -f 'sierra/olympus-desc.c' || echo '$(srcdir)/'`sierra/olympus-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-olympus-desc.Tpo sierra/$(DEPDIR)/sierra_la-olympus-desc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/olympus-desc.c' object='sierra/sierra_la-olympus-desc.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-upload.lo: minolta/dimagev/upload.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-upload.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Tpo -c -o minolta/dimagev/dimagev_la-upload.lo `test -f 'minolta/dimagev/upload.c' || echo '$(srcdir)/'`minolta/dimagev/upload.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/upload.c' object='minolta/dimagev/dimagev_la-upload.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-olympus-desc.lo `test -f 'sierra/olympus-desc.c' || echo '$(srcdir)/'`sierra/olympus-desc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-upload.lo `test -f 'minolta/dimagev/upload.c' || echo '$(srcdir)/'`minolta/dimagev/upload.c
 
-sierra/sierra_la-epson-desc.lo: sierra/epson-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sierra/sierra_la-epson-desc.lo -MD -MP -MF sierra/$(DEPDIR)/sierra_la-epson-desc.Tpo -c -o sierra/sierra_la-epson-desc.lo `test -f 'sierra/epson-desc.c' || echo '$(srcdir)/'`sierra/epson-desc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/sierra_la-epson-desc.Tpo sierra/$(DEPDIR)/sierra_la-epson-desc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/epson-desc.c' object='sierra/sierra_la-epson-desc.lo' libtool=yes @AMDEPBACKSLASH@
+minolta/dimagev/dimagev_la-util.lo: minolta/dimagev/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -MT minolta/dimagev/dimagev_la-util.lo -MD -MP -MF minolta/dimagev/$(DEPDIR)/dimagev_la-util.Tpo -c -o minolta/dimagev/dimagev_la-util.lo `test -f 'minolta/dimagev/util.c' || echo '$(srcdir)/'`minolta/dimagev/util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) minolta/dimagev/$(DEPDIR)/dimagev_la-util.Tpo minolta/dimagev/$(DEPDIR)/dimagev_la-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='minolta/dimagev/util.c' object='minolta/dimagev/dimagev_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sierra/sierra_la-epson-desc.lo `test -f 'sierra/epson-desc.c' || echo '$(srcdir)/'`sierra/epson-desc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimagev_la_CPPFLAGS) $(CPPFLAGS) $(dimagev_la_CFLAGS) $(CFLAGS) -c -o minolta/dimagev/dimagev_la-util.lo `test -f 'minolta/dimagev/util.c' || echo '$(srcdir)/'`minolta/dimagev/util.c
 
-st2205/st2205_la-library.lo: st2205/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/st2205_la-library.lo -MD -MP -MF st2205/$(DEPDIR)/st2205_la-library.Tpo -c -o st2205/st2205_la-library.lo `test -f 'st2205/library.c' || echo '$(srcdir)/'`st2205/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/st2205_la-library.Tpo st2205/$(DEPDIR)/st2205_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/library.c' object='st2205/st2205_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+dimera/dimera3500_la-dimera3500.lo: dimera/dimera3500.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimera3500_la_CPPFLAGS) $(CPPFLAGS) $(dimera3500_la_CFLAGS) $(CFLAGS) -MT dimera/dimera3500_la-dimera3500.lo -MD -MP -MF dimera/$(DEPDIR)/dimera3500_la-dimera3500.Tpo -c -o dimera/dimera3500_la-dimera3500.lo `test -f 'dimera/dimera3500.c' || echo '$(srcdir)/'`dimera/dimera3500.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dimera/$(DEPDIR)/dimera3500_la-dimera3500.Tpo dimera/$(DEPDIR)/dimera3500_la-dimera3500.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dimera/dimera3500.c' object='dimera/dimera3500_la-dimera3500.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/st2205_la-library.lo `test -f 'st2205/library.c' || echo '$(srcdir)/'`st2205/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimera3500_la_CPPFLAGS) $(CPPFLAGS) $(dimera3500_la_CFLAGS) $(CFLAGS) -c -o dimera/dimera3500_la-dimera3500.lo `test -f 'dimera/dimera3500.c' || echo '$(srcdir)/'`dimera/dimera3500.c
 
-st2205/st2205_la-st2205.lo: st2205/st2205.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/st2205_la-st2205.lo -MD -MP -MF st2205/$(DEPDIR)/st2205_la-st2205.Tpo -c -o st2205/st2205_la-st2205.lo `test -f 'st2205/st2205.c' || echo '$(srcdir)/'`st2205/st2205.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/st2205_la-st2205.Tpo st2205/$(DEPDIR)/st2205_la-st2205.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205.c' object='st2205/st2205_la-st2205.lo' libtool=yes @AMDEPBACKSLASH@
+dimera/dimera3500_la-mesalib.lo: dimera/mesalib.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimera3500_la_CPPFLAGS) $(CPPFLAGS) $(dimera3500_la_CFLAGS) $(CFLAGS) -MT dimera/dimera3500_la-mesalib.lo -MD -MP -MF dimera/$(DEPDIR)/dimera3500_la-mesalib.Tpo -c -o dimera/dimera3500_la-mesalib.lo `test -f 'dimera/mesalib.c' || echo '$(srcdir)/'`dimera/mesalib.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dimera/$(DEPDIR)/dimera3500_la-mesalib.Tpo dimera/$(DEPDIR)/dimera3500_la-mesalib.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dimera/mesalib.c' object='dimera/dimera3500_la-mesalib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/st2205_la-st2205.lo `test -f 'st2205/st2205.c' || echo '$(srcdir)/'`st2205/st2205.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dimera3500_la_CPPFLAGS) $(CPPFLAGS) $(dimera3500_la_CFLAGS) $(CFLAGS) -c -o dimera/dimera3500_la-mesalib.lo `test -f 'dimera/mesalib.c' || echo '$(srcdir)/'`dimera/mesalib.c
 
-st2205/st2205_la-st2205_decode.lo: st2205/st2205_decode.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/st2205_la-st2205_decode.lo -MD -MP -MF st2205/$(DEPDIR)/st2205_la-st2205_decode.Tpo -c -o st2205/st2205_la-st2205_decode.lo `test -f 'st2205/st2205_decode.c' || echo '$(srcdir)/'`st2205/st2205_decode.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/st2205_la-st2205_decode.Tpo st2205/$(DEPDIR)/st2205_la-st2205_decode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205_decode.c' object='st2205/st2205_la-st2205_decode.lo' libtool=yes @AMDEPBACKSLASH@
+directory/la-directory.lo: directory/directory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(directory_la_CPPFLAGS) $(CPPFLAGS) $(directory_la_CFLAGS) $(CFLAGS) -MT directory/la-directory.lo -MD -MP -MF directory/$(DEPDIR)/la-directory.Tpo -c -o directory/la-directory.lo `test -f 'directory/directory.c' || echo '$(srcdir)/'`directory/directory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) directory/$(DEPDIR)/la-directory.Tpo directory/$(DEPDIR)/la-directory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='directory/directory.c' object='directory/la-directory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/st2205_la-st2205_decode.lo `test -f 'st2205/st2205_decode.c' || echo '$(srcdir)/'`st2205/st2205_decode.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(directory_la_CPPFLAGS) $(CPPFLAGS) $(directory_la_CFLAGS) $(CFLAGS) -c -o directory/la-directory.lo `test -f 'directory/directory.c' || echo '$(srcdir)/'`directory/directory.c
 
-st2205/st2205_la-st2205_tables.lo: st2205/st2205_tables.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/st2205_la-st2205_tables.lo -MD -MP -MF st2205/$(DEPDIR)/st2205_la-st2205_tables.Tpo -c -o st2205/st2205_la-st2205_tables.lo `test -f 'st2205/st2205_tables.c' || echo '$(srcdir)/'`st2205/st2205_tables.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/st2205_la-st2205_tables.Tpo st2205/$(DEPDIR)/st2205_la-st2205_tables.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205_tables.c' object='st2205/st2205_la-st2205_tables.lo' libtool=yes @AMDEPBACKSLASH@
+docupen/la-cache.lo: docupen/cache.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -MT docupen/la-cache.lo -MD -MP -MF docupen/$(DEPDIR)/la-cache.Tpo -c -o docupen/la-cache.lo `test -f 'docupen/cache.c' || echo '$(srcdir)/'`docupen/cache.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) docupen/$(DEPDIR)/la-cache.Tpo docupen/$(DEPDIR)/la-cache.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docupen/cache.c' object='docupen/la-cache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/st2205_la-st2205_tables.lo `test -f 'st2205/st2205_tables.c' || echo '$(srcdir)/'`st2205/st2205_tables.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -c -o docupen/la-cache.lo `test -f 'docupen/cache.c' || echo '$(srcdir)/'`docupen/cache.c
 
-template/template_la-template.lo: template/template.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(template_la_CFLAGS) $(CFLAGS) -MT template/template_la-template.lo -MD -MP -MF template/$(DEPDIR)/template_la-template.Tpo -c -o template/template_la-template.lo `test -f 'template/template.c' || echo '$(srcdir)/'`template/template.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) template/$(DEPDIR)/template_la-template.Tpo template/$(DEPDIR)/template_la-template.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='template/template.c' object='template/template_la-template.lo' libtool=yes @AMDEPBACKSLASH@
+docupen/la-calibration.lo: docupen/calibration.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -MT docupen/la-calibration.lo -MD -MP -MF docupen/$(DEPDIR)/la-calibration.Tpo -c -o docupen/la-calibration.lo `test -f 'docupen/calibration.c' || echo '$(srcdir)/'`docupen/calibration.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) docupen/$(DEPDIR)/la-calibration.Tpo docupen/$(DEPDIR)/la-calibration.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docupen/calibration.c' object='docupen/la-calibration.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(template_la_CFLAGS) $(CFLAGS) -c -o template/template_la-template.lo `test -f 'template/template.c' || echo '$(srcdir)/'`template/template.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -c -o docupen/la-calibration.lo `test -f 'docupen/calibration.c' || echo '$(srcdir)/'`docupen/calibration.c
 
-tp6801/tp6801_la-library.lo: tp6801/library.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -MT tp6801/tp6801_la-library.lo -MD -MP -MF tp6801/$(DEPDIR)/tp6801_la-library.Tpo -c -o tp6801/tp6801_la-library.lo `test -f 'tp6801/library.c' || echo '$(srcdir)/'`tp6801/library.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tp6801/$(DEPDIR)/tp6801_la-library.Tpo tp6801/$(DEPDIR)/tp6801_la-library.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tp6801/library.c' object='tp6801/tp6801_la-library.lo' libtool=yes @AMDEPBACKSLASH@
+docupen/la-docupen.lo: docupen/docupen.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -MT docupen/la-docupen.lo -MD -MP -MF docupen/$(DEPDIR)/la-docupen.Tpo -c -o docupen/la-docupen.lo `test -f 'docupen/docupen.c' || echo '$(srcdir)/'`docupen/docupen.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) docupen/$(DEPDIR)/la-docupen.Tpo docupen/$(DEPDIR)/la-docupen.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docupen/docupen.c' object='docupen/la-docupen.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -c -o tp6801/tp6801_la-library.lo `test -f 'tp6801/library.c' || echo '$(srcdir)/'`tp6801/library.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -c -o docupen/la-docupen.lo `test -f 'docupen/docupen.c' || echo '$(srcdir)/'`docupen/docupen.c
 
-tp6801/tp6801_la-tp6801.lo: tp6801/tp6801.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -MT tp6801/tp6801_la-tp6801.lo -MD -MP -MF tp6801/$(DEPDIR)/tp6801_la-tp6801.Tpo -c -o tp6801/tp6801_la-tp6801.lo `test -f 'tp6801/tp6801.c' || echo '$(srcdir)/'`tp6801/tp6801.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tp6801/$(DEPDIR)/tp6801_la-tp6801.Tpo tp6801/$(DEPDIR)/tp6801_la-tp6801.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tp6801/tp6801.c' object='tp6801/tp6801_la-tp6801.lo' libtool=yes @AMDEPBACKSLASH@
+docupen/la-huffman.lo: docupen/huffman.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -MT docupen/la-huffman.lo -MD -MP -MF docupen/$(DEPDIR)/la-huffman.Tpo -c -o docupen/la-huffman.lo `test -f 'docupen/huffman.c' || echo '$(srcdir)/'`docupen/huffman.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) docupen/$(DEPDIR)/la-huffman.Tpo docupen/$(DEPDIR)/la-huffman.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docupen/huffman.c' object='docupen/la-huffman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -c -o tp6801/tp6801_la-tp6801.lo `test -f 'tp6801/tp6801.c' || echo '$(srcdir)/'`tp6801/tp6801.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -c -o docupen/la-huffman.lo `test -f 'docupen/huffman.c' || echo '$(srcdir)/'`docupen/huffman.c
+
+docupen/la-image.lo: docupen/image.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -MT docupen/la-image.lo -MD -MP -MF docupen/$(DEPDIR)/la-image.Tpo -c -o docupen/la-image.lo `test -f 'docupen/image.c' || echo '$(srcdir)/'`docupen/image.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) docupen/$(DEPDIR)/la-image.Tpo docupen/$(DEPDIR)/la-image.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='docupen/image.c' object='docupen/la-image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(docupen_la_CPPFLAGS) $(CPPFLAGS) $(docupen_la_CFLAGS) $(CFLAGS) -c -o docupen/la-image.lo `test -f 'docupen/image.c' || echo '$(srcdir)/'`docupen/image.c
+
+enigma13/la-enigma13.lo: enigma13/enigma13.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enigma13_la_CPPFLAGS) $(CPPFLAGS) $(enigma13_la_CFLAGS) $(CFLAGS) -MT enigma13/la-enigma13.lo -MD -MP -MF enigma13/$(DEPDIR)/la-enigma13.Tpo -c -o enigma13/la-enigma13.lo `test -f 'enigma13/enigma13.c' || echo '$(srcdir)/'`enigma13/enigma13.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) enigma13/$(DEPDIR)/la-enigma13.Tpo enigma13/$(DEPDIR)/la-enigma13.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='enigma13/enigma13.c' object='enigma13/la-enigma13.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enigma13_la_CPPFLAGS) $(CPPFLAGS) $(enigma13_la_CFLAGS) $(CFLAGS) -c -o enigma13/la-enigma13.lo `test -f 'enigma13/enigma13.c' || echo '$(srcdir)/'`enigma13/enigma13.c
+
+fuji/la-library.lo: fuji/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fuji_la_CPPFLAGS) $(CPPFLAGS) $(fuji_la_CFLAGS) $(CFLAGS) -MT fuji/la-library.lo -MD -MP -MF fuji/$(DEPDIR)/la-library.Tpo -c -o fuji/la-library.lo `test -f 'fuji/library.c' || echo '$(srcdir)/'`fuji/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) fuji/$(DEPDIR)/la-library.Tpo fuji/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fuji/library.c' object='fuji/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fuji_la_CPPFLAGS) $(CPPFLAGS) $(fuji_la_CFLAGS) $(CFLAGS) -c -o fuji/la-library.lo `test -f 'fuji/library.c' || echo '$(srcdir)/'`fuji/library.c
+
+fuji/la-fuji.lo: fuji/fuji.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fuji_la_CPPFLAGS) $(CPPFLAGS) $(fuji_la_CFLAGS) $(CFLAGS) -MT fuji/la-fuji.lo -MD -MP -MF fuji/$(DEPDIR)/la-fuji.Tpo -c -o fuji/la-fuji.lo `test -f 'fuji/fuji.c' || echo '$(srcdir)/'`fuji/fuji.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) fuji/$(DEPDIR)/la-fuji.Tpo fuji/$(DEPDIR)/la-fuji.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fuji/fuji.c' object='fuji/la-fuji.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fuji_la_CPPFLAGS) $(CPPFLAGS) $(fuji_la_CFLAGS) $(CFLAGS) -c -o fuji/la-fuji.lo `test -f 'fuji/fuji.c' || echo '$(srcdir)/'`fuji/fuji.c
+
+gsmart300/la-gsmart300.lo: gsmart300/gsmart300.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gsmart300_la_CPPFLAGS) $(CPPFLAGS) $(gsmart300_la_CFLAGS) $(CFLAGS) -MT gsmart300/la-gsmart300.lo -MD -MP -MF gsmart300/$(DEPDIR)/la-gsmart300.Tpo -c -o gsmart300/la-gsmart300.lo `test -f 'gsmart300/gsmart300.c' || echo '$(srcdir)/'`gsmart300/gsmart300.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) gsmart300/$(DEPDIR)/la-gsmart300.Tpo gsmart300/$(DEPDIR)/la-gsmart300.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsmart300/gsmart300.c' object='gsmart300/la-gsmart300.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gsmart300_la_CPPFLAGS) $(CPPFLAGS) $(gsmart300_la_CFLAGS) $(CFLAGS) -c -o gsmart300/la-gsmart300.lo `test -f 'gsmart300/gsmart300.c' || echo '$(srcdir)/'`gsmart300/gsmart300.c
+
+gsmart300/la-library.lo: gsmart300/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gsmart300_la_CPPFLAGS) $(CPPFLAGS) $(gsmart300_la_CFLAGS) $(CFLAGS) -MT gsmart300/la-library.lo -MD -MP -MF gsmart300/$(DEPDIR)/la-library.Tpo -c -o gsmart300/la-library.lo `test -f 'gsmart300/library.c' || echo '$(srcdir)/'`gsmart300/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) gsmart300/$(DEPDIR)/la-library.Tpo gsmart300/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsmart300/library.c' object='gsmart300/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gsmart300_la_CPPFLAGS) $(CPPFLAGS) $(gsmart300_la_CFLAGS) $(CFLAGS) -c -o gsmart300/la-library.lo `test -f 'gsmart300/library.c' || echo '$(srcdir)/'`gsmart300/library.c
+
+hp215/la-hp215.lo: hp215/hp215.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hp215_la_CPPFLAGS) $(CPPFLAGS) $(hp215_la_CFLAGS) $(CFLAGS) -MT hp215/la-hp215.lo -MD -MP -MF hp215/$(DEPDIR)/la-hp215.Tpo -c -o hp215/la-hp215.lo `test -f 'hp215/hp215.c' || echo '$(srcdir)/'`hp215/hp215.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) hp215/$(DEPDIR)/la-hp215.Tpo hp215/$(DEPDIR)/la-hp215.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hp215/hp215.c' object='hp215/la-hp215.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hp215_la_CPPFLAGS) $(CPPFLAGS) $(hp215_la_CFLAGS) $(CFLAGS) -c -o hp215/la-hp215.lo `test -f 'hp215/hp215.c' || echo '$(srcdir)/'`hp215/hp215.c
+
+iclick/la-library.lo: iclick/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iclick_la_CPPFLAGS) $(CPPFLAGS) $(iclick_la_CFLAGS) $(CFLAGS) -MT iclick/la-library.lo -MD -MP -MF iclick/$(DEPDIR)/la-library.Tpo -c -o iclick/la-library.lo `test -f 'iclick/library.c' || echo '$(srcdir)/'`iclick/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) iclick/$(DEPDIR)/la-library.Tpo iclick/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='iclick/library.c' object='iclick/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iclick_la_CPPFLAGS) $(CPPFLAGS) $(iclick_la_CFLAGS) $(CFLAGS) -c -o iclick/la-library.lo `test -f 'iclick/library.c' || echo '$(srcdir)/'`iclick/library.c
+
+iclick/la-iclick.lo: iclick/iclick.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iclick_la_CPPFLAGS) $(CPPFLAGS) $(iclick_la_CFLAGS) $(CFLAGS) -MT iclick/la-iclick.lo -MD -MP -MF iclick/$(DEPDIR)/la-iclick.Tpo -c -o iclick/la-iclick.lo `test -f 'iclick/iclick.c' || echo '$(srcdir)/'`iclick/iclick.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) iclick/$(DEPDIR)/la-iclick.Tpo iclick/$(DEPDIR)/la-iclick.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='iclick/iclick.c' object='iclick/la-iclick.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iclick_la_CPPFLAGS) $(CPPFLAGS) $(iclick_la_CFLAGS) $(CFLAGS) -c -o iclick/la-iclick.lo `test -f 'iclick/iclick.c' || echo '$(srcdir)/'`iclick/iclick.c
+
+jamcam/la-jamcam.lo: jamcam/jamcam.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jamcam_la_CPPFLAGS) $(CPPFLAGS) $(jamcam_la_CFLAGS) $(CFLAGS) -MT jamcam/la-jamcam.lo -MD -MP -MF jamcam/$(DEPDIR)/la-jamcam.Tpo -c -o jamcam/la-jamcam.lo `test -f 'jamcam/jamcam.c' || echo '$(srcdir)/'`jamcam/jamcam.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jamcam/$(DEPDIR)/la-jamcam.Tpo jamcam/$(DEPDIR)/la-jamcam.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jamcam/jamcam.c' object='jamcam/la-jamcam.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jamcam_la_CPPFLAGS) $(CPPFLAGS) $(jamcam_la_CFLAGS) $(CFLAGS) -c -o jamcam/la-jamcam.lo `test -f 'jamcam/jamcam.c' || echo '$(srcdir)/'`jamcam/jamcam.c
+
+jamcam/la-library.lo: jamcam/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jamcam_la_CPPFLAGS) $(CPPFLAGS) $(jamcam_la_CFLAGS) $(CFLAGS) -MT jamcam/la-library.lo -MD -MP -MF jamcam/$(DEPDIR)/la-library.Tpo -c -o jamcam/la-library.lo `test -f 'jamcam/library.c' || echo '$(srcdir)/'`jamcam/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jamcam/$(DEPDIR)/la-library.Tpo jamcam/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jamcam/library.c' object='jamcam/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jamcam_la_CPPFLAGS) $(CPPFLAGS) $(jamcam_la_CFLAGS) $(CFLAGS) -c -o jamcam/la-library.lo `test -f 'jamcam/library.c' || echo '$(srcdir)/'`jamcam/library.c
+
+jd11/la-jd11.lo: jd11/jd11.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -MT jd11/la-jd11.lo -MD -MP -MF jd11/$(DEPDIR)/la-jd11.Tpo -c -o jd11/la-jd11.lo `test -f 'jd11/jd11.c' || echo '$(srcdir)/'`jd11/jd11.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jd11/$(DEPDIR)/la-jd11.Tpo jd11/$(DEPDIR)/la-jd11.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jd11/jd11.c' object='jd11/la-jd11.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -c -o jd11/la-jd11.lo `test -f 'jd11/jd11.c' || echo '$(srcdir)/'`jd11/jd11.c
+
+jd11/la-serial.lo: jd11/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -MT jd11/la-serial.lo -MD -MP -MF jd11/$(DEPDIR)/la-serial.Tpo -c -o jd11/la-serial.lo `test -f 'jd11/serial.c' || echo '$(srcdir)/'`jd11/serial.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jd11/$(DEPDIR)/la-serial.Tpo jd11/$(DEPDIR)/la-serial.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jd11/serial.c' object='jd11/la-serial.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -c -o jd11/la-serial.lo `test -f 'jd11/serial.c' || echo '$(srcdir)/'`jd11/serial.c
+
+jd11/la-decomp.lo: jd11/decomp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -MT jd11/la-decomp.lo -MD -MP -MF jd11/$(DEPDIR)/la-decomp.Tpo -c -o jd11/la-decomp.lo `test -f 'jd11/decomp.c' || echo '$(srcdir)/'`jd11/decomp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jd11/$(DEPDIR)/la-decomp.Tpo jd11/$(DEPDIR)/la-decomp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jd11/decomp.c' object='jd11/la-decomp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jd11_la_CPPFLAGS) $(CPPFLAGS) $(jd11_la_CFLAGS) $(CFLAGS) -c -o jd11/la-decomp.lo `test -f 'jd11/decomp.c' || echo '$(srcdir)/'`jd11/decomp.c
+
+jl2005a/la-library.lo: jl2005a/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005a_la_CPPFLAGS) $(CPPFLAGS) $(jl2005a_la_CFLAGS) $(CFLAGS) -MT jl2005a/la-library.lo -MD -MP -MF jl2005a/$(DEPDIR)/la-library.Tpo -c -o jl2005a/la-library.lo `test -f 'jl2005a/library.c' || echo '$(srcdir)/'`jl2005a/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005a/$(DEPDIR)/la-library.Tpo jl2005a/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005a/library.c' object='jl2005a/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005a_la_CPPFLAGS) $(CPPFLAGS) $(jl2005a_la_CFLAGS) $(CFLAGS) -c -o jl2005a/la-library.lo `test -f 'jl2005a/library.c' || echo '$(srcdir)/'`jl2005a/library.c
+
+jl2005a/la-jl2005a.lo: jl2005a/jl2005a.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005a_la_CPPFLAGS) $(CPPFLAGS) $(jl2005a_la_CFLAGS) $(CFLAGS) -MT jl2005a/la-jl2005a.lo -MD -MP -MF jl2005a/$(DEPDIR)/la-jl2005a.Tpo -c -o jl2005a/la-jl2005a.lo `test -f 'jl2005a/jl2005a.c' || echo '$(srcdir)/'`jl2005a/jl2005a.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005a/$(DEPDIR)/la-jl2005a.Tpo jl2005a/$(DEPDIR)/la-jl2005a.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005a/jl2005a.c' object='jl2005a/la-jl2005a.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005a_la_CPPFLAGS) $(CPPFLAGS) $(jl2005a_la_CFLAGS) $(CFLAGS) -c -o jl2005a/la-jl2005a.lo `test -f 'jl2005a/jl2005a.c' || echo '$(srcdir)/'`jl2005a/jl2005a.c
+
+jl2005c/la-library.lo: jl2005c/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -MT jl2005c/la-library.lo -MD -MP -MF jl2005c/$(DEPDIR)/la-library.Tpo -c -o jl2005c/la-library.lo `test -f 'jl2005c/library.c' || echo '$(srcdir)/'`jl2005c/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005c/$(DEPDIR)/la-library.Tpo jl2005c/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005c/library.c' object='jl2005c/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -c -o jl2005c/la-library.lo `test -f 'jl2005c/library.c' || echo '$(srcdir)/'`jl2005c/library.c
+
+jl2005c/la-jl2005c.lo: jl2005c/jl2005c.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -MT jl2005c/la-jl2005c.lo -MD -MP -MF jl2005c/$(DEPDIR)/la-jl2005c.Tpo -c -o jl2005c/la-jl2005c.lo `test -f 'jl2005c/jl2005c.c' || echo '$(srcdir)/'`jl2005c/jl2005c.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005c/$(DEPDIR)/la-jl2005c.Tpo jl2005c/$(DEPDIR)/la-jl2005c.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005c/jl2005c.c' object='jl2005c/la-jl2005c.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -c -o jl2005c/la-jl2005c.lo `test -f 'jl2005c/jl2005c.c' || echo '$(srcdir)/'`jl2005c/jl2005c.c
+
+jl2005c/la-jpeg_memsrcdest.lo: jl2005c/jpeg_memsrcdest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -MT jl2005c/la-jpeg_memsrcdest.lo -MD -MP -MF jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Tpo -c -o jl2005c/la-jpeg_memsrcdest.lo `test -f 'jl2005c/jpeg_memsrcdest.c' || echo '$(srcdir)/'`jl2005c/jpeg_memsrcdest.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Tpo jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005c/jpeg_memsrcdest.c' object='jl2005c/la-jpeg_memsrcdest.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -c -o jl2005c/la-jpeg_memsrcdest.lo `test -f 'jl2005c/jpeg_memsrcdest.c' || echo '$(srcdir)/'`jl2005c/jpeg_memsrcdest.c
+
+jl2005c/la-jl2005bcd_decompress.lo: jl2005c/jl2005bcd_decompress.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -MT jl2005c/la-jl2005bcd_decompress.lo -MD -MP -MF jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Tpo -c -o jl2005c/la-jl2005bcd_decompress.lo `test -f 'jl2005c/jl2005bcd_decompress.c' || echo '$(srcdir)/'`jl2005c/jl2005bcd_decompress.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Tpo jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005c/jl2005bcd_decompress.c' object='jl2005c/la-jl2005bcd_decompress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -c -o jl2005c/la-jl2005bcd_decompress.lo `test -f 'jl2005c/jl2005bcd_decompress.c' || echo '$(srcdir)/'`jl2005c/jl2005bcd_decompress.c
+
+jl2005c/la-img_enhance.lo: jl2005c/img_enhance.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -MT jl2005c/la-img_enhance.lo -MD -MP -MF jl2005c/$(DEPDIR)/la-img_enhance.Tpo -c -o jl2005c/la-img_enhance.lo `test -f 'jl2005c/img_enhance.c' || echo '$(srcdir)/'`jl2005c/img_enhance.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) jl2005c/$(DEPDIR)/la-img_enhance.Tpo jl2005c/$(DEPDIR)/la-img_enhance.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jl2005c/img_enhance.c' object='jl2005c/la-img_enhance.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jl2005c_la_CPPFLAGS) $(CPPFLAGS) $(jl2005c_la_CFLAGS) $(CFLAGS) -c -o jl2005c/la-img_enhance.lo `test -f 'jl2005c/img_enhance.c' || echo '$(srcdir)/'`jl2005c/img_enhance.c
+
+kodak/dc120/la-dc120.lo: kodak/dc120/dc120.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc120_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc120_la_CFLAGS) $(CFLAGS) -MT kodak/dc120/la-dc120.lo -MD -MP -MF kodak/dc120/$(DEPDIR)/la-dc120.Tpo -c -o kodak/dc120/la-dc120.lo `test -f 'kodak/dc120/dc120.c' || echo '$(srcdir)/'`kodak/dc120/dc120.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc120/$(DEPDIR)/la-dc120.Tpo kodak/dc120/$(DEPDIR)/la-dc120.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc120/dc120.c' object='kodak/dc120/la-dc120.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc120_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc120_la_CFLAGS) $(CFLAGS) -c -o kodak/dc120/la-dc120.lo `test -f 'kodak/dc120/dc120.c' || echo '$(srcdir)/'`kodak/dc120/dc120.c
+
+kodak/dc120/la-library.lo: kodak/dc120/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc120_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc120_la_CFLAGS) $(CFLAGS) -MT kodak/dc120/la-library.lo -MD -MP -MF kodak/dc120/$(DEPDIR)/la-library.Tpo -c -o kodak/dc120/la-library.lo `test -f 'kodak/dc120/library.c' || echo '$(srcdir)/'`kodak/dc120/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc120/$(DEPDIR)/la-library.Tpo kodak/dc120/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc120/library.c' object='kodak/dc120/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc120_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc120_la_CFLAGS) $(CFLAGS) -c -o kodak/dc120/la-library.lo `test -f 'kodak/dc120/library.c' || echo '$(srcdir)/'`kodak/dc120/library.c
+
+kodak/dc210/la-dc210.lo: kodak/dc210/dc210.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc210_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc210_la_CFLAGS) $(CFLAGS) -MT kodak/dc210/la-dc210.lo -MD -MP -MF kodak/dc210/$(DEPDIR)/la-dc210.Tpo -c -o kodak/dc210/la-dc210.lo `test -f 'kodak/dc210/dc210.c' || echo '$(srcdir)/'`kodak/dc210/dc210.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc210/$(DEPDIR)/la-dc210.Tpo kodak/dc210/$(DEPDIR)/la-dc210.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc210/dc210.c' object='kodak/dc210/la-dc210.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc210_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc210_la_CFLAGS) $(CFLAGS) -c -o kodak/dc210/la-dc210.lo `test -f 'kodak/dc210/dc210.c' || echo '$(srcdir)/'`kodak/dc210/dc210.c
+
+kodak/dc210/la-library.lo: kodak/dc210/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc210_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc210_la_CFLAGS) $(CFLAGS) -MT kodak/dc210/la-library.lo -MD -MP -MF kodak/dc210/$(DEPDIR)/la-library.Tpo -c -o kodak/dc210/la-library.lo `test -f 'kodak/dc210/library.c' || echo '$(srcdir)/'`kodak/dc210/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc210/$(DEPDIR)/la-library.Tpo kodak/dc210/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc210/library.c' object='kodak/dc210/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc210_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc210_la_CFLAGS) $(CFLAGS) -c -o kodak/dc210/la-library.lo `test -f 'kodak/dc210/library.c' || echo '$(srcdir)/'`kodak/dc210/library.c
+
+kodak/dc240/la-dc240.lo: kodak/dc240/dc240.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc240_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc240_la_CFLAGS) $(CFLAGS) -MT kodak/dc240/la-dc240.lo -MD -MP -MF kodak/dc240/$(DEPDIR)/la-dc240.Tpo -c -o kodak/dc240/la-dc240.lo `test -f 'kodak/dc240/dc240.c' || echo '$(srcdir)/'`kodak/dc240/dc240.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc240/$(DEPDIR)/la-dc240.Tpo kodak/dc240/$(DEPDIR)/la-dc240.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc240/dc240.c' object='kodak/dc240/la-dc240.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc240_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc240_la_CFLAGS) $(CFLAGS) -c -o kodak/dc240/la-dc240.lo `test -f 'kodak/dc240/dc240.c' || echo '$(srcdir)/'`kodak/dc240/dc240.c
+
+kodak/dc240/la-library.lo: kodak/dc240/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc240_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc240_la_CFLAGS) $(CFLAGS) -MT kodak/dc240/la-library.lo -MD -MP -MF kodak/dc240/$(DEPDIR)/la-library.Tpo -c -o kodak/dc240/la-library.lo `test -f 'kodak/dc240/library.c' || echo '$(srcdir)/'`kodak/dc240/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc240/$(DEPDIR)/la-library.Tpo kodak/dc240/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc240/library.c' object='kodak/dc240/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc240_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc240_la_CFLAGS) $(CFLAGS) -c -o kodak/dc240/la-library.lo `test -f 'kodak/dc240/library.c' || echo '$(srcdir)/'`kodak/dc240/library.c
+
+kodak/dc3200/la-dc3200.lo: kodak/dc3200/dc3200.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc3200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc3200_la_CFLAGS) $(CFLAGS) -MT kodak/dc3200/la-dc3200.lo -MD -MP -MF kodak/dc3200/$(DEPDIR)/la-dc3200.Tpo -c -o kodak/dc3200/la-dc3200.lo `test -f 'kodak/dc3200/dc3200.c' || echo '$(srcdir)/'`kodak/dc3200/dc3200.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc3200/$(DEPDIR)/la-dc3200.Tpo kodak/dc3200/$(DEPDIR)/la-dc3200.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc3200/dc3200.c' object='kodak/dc3200/la-dc3200.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc3200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc3200_la_CFLAGS) $(CFLAGS) -c -o kodak/dc3200/la-dc3200.lo `test -f 'kodak/dc3200/dc3200.c' || echo '$(srcdir)/'`kodak/dc3200/dc3200.c
+
+kodak/dc3200/la-library.lo: kodak/dc3200/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc3200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc3200_la_CFLAGS) $(CFLAGS) -MT kodak/dc3200/la-library.lo -MD -MP -MF kodak/dc3200/$(DEPDIR)/la-library.Tpo -c -o kodak/dc3200/la-library.lo `test -f 'kodak/dc3200/library.c' || echo '$(srcdir)/'`kodak/dc3200/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/dc3200/$(DEPDIR)/la-library.Tpo kodak/dc3200/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/dc3200/library.c' object='kodak/dc3200/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_dc3200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_dc3200_la_CFLAGS) $(CFLAGS) -c -o kodak/dc3200/la-library.lo `test -f 'kodak/dc3200/library.c' || echo '$(srcdir)/'`kodak/dc3200/library.c
+
+kodak/ez200/la-ez200.lo: kodak/ez200/ez200.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_ez200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_ez200_la_CFLAGS) $(CFLAGS) -MT kodak/ez200/la-ez200.lo -MD -MP -MF kodak/ez200/$(DEPDIR)/la-ez200.Tpo -c -o kodak/ez200/la-ez200.lo `test -f 'kodak/ez200/ez200.c' || echo '$(srcdir)/'`kodak/ez200/ez200.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kodak/ez200/$(DEPDIR)/la-ez200.Tpo kodak/ez200/$(DEPDIR)/la-ez200.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kodak/ez200/ez200.c' object='kodak/ez200/la-ez200.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kodak_ez200_la_CPPFLAGS) $(CPPFLAGS) $(kodak_ez200_la_CFLAGS) $(CFLAGS) -c -o kodak/ez200/la-ez200.lo `test -f 'kodak/ez200/ez200.c' || echo '$(srcdir)/'`kodak/ez200/ez200.c
+
+konica/la-lowlevel.lo: konica/lowlevel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -MT konica/la-lowlevel.lo -MD -MP -MF konica/$(DEPDIR)/la-lowlevel.Tpo -c -o konica/la-lowlevel.lo `test -f 'konica/lowlevel.c' || echo '$(srcdir)/'`konica/lowlevel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/la-lowlevel.Tpo konica/$(DEPDIR)/la-lowlevel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/lowlevel.c' object='konica/la-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -c -o konica/la-lowlevel.lo `test -f 'konica/lowlevel.c' || echo '$(srcdir)/'`konica/lowlevel.c
+
+konica/la-konica.lo: konica/konica.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -MT konica/la-konica.lo -MD -MP -MF konica/$(DEPDIR)/la-konica.Tpo -c -o konica/la-konica.lo `test -f 'konica/konica.c' || echo '$(srcdir)/'`konica/konica.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/la-konica.Tpo konica/$(DEPDIR)/la-konica.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/konica.c' object='konica/la-konica.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -c -o konica/la-konica.lo `test -f 'konica/konica.c' || echo '$(srcdir)/'`konica/konica.c
+
+konica/la-library.lo: konica/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -MT konica/la-library.lo -MD -MP -MF konica/$(DEPDIR)/la-library.Tpo -c -o konica/la-library.lo `test -f 'konica/library.c' || echo '$(srcdir)/'`konica/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/la-library.Tpo konica/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/library.c' object='konica/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_la_CPPFLAGS) $(CPPFLAGS) $(konica_la_CFLAGS) $(CFLAGS) -c -o konica/la-library.lo `test -f 'konica/library.c' || echo '$(srcdir)/'`konica/library.c
+
+konica/qm150_la-qm150.lo: konica/qm150.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_qm150_la_CPPFLAGS) $(CPPFLAGS) $(konica_qm150_la_CFLAGS) $(CFLAGS) -MT konica/qm150_la-qm150.lo -MD -MP -MF konica/$(DEPDIR)/qm150_la-qm150.Tpo -c -o konica/qm150_la-qm150.lo `test -f 'konica/qm150.c' || echo '$(srcdir)/'`konica/qm150.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) konica/$(DEPDIR)/qm150_la-qm150.Tpo konica/$(DEPDIR)/qm150_la-qm150.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='konica/qm150.c' object='konica/qm150_la-qm150.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(konica_qm150_la_CPPFLAGS) $(CPPFLAGS) $(konica_qm150_la_CFLAGS) $(CFLAGS) -c -o konica/qm150_la-qm150.lo `test -f 'konica/qm150.c' || echo '$(srcdir)/'`konica/qm150.c
+
+largan/lmini/la-largan.lo: largan/lmini/largan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -MT largan/lmini/la-largan.lo -MD -MP -MF largan/lmini/$(DEPDIR)/la-largan.Tpo -c -o largan/lmini/la-largan.lo `test -f 'largan/lmini/largan.c' || echo '$(srcdir)/'`largan/lmini/largan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) largan/lmini/$(DEPDIR)/la-largan.Tpo largan/lmini/$(DEPDIR)/la-largan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='largan/lmini/largan.c' object='largan/lmini/la-largan.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -c -o largan/lmini/la-largan.lo `test -f 'largan/lmini/largan.c' || echo '$(srcdir)/'`largan/lmini/largan.c
+
+largan/lmini/la-lmini.lo: largan/lmini/lmini.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -MT largan/lmini/la-lmini.lo -MD -MP -MF largan/lmini/$(DEPDIR)/la-lmini.Tpo -c -o largan/lmini/la-lmini.lo `test -f 'largan/lmini/lmini.c' || echo '$(srcdir)/'`largan/lmini/lmini.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) largan/lmini/$(DEPDIR)/la-lmini.Tpo largan/lmini/$(DEPDIR)/la-lmini.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='largan/lmini/lmini.c' object='largan/lmini/la-lmini.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -c -o largan/lmini/la-lmini.lo `test -f 'largan/lmini/lmini.c' || echo '$(srcdir)/'`largan/lmini/lmini.c
+
+largan/lmini/la-lmini_ccd.lo: largan/lmini/lmini_ccd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -MT largan/lmini/la-lmini_ccd.lo -MD -MP -MF largan/lmini/$(DEPDIR)/la-lmini_ccd.Tpo -c -o largan/lmini/la-lmini_ccd.lo `test -f 'largan/lmini/lmini_ccd.c' || echo '$(srcdir)/'`largan/lmini/lmini_ccd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) largan/lmini/$(DEPDIR)/la-lmini_ccd.Tpo largan/lmini/$(DEPDIR)/la-lmini_ccd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='largan/lmini/lmini_ccd.c' object='largan/lmini/la-lmini_ccd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(largan_la_CPPFLAGS) $(CPPFLAGS) $(largan_la_CFLAGS) $(CFLAGS) -c -o largan/lmini/la-lmini_ccd.lo `test -f 'largan/lmini/lmini_ccd.c' || echo '$(srcdir)/'`largan/lmini/lmini_ccd.c
+
+lg_gsm/la-library.lo: lg_gsm/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lg_gsm_la_CPPFLAGS) $(CPPFLAGS) $(lg_gsm_la_CFLAGS) $(CFLAGS) -MT lg_gsm/la-library.lo -MD -MP -MF lg_gsm/$(DEPDIR)/la-library.Tpo -c -o lg_gsm/la-library.lo `test -f 'lg_gsm/library.c' || echo '$(srcdir)/'`lg_gsm/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lg_gsm/$(DEPDIR)/la-library.Tpo lg_gsm/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lg_gsm/library.c' object='lg_gsm/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lg_gsm_la_CPPFLAGS) $(CPPFLAGS) $(lg_gsm_la_CFLAGS) $(CFLAGS) -c -o lg_gsm/la-library.lo `test -f 'lg_gsm/library.c' || echo '$(srcdir)/'`lg_gsm/library.c
+
+lg_gsm/la-lg_gsm.lo: lg_gsm/lg_gsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lg_gsm_la_CPPFLAGS) $(CPPFLAGS) $(lg_gsm_la_CFLAGS) $(CFLAGS) -MT lg_gsm/la-lg_gsm.lo -MD -MP -MF lg_gsm/$(DEPDIR)/la-lg_gsm.Tpo -c -o lg_gsm/la-lg_gsm.lo `test -f 'lg_gsm/lg_gsm.c' || echo '$(srcdir)/'`lg_gsm/lg_gsm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lg_gsm/$(DEPDIR)/la-lg_gsm.Tpo lg_gsm/$(DEPDIR)/la-lg_gsm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lg_gsm/lg_gsm.c' object='lg_gsm/la-lg_gsm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lg_gsm_la_CPPFLAGS) $(CPPFLAGS) $(lg_gsm_la_CFLAGS) $(CFLAGS) -c -o lg_gsm/la-lg_gsm.lo `test -f 'lg_gsm/lg_gsm.c' || echo '$(srcdir)/'`lg_gsm/lg_gsm.c
+
+lumix/la-lumix.lo: lumix/lumix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lumix_la_CPPFLAGS) $(CPPFLAGS) $(lumix_la_CFLAGS) $(CFLAGS) -MT lumix/la-lumix.lo -MD -MP -MF lumix/$(DEPDIR)/la-lumix.Tpo -c -o lumix/la-lumix.lo `test -f 'lumix/lumix.c' || echo '$(srcdir)/'`lumix/lumix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) lumix/$(DEPDIR)/la-lumix.Tpo lumix/$(DEPDIR)/la-lumix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lumix/lumix.c' object='lumix/la-lumix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lumix_la_CPPFLAGS) $(CPPFLAGS) $(lumix_la_CFLAGS) $(CFLAGS) -c -o lumix/la-lumix.lo `test -f 'lumix/lumix.c' || echo '$(srcdir)/'`lumix/lumix.c
+
+mars/la-library.lo: mars/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mars_la_CPPFLAGS) $(CPPFLAGS) $(mars_la_CFLAGS) $(CFLAGS) -MT mars/la-library.lo -MD -MP -MF mars/$(DEPDIR)/la-library.Tpo -c -o mars/la-library.lo `test -f 'mars/library.c' || echo '$(srcdir)/'`mars/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mars/$(DEPDIR)/la-library.Tpo mars/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mars/library.c' object='mars/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mars_la_CPPFLAGS) $(CPPFLAGS) $(mars_la_CFLAGS) $(CFLAGS) -c -o mars/la-library.lo `test -f 'mars/library.c' || echo '$(srcdir)/'`mars/library.c
+
+mars/la-mars.lo: mars/mars.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mars_la_CPPFLAGS) $(CPPFLAGS) $(mars_la_CFLAGS) $(CFLAGS) -MT mars/la-mars.lo -MD -MP -MF mars/$(DEPDIR)/la-mars.Tpo -c -o mars/la-mars.lo `test -f 'mars/mars.c' || echo '$(srcdir)/'`mars/mars.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mars/$(DEPDIR)/la-mars.Tpo mars/$(DEPDIR)/la-mars.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mars/mars.c' object='mars/la-mars.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mars_la_CPPFLAGS) $(CPPFLAGS) $(mars_la_CFLAGS) $(CFLAGS) -c -o mars/la-mars.lo `test -f 'mars/mars.c' || echo '$(srcdir)/'`mars/mars.c
+
+mustek/la-mdc800.lo: mustek/mdc800.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-mdc800.lo -MD -MP -MF mustek/$(DEPDIR)/la-mdc800.Tpo -c -o mustek/la-mdc800.lo `test -f 'mustek/mdc800.c' || echo '$(srcdir)/'`mustek/mdc800.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-mdc800.Tpo mustek/$(DEPDIR)/la-mdc800.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/mdc800.c' object='mustek/la-mdc800.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-mdc800.lo `test -f 'mustek/mdc800.c' || echo '$(srcdir)/'`mustek/mdc800.c
+
+mustek/la-core.lo: mustek/core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-core.lo -MD -MP -MF mustek/$(DEPDIR)/la-core.Tpo -c -o mustek/la-core.lo `test -f 'mustek/core.c' || echo '$(srcdir)/'`mustek/core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-core.Tpo mustek/$(DEPDIR)/la-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/core.c' object='mustek/la-core.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-core.lo `test -f 'mustek/core.c' || echo '$(srcdir)/'`mustek/core.c
+
+mustek/la-image.lo: mustek/image.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-image.lo -MD -MP -MF mustek/$(DEPDIR)/la-image.Tpo -c -o mustek/la-image.lo `test -f 'mustek/image.c' || echo '$(srcdir)/'`mustek/image.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-image.Tpo mustek/$(DEPDIR)/la-image.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/image.c' object='mustek/la-image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-image.lo `test -f 'mustek/image.c' || echo '$(srcdir)/'`mustek/image.c
+
+mustek/la-io.lo: mustek/io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-io.lo -MD -MP -MF mustek/$(DEPDIR)/la-io.Tpo -c -o mustek/la-io.lo `test -f 'mustek/io.c' || echo '$(srcdir)/'`mustek/io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-io.Tpo mustek/$(DEPDIR)/la-io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/io.c' object='mustek/la-io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-io.lo `test -f 'mustek/io.c' || echo '$(srcdir)/'`mustek/io.c
+
+mustek/la-rs232.lo: mustek/rs232.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-rs232.lo -MD -MP -MF mustek/$(DEPDIR)/la-rs232.Tpo -c -o mustek/la-rs232.lo `test -f 'mustek/rs232.c' || echo '$(srcdir)/'`mustek/rs232.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-rs232.Tpo mustek/$(DEPDIR)/la-rs232.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/rs232.c' object='mustek/la-rs232.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-rs232.lo `test -f 'mustek/rs232.c' || echo '$(srcdir)/'`mustek/rs232.c
+
+mustek/la-usb.lo: mustek/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -MT mustek/la-usb.lo -MD -MP -MF mustek/$(DEPDIR)/la-usb.Tpo -c -o mustek/la-usb.lo `test -f 'mustek/usb.c' || echo '$(srcdir)/'`mustek/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mustek/$(DEPDIR)/la-usb.Tpo mustek/$(DEPDIR)/la-usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mustek/usb.c' object='mustek/la-usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mustek_la_CPPFLAGS) $(CPPFLAGS) $(mustek_la_CFLAGS) $(CFLAGS) -c -o mustek/la-usb.lo `test -f 'mustek/usb.c' || echo '$(srcdir)/'`mustek/usb.c
+
+panasonic/coolshot/la-coolshot.lo: panasonic/coolshot/coolshot.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_coolshot_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_coolshot_la_CFLAGS) $(CFLAGS) -MT panasonic/coolshot/la-coolshot.lo -MD -MP -MF panasonic/coolshot/$(DEPDIR)/la-coolshot.Tpo -c -o panasonic/coolshot/la-coolshot.lo `test -f 'panasonic/coolshot/coolshot.c' || echo '$(srcdir)/'`panasonic/coolshot/coolshot.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/coolshot/$(DEPDIR)/la-coolshot.Tpo panasonic/coolshot/$(DEPDIR)/la-coolshot.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/coolshot/coolshot.c' object='panasonic/coolshot/la-coolshot.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_coolshot_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_coolshot_la_CFLAGS) $(CFLAGS) -c -o panasonic/coolshot/la-coolshot.lo `test -f 'panasonic/coolshot/coolshot.c' || echo '$(srcdir)/'`panasonic/coolshot/coolshot.c
+
+panasonic/coolshot/la-library.lo: panasonic/coolshot/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_coolshot_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_coolshot_la_CFLAGS) $(CFLAGS) -MT panasonic/coolshot/la-library.lo -MD -MP -MF panasonic/coolshot/$(DEPDIR)/la-library.Tpo -c -o panasonic/coolshot/la-library.lo `test -f 'panasonic/coolshot/library.c' || echo '$(srcdir)/'`panasonic/coolshot/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/coolshot/$(DEPDIR)/la-library.Tpo panasonic/coolshot/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/coolshot/library.c' object='panasonic/coolshot/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_coolshot_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_coolshot_la_CFLAGS) $(CFLAGS) -c -o panasonic/coolshot/la-library.lo `test -f 'panasonic/coolshot/library.c' || echo '$(srcdir)/'`panasonic/coolshot/library.c
+
+panasonic/dc1000_la-dc1000.lo: panasonic/dc1000.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1000_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1000_la_CFLAGS) $(CFLAGS) -MT panasonic/dc1000_la-dc1000.lo -MD -MP -MF panasonic/$(DEPDIR)/dc1000_la-dc1000.Tpo -c -o panasonic/dc1000_la-dc1000.lo `test -f 'panasonic/dc1000.c' || echo '$(srcdir)/'`panasonic/dc1000.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/$(DEPDIR)/dc1000_la-dc1000.Tpo panasonic/$(DEPDIR)/dc1000_la-dc1000.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/dc1000.c' object='panasonic/dc1000_la-dc1000.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1000_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1000_la_CFLAGS) $(CFLAGS) -c -o panasonic/dc1000_la-dc1000.lo `test -f 'panasonic/dc1000.c' || echo '$(srcdir)/'`panasonic/dc1000.c
+
+panasonic/dc1000_la-dc.lo: panasonic/dc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1000_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1000_la_CFLAGS) $(CFLAGS) -MT panasonic/dc1000_la-dc.lo -MD -MP -MF panasonic/$(DEPDIR)/dc1000_la-dc.Tpo -c -o panasonic/dc1000_la-dc.lo `test -f 'panasonic/dc.c' || echo '$(srcdir)/'`panasonic/dc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/$(DEPDIR)/dc1000_la-dc.Tpo panasonic/$(DEPDIR)/dc1000_la-dc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/dc.c' object='panasonic/dc1000_la-dc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1000_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1000_la_CFLAGS) $(CFLAGS) -c -o panasonic/dc1000_la-dc.lo `test -f 'panasonic/dc.c' || echo '$(srcdir)/'`panasonic/dc.c
+
+panasonic/dc1580_la-dc1580.lo: panasonic/dc1580.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1580_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1580_la_CFLAGS) $(CFLAGS) -MT panasonic/dc1580_la-dc1580.lo -MD -MP -MF panasonic/$(DEPDIR)/dc1580_la-dc1580.Tpo -c -o panasonic/dc1580_la-dc1580.lo `test -f 'panasonic/dc1580.c' || echo '$(srcdir)/'`panasonic/dc1580.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/$(DEPDIR)/dc1580_la-dc1580.Tpo panasonic/$(DEPDIR)/dc1580_la-dc1580.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/dc1580.c' object='panasonic/dc1580_la-dc1580.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1580_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1580_la_CFLAGS) $(CFLAGS) -c -o panasonic/dc1580_la-dc1580.lo `test -f 'panasonic/dc1580.c' || echo '$(srcdir)/'`panasonic/dc1580.c
+
+panasonic/dc1580_la-dc.lo: panasonic/dc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1580_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1580_la_CFLAGS) $(CFLAGS) -MT panasonic/dc1580_la-dc.lo -MD -MP -MF panasonic/$(DEPDIR)/dc1580_la-dc.Tpo -c -o panasonic/dc1580_la-dc.lo `test -f 'panasonic/dc.c' || echo '$(srcdir)/'`panasonic/dc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/$(DEPDIR)/dc1580_la-dc.Tpo panasonic/$(DEPDIR)/dc1580_la-dc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/dc.c' object='panasonic/dc1580_la-dc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_dc1580_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_dc1580_la_CFLAGS) $(CFLAGS) -c -o panasonic/dc1580_la-dc.lo `test -f 'panasonic/dc.c' || echo '$(srcdir)/'`panasonic/dc.c
+
+panasonic/l859/la-l859.lo: panasonic/l859/l859.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_l859_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_l859_la_CFLAGS) $(CFLAGS) -MT panasonic/l859/la-l859.lo -MD -MP -MF panasonic/l859/$(DEPDIR)/la-l859.Tpo -c -o panasonic/l859/la-l859.lo `test -f 'panasonic/l859/l859.c' || echo '$(srcdir)/'`panasonic/l859/l859.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) panasonic/l859/$(DEPDIR)/la-l859.Tpo panasonic/l859/$(DEPDIR)/la-l859.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='panasonic/l859/l859.c' object='panasonic/l859/la-l859.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(panasonic_l859_la_CPPFLAGS) $(CPPFLAGS) $(panasonic_l859_la_CFLAGS) $(CFLAGS) -c -o panasonic/l859/la-l859.lo `test -f 'panasonic/l859/l859.c' || echo '$(srcdir)/'`panasonic/l859/l859.c
+
+pccam300/la-pccam300.lo: pccam300/pccam300.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam300_la_CPPFLAGS) $(CPPFLAGS) $(pccam300_la_CFLAGS) $(CFLAGS) -MT pccam300/la-pccam300.lo -MD -MP -MF pccam300/$(DEPDIR)/la-pccam300.Tpo -c -o pccam300/la-pccam300.lo `test -f 'pccam300/pccam300.c' || echo '$(srcdir)/'`pccam300/pccam300.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pccam300/$(DEPDIR)/la-pccam300.Tpo pccam300/$(DEPDIR)/la-pccam300.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pccam300/pccam300.c' object='pccam300/la-pccam300.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam300_la_CPPFLAGS) $(CPPFLAGS) $(pccam300_la_CFLAGS) $(CFLAGS) -c -o pccam300/la-pccam300.lo `test -f 'pccam300/pccam300.c' || echo '$(srcdir)/'`pccam300/pccam300.c
+
+pccam300/la-library.lo: pccam300/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam300_la_CPPFLAGS) $(CPPFLAGS) $(pccam300_la_CFLAGS) $(CFLAGS) -MT pccam300/la-library.lo -MD -MP -MF pccam300/$(DEPDIR)/la-library.Tpo -c -o pccam300/la-library.lo `test -f 'pccam300/library.c' || echo '$(srcdir)/'`pccam300/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pccam300/$(DEPDIR)/la-library.Tpo pccam300/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pccam300/library.c' object='pccam300/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam300_la_CPPFLAGS) $(CPPFLAGS) $(pccam300_la_CFLAGS) $(CFLAGS) -c -o pccam300/la-library.lo `test -f 'pccam300/library.c' || echo '$(srcdir)/'`pccam300/library.c
+
+pccam600/la-pccam600.lo: pccam600/pccam600.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam600_la_CPPFLAGS) $(CPPFLAGS) $(pccam600_la_CFLAGS) $(CFLAGS) -MT pccam600/la-pccam600.lo -MD -MP -MF pccam600/$(DEPDIR)/la-pccam600.Tpo -c -o pccam600/la-pccam600.lo `test -f 'pccam600/pccam600.c' || echo '$(srcdir)/'`pccam600/pccam600.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pccam600/$(DEPDIR)/la-pccam600.Tpo pccam600/$(DEPDIR)/la-pccam600.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pccam600/pccam600.c' object='pccam600/la-pccam600.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam600_la_CPPFLAGS) $(CPPFLAGS) $(pccam600_la_CFLAGS) $(CFLAGS) -c -o pccam600/la-pccam600.lo `test -f 'pccam600/pccam600.c' || echo '$(srcdir)/'`pccam600/pccam600.c
+
+pccam600/la-library.lo: pccam600/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam600_la_CPPFLAGS) $(CPPFLAGS) $(pccam600_la_CFLAGS) $(CFLAGS) -MT pccam600/la-library.lo -MD -MP -MF pccam600/$(DEPDIR)/la-library.Tpo -c -o pccam600/la-library.lo `test -f 'pccam600/library.c' || echo '$(srcdir)/'`pccam600/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pccam600/$(DEPDIR)/la-library.Tpo pccam600/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pccam600/library.c' object='pccam600/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pccam600_la_CPPFLAGS) $(CPPFLAGS) $(pccam600_la_CFLAGS) $(CFLAGS) -c -o pccam600/la-library.lo `test -f 'pccam600/library.c' || echo '$(srcdir)/'`pccam600/library.c
+
+pentax/la-pslr.lo: pentax/pslr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-pslr.lo -MD -MP -MF pentax/$(DEPDIR)/la-pslr.Tpo -c -o pentax/la-pslr.lo `test -f 'pentax/pslr.c' || echo '$(srcdir)/'`pentax/pslr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-pslr.Tpo pentax/$(DEPDIR)/la-pslr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr.c' object='pentax/la-pslr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-pslr.lo `test -f 'pentax/pslr.c' || echo '$(srcdir)/'`pentax/pslr.c
+
+pentax/la-library.lo: pentax/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-library.lo -MD -MP -MF pentax/$(DEPDIR)/la-library.Tpo -c -o pentax/la-library.lo `test -f 'pentax/library.c' || echo '$(srcdir)/'`pentax/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-library.Tpo pentax/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/library.c' object='pentax/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-library.lo `test -f 'pentax/library.c' || echo '$(srcdir)/'`pentax/library.c
+
+pentax/la-pslr_enum.lo: pentax/pslr_enum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-pslr_enum.lo -MD -MP -MF pentax/$(DEPDIR)/la-pslr_enum.Tpo -c -o pentax/la-pslr_enum.lo `test -f 'pentax/pslr_enum.c' || echo '$(srcdir)/'`pentax/pslr_enum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-pslr_enum.Tpo pentax/$(DEPDIR)/la-pslr_enum.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_enum.c' object='pentax/la-pslr_enum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-pslr_enum.lo `test -f 'pentax/pslr_enum.c' || echo '$(srcdir)/'`pentax/pslr_enum.c
+
+pentax/la-pslr_lens.lo: pentax/pslr_lens.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-pslr_lens.lo -MD -MP -MF pentax/$(DEPDIR)/la-pslr_lens.Tpo -c -o pentax/la-pslr_lens.lo `test -f 'pentax/pslr_lens.c' || echo '$(srcdir)/'`pentax/pslr_lens.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-pslr_lens.Tpo pentax/$(DEPDIR)/la-pslr_lens.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_lens.c' object='pentax/la-pslr_lens.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-pslr_lens.lo `test -f 'pentax/pslr_lens.c' || echo '$(srcdir)/'`pentax/pslr_lens.c
+
+pentax/la-pslr_model.lo: pentax/pslr_model.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-pslr_model.lo -MD -MP -MF pentax/$(DEPDIR)/la-pslr_model.Tpo -c -o pentax/la-pslr_model.lo `test -f 'pentax/pslr_model.c' || echo '$(srcdir)/'`pentax/pslr_model.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-pslr_model.Tpo pentax/$(DEPDIR)/la-pslr_model.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/pslr_model.c' object='pentax/la-pslr_model.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-pslr_model.lo `test -f 'pentax/pslr_model.c' || echo '$(srcdir)/'`pentax/pslr_model.c
+
+pentax/la-js0n.lo: pentax/js0n.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -MT pentax/la-js0n.lo -MD -MP -MF pentax/$(DEPDIR)/la-js0n.Tpo -c -o pentax/la-js0n.lo `test -f 'pentax/js0n.c' || echo '$(srcdir)/'`pentax/js0n.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pentax/$(DEPDIR)/la-js0n.Tpo pentax/$(DEPDIR)/la-js0n.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pentax/js0n.c' object='pentax/la-js0n.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pentax_la_CPPFLAGS) $(CPPFLAGS) $(pentax_la_CFLAGS) $(CFLAGS) -c -o pentax/la-js0n.lo `test -f 'pentax/js0n.c' || echo '$(srcdir)/'`pentax/js0n.c
+
+polaroid/pdc320_la-pdc320.lo: polaroid/pdc320.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc320_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc320_la_CFLAGS) $(CFLAGS) -MT polaroid/pdc320_la-pdc320.lo -MD -MP -MF polaroid/$(DEPDIR)/pdc320_la-pdc320.Tpo -c -o polaroid/pdc320_la-pdc320.lo `test -f 'polaroid/pdc320.c' || echo '$(srcdir)/'`polaroid/pdc320.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) polaroid/$(DEPDIR)/pdc320_la-pdc320.Tpo polaroid/$(DEPDIR)/pdc320_la-pdc320.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='polaroid/pdc320.c' object='polaroid/pdc320_la-pdc320.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc320_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc320_la_CFLAGS) $(CFLAGS) -c -o polaroid/pdc320_la-pdc320.lo `test -f 'polaroid/pdc320.c' || echo '$(srcdir)/'`polaroid/pdc320.c
+
+polaroid/pdc640_la-pdc640.lo: polaroid/pdc640.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -MT polaroid/pdc640_la-pdc640.lo -MD -MP -MF polaroid/$(DEPDIR)/pdc640_la-pdc640.Tpo -c -o polaroid/pdc640_la-pdc640.lo `test -f 'polaroid/pdc640.c' || echo '$(srcdir)/'`polaroid/pdc640.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) polaroid/$(DEPDIR)/pdc640_la-pdc640.Tpo polaroid/$(DEPDIR)/pdc640_la-pdc640.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='polaroid/pdc640.c' object='polaroid/pdc640_la-pdc640.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -c -o polaroid/pdc640_la-pdc640.lo `test -f 'polaroid/pdc640.c' || echo '$(srcdir)/'`polaroid/pdc640.c
+
+polaroid/pdc640_la-jd350e.lo: polaroid/jd350e.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -MT polaroid/pdc640_la-jd350e.lo -MD -MP -MF polaroid/$(DEPDIR)/pdc640_la-jd350e.Tpo -c -o polaroid/pdc640_la-jd350e.lo `test -f 'polaroid/jd350e.c' || echo '$(srcdir)/'`polaroid/jd350e.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) polaroid/$(DEPDIR)/pdc640_la-jd350e.Tpo polaroid/$(DEPDIR)/pdc640_la-jd350e.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='polaroid/jd350e.c' object='polaroid/pdc640_la-jd350e.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -c -o polaroid/pdc640_la-jd350e.lo `test -f 'polaroid/jd350e.c' || echo '$(srcdir)/'`polaroid/jd350e.c
+
+polaroid/pdc640_la-dlink350f.lo: polaroid/dlink350f.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -MT polaroid/pdc640_la-dlink350f.lo -MD -MP -MF polaroid/$(DEPDIR)/pdc640_la-dlink350f.Tpo -c -o polaroid/pdc640_la-dlink350f.lo `test -f 'polaroid/dlink350f.c' || echo '$(srcdir)/'`polaroid/dlink350f.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) polaroid/$(DEPDIR)/pdc640_la-dlink350f.Tpo polaroid/$(DEPDIR)/pdc640_la-dlink350f.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='polaroid/dlink350f.c' object='polaroid/pdc640_la-dlink350f.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc640_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc640_la_CFLAGS) $(CFLAGS) -c -o polaroid/pdc640_la-dlink350f.lo `test -f 'polaroid/dlink350f.c' || echo '$(srcdir)/'`polaroid/dlink350f.c
+
+polaroid/pdc700_la-pdc700.lo: polaroid/pdc700.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc700_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc700_la_CFLAGS) $(CFLAGS) -MT polaroid/pdc700_la-pdc700.lo -MD -MP -MF polaroid/$(DEPDIR)/pdc700_la-pdc700.Tpo -c -o polaroid/pdc700_la-pdc700.lo `test -f 'polaroid/pdc700.c' || echo '$(srcdir)/'`polaroid/pdc700.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) polaroid/$(DEPDIR)/pdc700_la-pdc700.Tpo polaroid/$(DEPDIR)/pdc700_la-pdc700.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='polaroid/pdc700.c' object='polaroid/pdc700_la-pdc700.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polaroid_pdc700_la_CPPFLAGS) $(CPPFLAGS) $(polaroid_pdc700_la_CFLAGS) $(CFLAGS) -c -o polaroid/pdc700_la-pdc700.lo `test -f 'polaroid/pdc700.c' || echo '$(srcdir)/'`polaroid/pdc700.c
+
+ptp2/la-ptp.lo: ptp2/ptp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-ptp.lo -MD -MP -MF ptp2/$(DEPDIR)/la-ptp.Tpo -c -o ptp2/la-ptp.lo `test -f 'ptp2/ptp.c' || echo '$(srcdir)/'`ptp2/ptp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-ptp.Tpo ptp2/$(DEPDIR)/la-ptp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/ptp.c' object='ptp2/la-ptp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-ptp.lo `test -f 'ptp2/ptp.c' || echo '$(srcdir)/'`ptp2/ptp.c
+
+ptp2/la-library.lo: ptp2/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-library.lo -MD -MP -MF ptp2/$(DEPDIR)/la-library.Tpo -c -o ptp2/la-library.lo `test -f 'ptp2/library.c' || echo '$(srcdir)/'`ptp2/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-library.Tpo ptp2/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/library.c' object='ptp2/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-library.lo `test -f 'ptp2/library.c' || echo '$(srcdir)/'`ptp2/library.c
+
+ptp2/la-usb.lo: ptp2/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-usb.lo -MD -MP -MF ptp2/$(DEPDIR)/la-usb.Tpo -c -o ptp2/la-usb.lo `test -f 'ptp2/usb.c' || echo '$(srcdir)/'`ptp2/usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-usb.Tpo ptp2/$(DEPDIR)/la-usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/usb.c' object='ptp2/la-usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-usb.lo `test -f 'ptp2/usb.c' || echo '$(srcdir)/'`ptp2/usb.c
+
+ptp2/la-ptpip.lo: ptp2/ptpip.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-ptpip.lo -MD -MP -MF ptp2/$(DEPDIR)/la-ptpip.Tpo -c -o ptp2/la-ptpip.lo `test -f 'ptp2/ptpip.c' || echo '$(srcdir)/'`ptp2/ptpip.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-ptpip.Tpo ptp2/$(DEPDIR)/la-ptpip.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/ptpip.c' object='ptp2/la-ptpip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-ptpip.lo `test -f 'ptp2/ptpip.c' || echo '$(srcdir)/'`ptp2/ptpip.c
+
+ptp2/la-config.lo: ptp2/config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-config.lo -MD -MP -MF ptp2/$(DEPDIR)/la-config.Tpo -c -o ptp2/la-config.lo `test -f 'ptp2/config.c' || echo '$(srcdir)/'`ptp2/config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-config.Tpo ptp2/$(DEPDIR)/la-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/config.c' object='ptp2/la-config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-config.lo `test -f 'ptp2/config.c' || echo '$(srcdir)/'`ptp2/config.c
+
+ptp2/la-olympus-wrap.lo: ptp2/olympus-wrap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-olympus-wrap.lo -MD -MP -MF ptp2/$(DEPDIR)/la-olympus-wrap.Tpo -c -o ptp2/la-olympus-wrap.lo `test -f 'ptp2/olympus-wrap.c' || echo '$(srcdir)/'`ptp2/olympus-wrap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-olympus-wrap.Tpo ptp2/$(DEPDIR)/la-olympus-wrap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/olympus-wrap.c' object='ptp2/la-olympus-wrap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-olympus-wrap.lo `test -f 'ptp2/olympus-wrap.c' || echo '$(srcdir)/'`ptp2/olympus-wrap.c
+
+ptp2/la-chdk.lo: ptp2/chdk.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-chdk.lo -MD -MP -MF ptp2/$(DEPDIR)/la-chdk.Tpo -c -o ptp2/la-chdk.lo `test -f 'ptp2/chdk.c' || echo '$(srcdir)/'`ptp2/chdk.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-chdk.Tpo ptp2/$(DEPDIR)/la-chdk.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/chdk.c' object='ptp2/la-chdk.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-chdk.lo `test -f 'ptp2/chdk.c' || echo '$(srcdir)/'`ptp2/chdk.c
+
+ptp2/la-fujiptpip.lo: ptp2/fujiptpip.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -MT ptp2/la-fujiptpip.lo -MD -MP -MF ptp2/$(DEPDIR)/la-fujiptpip.Tpo -c -o ptp2/la-fujiptpip.lo `test -f 'ptp2/fujiptpip.c' || echo '$(srcdir)/'`ptp2/fujiptpip.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptp2/$(DEPDIR)/la-fujiptpip.Tpo ptp2/$(DEPDIR)/la-fujiptpip.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptp2/fujiptpip.c' object='ptp2/la-fujiptpip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptp2_la_CPPFLAGS) $(CPPFLAGS) $(ptp2_la_CFLAGS) $(CFLAGS) -c -o ptp2/la-fujiptpip.lo `test -f 'ptp2/fujiptpip.c' || echo '$(srcdir)/'`ptp2/fujiptpip.c
+
+ricoh/la-library.lo: ricoh/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_la_CFLAGS) $(CFLAGS) -MT ricoh/la-library.lo -MD -MP -MF ricoh/$(DEPDIR)/la-library.Tpo -c -o ricoh/la-library.lo `test -f 'ricoh/library.c' || echo '$(srcdir)/'`ricoh/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ricoh/$(DEPDIR)/la-library.Tpo ricoh/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ricoh/library.c' object='ricoh/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_la_CFLAGS) $(CFLAGS) -c -o ricoh/la-library.lo `test -f 'ricoh/library.c' || echo '$(srcdir)/'`ricoh/library.c
+
+ricoh/la-ricoh.lo: ricoh/ricoh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_la_CFLAGS) $(CFLAGS) -MT ricoh/la-ricoh.lo -MD -MP -MF ricoh/$(DEPDIR)/la-ricoh.Tpo -c -o ricoh/la-ricoh.lo `test -f 'ricoh/ricoh.c' || echo '$(srcdir)/'`ricoh/ricoh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ricoh/$(DEPDIR)/la-ricoh.Tpo ricoh/$(DEPDIR)/la-ricoh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ricoh/ricoh.c' object='ricoh/la-ricoh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_la_CFLAGS) $(CFLAGS) -c -o ricoh/la-ricoh.lo `test -f 'ricoh/ricoh.c' || echo '$(srcdir)/'`ricoh/ricoh.c
+
+ricoh/g3_la-g3.lo: ricoh/g3.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_g3_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_g3_la_CFLAGS) $(CFLAGS) -MT ricoh/g3_la-g3.lo -MD -MP -MF ricoh/$(DEPDIR)/g3_la-g3.Tpo -c -o ricoh/g3_la-g3.lo `test -f 'ricoh/g3.c' || echo '$(srcdir)/'`ricoh/g3.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ricoh/$(DEPDIR)/g3_la-g3.Tpo ricoh/$(DEPDIR)/g3_la-g3.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ricoh/g3.c' object='ricoh/g3_la-g3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ricoh_g3_la_CPPFLAGS) $(CPPFLAGS) $(ricoh_g3_la_CFLAGS) $(CFLAGS) -c -o ricoh/g3_la-g3.lo `test -f 'ricoh/g3.c' || echo '$(srcdir)/'`ricoh/g3.c
+
+samsung/la-samsung.lo: samsung/samsung.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(samsung_la_CPPFLAGS) $(CPPFLAGS) $(samsung_la_CFLAGS) $(CFLAGS) -MT samsung/la-samsung.lo -MD -MP -MF samsung/$(DEPDIR)/la-samsung.Tpo -c -o samsung/la-samsung.lo `test -f 'samsung/samsung.c' || echo '$(srcdir)/'`samsung/samsung.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) samsung/$(DEPDIR)/la-samsung.Tpo samsung/$(DEPDIR)/la-samsung.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='samsung/samsung.c' object='samsung/la-samsung.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(samsung_la_CPPFLAGS) $(CPPFLAGS) $(samsung_la_CFLAGS) $(CFLAGS) -c -o samsung/la-samsung.lo `test -f 'samsung/samsung.c' || echo '$(srcdir)/'`samsung/samsung.c
+
+sierra/la-sierra.lo: sierra/sierra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-sierra.lo -MD -MP -MF sierra/$(DEPDIR)/la-sierra.Tpo -c -o sierra/la-sierra.lo `test -f 'sierra/sierra.c' || echo '$(srcdir)/'`sierra/sierra.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-sierra.Tpo sierra/$(DEPDIR)/la-sierra.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra.c' object='sierra/la-sierra.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-sierra.lo `test -f 'sierra/sierra.c' || echo '$(srcdir)/'`sierra/sierra.c
+
+sierra/la-library.lo: sierra/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-library.lo -MD -MP -MF sierra/$(DEPDIR)/la-library.Tpo -c -o sierra/la-library.lo `test -f 'sierra/library.c' || echo '$(srcdir)/'`sierra/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-library.Tpo sierra/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/library.c' object='sierra/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-library.lo `test -f 'sierra/library.c' || echo '$(srcdir)/'`sierra/library.c
+
+sierra/la-sierra-usbwrap.lo: sierra/sierra-usbwrap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-sierra-usbwrap.lo -MD -MP -MF sierra/$(DEPDIR)/la-sierra-usbwrap.Tpo -c -o sierra/la-sierra-usbwrap.lo `test -f 'sierra/sierra-usbwrap.c' || echo '$(srcdir)/'`sierra/sierra-usbwrap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-sierra-usbwrap.Tpo sierra/$(DEPDIR)/la-sierra-usbwrap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra-usbwrap.c' object='sierra/la-sierra-usbwrap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-sierra-usbwrap.lo `test -f 'sierra/sierra-usbwrap.c' || echo '$(srcdir)/'`sierra/sierra-usbwrap.c
+
+sierra/la-sierra-desc.lo: sierra/sierra-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-sierra-desc.lo -MD -MP -MF sierra/$(DEPDIR)/la-sierra-desc.Tpo -c -o sierra/la-sierra-desc.lo `test -f 'sierra/sierra-desc.c' || echo '$(srcdir)/'`sierra/sierra-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-sierra-desc.Tpo sierra/$(DEPDIR)/la-sierra-desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/sierra-desc.c' object='sierra/la-sierra-desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-sierra-desc.lo `test -f 'sierra/sierra-desc.c' || echo '$(srcdir)/'`sierra/sierra-desc.c
+
+sierra/la-nikon-desc.lo: sierra/nikon-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-nikon-desc.lo -MD -MP -MF sierra/$(DEPDIR)/la-nikon-desc.Tpo -c -o sierra/la-nikon-desc.lo `test -f 'sierra/nikon-desc.c' || echo '$(srcdir)/'`sierra/nikon-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-nikon-desc.Tpo sierra/$(DEPDIR)/la-nikon-desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/nikon-desc.c' object='sierra/la-nikon-desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-nikon-desc.lo `test -f 'sierra/nikon-desc.c' || echo '$(srcdir)/'`sierra/nikon-desc.c
+
+sierra/la-olympus-desc.lo: sierra/olympus-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-olympus-desc.lo -MD -MP -MF sierra/$(DEPDIR)/la-olympus-desc.Tpo -c -o sierra/la-olympus-desc.lo `test -f 'sierra/olympus-desc.c' || echo '$(srcdir)/'`sierra/olympus-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-olympus-desc.Tpo sierra/$(DEPDIR)/la-olympus-desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/olympus-desc.c' object='sierra/la-olympus-desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-olympus-desc.lo `test -f 'sierra/olympus-desc.c' || echo '$(srcdir)/'`sierra/olympus-desc.c
+
+sierra/la-epson-desc.lo: sierra/epson-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -MT sierra/la-epson-desc.lo -MD -MP -MF sierra/$(DEPDIR)/la-epson-desc.Tpo -c -o sierra/la-epson-desc.lo `test -f 'sierra/epson-desc.c' || echo '$(srcdir)/'`sierra/epson-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sierra/$(DEPDIR)/la-epson-desc.Tpo sierra/$(DEPDIR)/la-epson-desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sierra/epson-desc.c' object='sierra/la-epson-desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sierra_la_CPPFLAGS) $(CPPFLAGS) $(sierra_la_CFLAGS) $(CFLAGS) -c -o sierra/la-epson-desc.lo `test -f 'sierra/epson-desc.c' || echo '$(srcdir)/'`sierra/epson-desc.c
+
+sipix/blink_la-blink.lo: sipix/blink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_blink_la_CPPFLAGS) $(CPPFLAGS) $(sipix_blink_la_CFLAGS) $(CFLAGS) -MT sipix/blink_la-blink.lo -MD -MP -MF sipix/$(DEPDIR)/blink_la-blink.Tpo -c -o sipix/blink_la-blink.lo `test -f 'sipix/blink.c' || echo '$(srcdir)/'`sipix/blink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sipix/$(DEPDIR)/blink_la-blink.Tpo sipix/$(DEPDIR)/blink_la-blink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sipix/blink.c' object='sipix/blink_la-blink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_blink_la_CPPFLAGS) $(CPPFLAGS) $(sipix_blink_la_CFLAGS) $(CFLAGS) -c -o sipix/blink_la-blink.lo `test -f 'sipix/blink.c' || echo '$(srcdir)/'`sipix/blink.c
+
+sipix/blink2_la-blink2.lo: sipix/blink2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_blink2_la_CPPFLAGS) $(CPPFLAGS) $(sipix_blink2_la_CFLAGS) $(CFLAGS) -MT sipix/blink2_la-blink2.lo -MD -MP -MF sipix/$(DEPDIR)/blink2_la-blink2.Tpo -c -o sipix/blink2_la-blink2.lo `test -f 'sipix/blink2.c' || echo '$(srcdir)/'`sipix/blink2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sipix/$(DEPDIR)/blink2_la-blink2.Tpo sipix/$(DEPDIR)/blink2_la-blink2.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sipix/blink2.c' object='sipix/blink2_la-blink2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_blink2_la_CPPFLAGS) $(CPPFLAGS) $(sipix_blink2_la_CFLAGS) $(CFLAGS) -c -o sipix/blink2_la-blink2.lo `test -f 'sipix/blink2.c' || echo '$(srcdir)/'`sipix/blink2.c
+
+sipix/web2_la-web2.lo: sipix/web2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_web2_la_CPPFLAGS) $(CPPFLAGS) $(sipix_web2_la_CFLAGS) $(CFLAGS) -MT sipix/web2_la-web2.lo -MD -MP -MF sipix/$(DEPDIR)/web2_la-web2.Tpo -c -o sipix/web2_la-web2.lo `test -f 'sipix/web2.c' || echo '$(srcdir)/'`sipix/web2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sipix/$(DEPDIR)/web2_la-web2.Tpo sipix/$(DEPDIR)/web2_la-web2.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sipix/web2.c' object='sipix/web2_la-web2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sipix_web2_la_CPPFLAGS) $(CPPFLAGS) $(sipix_web2_la_CFLAGS) $(CFLAGS) -c -o sipix/web2_la-web2.lo `test -f 'sipix/web2.c' || echo '$(srcdir)/'`sipix/web2.c
+
+smal/la-smal.lo: smal/smal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(smal_la_CPPFLAGS) $(CPPFLAGS) $(smal_la_CFLAGS) $(CFLAGS) -MT smal/la-smal.lo -MD -MP -MF smal/$(DEPDIR)/la-smal.Tpo -c -o smal/la-smal.lo `test -f 'smal/smal.c' || echo '$(srcdir)/'`smal/smal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) smal/$(DEPDIR)/la-smal.Tpo smal/$(DEPDIR)/la-smal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='smal/smal.c' object='smal/la-smal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(smal_la_CPPFLAGS) $(CPPFLAGS) $(smal_la_CFLAGS) $(CFLAGS) -c -o smal/la-smal.lo `test -f 'smal/smal.c' || echo '$(srcdir)/'`smal/smal.c
+
+smal/la-ultrapocket.lo: smal/ultrapocket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(smal_la_CPPFLAGS) $(CPPFLAGS) $(smal_la_CFLAGS) $(CFLAGS) -MT smal/la-ultrapocket.lo -MD -MP -MF smal/$(DEPDIR)/la-ultrapocket.Tpo -c -o smal/la-ultrapocket.lo `test -f 'smal/ultrapocket.c' || echo '$(srcdir)/'`smal/ultrapocket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) smal/$(DEPDIR)/la-ultrapocket.Tpo smal/$(DEPDIR)/la-ultrapocket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='smal/ultrapocket.c' object='smal/la-ultrapocket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(smal_la_CPPFLAGS) $(CPPFLAGS) $(smal_la_CFLAGS) $(CFLAGS) -c -o smal/la-ultrapocket.lo `test -f 'smal/ultrapocket.c' || echo '$(srcdir)/'`smal/ultrapocket.c
+
+sonix/la-library.lo: sonix/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sonix_la_CPPFLAGS) $(CPPFLAGS) $(sonix_la_CFLAGS) $(CFLAGS) -MT sonix/la-library.lo -MD -MP -MF sonix/$(DEPDIR)/la-library.Tpo -c -o sonix/la-library.lo `test -f 'sonix/library.c' || echo '$(srcdir)/'`sonix/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonix/$(DEPDIR)/la-library.Tpo sonix/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonix/library.c' object='sonix/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sonix_la_CPPFLAGS) $(CPPFLAGS) $(sonix_la_CFLAGS) $(CFLAGS) -c -o sonix/la-library.lo `test -f 'sonix/library.c' || echo '$(srcdir)/'`sonix/library.c
+
+sonix/la-sonix.lo: sonix/sonix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sonix_la_CPPFLAGS) $(CPPFLAGS) $(sonix_la_CFLAGS) $(CFLAGS) -MT sonix/la-sonix.lo -MD -MP -MF sonix/$(DEPDIR)/la-sonix.Tpo -c -o sonix/la-sonix.lo `test -f 'sonix/sonix.c' || echo '$(srcdir)/'`sonix/sonix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonix/$(DEPDIR)/la-sonix.Tpo sonix/$(DEPDIR)/la-sonix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonix/sonix.c' object='sonix/la-sonix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sonix_la_CPPFLAGS) $(CPPFLAGS) $(sonix_la_CFLAGS) $(CFLAGS) -c -o sonix/la-sonix.lo `test -f 'sonix/sonix.c' || echo '$(srcdir)/'`sonix/sonix.c
+
+sonydscf1/sony_dscf1_la-command.lo: sonydscf1/command.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf1_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf1_la_CFLAGS) $(CFLAGS) -MT sonydscf1/sony_dscf1_la-command.lo -MD -MP -MF sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Tpo -c -o sonydscf1/sony_dscf1_la-command.lo `test -f 'sonydscf1/command.c' || echo '$(srcdir)/'`sonydscf1/command.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Tpo sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonydscf1/command.c' object='sonydscf1/sony_dscf1_la-command.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf1_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf1_la_CFLAGS) $(CFLAGS) -c -o sonydscf1/sony_dscf1_la-command.lo `test -f 'sonydscf1/command.c' || echo '$(srcdir)/'`sonydscf1/command.c
+
+sonydscf1/sony_dscf1_la-sonydscf1.lo: sonydscf1/sonydscf1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf1_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf1_la_CFLAGS) $(CFLAGS) -MT sonydscf1/sony_dscf1_la-sonydscf1.lo -MD -MP -MF sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Tpo -c -o sonydscf1/sony_dscf1_la-sonydscf1.lo `test -f 'sonydscf1/sonydscf1.c' || echo '$(srcdir)/'`sonydscf1/sonydscf1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Tpo sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonydscf1/sonydscf1.c' object='sonydscf1/sony_dscf1_la-sonydscf1.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf1_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf1_la_CFLAGS) $(CFLAGS) -c -o sonydscf1/sony_dscf1_la-sonydscf1.lo `test -f 'sonydscf1/sonydscf1.c' || echo '$(srcdir)/'`sonydscf1/sonydscf1.c
+
+sonydscf55/sony_dscf55_la-sony.lo: sonydscf55/sony.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf55_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf55_la_CFLAGS) $(CFLAGS) -MT sonydscf55/sony_dscf55_la-sony.lo -MD -MP -MF sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Tpo -c -o sonydscf55/sony_dscf55_la-sony.lo `test -f 'sonydscf55/sony.c' || echo '$(srcdir)/'`sonydscf55/sony.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Tpo sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonydscf55/sony.c' object='sonydscf55/sony_dscf55_la-sony.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf55_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf55_la_CFLAGS) $(CFLAGS) -c -o sonydscf55/sony_dscf55_la-sony.lo `test -f 'sonydscf55/sony.c' || echo '$(srcdir)/'`sonydscf55/sony.c
+
+sonydscf55/sony_dscf55_la-camera.lo: sonydscf55/camera.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf55_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf55_la_CFLAGS) $(CFLAGS) -MT sonydscf55/sony_dscf55_la-camera.lo -MD -MP -MF sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Tpo -c -o sonydscf55/sony_dscf55_la-camera.lo `test -f 'sonydscf55/camera.c' || echo '$(srcdir)/'`sonydscf55/camera.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Tpo sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sonydscf55/camera.c' object='sonydscf55/sony_dscf55_la-camera.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sony_dscf55_la_CPPFLAGS) $(CPPFLAGS) $(sony_dscf55_la_CFLAGS) $(CFLAGS) -c -o sonydscf55/sony_dscf55_la-camera.lo `test -f 'sonydscf55/camera.c' || echo '$(srcdir)/'`sonydscf55/camera.c
+
+soundvision/la-soundvision.lo: soundvision/soundvision.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -MT soundvision/la-soundvision.lo -MD -MP -MF soundvision/$(DEPDIR)/la-soundvision.Tpo -c -o soundvision/la-soundvision.lo `test -f 'soundvision/soundvision.c' || echo '$(srcdir)/'`soundvision/soundvision.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) soundvision/$(DEPDIR)/la-soundvision.Tpo soundvision/$(DEPDIR)/la-soundvision.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='soundvision/soundvision.c' object='soundvision/la-soundvision.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -c -o soundvision/la-soundvision.lo `test -f 'soundvision/soundvision.c' || echo '$(srcdir)/'`soundvision/soundvision.c
+
+soundvision/la-agfa_cl18.lo: soundvision/agfa_cl18.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -MT soundvision/la-agfa_cl18.lo -MD -MP -MF soundvision/$(DEPDIR)/la-agfa_cl18.Tpo -c -o soundvision/la-agfa_cl18.lo `test -f 'soundvision/agfa_cl18.c' || echo '$(srcdir)/'`soundvision/agfa_cl18.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) soundvision/$(DEPDIR)/la-agfa_cl18.Tpo soundvision/$(DEPDIR)/la-agfa_cl18.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='soundvision/agfa_cl18.c' object='soundvision/la-agfa_cl18.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -c -o soundvision/la-agfa_cl18.lo `test -f 'soundvision/agfa_cl18.c' || echo '$(srcdir)/'`soundvision/agfa_cl18.c
+
+soundvision/la-tiger_fastflicks.lo: soundvision/tiger_fastflicks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -MT soundvision/la-tiger_fastflicks.lo -MD -MP -MF soundvision/$(DEPDIR)/la-tiger_fastflicks.Tpo -c -o soundvision/la-tiger_fastflicks.lo `test -f 'soundvision/tiger_fastflicks.c' || echo '$(srcdir)/'`soundvision/tiger_fastflicks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) soundvision/$(DEPDIR)/la-tiger_fastflicks.Tpo soundvision/$(DEPDIR)/la-tiger_fastflicks.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='soundvision/tiger_fastflicks.c' object='soundvision/la-tiger_fastflicks.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -c -o soundvision/la-tiger_fastflicks.lo `test -f 'soundvision/tiger_fastflicks.c' || echo '$(srcdir)/'`soundvision/tiger_fastflicks.c
+
+soundvision/la-commands.lo: soundvision/commands.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -MT soundvision/la-commands.lo -MD -MP -MF soundvision/$(DEPDIR)/la-commands.Tpo -c -o soundvision/la-commands.lo `test -f 'soundvision/commands.c' || echo '$(srcdir)/'`soundvision/commands.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) soundvision/$(DEPDIR)/la-commands.Tpo soundvision/$(DEPDIR)/la-commands.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='soundvision/commands.c' object='soundvision/la-commands.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(soundvision_la_CPPFLAGS) $(CPPFLAGS) $(soundvision_la_CFLAGS) $(CFLAGS) -c -o soundvision/la-commands.lo `test -f 'soundvision/commands.c' || echo '$(srcdir)/'`soundvision/commands.c
+
+spca50x/la-spca50x.lo: spca50x/spca50x.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -MT spca50x/la-spca50x.lo -MD -MP -MF spca50x/$(DEPDIR)/la-spca50x.Tpo -c -o spca50x/la-spca50x.lo `test -f 'spca50x/spca50x.c' || echo '$(srcdir)/'`spca50x/spca50x.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) spca50x/$(DEPDIR)/la-spca50x.Tpo spca50x/$(DEPDIR)/la-spca50x.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spca50x/spca50x.c' object='spca50x/la-spca50x.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -c -o spca50x/la-spca50x.lo `test -f 'spca50x/spca50x.c' || echo '$(srcdir)/'`spca50x/spca50x.c
+
+spca50x/la-spca50x-flash.lo: spca50x/spca50x-flash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -MT spca50x/la-spca50x-flash.lo -MD -MP -MF spca50x/$(DEPDIR)/la-spca50x-flash.Tpo -c -o spca50x/la-spca50x-flash.lo `test -f 'spca50x/spca50x-flash.c' || echo '$(srcdir)/'`spca50x/spca50x-flash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) spca50x/$(DEPDIR)/la-spca50x-flash.Tpo spca50x/$(DEPDIR)/la-spca50x-flash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spca50x/spca50x-flash.c' object='spca50x/la-spca50x-flash.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -c -o spca50x/la-spca50x-flash.lo `test -f 'spca50x/spca50x-flash.c' || echo '$(srcdir)/'`spca50x/spca50x-flash.c
+
+spca50x/la-spca50x-sdram.lo: spca50x/spca50x-sdram.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -MT spca50x/la-spca50x-sdram.lo -MD -MP -MF spca50x/$(DEPDIR)/la-spca50x-sdram.Tpo -c -o spca50x/la-spca50x-sdram.lo `test -f 'spca50x/spca50x-sdram.c' || echo '$(srcdir)/'`spca50x/spca50x-sdram.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) spca50x/$(DEPDIR)/la-spca50x-sdram.Tpo spca50x/$(DEPDIR)/la-spca50x-sdram.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spca50x/spca50x-sdram.c' object='spca50x/la-spca50x-sdram.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -c -o spca50x/la-spca50x-sdram.lo `test -f 'spca50x/spca50x-sdram.c' || echo '$(srcdir)/'`spca50x/spca50x-sdram.c
+
+spca50x/la-library.lo: spca50x/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -MT spca50x/la-library.lo -MD -MP -MF spca50x/$(DEPDIR)/la-library.Tpo -c -o spca50x/la-library.lo `test -f 'spca50x/library.c' || echo '$(srcdir)/'`spca50x/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) spca50x/$(DEPDIR)/la-library.Tpo spca50x/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='spca50x/library.c' object='spca50x/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spca50x_la_CPPFLAGS) $(CPPFLAGS) $(spca50x_la_CFLAGS) $(CFLAGS) -c -o spca50x/la-library.lo `test -f 'spca50x/library.c' || echo '$(srcdir)/'`spca50x/library.c
+
+sq905/la-library.lo: sq905/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -MT sq905/la-library.lo -MD -MP -MF sq905/$(DEPDIR)/la-library.Tpo -c -o sq905/la-library.lo `test -f 'sq905/library.c' || echo '$(srcdir)/'`sq905/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sq905/$(DEPDIR)/la-library.Tpo sq905/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sq905/library.c' object='sq905/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -c -o sq905/la-library.lo `test -f 'sq905/library.c' || echo '$(srcdir)/'`sq905/library.c
+
+sq905/la-sq905.lo: sq905/sq905.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -MT sq905/la-sq905.lo -MD -MP -MF sq905/$(DEPDIR)/la-sq905.Tpo -c -o sq905/la-sq905.lo `test -f 'sq905/sq905.c' || echo '$(srcdir)/'`sq905/sq905.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sq905/$(DEPDIR)/la-sq905.Tpo sq905/$(DEPDIR)/la-sq905.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sq905/sq905.c' object='sq905/la-sq905.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -c -o sq905/la-sq905.lo `test -f 'sq905/sq905.c' || echo '$(srcdir)/'`sq905/sq905.c
+
+sq905/la-postprocess.lo: sq905/postprocess.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -MT sq905/la-postprocess.lo -MD -MP -MF sq905/$(DEPDIR)/la-postprocess.Tpo -c -o sq905/la-postprocess.lo `test -f 'sq905/postprocess.c' || echo '$(srcdir)/'`sq905/postprocess.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sq905/$(DEPDIR)/la-postprocess.Tpo sq905/$(DEPDIR)/la-postprocess.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sq905/postprocess.c' object='sq905/la-postprocess.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sq905_la_CPPFLAGS) $(CPPFLAGS) $(sq905_la_CFLAGS) $(CFLAGS) -c -o sq905/la-postprocess.lo `test -f 'sq905/postprocess.c' || echo '$(srcdir)/'`sq905/postprocess.c
+
+st2205/la-library.lo: st2205/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/la-library.lo -MD -MP -MF st2205/$(DEPDIR)/la-library.Tpo -c -o st2205/la-library.lo `test -f 'st2205/library.c' || echo '$(srcdir)/'`st2205/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/la-library.Tpo st2205/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/library.c' object='st2205/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/la-library.lo `test -f 'st2205/library.c' || echo '$(srcdir)/'`st2205/library.c
+
+st2205/la-st2205.lo: st2205/st2205.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/la-st2205.lo -MD -MP -MF st2205/$(DEPDIR)/la-st2205.Tpo -c -o st2205/la-st2205.lo `test -f 'st2205/st2205.c' || echo '$(srcdir)/'`st2205/st2205.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/la-st2205.Tpo st2205/$(DEPDIR)/la-st2205.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205.c' object='st2205/la-st2205.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/la-st2205.lo `test -f 'st2205/st2205.c' || echo '$(srcdir)/'`st2205/st2205.c
+
+st2205/la-st2205_decode.lo: st2205/st2205_decode.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/la-st2205_decode.lo -MD -MP -MF st2205/$(DEPDIR)/la-st2205_decode.Tpo -c -o st2205/la-st2205_decode.lo `test -f 'st2205/st2205_decode.c' || echo '$(srcdir)/'`st2205/st2205_decode.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/la-st2205_decode.Tpo st2205/$(DEPDIR)/la-st2205_decode.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205_decode.c' object='st2205/la-st2205_decode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/la-st2205_decode.lo `test -f 'st2205/st2205_decode.c' || echo '$(srcdir)/'`st2205/st2205_decode.c
+
+st2205/la-st2205_tables.lo: st2205/st2205_tables.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -MT st2205/la-st2205_tables.lo -MD -MP -MF st2205/$(DEPDIR)/la-st2205_tables.Tpo -c -o st2205/la-st2205_tables.lo `test -f 'st2205/st2205_tables.c' || echo '$(srcdir)/'`st2205/st2205_tables.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) st2205/$(DEPDIR)/la-st2205_tables.Tpo st2205/$(DEPDIR)/la-st2205_tables.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='st2205/st2205_tables.c' object='st2205/la-st2205_tables.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(st2205_la_CPPFLAGS) $(CPPFLAGS) $(st2205_la_CFLAGS) $(CFLAGS) -c -o st2205/la-st2205_tables.lo `test -f 'st2205/st2205_tables.c' || echo '$(srcdir)/'`st2205/st2205_tables.c
+
+stv0674/la-stv0674.lo: stv0674/stv0674.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0674_la_CPPFLAGS) $(CPPFLAGS) $(stv0674_la_CFLAGS) $(CFLAGS) -MT stv0674/la-stv0674.lo -MD -MP -MF stv0674/$(DEPDIR)/la-stv0674.Tpo -c -o stv0674/la-stv0674.lo `test -f 'stv0674/stv0674.c' || echo '$(srcdir)/'`stv0674/stv0674.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0674/$(DEPDIR)/la-stv0674.Tpo stv0674/$(DEPDIR)/la-stv0674.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0674/stv0674.c' object='stv0674/la-stv0674.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0674_la_CPPFLAGS) $(CPPFLAGS) $(stv0674_la_CFLAGS) $(CFLAGS) -c -o stv0674/la-stv0674.lo `test -f 'stv0674/stv0674.c' || echo '$(srcdir)/'`stv0674/stv0674.c
+
+stv0674/la-library.lo: stv0674/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0674_la_CPPFLAGS) $(CPPFLAGS) $(stv0674_la_CFLAGS) $(CFLAGS) -MT stv0674/la-library.lo -MD -MP -MF stv0674/$(DEPDIR)/la-library.Tpo -c -o stv0674/la-library.lo `test -f 'stv0674/library.c' || echo '$(srcdir)/'`stv0674/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0674/$(DEPDIR)/la-library.Tpo stv0674/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0674/library.c' object='stv0674/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0674_la_CPPFLAGS) $(CPPFLAGS) $(stv0674_la_CFLAGS) $(CFLAGS) -c -o stv0674/la-library.lo `test -f 'stv0674/library.c' || echo '$(srcdir)/'`stv0674/library.c
+
+stv0680/la-stv0680.lo: stv0680/stv0680.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-stv0680.lo -MD -MP -MF stv0680/$(DEPDIR)/la-stv0680.Tpo -c -o stv0680/la-stv0680.lo `test -f 'stv0680/stv0680.c' || echo '$(srcdir)/'`stv0680/stv0680.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-stv0680.Tpo stv0680/$(DEPDIR)/la-stv0680.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/stv0680.c' object='stv0680/la-stv0680.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-stv0680.lo `test -f 'stv0680/stv0680.c' || echo '$(srcdir)/'`stv0680/stv0680.c
+
+stv0680/la-library.lo: stv0680/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-library.lo -MD -MP -MF stv0680/$(DEPDIR)/la-library.Tpo -c -o stv0680/la-library.lo `test -f 'stv0680/library.c' || echo '$(srcdir)/'`stv0680/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-library.Tpo stv0680/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/library.c' object='stv0680/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-library.lo `test -f 'stv0680/library.c' || echo '$(srcdir)/'`stv0680/library.c
+
+stv0680/la-stv0680-bayer.lo: stv0680/stv0680-bayer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-stv0680-bayer.lo -MD -MP -MF stv0680/$(DEPDIR)/la-stv0680-bayer.Tpo -c -o stv0680/la-stv0680-bayer.lo `test -f 'stv0680/stv0680-bayer.c' || echo '$(srcdir)/'`stv0680/stv0680-bayer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-stv0680-bayer.Tpo stv0680/$(DEPDIR)/la-stv0680-bayer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/stv0680-bayer.c' object='stv0680/la-stv0680-bayer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-stv0680-bayer.lo `test -f 'stv0680/stv0680-bayer.c' || echo '$(srcdir)/'`stv0680/stv0680-bayer.c
+
+stv0680/la-sharpen.lo: stv0680/sharpen.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-sharpen.lo -MD -MP -MF stv0680/$(DEPDIR)/la-sharpen.Tpo -c -o stv0680/la-sharpen.lo `test -f 'stv0680/sharpen.c' || echo '$(srcdir)/'`stv0680/sharpen.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-sharpen.Tpo stv0680/$(DEPDIR)/la-sharpen.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/sharpen.c' object='stv0680/la-sharpen.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-sharpen.lo `test -f 'stv0680/sharpen.c' || echo '$(srcdir)/'`stv0680/sharpen.c
+
+stv0680/la-saturate.lo: stv0680/saturate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-saturate.lo -MD -MP -MF stv0680/$(DEPDIR)/la-saturate.Tpo -c -o stv0680/la-saturate.lo `test -f 'stv0680/saturate.c' || echo '$(srcdir)/'`stv0680/saturate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-saturate.Tpo stv0680/$(DEPDIR)/la-saturate.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/saturate.c' object='stv0680/la-saturate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-saturate.lo `test -f 'stv0680/saturate.c' || echo '$(srcdir)/'`stv0680/saturate.c
+
+stv0680/la-demosaic_sharpen.lo: stv0680/demosaic_sharpen.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -MT stv0680/la-demosaic_sharpen.lo -MD -MP -MF stv0680/$(DEPDIR)/la-demosaic_sharpen.Tpo -c -o stv0680/la-demosaic_sharpen.lo `test -f 'stv0680/demosaic_sharpen.c' || echo '$(srcdir)/'`stv0680/demosaic_sharpen.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) stv0680/$(DEPDIR)/la-demosaic_sharpen.Tpo stv0680/$(DEPDIR)/la-demosaic_sharpen.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stv0680/demosaic_sharpen.c' object='stv0680/la-demosaic_sharpen.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stv0680_la_CPPFLAGS) $(CPPFLAGS) $(stv0680_la_CFLAGS) $(CFLAGS) -c -o stv0680/la-demosaic_sharpen.lo `test -f 'stv0680/demosaic_sharpen.c' || echo '$(srcdir)/'`stv0680/demosaic_sharpen.c
+
+sx330z/la-library.lo: sx330z/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sx330z_la_CPPFLAGS) $(CPPFLAGS) $(sx330z_la_CFLAGS) $(CFLAGS) -MT sx330z/la-library.lo -MD -MP -MF sx330z/$(DEPDIR)/la-library.Tpo -c -o sx330z/la-library.lo `test -f 'sx330z/library.c' || echo '$(srcdir)/'`sx330z/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sx330z/$(DEPDIR)/la-library.Tpo sx330z/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sx330z/library.c' object='sx330z/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sx330z_la_CPPFLAGS) $(CPPFLAGS) $(sx330z_la_CFLAGS) $(CFLAGS) -c -o sx330z/la-library.lo `test -f 'sx330z/library.c' || echo '$(srcdir)/'`sx330z/library.c
+
+sx330z/la-sx330z.lo: sx330z/sx330z.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sx330z_la_CPPFLAGS) $(CPPFLAGS) $(sx330z_la_CFLAGS) $(CFLAGS) -MT sx330z/la-sx330z.lo -MD -MP -MF sx330z/$(DEPDIR)/la-sx330z.Tpo -c -o sx330z/la-sx330z.lo `test -f 'sx330z/sx330z.c' || echo '$(srcdir)/'`sx330z/sx330z.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) sx330z/$(DEPDIR)/la-sx330z.Tpo sx330z/$(DEPDIR)/la-sx330z.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sx330z/sx330z.c' object='sx330z/la-sx330z.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sx330z_la_CPPFLAGS) $(CPPFLAGS) $(sx330z_la_CFLAGS) $(CFLAGS) -c -o sx330z/la-sx330z.lo `test -f 'sx330z/sx330z.c' || echo '$(srcdir)/'`sx330z/sx330z.c
+
+template/la-template.lo: template/template.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(template_la_CPPFLAGS) $(CPPFLAGS) $(template_la_CFLAGS) $(CFLAGS) -MT template/la-template.lo -MD -MP -MF template/$(DEPDIR)/la-template.Tpo -c -o template/la-template.lo `test -f 'template/template.c' || echo '$(srcdir)/'`template/template.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) template/$(DEPDIR)/la-template.Tpo template/$(DEPDIR)/la-template.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='template/template.c' object='template/la-template.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(template_la_CPPFLAGS) $(CPPFLAGS) $(template_la_CFLAGS) $(CFLAGS) -c -o template/la-template.lo `test -f 'template/template.c' || echo '$(srcdir)/'`template/template.c
+
+topfield/la-crc16.lo: topfield/crc16.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -MT topfield/la-crc16.lo -MD -MP -MF topfield/$(DEPDIR)/la-crc16.Tpo -c -o topfield/la-crc16.lo `test -f 'topfield/crc16.c' || echo '$(srcdir)/'`topfield/crc16.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) topfield/$(DEPDIR)/la-crc16.Tpo topfield/$(DEPDIR)/la-crc16.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='topfield/crc16.c' object='topfield/la-crc16.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -c -o topfield/la-crc16.lo `test -f 'topfield/crc16.c' || echo '$(srcdir)/'`topfield/crc16.c
+
+topfield/la-tf_bytes.lo: topfield/tf_bytes.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -MT topfield/la-tf_bytes.lo -MD -MP -MF topfield/$(DEPDIR)/la-tf_bytes.Tpo -c -o topfield/la-tf_bytes.lo `test -f 'topfield/tf_bytes.c' || echo '$(srcdir)/'`topfield/tf_bytes.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) topfield/$(DEPDIR)/la-tf_bytes.Tpo topfield/$(DEPDIR)/la-tf_bytes.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='topfield/tf_bytes.c' object='topfield/la-tf_bytes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -c -o topfield/la-tf_bytes.lo `test -f 'topfield/tf_bytes.c' || echo '$(srcdir)/'`topfield/tf_bytes.c
+
+topfield/la-mjd.lo: topfield/mjd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -MT topfield/la-mjd.lo -MD -MP -MF topfield/$(DEPDIR)/la-mjd.Tpo -c -o topfield/la-mjd.lo `test -f 'topfield/mjd.c' || echo '$(srcdir)/'`topfield/mjd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) topfield/$(DEPDIR)/la-mjd.Tpo topfield/$(DEPDIR)/la-mjd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='topfield/mjd.c' object='topfield/la-mjd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -c -o topfield/la-mjd.lo `test -f 'topfield/mjd.c' || echo '$(srcdir)/'`topfield/mjd.c
+
+topfield/la-puppy.lo: topfield/puppy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -MT topfield/la-puppy.lo -MD -MP -MF topfield/$(DEPDIR)/la-puppy.Tpo -c -o topfield/la-puppy.lo `test -f 'topfield/puppy.c' || echo '$(srcdir)/'`topfield/puppy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) topfield/$(DEPDIR)/la-puppy.Tpo topfield/$(DEPDIR)/la-puppy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='topfield/puppy.c' object='topfield/la-puppy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -c -o topfield/la-puppy.lo `test -f 'topfield/puppy.c' || echo '$(srcdir)/'`topfield/puppy.c
+
+topfield/la-usb_io.lo: topfield/usb_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -MT topfield/la-usb_io.lo -MD -MP -MF topfield/$(DEPDIR)/la-usb_io.Tpo -c -o topfield/la-usb_io.lo `test -f 'topfield/usb_io.c' || echo '$(srcdir)/'`topfield/usb_io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) topfield/$(DEPDIR)/la-usb_io.Tpo topfield/$(DEPDIR)/la-usb_io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='topfield/usb_io.c' object='topfield/la-usb_io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(topfield_la_CPPFLAGS) $(CPPFLAGS) $(topfield_la_CFLAGS) $(CFLAGS) -c -o topfield/la-usb_io.lo `test -f 'topfield/usb_io.c' || echo '$(srcdir)/'`topfield/usb_io.c
+
+toshiba/pdrm11/la-library.lo: toshiba/pdrm11/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(toshiba_pdrm11_la_CPPFLAGS) $(CPPFLAGS) $(toshiba_pdrm11_la_CFLAGS) $(CFLAGS) -MT toshiba/pdrm11/la-library.lo -MD -MP -MF toshiba/pdrm11/$(DEPDIR)/la-library.Tpo -c -o toshiba/pdrm11/la-library.lo `test -f 'toshiba/pdrm11/library.c' || echo '$(srcdir)/'`toshiba/pdrm11/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) toshiba/pdrm11/$(DEPDIR)/la-library.Tpo toshiba/pdrm11/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='toshiba/pdrm11/library.c' object='toshiba/pdrm11/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(toshiba_pdrm11_la_CPPFLAGS) $(CPPFLAGS) $(toshiba_pdrm11_la_CFLAGS) $(CFLAGS) -c -o toshiba/pdrm11/la-library.lo `test -f 'toshiba/pdrm11/library.c' || echo '$(srcdir)/'`toshiba/pdrm11/library.c
+
+toshiba/pdrm11/la-pdrm11.lo: toshiba/pdrm11/pdrm11.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(toshiba_pdrm11_la_CPPFLAGS) $(CPPFLAGS) $(toshiba_pdrm11_la_CFLAGS) $(CFLAGS) -MT toshiba/pdrm11/la-pdrm11.lo -MD -MP -MF toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Tpo -c -o toshiba/pdrm11/la-pdrm11.lo `test -f 'toshiba/pdrm11/pdrm11.c' || echo '$(srcdir)/'`toshiba/pdrm11/pdrm11.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Tpo toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='toshiba/pdrm11/pdrm11.c' object='toshiba/pdrm11/la-pdrm11.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(toshiba_pdrm11_la_CPPFLAGS) $(CPPFLAGS) $(toshiba_pdrm11_la_CFLAGS) $(CFLAGS) -c -o toshiba/pdrm11/la-pdrm11.lo `test -f 'toshiba/pdrm11/pdrm11.c' || echo '$(srcdir)/'`toshiba/pdrm11/pdrm11.c
+
+tp6801/la-library.lo: tp6801/library.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tp6801_la_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -MT tp6801/la-library.lo -MD -MP -MF tp6801/$(DEPDIR)/la-library.Tpo -c -o tp6801/la-library.lo `test -f 'tp6801/library.c' || echo '$(srcdir)/'`tp6801/library.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tp6801/$(DEPDIR)/la-library.Tpo tp6801/$(DEPDIR)/la-library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tp6801/library.c' object='tp6801/la-library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tp6801_la_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -c -o tp6801/la-library.lo `test -f 'tp6801/library.c' || echo '$(srcdir)/'`tp6801/library.c
+
+tp6801/la-tp6801.lo: tp6801/tp6801.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tp6801_la_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -MT tp6801/la-tp6801.lo -MD -MP -MF tp6801/$(DEPDIR)/la-tp6801.Tpo -c -o tp6801/la-tp6801.lo `test -f 'tp6801/tp6801.c' || echo '$(srcdir)/'`tp6801/tp6801.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tp6801/$(DEPDIR)/la-tp6801.Tpo tp6801/$(DEPDIR)/la-tp6801.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tp6801/tp6801.c' object='tp6801/la-tp6801.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tp6801_la_CPPFLAGS) $(CPPFLAGS) $(tp6801_la_CFLAGS) $(CFLAGS) -c -o tp6801/la-tp6801.lo `test -f 'tp6801/tp6801.c' || echo '$(srcdir)/'`tp6801/tp6801.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -3336,6 +4679,7 @@
 	-rm -rf digita/.libs digita/_libs
 	-rm -rf dimera/.libs dimera/_libs
 	-rm -rf directory/.libs directory/_libs
+	-rm -rf docupen/.libs docupen/_libs
 	-rm -rf enigma13/.libs enigma13/_libs
 	-rm -rf fuji/.libs fuji/_libs
 	-rm -rf gsmart300/.libs gsmart300/_libs
@@ -3353,6 +4697,7 @@
 	-rm -rf konica/.libs konica/_libs
 	-rm -rf largan/lmini/.libs largan/lmini/_libs
 	-rm -rf lg_gsm/.libs lg_gsm/_libs
+	-rm -rf lumix/.libs lumix/_libs
 	-rm -rf mars/.libs mars/_libs
 	-rm -rf minolta/dimagev/.libs minolta/dimagev/_libs
 	-rm -rf mustek/.libs mustek/_libs
@@ -3404,6 +4749,27 @@
 	@list='$(camlibdoc_DATA)'; test -n "$(camlibdocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(camlibdocdir)'; $(am__uninstall_files_from_dir)
+install-dist_konicalocalizationDATA: $(dist_konicalocalization_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_konicalocalization_DATA)'; test -n "$(konicalocalizationdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(konicalocalizationdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(konicalocalizationdir)" || exit 1; \
+	fi; \
+	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)$(konicalocalizationdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(konicalocalizationdir)" || exit $$?; \
+	done
+
+uninstall-dist_konicalocalizationDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_konicalocalization_DATA)'; test -n "$(konicalocalizationdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(konicalocalizationdir)'; $(am__uninstall_files_from_dir)
 install-localizationDATA: $(localization_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(localization_DATA)'; test -n "$(localizationdir)" || list=; \
@@ -3524,8 +4890,10 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -3585,7 +4953,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(camlibdir)" "$(DESTDIR)$(camlibdocdir)" "$(DESTDIR)$(localizationdir)"; do \
+	for dir in "$(DESTDIR)$(camlibdir)" "$(DESTDIR)$(camlibdocdir)" "$(DESTDIR)$(konicalocalizationdir)" "$(DESTDIR)$(localizationdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -3639,6 +5007,8 @@
 	-rm -f dimera/$(am__dirstamp)
 	-rm -f directory/$(DEPDIR)/$(am__dirstamp)
 	-rm -f directory/$(am__dirstamp)
+	-rm -f docupen/$(DEPDIR)/$(am__dirstamp)
+	-rm -f docupen/$(am__dirstamp)
 	-rm -f enigma13/$(DEPDIR)/$(am__dirstamp)
 	-rm -f enigma13/$(am__dirstamp)
 	-rm -f fuji/$(DEPDIR)/$(am__dirstamp)
@@ -3673,6 +5043,8 @@
 	-rm -f largan/lmini/$(am__dirstamp)
 	-rm -f lg_gsm/$(DEPDIR)/$(am__dirstamp)
 	-rm -f lg_gsm/$(am__dirstamp)
+	-rm -f lumix/$(DEPDIR)/$(am__dirstamp)
+	-rm -f lumix/$(am__dirstamp)
 	-rm -f mars/$(DEPDIR)/$(am__dirstamp)
 	-rm -f mars/$(am__dirstamp)
 	-rm -f minolta/dimagev/$(DEPDIR)/$(am__dirstamp)
@@ -3743,7 +5115,190 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf adc65/$(DEPDIR) agfa-cl20/$(DEPDIR) aox/$(DEPDIR) ax203/$(DEPDIR) barbie/$(DEPDIR) canon/$(DEPDIR) casio/$(DEPDIR) clicksmart310/$(DEPDIR) digigr8/$(DEPDIR) digita/$(DEPDIR) dimera/$(DEPDIR) directory/$(DEPDIR) enigma13/$(DEPDIR) fuji/$(DEPDIR) gsmart300/$(DEPDIR) hp215/$(DEPDIR) iclick/$(DEPDIR) jamcam/$(DEPDIR) jd11/$(DEPDIR) jl2005a/$(DEPDIR) jl2005c/$(DEPDIR) kodak/dc120/$(DEPDIR) kodak/dc210/$(DEPDIR) kodak/dc240/$(DEPDIR) kodak/dc3200/$(DEPDIR) kodak/ez200/$(DEPDIR) konica/$(DEPDIR) largan/lmini/$(DEPDIR) lg_gsm/$(DEPDIR) mars/$(DEPDIR) minolta/dimagev/$(DEPDIR) mustek/$(DEPDIR) panasonic/$(DEPDIR) panasonic/coolshot/$(DEPDIR) panasonic/l859/$(DEPDIR) pccam300/$(DEPDIR) pccam600/$(DEPDIR) pentax/$(DEPDIR) polaroid/$(DEPDIR) ptp2/$(DEPDIR) ricoh/$(DEPDIR) samsung/$(DEPDIR) sierra/$(DEPDIR) sipix/$(DEPDIR) smal/$(DEPDIR) sonix/$(DEPDIR) sonydscf1/$(DEPDIR) sonydscf55/$(DEPDIR) soundvision/$(DEPDIR) spca50x/$(DEPDIR) sq905/$(DEPDIR) st2205/$(DEPDIR) stv0674/$(DEPDIR) stv0680/$(DEPDIR) sx330z/$(DEPDIR) template/$(DEPDIR) topfield/$(DEPDIR) toshiba/pdrm11/$(DEPDIR) tp6801/$(DEPDIR)
+		-rm -f adc65/$(DEPDIR)/la-adc65.Plo
+	-rm -f agfa-cl20/$(DEPDIR)/la-agfa_cl20.Plo
+	-rm -f aox/$(DEPDIR)/la-aox.Plo
+	-rm -f aox/$(DEPDIR)/la-library.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_compress_jpeg.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_decode_yuv.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Plo
+	-rm -f ax203/$(DEPDIR)/la-jidctflt.Plo
+	-rm -f ax203/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+	-rm -f ax203/$(DEPDIR)/la-library.Plo
+	-rm -f ax203/$(DEPDIR)/la-tinyjpeg.Plo
+	-rm -f barbie/$(DEPDIR)/la-barbie.Plo
+	-rm -f canon/$(DEPDIR)/la-canon.Plo
+	-rm -f canon/$(DEPDIR)/la-crc.Plo
+	-rm -f canon/$(DEPDIR)/la-library.Plo
+	-rm -f canon/$(DEPDIR)/la-serial.Plo
+	-rm -f canon/$(DEPDIR)/la-usb.Plo
+	-rm -f canon/$(DEPDIR)/la-util.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-camtojpeg.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-casio-qv-commands.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-casio-qv.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-ycctoppm.Plo
+	-rm -f clicksmart310/$(DEPDIR)/la-clicksmart.Plo
+	-rm -f clicksmart310/$(DEPDIR)/la-library.Plo
+	-rm -f digigr8/$(DEPDIR)/la-digi_postprocess.Plo
+	-rm -f digigr8/$(DEPDIR)/la-digigr8.Plo
+	-rm -f digigr8/$(DEPDIR)/la-library.Plo
+	-rm -f digita/$(DEPDIR)/la-commands.Plo
+	-rm -f digita/$(DEPDIR)/la-digita.Plo
+	-rm -f digita/$(DEPDIR)/la-serial.Plo
+	-rm -f digita/$(DEPDIR)/la-usb.Plo
+	-rm -f dimera/$(DEPDIR)/dimera3500_la-dimera3500.Plo
+	-rm -f dimera/$(DEPDIR)/dimera3500_la-mesalib.Plo
+	-rm -f directory/$(DEPDIR)/la-directory.Plo
+	-rm -f docupen/$(DEPDIR)/la-cache.Plo
+	-rm -f docupen/$(DEPDIR)/la-calibration.Plo
+	-rm -f docupen/$(DEPDIR)/la-docupen.Plo
+	-rm -f docupen/$(DEPDIR)/la-huffman.Plo
+	-rm -f docupen/$(DEPDIR)/la-image.Plo
+	-rm -f enigma13/$(DEPDIR)/la-enigma13.Plo
+	-rm -f fuji/$(DEPDIR)/la-fuji.Plo
+	-rm -f fuji/$(DEPDIR)/la-library.Plo
+	-rm -f gsmart300/$(DEPDIR)/la-gsmart300.Plo
+	-rm -f gsmart300/$(DEPDIR)/la-library.Plo
+	-rm -f hp215/$(DEPDIR)/la-hp215.Plo
+	-rm -f iclick/$(DEPDIR)/la-iclick.Plo
+	-rm -f iclick/$(DEPDIR)/la-library.Plo
+	-rm -f jamcam/$(DEPDIR)/la-jamcam.Plo
+	-rm -f jamcam/$(DEPDIR)/la-library.Plo
+	-rm -f jd11/$(DEPDIR)/la-decomp.Plo
+	-rm -f jd11/$(DEPDIR)/la-jd11.Plo
+	-rm -f jd11/$(DEPDIR)/la-serial.Plo
+	-rm -f jl2005a/$(DEPDIR)/la-jl2005a.Plo
+	-rm -f jl2005a/$(DEPDIR)/la-library.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-img_enhance.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jl2005c.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc120/$(DEPDIR)/la-dc120.Plo
+	-rm -f kodak/dc120/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc210/$(DEPDIR)/la-dc210.Plo
+	-rm -f kodak/dc210/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc240/$(DEPDIR)/la-dc240.Plo
+	-rm -f kodak/dc240/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc3200/$(DEPDIR)/la-dc3200.Plo
+	-rm -f kodak/dc3200/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/ez200/$(DEPDIR)/la-ez200.Plo
+	-rm -f konica/$(DEPDIR)/la-konica.Plo
+	-rm -f konica/$(DEPDIR)/la-library.Plo
+	-rm -f konica/$(DEPDIR)/la-lowlevel.Plo
+	-rm -f konica/$(DEPDIR)/qm150_la-qm150.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-largan.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-lmini.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-lmini_ccd.Plo
+	-rm -f lg_gsm/$(DEPDIR)/la-lg_gsm.Plo
+	-rm -f lg_gsm/$(DEPDIR)/la-library.Plo
+	-rm -f lumix/$(DEPDIR)/la-lumix.Plo
+	-rm -f mars/$(DEPDIR)/la-library.Plo
+	-rm -f mars/$(DEPDIR)/la-mars.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-data.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-download.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-info.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-status.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-util.Plo
+	-rm -f mustek/$(DEPDIR)/la-core.Plo
+	-rm -f mustek/$(DEPDIR)/la-image.Plo
+	-rm -f mustek/$(DEPDIR)/la-io.Plo
+	-rm -f mustek/$(DEPDIR)/la-mdc800.Plo
+	-rm -f mustek/$(DEPDIR)/la-rs232.Plo
+	-rm -f mustek/$(DEPDIR)/la-usb.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1000_la-dc.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1000_la-dc1000.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1580_la-dc.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1580_la-dc1580.Plo
+	-rm -f panasonic/coolshot/$(DEPDIR)/la-coolshot.Plo
+	-rm -f panasonic/coolshot/$(DEPDIR)/la-library.Plo
+	-rm -f panasonic/l859/$(DEPDIR)/la-l859.Plo
+	-rm -f pccam300/$(DEPDIR)/la-library.Plo
+	-rm -f pccam300/$(DEPDIR)/la-pccam300.Plo
+	-rm -f pccam600/$(DEPDIR)/la-library.Plo
+	-rm -f pccam600/$(DEPDIR)/la-pccam600.Plo
+	-rm -f pentax/$(DEPDIR)/la-js0n.Plo
+	-rm -f pentax/$(DEPDIR)/la-library.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_enum.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_lens.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_model.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc320_la-pdc320.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-dlink350f.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-jd350e.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-pdc640.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc700_la-pdc700.Plo
+	-rm -f ptp2/$(DEPDIR)/la-chdk.Plo
+	-rm -f ptp2/$(DEPDIR)/la-config.Plo
+	-rm -f ptp2/$(DEPDIR)/la-fujiptpip.Plo
+	-rm -f ptp2/$(DEPDIR)/la-library.Plo
+	-rm -f ptp2/$(DEPDIR)/la-olympus-wrap.Plo
+	-rm -f ptp2/$(DEPDIR)/la-ptp.Plo
+	-rm -f ptp2/$(DEPDIR)/la-ptpip.Plo
+	-rm -f ptp2/$(DEPDIR)/la-usb.Plo
+	-rm -f ricoh/$(DEPDIR)/g3_la-g3.Plo
+	-rm -f ricoh/$(DEPDIR)/la-library.Plo
+	-rm -f ricoh/$(DEPDIR)/la-ricoh.Plo
+	-rm -f samsung/$(DEPDIR)/la-samsung.Plo
+	-rm -f sierra/$(DEPDIR)/la-epson-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-library.Plo
+	-rm -f sierra/$(DEPDIR)/la-nikon-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-olympus-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra-usbwrap.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra.Plo
+	-rm -f sipix/$(DEPDIR)/blink2_la-blink2.Plo
+	-rm -f sipix/$(DEPDIR)/blink_la-blink.Plo
+	-rm -f sipix/$(DEPDIR)/web2_la-web2.Plo
+	-rm -f smal/$(DEPDIR)/la-smal.Plo
+	-rm -f smal/$(DEPDIR)/la-ultrapocket.Plo
+	-rm -f sonix/$(DEPDIR)/la-library.Plo
+	-rm -f sonix/$(DEPDIR)/la-sonix.Plo
+	-rm -f sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Plo
+	-rm -f sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Plo
+	-rm -f sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Plo
+	-rm -f sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Plo
+	-rm -f soundvision/$(DEPDIR)/la-agfa_cl18.Plo
+	-rm -f soundvision/$(DEPDIR)/la-commands.Plo
+	-rm -f soundvision/$(DEPDIR)/la-soundvision.Plo
+	-rm -f soundvision/$(DEPDIR)/la-tiger_fastflicks.Plo
+	-rm -f spca50x/$(DEPDIR)/la-library.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x-flash.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x-sdram.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x.Plo
+	-rm -f sq905/$(DEPDIR)/la-library.Plo
+	-rm -f sq905/$(DEPDIR)/la-postprocess.Plo
+	-rm -f sq905/$(DEPDIR)/la-sq905.Plo
+	-rm -f st2205/$(DEPDIR)/la-library.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205_decode.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205_tables.Plo
+	-rm -f stv0674/$(DEPDIR)/la-library.Plo
+	-rm -f stv0674/$(DEPDIR)/la-stv0674.Plo
+	-rm -f stv0680/$(DEPDIR)/la-demosaic_sharpen.Plo
+	-rm -f stv0680/$(DEPDIR)/la-library.Plo
+	-rm -f stv0680/$(DEPDIR)/la-saturate.Plo
+	-rm -f stv0680/$(DEPDIR)/la-sharpen.Plo
+	-rm -f stv0680/$(DEPDIR)/la-stv0680-bayer.Plo
+	-rm -f stv0680/$(DEPDIR)/la-stv0680.Plo
+	-rm -f sx330z/$(DEPDIR)/la-library.Plo
+	-rm -f sx330z/$(DEPDIR)/la-sx330z.Plo
+	-rm -f template/$(DEPDIR)/la-template.Plo
+	-rm -f topfield/$(DEPDIR)/la-crc16.Plo
+	-rm -f topfield/$(DEPDIR)/la-mjd.Plo
+	-rm -f topfield/$(DEPDIR)/la-puppy.Plo
+	-rm -f topfield/$(DEPDIR)/la-tf_bytes.Plo
+	-rm -f topfield/$(DEPDIR)/la-usb_io.Plo
+	-rm -f toshiba/pdrm11/$(DEPDIR)/la-library.Plo
+	-rm -f toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Plo
+	-rm -f tp6801/$(DEPDIR)/la-library.Plo
+	-rm -f tp6801/$(DEPDIR)/la-tp6801.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -3761,7 +5316,7 @@
 info-am:
 
 install-data-am: install-camlibLTLIBRARIES install-camlibdocDATA \
-	install-localizationDATA
+	install-dist_konicalocalizationDATA install-localizationDATA
 
 install-dvi: install-dvi-recursive
 
@@ -3790,7 +5345,190 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf adc65/$(DEPDIR) agfa-cl20/$(DEPDIR) aox/$(DEPDIR) ax203/$(DEPDIR) barbie/$(DEPDIR) canon/$(DEPDIR) casio/$(DEPDIR) clicksmart310/$(DEPDIR) digigr8/$(DEPDIR) digita/$(DEPDIR) dimera/$(DEPDIR) directory/$(DEPDIR) enigma13/$(DEPDIR) fuji/$(DEPDIR) gsmart300/$(DEPDIR) hp215/$(DEPDIR) iclick/$(DEPDIR) jamcam/$(DEPDIR) jd11/$(DEPDIR) jl2005a/$(DEPDIR) jl2005c/$(DEPDIR) kodak/dc120/$(DEPDIR) kodak/dc210/$(DEPDIR) kodak/dc240/$(DEPDIR) kodak/dc3200/$(DEPDIR) kodak/ez200/$(DEPDIR) konica/$(DEPDIR) largan/lmini/$(DEPDIR) lg_gsm/$(DEPDIR) mars/$(DEPDIR) minolta/dimagev/$(DEPDIR) mustek/$(DEPDIR) panasonic/$(DEPDIR) panasonic/coolshot/$(DEPDIR) panasonic/l859/$(DEPDIR) pccam300/$(DEPDIR) pccam600/$(DEPDIR) pentax/$(DEPDIR) polaroid/$(DEPDIR) ptp2/$(DEPDIR) ricoh/$(DEPDIR) samsung/$(DEPDIR) sierra/$(DEPDIR) sipix/$(DEPDIR) smal/$(DEPDIR) sonix/$(DEPDIR) sonydscf1/$(DEPDIR) sonydscf55/$(DEPDIR) soundvision/$(DEPDIR) spca50x/$(DEPDIR) sq905/$(DEPDIR) st2205/$(DEPDIR) stv0674/$(DEPDIR) stv0680/$(DEPDIR) sx330z/$(DEPDIR) template/$(DEPDIR) topfield/$(DEPDIR) toshiba/pdrm11/$(DEPDIR) tp6801/$(DEPDIR)
+		-rm -f adc65/$(DEPDIR)/la-adc65.Plo
+	-rm -f agfa-cl20/$(DEPDIR)/la-agfa_cl20.Plo
+	-rm -f aox/$(DEPDIR)/la-aox.Plo
+	-rm -f aox/$(DEPDIR)/la-library.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_compress_jpeg.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_decode_yuv.Plo
+	-rm -f ax203/$(DEPDIR)/la-ax203_decode_yuv_delta.Plo
+	-rm -f ax203/$(DEPDIR)/la-jidctflt.Plo
+	-rm -f ax203/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+	-rm -f ax203/$(DEPDIR)/la-library.Plo
+	-rm -f ax203/$(DEPDIR)/la-tinyjpeg.Plo
+	-rm -f barbie/$(DEPDIR)/la-barbie.Plo
+	-rm -f canon/$(DEPDIR)/la-canon.Plo
+	-rm -f canon/$(DEPDIR)/la-crc.Plo
+	-rm -f canon/$(DEPDIR)/la-library.Plo
+	-rm -f canon/$(DEPDIR)/la-serial.Plo
+	-rm -f canon/$(DEPDIR)/la-usb.Plo
+	-rm -f canon/$(DEPDIR)/la-util.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-camtojpeg.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-casio-qv-commands.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-casio-qv.Plo
+	-rm -f casio/$(DEPDIR)/qv_la-ycctoppm.Plo
+	-rm -f clicksmart310/$(DEPDIR)/la-clicksmart.Plo
+	-rm -f clicksmart310/$(DEPDIR)/la-library.Plo
+	-rm -f digigr8/$(DEPDIR)/la-digi_postprocess.Plo
+	-rm -f digigr8/$(DEPDIR)/la-digigr8.Plo
+	-rm -f digigr8/$(DEPDIR)/la-library.Plo
+	-rm -f digita/$(DEPDIR)/la-commands.Plo
+	-rm -f digita/$(DEPDIR)/la-digita.Plo
+	-rm -f digita/$(DEPDIR)/la-serial.Plo
+	-rm -f digita/$(DEPDIR)/la-usb.Plo
+	-rm -f dimera/$(DEPDIR)/dimera3500_la-dimera3500.Plo
+	-rm -f dimera/$(DEPDIR)/dimera3500_la-mesalib.Plo
+	-rm -f directory/$(DEPDIR)/la-directory.Plo
+	-rm -f docupen/$(DEPDIR)/la-cache.Plo
+	-rm -f docupen/$(DEPDIR)/la-calibration.Plo
+	-rm -f docupen/$(DEPDIR)/la-docupen.Plo
+	-rm -f docupen/$(DEPDIR)/la-huffman.Plo
+	-rm -f docupen/$(DEPDIR)/la-image.Plo
+	-rm -f enigma13/$(DEPDIR)/la-enigma13.Plo
+	-rm -f fuji/$(DEPDIR)/la-fuji.Plo
+	-rm -f fuji/$(DEPDIR)/la-library.Plo
+	-rm -f gsmart300/$(DEPDIR)/la-gsmart300.Plo
+	-rm -f gsmart300/$(DEPDIR)/la-library.Plo
+	-rm -f hp215/$(DEPDIR)/la-hp215.Plo
+	-rm -f iclick/$(DEPDIR)/la-iclick.Plo
+	-rm -f iclick/$(DEPDIR)/la-library.Plo
+	-rm -f jamcam/$(DEPDIR)/la-jamcam.Plo
+	-rm -f jamcam/$(DEPDIR)/la-library.Plo
+	-rm -f jd11/$(DEPDIR)/la-decomp.Plo
+	-rm -f jd11/$(DEPDIR)/la-jd11.Plo
+	-rm -f jd11/$(DEPDIR)/la-serial.Plo
+	-rm -f jl2005a/$(DEPDIR)/la-jl2005a.Plo
+	-rm -f jl2005a/$(DEPDIR)/la-library.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-img_enhance.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jl2005bcd_decompress.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jl2005c.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-jpeg_memsrcdest.Plo
+	-rm -f jl2005c/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc120/$(DEPDIR)/la-dc120.Plo
+	-rm -f kodak/dc120/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc210/$(DEPDIR)/la-dc210.Plo
+	-rm -f kodak/dc210/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc240/$(DEPDIR)/la-dc240.Plo
+	-rm -f kodak/dc240/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/dc3200/$(DEPDIR)/la-dc3200.Plo
+	-rm -f kodak/dc3200/$(DEPDIR)/la-library.Plo
+	-rm -f kodak/ez200/$(DEPDIR)/la-ez200.Plo
+	-rm -f konica/$(DEPDIR)/la-konica.Plo
+	-rm -f konica/$(DEPDIR)/la-library.Plo
+	-rm -f konica/$(DEPDIR)/la-lowlevel.Plo
+	-rm -f konica/$(DEPDIR)/qm150_la-qm150.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-largan.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-lmini.Plo
+	-rm -f largan/lmini/$(DEPDIR)/la-lmini_ccd.Plo
+	-rm -f lg_gsm/$(DEPDIR)/la-lg_gsm.Plo
+	-rm -f lg_gsm/$(DEPDIR)/la-library.Plo
+	-rm -f lumix/$(DEPDIR)/la-lumix.Plo
+	-rm -f mars/$(DEPDIR)/la-library.Plo
+	-rm -f mars/$(DEPDIR)/la-mars.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-capture.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-data.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-delete.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-dimagev.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-download.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-info.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-packet.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-status.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-upload.Plo
+	-rm -f minolta/dimagev/$(DEPDIR)/dimagev_la-util.Plo
+	-rm -f mustek/$(DEPDIR)/la-core.Plo
+	-rm -f mustek/$(DEPDIR)/la-image.Plo
+	-rm -f mustek/$(DEPDIR)/la-io.Plo
+	-rm -f mustek/$(DEPDIR)/la-mdc800.Plo
+	-rm -f mustek/$(DEPDIR)/la-rs232.Plo
+	-rm -f mustek/$(DEPDIR)/la-usb.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1000_la-dc.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1000_la-dc1000.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1580_la-dc.Plo
+	-rm -f panasonic/$(DEPDIR)/dc1580_la-dc1580.Plo
+	-rm -f panasonic/coolshot/$(DEPDIR)/la-coolshot.Plo
+	-rm -f panasonic/coolshot/$(DEPDIR)/la-library.Plo
+	-rm -f panasonic/l859/$(DEPDIR)/la-l859.Plo
+	-rm -f pccam300/$(DEPDIR)/la-library.Plo
+	-rm -f pccam300/$(DEPDIR)/la-pccam300.Plo
+	-rm -f pccam600/$(DEPDIR)/la-library.Plo
+	-rm -f pccam600/$(DEPDIR)/la-pccam600.Plo
+	-rm -f pentax/$(DEPDIR)/la-js0n.Plo
+	-rm -f pentax/$(DEPDIR)/la-library.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_enum.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_lens.Plo
+	-rm -f pentax/$(DEPDIR)/la-pslr_model.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc320_la-pdc320.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-dlink350f.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-jd350e.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc640_la-pdc640.Plo
+	-rm -f polaroid/$(DEPDIR)/pdc700_la-pdc700.Plo
+	-rm -f ptp2/$(DEPDIR)/la-chdk.Plo
+	-rm -f ptp2/$(DEPDIR)/la-config.Plo
+	-rm -f ptp2/$(DEPDIR)/la-fujiptpip.Plo
+	-rm -f ptp2/$(DEPDIR)/la-library.Plo
+	-rm -f ptp2/$(DEPDIR)/la-olympus-wrap.Plo
+	-rm -f ptp2/$(DEPDIR)/la-ptp.Plo
+	-rm -f ptp2/$(DEPDIR)/la-ptpip.Plo
+	-rm -f ptp2/$(DEPDIR)/la-usb.Plo
+	-rm -f ricoh/$(DEPDIR)/g3_la-g3.Plo
+	-rm -f ricoh/$(DEPDIR)/la-library.Plo
+	-rm -f ricoh/$(DEPDIR)/la-ricoh.Plo
+	-rm -f samsung/$(DEPDIR)/la-samsung.Plo
+	-rm -f sierra/$(DEPDIR)/la-epson-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-library.Plo
+	-rm -f sierra/$(DEPDIR)/la-nikon-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-olympus-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra-desc.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra-usbwrap.Plo
+	-rm -f sierra/$(DEPDIR)/la-sierra.Plo
+	-rm -f sipix/$(DEPDIR)/blink2_la-blink2.Plo
+	-rm -f sipix/$(DEPDIR)/blink_la-blink.Plo
+	-rm -f sipix/$(DEPDIR)/web2_la-web2.Plo
+	-rm -f smal/$(DEPDIR)/la-smal.Plo
+	-rm -f smal/$(DEPDIR)/la-ultrapocket.Plo
+	-rm -f sonix/$(DEPDIR)/la-library.Plo
+	-rm -f sonix/$(DEPDIR)/la-sonix.Plo
+	-rm -f sonydscf1/$(DEPDIR)/sony_dscf1_la-command.Plo
+	-rm -f sonydscf1/$(DEPDIR)/sony_dscf1_la-sonydscf1.Plo
+	-rm -f sonydscf55/$(DEPDIR)/sony_dscf55_la-camera.Plo
+	-rm -f sonydscf55/$(DEPDIR)/sony_dscf55_la-sony.Plo
+	-rm -f soundvision/$(DEPDIR)/la-agfa_cl18.Plo
+	-rm -f soundvision/$(DEPDIR)/la-commands.Plo
+	-rm -f soundvision/$(DEPDIR)/la-soundvision.Plo
+	-rm -f soundvision/$(DEPDIR)/la-tiger_fastflicks.Plo
+	-rm -f spca50x/$(DEPDIR)/la-library.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x-flash.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x-sdram.Plo
+	-rm -f spca50x/$(DEPDIR)/la-spca50x.Plo
+	-rm -f sq905/$(DEPDIR)/la-library.Plo
+	-rm -f sq905/$(DEPDIR)/la-postprocess.Plo
+	-rm -f sq905/$(DEPDIR)/la-sq905.Plo
+	-rm -f st2205/$(DEPDIR)/la-library.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205_decode.Plo
+	-rm -f st2205/$(DEPDIR)/la-st2205_tables.Plo
+	-rm -f stv0674/$(DEPDIR)/la-library.Plo
+	-rm -f stv0674/$(DEPDIR)/la-stv0674.Plo
+	-rm -f stv0680/$(DEPDIR)/la-demosaic_sharpen.Plo
+	-rm -f stv0680/$(DEPDIR)/la-library.Plo
+	-rm -f stv0680/$(DEPDIR)/la-saturate.Plo
+	-rm -f stv0680/$(DEPDIR)/la-sharpen.Plo
+	-rm -f stv0680/$(DEPDIR)/la-stv0680-bayer.Plo
+	-rm -f stv0680/$(DEPDIR)/la-stv0680.Plo
+	-rm -f sx330z/$(DEPDIR)/la-library.Plo
+	-rm -f sx330z/$(DEPDIR)/la-sx330z.Plo
+	-rm -f template/$(DEPDIR)/la-template.Plo
+	-rm -f topfield/$(DEPDIR)/la-crc16.Plo
+	-rm -f topfield/$(DEPDIR)/la-mjd.Plo
+	-rm -f topfield/$(DEPDIR)/la-puppy.Plo
+	-rm -f topfield/$(DEPDIR)/la-tf_bytes.Plo
+	-rm -f topfield/$(DEPDIR)/la-usb_io.Plo
+	-rm -f toshiba/pdrm11/$(DEPDIR)/la-library.Plo
+	-rm -f toshiba/pdrm11/$(DEPDIR)/la-pdrm11.Plo
+	-rm -f tp6801/$(DEPDIR)/la-library.Plo
+	-rm -f tp6801/$(DEPDIR)/la-tp6801.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -3808,34 +5546,37 @@
 ps-am:
 
 uninstall-am: uninstall-camlibLTLIBRARIES uninstall-camlibdocDATA \
+	uninstall-dist_konicalocalizationDATA \
 	uninstall-localizationDATA
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	check check-am clean clean-camlibLTLIBRARIES clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am \
+	am--depfiles check check-am clean clean-camlibLTLIBRARIES \
+	clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
 	install-camlibLTLIBRARIES install-camlibdocDATA 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-localizationDATA install-man \
-	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-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-camlibLTLIBRARIES \
-	uninstall-camlibdocDATA uninstall-localizationDATA
+	install-data-am install-dist_konicalocalizationDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-localizationDATA install-man 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-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-camlibLTLIBRARIES uninstall-camlibdocDATA \
+	uninstall-dist_konicalocalizationDATA \
+	uninstall-localizationDATA
 
 .PRECIOUS: Makefile
 
 
 ########################################################################
 # You can generate this Makefile-files include list by running
-# find . -name Makefile-files -exec echo include {} \; | sort | sed 's| ./| |g' 
+# find . -name Makefile-files -exec echo include {} \; | sort | sed 's| ./| |g'
 # End of list of Makefile-files
 
 ########################################################################
@@ -3846,16 +5587,27 @@
 		y="$$(basename "$$x" ".la")"; \
 		echo "GP_CAMLIB($$y)dnl"; \
 	done
-all-local: Makefile
-	@:; \
-	(for x in $(EXTRA_LTLIBRARIES) template.la; do echo "$$(basename "$$x" ".la")"; done) \
-		| sort > all-src-camlibs; \
-	(for x in $(ALL_DEFINED_CAMLIBS); do echo "$$x"; done) \
-		| sort > all-def-camlibs; \
-	if cmp all-def-camlibs all-src-camlibs; then :; else \
-		diff -u all-def-camlibs all-src-camlibs; \
-		echo "List of camlibs in configure.ac is out of date."; \
-		echo "Have a developer update it using \"make -C camlibs print-camlibs\"."; \
+all-cfg-camlibs: Makefile
+	@(for x in $(GP_CAMLIB_SET_EVERYTHING); do echo "$$x"; done) \
+		| LC_ALL=C $(SORT) > all-cfg-camlibs
+all-mkf-camlibs: Makefile
+	@(for x in $(EXTRA_LTLIBRARIES) $(noinst_LTLIBRARIES); do echo "$$(basename "$$x" ".la")"; done) \
+		| LC_ALL=C $(SORT) > all-mkf-camlibs
+
+.PHONY: all-local
+all-local: all-cfg-camlibs all-mkf-camlibs
+	@if $(CMP) all-cfg-camlibs all-mkf-camlibs > /dev/null 2>&1; then :; else \
+		echo "#"; \
+		for camlib in $$($(COMM) -23 all-cfg-camlibs all-mkf-camlibs); do \
+			echo "#   - '$${camlib}' camlib in 'configure.ac', but not in Makefiles."; \
+		done; \
+		for camlib in $$($(COMM) -13 all-cfg-camlibs all-mkf-camlibs); do \
+			echo "#   - '$${camlib}' camlib in Makefiles, but not in 'configure.ac'"; \
+		done; \
+		echo "#"; \
+		echo "# The camlib set definitions in 'configure.ac' and Makefiles are inconsistent"; \
+		echo "# Have a developer sync them, maybe using \"make -C camlibs print-camlibs\"."; \
+		echo "#"; \
 		exit 1; \
 	fi
 
@@ -3863,8 +5615,8 @@
 # Shortcut for installation of a subset of camlibs
 # Usage: make CAMLIBS="canon.la ptp2.la" install-camlibs
 
-install-camlibs:
-	$(MAKE) BUILD_THESE_CAMLIBS="$(CAMLIBS)" install-camlibLTLIBRARIES
+install-camlibs: $(GP_CAMLIB_SET)
+	$(MAKE) $(AM_MAKEFLAGS) GP_CAMLIB_SET="$(GP_CAMLIB_SET)" install-camlibLTLIBRARIES
 
 ########################################################################
 # End of camlibs/Makefile.am

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/adc65/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/adc65/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/adc65/README.adc65 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/adc65/README.adc65 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/adc65/adc65.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/adc65/adc65.c Changed

@@ -1,6 +1,6 @@
 /* ADC-65(s) camera driver
- * Released under the GPL version 2   
- * 
+ * Released under the GPL version 2
+ *
  * Copyright 2001
  * Benjamin Moos
  * <benjamin@psnw.com>
@@ -126,7 +126,7 @@
 			 */
 			strcpy(s, ppmhead);
 			z = strlen(s);
-			
+
 			for (y=0; y<256; y++) {
 			  if (y == 255) {
 				y1 = y - 1;
@@ -143,24 +143,24 @@
 				bl = (unsigned char)usy1 * 256 + x;
 				ur = (unsigned char)usy * 256 + x1;
 				br = (unsigned char)usy1 * 256 + x1;
-				  
-				  switch ( ((y & 1) << 1) | (x & 1) ) {	
-				  case 0: /* even row, even col, B */		
+
+				  switch ( ((y & 1) << 1) | (x & 1) ) {
+				  case 0: /* even row, even col, B */
 					rgb.R = br;
 					rgb.G = (ur + bl) / 2;
 					rgb.B = ul;
 					break;
-				  case 1: /* even row, odd col, G */		
+				  case 1: /* even row, odd col, G */
 					rgb.R = bl;
 					rgb.G = ul;
 					rgb.B = ur;
 					break;
-				  case 2:	/* odd row, even col, G */		
+				  case 2:	/* odd row, even col, G */
 					rgb.R = ur;
 					rgb.G = ul;
 					rgb.B = bl;
 					break;
-				  case 3:	/* odd row, odd col, R */		
+				  case 3:	/* odd row, odd col, R */
 				  default:
 					rgb.R = ul;
 					rgb.G = (ur + bl) / 2;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/Makefile-files Changed

@@ -1,17 +1,24 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += \
-	agfa-cl20/README.agfa-cl20 \
-	agfa-cl20/STATUS agfa-cl20/ChangeLog \
-	agfa-cl20/protocol.txt agfa-cl20/protocol2.txt \
-	agfa-cl20/commands.txt \
-	agfa-cl20/pic-header.txt agfa-cl20/RANDOM
+EXTRA_DIST                += %reldir%/ChangeLog
+EXTRA_DIST                += %reldir%/RANDOM
 
-camlibdoc_DATA += agfa-cl20/README.agfa-cl20
+EXTRA_DIST                += %reldir%/README.agfa-cl20
+camlibdoc_DATA            += %reldir%/README.agfa-cl20
 
-EXTRA_LTLIBRARIES += agfa_cl20.la
+EXTRA_DIST                += %reldir%/STATUS
+EXTRA_DIST                += %reldir%/commands.txt
+EXTRA_DIST                += %reldir%/pic-header.txt
+EXTRA_DIST                += %reldir%/protocol.txt
+EXTRA_DIST                += %reldir%/protocol2.txt
 
-agfa_cl20_la_SOURCES = agfa-cl20/agfa_cl20.c
-agfa_cl20_la_LDFLAGS = $(camlib_ldflags)
-agfa_cl20_la_DEPENDENCIES = $(camlib_dependencies)
-agfa_cl20_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES         += agfa_cl20.la
+
+agfa_cl20_la_SOURCES       = %reldir%/agfa_cl20.c
+
+agfa_cl20_la_CFLAGS        = $(camlib_cflags)
+agfa_cl20_la_CPPFLAGS      = $(camlib_cppflags)
+agfa_cl20_la_DEPENDENCIES  = $(camlib_dependencies)
+agfa_cl20_la_LDFLAGS       = $(camlib_ldflags)
+agfa_cl20_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/RANDOM -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/RANDOM Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/agfa_cl20.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/agfa_cl20.c Changed

@@ -8,7 +8,7 @@
  * 	- fix number of picturs detection
  * 	- get rid of the heavy stack usage and use the heap instead
  * 	- fix USB download size
- * 	
+ *
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -70,13 +70,13 @@
 	unsigned short ret = 0;
 
 	ret = ret + (a / 1000) * 0x1000;
-	a = a % 1000;	
+	a = a % 1000;
 	ret = ret + ((a / 100) * 0x100);
 	a = a % 100;
 	ret = ret + ((a / 10) * 0x10);
 	a = a % 10;
 	ret = ret + a;
-	
+
 	return ret;
 }
 
@@ -90,13 +90,13 @@
 	unsigned short ret = 0;
 
 	ret = ret + ((a / 0x1000) * 1000);
-	a = a % 0x1000;	
+	a = a % 0x1000;
 	ret = ret + ((a / 0x100) * 100);
 	a = a % 0x100;
 	ret = ret + ((a / 0x10) * 10);
 	a = a % 0x10;
 	ret = ret + a;
-	
+
 	return ret;
 }
 
@@ -153,7 +153,7 @@
 {
 	Camera *camera = privdata;
 	int n = -1;
-	int size = -1;
+	unsigned int size = 0;
 	unsigned char hb, lb;
 	unsigned long j;
 	unsigned int app1len = -1;
@@ -162,7 +162,7 @@
 
 	unsigned char * result;
 	unsigned char * ptr;
-	
+
 	/* unsigned char last, next; */
 
 	GP_DEBUG(" * get_file_func()");
@@ -182,19 +182,19 @@
 		gp_port_read(camera->port, (char*)indata, 0x100);
 
 		size = indata 5  + (indata 6  * 0xFF) + 3;
-		
+
 		resolution = (unsigned char)indata 17 ;
 		if (resolution == 1) {
 			char dummy;
 
-			result = calloc(size, 0x100);
+			result = calloc((size + 1), 0x100);
 			ptr = result;
-				
+
 			gp_port_usb_msg_read(camera->port,0x00,0x0000,0x0521,&dummy,0x0001);
 			gp_port_usb_msg_read(camera->port,0x00,0x0000,0x8000,&dummy,0x0001);
 
 			gp_port_usb_msg_write(camera->port,0x0A,to_camera(n),0x000A,NULL,0x0);
-			
+
 			for (j = 0; j < size; j++) {
 		   		gp_port_read(camera->port, (char*)ptr, 0x100);
 				ptr += 0x100;
@@ -208,6 +208,11 @@
 			lb = (unsigned char)*(result + 0x05);
 			hb = (unsigned char)*(result + 0x04);
 			app1len = (unsigned int)(hb * 256) + (unsigned int)(lb);
+			if ((app1len < 4) || (app1len > size - 4 - 20)) {
+				free (result);
+				GP_DEBUG("app1len %d is larger than size %d", app1len, size);
+				return GP_ERROR_CORRUPTED_DATA;
+			}
 
 			result3 = 0xe0;
 			result4 = 0x00;
@@ -229,9 +234,9 @@
 
 			memmove(&result20,
 			       &resultapp1len + 4,
-			       (unsigned int)(size - app1len - 2));
+			       (unsigned int)(size - app1len - 4));
 
-			size = size - app1len + 24;
+			size = size - app1len + 20 + 4;
 
 			gp_file_set_mime_type(file, GP_MIME_JPEG);
 			gp_file_append(file, (char*)result, size);
@@ -249,7 +254,7 @@
 
 			data = (unsigned char *)calloc(size, 0x100);
 			ptr = data;
-			
+
 			gp_port_usb_msg_write(camera->port,0x0A,to_camera(n),0x000B,NULL,0x0);
 			if (size < 100) {
 				for (j = 0; j < size; j++) {
@@ -268,6 +273,11 @@
 
 			size = size * 0x100;
 
+			if (size < 128*96*2*4 + 9 + 0x1a0) {
+				GP_DEBUG("size %d smaller than expected %d", size, 128*96*2*4 + 9 + 0x1a0);
+				return GP_ERROR_CORRUPTED_DATA;
+			}
+
 			{
 				unsigned int thumb_start = 9 + 0x1a0;
 				unsigned char temp1, temp2, temp3, temp4;
@@ -277,14 +287,14 @@
 				unsigned int offset = 0;
 
 				result = calloc(1, 128 * 96 * 4 * 4 + 100 );
-				
+
 				memcpy(result, "P3\n128 96\n255\n", 14);
 				offset = offset + 14;
 
 				temp1 = data thumb_start + pixel_count ;
 
 				while (pixel_count < (128*96*2)) {
-						
+
 					temp1 = data thumb_start + pixel_count ;
 					temp2 = data thumb_start + pixel_count + 1 ;
 					temp3 = data thumb_start + pixel_count + 2 ;
@@ -335,18 +345,18 @@
 
 		break;
 		}
-		
+
 	case GP_FILE_TYPE_RAW: {
 		char dummy;
 		GP_DEBUG(" * REQUEST FOR RAW IMAGE");
-		
+
 		gp_port_usb_msg_write(camera->port,0x0A,to_camera(n),0x0008,NULL,0x0);
 		gp_port_read(camera->port, (char*)indata, 0x100);
 
 		size = indata 5  + (indata 6  * 0xFF) + 3;
 		result = calloc(size, 0x100);
 		ptr = result;
-		
+
 		gp_port_usb_msg_read(camera->port,0x00,0x0000,0x0521,&dummy,0x0001);
 		gp_port_usb_msg_read(camera->port,0x00,0x0000,0x8000,&dummy,0x0001);
 
@@ -377,15 +387,15 @@
 		gp_port_read(camera->port, (char*)indata, 0x100);
 
 		size = indata 5  + (indata 6  * 0xFF) + 3;
-		
-		result = calloc(size, 0x100);
+
+		result = calloc((size+1), 0x100);
 		ptr = result;
-				
+
 		gp_port_usb_msg_read(camera->port,0x00,0x0000,0x0521,&dummy,0x0001);
 		gp_port_usb_msg_read(camera->port,0x00,0x0000,0x8000,&dummy,0x0001);
 
 		gp_port_usb_msg_write(camera->port,0x0A,to_camera(n),0x000A,NULL,0x0);
-			
+
 		for (j = 0; j < size; j++) {
 	   		gp_port_read(camera->port, (char*)ptr, 0x100);
 			ptr += 0x100;
@@ -398,10 +408,18 @@
 		gp_port_usb_msg_read(camera->port,0x00,0x0000,0x8000,&dummy,0x0001);
 		size = size * 0x100;
 
+
 		lb = *(result + 0x05);
 		hb = *(result + 0x04);
 		app1len = (unsigned int)(hb * 256) + (unsigned int)(lb);
 
+		if ((app1len < 4) || (size < app1len+4)) {
+			GP_DEBUG("size %d smaller than expected %d", size, app1len+2);
+			free(result);
+			return GP_ERROR_CORRUPTED_DATA;
+		}
+		GP_DEBUG("size %d app1len %d", size, app1len);
+
 		result3 = 0xe0;
 		result4 = 0x00;
 		result5 = 0x10;
@@ -419,10 +437,10 @@
 		result17 = 0x01;
 		result18 = 0x00;
 		result19 = 0x00;
-	
+
 		memmove(&result20,
 		       &resultapp1len + 4,
-		       (unsigned int)(size - app1len - 2));
+		       (unsigned int)(size - app1len - 4));
 
 		size = size - app1len + 24;
 
@@ -523,7 +541,7 @@
 	} else {
 		has_compact_flash = 0;
 	}
-		
+
 	if (has_compact_flash == 0) {
 		sprintf( summary->text, _("Camera appears to not be using CompactFlash storage\n"
 						"Unfortunately we do not support that at the moment :-(\n"));
@@ -596,7 +614,7 @@
 		 * Nevertheless, this is a 0.80 Megapixel camera, no more !!! No matter
 		 * what the marketing says!
 		 */
-			
+
 		info->preview.fields = GP_FILE_INFO_TYPE;
 		strcpy( info->preview.type, GP_MIME_PPM);
 		info->preview.width = 128;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/pic-header.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/pic-header.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/protocol.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/protocol.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/agfa-cl20/protocol2.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/agfa-cl20/protocol2.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/aox/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/aox/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/aox/aox.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/aox/aox.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/aox/aox.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/aox/aox.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/aox/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/aox/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/Makefile-files Changed

@@ -1,12 +1,36 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += ax203/README.ax203-compression ax203/README.ax203
-camlibdoc_DATA += ax203/README.ax203-compression ax203/README.ax203
+EXTRA_DIST            += %reldir%/README.ax203-compression
+camlibdoc_DATA        += %reldir%/README.ax203-compression
 
-EXTRA_LTLIBRARIES += ax203.la
+EXTRA_DIST            += %reldir%/README.ax203
+camlibdoc_DATA        += %reldir%/README.ax203
 
-ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h ax203/tinyjpeg-internal.h ax203/jidctflt.c
-ax203_la_LDFLAGS = $(camlib_ldflags)
-ax203_la_DEPENDENCIES = $(camlib_dependencies)
-ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ @LIBJPEG@
-ax203_la_CFLAGS = @LIBGD_CFLAGS@
+
+EXTRA_LTLIBRARIES     += ax203.la
+
+ax203_la_SOURCES       =
+ax203_la_SOURCES      += %reldir%/library.c
+ax203_la_SOURCES      += %reldir%/ax203.c
+ax203_la_SOURCES      += %reldir%/ax203.h
+ax203_la_SOURCES      += %reldir%/ax203_decode_yuv.c
+ax203_la_SOURCES      += %reldir%/ax203_decode_yuv_delta.c
+ax203_la_SOURCES      += %reldir%/ax203_compress_jpeg.c
+ax203_la_SOURCES      += %reldir%/jpeg_memsrcdest.h
+ax203_la_SOURCES      += %reldir%/jpeg_memsrcdest.c
+ax203_la_SOURCES      += %reldir%/tinyjpeg.c
+ax203_la_SOURCES      += %reldir%/tinyjpeg.h
+ax203_la_SOURCES      += %reldir%/tinyjpeg-internal.h
+ax203_la_SOURCES      += %reldir%/jidctflt.c
+
+ax203_la_CFLAGS        = $(camlib_cflags)
+ax203_la_CPPFLAGS      = $(camlib_cppflags)
+ax203_la_DEPENDENCIES  = $(camlib_dependencies)
+ax203_la_LDFLAGS       = $(camlib_ldflags)
+ax203_la_LIBADD        = $(camlib_libadd)
+
+ax203_la_LIBADD       += $(LIBGD_LIBS)
+ax203_la_CPPFLAGS     += $(LIBGD_CFLAGS)
+
+ax203_la_LIBADD       += $(LIBJPEG_LIBS)
+ax203_la_CPPFLAGS     += $(LIBJPEG_CFLAGS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/ax203.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/ax203.c Changed

@@ -13,7 +13,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
@@ -45,69 +45,69 @@
 	int has_4k_sectors;
 	int pp_64k;
 } ax203_eeprom_info = {
-	{ "AMIC A25L040", 0x37133037,  524288, 1 },
-	{ "AMIC A25L080", 0x37143037, 1048576, 1 },
-	{ "AMIC A25L40P", 0x1320377f,  524288, 0 },
-	{ "AMIC A25L80P", 0x1420377f, 1048576, 0 },
-	{ "AMIC A25L16P", 0x1520377f, 2097152, 0 },
+	{ "AMIC A25L040", 0x37133037,  524288, 1, 0 },
+	{ "AMIC A25L080", 0x37143037, 1048576, 1, 0 },
+	{ "AMIC A25L40P", 0x1320377f,  524288, 0, 0 },
+	{ "AMIC A25L80P", 0x1420377f, 1048576, 0, 0 },
+	{ "AMIC A25L16P", 0x1520377f, 2097152, 0, 0 },
 
 	/* Note the ATmel AT26DF041 id:0x0000441f is fsck-ed up. It doesn't
 	   support ERASE_64K, (only 4K) and SPI_EEPROM_PP is 0x11 rather then
 	   0x02 (0x02 only programs a single byte). */
 	/* I cannot find a datasheet for the ATmel AT26DF081 id:0x0000451f */
-	{ "ATmel AT26DF161",  0x0000461f, 2097152, 1 },
-	{ "ATmel AT26DF081A", 0x0001451f, 1048576, 1 },
-	{ "ATmel AT26DF161A", 0x0001461f, 2097152, 1 },
-	{ "ATmel AT25DF081",  0x0002451f, 1048576, 1 },
-	{ "ATmel AT25DF161",  0x0002461f, 2097152, 1 },
+	{ "ATmel AT26DF161",  0x0000461f, 2097152, 1, 0 },
+	{ "ATmel AT26DF081A", 0x0001451f, 1048576, 1, 0 },
+	{ "ATmel AT26DF161A", 0x0001461f, 2097152, 1, 0 },
+	{ "ATmel AT25DF081",  0x0002451f, 1048576, 1, 0 },
+	{ "ATmel AT25DF161",  0x0002461f, 2097152, 1, 0 },
 
-	{ "EON EN25B16", 0x1c15201c, 2097152, 0 },
-	{ "EON EN25B32", 0x1c16201c, 4194304, 0 },
-	{ "EON EN25F80", 0x1c14311c, 1048576, 1 },
-	{ "EON EN25F16", 0x1c15311c, 2097152, 1 },
+	{ "EON EN25B16", 0x1c15201c, 2097152, 0, 0 },
+	{ "EON EN25B32", 0x1c16201c, 4194304, 0, 0 },
+	{ "EON EN25F80", 0x1c14311c, 1048576, 1, 0 },
+	{ "EON EN25F16", 0x1c15311c, 2097152, 1, 0 },
 
-	{ "ESI ES25P80", 0x0014204a, 1048576, 0 },
-	{ "ESI ES25P16", 0x0015204a, 2097152, 0 },
+	{ "ESI ES25P80", 0x0014204a, 1048576, 0, 0 },
+	{ "ESI ES25P16", 0x0015204a, 2097152, 0, 0 },
 
-	{ "ESMT F25L008 (top)",    0x8c14208c, 1048576, 1 },
-	{ "ESMT F25L008 (bottom)", 0x8c14218c, 1048576, 1 },
+	{ "ESMT F25L008 (top)",    0x8c14208c, 1048576, 1, 0 },
+	{ "ESMT F25L008 (bottom)", 0x8c14218c, 1048576, 1, 0 },
 
-	{ "GigaDevice GD25Q40", 0xc81340c8,  524288, 1 },
-	{ "GigaDevice GD25Q80", 0xc81440c8, 1048576, 1 },
-	{ "GigaDevice GD25Q16", 0xc81540c8, 2097152, 1 },
+	{ "GigaDevice GD25Q40", 0xc81340c8,  524288, 1, 0 },
+	{ "GigaDevice GD25Q80", 0xc81440c8, 1048576, 1, 0 },
+	{ "GigaDevice GD25Q16", 0xc81540c8, 2097152, 1, 0 },
 
-	{ "MXIC MX25L4005A", 0xc21320c2,  524288, 1 },
-	{ "MXIC MX25L8005A", 0xc21420c2, 1048576, 1 },
-	{ "MXIC MX25L1605A", 0xc21520c2, 2097152, 1 },
+	{ "MXIC MX25L4005A", 0xc21320c2,  524288, 1, 0 },
+	{ "MXIC MX25L8005A", 0xc21420c2, 1048576, 1, 0 },
+	{ "MXIC MX25L1605A", 0xc21520c2, 2097152, 1, 0 },
 
-	{ "Nantronics N25S80", 0xd51430d5, 1048576, 1 },                                                                                                                                     
+	{ "Nantronics N25S80", 0xd51430d5, 1048576, 1, 0 },
 
-	{ "PMC Pm25LV010", 0x007e9d7f, 524288, 0 },
+	{ "PMC Pm25LV010", 0x007e9d7f, 524288, 0, 0 },
 
-	{ "Spansion S25FL004A", 0x00120201,  524288, 0 },
-	{ "Spansion S25FL008A", 0x00130201, 1048576, 0 },
-	{ "Spansion S25FL016A", 0x00140201, 2097152, 0 },
+	{ "Spansion S25FL004A", 0x00120201,  524288, 0, 0 },
+	{ "Spansion S25FL008A", 0x00130201, 1048576, 0, 0 },
+	{ "Spansion S25FL016A", 0x00140201, 2097152, 0, 0 },
 
 	{ "SST25VF080", 0xbf8e25bf, 1048576, 0, 1 },
 	{ "SST25VF016", 0xbf4125bf, 2097152, 0, 1 },
 
-	{ "ST M25P08", 0x7f142020, 1048576, 0 },
-	{ "ST M25P16", 0x7f152020, 2097152, 0 },
-	{ "ST M25P32", 0x7f162020, 4194304, 0 },
-	{ "ST M25P64", 0x7f172020, 8388608, 0 },
+	{ "ST M25P08", 0x7f142020, 1048576, 0, 0 },
+	{ "ST M25P16", 0x7f152020, 2097152, 0, 0 },
+	{ "ST M25P32", 0x7f162020, 4194304, 0, 0 },
+	{ "ST M25P64", 0x7f172020, 8388608, 0, 0 },
 
-	{ "Winbond W25P80", 0x001420ef, 1048576, 0 },
-	{ "Winbond W25P16", 0x001520ef, 2097152, 0 },
+	{ "Winbond W25P80", 0x001420ef, 1048576, 0, 0 },
+	{ "Winbond W25P16", 0x001520ef, 2097152, 0, 0 },
 
-	{ "Winbond W25X40", 0x001330ef,  524288, 1 },
-	{ "Winbond W25X80", 0x001430ef, 1048576, 1 },
-	{ "Winbond W25X16", 0x001530ef, 2097152, 1 },
-	{ "Winbond W25X32", 0x001630ef, 4194304, 1 },
-	{ "Winbond W25X64", 0x001730ef, 8388608, 1 },
+	{ "Winbond W25X40", 0x001330ef,  524288, 1, 0 },
+	{ "Winbond W25X80", 0x001430ef, 1048576, 1, 0 },
+	{ "Winbond W25X16", 0x001530ef, 2097152, 1, 0 },
+	{ "Winbond W25X32", 0x001630ef, 4194304, 1, 0 },
+	{ "Winbond W25X64", 0x001730ef, 8388608, 1, 0 },
 
-	{ "Winbond W25Q80", 0x001440ef, 1048576, 1 },
-	{ "Winbond W25Q16", 0x001540ef, 2097152, 1 },
-	{ "Winbond W25Q32", 0x001640ef, 4194304, 1 },
+	{ "Winbond W25Q80", 0x001440ef, 1048576, 1, 0 },
+	{ "Winbond W25Q16", 0x001540ef, 2097152, 1, 0 },
+	{ "Winbond W25Q32", 0x001640ef, 4194304, 1, 0 },
 
 	{ }
 };
@@ -268,9 +268,9 @@
 	char cmd_buffer16;
 
 	memset (cmd_buffer, 0, sizeof (cmd_buffer));
-	
+
 	cmd_buffer0 = AX203_SET_TIME;
-	
+
 	cmd_buffer5 = t->tm_year % 100;
 
 	switch (camera->pl->frame_version) {
@@ -319,12 +319,12 @@
 ax203_eeprom_read(Camera *camera, int address, char *buf, int buf_size)
 {
 	char cmd4;
-    
+
 	cmd0 = SPI_EEPROM_READ;
 	cmd1 = (address >> 16) & 0xff;
 	cmd2 = (address >> 8) & 0xff;
 	cmd3 = (address) & 0xff;
-		    
+
 	return ax203_send_eeprom_cmd (camera, 0, cmd, sizeof(cmd), buf,
 				      buf_size, 0);
 }
@@ -339,7 +339,7 @@
 	cmd1 = (address >> 16) & 0xff;
 	cmd2 = (address >> 8) & 0xff;
 	cmd3 = (address) & 0xff;
-		    
+
 	return ax203_send_eeprom_cmd (camera, 1, cmd, sizeof(cmd), buf,
 				      buf_size, extra_arg);
 }
@@ -372,7 +372,7 @@
 	cmd1 = (address >> 16) & 0xff;
 	cmd2 = (address >> 8) & 0xff;
 	cmd3 = (address) & 0xff;
-		    
+
 	return ax203_send_eeprom_cmd (camera, 1, cmd, sizeof(cmd), NULL, 0, 0);
 }
 
@@ -385,7 +385,7 @@
 	cmd1 = (address >> 16) & 0xff;
 	cmd2 = (address >> 8) & 0xff;
 	cmd3 = (address) & 0xff;
-		    
+
 	return ax203_send_eeprom_cmd (camera, 1, cmd, sizeof(cmd), NULL, 0, 0);
 }
 
@@ -405,7 +405,7 @@
 		count = 64;
 		break;
 	case AX3003_FIRMWARE_3_5_x:
-		/* On the ax3003 contineously reading the status word
+		/* On the ax3003 continuously reading the status word
 		   does not work. */
 		count = 1;
 		break;
@@ -585,7 +585,7 @@
 /* This function reads the parameter block from the eeprom and:
    1) checks some hopefully constant bytes to make sure it is not reading
       garbage
-   2) Gets the lcd size from the paramter block (ax203_get_lcd_size seems
+   2) Gets the lcd size from the parameter block (ax203_get_lcd_size seems
       to result in all frames being detected as being 128x128 pixels).
    3) Determines the compression type for v3.4.x frames
    4) Determines the start of the ABFS
@@ -595,7 +595,7 @@
 	uint8_t buf32, expect32;
 	int i, param_offset = 0, resolution_offset = 0;
 	int compression_offset = -1, abfs_start_offset = 0, expect_size = 0;
-	const int valid_resolutions2 = {
+	const unsigned int valid_resolutions2 = {
 		{  96,  64 },
 		{ 120, 160 },
 		{ 128, 128 },
@@ -782,7 +782,7 @@
 		return 0;
 	}
 	/* Never reached */
-	return GP_ERROR_NOT_SUPPORTED;	
+	return GP_ERROR_NOT_SUPPORTED;
 }
 
 static int
@@ -800,7 +800,7 @@
 			sizeof(struct ax3003_v3_5_x_raw_fileinfo);
 	}
 	/* Never reached */
-	return GP_ERROR_NOT_SUPPORTED;	
+	return GP_ERROR_NOT_SUPPORTED;
 }
 
 static int
@@ -905,7 +905,7 @@
 	fileinfo->address = le32toh (raw.address);
 	fileinfo->size    = le16toh (raw.size);
 
-	return GP_OK;	
+	return GP_OK;
 }
 
 static
@@ -992,7 +992,7 @@
 		return ax203_read_v3_3_x_v3_4_x_filecount (camera);
 	case AX206_FIRMWARE_3_5_x:
 	case AX3003_FIRMWARE_3_5_x:
-		return ax203_read_v3_5_x_filecount (camera);;
+		return ax203_read_v3_5_x_filecount (camera);
 	}
 	/* Never reached */
 	return GP_ERROR_NOT_SUPPORTED;
@@ -1039,7 +1039,7 @@
 		return ax3003_read_v3_5_x_fileinfo (camera, idx, fileinfo);
 	}
 	/* Never reached */
-	return GP_ERROR_NOT_SUPPORTED;	
+	return GP_ERROR_NOT_SUPPORTED;
 }
 
 static
@@ -1057,14 +1057,14 @@
 		return ax3003_write_v3_5_x_fileinfo (camera, idx, fileinfo);
 	}
 	/* Never reached */
-	return GP_ERROR_NOT_SUPPORTED;	
+	return GP_ERROR_NOT_SUPPORTED;
 }
 
 int
 ax203_file_present(Camera *camera, int idx)
 {
 	struct ax203_fileinfo fileinfo;
-	
+
 	CHECK (ax203_read_fileinfo (camera, idx, &fileinfo))
 
 	return fileinfo.present;
@@ -1102,7 +1102,7 @@
 			if (!camera->pl->jdec)
 				return GP_ERROR_NO_MEMORY;
 		}
-		
+
 		/* Hack for width / heights which are not a multiple of 16 */
 		if (camera->pl->width % 16 || camera->pl->height % 16) {
 			width  = (camera->pl->width  + 15) & ~15;
@@ -1121,8 +1121,8 @@
 		}
 		if (!row_skip) {
 			tinyjpeg_get_size (camera->pl->jdec, &width, &height);
-			if ((int)width  != camera->pl->width ||
-			    (int)height != camera->pl->height) {
+			if (width  != camera->pl->width ||
+			    height != camera->pl->height) {
 				gp_log (GP_LOG_ERROR, "ax203",
 					"Hdr dimensions %ux%u don't match lcd %dx%d",
 					width, height,
@@ -1193,12 +1193,12 @@
 
 /* Returns the number of bytes of dest used or a negative error code */
 static int
-ax203_encode_image(Camera *camera, int **src, char *dest, int dest_size)
+ax203_encode_image(Camera *camera, int **src, char *dest, unsigned int dest_size)
 {
 #ifdef HAVE_LIBGD
 	int size = ax203_filesize (camera);
 #ifdef HAVE_LIBJPEG
-	int x, y;
+	unsigned int x, y;
 	struct jpeg_compress_struct cinfo;
 	struct jpeg_error_mgr jcerr;
 	JOCTET *jpeg_dest = NULL;
@@ -1207,7 +1207,10 @@
 	JSAMPROW row_pointer1 = { row };
 #endif
 
-	if (dest_size < size)
+	if (size < GP_OK)
+		return size;
+
+	if (dest_size < (unsigned int)size)
 		return GP_ERROR_FIXED_LIMIT_EXCEEDED;
 
 	switch (camera->pl->compression_version) {
@@ -1239,8 +1242,8 @@
 		cinfo.in_color_space = JCS_RGB;
 		jpeg_set_defaults (&cinfo);
 		jpeg_start_compress (&cinfo, TRUE);
-		for (y = 0; y < cinfo.image_height; y++) {
-			for (x = 0; x < cinfo.image_width; x++) {
+		for (y = 0; y < (unsigned int)cinfo.image_height; y++) {
+			for (x = 0; x < (unsigned int)cinfo.image_width; x++) {
 				int p = srcyx;
 				rowx * 3 + 0 = gdTrueColorGetRed(p);
 				rowx * 3 + 1 = gdTrueColorGetGreen(p);
@@ -1305,8 +1308,8 @@
 	/* Delete all pictures from the frame */
 	ret = ax203_delete_all (camera);
 	if (ret < 0) goto cleanup;
-	
-	/* An last write them back (in one contineous block) */
+
+	/* An last write them back (in one continuous block) */
 	for (i = 0; i < count; i++) {
 		if (!fileinfoi.present)
 			continue;
@@ -1499,7 +1502,7 @@
 
 	if (free >= size) {
 		gp_log (GP_LOG_DEBUG, "ax203",
-			"not enough contineous freespace to add file, "
+			"not enough continuous freespace to add file, "
 			"defragmenting memory");
 		CHECK (ax203_defrag_memory (camera))
 		goto retry;
@@ -1771,7 +1774,7 @@
 		if (ax203_eeprom_infoi.id == id)
 			break;
 	}
-	
+
 	if (!ax203_eeprom_infoi.name) {
 		gp_log (GP_LOG_ERROR, "ax203", "unknown eeprom id: %08x", id);
 		return GP_ERROR_MODEL_NOT_FOUND;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/ax203.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/ax203.h Changed

@@ -13,18 +13,20 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef __AX203_H__
-#define __AX203_H__
+
+#ifndef CAMLIBS_AX203_AX203_H
+#define CAMLIBS_AX203_AX203_H
+
 #include "config.h"
 
 #include <stdio.h>
 
 #include <gphoto2/gphoto2-library.h>
-#include <gphoto2-endian.h>
+#include <libgphoto2/gphoto2-endian.h>
 
 #include "tinyjpeg.h"
 
@@ -95,8 +97,8 @@
 	int sector_dirty4194304 / SPI_EEPROM_SECTOR_SIZE;
 	int fs_start;
 	/* LCD display attributes */
-	int width;
-	int height;
+	unsigned int width;
+	unsigned int height;
 	/* USB "bridge" / firmware attributes */
 	enum ax203_version frame_version;
 	enum ax203_compression compression_version;
@@ -200,8 +202,8 @@
 
 int
 ax206_compress_jpeg(Camera *camera, int **in, uint8_t *outbuf, int out_size,
-	int width, int height);
+	unsigned int width, unsigned int height);
 
 #endif
 
-#endif
+#endif /* !defined(CAMLIBS_AX203_AX203_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/ax203_compress_jpeg.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/ax203_compress_jpeg.c Changed

@@ -14,7 +14,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
@@ -47,7 +47,7 @@
 		if (jpegi != 0xff) {
 			gp_log (GP_LOG_ERROR, "ax203",
 				"marker does not start with ff?");
-			return GP_ERROR_CORRUPTED_DATA;	
+			return GP_ERROR_CORRUPTED_DATA;
 		}
 		if (jpegi + 1 == 0xda)
 			break;
@@ -94,7 +94,7 @@
 {
 	int info_addr = block_nr * 8;
 
-	/* skip header */	
+	/* skip header */
 	huffman_addr -= 16;
 	info_addr += 16;
 
@@ -114,7 +114,7 @@
 
 int
 ax206_compress_jpeg(Camera *camera, int **in, uint8_t *outbuf, int out_size,
-	int width, int height)
+	unsigned int width, unsigned int height)
 {
 	struct jpeg_compress_struct cinfo;
 	struct jpeg_decompress_struct dinfo;
@@ -122,7 +122,8 @@
 	JSAMPROW row_pointer1;
 	JOCTET *buf = NULL, *regular_jpeg = NULL;
 	jvirt_barray_ptr *in_coefficients;
-	int i, x, y, stop, size, ret, outc;
+	unsigned int i, x, y;
+	int stop, size, ret, outc;
 	unsigned long regular_jpeg_size = 0, buf_size = 0;
 	int last_dc_val3 = { 0, 0, 0 };
 
@@ -185,7 +186,7 @@
 	ret = locate_tables_n_write (regular_jpeg, regular_jpeg_size, 0xdb,
 				     outbuf, &outc);
 	if (ret < 0) return ret;
-	
+
 	/* Locate huffman tables and write them to outbuf */
 	ret = locate_tables_n_write (regular_jpeg, regular_jpeg_size, 0xc4,
 				     outbuf, &outc);
@@ -195,7 +196,7 @@
 	   DCT coefficients:
 	   1) It wants the MCU huffman data for each new MCU to start on a byte
 	      boundary
-	   2) The component order in an MCU is Cb Cr Y, rather then Y Cb Cr 
+	   2) The component order in an MCU is Cb Cr Y, rather then Y Cb Cr
 
 	   We solve both these issues by decompressing the regular jpeg we've
 	   just created into its raw coefficients, following by creating
@@ -228,7 +229,7 @@
 #endif
 	jpeg_set_defaults (&cinfo);
 	/* We will write Cb values as comp. 0, so give it chroma settings */
-	cinfo.comp_info0.h_samp_factor = 1; 
+	cinfo.comp_info0.h_samp_factor = 1;
 	cinfo.comp_info0.v_samp_factor = 1;
 	cinfo.comp_info0.quant_tbl_no = 1;
 	cinfo.comp_info0.dc_tbl_no = 1;
@@ -329,14 +330,14 @@
 			if (i >= buf_size) {
 				gp_log (GP_LOG_ERROR, "ax203",
 					"missing in ff da marker?");
-				return GP_ERROR_CORRUPTED_DATA;	
+				return GP_ERROR_CORRUPTED_DATA;
 			}
 
 			size = buf_size - i - 2;
 			if ((outc + size) > out_size) {
 				gp_log (GP_LOG_ERROR, "ax203",
 					"jpeg output buffer overflow");
-				return GP_ERROR_FIXED_LIMIT_EXCEEDED;	
+				return GP_ERROR_FIXED_LIMIT_EXCEEDED;
 			}
 			outc += copy_huffman(outbuf + outc, buf + i, size);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/ax203_decode_yuv.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/ax203_decode_yuv.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/ax203_decode_yuv_delta.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/ax203_decode_yuv_delta.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/jidctflt.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/jidctflt.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/jpeg_memsrcdest.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/jpeg_memsrcdest.c Changed

@@ -213,15 +213,15 @@
  * Empty the output buffer --- called whenever buffer fills up.
  *
  * In typical applications, this should write the entire output buffer
- * (ignoring the current state of next_output_byte & free_in_buffer), 
+ * (ignoring the current state of next_output_byte & free_in_buffer),
  * reset the pointer & count to the start of the buffer, and return TRUE
  * indicating that the buffer has been dumped.
  *
  * In applications that need to be able to suspend compression due to output
- * overrun, a FALSE return indicates that the buffer cannot be emptied now. 
+ * overrun, a FALSE return indicates that the buffer cannot be emptied now.
  * In this situation, the compressor will return to its caller (possibly with
- * an indication that it has not accepted all the supplied scanlines).  The  
- * application should resume compression after it has made more room in the  
+ * an indication that it has not accepted all the supplied scanlines).  The
+ * application should resume compression after it has made more room in the
  * output buffer.  Note that there are substantial restrictions on the use of
  * suspension --- see the documentation.
  *
@@ -249,7 +249,7 @@
 }
 
 /*
- * Terminate destination --- called by jpeg_finish_compress   
+ * Terminate destination --- called by jpeg_finish_compress
  * after all data has been written.  Usually needs to flush buffer.
  *
  * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/jpeg_memsrcdest.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/jpeg_memsrcdest.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/library.c Changed

@@ -13,12 +13,12 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -34,19 +34,8 @@
 #include <gphoto2/gphoto2-setting.h>
 #include "ax203.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 static const struct ax203_devinfo ax203_devinfo = {
 	{ 0x1908, 0x1315, AX203_FIRMWARE_3_3_x },
@@ -81,7 +70,7 @@
 		a.usb_vendor = ax203_devinfoi.vendor_id;
 		a.usb_product= ax203_devinfoi.product_id;
 		a.operations = GP_OPERATION_NONE;
-		a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE | 
+		a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE |
 				      GP_FOLDER_OPERATION_DELETE_ALL;
 		/* FIXME add support for downloading RAW images */
 		a.file_operations   = GP_FILE_OPERATION_DELETE |
@@ -212,7 +201,7 @@
 	ret = gp_file_set_mime_type (file, GP_MIME_PNG);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
-	ret = gp_file_set_name (file, filename); 
+	ret = gp_file_set_name (file, filename);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
 	ret = gp_file_append (file, gdpng, size);
@@ -225,7 +214,7 @@
 }
 
 static int
-put_file_func (CameraFilesystem *fs, const char *folder, const char *name, 
+put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
 	CameraFileType type, CameraFile *file, void *data, GPContext *context)
 {
 #ifdef HAVE_LIBGD
@@ -360,9 +349,9 @@
 file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
 		void *data, GPContext *context)
 {
-	Camera *camera = data; 
+	Camera *camera = data;
 	int i, count, present;
-	char buf16;
+	char buf30;
 
 	count = ax203_read_filecount (camera);
 	if (count < 0) return count;
@@ -467,7 +456,7 @@
 }
 
 static int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	char buf2;
 
@@ -483,7 +472,7 @@
 }
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
     	CameraAbilities a;
     	int i, ret;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/tinyjpeg-internal.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/tinyjpeg-internal.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/tinyjpeg.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/tinyjpeg.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ax203/tinyjpeg.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ax203/tinyjpeg.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/barbie/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/barbie/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/barbie/barbie.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/barbie/barbie.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/ChangeLog Changed

@@ -689,7 +689,7 @@
 
 	* usb.c: added fix for EOS D60 unlocking by Fredrik (reported to work)
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
@@ -705,7 +705,7 @@
 
 	* canon.ch: support for PowerShot A100, A200
 	
-2002-07-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* canon.h: Make CVS compile again by adding CANON_PS_A100 to the
 	  enumeration.
@@ -788,7 +788,7 @@
 	  #ifdef OBSOLETE to make sources clean before gPhoto2
 	  2.0 is released.
 
-2002-01-08  christophe barbé <christophe.barbe.ml@online.fr>
+2002-01-08  christophe barbÃ© <christophe.barbe.ml@online.fr>
 
 	* usb.c: Change model detection to look at model name instead
 	  of USB vendor/product ID since this is required to make the
@@ -818,24 +818,24 @@
 
 	  Made canon_int_get_time() always return gphoto2 status codes.
 
-2002-01-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* *.c: gp_camera_status -> gp_context_status
 
 2002-01-14  Fredrik <fredrik@krixor.xy.org>
 
-	* canon.c, library.c: More carefull buffer size checking in some
+	* canon.c, library.c: More careful buffer size checking in some
 	  places. We should do a real audit of these.
 
 	* library.c: Fixed mkdir and rmdir functions which did not convert
 	  from gphoto paths to canon paths.
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
-	* *.c,h: Replase last call to gp_camera_set_error (I oversaw one
+	* *.c,h: Replaces last call to gp_camera_set_error (I oversaw one
 	  hidden in the header file).
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* *.c,h: Replace calls to gp_camera_set_error by gp_context_error.
 
@@ -885,7 +885,7 @@
 
 	* canon.c, library.c: Improve error checking and
 	debug diagnostics when camera does not return the
-	expected ammount of data.
+	expected amount of data.
 
 2002-01-01  Fredrik <fredrik@krixor.xy.org>
 
@@ -900,7 +900,7 @@
 
 	* canon.c, canon.h, serial.c, usb.c, util.c, util.h :
 
-	  Patch from Michel Dänzer <daenzer@debian.org>,
+	  Patch from Michel DÃ¤nzer <daenzer@debian.org>,
 
 	  Handle endian issues when communicating with the
 	  cameras by using the new _byteorder.h include
@@ -1003,7 +1003,7 @@
 	* canon.h: added CANON_MINIMUM_DIRENT_SIZE.
 
 	* canon.c, canon.h:
-	  Exchanged canon_int_list_directorys() with my
+	  Exchanged canon_int_list_directory() with my
 	  rewritten version. At least some hypothetical bugs
 	  fixed, easier to understand and proper error-checking.
 	  This should hopefully not break serial, since this is

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/Makefile-files Changed

@@ -1,10 +1,15 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_LTLIBRARIES += canon.la
+SUBDIRS               += %reldir%/doc
 
-camlibdoc_DATA += canon/README.canon
+EXTRA_DIST            += %reldir%/.indent.pro
+EXTRA_DIST            += %reldir%/ChangeLog
+EXTRA_DIST            += %reldir%/urb-interpret
+EXTRA_DIST            += %reldir%/TODO
+
+EXTRA_DIST            += %reldir%/README.canon
+camlibdoc_DATA        += %reldir%/README.canon
 
-EXTRA_DIST += canon/.indent.pro canon/ChangeLog canon/urb-interpret canon/README.canon canon/TODO
 
 # "ideal" version:
 # + only export the 3 symbols
@@ -15,14 +20,29 @@
 #     without ## macros
 #   + makes it possible to have the same name the module filename and
 #     the camlib name returned by camera_id()
-canon_la_SOURCES =	\
-	canon/canon.c canon/canon.h		\
-	canon/library.c canon/library.h	\
-	canon/serial.c canon/serial.h	\
-	canon/usb.c canon/usb.h		\
-	canon/crc.c canon/crc.h		\
-	canon/util.c canon/util.h
-canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-canon_la_LDFLAGS = $(camlib_ldflags)
-canon_la_DEPENDENCIES = $(camlib_dependencies)
-canon_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
+
+EXTRA_LTLIBRARIES     += canon.la
+
+canon_la_SOURCES       =
+
+canon_la_SOURCES      += %reldir%/canon.c
+canon_la_SOURCES      += %reldir%/canon.h
+canon_la_SOURCES      += %reldir%/library.c
+canon_la_SOURCES      += %reldir%/library.h
+canon_la_SOURCES      += %reldir%/serial.c
+canon_la_SOURCES      += %reldir%/serial.h
+canon_la_SOURCES      += %reldir%/usb.c
+canon_la_SOURCES      += %reldir%/usb.h
+canon_la_SOURCES      += %reldir%/crc.c
+canon_la_SOURCES      += %reldir%/crc.h
+canon_la_SOURCES      += %reldir%/util.c
+canon_la_SOURCES      += %reldir%/util.h
+
+canon_la_CFLAGS        = $(camlib_cflags)
+canon_la_CPPFLAGS      = $(camlib_cppflags)
+canon_la_DEPENDENCIES  = $(camlib_dependencies)
+canon_la_LDFLAGS       = $(camlib_ldflags)
+canon_la_LIBADD        = $(camlib_libadd)
+
+canon_la_CPPFLAGS     += $(LIBEXIF_CFLAGS)
+canon_la_LIBADD       += $(LIBEXIF_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/TODO -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/TODO Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/canon.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/canon.c Changed

@@ -12,10 +12,10 @@
  * use a FireWire (IEEE 1394) interface.
  *
  * We are working at moving serial and USB specific stuff to serial.c
- * and usb.c, keeping the common protocols/busses support in this
+ * and usb.c, keeping the common protocols/buses support in this
  * file.
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #include "config.h"
 
 #include <stdlib.h>
@@ -23,6 +23,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #ifdef TM_IN_SYS_TIME
 #include <sys/time.h>
@@ -30,26 +31,11 @@
 #include <time.h>
 #endif
 
-#ifdef OS2
-#include <db.h>
-#endif
-
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #include "usb.h"
 #include "util.h"
@@ -468,7 +454,7 @@
  * @camera: Camera to work on
  * @filename: the file for which to get the name of the audio annotation
  *
- * The identifier returned is 
+ * The identifier returned is
  *  a) NULL if no audio file exists for this file or an internal error occurred
  *  b) pointer to string with file name of the corresponding thumbnail
  *  c) pointer to filename in case filename is a thumbnail itself
@@ -510,7 +496,7 @@
  * @camera: Camera to work on
  * @filename: the file to get the name of the thumbnail of
  *
- * The identifier returned is 
+ * The identifier returned is
  *  a) NULL if no thumbnail exists for this file or an internal error occurred
  *  b) pointer to empty string if thumbnail is contained in the file itself
  *  c) pointer to string with file name of the corresponding thumbnail
@@ -659,7 +645,7 @@
  *
  * Gets the camera identification string, usually the owner name.
  *
- * This information is then stored in the "camera" structure, which 
+ * This information is then stored in the "camera" structure, which
  * is a global variable for the driver.
  *
  * This function also gets the firmware revision in the camera struct.
@@ -919,12 +905,12 @@
                  * response. It also needs an extra zero byte at the
                  * end. */
                 payloadpayloadlen++ = 0;
-                msg = canon_usb_dialogue ( camera, 
+                msg = canon_usb_dialogue ( camera,
                                            CANON_USB_FUNCTION_CONTROL_CAMERA_2,
                                            &datalen, payload, payloadlen );
         }
         else
-                msg = canon_usb_dialogue ( camera, 
+                msg = canon_usb_dialogue ( camera,
                                            CANON_USB_FUNCTION_CONTROL_CAMERA,
                                            &datalen, payload, payloadlen );
         if ( msg == NULL  && datalen != 0x1c) {
@@ -948,7 +934,7 @@
  * @payload: pointer to the payload data buffer to send to the camera
  * @payloadlen: length of the payload to send to the camera
  * @response_handle: pointer to a pointer where the camera response buffer
- *   address should be stored.  
+ *   address should be stored.
  * @datalen: the length of the response data from the camera
  *
  * Executes a command with arbitrary parameter data that returns data
@@ -962,7 +948,7 @@
 static int
 canon_int_do_control_dialogue_payload (Camera *camera, unsigned char *payload,
                                        unsigned int payloadlen,
-                                       unsigned char **response_handle, 
+                                       unsigned char **response_handle,
                                        unsigned int *datalen)
 {
         unsigned char *msg;
@@ -974,12 +960,12 @@
                  * response. It also needs an extra zero byte at the
                  * end. */
                 payloadpayloadlen++ = 0;
-                msg = canon_usb_dialogue_full ( camera, 
+                msg = canon_usb_dialogue_full ( camera,
                                                 CANON_USB_FUNCTION_CONTROL_CAMERA_2,
                                                 datalen, payload, payloadlen);
         }
         else
-                msg = canon_usb_dialogue_full ( camera, 
+                msg = canon_usb_dialogue_full ( camera,
                                                 CANON_USB_FUNCTION_CONTROL_CAMERA,
                                                 datalen, payload, payloadlen);
 
@@ -1005,10 +991,10 @@
  * @a: 32-bit first word of payload (first command parameter)
  * @b: 32-bit second word of payload (second command parameter)
  * @response_handle: pointer to a pointer where the camera response buffer
- *   address should be stored.  
+ *   address should be stored.
  * @datalen: the length of the response data from the camera
  *
- * Executes a remote capture command that returns data from the 
+ * Executes a remote capture command that returns data from the
  * camera, e.g., get release parameters.
  *
  * Returns: gphoto2 status code, camera response data in @response_handle,
@@ -1029,7 +1015,7 @@
         GP_DEBUG("%s++ with %x, %x", desc, a, b);
 
         status = canon_int_do_control_dialogue_payload (camera, payload,
-                                                        payloadlen, 
+                                                        payloadlen,
                                                         response_handle, datalen);
 
         if ( status < 0 ) {
@@ -1055,14 +1041,14 @@
  * Returns: gphoto2 status code
  *
  */
-int 
-canon_int_start_remote_control (Camera *camera, GPContext __unused__ *context) 
+int
+canon_int_start_remote_control (Camera *camera, GPContext __unused__ *context)
 {
         int status;
 
         if (camera->pl->remote_control) {
                 GP_DEBUG ("canon_int_start_remote_control: Camera already under remote control");
-                return GP_ERROR; 
+                return GP_ERROR;
         }
 
         /* Init, extends camera lens, puts us in remote capture mode */
@@ -1070,7 +1056,7 @@
                                                CANON_USB_CONTROL_INIT, 0, 0);
 
 
-        if (status == GP_OK) 
+        if (status == GP_OK)
                 camera->pl->remote_control = 1;
 
         return status;
@@ -1088,8 +1074,8 @@
  * Returns: gphoto2 status code
  *
  */
-int 
-canon_int_end_remote_control (Camera *camera, GPContext __unused__ *context) 
+int
+canon_int_end_remote_control (Camera *camera, GPContext __unused__ *context)
 {
         int status;
 
@@ -1103,7 +1089,7 @@
                                                CANON_USB_CONTROL_EXIT, 0, 0);
 
 
-        if (status == GP_OK) 
+        if (status == GP_OK)
                 camera->pl->remote_control = 0;
 
         return status;
@@ -1138,14 +1124,14 @@
         unsigned int b_length_orig = 0;
         unsigned int *b_length = &b_length_orig;
         unsigned char *b_data_orig = NULL;
-        unsigned char **b_data = &b_data_orig; 
+        unsigned char **b_data = &b_data_orig;
 
         int photo_status;
 
         /* Should we download the thumbnail, or the full image ? */
-        if (camera->pl->capture_size == CAPTURE_FULL_IMAGE) 
+        if (camera->pl->capture_size == CAPTURE_FULL_IMAGE)
                 transfermode = REMOTE_CAPTURE_FULL_TO_PC;
-        else 
+        else
                 transfermode = REMOTE_CAPTURE_THUMB_TO_PC;
 
         switch (camera->port->type) {
@@ -1156,14 +1142,14 @@
 
                 camera->pl->image_b_key = 0x0;
                 camera->pl->image_b_length = 0x0;
-                
+
                 /*
                  * Send a sequence of CONTROL_CAMERA commands.
                  */
 
                 if (!camera->pl->remote_control) {
                         gp_port_set_timeout (camera->port, 15000);
-                        
+
                         status = canon_int_start_remote_control (camera, context);
                         if ( status < 0 )
                                 return status;
@@ -1215,18 +1201,18 @@
                 /* Shutter Release
                    Can't use normal "canon_int_do_control_command", as
                    we must read the interrupt pipe before the response
-                   comes back for this commmand. */
+                   comes back for this command. */
                 *data = canon_usb_capture_dialogue ( camera, &return_length, &photo_status, context );
                 if ( *data == NULL ) {
                         /* Try to leave camera in a usable state. */
                         canon_int_end_remote_control (camera, context);
 
-                        /* XXX It would be nice if we had a way to 
+                        /* XXX It would be nice if we had a way to
                            decode the camera error state for the caller
-                           application.  For example, 
+                           application.  For example,
                            photo_status == 0x01 seems to mean
                            "autofocus failure" on the EOS 5D. */
-                        if (photo_status != 0) 
+                        if (photo_status != 0)
                                 return GP_ERROR_CAMERA_ERROR;
                         else
                                 return GP_ERROR_OS_FAILURE;
@@ -1234,7 +1220,7 @@
                 }
 
                 if (transfermode == REMOTE_CAPTURE_FULL_TO_PC) {
-                        
+
                         /* Download the image. */
                         if ( camera->pl->image_length > 0 ) {
                                 status = canon_usb_get_captured_image ( camera, camera->pl->image_key, data, length, context );
@@ -1244,7 +1230,7 @@
                                         return status;
                                 }
                         }
-                        
+
                         /* Download the secondary image, if one exists */
                         if ( camera->pl->image_b_length > 0 ) {
                                 status = canon_usb_get_captured_secondary_image ( camera, camera->pl->image_b_key, b_data, b_length, context );
@@ -1253,15 +1239,15 @@
                                                    " secondary image download failed, status= %i", status );
                                         return status;
                                 }
-                                
+
                                 /* Get rid of it */
-                                /* XXX maybe this should be changed in the future 
+                                /* XXX maybe this should be changed in the future
                                  * to do something else with it */
                                 free(b_data_orig);
                         }
-                        
+
                 } else if (transfermode == REMOTE_CAPTURE_THUMB_TO_PC) {
-                        
+
                         /* Download the thumbnail image. */
                         if ( camera->pl->thumb_length > 0 ) {
                                 status = canon_usb_get_captured_thumbnail ( camera, camera->pl->image_key, data, length, context );
@@ -1271,9 +1257,9 @@
                                         return status;
                                 }
                         }
-                        
+
                 }
-                
+
                 break;
         case GP_PORT_SERIAL:
                 return GP_ERROR_NOT_SUPPORTED;
@@ -1288,7 +1274,9 @@
  * canon_int_find_new_image:
  * @camera: Camera * to this camera
  * @initial_state: Camera directory dump before image capture
+ * @initial_state_len: Lengt of before dump 
  * @final_state: Directory dump after image capture
+ * @final_state_len: Length of after dump
  * @path: Will be filled in with the path and filename of the captured
  *        image, in canonical gphoto2 format.
  *
@@ -1297,8 +1285,11 @@
  * and its pathname is decoded into the given CameraFilePath.
  *
  */
-void canon_int_find_new_image ( Camera *camera, unsigned char *initial_state, unsigned char *final_state,
-                           CameraFilePath *path )
+void canon_int_find_new_image (
+		Camera *camera,
+		unsigned char *initial_state, unsigned int initial_state_length,
+		unsigned char *final_state, unsigned int final_state_length,
+		CameraFilePath *path )
 {
         char *old_entry = (char *)initial_state, *new_entry = (char *)final_state;
 
@@ -1308,9 +1299,13 @@
 
         path->folder0 = 0; /* Start with null pathname string. */
         GP_DEBUG ( "canon_int_find_new_image: starting directory compare" );
-        while ( le16atoh ( old_entry+CANON_DIRENT_ATTRS ) != 0
-                || le32atoh ( old_entry + CANON_DIRENT_SIZE ) != 0
-                || le32atoh ( old_entry + CANON_DIRENT_TIME ) != 0 ) {
+        while ( (((new_entry - (char*)final_state) < final_state_length) &&
+		((old_entry - (char*)initial_state) < initial_state_length)) &&
+		(	le16atoh ( old_entry + CANON_DIRENT_ATTRS ) != 0 ||
+			le32atoh ( old_entry + CANON_DIRENT_SIZE ) != 0 ||
+			le32atoh ( old_entry + CANON_DIRENT_TIME ) != 0
+		)
+	) {
                 char *old_name = old_entry + CANON_DIRENT_NAME,
                         *new_name = new_entry + CANON_DIRENT_NAME;
                 GP_DEBUG ( " old entry \"%s\", attr = 0x%02x, size=%i",
@@ -1473,9 +1468,9 @@
         int photo_status;
 
         /* Should we save the thumbnail, or the full image ? */
-        if (camera->pl->capture_size == CAPTURE_THUMB) 
+        if (camera->pl->capture_size == CAPTURE_THUMB)
                 transfermode = REMOTE_CAPTURE_THUMB_TO_DRIVE;
-        else 
+        else
                 transfermode = REMOTE_CAPTURE_FULL_TO_DRIVE;
 
         switch (camera->port->type) {
@@ -1604,21 +1599,21 @@
                 /* Shutter Release
                    Can't use normal "canon_int_do_control_command", as
                    we must read the interrupt pipe before the response
-                   comes back for this commmand. */
+                   comes back for this command. */
                 data = canon_usb_capture_dialogue ( camera, &return_length, &photo_status, context );
                 if ( data == NULL ) {
                         /* Try to leave camera in a usable state. */
                         canon_int_end_remote_control (camera, context);
 
 			free ( initial_state );
-                        /* XXX It would be nice if we had a way to 
+                        /* XXX It would be nice if we had a way to
                            decode the camera error state for the caller
-                           application.  For example, 
+                           application.  For example,
                            photo_status == 0x01 seems to mean
                            "autofocus failure" on the EOS 5D. */
-                        if (photo_status != 0) 
+                        if (photo_status != 0)
                                 return GP_ERROR_CAMERA_ERROR;
-                        else 
+                        else
                                 return GP_ERROR_OS_FAILURE;
 
                 }
@@ -1637,12 +1632,13 @@
                 }
 
                 /* Find new file name in camera directory */
-                canon_int_find_new_image ( camera, initial_state, final_state, path );
+                canon_int_find_new_image ( camera, initial_state, initial_state_len, final_state, final_state_len, path );
 
 		/* Save this state to the camera directory state */
 		if (camera->pl->directory_state)
 			free (camera->pl->directory_state);
 		camera->pl->directory_state = final_state;
+		camera->pl->directory_state_length = final_state_len;
 
                 free ( initial_state );
                 break;
@@ -1720,8 +1716,8 @@
  *
  * Reads the camera's release parameters (ISO, aperture, shutter speed, etc)
  *
- * Right now this has only been tested on an EOS 5D via USB. 
- * Note that the camera must be under USB control via 
+ * Right now this has only been tested on an EOS 5D via USB.
+ * Note that the camera must be under USB control via
  * canon_int_start_remote_control() before calling this function.
  *
  * Returns: gphoto2 error code
@@ -1737,7 +1733,7 @@
 
         GP_DEBUG ("canon_int_get_release_params()");
 
-        /* canon_int_start_remote_control() must be called before 
+        /* canon_int_start_remote_control() must be called before
            this function */
         if (!camera->pl->remote_control) {
                 GP_DEBUG ("canon_int_get_release_params: Camera not under USB control");
@@ -1770,36 +1766,36 @@
         }
 
 
-        /* 
-         * 0x5c is the offset to the camera parameters in the 
-         * get release params response data 
+        /*
+         * 0x5c is the offset to the camera parameters in the
+         * get release params response data
          */
-        memcpy(camera->pl->release_params, response + 0x5c, 
+        memcpy(camera->pl->release_params, response + 0x5c,
                sizeof(camera->pl->release_params));
 
 	for (i=0;i<sizeof(camera->pl->release_params);i++) {
 		GP_DEBUG("canon_int_get_release_params: %d = 0x%02x", i, camera->pl->release_paramsi);
 	}
 
-        GP_DEBUG ("canon_int_get_release_params: shutter speed = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: shutter speed = 0x%02x",
                   camera->pl->release_paramsSHUTTERSPEED_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: aperture = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: aperture = 0x%02x",
                   camera->pl->release_paramsAPERTURE_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: iso = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: iso = 0x%02x",
                   camera->pl->release_paramsISO_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: focus mode = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: focus mode = 0x%02x",
                   camera->pl->release_paramsFOCUS_MODE_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: beep mode = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: beep mode = 0x%02x",
                   camera->pl->release_paramsBEEP_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: flash mode = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: flash mode = 0x%02x",
                   camera->pl->release_paramsFLASH_INDEX);
 
-        GP_DEBUG ("canon_int_get_release_params: exposurebias = 0x%02x", 
+        GP_DEBUG ("canon_int_get_release_params: exposurebias = 0x%02x",
                   camera->pl->release_paramsEXPOSUREBIAS_INDEX);
 
         GP_DEBUG ("canon_int_get_release_params: shooting mode = 0x%02x",
@@ -1809,13 +1805,13 @@
         camera->pl->secondary_image = 0;
 	/* Based on the image format settings in the release params,
 	   determine whether we expect one or two images to be returned
-	   by the camera. 
-           I am not sure if this will work correctly for non-EOS 5D 
+	   by the camera.
+           I am not sure if this will work correctly for non-EOS 5D
            cameras - I would appreciate testing feedback from other
-           Canon camera users.  To test try capturing an image 
-           to the host computer in a single format (e.g., RAW or Large Fine 
-           JPEG).  Also try capturing an image when the camera is set to 
-           a dual format, e.g., RAW + Large Fine JPEG. Note that currently, we 
+           Canon camera users.  To test try capturing an image
+           to the host computer in a single format (e.g., RAW or Large Fine
+           JPEG).  Also try capturing an image when the camera is set to
+           a dual format, e.g., RAW + Large Fine JPEG. Note that currently, we
            only save the primary image to disk.
            Thanks - <paul@booyaka.com>
         */
@@ -1829,7 +1825,7 @@
 /**
  * canon_int_set_shutter_speed
  * @camera: camera to work with
- * @shutter_speed: shutter speed - use one of the defines such as 
+ * @shutter_speed: shutter speed - use one of the defines such as
  *                 SHUTTER_SPEED_1_15 for 1/15th of a second, etc.
  * @context: context for error reporting
  *
@@ -1848,51 +1844,51 @@
                   shutter_speed);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
 
         /* Modify the shutter speed */
-        
+
         /* XXX must test for valid shutter speeds here */
         camera->pl->release_paramsSHUTTERSPEED_INDEX = shutter_speed;
-        
+
         /* Upload the shutter speed to the camera */
         status = canon_int_set_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsSHUTTERSPEED_INDEX != shutter_speed) {
                 GP_DEBUG ("canon_int_set_shutter_speed: Could not set shutter "
-                          "speed to 0x%02x (camera returned 0x%02x)", 
-                          shutter_speed, 
+                          "speed to 0x%02x (camera returned 0x%02x)",
+                          shutter_speed,
                           camera->pl->release_paramsSHUTTERSPEED_INDEX);
                 return GP_ERROR_NOT_SUPPORTED;
         } else {
                 GP_DEBUG ("canon_int_set_shutter_speed: shutter speed change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_shutter_speed() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
 /**
  * canon_int_set_beep
  * @camera: camera to work with
- * @beep_mode: beep mode - use one of the defines such as 
+ * @beep_mode: beep mode - use one of the defines such as
  *                 BEEP_ON for turning on the beep when the camera sets the focus.
  * @context: context for error reporting
  *
@@ -1911,49 +1907,49 @@
                   beep_mode);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
         /* Modify the beep mode */
-        
+
         /* XXX must test for valid shutter speeds here */
         camera->pl->release_paramsBEEP_INDEX = beep_mode;
-        
+
         /* Upload the beep mode to the camera */
         status = canon_int_set_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsBEEP_INDEX != beep_mode) {
                 GP_DEBUG ("canon_int_set_beep: Could not set beep "
-                          "mode to 0x%02x (camera returned 0x%02x)", 
+                          "mode to 0x%02x (camera returned 0x%02x)",
                           beep_mode,
                           camera->pl->release_paramsBEEP_INDEX);
                 return GP_ERROR_NOT_SUPPORTED;
         } else {
                 GP_DEBUG ("canon_int_set_beep: beep mode change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_beep() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 /**
  * canon_int_set_flash
  * @camera: camera to work with
- * @flash_mode: flash mode - use one of the defines such as 
+ * @flash_mode: flash mode - use one of the defines such as
  *                 FLASH_MODE_OFF for turning off the flash.
  * @context: context for error reporting
  *
@@ -1972,43 +1968,43 @@
                   flash_mode);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
         /* Modify the beep mode */
-        
+
         /* XXX must test for valid flash mode here */
         camera->pl->release_paramsFLASH_INDEX = flash_mode;
-        
+
         /* Upload the flash mode to the camera */
         status = canon_int_set_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsFLASH_INDEX != flash_mode) {
                 GP_DEBUG ("canon_int_set_flash: Could not set flash "
-                          "mode to 0x%02x (camera returned 0x%02x)", 
+                          "mode to 0x%02x (camera returned 0x%02x)",
                           flash_mode,
                           camera->pl->release_paramsFLASH_INDEX);
                 return GP_ERROR_NOT_SUPPORTED;
         } else {
                 GP_DEBUG ("canon_int_set_flash: flash mode change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_flash() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
@@ -2031,15 +2027,15 @@
 
         GP_DEBUG ("canon_int_set_zoom() called for zoom 0x%02x",
                   zoom_level);
-        
+
         status = canon_int_do_control_command( camera, CANON_USB_CONTROL_SET_ZOOM_POS, 0x04, zoom_level );
 
         if (status < 0)
                 return status;
-                
+
         GP_DEBUG ("canon_int_set_zoom() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
@@ -2124,7 +2120,7 @@
  */
 int
 canon_int_set_image_format (Camera *camera, unsigned char res_byte1,
-                          unsigned char res_byte2, unsigned char res_byte3,  
+                          unsigned char res_byte2, unsigned char res_byte3,
                           GPContext *context)
 {
         int status;
@@ -2132,45 +2128,45 @@
         GP_DEBUG ("canon_int_set_image_format() called");
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
-        
+
         /* Modify the image format */
 
         camera->pl->release_paramsIMAGE_FORMAT_1_INDEX = res_byte1;
         camera->pl->release_paramsIMAGE_FORMAT_2_INDEX = res_byte2;
         camera->pl->release_paramsIMAGE_FORMAT_3_INDEX = res_byte3;
 
-        
+
 		/* Upload the image_format to the camera */
         status = canon_int_set_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
-        
-        /* It seems to take the camera body a while to change this parameter 
-           when all three res_bytes are changed at once.  
+
+        /* It seems to take the camera body a while to change this parameter
+           when all three res_bytes are changed at once.
            So, give the camera a chance to catch up.
-           3750 us was occasionally too short, but 5000 us seems to 
+           3750 us was occasionally too short, but 5000 us seems to
            work well. */
         usleep(5000);
 
         /* Make sure the camera changed it! */
 
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
-                
+
         if (camera->pl->release_paramsIMAGE_FORMAT_1_INDEX != res_byte1 ||
             camera->pl->release_paramsIMAGE_FORMAT_2_INDEX != res_byte2 ||
             camera->pl->release_paramsIMAGE_FORMAT_3_INDEX != res_byte3) {
             GP_DEBUG ("canon_int_set_image_format: Could not set image format "
-                          "to 0x%02x 0x%02x 0x%02x (camera returned 0x%02x 0x%02x 0x%02x)", 
-                          res_byte1, res_byte2, res_byte3, 
+                          "to 0x%02x 0x%02x 0x%02x (camera returned 0x%02x 0x%02x 0x%02x)",
+                          res_byte1, res_byte2, res_byte3,
                           camera->pl->release_paramsIMAGE_FORMAT_1_INDEX,
                           camera->pl->release_paramsIMAGE_FORMAT_2_INDEX,
                           camera->pl->release_paramsIMAGE_FORMAT_3_INDEX);
@@ -2178,17 +2174,17 @@
         } else {
             GP_DEBUG ("canon_int_set_image_format: image_format change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_image_format() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
 /**
  * canon_int_set_iso
  * @camera: camera to work with
- * @iso: ISO - use one of the defines such as ISO_400, etc. 
+ * @iso: ISO - use one of the defines such as ISO_400, etc.
  * @context: context for error reporting
  *
  * Sets the camera's ISO speed.  Only tested for EOS 5D via USB.
@@ -2205,41 +2201,41 @@
         GP_DEBUG ("canon_int_set_iso() called for ISO 0x%02x", iso);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
         /* Modify the ISO */
-        
+
         camera->pl->release_paramsISO_INDEX = iso;
-        
+
         /* Upload the ISO to the camera */
         status = canon_int_set_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsISO_INDEX != iso) {
                 GP_DEBUG ("canon_int_set_iso: Could not set ISO "
-                          "to 0x%02x (camera returned 0x%02x)", 
+                          "to 0x%02x (camera returned 0x%02x)",
                           iso, camera->pl->release_paramsISO_INDEX);
                 return GP_ERROR_CORRUPTED_DATA;
         } else {
                 GP_DEBUG ("canon_int_set_iso: ISO change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_iso() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
@@ -2292,7 +2288,7 @@
 /**
  * canon_int_set_aperture
  * @camera: camera to work with
- * @aperture: use one of the defines such as APERTURE_F5_6, etc. 
+ * @aperture: use one of the defines such as APERTURE_F5_6, etc.
  * @context: context for error reporting
  *
  * Sets the camera's aperture.  Only tested for EOS 5D via USB.
@@ -2310,42 +2306,42 @@
                   aperture);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
         /* Modify the aperture */
-        
+
         camera->pl->release_paramsAPERTURE_INDEX = aperture;
-        
+
         /* Upload the aperture to the camera */
         status = canon_int_set_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsAPERTURE_INDEX != aperture) {
                 GP_DEBUG ("canon_int_set_aperture: Could not set aperture "
-                          "to 0x%02x (camera returned 0x%02x)", 
-                          aperture, 
+                          "to 0x%02x (camera returned 0x%02x)",
+                          aperture,
                           camera->pl->release_paramsAPERTURE_INDEX);
                 return GP_ERROR_CORRUPTED_DATA;
         } else {
                 GP_DEBUG ("canon_int_set_aperture: aperture change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_aperture() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 
@@ -2383,25 +2379,25 @@
                 return status;
         if (camera->pl->release_paramsEXPOSUREBIAS_INDEX != expbias) {
                 GP_DEBUG ("canon_int_set_exposurebias: Could not set exposure bias "
-                          "to 0x%02x (camera returned 0x%02x)", 
-                          expbias, 
+                          "to 0x%02x (camera returned 0x%02x)",
+                          expbias,
                           camera->pl->release_paramsEXPOSUREBIAS_INDEX);
                 return GP_ERROR_CORRUPTED_DATA;
         } else {
                 GP_DEBUG ("canon_int_set_exposurebias: expbias change verified");
         }
         GP_DEBUG ("canon_int_set_exposurebias() finished successfully");
-        return GP_OK;        
+        return GP_OK;
 }
 
 
 /**
  * canon_int_set_focus_mode
  * @camera: camera to work with
- * @focus_mode: use one of the defines such as AUTO_FOCUS_AI_SERVO, etc. 
+ * @focus_mode: use one of the defines such as AUTO_FOCUS_AI_SERVO, etc.
  * @context: context for error reporting
  *
- * Sets the camera's focus mode.  Note that the selection of focus modes is 
+ * Sets the camera's focus mode.  Note that the selection of focus modes is
  * limited by the AF/MF switch on the lens body.  In particular, this function
  * is only useful for switching between the various autofocus modes while the
  * lens focus switch is set to 'AF'.  Only tested for EOS 5D via USB.
@@ -2419,43 +2415,43 @@
                   focus_mode);
 
         /* Get the current camera settings */
-        
+
         status = canon_int_get_release_params (camera, context);
-        
+
         if (status < 0)
                 return status;
 
 
         /* Modify the focus mode */
-        
+
         camera->pl->release_paramsFOCUS_MODE_INDEX = focus_mode;
-        
+
         /* Upload the focus mode to the camera */
         status = canon_int_set_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         /* Make sure the camera changed it! */
-        
+
         status = canon_int_get_release_params (camera, context);
 
         if (status < 0)
                 return status;
-        
+
         if (camera->pl->release_paramsFOCUS_MODE_INDEX != focus_mode) {
                 GP_DEBUG ("canon_int_set_focus_mode: Could not set focus_mode "
-                          "to 0x%02x (camera returned 0x%02x)", 
-                          focus_mode, 
+                          "to 0x%02x (camera returned 0x%02x)",
+                          focus_mode,
                           camera->pl->release_paramsFOCUS_MODE_INDEX);
                 return GP_ERROR_CORRUPTED_DATA;
         } else {
                 GP_DEBUG ("canon_int_set_focus_mode: focus_mode change verified");
         }
-        
+
         GP_DEBUG ("canon_int_set_focus_mode() finished successfully");
 
-        return GP_OK;        
+        return GP_OK;
 }
 
 /**
@@ -2481,29 +2477,29 @@
 
         if (!camera->pl->remote_control) {
                 GP_DEBUG ("canon_int_set_release_params: Camera not under USB control");
-                return GP_ERROR; 
+                return GP_ERROR;
         }
 
         memset(payload, 0, sizeof(payload));
 
         switch (camera->port->type) {
             case GP_PORT_USB:
-                    /* This is what we need for Canon class 6 cameras - 
+                    /* This is what we need for Canon class 6 cameras -
                        not sure what it is for previous protocols */
-                    payload0x0 = CANON_USB_CONTROL_SET_ZOOM_POS; 
+                    payload0x0 = CANON_USB_CONTROL_SET_ZOOM_POS;
                     payload0x4 = 0x30;
 
                     /* Copy the release parameter block from the camera state
                      * structure into the payload.  The 0x08 is the byte offset
                      * into the payload where the release parameters start.
                      */
-                    memcpy(payload + 0x08, camera->pl->release_params, 
-                           sizeof(camera->pl->release_params)); 
+                    memcpy(payload + 0x08, camera->pl->release_params,
+                           sizeof(camera->pl->release_params));
 
                     payloadlen = RELEASE_PARAMS_LEN + 0x08;
 
                     status = canon_int_do_control_dialogue_payload (camera, payload, payloadlen, &msg, &len);
-                    
+
                     if ( msg == NULL )
                             return GP_ERROR_CORRUPTED_DATA;
 
@@ -2516,12 +2512,12 @@
                     status = canon_int_do_control_dialogue (camera,
                                                             CANON_USB_CONTROL_GET_PARAMS,
                                                             0x00, 0, &trash_handle, &trash_int);
-                        
+
 
                     if ( status < 0 )
                             return GP_ERROR;
 
-                    
+
                     status = canon_int_do_control_dialogue_payload (camera, payload, payloadlen, &msg, &len);
 
                     if ( msg == NULL )
@@ -2697,7 +2693,7 @@
         time_t new_date;
         struct tm *tm;
 
-        GP_DEBUG ("canon_int_set_time: %i=0x%x %s", (unsigned int) date, (unsigned int) date,
+        GP_DEBUG ("canon_int_set_time: %li=0x%lx %s", (unsigned long) date, (unsigned long) date,
                   asctime (localtime (&date)));
 
         /* call localtime() just to get 'extern long timezone' / tm->tm_gmtoff set.
@@ -2922,12 +2918,12 @@
                         "(expected %i got %i)", 0x0c, len);
                 return GP_ERROR_CORRUPTED_DATA;
         }
-        
+
         /* Capacity and available are not NULL as verified above.
         * But cap and ava are only set for the USB case, so we have to check for that.
         * If you know the logic better, feel free to improve it. */
         switch (camera->port->type) {
-                case GP_PORT_USB:                         
+                case GP_PORT_USB:
                         *capacity = cap;
                         *available = ava;
                         GP_DEBUG ("canon_int_get_disk_name_info: "
@@ -3100,7 +3096,7 @@
  * Implicitly assumes that uint8_t is a char for strings.
  *
  * A few notes about listing files and camera->pl->list_all_files:
- * 
+ *
  *   If camera->pl->list_all_files is false (intended default), then
  *   we list only "primary files" or ("main" files). Those are files
  *   like image files or movie files which the user explicitly created
@@ -3324,7 +3320,7 @@
                                    in this block */
                                 memset (&info, 0, sizeof (info));
 
-                                /* we start with nothing and continously add stuff */
+                                /* we start with nothing and continuously add stuff */
                                 info.file.fields = GP_FILE_INFO_NONE;
 
                                 info.file.mtime = dirent_time;
@@ -3511,7 +3507,7 @@
  *
  * NOTE: Since cameras that do not store the thumbnail in a separate
  * file does not return just the thumbnail but the first 10813 bytes
- * of the image (most oftenly the EXIF header with thumbnail data in
+ * of the image (most often the EXIF header with thumbnail data in
  * it) this must be treated before called a true thumbnail.
  *
  * Returns: result from canon_usb_get_thumbnail()
@@ -3604,7 +3600,7 @@
                         else if ( le32atoh ( msg ) != 0 ) {
                                 GP_DEBUG ( "canon_int_delete_file: "
                                            "non-zero return code 0x%x from camera. "
-                                           "Possibly tried to delete a nonexistent file.", 
+                                           "Possibly tried to delete a nonexistent file.",
                                            le32atoh ( msg ) );
                                 return GP_ERROR_FILE_NOT_FOUND;
                         }
@@ -3885,7 +3881,7 @@
                                 /* we're going to fill out the info structure
                                    in this block */
 
-                                /* We start with nothing and continously add stuff */
+                                /* We start with nothing and continuously add stuff */
                                 info->file.fields = GP_FILE_INFO_NONE;
 
                                 info->file.mtime = dirent_time;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/canon.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/canon.h Changed

@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef _CANON_H
-#define _CANON_H
+#ifndef CAMLIBS_CANON_CANON_H
+#define CAMLIBS_CANON_CANON_H
 
 #ifdef CANON_EXPERIMENTAL_UPLOAD
 # ifdef __GCC__
@@ -275,7 +275,7 @@
 	SHUTTER_SPEED_3_2_SEC = 0x2b,
 	SHUTTER_SPEED_2_5_SEC = 0x2d,
 	SHUTTER_SPEED_2_SEC = 0x30,
-	SHUTTER_SPEED_1_6_SEC = 0x32,
+	SHUTTER_SPEED_1_6_SEC = 0x33,
 	SHUTTER_SPEED_1_3_SEC = 0x35,
 	SHUTTER_SPEED_1_SEC = 0x38,
 	SHUTTER_SPEED_0_8_SEC = 0x3b,
@@ -400,7 +400,8 @@
 };
 
 struct canonExposureBiasStateStruct {
-	unsigned char value;
+	unsigned char valueEOS;
+	unsigned char valuePS;
 	char* label;
 };
 
@@ -415,7 +416,7 @@
 #define SELF_TIMER_1_INDEX  0x04 /* Currently not used */
 #define SELF_TIMER_2_INDEX  0x05 /* Currently not used */
 #define FLASH_INDEX         0x06
-#define BEEP_INDEX          0x07 
+#define BEEP_INDEX          0x07
 #define FOCUS_MODE_INDEX    0x12
 #define ISO_INDEX           0x1a
 #define APERTURE_INDEX      0x1c
@@ -426,15 +427,15 @@
 /**
  * canonCaptureSizeClass:
  * @CAPTURE_COMPATIBILITY: operate in the traditional gphoto2 mode
- * @CAPTURE_THUMB: capture thumbnails 
+ * @CAPTURE_THUMB: capture thumbnails
  * @CAPTURE_FULL_IMAGES: capture full-sized images
  *
  * By default (CAPTURE_COMPATIBILITY mode), the driver will capture
  * thumbnails to the host computer in capture_preview, and full-sized
- * images to the camera's drive in capture_image.  
- * CAPTURE_FULL_IMAGE will capture a full-sized image to the host 
+ * images to the camera's drive in capture_image.
+ * CAPTURE_FULL_IMAGE will capture a full-sized image to the host
  * computer in capture_preview, or to the camera's drive in capture_image.
- * CAPTURE_THUMB is likewise intended to capture thumbnails to either 
+ * CAPTURE_THUMB is likewise intended to capture thumbnails to either
  * the host computer or to the camera's drive, although these modes do not
  * seem to work right now.
  *
@@ -478,8 +479,8 @@
 	int receive_error; /* status of transfer on serial connection */
 	int first_init;  /* first use of camera   1 = yes 0 = no */
 	int uploading;   /* 1 = yes ; 0 = no */
-	int slow_send;   /* to send data via serial with a usleep(1) 
-			  * between each byte 1 = yes ; 0 = no */ 
+	int slow_send;   /* to send data via serial with a usleep(1)
+			  * between each byte 1 = yes ; 0 = no */
 
 	unsigned char seq_tx;
 	unsigned char seq_rx;
@@ -489,13 +490,14 @@
 	 */
 	int list_all_files; /* whether to list all files, not just know types */
 
-	int upload_keep_filename; /* 0=DCIF compatible filenames (AUT_*), 
+	int upload_keep_filename; /* 0=DCIF compatible filenames (AUT_*),
 				     1=keep original filename */
 
 	char *cached_drive;	/* usually something like C: */
 	int cached_ready;       /* whether the camera is ready to rock */
 
 	unsigned char *directory_state;	/* directory content state for wait_for_event */
+	unsigned int directory_state_length;	/* length of directory content state for wait_for_event */
 
 	long image_key, thumb_length, image_length; /* For immediate download of captured image */
 	long image_b_key, image_b_length; /* For immediate download of secondary captured image */
@@ -516,12 +518,12 @@
 
 	unsigned int body_id;	/* hardware serial number for some cameras */
 
-	unsigned char release_paramsRELEASE_PARAMS_LEN; /* "Release 
+	unsigned char release_paramsRELEASE_PARAMS_LEN; /* "Release
 							     parameters:"
-							     ISO, aperture, 
+							     ISO, aperture,
 							     etc */
 
-	int secondary_image; /* Should we attempt to download a 
+	int secondary_image; /* Should we attempt to download a
 				secondary image? (e.g., RAW + JPEG) */
 
 /*
@@ -565,14 +567,14 @@
 /**
  * canonDirentAttributeBits:
  * @CANON_ATTR_WRITE_PROTECTED: File is write-protected
- * @CANON_ATTR_UNKNOWN_2: 
- * @CANON_ATTR_UNKNOWN_4: 
- * @CANON_ATTR_UNKNOWN_8: 
+ * @CANON_ATTR_UNKNOWN_2:
+ * @CANON_ATTR_UNKNOWN_4:
+ * @CANON_ATTR_UNKNOWN_8:
  * @CANON_ATTR_NON_RECURS_ENT_DIR: This entry represents a directory
  *   that was not entered in this listing.
  * @CANON_ATTR_NOT_DOWNLOADED: This file has not yet been downloaded
  *   (the bit is cleared by the host software).
- * @CANON_ATTR_UNKNOWN_40: 
+ * @CANON_ATTR_UNKNOWN_40:
  * @CANON_ATTR_RECURS_ENT_DIR: This entry represents a directory
  *   that was entered in this listing; look for its contents
  *   later in the listing.
@@ -621,7 +623,7 @@
 	DIR_REMOVE = 1
 } canonDirFunctionCode;
 
-/* These macros contain the default label for all the 
+/* These macros contain the default label for all the
  * switch (camera->port->type) statements
  */
 
@@ -721,7 +723,7 @@
  */
 int canon_int_get_release_params (Camera *camera, GPContext *context);
 
-void canon_int_find_new_image ( Camera *camera, unsigned char *initial_state, unsigned char *final_state, CameraFilePath *path );
+void canon_int_find_new_image ( Camera *camera, unsigned char *initial_state, unsigned int initial_state_length, unsigned char *final_state, unsigned int final_state_length, CameraFilePath *path );
 
 
 /* path conversion - needs drive letter, and therefore cannot be moved
@@ -736,7 +738,7 @@
 /* for the macros abbreviating gp_log* */
 #define GP_MODULE "canon"
 
-#endif /* _CANON_H */
+#endif /* !defined(CAMLIBS_CANON_CANON_H) */
 
 /*
  * Local Variables:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/crc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/crc.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/crc.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/crc.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/doc/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/doc/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/doc/Protocol.xml -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/doc/Protocol.xml Changed

@@ -460,7 +460,7 @@
 	    <row><entry align="center">&boxv;</entry><entry align="center">&uarr;</entry><entry></entry></row>
 	    <row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01</entry></row>
 	    <row><entry namest="col1" nameend="col2" align="center">&lt;CRC&gt;</entry><entry></entry></row>
-	    <row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01 12 34  (fictious CRC)</entry></row>
+	    <row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01 12 34  (fictitious CRC)</entry></row>
 	    <row><entry namest="col1" nameend="col2" align="center">&lt;Escaping&gt;</entry><entry></entry></row>
 	    <row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 7E E0 01 12 34</entry></row>
 	    <row><entry namest="col1" nameend="col2" align="center">&lt;Framing&gt;</entry><entry></entry></row>
@@ -2528,7 +2528,7 @@
           </listitem>
           <listitem>
             <para>The sequence of messages 0x0a/0x1c; 0x0a/0x1d may be
-              repeated once or twice if the the image captured is the
+              repeated once or twice if the image captured is the
               last one that will fit on the camera's storage
               device.</para>
           </listitem>

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/library.c Changed

@@ -39,24 +39,8 @@
 
 #include <gphoto2/gphoto2.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #include "util.h"
 #include "library.h"
@@ -233,24 +217,24 @@
 };
 
 static const struct canonExposureBiasStateStruct exposureBiasStateArray = {
-	{0x10,"+2"},
-	{0x0d,"+1 2/3"},
-	{0x0c,"+1 1/2"},
-	{0x0b,"+1 1/3"},
-	{0x08,"+1"},
-	{0x05,"+2/3"},
-	{0x04,"+1/2"},
-	{0x03,"+1/3"},
-	{0x00,"0"},
-	{0xfd,"-1/3"},
-	{0xfc,"-1/2"},
-	{0xfb,"-2/3"},
-	{0xf8,"-1"},
-	{0xf5,"-1 1/3"},
-	{0xf4,"-1 1/2"},
-	{0xf3,"-1 2/3"},
-	{0xf0,"-2"},
-	{0, NULL},
+	{0x10,0x08,"+2"},
+	{0x0d,0x0b,"+1 2/3"},
+	{0x0c,0x0c,"+1 1/2"},
+	{0x0b,0x0d,"+1 1/3"},
+	{0x08,0x10,"+1"},
+	{0x05,0x13,"+2/3"},
+	{0x04,0x14,"+1/2"},
+	{0x03,0x15,"+1/3"},
+	{0x00,0x18,"0"},
+	{0xfd,0x1b,"-1/3"},
+	{0xfc,0x1c,"-1/2"},
+	{0xfb,0x1d,"-2/3"},
+	{0xf8,0x20,"-1"},
+	{0xf5,0x23,"-1 1/3"},
+	{0xf4,0x24,"-1 1/2"},
+	{0xf3,0x25,"-1 2/3"},
+	{0xf0,0x28,"-2"},
+	{0,0,NULL},
 };
 
 
@@ -358,7 +342,7 @@
  *
  */
 static int
-camera_manual (Camera __unused__ *camera, CameraText *manual, 
+camera_manual (Camera __unused__ *camera, CameraText *manual,
 	       GPContext __unused__ *context)
 {
 	GP_DEBUG ("camera_manual()");
@@ -532,9 +516,9 @@
 {
 	int res = 0;
 
-	if (camera->port->type == GP_PORT_USB) 
+	if (camera->port->type == GP_PORT_USB)
 		canon_usb_unlock_keys (camera, context);
-	
+
 	/* Turn off remote control if enabled (remote control only
 	 * applies to USB cameras, but in case of serial connection
 	 * remote_control should never be seen set here) */
@@ -690,7 +674,7 @@
  ****************************************************************************/
 
 static int
-file_list_func (CameraFilesystem __unused__ *fs, const char *folder, 
+file_list_func (CameraFilesystem __unused__ *fs, const char *folder,
 		CameraList *list, void *data,
 		GPContext *context)
 {
@@ -701,12 +685,12 @@
 	if (!check_readiness (camera, context))
 		return GP_ERROR;
 
-	return canon_int_list_directory (camera, folder, list, 
+	return canon_int_list_directory (camera, folder, list,
 					 CANON_LIST_FILES, context);
 }
 
 static int
-folder_list_func (CameraFilesystem __unused__ *fs, const char *folder, 
+folder_list_func (CameraFilesystem __unused__ *fs, const char *folder,
 		  CameraList *list, void *data,
 		  GPContext *context)
 {
@@ -717,13 +701,13 @@
 	if (!check_readiness (camera, context))
 		return GP_ERROR;
 
-	return canon_int_list_directory (camera, folder, list, 
+	return canon_int_list_directory (camera, folder, list,
 					 CANON_LIST_FOLDERS, context);
 }
 
 static int
 get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
-	       CameraFileType type, CameraFile *file, void *user_data, 
+	       CameraFileType type, CameraFile *file, void *user_data,
 	       GPContext *context)
 {
 	Camera *camera = user_data;
@@ -1069,8 +1053,8 @@
 		snprintf (time_str, sizeof (time_str), _("%s (host time %s%i seconds)"),
 			  formatted_camera_time, time_diff >= 0 ? "+" : "", (int) time_diff);
 	} else {
-		GP_DEBUG ("canon_int_get_time() returned negative result: %s (%i)",
-			  gp_result_as_string ((int) camera_time), (int) camera_time);
+		GP_DEBUG ("canon_int_get_time() returned negative result: %s (%li)",
+			  gp_result_as_string ((int) camera_time), (long) camera_time);
 		snprintf (time_str, sizeof (time_str), ("not available: %s"),
 			  gp_result_as_string ((int) camera_time));
 	}
@@ -1123,12 +1107,12 @@
 	(*sinfos)->access = GP_STORAGEINFO_AC_READONLY_WITH_DELETE;
 	return GP_OK;
 }
-	
+
 
 /****************************************************************************/
 
 static int
-camera_about (Camera __unused__ *camera, CameraText *about, 
+camera_about (Camera __unused__ *camera, CameraText *about,
 	      GPContext __unused__ *context)
 {
 	GP_DEBUG ("camera_about()");
@@ -1151,7 +1135,7 @@
 /****************************************************************************/
 
 static int
-delete_file_func (CameraFilesystem __unused__ *fs, const char *folder, 
+delete_file_func (CameraFilesystem __unused__ *fs, const char *folder,
 		  const char *filename, void *data,
 		  GPContext *context)
 {
@@ -1205,10 +1189,10 @@
 #ifdef CANON_EXPERIMENTAL_UPLOAD
 /*
  * get from the filesystem the name of the highest numbered picture or directory
- * 
+ *
  */
 static int
-get_last_file (Camera *camera, char *directory, char *destname, 
+get_last_file (Camera *camera, char *directory, char *destname,
 	       GPContext* context, char getdirectory, char*result)
 {
 	CameraFilesystem * fs = camera->fs;
@@ -1218,9 +1202,9 @@
 	GP_DEBUG ("get_last_file()");
 
 	if(directory1 == ':') {
-	    /* gp_file_list_folder() needs absolute filenames 
+	    /* gp_file_list_folder() needs absolute filenames
 	       starting with '/' */
-	    GP_DEBUG ("get_last_file(): replacing '%c:%c' by '/'", 
+	    GP_DEBUG ("get_last_file(): replacing '%c:%c' by '/'",
 		      directory0, directory2);
 	    sprintf(dir2, "/%s", &directory3);
 	    directory = dir2;
@@ -1238,7 +1222,7 @@
 	for(t=0;t<list->count;t++)
 	{
 	    char* name = list->entryt.name;
-	    if(getdirectory) 
+	    if(getdirectory)
 		GP_DEBUG ("get_last_file(): folder: %s", name);
 	    else
 		GP_DEBUG ("get_last_file(): file: %s", name);
@@ -1251,7 +1235,7 @@
 		continue;
 
 	    /* ...and only for files similar to AUT_0-9{4} */
-	    if(!getdirectory && (!isdigit(name6) || 
+	    if(!getdirectory && (!isdigit(name6) ||
 			         !isdigit(name7)))
 		continue;
 
@@ -1278,9 +1262,9 @@
 }
 
 /*
- * convert a filename to 8.3 format by truncating 
+ * convert a filename to 8.3 format by truncating
  * the basename to 8 and the extension to 3 chars
- * 
+ *
  */
 static void
 convert_filename_to_8_3(const char* filename, char* dest)
@@ -1293,7 +1277,7 @@
     }
     else {
 	int l = c-filename;
-	if(l>8) 
+	if(l>8)
 	    l=8;
 	memcpy(dest, filename, l);
 	destl=0;
@@ -1457,7 +1441,7 @@
 
 	gp_camera_get_abilities (camera, &a);
 	/* Special case for A50 and Pro 70 */
-	if ((camera->pl->speed > 57600) && 
+	if ((camera->pl->speed > 57600) &&
 	    ((camera->pl->md->model == CANON_CLASS_1)
 	     || (camera->pl->md->model == CANON_CLASS_2))) {
 		gp_context_error (context,
@@ -1550,7 +1534,7 @@
 
 /* Wait for an event */
 static int
-camera_wait_for_event (Camera *camera, int timeout, CameraEventType *eventtype, void **eventdata, GPContext *context) 
+camera_wait_for_event (Camera *camera, int timeout, CameraEventType *eventtype, void **eventdata, GPContext *context)
 {
 	return canon_int_wait_for_event (camera, timeout, eventtype, eventdata, context);
 }
@@ -1602,9 +1586,9 @@
 		}
 		i++;
 	}
-	
+
 	/* Set to "Compatibility mode" if not currently set */
-	if (menuval == -1) 
+	if (menuval == -1)
 		gp_widget_set_value (t, _("Compatibility Mode"));
 
 	gp_widget_append (section, t);
@@ -1615,7 +1599,7 @@
 	/* Necessary for release params: ISO, aperture, etc. */
 	if (!camera->pl->remote_control) {
 		res = canon_int_start_remote_control (camera, context);
-		if (res != GP_OK) 
+		if (res != GP_OK)
 			return -1;
 	}
 
@@ -1642,8 +1626,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown ISO value if the 
+
+	/* Set an unknown ISO value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1696,8 +1680,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown shutter value if the 
+
+	/* Set an unknown shutter value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1736,8 +1720,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown aperture value if the 
+
+	/* Set an unknown aperture value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1757,14 +1741,14 @@
 	while (exposureBiasStateArrayi.label) {
 		gp_widget_add_choice (t, _(exposureBiasStateArrayi.label));
 		if (camera->pl->release_paramsEXPOSUREBIAS_INDEX ==
-		    exposureBiasStateArrayi.value) {
+		    ((camera->pl->md->id_str && !strstr(camera->pl->md->id_str,"EOS") && !strstr(camera->pl->md->id_str,"Rebel")) ? exposureBiasStateArrayi.valuePS : exposureBiasStateArrayi.valueEOS)) {
 			gp_widget_set_value (t, _(exposureBiasStateArrayi.label));
 			menuval = i;
 		}
 		i++;
 	}
-	
-	/* Set an unknown exp bias value if the 
+
+	/* Set an unknown exp bias value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1794,7 +1778,7 @@
 		}
 		i++;
 	}
-	
+
 	/* Set an unknown imageFormat value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
@@ -1822,8 +1806,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown focus mode value if the 
+
+	/* Set an unknown focus mode value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1850,8 +1834,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown flash value if the 
+
+	/* Set an unknown flash value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1878,8 +1862,8 @@
 		}
 		i++;
 	}
-	
-	/* Set an unknown beep value if the 
+
+	/* Set an unknown beep value if the
 	 * camera is set to something weird */
 	if (menuval == -1) {
 		gp_widget_add_choice (t, _("Unknown"));
@@ -1911,6 +1895,7 @@
 	gp_widget_new (GP_WIDGET_TEXT, _("Camera Model"), &t);
 	gp_widget_set_name (t, "model");
 	gp_widget_set_value (t, camera->pl->ident);
+	gp_widget_set_readonly (t, 1);
 	gp_widget_append (section, t);
 
 	gp_widget_new (GP_WIDGET_TEXT, _("Date and Time"), &t);
@@ -1923,6 +1908,7 @@
 	} else {
 		gp_widget_set_value (t, _("Error"));
 	}
+	gp_widget_set_readonly (t, 1);
 	gp_widget_append (section, t);
 
 	gp_widget_new (GP_WIDGET_TEXT, _("Firmware Version"), &t);
@@ -1930,6 +1916,7 @@
 	sprintf (firm, "%i.%i.%i.%i", camera->pl->firmwrev3, camera->pl->firmwrev2,
 		 camera->pl->firmwrev1, camera->pl->firmwrev0);
 	gp_widget_set_value (t, firm);
+	gp_widget_set_readonly (t, 1);
 	gp_widget_append (section, t);
 
 	canon_get_batt_status (camera, &pwr_status, &pwr_source, context);
@@ -1948,6 +1935,7 @@
 	gp_widget_new (GP_WIDGET_TEXT, _("Power"), &t);
 	gp_widget_set_name (t, "power");
 	gp_widget_set_value (t, power_str);
+	gp_widget_set_readonly (t, 1);
 	gp_widget_append (section, t);
 
 
@@ -2013,8 +2001,8 @@
 			}
 			i++;
 		}
-		
-		if (!captureSizeArrayi.label) 
+
+		if (!captureSizeArrayi.label)
 			gp_context_status (context, _("Invalid capture size class setting"));
 
 	}
@@ -2157,7 +2145,7 @@
 			i = 0;
 			while (exposureBiasStateArrayi.label) {
 				if (strcmp (_(exposureBiasStateArrayi.label), wvalue) == 0) {
-					expbias = exposureBiasStateArrayi.value;
+					expbias = ((camera->pl->md->id_str && !strstr(camera->pl->md->id_str,"EOS") && !strstr(camera->pl->md->id_str,"Rebel")) ? exposureBiasStateArrayi.valuePS : exposureBiasStateArrayi.valueEOS);
 					break;
 				}
 				i++;
@@ -2187,7 +2175,7 @@
 			while (imageFormatStateArrayi.label) {
 				if (strcmp (_(imageFormatStateArrayi.label), wvalue) == 0)
 					break;
-				
+
 				i++;
 			}
 
@@ -2258,7 +2246,7 @@
 					gp_context_status (context, _("Beep mode changed"));
 				else
 					gp_context_status (context, _("Could not change beep mode"));
-			}		
+			}
 		}
 	}
 
@@ -2279,7 +2267,7 @@
 						gp_context_status (context, _("Zoom level changed"));
 					else
 						gp_context_status (context, _("Could not change zoom level"));
-				}		
+				}
 			}
 	}
 
@@ -2339,7 +2327,7 @@
 					gp_context_status (context, _("Flash mode changed"));
 				else
 					gp_context_status (context, _("Could not change flash mode"));
-			}		
+			}
 		}
 	}
 
@@ -2388,10 +2376,10 @@
 }
 
 static int
-get_info_func (CameraFilesystem __unused__ *fs, const char *folder, 
+get_info_func (CameraFilesystem __unused__ *fs, const char *folder,
 	       const char *filename,
-	       CameraFileInfo * info, 
-	       void __unused__ *data, GPContext __unused__ *context)
+	       CameraFileInfo * info,
+	       void *data, GPContext *context)
 {
 	Camera *camera = data;
 	GP_DEBUG ("get_info_func() called for '%s'/'%s'", folder, filename);
@@ -2452,7 +2440,7 @@
 	if (canonpath == NULL)
 		return GP_ERROR_BAD_PARAMETERS;
 
-	r = canon_int_directory_operations (camera, canonpath, 
+	r = canon_int_directory_operations (camera, canonpath,
 					    DIR_CREATE, context);
 	if (r != GP_OK)
 		return (r);
@@ -2494,7 +2482,7 @@
 	if (canonpath == NULL)
 		return GP_ERROR_BAD_PARAMETERS;
 
-	r = canon_int_directory_operations (camera, canonpath, 
+	r = canon_int_directory_operations (camera, canonpath,
 					    DIR_REMOVE, context);
 	if (r != GP_OK)
 		return (r);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/serial.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/serial.c Changed

@@ -23,27 +23,12 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #include "library.h"
 #include "canon.h"
@@ -211,7 +196,7 @@
  * @gdev: serial port to use
  * @to:   timeout in milliseconds
  *
- * Sets the timeout, in miliseconds.
+ * Sets the timeout, in milliseconds.
  *
  */
 static void
@@ -349,8 +334,8 @@
 /**
  * canon_serial_send_packet
  * @camera: Camera object to work with
- * @type: 
- * @seq: 
+ * @type:
+ * @seq:
  * @pkt: data to send to camera
  * @len: length of data
  *
@@ -691,7 +676,7 @@
 		if (type == PKT_ACK && mtype == 0x3 && dir == 0x21) {
 			GP_DEBUG("ignoring ACK received while waiting for MSG");
 			return frag;
-		} 
+		}
 */
 		if (len < MSG_HDR_LEN || fragMSG_02 != 2) {
 			GP_DEBUG ("ERROR: message format error");
@@ -1368,11 +1353,11 @@
 	 * don't actually use id_str, but serial_id_string.
 	 */
 	for (i = 0; modelsi.id_str != NULL; i++) {
-		if ((modelsi.serial_id_string != NULL) && 
+		if ((modelsi.serial_id_string != NULL) &&
 		    !strcmp (modelsi.serial_id_string, cam_id_str)) {
 			GP_DEBUG ("canon_serial_ready: Serial ID string matches '%s'",
 				  modelsi.serial_id_string);
-			gp_context_status (context, _("Detected a \"%s\" aka \"%s\""), 
+			gp_context_status (context, _("Detected a \"%s\" aka \"%s\""),
 					   modelsi.id_str, modelsi.serial_id_string);
 			camera->pl->md = (struct canonCamModelData *) &modelsi;
 			break;
@@ -1478,7 +1463,7 @@
  * @context: context for error reporting
  *
  * This is just the serial specific part extracted from the older
- * canon_get_thumbnail() routine. 
+ * canon_get_thumbnail() routine.
  *
  * Returns: gphoto2 error code
  *

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/serial.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/serial.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/usb.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/usb.c Changed

@@ -21,28 +21,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #endif /* CANON_EXPERIMENTAL_UPLOAD */
-#ifdef OS2
-#include <db.h>
-#endif
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #include <gphoto2/gphoto2.h>
 
@@ -58,14 +39,14 @@
 
 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);}
 
-/* IDENTIFY_INIT_TIMEOUT: the starting timeout (in milliseconds) 
+/* IDENTIFY_INIT_TIMEOUT: the starting timeout (in milliseconds)
  * to wait for the camera to respond to an "identify camera" request.
  * This timeout is doubled for each retry */
 /* It was originally 10, but this made the communication fail, so
  * bump up to 100. */
 #define IDENTIFY_INIT_TIMEOUT 100
 
-/* IDENTIFY_MAX_ATTEMPTS: how many "identify camera" requests to send 
+/* IDENTIFY_MAX_ATTEMPTS: how many "identify camera" requests to send
  * to the camera, until we give up for lack of response. */
 #define IDENTIFY_MAX_ATTEMPTS 5
 
@@ -379,7 +360,7 @@
 				else
 					GP_DEBUG ("canon_usb_camera_init() "
 						  "Step #5 of initialization failed! (returned %i, expected %i) "
-						  "Camera might still work though. Continuing.", 
+						  "Camera might still work though. Continuing.",
 						  i, 4);
 			}
                 }
@@ -460,10 +441,10 @@
 canon_usb_init (Camera *camera, GPContext *context)
 {
         /* unsigned char buffer0x44; */
-        int res, id_retry, i, camstat; 
+        int res, id_retry, i, camstat;
         /* int read_bytes; */
 	int orig_mstimeout = -1;
-	int id_mstimeout = IDENTIFY_INIT_TIMEOUT; /* separate timeout for 
+	int id_mstimeout = IDENTIFY_INIT_TIMEOUT; /* separate timeout for
 						     identify camera */
 
         GP_DEBUG ("Initializing the (USB) camera.");
@@ -480,7 +461,7 @@
         if ( camstat < 0 )
                 return camstat;
 
-	/* Save the original timeout value and set up the initial 
+	/* Save the original timeout value and set up the initial
 	   identify camera timeout value */
 	gp_port_get_timeout (camera->port, &orig_mstimeout);
 	gp_port_set_timeout (camera->port, id_mstimeout);
@@ -533,7 +514,7 @@
                 GP_DEBUG ( "canon_usb_init: camera uses newer protocol, so we get camera abilities" );
                 c_res = canon_usb_dialogue (camera,
                                             CANON_USB_FUNCTION_GET_PIC_ABILITIES_2,
-                                            &bytes_read, NULL, 0); 
+                                            &bytes_read, NULL, 0);
 
                 if ( c_res == NULL ) {
                         GP_DEBUG ( "canon_usb_init: \"get picture abilities\" failed; continuing anyway." );
@@ -565,7 +546,7 @@
                 if (res != GP_OK) {
                         gp_context_error (context, _("Camera not ready, get_battery failed: %s"),
                                           gp_result_as_string (res));
-                        return res; 
+                        return res;
                 }
 
         }
@@ -692,7 +673,7 @@
 
 		c_res = canon_usb_dialogue (camera,
 					    CANON_USB_FUNCTION_GET_PIC_ABILITIES_2,
-					    &bytes_read, NULL, 0); 
+					    &bytes_read, NULL, 0);
 
 		if ( c_res == NULL ) {
 			GP_DEBUG ( "canon_usb_lock_keys: \"get picture abilities\" failed; continuing anyway." );
@@ -784,7 +765,7 @@
                 }
                 else {
                         /* Your camera model does not need unlocking, cannot do unlocking or
-                         * we don't know how to unlock its keys. 
+                         * we don't know how to unlock its keys.
                          */
                         GP_DEBUG ("canon_usb_unlock_keys: Key unlocking not implemented for this camera model. "
                                   "If unlocking works when using the Windows software with your camera, "
@@ -943,11 +924,11 @@
 	unsigned char *final_state = NULL; /* For comparing
 					     * before/after
 					     * directories */
-	unsigned int directory_state_len, final_state_len;
+	unsigned int final_state_len;
         int status = GP_OK;
 
 	if (!camera->pl->directory_state)
-		status = canon_usb_list_all_dirs ( camera, &camera->pl->directory_state, &directory_state_len, context );
+		status = canon_usb_list_all_dirs ( camera, &camera->pl->directory_state, &camera->pl->directory_state_length, context );
 	if (status < GP_OK) {
 		GP_DEBUG ("canon_usb_wait_for_event: status %d", status);
 		return status;
@@ -970,7 +951,7 @@
 		if (status < GP_OK)
 			return status;
 		/* Find new file name in camera directory */
-		canon_int_find_new_image ( camera, camera->pl->directory_state, final_state, path );
+		canon_int_find_new_image ( camera, camera->pl->directory_state, camera->pl->directory_state_length, final_state, final_state_len, path );
 		if (path->folder0 != '/') {
 			free (path);
 			*eventtype = GP_EVENT_UNKNOWN;
@@ -979,6 +960,7 @@
 		}
 		free ( camera->pl->directory_state );
 		camera->pl->directory_state = final_state;
+		camera->pl->directory_state_length = final_state_len;
 		return GP_OK;
 	}
 	default:
@@ -1005,7 +987,7 @@
  *  command, then handle the interrupt pipe here.
  *
  * Returns: a char * that points to the data read from the camera (or
- * NULL on failure), and sets what @return_length points to to the number
+ * NULL on failure), and sets what @return_length points to the number
  * of bytes read. If this function returns NULL, return any photographic
  * failure error codes in what @photo_status points to.
  *
@@ -1025,15 +1007,12 @@
                 *return_length = 0;
 
 	/* for later wait_event */
-	if (!camera->pl->directory_state) {
-		unsigned int directory_state_len;
-
-		status = canon_usb_list_all_dirs ( camera, &camera->pl->directory_state, &directory_state_len, context );
-	}
+	if (!camera->pl->directory_state)
+		status = canon_usb_list_all_dirs ( camera, &camera->pl->directory_state, &camera->pl->directory_state_length, context );
 
         GP_DEBUG ("canon_usb_capture_dialogue()");
 
-	*photo_status = 0; /* This should only be checked by the caller 
+	*photo_status = 0; /* This should only be checked by the caller
 			      if canon_usb_capture_dialogue() returns null */
 
         /* Build payload for command, which contains subfunction code */
@@ -1083,7 +1062,7 @@
 		GP_DEBUG ( "canon_usb_capture_dialogue: Issuing unknown command 0x22 for class 6 camera." );
                 buffer = canon_usb_dialogue ( camera,
 					      CANON_USB_FUNCTION_20D_UNKNOWN_2,
-					      return_length, payload, 4 ); 
+					      return_length, payload, 4 );
 
                 if ( buffer == NULL )
                         GP_DEBUG ( "canon_usb_capture_dialogue: Unknown command 0x22 returned null buffer; continuing anyway." );
@@ -1154,7 +1133,7 @@
 			/* (only for RAW + JPEG modes) */
 			GP_DEBUG ( "canon_usb_capture_dialogue: "
 				   "secondary image descriptor received");
-			
+
 			camera->pl->image_b_length = le32atoh ( buf2+0x11 );
 			camera->pl->image_b_key = le32atoh ( buf2+0x0c );
 
@@ -1334,7 +1313,7 @@
  *
  * Returns: a char * that points to all of the packet data read from
  * the camera (or NULL on failure), and sets what @return_length
- * points to to the number of bytes read.  Note that, unlike this
+ * points to the number of bytes read.  Note that, unlike this
  * function, canon_usb_dialogue() chops off the first 0x50 bytes to
  * generate its output.
  *
@@ -1630,7 +1609,7 @@
  *      returned with GP_OK or some error code.
  *
  * Returns: a char * that points to the data read from the camera (or
- * NULL on failure), and sets what @return_length points to to the number
+ * NULL on failure), and sets what @return_length points to the number
  * of bytes read.
  *
  */
@@ -1642,13 +1621,13 @@
 
 	buffer = canon_usb_dialogue_full (camera, canon_funct, return_length,
 					  payload, payload_length);
-	
+
 	/* Remove the packet header from the response */
 	if (return_length)
 		*return_length = *return_length - 0x50;
-	if (buffer) 
+	if (buffer)
 		return buffer + 0x50;
-	else 
+	else
 		return NULL;
 }
 
@@ -1983,7 +1962,7 @@
  * Gets the just-captured image from a USB-connected Canon
  * camera. This function must be called soon after an image capture,
  * and needs the image key returned by canon_usb_capture_dialogue().
- * This function is only used for "secondary images," e.g., the JPEGs 
+ * This function is only used for "secondary images," e.g., the JPEGs
  * downloaded when the camera's capture image format mode is set to "RAW + JPEG"
  *
  * Returns: gphoto2 error code, length in @length, and image data in @data.
@@ -2104,7 +2083,7 @@
         }
         memset ( payload, 0, payload_size );
 
-        strncpy ( (char *)payload + 0x4, camera_filename, strlen(camera_filename) );
+        strcpy ( (char *)payload + 0x4, camera_filename );
         htole32a ( payload, time );          /* Load specified time for camera directory. */
         result_buffer = canon_usb_dialogue ( camera, CANON_USB_FUNCTION_SET_FILE_TIME,
 					     &bytes_read, payload, payload_size );
@@ -2186,7 +2165,7 @@
  * @destname: name file should have on camera
  * @destpath: pathname for directory to put file
  * @context: context for error reporting
- * 
+ *
  * Uploads file to USB camera
  *
  * Bugs:
@@ -2194,11 +2173,11 @@
  * correctly uploaded, cause the camera to not accept any more uploads.
  * Smaller files work fine.
  * s10sh (http://www.kyuzz.org/antirez/s10sh.html) has the same problem.
- * The problem only appears when USB deinitialisation and initialisation
+ * The problem only appears when USB deinitialization and initialization
  * is performed between uploads. You can call this function more than
- * once with big files during one session without encountering the problem 
+ * once with big files during one session without encountering the problem
  * described. <kramm@quiss.org>
- * 
+ *
  * Returns: gphoto2 error code
  *
  */
@@ -2215,7 +2194,7 @@
 #else /* else ifdef CANON_EXPERIMENTAL_UPLOAD */
 
 int
-canon_usb_put_file (Camera *camera, CameraFile *file, 
+canon_usb_put_file (Camera *camera, CameraFile *file,
 		    const char *xfilename, const char *destname, const char *destpath,
                     GPContext *context)
 {
@@ -2342,7 +2321,7 @@
 		/* Max length of data block */
 		htole32a ( packet+0x58, len2 );
 
-		strcpy(&packet0x5c, filename); 
+		strcpy(&packet0x5c, filename);
 		memcpy(&packet0x5c+filename_len+1, &dataoffs, len2);
 
 		status = gp_port_write (camera->port, packet, len1+0x40);
@@ -2443,7 +2422,7 @@
          *
          * the 0x00 before dirname means 'no recursion'
          * NOTE: the first 0x00 after dirname is the NULL byte terminating
-         * the string, so payload_length is strlen(dirname) + 4 
+         * the string, so payload_length is strlen(dirname) + 4
          */
         if (strlen (path) + 4 > sizeof (payload)) {
                 GP_DEBUG ("canon_usb_get_dirents: "
@@ -2514,7 +2493,7 @@
          * the 0x0f before dirname means 'recurse to level 15', which
          * should get all the directories on the camera.
          * NOTE: the first 0x00 after dirname is the NULL byte terminating
-         * the string, so payload_length is strlen(dirname) + 4 
+         * the string, so payload_length is strlen(dirname) + 4
          */
         if (strlen (disk_name) + 4 > sizeof (payload)) {
                 GP_DEBUG ("canon_usb_list_all_dirs: "
@@ -2611,9 +2590,9 @@
          * the colon/space problem. (FIXME)
          */
         for (i = 0; modelsi.id_str != NULL; i++) {
-                if (modelsi.usb_vendor 
+                if (modelsi.usb_vendor
                     && modelsi.usb_product
-                    && (a.usb_vendor  == modelsi.usb_vendor) 
+                    && (a.usb_vendor  == modelsi.usb_vendor)
                     && (a.usb_product == modelsi.usb_product)) {
                         GP_DEBUG ("canon_usb_identify: USB ID match 0x%04x:0x%04x (model name \"%s\")",
                                   modelsi.usb_vendor, modelsi.usb_product, modelsi.id_str);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/usb.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/usb.h Changed

@@ -4,8 +4,8 @@
  *
  ****************************************************************************/
 
-#ifndef _CANON_USB_H
-#define _CANON_USB_H
+#ifndef CAMLIBS_CANON_USB_H
+#define CAMLIBS_CANON_USB_H
 
 /**
  * USB_BULK_READ_SIZE
@@ -102,7 +102,7 @@
  * to select which command to issue to the camera. See the protocol
  * document for details.
  */
- 
+
 typedef enum {
 	CANON_USB_FUNCTION_GET_FILE = 1,
 	CANON_USB_FUNCTION_IDENTIFY_CAMERA,
@@ -203,7 +203,7 @@
 } canonSubcommandIndex;
 
 
-struct canon_usb_control_cmdstruct 
+struct canon_usb_control_cmdstruct
 {
 	canonSubcommandIndex num;
 	char *description;
@@ -223,7 +223,7 @@
 
 
 
-struct canon_usb_cmdstruct 
+struct canon_usb_cmdstruct
 {
 	canonCommandIndex num;
 	char *description;
@@ -253,14 +253,14 @@
 
 int canon_usb_init (Camera *camera, GPContext *context);
 int canon_usb_set_file_time ( Camera *camera, char *camera_filename, time_t time, GPContext *context);
-int canon_usb_put_file (Camera *camera, CameraFile *file, const char *filename, const char *destname, const char *destpath, 
+int canon_usb_put_file (Camera *camera, CameraFile *file, const char *filename, const char *destname, const char *destpath,
 	        GPContext *context);
 unsigned char *canon_usb_capture_dialogue (Camera *camera, unsigned int *return_length, int *photo_status, GPContext *context );
 unsigned char *canon_usb_dialogue_full (Camera *camera, canonCommandIndex canon_funct,
 				   unsigned int *return_length, const unsigned char *payload, unsigned int payload_length);
 unsigned char *canon_usb_dialogue (Camera *camera, canonCommandIndex canon_funct,
 				   unsigned int *return_length, const unsigned char *payload, unsigned int payload_length);
-int canon_usb_long_dialogue (Camera *camera, canonCommandIndex canon_funct, unsigned char **data, 
+int canon_usb_long_dialogue (Camera *camera, canonCommandIndex canon_funct, unsigned char **data,
 		unsigned int *data_length, unsigned int max_data_size, const unsigned char *payload,
 		unsigned int payload_length, int display_status, GPContext *context);
 int canon_usb_get_file (Camera *camera, const char *name, unsigned char **data, unsigned int *length, GPContext *context);
@@ -282,7 +282,8 @@
 int canon_usb_wait_for_event (Camera *camera, int timeout,
 			CameraEventType *eventtype, void **eventdata,
 			GPContext *context);
-#endif /* _CANON_USB_H */
+
+#endif /* !defined(CAMLIBS_CANON_USB_H) */
 
 /****************************************************************************
  *

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/util.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/util.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/canon/util.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/canon/util.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/ChangeLog Changed

@@ -13,7 +13,7 @@
 
 	* casio-qv.c:
 	  corrected preview type to PPM
-		do not explictly append filename of captured image to filesystem
+		do not explicitly append filename of captured image to filesystem
 		reset line speed and power down interface on exit
 	* casio-qv-commands.c:
 	  capture works now
@@ -64,23 +64,23 @@
 
 	* PROTOCOL.txt: added protocol description
 
-2003-01-08  Lutz Müller <lutz@users.sourceforge.net>
+2003-01-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* casio-qv.c (camera_init): Cosmetic change.
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
-2002-09-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* casio-qv.c (camera_init): Fix initialization.
 	* casio-qv-commands.c,h (QVgetthumb): New.
 
-2002-09-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* casio-qv-commands.c,h (QVsetspeed): New.
 
-2002-09-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* casio-qv-commands.c (QVping): Fix.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/Makefile-files Changed

@@ -1,16 +1,24 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += casio/PROTOCOL.txt casio/ChangeLog
+EXTRA_DIST               += %reldir%/ChangeLog
+EXTRA_DIST               += %reldir%/PROTOCOL.txt
 
-EXTRA_LTLIBRARIES += casio_qv.la
 
-casio_qv_la_SOURCES =		\
-	casio/casio-qv.c				\
-	casio/casio-qv-commands.c casio/casio-qv-commands.h \
-	casio/camtojpeg.c casio/camtojpeg.h			\
-	casio/cam2jpgtab.h casio/jpegtab_f.h		\
-	casio/ycctoppm.c casio/ycctoppm.h
+EXTRA_LTLIBRARIES        += casio_qv.la
 
-casio_qv_la_LDFLAGS = $(camlib_ldflags)
-casio_qv_la_DEPENDENCIES = $(camlib_dependencies)
-casio_qv_la_LIBADD = $(camlib_libadd)
+casio_qv_la_SOURCES       =
+casio_qv_la_SOURCES      += %reldir%/casio-qv.c
+casio_qv_la_SOURCES      += %reldir%/casio-qv-commands.c
+casio_qv_la_SOURCES      += %reldir%/casio-qv-commands.h
+casio_qv_la_SOURCES      += %reldir%/camtojpeg.c
+casio_qv_la_SOURCES      += %reldir%/camtojpeg.h
+casio_qv_la_SOURCES      += %reldir%/cam2jpgtab.h
+casio_qv_la_SOURCES      += %reldir%/jpegtab_f.h
+casio_qv_la_SOURCES      += %reldir%/ycctoppm.c
+casio_qv_la_SOURCES      += %reldir%/ycctoppm.h
+
+casio_qv_la_CFLAGS        = $(camlib_cflags)
+casio_qv_la_CPPFLAGS      = $(camlib_cppflags)
+casio_qv_la_DEPENDENCIES  = $(camlib_dependencies)
+casio_qv_la_LDFLAGS       = $(camlib_ldflags)
+casio_qv_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/PROTOCOL.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/PROTOCOL.txt Changed

@@ -30,7 +30,7 @@
 CASIO's QV-10 serial cable is a level converter. It converts RS-232C 
 voltage levels to QV-10's voltage levels. This voltage converter circuit
 uses the electrical power supplied by the host computer's RS-232C 
-connector. (V+ is CTS, V- is RTS.) To recieve digital data from QV-10, 
+connector. (V+ is CTS, V- is RTS.) To receive digital data from QV-10, 
 set the CTS terminal to ON, RTS terminal to OFF. 
 
 On power-up, QV-10 serial communication speed defaults to 9600baud.  This
@@ -54,7 +54,7 @@
 
     above the line: data sent to QV-10
     ---------------------------------------
-    below the line: data recieved from QV-10
+    below the line: data received from QV-10
 
 ASCII code values are quoted.
 All other values are hex.
@@ -137,7 +137,7 @@
 
 Comment:
  WW WW: Data Block Size (2 bytes):  (Normally 0x00 0x80, 128 bytes)
-        The data preceeding the endmark(02 00 00 03 FC) is its 
+        The data preceding the endmark(02 00 00 03 FC) is its 
         block size(under 0x00 0x80).
     JJ: Picture data. (Image Area of CAM format) 
         (Please refer to the CAM format information below).
@@ -162,7 +162,7 @@
 
 Comment:
     The return byte 6a is checksum.
-    The return byte ZZ(normaly 06 ?) is unknown.
+    The return byte ZZ(normally 06 ?) is unknown.
     Picture Data format is the same as above.
     The procedure of send a 'fine mode(640x480)' picture for QV100 is unknown.
 
@@ -191,7 +191,7 @@
 Comment:
  WW WW: Data block size. (2byte). 
         Normally 0x00 0x80 (128 bytes)
-        The data preceeding the endmark(02 00 00 03 FC) is its 
+        The data preceding the endmark(02 00 00 03 FC) is its 
         block size(under 0x00 0x80).
     TT: Picture data. (YCC format)
     SS: Check sum.
@@ -236,8 +236,8 @@
     
 Comment:
   WW WW: Data block size. (2bytes). 
-         Normaly 0x00 0x80, 128 bytes.
-         The data preceeding the endmark(02 00 00 03 FC) is its 
+         Normally 0x00 0x80, 128 bytes.
+         The data preceding the endmark(02 00 00 03 FC) is its 
          block size(under 0x00 0x80).
      TT: Picture Data. (YCC format)
      SS: Check sum.
@@ -387,7 +387,7 @@
 Comment:
       Fetch battery boltage.
     XX: battery voltage.
-        XX/0x10 (devide by 0x10) is an approximate voltage value.
+        XX/0x10 (divide by 0x10) is an approximate voltage value.
     The return byte 83 is checksum.
     (at QV-700/770 this function report another value.)
 
@@ -586,7 +586,7 @@
 
 Comment:
  WW WW: Data Block Size (2 bytes):  (Normally 0x00 0x80, 128 bytes)
-        The data preceeding the endmark(02 00 00 03 FC) is its 
+        The data preceding the endmark(02 00 00 03 FC) is its 
         block size(under 0x00 0x80).
     JJ: Picture data. (JFIF format) 
     SS: Check sum.  Reverse bits of all sum of second byte (after 0x02)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/camtojpeg.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/camtojpeg.c Changed

@@ -62,16 +62,16 @@
     +sizeof(sos_v)+vsize
     +sizeof(eoi)
   ));
-  
+
   dst=*jpeg;
   memcpy(dst,soi,sizeof(soi));     dst+=sizeof(soi);
   memcpy(dst,app0,sizeof(app0));   dst+=sizeof(app0);
 
   cam+=8;
-  
+
   memcpy(dst,dqt0,sizeof(dqt0));   dst+=sizeof(dqt0);
   memcpy(dst,cam,64);              dst+=64;            cam+=64;
-  
+
   memcpy(dst,dqt1,sizeof(dqt1));   dst+=sizeof(dqt1);
   memcpy(dst,cam,64);              dst+=64;            cam+=64;
 
@@ -80,7 +80,7 @@
 
   memcpy(dst,sos_y,sizeof(sos_y)); dst+=sizeof(sos_y);
   memcpy(dst,cam,ysize);           dst+=ysize;         cam+=ysize;
-  
+
   memcpy(dst,sos_u,sizeof(sos_u)); dst+=sizeof(sos_u);
   memcpy(dst,cam,usize);           dst+=usize;         cam+=usize;
 
@@ -97,7 +97,7 @@
   int size;
   static const unsigned char c1 = { 1 };
   unsigned char *dst;
-  
+
   size = u32(cam + 4);
 
   *jpeg=malloc(*jpegSize=
@@ -123,7 +123,7 @@
 
   memcpy(dst,sof_f,sizeof(sof_f)); dst+=sizeof(sof_f);
   memcpy(dst,dht_f,sizeof(dht_f)); dst+=sizeof(dht_f);
-  
+
   memcpy(dst,sos_f,sizeof(sos_f)); dst+=sizeof(sos_f);
   memcpy(dst,cam,size);            dst+=size;          cam+=size;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/camtojpeg.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/camtojpeg.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/casio-qv-commands.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/casio-qv-commands.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/casio-qv-commands.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/casio-qv-commands.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/casio-qv.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/casio-qv.c Changed

@@ -1,16 +1,16 @@
 /* casio-qv.c
  *
- * Copyright © 2001 Lutz Müller
+ * Copyright Â© 2001 Lutz MÃ¼ller
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -34,26 +34,15 @@
 #define THUMBNAIL_HEIGHT 36
 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);}
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 static int
 get_info_func (CameraFilesystem *fs, const char *folder, const char *file,
 	       CameraFileInfo *info, void *data, GPContext *context);
 
 int
-camera_id (CameraText *id) 
+camera_id (CameraText *id)
 {
 	strcpy (id->text, "Casio QV");
 
@@ -73,11 +62,11 @@
 	{"Casio:QV300", 1, 0x01048dc0},
 	{"Casio:QV700", 1, 0x01a0e081},
 	{"Casio:QV770", 1, 0x01a10000},
-	{NULL}
+	{NULL, 0, 0}
 };
 
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	int i;
 	CameraAbilities a;
@@ -104,7 +93,7 @@
 
 		CHECK_RESULT (gp_abilities_list_append (list, a));
 	}
-	
+
 	return (GP_OK);
 }
 
@@ -182,7 +171,7 @@
 }
 
 static int
-camera_about (Camera *camera, CameraText *about, GPContext *context) 
+camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
 	strcpy (about->text, _("Driver framework written by Lutz Mueller "
 		"<lutz@users.sf.net>.\n"
@@ -278,7 +267,7 @@
         gp_widget_add_choice (child, _("OK"));
         if (status0&0x80) strcpy (t, _("Too bright"));
         else if (status0&0x40) strcpy (t, _("Too dark"));
-	else strcpy (t, _("OK"));                
+	else strcpy (t, _("OK"));
         gp_widget_set_value (child, t);
         gp_widget_append (*window, child);
 
@@ -327,7 +316,7 @@
 };
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
 	gp_port_settings settings;
 	int selected_speed;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/ycctoppm.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/ycctoppm.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/casio/ycctoppm.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/casio/ycctoppm.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/clicksmart310/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/clicksmart310/Makefile-files Changed

@@ -1,13 +1,19 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += clicksmart310/README.clicksmart310
-camlibdoc_DATA += clicksmart310/README.clicksmart310
+EXTRA_DIST                    += %reldir%/README.clicksmart310
+camlibdoc_DATA                += %reldir%/README.clicksmart310
 
-EXTRA_LTLIBRARIES += clicksmart310.la
 
-clicksmart310_la_SOURCES = \
-	clicksmart310/library.c \
-	clicksmart310/clicksmart.c clicksmart310/clicksmart.h \
-	clicksmart310/spca50x-jpeg-header.h
-clicksmart310_la_LDFLAGS = $(camlib_ldflags)
-clicksmart310_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES             += clicksmart310.la
+
+clicksmart310_la_SOURCES       =
+clicksmart310_la_SOURCES      += %reldir%/library.c
+clicksmart310_la_SOURCES      += %reldir%/clicksmart.c
+clicksmart310_la_SOURCES      += %reldir%/clicksmart.h
+clicksmart310_la_SOURCES      += %reldir%/spca50x-jpeg-header.h
+
+clicksmart310_la_CFLAGS        = $(camlib_cflags)
+clicksmart310_la_CPPFLAGS      = $(camlib_cppflags)
+clicksmart310_la_DEPENDENCIES  = $(camlib_dependencies)
+clicksmart310_la_LDFLAGS       = $(camlib_ldflags)
+clicksmart310_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/clicksmart310/clicksmart.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/clicksmart310/clicksmart.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/clicksmart310/clicksmart.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/clicksmart310/clicksmart.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/clicksmart310/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/clicksmart310/library.c Changed

@@ -151,7 +151,7 @@
         Camera *camera = data;
 	int n;
 	GP_DEBUG ("List files in %s\n", folder);
-    	n = camera->pl->num_pics;	
+    	n = camera->pl->num_pics;
 	gp_list_populate(list, "cs%03i.jpeg", n);
 	return GP_OK;
 }
@@ -172,7 +172,7 @@
 
 	/* Get the entry number of the photo on the camera */
     	k = gp_filesystem_number (camera->fs, "/", filename, context);
-    	
+
 	if (GP_FILE_TYPE_EXIF==type) return GP_ERROR_FILE_EXISTS;
 
 	if (GP_FILE_TYPE_RAW!=type && GP_FILE_TYPE_NORMAL !=type && GP_FILE_TYPE_PREVIEW!=type)
@@ -192,31 +192,29 @@
 		jpeg_format = JPEG_QCIF_FORMAT;
 		break;
 	default:  GP_DEBUG ( "Unknown resolution setting %i\n", res);
-		return GP_ERROR;		
+		return GP_ERROR;
 	}
 
-	data = malloc (w*h);
-	if(!data)
-		return GP_ERROR_NO_MEMORY;
+	data = NULL;
 
 	GP_DEBUG("Fetch entry %i\n", k);
-	b = clicksmart_read_pic_data (camera->pl, camera->port, data, k);
+	b = clicksmart_read_pic_data (camera->pl, camera->port, &data, k);
 
 	if (GP_FILE_TYPE_RAW == type) {	/* type is GP_FILE_TYPE_RAW */
 		gp_file_set_mime_type (file, GP_MIME_RAW);
 	        gp_file_set_data_and_size (file, (char *)data, b);
 		/* Reset camera when done, for more graceful exit. */
 		if (k +1 == camera->pl->num_pics) {
-	    		clicksmart_reset (camera->port);	
+	    		clicksmart_reset (camera->port);
 		}
 		return GP_OK;
 	}
-		
-	GP_DEBUG ("size = %i\n", b);	
+
+	GP_DEBUG ("size = %i\n", b);
 
 	/* It looks as though o_size = b */
 	/* It seems that qIndex is byte7, which is always 3, so I use that. */
-	
+
 	file_size = b + 589 + 1024 * 10;
 
 	jpeg_out = malloc(file_size);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/clicksmart310/spca50x-jpeg-header.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/clicksmart310/spca50x-jpeg-header.h Changed

@@ -1,19 +1,19 @@
-/* spca50x-jpeg-header.h 
+/* spca50x-jpeg-header.h
  *
  * part of libgphoto2/camlibs/clicksmart310
  *
- * This file is essentially identical to the file of the same name, 
- * found in libgphoto2/camlibs/spca50x. 
+ * This file is essentially identical to the file of the same name,
+ * found in libgphoto2/camlibs/spca50x.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef __SPCA50X_JPEG_HEADER_H
-#define __SPCA50X_JPEG_HEADER_H
+#ifndef CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H
+#define CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H
 
 /*
  *  Start from 0 -> 588
@@ -35,7 +35,7 @@
 #define SPCA50X_JPG_DEFAULT_HEADER_PART3_LENGTH 33
 #define SPCA50X_JPG_DEFAULT_HEADER_LENGTH	589
 
-static unsigned 
+static unsigned
 char SPCA50xJPGDefaultHeaderPart1SPCA50X_JPG_DEFAULT_HEADER_PART1_LENGTH = {
 	/* SOI(Start of Image) */
 	0xFF,0xD8,
@@ -53,7 +53,7 @@
 	0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,
 	0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22
 };
-static unsigned 
+static unsigned
 char SPCA50xJPGDefaultHeaderPart2SPCA50X_JPG_DEFAULT_HEADER_PART2_LENGTH = {
 	/* DHT(Define Huffman Table) */
 	0xFF,0xC4,
@@ -89,7 +89,7 @@
  *  5 - 6 : Image Height(H Byte,L Byte)
  *  7 - 8 : Image Width(H Byte,L Byte)
  */
-static unsigned 
+static unsigned
 char  SPCA50xJPGDefaultHeaderPart3SPCA50X_JPG_DEFAULT_HEADER_PART3_LENGTH = {
 	/* SOFn(Start of Frame) */
 	0xFF,0xC0,
@@ -204,4 +204,4 @@
 	  124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124 }
 };
 
-#endif /* __SPCA50X_JPEG_HEADER_H */
+#endif /* !defined(CAMLIBS_CLICKSMART310_SPCA50X_JPEG_HEADER_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digigr8/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digigr8/Makefile-files Changed

@@ -1,22 +1,33 @@
-# -*- Makefile -*-
-
-EXTRA_DIST += digigr8/README.905C
-EXTRA_DIST += digigr8/README.9050
-EXTRA_DIST += digigr8/README.9051
-EXTRA_DIST += digigr8/README.9052
-EXTRA_DIST += digigr8/README.913D
-EXTRA_DIST += digigr8/ChangeLog
-camlibdoc_DATA += digigr8/README.905C
-camlibdoc_DATA += digigr8/README.9050
-camlibdoc_DATA += digigr8/README.9051
-camlibdoc_DATA += digigr8/README.9052
-camlibdoc_DATA += digigr8/README.913D
-EXTRA_LTLIBRARIES += digigr8.la
-
-digigr8_la_SOURCES = \
-	digigr8/library.c \
-	digigr8/digigr8.c digigr8/digigr8.h \
-	digigr8/digi_postprocess.c 
-digigr8_la_LDFLAGS = $(camlib_ldflags)
-digigr8_la_DEPENDENCIES = $(camlib_dependencies)
-digigr8_la_LIBADD = $(camlib_libadd)
+# -*- Makefile-automake -*-
+
+EXTRA_DIST              += %reldir%/ChangeLog
+
+EXTRA_DIST              += %reldir%/README.9050
+camlibdoc_DATA          += %reldir%/README.9050
+
+EXTRA_DIST              += %reldir%/README.9051
+camlibdoc_DATA          += %reldir%/README.9051
+
+EXTRA_DIST              += %reldir%/README.9052
+camlibdoc_DATA          += %reldir%/README.9052
+
+EXTRA_DIST              += %reldir%/README.905C
+camlibdoc_DATA          += %reldir%/README.905C
+
+EXTRA_DIST              += %reldir%/README.913D
+camlibdoc_DATA          += %reldir%/README.913D
+
+
+EXTRA_LTLIBRARIES       += digigr8.la
+
+digigr8_la_SOURCES       =
+digigr8_la_SOURCES      += %reldir%/library.c
+digigr8_la_SOURCES      += %reldir%/digigr8.c
+digigr8_la_SOURCES      += %reldir%/digigr8.h
+digigr8_la_SOURCES      += %reldir%/digi_postprocess.c
+
+digigr8_la_CFLAGS        = $(camlib_cflags)
+digigr8_la_CPPFLAGS      = $(camlib_cppflags)
+digigr8_la_DEPENDENCIES  = $(camlib_dependencies)
+digigr8_la_LDFLAGS       = $(camlib_ldflags)
+digigr8_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digigr8/digi_postprocess.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digigr8/digi_postprocess.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digigr8/digigr8.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digigr8/digigr8.c Changed

@@ -2,18 +2,18 @@
  * digigr8.c
  *
  * Part of libgphoto2/camlibs/digigr8
- * Here are the functions which are needed to get data from the camera.  
+ * Here are the functions which are needed to get data from the camera.
  *
  * Copyright (c) 2005 Theodore Kilgore <kilgota@auburn.edu>
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
  * Cameras supported by this driver have Product ID 0x905C, 0x9050, or.
  * 0x913D.
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
 #include <config.h>
 
@@ -24,20 +24,17 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include "digigr8.h"
 
-#define GP_MODULE "digigr8" 
+#define GP_MODULE "digigr8"
 
 #define SQWRITE gp_port_usb_msg_write
 #define SQREAD  gp_port_usb_msg_read
 
-int 
+int
 digi_init (GPPort *port, CameraPrivateLibrary *priv)
 {
 	char c0x14;
@@ -49,17 +46,16 @@
 
 	SQWRITE (port, 0x0c, 0x14f4, 0x0, NULL, 0);
 	SQREAD (port, 0x0c, 0xf5, 0x00, c, 0x14);
-	SQWRITE (port, 0x0c, 0x1440, 0x110f, NULL, 0);
 	digi_reset (port);
 	SQWRITE (port, 0x0c, 0x14f0, 0x0, NULL, 0);
 
-	gp_port_read (port, c, 0x14); 	
+	gp_port_read (port, c, 0x14);
 	digi_reset(port);
 	SQWRITE (port, 0x0c, 0x20, 0x40, NULL, 0);
 	gp_port_read(port, (char *)catalog, 0x4000); /* We need 16 bytes for each photo. */
 	digi_reset (port);
 
-	/* The first occurence of a zero denotes end of files entries */
+	/* The first occurrence of a zero denotes end of files entries */
 	for (i=0; i<0x4000 && catalogi; i+=16);
 	priv->nb_entries = i>>4;
 	catalog_tmp = realloc(catalog, i+16);
@@ -68,15 +64,15 @@
 	memset (catalog+i, 0, 16);
 	if (i) {
 		/*
-		 * 0x913c cameras allow individual photo deletion. This causes 
+		 * 0x913c cameras allow individual photo deletion. This causes
 		 * the relevant catalog line to start with 0x64. So the related
-		 * lines of config data must be removed, and the deleted 
+		 * lines of config data must be removed, and the deleted
 		 * images need to be cast out from the count.
 		 */
 
 		for (j=0; j<i; j+=16) {
 			if ((!catalogj) || (catalogj == 0x64)) {
-				memmove(catalog+j, catalog+j+16, i+16-j);
+				memmove(catalog+j, catalog+j+16, i-j);
 				priv->nb_entries -- ;
 			}
 		}
@@ -94,7 +90,7 @@
 }
 
 
-int
+unsigned int
 digi_get_comp_ratio (CameraPrivateLibrary *priv, int entry)
 {
 	switch (priv->catalog16*entry) {
@@ -107,7 +103,7 @@
 	case 0x43:
 	case 0x52:
 	case 0x53:
-	case 0x56: 
+	case 0x56:
 	case 0x72: return 0;
 	default:
 		GP_DEBUG ("Your camera has unknown resolution settings.\n");
@@ -115,18 +111,18 @@
 	}
 }
 
-int
+unsigned int
 digi_get_data_size (CameraPrivateLibrary *priv, int entry)
 {
-	return ((priv->catalog16*entry + 6 <<16) 
-		| (priv->catalog16*entry + 5 <<8) 
+	return ((priv->catalog16*entry + 6 <<16)
+		| (priv->catalog16*entry + 5 <<8)
 		| (priv->catalog16*entry + 4 ) );
 }
 
-int
+unsigned int
 digi_get_picture_width (CameraPrivateLibrary *priv, int entry)
 {
-	switch (priv->catalog16*entry) {  
+	switch (priv->catalog16*entry) {
 	case 0x41:
 	case 0x52:
 	case 0x61: return 352;
@@ -148,8 +144,8 @@
 digi_rewind (GPPort *port, CameraPrivateLibrary *priv)
 {
 	static char dummy_buf0x4000;
-	
-	
+
+
 	GP_DEBUG("REWIND cam's data pointer");
 
 	/* One has to read the catalog to rewind the data stream...
@@ -158,7 +154,7 @@
 
 	digi_reset(port);
 	SQWRITE (port, 0x0c, 0x20, 0x40, NULL, 0); /* Access config */
-	gp_port_read(port, dummy_buf, 0x4000); 
+	gp_port_read(port, dummy_buf, 0x4000);
 	digi_reset (port);
 
 	priv->last_fetched_entry = -1;
@@ -177,25 +173,27 @@
 
 
 int
-digi_read_picture_data (GPPort *port, unsigned char *data, int size, int n )
+digi_read_picture_data (GPPort *port, unsigned char *data, unsigned int size, int n )
 {
+	unsigned int remainder = size % 0x8000;
+	unsigned int offset = 0;
+	int ret;
 
-
-	int remainder = size % 0x8000;
-	int offset = 0;
 	if (!n) {
-		SQWRITE (port, 0x0c, 0x30, 0x00, NULL, 0); 
-	}	
+		SQWRITE (port, 0x0c, 0x30, 0x00, NULL, 0);
+	}
 	while ((offset + 0x8000 < size)) {
-		gp_port_read (port, (char *)data + offset, 0x8000);
-			offset = offset + 0x8000;
+		ret = gp_port_read (port, (char *)data + offset, 0x8000);
+		if (ret < GP_OK) return ret;
+		offset = offset + 0x8000;
 	}
-	gp_port_read (port, (char *)data + offset, remainder);
+	ret = gp_port_read (port, (char *)data + offset, remainder);
+	if (ret < GP_OK) return ret;
 
 	return GP_OK;
-} 
+}
 
-int digi_delete_all     (GPPort *port, CameraPrivateLibrary *priv) 
+int digi_delete_all     (GPPort *port, CameraPrivateLibrary *priv)
 {
 	int size;
 	int num_pics;
@@ -230,7 +228,7 @@
 		return GP_ERROR_NO_MEMORY;
 	}
 	gp_port_read(port, (char *)junk, size);
-	free(junk); 
+	free(junk);
 	digi_reset (port);
 
 	return GP_OK;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digigr8/digigr8.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digigr8/digigr8.h Changed

@@ -1,21 +1,21 @@
 /*
- * digigr8.h 
+ * digigr8.h
  *
- * Header file for libgphoto2/camlibs/digigr8.  
+ * Header file for libgphoto2/camlibs/digigr8.
  *
  * Copyright (c) 2005 Theodore Kilgore <kilgota@auburn.edu>
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
- * Cameras supported by this driver have Product ID 0x905C, 0x9050, or 
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
+ * Cameras supported by this driver have Product ID 0x905C, 0x9050, or
  * 0x913D.
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
-#ifndef __DIGIGR8_H__
-#define __DIGIGR8_H__
+#ifndef CAMLIBS_DIGIGR8_DIGIGR8_H
+#define CAMLIBS_DIGIGR8_DIGIGR8_H
 
 #include <gphoto2/gphoto2-port.h>
 
@@ -31,16 +31,16 @@
 int digi_reset             		(GPPort *);
 int digi_init                          (GPPort *, CameraPrivateLibrary *);
 int digi_rewind (GPPort *port, CameraPrivateLibrary *priv);
-int digi_read_picture_data  (GPPort *, unsigned char *data, 
-					    int size, int n);
+int digi_read_picture_data  (GPPort *, unsigned char *data,
+					    unsigned int size, int n);
 
 /* Those functions don't need data transfer with the camera */
 int digi_get_num_frames                (CameraPrivateLibrary *, int entry);
-int digi_get_comp_ratio      	     (CameraPrivateLibrary *, int entry);
-int digi_get_data_size             (CameraPrivateLibrary *, int entry);
-int digi_get_picture_width             (CameraPrivateLibrary *, int entry);
+unsigned int digi_get_comp_ratio      	     (CameraPrivateLibrary *, int entry);
+unsigned int digi_get_data_size             (CameraPrivateLibrary *, int entry);
+unsigned int digi_get_picture_width             (CameraPrivateLibrary *, int entry);
 int digi_is_clip                       (CameraPrivateLibrary *, int entry);
-int digi_decompress (unsigned char *out_data, unsigned char *data, 
+int digi_decompress (unsigned char *out_data, unsigned char *data,
 							    int w, int h);
 int digi_postprocess	(int width, int height, unsigned char* rgb);
 int digi_delete_all	(GPPort *, CameraPrivateLibrary *priv);
@@ -49,5 +49,5 @@
 white_balance (unsigned char *data, unsigned int size, float saturation);
 
 
-#endif
+#endif /* !defined(CAMLIBS_DIGIGR8_DIGIGR8_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digigr8/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digigr8/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/commands.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/commands.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/digita.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/digita.c Changed

@@ -19,7 +19,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -31,30 +31,16 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef OS2
-#include <db.h>
-#endif
 
 #define GP_MODULE "digita"
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
-#include "gphoto2-endian.h"
+
+#include "libgphoto2/gphoto2-endian.h"
 #include "digita.h"
 
 #ifndef MAX
@@ -81,7 +67,7 @@
 
 int camera_abilities(CameraAbilitiesList *list)
 {
-	int i;
+	unsigned int i;
 	CameraAbilities a;
 
 	for (i = 0; i < sizeof(models) / sizeof(models0); i++) {
@@ -97,7 +83,7 @@
 		a.speed5	= 0;
 		a.operations		= GP_OPERATION_NONE;
 		a.folder_operations	= GP_FOLDER_OPERATION_NONE;
-		a.file_operations	= GP_FILE_OPERATION_PREVIEW | 
+		a.file_operations	= GP_FILE_OPERATION_PREVIEW |
 					  GP_FILE_OPERATION_DELETE;
 		a.usb_vendor  = modelsi.usb_vendor;
 		a.usb_product = modelsi.usb_product;
@@ -208,7 +194,7 @@
 }
 
 #define GFD_BUFSIZE 19432
-static unsigned char *digita_file_get(Camera *camera, const char *folder, 
+static unsigned char *digita_file_get(Camera *camera, const char *folder,
 			     const char *filename, int thumbnail, int *size,
 			     GPContext *context)
 {
@@ -318,7 +304,7 @@
 	Camera *camera = user_data;
 	unsigned char *data;
 	unsigned int width, height;
-	char ppmhead64; 
+	char ppmhead64;
 	int buflen;
 
 	if (folder0 == '/')
@@ -403,7 +389,7 @@
 	return GP_OK;
 }
 
-static int digita_file_delete(Camera *camera, const char *folder, 
+static int digita_file_delete(Camera *camera, const char *folder,
 			     const char *filename, GPContext *context)
 {
 	struct filename fn;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/digita.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/digita.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/digita/serial.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/digita/serial.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/Makefile-files Changed

@@ -1,13 +1,21 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += dimera/CREDITS dimera/Protocol.txt dimera/ChangeLog dimera/TODO
+EXTRA_DIST                 += %reldir%/CREDITS
+EXTRA_DIST                 += %reldir%/ChangeLog
+EXTRA_DIST                 += %reldir%/Protocol.txt
+EXTRA_DIST                 += %reldir%/TODO
 
-EXTRA_LTLIBRARIES += dimera3500.la
 
-dimera3500_la_SOURCES =\
-	dimera/dimera3500.c \
-	dimera/mesalib.c dimera/mesalib.h\
-	dimera/dimeratab.h
-dimera3500_la_LDFLAGS = $(camlib_ldflags)
-dimera3500_la_DEPENDENCIES = $(camlib_dependencies)
-dimera3500_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES          += dimera3500.la
+
+dimera3500_la_SOURCES       =
+dimera3500_la_SOURCES      += %reldir%/dimera3500.c
+dimera3500_la_SOURCES      += %reldir%/mesalib.c
+dimera3500_la_SOURCES      += %reldir%/mesalib.h
+dimera3500_la_SOURCES      += %reldir%/dimeratab.h
+
+dimera3500_la_CFLAGS        = $(camlib_cflags)
+dimera3500_la_CPPFLAGS      = $(camlib_cppflags)
+dimera3500_la_DEPENDENCIES  = $(camlib_dependencies)
+dimera3500_la_LDFLAGS       = $(camlib_ldflags)
+dimera3500_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/dimera3500.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/dimera3500.c Changed

@@ -1,4 +1,4 @@
-/* 
+/*
  * Program:	gPhoto2 driver for Mustek VDC 3500/Relisys Dimera 3500
  *
  * Note:
@@ -19,7 +19,7 @@
  *
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -29,23 +29,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <_stdint.h>
+#include <stdint.h>
 
 #include <gphoto2/gphoto2.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #define GP_MODULE "dimera"
 
@@ -69,7 +58,7 @@
 static const char Dimera_thumbhdr =
 "P5\n# Dimera 3500 Thumbnail written by gphoto2\n64 48\n255\n";
 
-static const char Dimera_viewhdr = 
+static const char Dimera_viewhdr =
 "P5\n# Dimera 3500 Viewfinder written by gphoto2\n128 96\n15\n";
 
 static const char Dimera_finehdr =
@@ -93,9 +82,9 @@
 /* Gphoto2 */
 
 struct _CameraPrivateLibrary {
-        unsigned exposure; 
-        int auto_exposure; 
-        int auto_flash; 
+        unsigned exposure;
+        int auto_exposure;
+        int auto_flash;
 };
 
 
@@ -186,7 +175,7 @@
 conversion_chuck (const unsigned int width, const unsigned int height,
 	const unsigned char *src,unsigned char *dst
 ) {
-	int x, y;
+	unsigned int x, y;
 	int p1, p2, p3, p4;
 	int red, green, blue;
 
@@ -196,7 +185,7 @@
 	 *
 	 * Convert the 4 cells into a single RGB pixel.
 	 * Colors are encoded as follows:
-	 * 
+	 *
 	 * 		000000000000000000........33
 	 * 		000000000011111111........11
 	 * 		012345678901234567........89
@@ -216,7 +205,7 @@
 	 * The exception is when x or y are zero then the neighors used are
 	 * the +1 cells.
 	 */
-	
+
 	for (y = 0;y < height; y++)
 		for (x = 0;x < width; x++) {
 			p1 = ((y==0?y+1:y-1)*width) + (x==0?x+1:x-1);
@@ -306,7 +295,7 @@
 		if (!data)
 			return GP_ERROR;
 		gp_file_set_data_and_size (file, (char *)data, size); /* will take over data ptr ownership */
-		gp_file_set_mime_type (file, GP_MIME_RAW); 
+		gp_file_set_mime_type (file, GP_MIME_RAW);
 		gp_file_adjust_name_for_mime_type (file);
 		break;
 	case GP_FILE_TYPE_PREVIEW:
@@ -441,7 +430,7 @@
 			eeprom_capacity = eeprom_size_tableeeprom_info11;
 	}
 	/* Estimate the number of pictures that this size of flash can hold */
-	hi_pics_max = eeprom_capacity / 2; 
+	hi_pics_max = eeprom_capacity / 2;
 	lo_pics_max = (eeprom_capacity * 13) / 8;
 
 	if (features.feature_bits_lo & AC_PRESENT)
@@ -645,7 +634,7 @@
 
 			if ( (s == GP_ERROR_TIMEOUT || s == GP_ERROR_CORRUPTED_DATA) && --retry > 0)
 			{
-				GP_DEBUG( "Dimera_Get_Full_Image: retrans"); 
+				GP_DEBUG( "Dimera_Get_Full_Image: retrans");
 				continue;
 			}
 			GP_DEBUG(
@@ -681,7 +670,7 @@
 
 			if ( (s == GP_ERROR_TIMEOUT || s == GP_ERROR_CORRUPTED_DATA) && --retry > 0)
 			{
-				GP_DEBUG("Dimera_Get_Full_Image: retrans"); 
+				GP_DEBUG("Dimera_Get_Full_Image: retrans");
 				continue;
 			}
 			GP_DEBUG(
@@ -744,7 +733,7 @@
 
 	/* Choose the correct curve for this camera scene */
 	for (i=0; exposure_tablesi.M; ++i) {
-		GP_DEBUG( "brightness %d, %f ", 
+		GP_DEBUG( "brightness %d, %f ",
 			brightness,
 			exp((double)((brightness/16.0) - exposure_tablesi.b) / exposure_tablesi.M));
 		if (exp((double)((brightness/16.0) - exposure_tablesi.b) / exposure_tablesi.M) > exposure)
@@ -811,7 +800,7 @@
 
 	/* Automatic exposure control */
 
-	/* Current picture brightness, where 0 is is dark and 255 is bright */
+	/* Current picture brightness, where 0 is dark and 255 is bright */
 	brightness = exposure_total / (VIEWFIND_SZ / 16);
 
 	GP_DEBUG(

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/dimeratab.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/dimeratab.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/mesalib.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/mesalib.c Changed

@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include <gphoto2/gphoto2.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 
 #define GP_MODULE "dimera"
 #define debuglog(e) GP_DEBUG( "%s", (e))
@@ -114,7 +114,7 @@
 }
 
 /* Read exactly this number of bytes from the port within the given timeouts */
-int
+unsigned int
 mesa_read( GPPort *port, uint8_t *b, int s, int timeout2, int timeout1 )
 {
 	int		n = 0;
@@ -204,7 +204,7 @@
 	if (speed == 0)
 		speed = 115200;		/* use default speed */
 
-	GP_DEBUG( 
+	GP_DEBUG(
 	 "mesa_set_speed: speed %d", speed);
 
 	b0 = SET_SPEED;
@@ -266,7 +266,7 @@
 		return GP_ERROR_TIMEOUT;
 	}
 
-	GP_DEBUG( 
+	GP_DEBUG(
 	 "mesa_version: %02x:%02x:%02x\n", r0, r1, r2 );
 	sprintf(v, "%2x.%02x%c", r1, r0, r2);
 	/* highest byte must be < MESA_VERSION_SZ */
@@ -323,7 +323,7 @@
  * *   The following contradicted by traces from my Win98 twain driver*	  GDB
  * ********************************************************************   GDB
  * The image is stored in the camera as 504 row (0 - 503), the first 8 and the
- * last 2 are blank. 
+ * last 2 are blank.
  * The rows are 18 dummy pixels, 2 blanks, 646 pixels, 13 bytes garbage,
  * 2 bytes blanks
  *
@@ -436,11 +436,11 @@
  * the image can be full scale, 0, zoom 2x 1, zoom 4x, 2, and for
  * low res images, 8x, 3.
  *
- * row and column may be offset 0-197 and 0-223 for zoom. 
+ * row and column may be offset 0-197 and 0-223 for zoom.
  *
  * exposure is * 1/50000 seconds.
  *
- * download specifies how, of if thge image is downloaded.
+ * download specifies how, of if the image is downloaded.
  * 0-47		returns one 32 byte (64 pixel) row.
  * 128-223	returns on 64 byte row.
  * 249		returns all odd rows of a hi-res image 1536 bytes.
@@ -471,7 +471,7 @@
 		return GP_ERROR_BAD_PARAMETERS;
 	else if ( download == 249 || download == 250 )
 		bytes = 1536;
-	else if ( download == 251 ) 
+	else if ( download == 251 )
 		bytes = 6144;
 	else if ( download == 252 )
 		bytes = 0;
@@ -520,7 +520,7 @@
 			return GP_ERROR_CORRUPTED_DATA;
 		}
 	}
-	
+
 	return bytes;
 }
 
@@ -556,7 +556,7 @@
 		return GP_ERROR_BAD_PARAMETERS;
 	else if ( download == 249 )
 		bytes = 1536;
-	else if ( download == 250 || download == 251 ) 
+	else if ( download == 250 || download == 251 )
 		bytes = 768;
 	else if ( download == 252 )
 		bytes = 0;
@@ -594,7 +594,7 @@
 		if ( cksum != b0 )
 			return GP_ERROR_CORRUPTED_DATA;
 	}
-	
+
 	return bytes;
 }
 
@@ -753,7 +753,7 @@
 {
 	uint8_t		b7;
 	int		i;
-	
+
 	b0 = RCV_TEST;
 	memcpy( &b1, r, 6 );

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/dimera/mesalib.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/dimera/mesalib.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/directory/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/directory/ChangeLog Changed

@@ -36,19 +36,19 @@
 	appropriate to not leak.
 	(folder_list_func): same as above.
 
-2002-11-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-11-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* directory.c: Additional debugging stuff.
 
-2002-11-04  Lutz Müller <lutz@users.sourceforge.net>
+2002-11-04  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* directory.c: Don't follow links.
 
-2002-07-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* directory.c: Improve user feedback by calling gp_context_idle.
 
-2002-02-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* directory.c (delete_file_func): In case of error, tell the user
 	  what went wrong.
@@ -57,23 +57,23 @@
 
 	* directory.c: Now using MIME type macros.  Replaced // comment.
 
-2002-02-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* directory.c: Detect *.jpeg files, too.
 
-2002-02-07  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-07  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am:
 	* directory.c: Support GP_FILE_TYPE_EXIF ifdef HAVE_EXIF
 
-2001-12-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* directory.c: Even more debugging.
 
-2001-12-28  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-28  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* directory.c: Debugging stuff, file deletion.
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* directory.c: Support GP_FILE_TYPE_PREVIEW, too.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/directory/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/directory/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/directory/directory.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/directory/directory.c Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/ChangeLog Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/Makefile-files Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/cache.c Added

@@ -0,0 +1,105 @@
+/* cache.c
+ *
+ * Copyright 2020 Ondrej Zary <ondrej@zary.sk>
+ * based on Docupen tools by Florian Heinz <fh@cronon-ag.de>
+ */
+#include <gphoto2/gphoto2-library.h>
+#include <libgphoto2/gphoto2-endian.h>
+#include "docupen.h"
+
+static char cmd_datalen  = { 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_unknown  = { 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_get_all  = { 0x51, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x1a };
+
+static bool fill_cache(Camera *camera)
+{
+	char *buf;
+	int ret;
+	size_t pktsize = camera->pl->info.packetsize2 |
+			 camera->pl->info.packetsize1 << 8|
+			 camera->pl->info.packetsize0 << 16;
+
+	buf = malloc(pktsize);
+	if (!buf)
+		return false;
+
+	/* truncate file */
+	fclose(camera->pl->cache);
+	camera->pl->cache = fopen(camera->pl->cache_file, "w+");
+	if (!camera->pl->cache) {
+		perror("fopen");
+		GP_LOG_E("unable to trunate cache file %s", camera->pl->cache_file);
+		free(buf);
+		return false;
+	}
+
+	dp_cmd(camera->port, cmd_unknown);
+	dp_cmd(camera->port, cmd_get_all);
+
+	uint32_t done = 0;
+	while (done < camera->pl->datalen) {
+		ret = gp_port_read(camera->port, buf, (camera->pl->datalen - done < pktsize) ? camera->pl->datalen-done : pktsize);
+		if (ret < 0)
+			break;
+		fwrite(buf, 1, ret, camera->pl->cache);
+		done += ret;
+		if ((size_t)ret < pktsize)
+			break;
+	}
+	free(buf);
+	return true;
+}
+
+bool dp_init_cache(Camera *camera)
+{
+	if (camera->pl->cache_file)
+		return true;
+
+	camera->pl->cache_file = malloc(64 + strlen(getenv("HOME")));
+	if (!camera->pl->cache_file)
+		return false;
+	sprintf(camera->pl->cache_file, "%s/.cache", getenv("HOME"));
+
+	if (!gp_system_is_dir(camera->pl->cache_file) && gp_system_mkdir(camera->pl->cache_file) != GP_OK) {
+		GP_LOG_E("unable to create directory %s", camera->pl->cache_file);
+		goto err_free;
+	}
+
+	sprintf(camera->pl->cache_file, "%s/.cache/docupen-%s.bin", getenv("HOME"), camera->pl->info.serialno);
+	camera->pl->cache = fopen(camera->pl->cache_file, "a+");
+	if (!camera->pl->cache) {
+		perror("fopen");
+		GP_LOG_E("unable to open cache file %s", camera->pl->cache_file);
+		goto err_free;
+	}
+
+	dp_cmd(camera->port, cmd_datalen);
+	gp_port_read(camera->port, (void *)&camera->pl->datalen, sizeof(camera->pl->datalen));
+	camera->pl->datalen = le32toh(camera->pl->datalen);
+	fseek(camera->pl->cache, 0, SEEK_END);
+	if (ftell(camera->pl->cache) == camera->pl->datalen) {	/* cache is valid */
+		if (!dp_init_calibration(camera, false))
+			goto err_free;
+		return true;
+	}
+
+	if (!dp_init_calibration(camera, true)) /* if cache is invalid, update LUT too */
+		goto err_free;
+
+	if (fill_cache(camera))
+		return true;
+
+err_free:
+	free(camera->pl->cache_file);
+	camera->pl->cache_file = NULL;
+	return false;
+}
+
+bool dp_delete_cache(Camera *camera)
+{
+	if (camera->pl->cache)
+		fclose(camera->pl->cache);
+	camera->pl->cache = NULL;
+
+	return !unlink(camera->pl->cache_file);
+}

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/calibration.c Added

@@ -0,0 +1,176 @@
+/* calibration.c
+ *
+ * Copyright 2020 Ondrej Zary <ondrej@zary.sk>
+ */
+#include <math.h>
+#include <gphoto2/gphoto2-library.h>
+#include "docupen.h"
+
+#define NUM_POINTS 5
+struct pixel_cal {
+	unsigned char dataNUM_POINTS;
+};
+
+#define CAL_SIZE (1600 * 3)
+#define LUT_FILE_DUMMY_END 0x800
+#define LUT_FILE_SIZE (2 * (CAL_SIZE * NUM_POINTS + CAL_SIZE * 2 + CAL_SIZE * sizeof(struct lut)) + LUT_FILE_DUMMY_END + SERIALNO_LEN + 2)	/* 2526866 */
+
+static char cmd_get_cal  = { 0x56, 0x00, 0x00, 0xc0, 0x5d, 0x00, 0x00, 0x1a };
+static char cmd_get_cal1 = { 0x56, 0x01, 0x00, 0xc0, 0x61, 0x00, 0x00, 0x1a };
+
+/* VALUES (y) at which data points (x) are stored */
+static unsigned char cal_points = { 0, 32, 38, 106, 192, 252, 255 };
+
+static unsigned char empty = { 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+/* build look-up table (LUT) from calibration data */
+static void make_lut(unsigned char lut, unsigned char p) {
+	unsigned char points = { 0, p0, p1, p2, p3, p4, p4 + 8 };
+	float slope = (float)cal_points1 / points1;
+	int cur_point = 0;
+	for (unsigned int i = 0; i < sizeof(struct lut); i++) {
+		unsigned int val = floorf((i - pointscur_point) * slope + cal_pointscur_point);
+		luti = (val <= 255) ? val : 255;
+		if (luti < 255 && luti >= cal_pointscur_point + 1) {
+			cur_point++;
+			slope = (float)(cal_pointscur_point + 1 - cal_pointscur_point) / (pointscur_point + 1 - pointscur_point);
+		}
+	}
+}
+
+static bool lut_from_cal(struct pixel_cal cal, FILE *out) {
+	/* input data */
+	if (fwrite(cal, 1, CAL_SIZE * sizeof(struct pixel_cal), out) != CAL_SIZE * sizeof(struct pixel_cal))
+		return false;
+
+	/* fake ??? table */
+	unsigned char table2CAL_SIZE * 2;
+	memset(table2, 0x00, sizeof(table2));
+	table20 = 0x18;
+	if (fwrite(table2, 1, sizeof(table2), out) != sizeof(table2))
+		return false;
+
+	/* lookup tables */
+	for (int i = 0; i < CAL_SIZE; i++) {
+		unsigned char lutsizeof(struct lut);
+		if (i == 0) {
+			memset(lut, 0xff, sizeof(lut));
+			lut0 = 0x18;
+		} else if (memcmp(cali.data, empty, NUM_POINTS) == 0)
+			memset(lut, 0xff, sizeof(lut));
+		else
+			make_lut(lut, cali.data);
+		if (fwrite(lut, 1, sizeof(lut), out) != sizeof(lut))
+			return false;
+	}
+
+	return true;
+}
+
+/* create a calibration LUT file, same format as PenLut.raw in Windows SW */
+static bool make_lut_file(Camera *camera, FILE *lut)
+{
+	struct pixel_cal calCAL_SIZE;
+	char dummy0x400;
+
+	/* first calibration data */
+	dp_cmd(camera->port, cmd_get_cal);
+	if (gp_port_read(camera->port, (void *)cal, sizeof(cal)) != sizeof(cal))
+		return false;
+	if (!lut_from_cal(cal, lut))
+		return false;
+	/* second calibration data */
+	dp_cmd(camera->port, cmd_get_cal1);
+	if (gp_port_read(camera->port, (void *)cal, sizeof(cal)) != sizeof(cal))
+		return false;
+	if (gp_port_read(camera->port, dummy, sizeof(dummy)) != sizeof(dummy))
+		return false;
+	if (!lut_from_cal(cal, lut))
+		return false;
+	/* 0x800 zero bytes (LUT_FILE_DUMMY_END) */
+	memset(dummy, 0, sizeof(dummy));
+	if (fwrite(dummy, 1, sizeof(dummy), lut) != sizeof(dummy))
+		return false;
+	if (fwrite(dummy, 1, sizeof(dummy), lut) != sizeof(dummy))
+		return false;
+	/* serial number */
+	if (fwrite(camera->pl->info.serialno, 1, sizeof(camera->pl->info.serialno), lut) != sizeof(camera->pl->info.serialno))
+		return false;
+	/* 2 zero bytes */
+	if (fwrite(dummy, 1, 2, lut) != 2)
+		return false;
+
+	return true;
+}
+
+bool dp_init_calibration(Camera *camera, bool force)
+{
+	char *lut_file;
+	bool ret = false;
+	int i, j;
+
+	if (camera->pl->lut)
+                return true;
+
+	lut_file = malloc(64 + strlen(getenv("HOME")));
+	if (!lut_file)
+		return false;
+	sprintf(lut_file, "%s/.cache/docupen-%s.lut", getenv("HOME"), camera->pl->info.serialno);
+
+	FILE *lut = fopen(lut_file, "a+");
+	if (!lut) {
+		perror("fopen");
+		GP_LOG_E("unable to open LUT file %s", lut_file);
+		goto err_free;
+	}
+	fseek(lut, 0, SEEK_END);
+	if (force || ftell(lut) != LUT_FILE_SIZE) {
+		/* truncate file */
+		fclose(lut);
+		lut = fopen(lut_file, "w+");
+		if (!lut) {
+			perror("fopen");
+			GP_LOG_E("unable to trunate cache file %s", lut_file);
+			goto err_free;
+		}
+		if (!make_lut_file(camera, lut))
+			goto err_close;
+		fflush(lut);
+	}
+	/* read first LUT into memory, the 2nd one seems unused? */
+	fseek(lut, CAL_SIZE * NUM_POINTS + CAL_SIZE * 2, SEEK_SET); /* 0x8340 */
+	camera->pl->lut = malloc(CAL_SIZE * sizeof(struct lut));
+	if (!camera->pl->lut)
+		goto err_close;
+
+	if (fread(camera->pl->lut, 1, CAL_SIZE * sizeof(struct lut), lut) != (CAL_SIZE * sizeof(struct lut))) {
+		GP_LOG_E("error reading LUT from file");
+		goto err_close;
+	}
+	/**
+	 * There are empty (0xff) LUTs at the beginning and end (left and right edge of the scanner).
+	 * Windows SW crops the image there. We can use full width of the scanner at the cost of
+	 * edges not having properly calibrated colors.
+	 * Find first and last non-empty LUTs and copy over the empty ones.
+	 */
+	for (i = 0; i < CAL_SIZE; i++)
+		if (camera->pl->luti.data1 != 0xff)	/* 1 because first byte of first LUT is always 0x18 */
+			break;
+	for (j = 0; j < i; j += 3)	/* copy in 3-LUT (RGB) chunks */
+		memcpy(camera->pl->lutj.data, camera->pl->luti.data, 3 * sizeof(struct lut));
+
+	for (i = CAL_SIZE - 1; i >= 0; i--)
+		if (camera->pl->luti.data1 != 0xff)
+			break;
+	i -= 2;
+	for (j = i + 3; j < CAL_SIZE; j += 3) /* copy in 3-LUT (RGB) chunks */
+		memcpy(camera->pl->lutj.data, camera->pl->luti.data, 3 * sizeof(struct lut));
+
+	ret = true;
+
+err_close:
+	fclose(lut);
+err_free:
+	free(lut_file);
+	return ret;
+}

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/docupen.c Added

@@ -0,0 +1,689 @@
+/* docupen.c
+ * Docupen camera driver (camlib).
+ *
+ * Copyright 2020 Ondrej Zary <ondrej@zary.sk>
+ * based on Docupen tools by Florian Heinz <fh@cronon-ag.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+#include "config.h"
+
+#include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-result.h>
+#include <libgphoto2/gphoto2-endian.h>
+
+#include "libgphoto2/i18n.h"
+
+#include "docupen.h"
+
+
+#if 0
+static const struct {
+	char *model;
+	int usb_vendor;
+	int usb_product;
+} models = {
+	{ "Planon DocuPen RC800", 0x18dd, 0x1000 },
+	{ NULL, 0, 0 }
+};
+#endif
+
+#define DP_ACK 0xD1
+#define DP_CMD_LEN 8
+
+static char cmd_query		= { 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_inquiry	= { 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_turnoff	= { 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_del_all	= { 0x7a, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x1a };
+static char cmd_get_profile	= { 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1a }; /* length = 0x400 */
+static char cmd_set_profile	= { 0x59, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1a }; /* length = 0x400 */
+
+#define RAW_HEADER_SERIAL_OFFSET 0x4e
+static char raw_header = {
+/*  0 */ 0x53, 0x53, 0x08, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40, 0xc0, /* SS._..........@. */
+/* 10 */ 0x12, 0x00, 0x20, 0x48, 0x88, 0x00, 0x00, 0x68, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* .. H...h........ */
+/* 20 */ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ................ */
+/* 30 */ 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........g....... */
+/* 40 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x32, /* ..............12 */
+/* 50 */ 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50        /* 34567890......P  */
+};
+
+bool dp_cmd(GPPort *port, const char *cmd)
+{
+	unsigned char reply64;
+
+	if (gp_port_write(port, cmd, DP_CMD_LEN) != DP_CMD_LEN) {
+		GP_LOG_E("command write failed");
+		return false;
+	}
+	int ret = gp_port_read(port, (void *)reply, sizeof(reply));
+	if (ret < 1 || reply0 != DP_ACK) {
+		GP_LOG_E("command failed: ret=%d reply0=%02hhx", ret, reply0);
+		return false;
+	}
+	return true;
+}
+
+static bool inquiry_read(Camera *camera)
+{
+	if (gp_port_read(camera->port, (void *)&camera->pl->info, 4) != 4) {	/* read header */
+		GP_LOG_E("error reading info header");
+		return false;
+	}
+	/* FIXME: len is 8bit unsigned, so can be at most 255 ... sizeof(struct dp_info) is currently over 256
+	 * so this is alwas false ... It is harmless and likely ok, but weird. -Marcus 20200831 */
+	if (camera->pl->info.len > sizeof(struct dp_info)) {
+		GP_LOG_E("camera info too long: %d bytes", camera->pl->info.len);
+		return false;
+	}
+	int ret = gp_port_read(camera->port, (void *)&camera->pl->info + 4, camera->pl->info.len - 4);
+	if (ret != camera->pl->info.len - 4) {
+		GP_LOG_E("camera info length error: expected %d bytes, got %d", camera->pl->info.len - 4, ret);
+		return false;
+	}
+
+	return true;
+}
+
+
+int camera_exit (Camera *camera, GPContext *context);
+int
+camera_exit (Camera *camera, GPContext *context)
+{
+	if (camera->pl) {
+		if (camera->pl->cache)
+			fclose(camera->pl->cache);
+		free(camera->pl->cache_file);
+		free(camera->pl->lut);
+		free(camera->pl);
+		camera->pl = NULL;
+	}
+	dp_cmd(camera->port, cmd_turnoff);
+	return GP_OK;
+}
+
+
+static bool dp_get_profile(Camera *camera)
+{
+	if (!camera->pl->profile)
+		camera->pl->profile = malloc(PROFILE_LEN);
+	if (!camera->pl->profile)
+		return false;
+
+	dp_cmd(camera->port, cmd_get_profile);
+	if (gp_port_read(camera->port, camera->pl->profile, PROFILE_LEN) != PROFILE_LEN)
+		return false;
+
+	return true;
+}
+
+static bool dp_set_profile(Camera *camera)
+{
+	if (!camera->pl->profile)
+		return false;
+
+	dp_cmd(camera->port, cmd_set_profile);
+	if (gp_port_write(camera->port, camera->pl->profile, PROFILE_LEN) != PROFILE_LEN)
+		return false;
+
+	return true;
+}
+
+
+int camera_config_get (Camera *camera, CameraWidget **window, GPContext *context);
+int
+camera_config_get (Camera *camera, CameraWidget **window, GPContext *context)
+{
+	CameraWidget *section, *widget;
+
+	if (!dp_get_profile(camera))
+		return GP_ERROR;
+
+	gp_widget_new (GP_WIDGET_WINDOW, _("Scanner Profile Configuration"), window);
+
+	gp_widget_new (GP_WIDGET_SECTION, _("Mono mode"), &section);
+	gp_widget_append (*window, section);
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Depth"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("Mono (b/w)"));
+        gp_widget_add_choice (widget, _("Grey (4bpp)"));
+        gp_widget_add_choice (widget, _("Grey (8bpp)"));
+        switch(camera->pl->profile0x80) {
+        case 0x00: gp_widget_set_value (widget, _("Mono (b/w)")); break;
+        case 0x01: gp_widget_set_value (widget, _("Grey (4bpp)")); break;
+        case 0x02: gp_widget_set_value (widget, _("Grey (8bpp)")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Lo Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("100 DPI"));
+        gp_widget_add_choice (widget, _("200 DPI"));
+        switch(camera->pl->profile0x81) {
+        case RES_100DPI: gp_widget_set_value (widget, _("100 DPI")); break;
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Hi Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("200 DPI"));
+        gp_widget_add_choice (widget, _("400 DPI"));
+        switch(camera->pl->profile0x82) {
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        case RES_400DPI: gp_widget_set_value (widget, _("400 DPI")); break;
+        }
+
+	gp_widget_new (GP_WIDGET_SECTION, _("Color Document mode"), &section);
+	gp_widget_append (*window, section);
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Depth"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("NQ (12bpp)"));
+        switch(camera->pl->profile0x83) {
+        case 0x04: gp_widget_set_value (widget, _("NQ (12bpp)")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Lo Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("100 DPI"));
+        gp_widget_add_choice (widget, _("200 DPI"));
+        switch(camera->pl->profile0x84) {
+        case RES_100DPI: gp_widget_set_value (widget, _("100 DPI")); break;
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Hi Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("200 DPI"));
+        gp_widget_add_choice (widget, _("400 DPI"));
+        switch(camera->pl->profile0x85) {
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        case RES_400DPI: gp_widget_set_value (widget, _("400 DPI")); break;
+        }
+
+	gp_widget_new (GP_WIDGET_SECTION, _("Color Photo mode"), &section);
+	gp_widget_append (*window, section);
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Depth"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("HQ (24bpp)"));
+        switch(camera->pl->profile0x86) {
+        case 0x08: gp_widget_set_value (widget, _("HQ (24bpp)")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Lo Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("100 DPI"));
+        gp_widget_add_choice (widget, _("200 DPI"));
+        switch(camera->pl->profile0x87) {
+        case RES_100DPI: gp_widget_set_value (widget, _("100 DPI")); break;
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        }
+
+        gp_widget_new (GP_WIDGET_RADIO, _("Hi Resolution"), &widget);
+        gp_widget_append (section, widget);
+        gp_widget_add_choice (widget, _("200 DPI"));
+        gp_widget_add_choice (widget, _("400 DPI"));
+        switch(camera->pl->profile0x88) {
+        case RES_200DPI: gp_widget_set_value (widget, _("200 DPI")); break;
+        case RES_400DPI: gp_widget_set_value (widget, _("400 DPI")); break;
+        }
+
+	return GP_OK;
+}
+
+
+int camera_config_set (Camera *camera, CameraWidget *window, GPContext *context);
+int
+camera_config_set (Camera *camera, CameraWidget *window, GPContext *context)
+{
+	CameraWidget *section, *widget;
+	char *value;
+
+	gp_widget_get_child_by_label (window, _("Mono mode"), &section);
+	gp_widget_get_child_by_label (section, _("Depth"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("Mono (b/w)")))
+			camera->pl->profile0x80 = 0x00;
+		else if (!strcmp(value, _("Grey (4bpp)")))
+			camera->pl->profile0x80 = 0x01;
+		else if (!strcmp(value, _("Grey (8bpp)")))
+			camera->pl->profile0x80 = 0x02;
+	}
+
+	gp_widget_get_child_by_label (section, _("Lo Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("100 DPI")))
+			camera->pl->profile0x81 = RES_100DPI;
+		else if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x81 = RES_200DPI;
+	}
+
+	gp_widget_get_child_by_label (section, _("Hi Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x82 = RES_200DPI;
+		else if (!strcmp(value, _("400 DPI")))
+			camera->pl->profile0x82 = RES_400DPI;
+	}
+
+	gp_widget_get_child_by_label (window, _("Color Document mode"), &section);
+	gp_widget_get_child_by_label (section, _("Depth"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("NQ (12bpp)")))
+			camera->pl->profile0x83 = 0x04;
+	}
+
+	gp_widget_get_child_by_label (section, _("Lo Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("100 DPI")))
+			camera->pl->profile0x84 = RES_100DPI;
+		else if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x84 = RES_200DPI;
+	}
+
+	gp_widget_get_child_by_label (section, _("Hi Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x85 = RES_200DPI;
+		else if (!strcmp(value, _("400 DPI")))
+			camera->pl->profile0x85 = RES_400DPI;
+	}
+
+	gp_widget_get_child_by_label (window, _("Color Photo mode"), &section);
+	gp_widget_get_child_by_label (section, _("Depth"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("HQ (24bpp)")))
+			camera->pl->profile0x86 = 0x08;
+	}
+
+	gp_widget_get_child_by_label (section, _("Lo Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("100 DPI")))
+			camera->pl->profile0x87 = RES_100DPI;
+		else if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x87 = RES_200DPI;
+	}
+
+	gp_widget_get_child_by_label (section, _("Hi Resolution"), &widget);
+	if (gp_widget_changed (widget)) {
+		gp_widget_get_value (widget, &value);
+		gp_widget_set_changed (widget, 0);
+		if (!strcmp(value, _("200 DPI")))
+			camera->pl->profile0x88 = RES_200DPI;
+		else if (!strcmp(value, _("400 DPI")))
+			camera->pl->profile0x88 = RES_400DPI;
+	}
+
+	if (!dp_set_profile(camera))
+		return GP_ERROR;
+
+	return GP_OK;
+}
+
+
+int
+camera_summary (Camera *camera, CameraText *summary, GPContext *context);
+int
+camera_summary (Camera *camera, CameraText *summary, GPContext *context)
+{
+	sprintf(summary->text, "Scanner model: DocuPen RC800\n"
+		"Images in memory: %d\n"
+		"Used bytes in memory: %d\n"
+		"Internal Flash ID: %04x\n"
+		"Memory size: %d\n"
+		"Calibration values: %d %d %d %d %d %d %d %d",
+		le32toh(camera->pl->info.pagestored),
+		le32toh(camera->pl->info.datacountbyte),
+		le16toh(camera->pl->info.flashmemid),
+		le32toh(camera->pl->info.flashmemmax),
+		camera->pl->info.calibvalue0,
+		camera->pl->info.calibvalue1,
+		camera->pl->info.calibvalue2,
+		camera->pl->info.calibvalue3,
+		camera->pl->info.calibvalue4,
+		camera->pl->info.calibvalue5,
+		camera->pl->info.calibvalue6,
+		camera->pl->info.calibvalue7
+		);
+	return GP_OK;
+}
+
+
+int
+camera_manual (Camera *camera, CameraText *manual, GPContext *context);
+int
+camera_manual (Camera *camera, CameraText *manual, GPContext *context)
+{
+	strcpy(manual->text,
+	_(
+	"Docupen scanner can't download/erase individual images, only everything\n"
+	"at once. To work-around this, a cache file is created where a copy of the\n"
+	"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+	"image - so downloading the first image will take long time if the cache is\n"
+	"empty or not valid. The cache is invalidated automatically when the amount\n"
+	"of used memory reported by the scanner does not match cache size.\n"
+	"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+	"\n"
+	"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+	"it's effective even when connected by USB. You need to turn it on before\n"
+	"each gphoto2 operation. In some situations, you might need to prevent it\n"
+	"from turning off by repeatedly pressing any of the buttons."
+	));
+
+	return GP_OK;
+}
+
+
+int
+camera_about (Camera *camera, CameraText *about, GPContext *context);
+int
+camera_about (Camera *camera, CameraText *about, GPContext *context)
+{
+	strcpy (about->text, _("DocuPen RC800 scanner library\n"
+			       "Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+			       "based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+			       ));
+
+	return GP_OK;
+}
+
+
+int
+get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
+	       CameraFileType type, CameraFile *file, void *data,
+	       GPContext *context);
+int
+get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
+	       CameraFileType type, CameraFile *file, void *data,
+	       GPContext *context)
+{
+	Camera *camera = data;
+	struct dp_imagehdr header;
+	size_t ret;
+	char *file_data;
+	gdImagePtr img;
+	void *gdout;
+	int gdsize;
+	int nr = gp_filesystem_number(fs, folder, filename, context);
+	if (nr < 0)
+		return nr;
+	nr++; /* libgphoto2 file numbering is 0-based, docupen 1-based */
+
+	if (!dp_init_cache(camera)) {
+		GP_LOG_E("error initializing cache");
+		return GP_ERROR;
+	}
+
+	/* find the file in cache */
+	fseek(camera->pl->cache, 0, SEEK_SET);
+	do {
+		ret = fread(&header, 1, sizeof(header), camera->pl->cache);
+		if (ret < sizeof(header)) {
+			GP_LOG_E("error reading image header");
+			return GP_ERROR;
+		}
+		if (le16toh(header.magic) != DP_MAGIC) {
+			GP_LOG_E("invalid magic number in image header: 0x%04x", le16toh(header.magic));
+			return GP_ERROR;
+		}
+		if (le16toh(header.nr) == nr) /* found */
+			break;
+		fseek(camera->pl->cache, le32toh(header.payloadlen), SEEK_CUR);
+	} while (1);
+
+	file_data = malloc(le32toh(header.payloadlen));
+	if (!file_data)
+		return GP_ERROR_NO_MEMORY;
+
+	ret = fread(file_data, 1, le32toh(header.payloadlen), camera->pl->cache);
+	if (ret < le32toh(header.payloadlen)) {
+		perror("fread");
+		GP_LOG_E("error reading image data");
+		free(file_data);
+		return GP_ERROR;
+	}
+	switch (type) {
+	case GP_FILE_TYPE_PREVIEW:
+	case GP_FILE_TYPE_NORMAL:
+		switch (le16toh(header.type)) {
+		case TYPE_MONO:
+			img = dp_get_image_mono(&header, file_data);
+			break;
+		case TYPE_GREY4:
+		case TYPE_GREY8:
+			img = dp_get_image_grey(&header, file_data, camera->pl->lut);
+			break;
+		case TYPE_COLOR12:
+		case TYPE_COLOR24:
+			img = dp_get_image_color(&header, file_data, camera->pl->lut);
+			break;
+		default:
+			GP_LOG_E("invalid image type 0x%x", le16toh(header.type));
+			free(file_data);
+			return GP_ERROR;
+		}
+		if (!img) {
+			free(file_data);
+			return GP_ERROR_NO_MEMORY;
+		}
+		gdout = gdImagePngPtr(img, &gdsize);
+		gdImageDestroy(img);
+		free(file_data);
+		if (!gdout) {
+			GP_LOG_E("image conversion error");
+			return GP_ERROR;
+		}
+		file_data = malloc(gdsize);
+		memcpy(file_data, gdout, gdsize);
+		gdFree(gdout);
+		gp_file_set_mime_type (file, GP_MIME_PNG);
+		gp_file_set_data_and_size (file, file_data, gdsize);
+		break;
+	case GP_FILE_TYPE_RAW:
+		gp_file_set_mime_type(file, GP_MIME_RAW);
+		memcpy(raw_header + RAW_HEADER_SERIAL_OFFSET, camera->pl->info.serialno, sizeof(camera->pl->info.serialno));
+		gp_file_append(file, (void *)&raw_header, sizeof(raw_header));
+		gp_file_append(file, (void *)&header, sizeof(header));
+		gp_file_append(file, file_data, le32toh(header.payloadlen));
+		free(file_data);
+		gp_file_adjust_name_for_mime_type(file);
+		break;
+	default:
+		free(file_data);
+		return GP_ERROR_NOT_SUPPORTED;
+	}
+
+	return GP_OK;
+}
+
+
+int
+delete_all_func (CameraFilesystem *fs, const char *folder, void *data,
+		 GPContext *context);
+int
+delete_all_func (CameraFilesystem *fs, const char *folder, void *data,
+		 GPContext *context)
+{
+	Camera *camera = data;
+	unsigned char status;
+
+	if (!dp_cmd(camera->port, cmd_del_all)) {
+		GP_LOG_E("delete all command failed");
+		return GP_ERROR_CAMERA_ERROR;
+	}
+
+	do
+		gp_port_read(camera->port, (void *)&status, 1);
+	while (status == DP_ACK);
+
+	if (status != 0) {
+		GP_LOG_E("erase failed");
+		return GP_ERROR_CAMERA_ERROR;
+	}
+
+	if (!inquiry_read(camera)) {
+		GP_LOG_E("error reading inquiry after erase");
+		return GP_ERROR_CAMERA_ERROR;
+	}
+
+	dp_delete_cache(camera);
+
+	return GP_OK;
+}
+
+
+int
+file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
+		void *data, GPContext *context);
+int
+file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
+		void *data, GPContext *context)
+{
+	Camera *camera = data;
+	return gp_list_populate(list, "docupen%03i.png", le32toh(camera->pl->info.pagestored));
+}
+
+
+int
+storage_info_func (CameraFilesystem *fs,
+		CameraStorageInformation **storageinformations,
+		int *nrofstorageinformations, void *data,
+		GPContext *context);
+int
+storage_info_func (CameraFilesystem *fs,
+		CameraStorageInformation **storageinformations,
+		int *nrofstorageinformations, void *data,
+		GPContext *context)
+{
+	Camera *camera = data;
+	CameraStorageInformation *sinfo;
+
+	sinfo = malloc(sizeof(CameraStorageInformation));
+	if (!sinfo)
+		return GP_ERROR_NO_MEMORY;
+
+	*storageinformations = sinfo;
+	*nrofstorageinformations = 1;
+
+	sinfo->fields  = GP_STORAGEINFO_BASE;
+	strcpy(sinfo->basedir, "/");
+	sinfo->fields |= GP_STORAGEINFO_ACCESS;
+	sinfo->access  = GP_STORAGEINFO_AC_READONLY_WITH_DELETE;
+	sinfo->fields |= GP_STORAGEINFO_STORAGETYPE;
+	sinfo->type    = GP_STORAGEINFO_ST_REMOVABLE_RAM;
+	sinfo->fields |= GP_STORAGEINFO_FILESYSTEMTYPE;
+	sinfo->fstype  = GP_STORAGEINFO_FST_GENERICFLAT;
+	sinfo->fields |= GP_STORAGEINFO_MAXCAPACITY;
+	sinfo->capacitykbytes = le32toh(camera->pl->info.flashmemmax) / 1024;
+	sinfo->fields |= GP_STORAGEINFO_FREESPACEKBYTES;
+	sinfo->freekbytes = (le32toh(camera->pl->info.flashmemmax) - le32toh(camera->pl->info.datacountbyte)) / 1024;
+
+	return GP_OK;
+}
+
+
+int
+camera_id (CameraText *id)
+{
+	strcpy(id->text, "docupen");
+
+	return GP_OK;
+}
+
+
+int
+camera_abilities (CameraAbilitiesList *list)
+{
+	CameraAbilities a;
+
+	memset(&a, 0, sizeof(a));
+	strcpy(a.model, "Planon DocuPen RC800");
+	a.status            = GP_DRIVER_STATUS_EXPERIMENTAL;
+	a.port              = GP_PORT_USB;
+	a.usb_vendor        = 0x18dd;
+	a.usb_product       = 0x1000;
+	a.speed0          = 0;
+	a.operations        = GP_OPERATION_CONFIG;
+	a.file_operations   = GP_FILE_OPERATION_RAW;
+	a.folder_operations = GP_FOLDER_OPERATION_DELETE_ALL;
+
+	gp_abilities_list_append(list, a);
+
+	return GP_OK;
+}
+
+CameraFilesystemFuncs fsfuncs = {
+	.file_list_func = file_list_func,
+	.get_file_func = get_file_func,
+	.delete_all_func = delete_all_func,
+	.storage_info_func = storage_info_func
+};
+
+int
+camera_init (Camera *camera, GPContext *context)
+{
+	char buf64;
+
+        camera->functions->exit                 = camera_exit;
+        camera->functions->get_config           = camera_config_get;
+        camera->functions->set_config           = camera_config_set;
+        camera->functions->summary              = camera_summary;
+        camera->functions->manual               = camera_manual;
+        camera->functions->about                = camera_about;
+
+	gp_filesystem_set_funcs(camera->fs, &fsfuncs, camera);
+
+	camera->pl = calloc(1, sizeof(CameraPrivateLibrary));
+	if (!camera->pl)
+		return GP_ERROR_NO_MEMORY;
+
+	if (!dp_cmd(camera->port, cmd_query)) {
+		GP_LOG_E("query failed");
+		camera_exit(camera, context);
+		return GP_ERROR_CAMERA_ERROR;
+	}
+	gp_port_read(camera->port, buf, sizeof(buf));	/* read and ingore */
+
+	if (!dp_cmd(camera->port, cmd_inquiry)) {
+		GP_LOG_E("inquiry failed");
+		camera_exit(camera, context);
+		return GP_ERROR_CAMERA_ERROR;
+	}
+	if (!inquiry_read(camera)) {
+		GP_LOG_E("error reading inquiry reply");
+		camera_exit(camera, context);
+		return GP_ERROR_CAMERA_ERROR;
+	}
+
+	return GP_OK;
+}

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/docupen.h Added

@@ -0,0 +1,96 @@
+#ifndef CAMLIBS_DOCUPEN_DOCUPEN_H
+#define CAMLIBS_DOCUPEN_DOCUPEN_H
+
+#include <string.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <gd.h>
+
+#define MAX_CALIBVALUES	8
+#define SERIALNO_LEN	16
+
+struct dp_info {
+	uint8_t  s;
+	uint16_t version;
+	uint8_t  len;
+	uint32_t memwrite;
+	uint32_t pagestored;
+	uint16_t res;
+	uint32_t datacountbyte;
+	uint8_t  flashmemcfg;
+	uint16_t flashmemid;
+	uint32_t flashmemmax;
+	uint32_t errorcode;
+	uint32_t memwritestart;
+	uint8_t  packetsize3;
+	uint8_t  notchMAX_CALIBVALUES;
+	uint32_t ucorrectedcountbyte;
+	uint8_t  calibvalueMAX_CALIBVALUES;
+	uint16_t checksum;
+	uint16_t m_badcols10;
+	uint8_t  serialnoSERIALNO_LEN;
+	uint8_t  assignedserialno;
+	uint8_t  modelname8;
+	uint32_t modelwidth;
+	uint8_t  encryptionsupport;
+	uint8_t  maxdpi;
+	uint8_t  dummy;
+	uint8_t  unused250;
+} __attribute__ ((packed));
+
+#define DP_MAGIC	0x2049
+
+/* Vertical resolutions. Horizontal resolution is always 200dpi */
+#define RES_100DPI	0x19
+#define RES_200DPI	0x32
+#define RES_400DPI	0x64
+
+#define TYPE_FIRST	0x0000
+#define TYPE_MONO	0x4700
+#define TYPE_GREY4	0x0001
+#define TYPE_GREY8	0x0002
+#define TYPE_COLOR12	0x0004
+#define TYPE_COLOR24	0x0008
+
+#define PROFILE_LEN	0x400
+
+struct dp_imagehdr {
+	uint16_t magic;
+	uint16_t type;
+	uint8_t  unknown;	/* header size = always 0x32 */
+	uint8_t  dpi;
+	uint16_t sizex;
+	uint16_t sizey;
+	uint32_t payloadlen;
+	uint32_t payloadlen2; /* ???  is payloadlen-0x20 */
+	uint32_t payloadaddr;
+	uint32_t nextchunk_raw;
+	uint32_t nextchunk;  /* nextchunk-0x200, for USB-Mode */
+	uint16_t nr;
+	uint8_t  data0;
+} __attribute__ ((packed));
+
+struct _CameraPrivateLibrary {
+	struct dp_info info;
+	uint32_t datalen;
+	char *cache_file;
+	FILE *cache;
+	struct lut *lut;
+	char *profile;
+};
+
+struct lut {
+    unsigned char data256;
+};
+
+bool dp_cmd(GPPort *port, const char *cmd);
+bool dp_init_cache(Camera *camera);
+bool dp_delete_cache(Camera *camera);
+bool dp_init_calibration(Camera *camera, bool force);
+gdImagePtr dp_get_image_mono(struct dp_imagehdr *dp, void *data);
+gdImagePtr dp_get_image_grey(struct dp_imagehdr *dp, void *data, struct lut *lut);
+gdImagePtr dp_get_image_color(struct dp_imagehdr *dp, void *data, struct lut *lut);
+
+#endif /* !defined(CAMLIBS_DOCUPEN_DOCUPEN_H) */

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/huffman.c Added

@@ -0,0 +1,338 @@
+/*
+ * Copyright 2020 Ondrej Zary <ondrej@zary.sk>
+ * based on Docupen tools (C) 2008 Florian Heinz <fh@cronon-ag.de>
+ * based on code found in package sfftobmp (Thanks Peter!)
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "huffman.h"
+
+struct huffman {
+	unsigned short code;
+	int len;
+	unsigned char bits;
+};
+
+#define NOT_FOUND -1
+#define RL_EOL    -2
+struct huffman black, white, blackterm, whiteterm;
+
+static void skip(struct decoder *d, int nrbits) {
+	d->bitoff += nrbits % 8;
+	d->byteoff += nrbits / 8 + (d->bitoff / 8);
+	d->bitoff %= 8;
+}
+
+static unsigned short get(struct decoder *d, int nrbits) {
+	unsigned short ret = 0;
+	int bitoff, byteoff, i = 16;
+
+	bitoff = d->bitoff;
+	byteoff = d->byteoff;
+
+	while (nrbits--) {
+		ret >>= 1;
+		i--;
+		ret |= !!((d->databyteoff & (1 << (7 - bitoff++)))) << 15;
+		if (bitoff >= 8) {
+			 byteoff++;
+			 bitoff = 0;
+		}
+		if (byteoff >= d->length)
+			return -1;
+	}
+
+	return ret >> i;
+}
+
+static int find(struct decoder *d, struct huffman *tab)
+{
+	unsigned short bits;
+
+	while (tab->code) {
+		bits = get(d, tab->bits);
+		if (bits == tab->code) {
+			skip(d, tab->bits);
+			return tab->len;
+		}
+		tab++;
+	}
+
+	return NOT_FOUND;
+}
+
+void decoder_init(struct decoder *d, void *data, int length) {
+	memset(d, 0, sizeof(struct decoder));
+	d->data = data;
+	d->length = length;
+}
+
+int decoder_token(struct decoder *d, int *type, int *len) {
+	int l;
+	int found_nonterm = 0;
+
+	*type = DECODER_NOOP;
+
+	l = find(d, d->state & WHITE ? whiteterm : blackterm);
+	if (l == NOT_FOUND) {
+		if (d->state & TERM)
+			return -1;
+		l = find(d, d->state & WHITE ? white : black);
+		if (l == NOT_FOUND)
+			return -1;
+		found_nonterm = 1;
+	}
+
+	if (l == RL_EOL) {
+		*type = DECODER_EOL;
+		if (d->bitoff > 0) {
+			d->bitoff = 0;
+			d->byteoff++;
+		}
+		return 0;
+	}
+
+	if (l > 0) {
+		*type = d->state & WHITE ? DECODER_WHITE : DECODER_BLACK;
+		*len = l;
+	}
+	if (found_nonterm)
+		d->state = d->state & WHITE ? WHITE | TERM : BLACK | TERM;
+	else
+		d->state = d->state & WHITE ? BLACK : WHITE;
+
+	return 0;
+}
+
+struct huffman black = {
+	{ 0x0080, RL_EOL,  8 },
+	{ 0x0800, RL_EOL, 12 },
+	{ 0x001b,   64, 5 },
+	{ 0x0009,  128, 5 },
+	{ 0x003a,  192, 6 },
+	{ 0x0076,  256, 7 },
+	{ 0x006c,  320, 8 },
+	{ 0x00ec,  384, 8 },
+	{ 0x0026,  448, 8 },
+	{ 0x00a6,  512, 8 },
+	{ 0x0016,  576, 8 },
+	{ 0x00e6,  640, 8 },
+	{ 0x0066,  704, 9 },
+	{ 0x0166,  768, 9 },
+	{ 0x0096,  832, 9 },
+	{ 0x0196,  896, 9 },
+	{ 0x0056,  960, 9 },
+	{ 0x0156, 1024, 9 },
+	{ 0x00d6, 1088, 9 },
+	{ 0x01d6, 1152, 9 },
+	{ 0x0036, 1216, 9 },
+	{ 0x0136, 1280, 9 },
+	{ 0x00b6, 1344, 9 },
+	{ 0x01b6, 1408, 9 },
+	{ 0x0032, 1472, 9 },
+	{ 0x0132, 1536, 9 },
+	{ 0x00b2, 1600, 9 },
+	{ 0x0006, 1664, 6 },
+	{ 0x01b2, 1728, 9 },
+	{ 0x0080, 1792, 11 },
+	{ 0x0180, 1856, 11 },
+	{ 0x0580, 1920, 11 },
+	{ 0x0480, 1984, 12 },
+	{ 0x0c80, 2048, 12 },
+	{ 0x0280, 2112, 12 },
+	{ 0x0a80, 2176, 12 },
+	{ 0x0680, 2240, 12 },
+	{ 0x0e80, 2304, 12 },
+	{ 0x0380, 2368, 12 },
+	{ 0x0b80, 2432, 12 },
+	{ 0x0780, 2496, 12 },
+	{ 0x0f80, 2560, 12 },
+	{      0,    0, 0 }
+};
+
+struct huffman blackterm = {
+	{ 0x0080, RL_EOL,  8 },
+	{ 0x0800, RL_EOL, 12 },
+	{ 0x00ac,  0, 8 },
+	{ 0x0038,  1, 6 },
+	{ 0x000e,  2, 4 },
+	{ 0x0001,  3, 4 },
+	{ 0x000d,  4, 4 },
+	{ 0x0003,  5, 4 },
+	{ 0x0007,  6, 4 },
+	{ 0x000f,  7, 4 },
+	{ 0x0019,  8, 5 },
+	{ 0x0005,  9, 5 },
+	{ 0x001c, 10, 5 },
+	{ 0x0002, 11, 5 },
+	{ 0x0004, 12, 6 },
+	{ 0x0030, 13, 6 },
+	{ 0x000b, 14, 6 },
+	{ 0x002b, 15, 6 },
+	{ 0x0015, 16, 6 },
+	{ 0x0035, 17, 6 },
+	{ 0x0072, 18, 7 },
+	{ 0x0018, 19, 7 },
+	{ 0x0008, 20, 7 },
+	{ 0x0074, 21, 7 },
+	{ 0x0060, 22, 7 },
+	{ 0x0010, 23, 7 },
+	{ 0x000a, 24, 7 },
+	{ 0x006a, 25, 7 },
+	{ 0x0064, 26, 7 },
+	{ 0x0012, 27, 7 },
+	{ 0x000c, 28, 7 },
+	{ 0x0040, 29, 8 },
+	{ 0x00c0, 30, 8 },
+	{ 0x0058, 31, 8 },
+	{ 0x00d8, 32, 8 },
+	{ 0x0048, 33, 8 },
+	{ 0x00c8, 34, 8 },
+	{ 0x0028, 35, 8 },
+	{ 0x00a8, 36, 8 },
+	{ 0x0068, 37, 8 },
+	{ 0x00e8, 38, 8 },
+	{ 0x0014, 39, 8 },
+	{ 0x0094, 40, 8 },
+	{ 0x0054, 41, 8 },
+	{ 0x00d4, 42, 8 },
+	{ 0x0034, 43, 8 },
+	{ 0x00b4, 44, 8 },
+	{ 0x0020, 45, 8 },
+	{ 0x00a0, 46, 8 },
+	{ 0x0050, 47, 8 },
+	{ 0x00d0, 48, 8 },
+	{ 0x004a, 49, 8 },
+	{ 0x00ca, 50, 8 },
+	{ 0x002a, 51, 8 },
+	{ 0x00aa, 52, 8 },
+	{ 0x0024, 53, 8 },
+	{ 0x00a4, 54, 8 },
+	{ 0x001a, 55, 8 },
+	{ 0x009a, 56, 8 },
+	{ 0x005a, 57, 8 },
+	{ 0x00da, 58, 8 },
+	{ 0x0052, 59, 8 },
+	{ 0x00d2, 60, 8 },
+	{ 0x004c, 61, 8 },
+	{ 0x00cc, 62, 8 },
+	{ 0x002c, 63, 8 },
+	{      0, 0, 0 }
+};
+
+struct huffman white = {
+	{ 0x0080, RL_EOL,  8 },
+	{ 0x0800 ,RL_EOL, 12 },
+	{ 0x03c0,   64, 10 },
+	{ 0x0130,  128, 12 },
+	{ 0x0930,  192, 12 },
+	{ 0x0da0,  256, 12 },
+	{ 0x0cc0,  320, 12 },
+	{ 0x02c0,  384, 12 },
+	{ 0x0ac0,  448, 12 },
+	{ 0x06c0,  512, 13 },
+	{ 0x16c0,  576, 13 },
+	{ 0x0a40,  640, 13 },
+	{ 0x1a40,  704, 13 },
+	{ 0x0640,  768, 13 },
+	{ 0x1640,  832, 13 },
+	{ 0x09c0,  896, 13 },
+	{ 0x19c0,  960, 13 },
+	{ 0x05c0, 1024, 13 },
+	{ 0x15c0, 1088, 13 },
+	{ 0x0dc0, 1152, 13 },
+	{ 0x1dc0, 1216, 13 },
+	{ 0x0940, 1280, 13 },
+	{ 0x1940, 1344, 13 },
+	{ 0x0540, 1408, 13 },
+	{ 0x1540, 1472, 13 },
+	{ 0x0b40, 1536, 13 },
+	{ 0x1b40, 1600, 13 },
+	{ 0x04c0, 1664, 13 },
+	{ 0x14c0, 1728, 13 },
+	{ 0x0080, 1792, 11 },
+	{ 0x0180, 1856, 11 },
+	{ 0x0580, 1920, 11 },
+	{ 0x0480, 1984, 12 },
+	{ 0x0c80, 2048, 12 },
+	{ 0x0280, 2112, 12 },
+	{ 0x0a80, 2176, 12 },
+	{ 0x0680, 2240, 12 },
+	{ 0x0e80, 2304, 12 },
+	{ 0x0380, 2368, 12 },
+	{ 0x0b80, 2432, 12 },
+	{ 0x0780, 2496, 12 },
+	{ 0x0f80, 2560, 12 },
+	{      0,    0, 0 }
+};
+
+struct huffman whiteterm = {
+	{ 0x0080, RL_EOL,  8 },
+	{ 0x0800, RL_EOL, 12 },
+	{ 0x03b0,  0, 10 },
+	{ 0x0002,  1,  3 },
+	{ 0x0003,  2,  2 },
+	{ 0x0001,  3,  2 },
+	{ 0x0006,  4,  3 },
+	{ 0x000c,  5,  4 },
+	{ 0x0004,  6,  4 },
+	{ 0x0018,  7,  5 },
+	{ 0x0028,  8,  6 },
+	{ 0x0008,  9,  6 },
+	{ 0x0010, 10,  7 },
+	{ 0x0050, 11,  7 },
+	{ 0x0070, 12,  7 },
+	{ 0x0020, 13,  8 },
+	{ 0x00e0, 14,  8 },
+	{ 0x0030, 15,  9 },
+	{ 0x03a0, 16, 10 },
+	{ 0x0060, 17, 10 },
+	{ 0x0040, 18, 10 },
+	{ 0x0730, 19, 11 },
+	{ 0x00b0, 20, 11 },
+	{ 0x01b0, 21, 11 },
+	{ 0x0760, 22, 11 },
+	{ 0x00a0, 23, 11 },
+	{ 0x0740, 24, 11 },
+	{ 0x00c0, 25, 11 },
+	{ 0x0530, 26, 12 },
+	{ 0x0d30, 27, 12 },
+	{ 0x0330, 28, 12 },
+	{ 0x0b30, 29, 12 },
+	{ 0x0160, 30, 12 },
+	{ 0x0960, 31, 12 },
+	{ 0x0560, 32, 12 },
+	{ 0x0d60, 33, 12 },
+	{ 0x04b0, 34, 12 },
+	{ 0x0cb0, 35, 12 },
+	{ 0x02b0, 36, 12 },
+	{ 0x0ab0, 37, 12 },
+	{ 0x06b0, 38, 12 },
+	{ 0x0eb0, 39, 12 },
+	{ 0x0360, 40, 12 },
+	{ 0x0b60, 41, 12 },
+	{ 0x05b0, 42, 12 },
+	{ 0x0db0, 43, 12 },
+	{ 0x02a0, 44, 12 },
+	{ 0x0aa0, 45, 12 },
+	{ 0x06a0, 46, 12 },
+	{ 0x0ea0, 47, 12 },
+	{ 0x0260, 48, 12 },
+	{ 0x0a60, 49, 12 },
+	{ 0x04a0, 50, 12 },
+	{ 0x0ca0, 51, 12 },
+	{ 0x0240, 52, 12 },
+	{ 0x0ec0, 53, 12 },
+	{ 0x01c0, 54, 12 },
+	{ 0x0e40, 55, 12 },
+	{ 0x0140, 56, 12 },
+	{ 0x01a0, 57, 12 },
+	{ 0x09a0, 58, 12 },
+	{ 0x0d40, 59, 12 },
+	{ 0x0340, 60, 12 },
+	{ 0x05a0, 61, 12 },
+	{ 0x0660, 62, 12 },
+	{ 0x0e60, 63, 12 },
+	{      0, 0, 0 }
+};

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/huffman.h Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/docupen/image.c Added

@@ -0,0 +1,259 @@
+/* image.c
+ *
+ * Copyright 2020 Ondrej Zary <ondrej@zary.sk>
+ * based on Docupen tools by Florian Heinz <fh@cronon-ag.de>
+ */
+#include <gphoto2/gphoto2-library.h>
+#include <libgphoto2/gphoto2-endian.h>
+#include "docupen.h"
+#include "huffman.h"
+
+gdImagePtr dp_get_image_mono(struct dp_imagehdr *dp, void *data)
+{
+	gdImagePtr img, fixed;
+	int black, white;
+	int type, len;
+	int x = 0, y = 0;
+	struct decoder decoder;
+	int palette256;
+	unsigned int tmp = 0;
+	int nr_marks = 0, mark = 0, offset = 0, last_mark = 0;
+	int dist = dp->dpi == RES_400DPI ? 26 : 13;
+	int out_width = dp->dpi == RES_400DPI ? 3072 : 1536;
+
+	img = gdImageCreate(le16toh(dp->sizex), le16toh(dp->sizey));
+	if (!img)
+		return NULL;
+
+	for (int i = 0; i <= 255; i++)
+		palettei = gdImageColorAllocate(img, i, i, i);
+	black = palette0;
+	white = palette255;
+
+	decoder_init(&decoder, data, le32toh(dp->payloadlen));
+	while (decoder_token(&decoder, &type, &len) >= 0) {
+		switch (type) {
+		case DECODER_EOL:
+			if (y > 0 && gdImagePalettePixel(img, 0, y) > 0xf0) {
+				nr_marks++;
+				last_mark = y;
+			}
+			y++;
+			x = 0;
+			tmp = 0;
+			break;
+		case DECODER_BLACK:
+		case DECODER_WHITE:
+			while (len && (x++ < le16toh(dp->sizex))) {
+				/* decode first 32 bits(pixels) as four 8bpp pixels */
+				if (x > le16toh(dp->sizex) - 32)
+					if (type == DECODER_WHITE)
+						tmp |= (1 << (le16toh(dp->sizex) - x));
+				if (x == le16toh(dp->sizex)) {
+					gdImageSetPixel(img, 0, y, tmp & 0xff);
+					gdImageSetPixel(img, 1, y, (tmp >> 8) & 0xff);
+					gdImageSetPixel(img, 2, y, (tmp >> 16) & 0xff);
+					gdImageSetPixel(img, 3, y, (tmp >> 24) & 0xff);
+				}
+				if (x <= le16toh(dp->sizex) - 32)
+					gdImageSetPixel(img, le16toh(dp->sizex) - x, y, (type == DECODER_WHITE) ? white : black);
+				len--;
+			}
+			break;
+		}
+		if (y >= le16toh(dp->sizey))
+			break;
+	}
+	/* don't lose the image bottom below the last mark */
+	if (last_mark < le16toh(dp->sizey) - 1) {
+		nr_marks++;
+		gdImageSetPixel(img, 0, le16toh(dp->sizey) - 1, 0xff);
+	}
+
+	fixed = gdImageCreate(out_width, nr_marks * dist);
+	if (!fixed) {
+		gdImageDestroy(img);
+		return NULL;
+	}
+	black = gdImageColorAllocate(fixed, 0, 0, 0);
+	white = gdImageColorAllocate(fixed, 255, 255, 255);
+
+	for (y = 0; y < img->sy; y++) {
+		if (y > 0 && gdImagePalettePixel(img, 0, y) > 0xf0) {
+			gdImageCopyResampled(fixed, img, 0, offset, 32, mark, out_width, dist, 1536, y - mark);
+			mark = y;
+			offset += dist;
+		}
+	}
+
+	gdImageDestroy(img);
+
+	return fixed;
+}
+
+struct line_grey4 {
+	unsigned char val800;
+};
+
+struct line_grey8 {
+	unsigned char val1600;
+};
+
+gdImagePtr dp_get_image_grey(struct dp_imagehdr *dp, void *data, struct lut *lut)
+{
+	gdImagePtr img, fixed;
+	int palette256, palette2256;
+	int i, j, odd, val;
+	struct line_grey4 *line4 = data;
+	struct line_grey8 *line8 = data;
+	int nr_marks = 0, mark = 0, offset = 0, last_mark = 0;
+	int pos_x;
+	int dist = dp->dpi == RES_400DPI ? 26 : 13;
+	int out_width = dp->dpi == RES_400DPI ? 3180 : 1590;
+
+	img = gdImageCreate(le16toh(dp->sizex), le16toh(dp->sizey));
+	if (!img)
+		return NULL;
+	for (i = 0; i <= 255; i++)
+		palettei = gdImageColorAllocate(img, i, i, i);
+
+	for (i = 0; i < le16toh(dp->sizey); i++) {
+		odd = 0;
+		for (j = 0; j < le16toh(dp->sizex); j++) {
+			if (le16toh(dp->type) == TYPE_GREY4) {
+				if (odd)
+					val = line4->valj >> 1 & 0xf0;
+				else
+					val = (line4->valj >> 1 & 0x0f) << 4;
+				odd = !odd;
+			} else
+				val = line8->valj;
+			pos_x = le16toh(dp->sizex) - j - 1;
+			if (pos_x != 1599)
+				val = lutpos_x * 3 + 2.dataval; /* use red LUT */
+			gdImageSetPixel(img, pos_x, i, paletteval);
+		}
+		if (i > 0 && gdImagePalettePixel(img, 1599, i) < 0xf0) {
+			nr_marks++;
+			last_mark = i;
+		}
+		line4++;
+		line8++;
+	}
+	/* don't lose the image bottom below the last mark */
+	if (last_mark < le16toh(dp->sizey) - 1) {
+		nr_marks++;
+		gdImageSetPixel(img, 1599, le16toh(dp->sizey) - 1, 0x80);
+	}
+
+	fixed = gdImageCreate(out_width, nr_marks * dist);
+	if (!fixed) {
+		gdImageDestroy(img);
+		return NULL;
+	}
+	for (i = 0; i <= 255; i++)
+		palette2i = gdImageColorAllocate(fixed, i, i, i);
+
+	for (i = 0; i < img->sy; i++) {
+		if (i > 0 && gdImagePalettePixel(img, 1599, i) < 0xf0) {
+			gdImageCopyResampled(fixed, img, 0, offset, 0, mark, out_width, dist, 1590, i - mark);
+			mark = i;
+			offset += dist;
+		}
+	}
+
+	gdImageDestroy(img);
+
+	return fixed;
+}
+
+struct line12 {
+	unsigned char r800;
+	unsigned char g800;
+	unsigned char b800;
+};
+
+struct line24 {
+	unsigned char r1600;
+	unsigned char g1600;
+	unsigned char b1600;
+};
+
+gdImagePtr dp_get_image_color(struct dp_imagehdr *dp, void *data, struct lut *lut)
+{
+	gdImagePtr img, fixed;
+	int i, j, odd;
+	unsigned char r, g, b;
+	struct line12 *line12 = data;
+	struct line24 *line24 = data;
+	int nr_marks = 0, mark = 0, offset = 0, last_mark = 0;
+	int pos_x;
+	int dist = dp->dpi == RES_400DPI ? 26 : 13;
+	int out_width = dp->dpi == RES_400DPI ? 3180 : 1590;
+
+	if ((le16toh(dp->sizex) <= 0) || (le16toh(dp->sizey) <= 0) ||
+		 ((le16toh(dp->sizex) * le16toh(dp->sizey) * 3) / (le16toh(dp->type) == TYPE_COLOR12 ? 2 : 1) > le32toh(dp->payloadlen)))
+		return NULL;
+
+	img = gdImageCreateTrueColor(le16toh(dp->sizex), le16toh(dp->sizey));
+	if (!img)
+		return NULL;
+
+	for (i = 0; i < le16toh(dp->sizey); i++) {
+		odd = 0;
+		for (j = 0; j < le16toh(dp->sizex); j++) {
+			if (le16toh(dp->type) == TYPE_COLOR12) {
+				if (odd) {
+					r = line12->rj >> 1 & 0xf0;
+					g = line12->gj >> 1 & 0xf0;
+					b = line12->bj >> 1 & 0xf0;
+				} else {
+					r = (line12->rj >> 1 & 0x0f) << 4;
+					g = (line12->gj >> 1 & 0x0f) << 4;
+					b = (line12->bj >> 1 & 0x0f) << 4;
+				}
+				odd = !odd;
+			} else {
+				r = line24->rj;
+				g = line24->gj;
+				b = line24->bj;
+			}
+			pos_x = le16toh(dp->sizex) - j - 1;
+			if (pos_x != 1599) {
+				r = lutpos_x * 3 + 2.datar;
+				g = lutpos_x * 3 + 1.datag;
+				b = lutpos_x * 3 + 0.datab;
+			}
+			gdImageSetPixel(img, pos_x, i, (r << 16) | (g << 8) | b);
+		}
+		if (gdTrueColorGetRed(gdImageTrueColorPixel(img, 1599, i)) < 0xf0) {
+			nr_marks++;
+			last_mark = i;
+		}
+		line12++;
+		line24++;
+	}
+	/* don't lose the image bottom below the last mark */
+	if (last_mark < le16toh(dp->sizey) - 1) {
+		nr_marks++;
+		gdImageSetPixel(img, 1599, le16toh(dp->sizey) - 1, 0x80 << 16);
+	}
+
+	fixed = gdImageCreateTrueColor(out_width, nr_marks * dist);
+	if (!fixed) {
+		gdImageDestroy(img);
+		return NULL;
+	}
+
+	for (i = 0; i < img->sy; i++) {
+		if (gdTrueColorGetRed(gdImageTrueColorPixel(img, 1599, i)) < 0xf0) {
+			gdImageCopyResampled(fixed, img, 0, offset, 0, mark, out_width, dist, 1590, i - mark);
+			mark = i;
+			offset += dist;
+		}
+	}
+
+	gdImageDestroy(img);
+
+	return fixed;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/enigma13/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/enigma13/Makefile-files Changed

@@ -1,12 +1,20 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += enigma13/STATUS enigma13/protocol.txt enigma13/README.enigma13 enigma13/ChangeLog
-camlibdoc_DATA += enigma13/README.enigma13
+EXTRA_DIST               += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += enigma13.la
+EXTRA_DIST               += %reldir%/README.enigma13
+camlibdoc_DATA           += %reldir%/README.enigma13
 
-enigma13_la_SOURCES = enigma13/enigma13.c
-enigma13_la_LDFLAGS = $(camlib_ldflags)
-enigma13_la_DEPENDENCIES = $(camlib_dependencies)
-enigma13_la_LIBADD = $(camlib_libadd)
+EXTRA_DIST               += %reldir%/STATUS
+EXTRA_DIST               += %reldir%/protocol.txt
 
+
+EXTRA_LTLIBRARIES        += enigma13.la
+
+enigma13_la_SOURCES       = %reldir%/enigma13.c
+
+enigma13_la_CFLAGS        = $(camlib_cflags)
+enigma13_la_CPPFLAGS      = $(camlib_cppflags)
+enigma13_la_DEPENDENCIES  = $(camlib_dependencies)
+enigma13_la_LDFLAGS       = $(camlib_ldflags)
+enigma13_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/enigma13/README.enigma13 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/enigma13/README.enigma13 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/enigma13/enigma13.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/enigma13/enigma13.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/enigma13/protocol.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/enigma13/protocol.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/fuji/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/fuji/ChangeLog Changed

@@ -1,4 +1,4 @@
-2002-04-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (post_func): Only put the camera back to 9600 bps if
 	  this is needed. And don't reset the camera before the speed change.
@@ -16,16 +16,16 @@
 
 	* fuji.c Remove 0xff escaping code now done by libgphoto2_port
 
-2002-04-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c: Formatting.
 
-2002-04-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c:
 	* fuji.c,h: Implement upload and summary.
 
-2002-04-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: A fuji_reset doesn't seem to reset the speed to 9600.
 
@@ -36,62 +36,62 @@
 	which does not support file-length query.
 	# fuji.h: Fixed FUJI_CMD_PIC_GET vs PIC_GET_THUMB swap.
 
-2002-04-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Don't make the check for supported commands fatal.
 
-2002-04-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: If we tell the camera to switch to another speed, we
 	  need to change the port's speed, too.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c
 	* fuji.c,h: Basic configuration support. Progress information.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* PROTOCOL: Some notes.
 	* fuji.c: Fix calculation of packet length.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c:
 	* fuji.c,h: Use the pre,post_func-tions.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c:
 	* fuji.c,h: Check for supported commands.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c: Fix calculation of checksum.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c: For now, don't check the checksum.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c: Fix calculation of packet length.
 
-2002-04-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c:
 	* fuji.c,h: Implement fetching of previews.
 
-2002-04-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c: Fix logic.
 
-2002-04-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* fuji.c,h:
 	* library.c: More functions. Needs testing.
 
-2002-04-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: New.
 	* fuji.c,h: Rewrite.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/fuji/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/fuji/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/fuji/fuji.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/fuji/fuji.c Changed

@@ -2,7 +2,7 @@
  *
  * Fuji Camera library for the gphoto project.
  *
- * © 2001 Matthew G. Martin <matt.martin@ieee.org>
+ * Â© 2001 Matthew G. Martin <matt.martin@ieee.org>
  *     2002 Lutz Mueller <lutz@users.sourceforge.net>
  *
  * This routine works for Fuji DS-7 and DX-5,7,10 and
@@ -49,24 +49,8 @@
 
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #ifndef MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
@@ -178,7 +162,7 @@
 	   unsigned char *last, GPContext *context)
 {
 	unsigned char b1024, check = 0;
-	int i;
+	unsigned int i;
 
 	/*
 	 * Read the header. The checksum covers all bytes between

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/fuji/fuji.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/fuji/fuji.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/fuji/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/fuji/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/gsmart300/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/gsmart300/Makefile-files Changed

@@ -1,14 +1,21 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += gsmart300/README.gsmart300 gsmart300/ChangeLog
-camlibdoc_DATA += gsmart300/README.gsmart300
+EXTRA_DIST                += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += gsmart300.la
+EXTRA_DIST                += %reldir%/README.gsmart300
+camlibdoc_DATA            += %reldir%/README.gsmart300
 
-gsmart300_la_SOURCES = \
-	gsmart300/gsmart300.c gsmart300/gsmart300.h \
-	gsmart300/library.c \
-	gsmart300/gsmart300-jpeg-header.h 
-gsmart300_la_LDFLAGS = $(camlib_ldflags)
-gsmart300_la_DEPENDENCIES = $(camlib_dependencies)
-gsmart300_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES         += gsmart300.la
+
+gsmart300_la_SOURCES       =
+gsmart300_la_SOURCES      += %reldir%/gsmart300.c
+gsmart300_la_SOURCES      += %reldir%/gsmart300.h
+gsmart300_la_SOURCES      += %reldir%/library.c
+gsmart300_la_SOURCES      += %reldir%/gsmart300-jpeg-header.h
+
+gsmart300_la_CFLAGS        = $(camlib_cflags)
+gsmart300_la_CPPFLAGS      = $(camlib_cppflags)
+gsmart300_la_DEPENDENCIES  = $(camlib_dependencies)
+gsmart300_la_LDFLAGS       = $(camlib_ldflags)
+gsmart300_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/gsmart300/gsmart300-jpeg-header.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/gsmart300/gsmart300-jpeg-header.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/gsmart300/gsmart300.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/gsmart300/gsmart300.c Changed

@@ -25,7 +25,7 @@
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <config.h>
 
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gphoto2/gphoto2.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 
 #include "gsmart300.h"
 #include "gsmart300-jpeg-header.h"
@@ -57,6 +57,10 @@
 #  define N_(String) (String)
 #endif
 
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#define sleep(x)
+#endif
+
 #define GP_MODULE "gsmart300"
 static int gsmart300_download_data (CameraPrivateLibrary * lib,
 		int data_type, uint16_t index, unsigned int size,
@@ -140,8 +144,18 @@
 		  + (p11 & 0xff);
 	qIndex = p7 & 0x07;
 
+	if (qIndex >= 5) {
+		GP_DEBUG("qIndex %d is larger or equal than 5\n", qIndex);
+		return GP_ERROR_CORRUPTED_DATA;
+	}
+
 	file_size = data_size + GSMART_JPG_DEFAULT_HEADER_LENGTH + 1024 * 10;
 
+	if (flash_size < data_size) {
+		GP_DEBUG("flash_size %d is smaller than data_size %d\n", flash_size, data_size);
+		return GP_ERROR_CORRUPTED_DATA;
+	}
+
 	/* slurp in the image */
 	mybuf = malloc (flash_size);
 	if (!mybuf)
@@ -322,7 +336,7 @@
 	GP_DEBUG ("* gsmart300_reset");
 	CHECK (gp_port_usb_msg_write (lib->gpdev, 0x02, 0x0000, 0x0003,
 				      NULL, 0));
-	sleep (1.5);
+	sleep (1);
 	return GP_OK;
 }
 
@@ -334,7 +348,7 @@
 				 uint16_t index, unsigned int size, uint8_t * buf)
 {
 	uint16_t fat_index = 0x1fff - index;
-	int i;
+	unsigned int i;
 
 	if (data_type == __GS300_FAT)
 		CHECK (gp_port_usb_msg_write (lib->gpdev, 0x03,
@@ -362,7 +376,7 @@
 gsmart300_get_FATs (CameraPrivateLibrary * lib)
 {
 	uint8_t type;
-	unsigned int index = 0;
+	int index = 0;
 	unsigned int file_index = 0;
 	uint8_t *p = NULL;
 	char buf14;
@@ -371,11 +385,11 @@
 
 	if (lib->fats)
 		free (lib->fats);
-	lib->fats = malloc ((lib->num_files) * FLASH_PAGE_SIZE_300);
+	lib->fats = calloc (lib->num_files,FLASH_PAGE_SIZE_300);
 
 	if (lib->files)
 		free (lib->files);
-	lib->files = malloc (lib->num_files * sizeof (struct GsmartFile));
+	lib->files = calloc (lib->num_files,sizeof (struct GsmartFile));
 
 	p = lib->fats;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/gsmart300/gsmart300.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/gsmart300/gsmart300.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/gsmart300/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/gsmart300/library.c Changed

@@ -25,7 +25,7 @@
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <config.h>
 
@@ -247,6 +247,7 @@
 		CHECK (gsmart300_get_info (camera->pl));
 
 	for (i = 0; i < camera->pl->num_files; i++) {
+		if (!camera->pl->filesi.name) continue; /* had a bad directory entry */
 		strncpy (temp_file, camera->pl->filesi.name, 12);
 		temp_file12 = 0;
 		gp_list_append (list, temp_file, NULL);
@@ -263,7 +264,7 @@
 	Camera *camera = user_data;
 	int number, filetype;
 
-	CHECK (number = gp_filesystem_number (camera->fs, folder, filename, 
+	CHECK (number = gp_filesystem_number (camera->fs, folder, filename,
 				              context));
 	switch (type) {
 		case GP_FILE_TYPE_NORMAL:
@@ -284,7 +285,7 @@
 
 static int
 get_info_func (CameraFilesystem *fs, const char *folder,
-	       const char *filename, CameraFileInfo *info, void *data, 
+	       const char *filename, CameraFileInfo *info, void *data,
 	       GPContext *context)
 {
 	Camera *camera = data;
@@ -292,13 +293,13 @@
 	struct GsmartFile *file;
 
 	/* Get the file number from the CameraFileSystem */
-	CHECK (n = gp_filesystem_number (camera->fs, folder, filename, 
+	CHECK (n = gp_filesystem_number (camera->fs, folder, filename,
 				         context));
 
 	CHECK (gsmart300_get_file_info (camera->pl, n, &file));
 
-	info->file.fields = GP_FILE_INFO_TYPE 
-		| GP_FILE_INFO_WIDTH 
+	info->file.fields = GP_FILE_INFO_TYPE
+		| GP_FILE_INFO_WIDTH
 		| GP_FILE_INFO_HEIGHT;
 	if (file->mime_type == GSMART_FILE_TYPE_IMAGE) {
 		strcpy (info->file.type, GP_MIME_JPEG);
@@ -308,8 +309,8 @@
 	info->file.width = file->width;
 	info->file.height = file->height;
 
-	info->preview.fields = GP_FILE_INFO_TYPE 
-		| GP_FILE_INFO_WIDTH 
+	info->preview.fields = GP_FILE_INFO_TYPE
+		| GP_FILE_INFO_WIDTH
 		| GP_FILE_INFO_HEIGHT;
 	strcpy (info->preview.type, GP_MIME_BMP);
 
@@ -324,7 +325,7 @@
 	int n, c;
 
 	/* Get the file number from the CameraFileSystem */
-	CHECK (n = gp_filesystem_number (camera->fs, folder, filename, 
+	CHECK (n = gp_filesystem_number (camera->fs, folder, filename,
 				         context));
 	CHECK (c = gp_filesystem_count (camera->fs, folder, context));
 	if (n + 1 != c) {
@@ -332,7 +333,7 @@
 
 		gp_filesystem_name (fs, "/", c - 1, &name, context);
 		gp_context_error (context,
-											_("Your camera only supports deleting " 
+											_("Your camera only supports deleting "
 												"the last file on the camera. In this "
 												"case, this is file '%s'."), name);
 		return (GP_ERROR);
@@ -342,7 +343,7 @@
 }
 
 static int
-delete_all_func (CameraFilesystem *fs, const char *folder, void *data, 
+delete_all_func (CameraFilesystem *fs, const char *folder, void *data,
 		 GPContext *context)
 {
 	Camera *camera = data;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/hp215/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/hp215/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/hp215/PROTOCOL -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/hp215/PROTOCOL Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/hp215/crctab.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/hp215/crctab.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/hp215/hp215.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/hp215/hp215.c Changed

@@ -16,7 +16,7 @@
  *                                                                           *
  *  You should have received a copy of the GNU Library General Public        *
  *  License along with this program; see the file COPYING.LIB.  If not,      *
- *  write to the 
+ *  write to the
  *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA  02110-1301  USA
  *                                                                           *
@@ -53,7 +53,7 @@
      0x03 = Endcode   for a command
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -69,24 +69,12 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
 
-#include "crctab.h"
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
+#include "crctab.h"
 #include "hp215.h"
 
+
 enum hp215_cmd {
 	SET_TIME			= 0x86,
 	SET_TIME_AS_STR			= 0x87,
@@ -414,7 +402,7 @@
 		gp_log (GP_LOG_ERROR, "hp215", "too short reply block, %d bytes", msglen);
 		return GP_ERROR_IO;
 	}
-	
+
 	memcpy (datebuf, msg, 15);
 	gp_log (GP_LOG_DEBUG, "hp215", "0f: %02x", msg0x0f & 0x7f);
 	gp_log (GP_LOG_DEBUG, "hp215", "10: %02x", msg0x10 & 0x7f);
@@ -602,7 +590,7 @@
 0000  80 80 80 85 86 85-84 84 30 31 2f 30 32 2f  ..........01/02/
 0010  30 30 20 31 34 3a 34 38-00 80 81 80 80 80 80 81  00 14:48........
 0020  88 89 84 81 80 80 80 80-80 81 00 00 00 00 00 00  ................
-0030  00 00 00 00 00 00      -                         ......          
+0030  00 00 00 00 00 00      -                         ......
  */
 	xmsg = msg;
 	ret = decode_u32(&xmsg, &msglen, &val);
@@ -704,7 +692,7 @@
 	if (ret < GP_OK) return ret;
 	ret = decode_u32(&xmsg, &msglen, &val3);
 	if (ret < GP_OK) return ret;
-	
+
 	gp_log (GP_LOG_DEBUG, "hp215", "shootmode table 0x%08x, 0x%08x, 0x%08x", val1, val2, val3);
 
 	cnt = val1+val2;
@@ -853,7 +841,7 @@
 	settings.usb.inep  = 0x83;
 	settings.usb.outep = 0x04;
 	gp_port_set_settings (camera->port, settings);
-	/* This function does the initialisation sequence.
+	/* This function does the initialization sequence.
 	 * CMD = 0xce, REPLY = 2 byte, 0xe0 0xe0  ... apparently means ok.
 	 */
 	gp_log (GP_LOG_DEBUG, "hp215", "Sending init sequence ... ");

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/hp215/hp215.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/hp215/hp215.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/iclick/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/iclick/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/iclick/iclick.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/iclick/iclick.c Changed

@@ -1,23 +1,23 @@
 /*
  * iclick.c
  *
- * Here, the functions which are needed to get data from the camera.  
+ * Here, the functions which are needed to get data from the camera.
  *
  * Copyright (c) 2004 Theodore Kilgore <kilgota@auburn.edu>,
- * Stephen Pollei <stephen_pollei@comcast.net>. 
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
- * The chip supported by this driver is presumed to be the SQ915.  
+ * Stephen Pollei <stephen_pollei@comcast.net>.
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
+ * The chip supported by this driver is presumed to be the SQ915.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
 #include <config.h>
 
@@ -28,15 +28,12 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include "iclick.h"
 
-#define GP_MODULE "iclick" 
+#define GP_MODULE "iclick"
 
 #define SQWRITE gp_port_usb_msg_write
 #define SQREAD  gp_port_usb_msg_read
@@ -47,12 +44,12 @@
 static unsigned char *
 icl_read_data (GPPort *port, unsigned char *data, int size)
 {
-	gp_port_read (port, data, size); 
+	gp_port_read (port, data, size);
 	return GP_OK;
 }
 */
 
-int icl_access_reg (GPPort *port, enum icl_cmnd_type reg) 
+int icl_access_reg (GPPort *port, enum icl_cmnd_type reg)
 {
 	SQWRITE (port, 0x0c, reg,
 			(CONFIG == reg) ? CONFIG_I : 0,
@@ -60,7 +57,7 @@
 	return GP_OK;
 }
 
-int 
+int
 icl_init (GPPort *port, CameraPrivateLibrary *priv)
 {
 	int i;
@@ -69,29 +66,29 @@
 	unsigned char *catalog_tmp;
 
 	priv->model=SQ_MODEL_ICLICK;
-	
-	
+
+
 	if (!catalog) return GP_ERROR_NO_MEMORY;
 
 
 	icl_reset (port);
 
 	icl_access_reg(port, CONFIG);	     /* Access config */
-	gp_port_read(port, (char *)catalog, 0x8000); 
+	gp_port_read(port, (char *)catalog, 0x8000);
 	/* Config data is in lines of 16 bytes. Each photo uses two lines. */
 	icl_read_picture_data(port, dummy_buf, 0x28000);
 	icl_reset (port);
 
-	/* Photo list starts with line 0040. List terminates when we 
+	/* Photo list starts with line 0040. List terminates when we
 	 * the first entry of an even-numbered line is zero. */
-	for (i=0; i< (0x8000 - 64) && catalogi+64 ; i+=32) 
+	for (i=0; i< (0x8000 - 64) && catalogi+64 ; i+=32)
 		;
 	priv->nb_entries = i>>5;
 	if (i) {
 		catalog_tmp = realloc(catalog, i);
-		if (catalog_tmp) 
+		if (catalog_tmp)
 			priv->catalog = catalog_tmp;
-		else 
+		else
 			priv->catalog = catalog;
 	} else {
 		free(catalog);
@@ -122,8 +119,8 @@
 int
 icl_get_width_height (CameraPrivateLibrary *priv, int entry, int *w, int *h)
 {
-	*w = 640; 
-	*h = 480; 
+	*w = 640;
+	*h = 480;
 	return GP_OK;
 }
 
@@ -132,11 +129,11 @@
 icl_rewind (GPPort *port, CameraPrivateLibrary *priv)
 {
 	static unsigned char dummy_buf0x30000;
-	
+
 	GP_DEBUG("REWIND cam's data pointer");
 
 	/* One has to read the catalog to rewind the data stream...
-	 * I don't know if it's by design. 
+	 * I don't know if it's by design.
 	 * There ought to be something better to do... :-/
 	 */
 
@@ -161,7 +158,7 @@
     	return GP_OK;
 }
 
-int 
+int
 icl_read_picture_data (GPPort *port, unsigned char *data, int size )
 {
 	int remainder = size % 0x8000;
@@ -175,6 +172,6 @@
 		gp_port_read (port, (char *)data + offset, remainder);
 
     	return GP_OK;
-} 
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/iclick/iclick.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/iclick/iclick.h Changed

@@ -1,28 +1,28 @@
 /*
  * iclick.c
  *
- * Here, the functions which are needed to get data from the camera.  
+ * Here, the functions which are needed to get data from the camera.
  *
- * Copyright (c) 2004 Theodore Kilgore <kilgota@auburn.edu>, 
+ * Copyright (c) 2004 Theodore Kilgore <kilgota@auburn.edu>,
  * Stephen Pollei <stephen_pollei@comcast.net>.
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
- * The chip supported by this driver is presumed to be the SQ915.  
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
+ * The chip supported by this driver is presumed to be the SQ915.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
 
 
-#ifndef __ICLICK_H__
-#define __ICLICK_H__
+#ifndef CAMLIBS_ICLICK_ICLICK_H
+#define CAMLIBS_ICLICK_ICLICK_H
 
 #include <gphoto2/gphoto2-port.h>
 
@@ -30,8 +30,8 @@
  * A 'clip' is an autoshoot clip.
  * A 'frame' is a single a picture out of a clip.
  * An 'entry' corresponds to a line listed in the camera's configuration data,
- * part of which is a rudimentary allocation table (the 'catalog'). 
- * An entry, therefore, may be either a picture or a clip. 
+ * part of which is a rudimentary allocation table (the 'catalog').
+ * An entry, therefore, may be either a picture or a clip.
  * We reserve the word 'file' for the user fetchable file,
  * that is, a picture or a frame.
  */
@@ -90,5 +90,5 @@
 int icl_get_size                      (CameraPrivateLibrary *, int entry);
 int icl_get_width_height              (CameraPrivateLibrary *, int entry, int *w, int *h);
 
-#endif
+#endif /* !defined(CAMLIBS_ICLICK_ICLICK_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/iclick/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/iclick/library.c Changed

@@ -19,7 +19,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <config.h>
 
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bayer.h>
-#include <gamma.h>
+#include <libgphoto2/bayer.h>
+#include <libgphoto2/gamma.h>
 
 
 #include <gphoto2/gphoto2.h>
@@ -60,7 +60,7 @@
    	unsigned short idProduct;
 } models = {
         {"iClick 5X",    GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9153},
-	{NULL,0,0}
+	{NULL,0,0,0}
 };
 
 int
@@ -111,7 +111,7 @@
 
 static int camera_manual (Camera *camera, CameraText *manual, GPContext *context)
 {
-	strcpy(manual->text, 	
+	strcpy(manual->text,
 	_(
 	"Information regarding cameras with ID 0x2770:0x9153.\n\n"
 	"We do not recommend the use of a GUI program to access\n"
@@ -255,6 +255,7 @@
 		if (icl_get_width_height (camera->pl, entry, &w, &h) >= GP_OK)
 			break; /* Known format, process image */
 		/* Unsupported format, fallthrough to raw */
+		/* fallthrough */
 	case GP_FILE_TYPE_RAW:
 		gp_file_set_mime_type (file, GP_MIME_RAW);
 		gp_file_adjust_name_for_mime_type (file);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jamcam/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jamcam/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jamcam/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jamcam/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jamcam/jamcam.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jamcam/jamcam.c Changed

@@ -30,25 +30,14 @@
 #include <string.h>
 
 #include <gphoto2/gphoto2.h>
-#include <bayer.h>
-#include <gamma.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include <libgphoto2/bayer.h>
+#include <libgphoto2/gamma.h>
+
+#include "libgphoto2/i18n.h"
 
 #include "library.h"
 
+
 #define GP_MODULE "jamcam"
 #define TIMEOUT	      2000
 
@@ -181,7 +170,8 @@
 	char *raw, *ppm;
 	unsigned char gtable256;
 	char *ptr;
-	int size = 0, n = 0;
+	unsigned int size = 0;
+	int n = 0;
 	int width, height;
 	struct jamcam_file *jc_file;
 
@@ -198,7 +188,7 @@
 
 	raw = malloc(640*480 * 3);
 	ppm = malloc(640*480 * 3 + 200);
-	
+
 	switch (type) {
 	case GP_FILE_TYPE_PREVIEW:
 
@@ -238,6 +228,12 @@
 			"%d %d\n"
 			"255\n", jc_file->width, jc_file->height );
 
+		if ((jc_file->width > 640) || (jc_file->height > 480)) {
+			free (raw);
+			free (ppm);
+			return GP_ERROR;
+		}
+
 		ptr = ppm + strlen( ppm );
 
 		size = strlen( ppm ) + ( jc_file->width * jc_file->height * 3 );

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jamcam/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jamcam/library.c Changed

@@ -31,37 +31,21 @@
 #include <time.h>
 #include <math.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE
 
 static struct jamcam_file jamcam_files1024;
-static int jamcam_count = 0;
+static unsigned int jamcam_count = 0;
 static int jamcam_mmc_card_size = 0;
 
 static int jamcam_read_packet (Camera *camera, unsigned char *packet, int length);
 static int jamcam_write_packet (Camera *camera, unsigned char *packet, int length);
 static int jamcam_fetch_memory( Camera *camera, CameraFile *file,
-		unsigned char *data, int start, int length, GPContext *context);
+		unsigned char *data, unsigned int start, unsigned int length, GPContext *context);
 static int jamcam_query_mmc_card (Camera *camera);
 
 static int jamcam_set_int_at_pos( unsigned char *buf, int pos, int value ) {
@@ -70,10 +54,10 @@
 	bufpos + 2 = ( value >> 16 ) & 0xff;
 	bufpos + 3 = ( value >> 24 ) & 0xff;
 
-	return( value );
+	return value;
 }
 
-static int jamcam_get_int_at_pos( unsigned char *buf, int pos ) {
+static unsigned int jamcam_get_int_at_pos( unsigned char *buf, int pos ) {
 	int ret = 0;
 
 	ret += bufpos + 0;
@@ -81,10 +65,10 @@
 	ret += bufpos + 2 * 256 * 256;
 	ret += bufpos + 3 * 256 * 256 * 256;
 
-	return( ret );
+	return ret;
 }
 
-static int jamcam_set_usb_mem_pointer( Camera *camera, int position ) {
+static int jamcam_set_usb_mem_pointer( Camera *camera, unsigned int position ) {
 	char reply8;
 
 	GP_DEBUG ("* jamcam_set_usb_mem_pointer");
@@ -103,7 +87,7 @@
 		0,
 		reply, 8 );
 
-	return( GP_OK );
+	return GP_OK;
 }
 
 
@@ -112,9 +96,9 @@
 	unsigned char buf16;
 	unsigned char reply512;
 	unsigned int position = 0x40000000;
-	int data_incr;
-	int width;
-	int height;
+	unsigned int data_incr;
+	unsigned int width;
+	unsigned int height;
 
 	GP_DEBUG ("* jamcam_mmc_card_file_count");
 
@@ -140,13 +124,15 @@
 				jamcam_filesjamcam_count.height = height;
 				jamcam_filesjamcam_count.data_incr = data_incr;
 
+				if (jamcam_count+1 >= sizeof(jamcam_files)/sizeof(jamcam_files0))
+					break;
 				jamcam_count++;
 
 				position += data_incr;
 
 				jamcam_set_int_at_pos( buf, 4, position );
 				jamcam_write_packet( camera, buf, 8 );
-			
+
 				jamcam_read_packet( camera, reply, 16 );
 			}
 			break;
@@ -185,6 +171,8 @@
 				jamcam_filesjamcam_count.width = width;
 				jamcam_filesjamcam_count.height = height;
 				jamcam_filesjamcam_count.data_incr = data_incr;
+				if (jamcam_count+1 >= sizeof(jamcam_files)/sizeof(jamcam_files0))
+					break;
 				jamcam_count++;
 
 				position += data_incr;
@@ -215,7 +203,7 @@
 			break;
 	}
 
-	GP_DEBUG (		"*** returning with jamcam_count = %d", jamcam_count);
+	GP_DEBUG (		"*** returning with jamcam_count = %u", jamcam_count);
 	return( 0 );
 }
 
@@ -255,6 +243,8 @@
 				jamcam_filesjamcam_count.width = width;
 				jamcam_filesjamcam_count.height = height;
 				jamcam_filesjamcam_count.data_incr = data_incr;
+				if (jamcam_count+1 >= sizeof(jamcam_files)/sizeof(jamcam_files0))
+					break;
 
 				jamcam_count++;
 
@@ -262,7 +252,7 @@
 
 				jamcam_set_int_at_pos( buf, 4, position );
 				jamcam_write_packet( camera, buf, 8 );
-			
+
 				jamcam_read_packet( camera, reply, 16 );
 			}
 
@@ -291,6 +281,8 @@
 				jamcam_filesjamcam_count.width = width;
 				jamcam_filesjamcam_count.height = height;
 				jamcam_filesjamcam_count.data_incr = data_incr;
+				if (jamcam_count+1 >= sizeof(jamcam_files)/sizeof(jamcam_files0))
+					break;
 				jamcam_count++;
 
 				position += data_incr;
@@ -313,19 +305,19 @@
 		jamcam_count += jamcam_mmc_card_file_count( camera );
 	}
 
-	GP_DEBUG (		"*** returning jamcam_count = %d", jamcam_count);
+	GP_DEBUG (		"*** returning jamcam_count = %u", jamcam_count);
 	return( jamcam_count );
 }
 
 static int jamcam_fetch_memory( Camera *camera, CameraFile *file,
-		unsigned char *data, int start, int length, GPContext *context) {
+		unsigned char *data, unsigned int start, unsigned int length, GPContext *context) {
 	unsigned char tmp_buf16;
 	unsigned char packet16;
-	int new_start;
-	int new_end;
-	int bytes_read = 0;
-	int bytes_to_read;
-	int bytes_left = length;
+	unsigned int new_start;
+	unsigned int new_end;
+	unsigned int bytes_read = 0;
+	unsigned int bytes_to_read;
+	unsigned int bytes_left = length;
 	int res = GP_OK;
 	unsigned int id = 0;
 
@@ -377,7 +369,7 @@
 
 				break;
 		}
-				
+
 		bytes_left -= bytes_to_read;
 		bytes_read += bytes_to_read;
 
@@ -398,12 +390,12 @@
 	if ( res == GP_OK ) {
 		GP_DEBUG ("  * returning OK");
 	}
-	return( res );
+	return res;
 }
 
 int jamcam_request_image( Camera *camera, CameraFile *file,
-		char *buf, int *len, int number, GPContext *context ) {
-	int position;
+		char *buf, unsigned int *len, int number, GPContext *context ) {
+	unsigned int position;
 	int result;
 	unsigned char *tmp_buf;
 
@@ -424,9 +416,11 @@
 			0x0000,
 			NULL, 0 );
 	}
-	
-	result = jamcam_fetch_memory( camera, file, tmp_buf, position,
-		jamcam_filesnumber.data_incr, context );
+	if (jamcam_filesnumber.data_incr <= 640*480*3)
+		result = jamcam_fetch_memory( camera, file, tmp_buf, position,
+			jamcam_filesnumber.data_incr, context );
+	else
+		result = GP_ERROR;
 
 	/* this seems to reset the camera to a sane status */
 	if ( camera->port->type == GP_PORT_USB ) {
@@ -439,11 +433,12 @@
 
 	if ( result == GP_OK ) {
 		*len = jamcam_filesnumber.width * jamcam_filesnumber.height;
-		memcpy( buf, tmp_buf + 0x10, *len );
+		if (*len < 640*480*3)
+			memcpy( buf, tmp_buf + 0x10, *len );
 	}
 	free (tmp_buf);
 
-	return( result );
+	return result;
 }
 
 struct jamcam_file *jamcam_file_info(Camera *camera, int number)
@@ -453,14 +448,14 @@
 }
 
 int jamcam_request_thumbnail( Camera *camera, CameraFile *file,
-		char *buf, int *len, int number, GPContext *context ) {
+		char *buf, unsigned int *len, int number, GPContext *context ) {
 	unsigned char line2048;
 	char packet16;
-	int position;
+	unsigned int position;
 	int x, y;
 	int res = GP_OK;
 	char *ptr;
-	int bytes_to_read;
+	unsigned int bytes_to_read;
 	unsigned int id;
 
 	GP_DEBUG ("* jamcam_request_thumbnail");
@@ -494,6 +489,11 @@
 		}
 	}
 
+	if (bytes_to_read > sizeof(line)) {
+		res = GP_ERROR;
+		goto resetcam;
+	}
+
 	/* fetch thumbnail lines and build the thumbnail */
 	position += 10 * jamcam_filesnumber.width;
 	id = gp_context_progress_start (context, 60.,
@@ -529,6 +529,7 @@
 	}
 	gp_context_progress_stop (context, id);
 
+resetcam:
 	/* this seems to reset the camera to a sane status */
 	if ( camera->port->type == GP_PORT_USB ) {
 		gp_port_usb_msg_write( camera->port,
@@ -538,7 +539,7 @@
 			NULL, 0 );
 	}
 
-	return( res );
+	return res;
 }
 
 static int jamcam_write_packet (Camera *camera, unsigned char *packet, int length) {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jamcam/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jamcam/library.h Changed

@@ -23,8 +23,8 @@
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
 
-#ifndef __LIBRARY_H__
-#define __LIBRARY_H__
+#ifndef CAMLIBS_JAMCAM_LIBRARY_H
+#define CAMLIBS_JAMCAM_LIBRARY_H
 
 #define	RETRIES			10
 
@@ -34,16 +34,16 @@
 #define CHECK(result) {int __res; __res = result; if (__res < 0) return (__res);}
 
 struct jamcam_file {
-	int position;
-	int width;
-	int height;
-	int data_incr;
+	unsigned int position;
+	unsigned int width;
+	unsigned int height;
+	unsigned int data_incr;
 };
 
 int jamcam_enq(Camera *camera);
 int jamcam_file_count(Camera *camera);
 struct jamcam_file *jamcam_file_info(Camera *camera, int number);
-int jamcam_request_image(Camera *camera, CameraFile *file, char *buf, int *len, int number, GPContext *context );
-int jamcam_request_thumbnail(Camera *camera, CameraFile *file, char *buf, int *len, int number, GPContext *context );
+int jamcam_request_image(Camera *camera, CameraFile *file, char *buf, unsigned int *len, int number, GPContext *context );
+int jamcam_request_thumbnail(Camera *camera, CameraFile *file, char *buf, unsigned int *len, int number, GPContext *context );
 
-#endif /* __LIBRARY_H__ */
+#endif /* !defined(CAMLIBS_JAMCAM_LIBRARY_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/decomp.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/decomp.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/decomp.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/decomp.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/jd11.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/jd11.c Changed

@@ -1,16 +1,16 @@
 /*
  * Jenoptik JD11 Camera Driver
  * Copyright 1999-2001 Marcus Meissner <marcus@jet.franken.de>
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -27,29 +27,18 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "serial.h"
 
-int camera_id (CameraText *id) 
+
+int camera_id (CameraText *id)
 {
 	strcpy(id->text, "JD11");
 	return (GP_OK);
 }
 
-int camera_abilities (CameraAbilitiesList *list) 
+int camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -102,7 +91,7 @@
 }
 
 static int file_list_func (CameraFilesystem *fs, const char *folder,
-			   CameraList *list, void *data, GPContext *context) 
+			   CameraList *list, void *data, GPContext *context)
 {
 	Camera *camera = (Camera*)data;
 
@@ -153,23 +142,23 @@
     return jd11_erase_all(camera->port);
 }
 
-static int camera_manual (Camera *camera, CameraText *manual, GPContext *context) 
+static int camera_manual (Camera *camera, CameraText *manual, GPContext *context)
 {
-	strcpy(manual->text, 
+	strcpy(manual->text,
 	_(
 	"The JD11 camera works rather well with this driver.\n"
 	"An RS232 interface @ 115 kbit is required for image transfer.\n"
 	"The driver allows you to get\n\n"
 	"   - thumbnails (64x48 PGM format)\n"
 	"   - full images (640x480 PPM format)\n"
-	)); 
+	));
 
 	return (GP_OK);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy (about->text, 
+	strcpy (about->text,
 		_("JD11\n"
 		"Marcus Meissner <marcus@jet.franken.de>\n"
 		"Driver for the Jenoptik JD11 camera.\n"
@@ -178,7 +167,7 @@
 	return (GP_OK);
 }
 static int camera_config_get (Camera *camera, CameraWidget **window,
-			      GPContext *context) 
+			      GPContext *context)
 {
 	CameraWidget *widget,*section;
 	float value_float,red,green,blue;
@@ -231,7 +220,7 @@
 }
 
 static int camera_config_set (Camera *camera, CameraWidget *window,
-			      GPContext *context) 
+			      GPContext *context)
 {
 	float f,red,green,blue;
 	CameraWidget *widget,*section;
@@ -282,7 +271,7 @@
 	.delete_all_func = delete_all_func,
 };
 
-int camera_init (Camera *camera, GPContext *context) 
+int camera_init (Camera *camera, GPContext *context)
 {
         gp_port_settings settings;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/jd11.html -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/jd11.html Changed

@@ -1,7 +1,7 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <meta name="GENERATOR" content="Mozilla/4.61C-CCK-MCD Caldera Systems OpenLinux en (X11; I; Linux 2.2.14 i586) Netscape">
    <meta name="license" content="GPL v2">
    <title>Reverse Engineering the JD11 (JenCam 11) </title>
@@ -14,7 +14,7 @@
 <hr>
 <h2>
 What is the JD11?</h2>
-The JD11 is a cheap digital camera produced by JenOptik (apparenly a subsidary
+The JD11 is a cheap digital camera produced by JenOptik (apparenly a subsidiary
 of Zeiss Jena). It was at the time of writing this available for around
 250 DM.
 <p>There is software available, a windows program called <i>FotoBee</i>
@@ -27,7 +27,7 @@
 The JD11 comes with a serial cable with a DB9 connector on the computerside
 and a small klinkenstecker at the camera end. So just 2 lines (RX, TX)
 and GND.
-<p>There is no documenation on the serial protocol in the inlaying documentation.
+<p>There is no documentation on the serial protocol in the inlaying documentation.
 <p>The FotoBee.exe program uses the Windows serial communications interface,
 which is fortunately implemented in WINE. By snooping the setup calls,
 the serial parameters are:
@@ -125,7 +125,7 @@
 	<td>
 		The packetreader. It is called in a loop after querying the
 		imagesize. If 201 bytes are read, the 201th byte is the checksum
-		(sum of 0-199)&0xff, otherwise there is no checksum.<br>
+		(sum of 0-199)&amp;0xff, otherwise there is no checksum.<br>
 		Returns the 200 bytes read.
 	</td>
 </tr>
@@ -226,7 +226,7 @@
 format. It does not unfortunately.
 
 <h3>Chapter 3.1: The format of the index picture</h3>
-Casting a closer look at the raw data of the index picture shows a a stream
+Casting a closer look at the raw data of the index picture shows a stream
 of 8 bit values. Some experimentation later it turns out to a stream of
 64x48 grayscale pictures, upside down.
 Using:<pre>
@@ -297,7 +297,7 @@
 The high quality format uses a very different compression.<p>
 It just compacts all 8bit values to 6bit by shortening out the 2 least
 significant bits.
-So we just restore them (AAAA AABB BBBB CCCC CCDD DDDD -> AAAAAA00, BBBBBB00,
+So we just restore them (AAAA AABB BBBB CCCC CCDD DDDD -&gt; AAAAAA00, BBBBBB00,
 CCCCCC00, DDDDDD00) and get the same grayscale images as with the lowquality
 compression.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/serial.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/serial.c Changed

@@ -1,16 +1,16 @@
 /*
  * Jenopt JD11 Camera Driver
- * Copyright 1999-2001 Marcus Meissner <marcus@jet.franken.de> 
- * 
+ * Copyright 1999-2001 Marcus Meissner <marcus@jet.franken.de>
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -30,29 +30,12 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#include <bayer.h>
+#include <libgphoto2/bayer.h>
+#include "libgphoto2/i18n.h"
 
 #include "serial.h"
 #include "decomp.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #if 0
 static int
@@ -273,7 +256,7 @@
 	fprintf(stderr,"TestFLASH: xcmd = %x.\n",xcmd);
 }
 
-/* some kind of selftest  ... shuts the shutters, beeps... only stops by 
+/* some kind of selftest  ... shuts the shutters, beeps... only stops by
  * powercycle. */
 static void cmd_79(GPPort *port) {
 	unsigned short xcmd;
@@ -351,7 +334,7 @@
 }
 
 /* This function reads all thumbnails at once and initializes the whole
- * camera filesystem. This can be done, because finding out how much 
+ * camera filesystem. This can be done, because finding out how much
  * pictures are on the camera is done by reading the whole preview picture
  * stream anyway.
  * And since the file infos are static mostly, why not just set them too at
@@ -401,7 +384,7 @@
 	unsigned char thumb64*48;
 	int y;
 	CameraFileInfo	info;
-	
+
 	ret = gp_file_new(&file);
 	if (ret!=GP_OK) {
 	    free(indexbuf);
@@ -435,16 +418,17 @@
 		return ret;
 	}
 
+	memset (&info, 0, sizeof (info));
 	/* we also get the fs info for free, so just set it */
 	info.file.fields = GP_FILE_INFO_TYPE |
-			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT | 
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
 			GP_FILE_INFO_SIZE;
 	strcpy(info.file.type,GP_MIME_PNM);
 	info.file.width		= 640;
 	info.file.height	= 480;
 	info.file.size		= 640*480*3+strlen(IMGHEADER);
 	info.preview.fields = GP_FILE_INFO_TYPE |
-			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT | 
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
 			GP_FILE_INFO_SIZE;
 	strcpy(info.preview.type,GP_MIME_PGM);
 	info.preview.width	= 64;
@@ -523,6 +507,12 @@
     }
     gp_file_append(file, IMGHEADER, strlen(IMGHEADER));
     data = malloc(640*480*3);
+    if (!data) {
+        free(uncomp0);free(uncomp1);free(uncomp2);
+        free(imagebufs0);free(imagebufs1);free(imagebufs2);free(imagebufs);
+        return GP_ERROR_NO_MEMORY;
+    }
+
     if (!raw) {
 	unsigned char *bayerpre;
 	s = bayerpre = malloc(640*480);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jd11/serial.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jd11/serial.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005a/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005a/Makefile-files Changed

@@ -1,13 +1,20 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += jl2005a/README.jl2005a jl2005a/ChangeLog
-camlibdoc_DATA += jl2005a/README.jl2005a jl2005a/ChangeLog
+EXTRA_DIST              += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += jl2005a.la
+EXTRA_DIST              += %reldir%/README.jl2005a
+camlibdoc_DATA          += %reldir%/README.jl2005a
 
-jl2005a_la_SOURCES = jl2005a/library.c\
-		    jl2005a/jl2005a.c\
-		    jl2005a/jl2005a.h
-jl2005a_la_LDFLAGS = $(camlib_ldflags)
-jl2005a_la_DEPENDENCIES = $(camlib_dependencies)
-jl2005a_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES       += jl2005a.la
+
+jl2005a_la_SOURCES       =
+jl2005a_la_SOURCES      += %reldir%/library.c
+jl2005a_la_SOURCES      += %reldir%/jl2005a.c
+jl2005a_la_SOURCES      += %reldir%/jl2005a.h
+
+jl2005a_la_CFLAGS        = $(camlib_cflags)
+jl2005a_la_CPPFLAGS      = $(camlib_cppflags)
+jl2005a_la_DEPENDENCIES  = $(camlib_dependencies)
+jl2005a_la_LDFLAGS       = $(camlib_ldflags)
+jl2005a_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005a/jl2005a.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005a/jl2005a.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005a/jl2005a.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005a/jl2005a.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005a/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005a/library.c Changed

@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bayer.h>
-#include <gamma.h>
+#include <libgphoto2/bayer.h>
+#include <libgphoto2/gamma.h>
 
 #include <gphoto2/gphoto2.h>
 
@@ -164,9 +164,10 @@
 {
 	Camera *camera = user_data;
 	int status = GP_OK;
-	int w, h = 0, k;
-	int i,j;
-	int b = 0;
+	unsigned int w, h = 0;
+	unsigned int i, j;
+	int k;
+	unsigned int b = 0;
 	int compressed = 0;
 	unsigned char header5 = "\xff\xff\xff\xff\x55";
 	unsigned int size;
@@ -190,6 +191,18 @@
 	GP_DEBUG ("width is %i\n", w);
 	h = jl2005a_get_pic_height(camera->port);
 	GP_DEBUG ("height is %i\n", h);
+
+	/* sanity check against bad usb devices */
+	if ((w ==0) || (w > 1024) || (h == 0) || (h > 1024)) {
+		GP_DEBUG ("width / height not within sensible range");
+		return GP_ERROR_CORRUPTED_DATA;
+	}
+
+	if (b < w*h+5) {
+		GP_DEBUG ("b is %i, while w*h+5 is %i\n", b, w*h+5);
+		return GP_ERROR_CORRUPTED_DATA;
+	}
+
 	/* Image data to be downloaded contains header and footer bytes */
 	data = malloc (b+14);
 	if (!data) return GP_ERROR_NO_MEMORY;
@@ -208,7 +221,7 @@
 	/* Now get ready to put the data into a PPM image file. */
 	image_start=data+5;
 	if (w == 176) {
-		for (i=1; i < h; i +=4){
+		for (i=1; i < h-1; i +=4){
 			for (j=1; j< w; j ++){
 				temp=image_starti*w+j;
 				image_starti*w+j = image_start(i+1)*w+j;
@@ -224,15 +237,33 @@
 			compressed = 1;
 			h = 288;
 		}
-	p_data = malloc( w*h );
+
+	/* sanity check the sizes, as the ahd bayer algorithm does not like very small height / width */
+	if ((h < 72) || (w < 176)) {
+		status = GP_ERROR_CORRUPTED_DATA;
+		goto end;
+	}
+	p_data = calloc( w,h );
 	if (!p_data) {
 		status =  GP_ERROR_NO_MEMORY;
 		goto end;
 	}
-	if (compressed)
+	if (compressed) {
+		/* compressed seems to mean half the lines */
+		if (w/2*h > b+14) {
+			free(p_data);
+			status = GP_ERROR_CORRUPTED_DATA;
+			goto end;
+		}
 		jl2005a_decompress (image_start, p_data, w, h);
-	else
+	} else {
+		if (w*h > b+14) {
+			free(p_data);
+			status = GP_ERROR_CORRUPTED_DATA;
+			goto end;
+		}
 		memcpy(p_data, image_start, w*h);
+	}
 	ppm = malloc (w * h * 3 + 256); /* room for data and header */
 	if (!ppm) {
 		free(p_data);
@@ -247,7 +278,7 @@
 	size = strlen ((char *)ppm);
 	ptr = ppm + size;
 	size = size + (w * h * 3);
-	GP_DEBUG ("size = %i\n", size);
+	GP_DEBUG ("size = %i, w = %d, h = %d\n", size, w,h );
 	gp_ahd_decode (p_data, w , h, ptr, BAYER_TILE_BGGR);
 
 	free(p_data);
@@ -255,7 +286,7 @@
 	gp_gamma_correct_single (gtable, ptr, w * h);
 	gp_file_set_mime_type (file, GP_MIME_PPM);
 	gp_file_set_data_and_size (file, (char *)ppm, size);
-	end:
+end:
 	free(data);
 	return status;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/Makefile-files Changed

@@ -1,19 +1,32 @@
-# -*- Makefile -*-
-
-EXTRA_DIST += jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression jl2005c/ChangeLog
-camlibdoc_DATA += jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression
-
-EXTRA_LTLIBRARIES += jl2005c.la
-
-jl2005c_la_SOURCES = jl2005c/library.c\
-		    jl2005c/jl2005c.c\
-		    jl2005c/jpeg_memsrcdest.c \
-		    jl2005c/jpeg_memsrcdest.h \
-		    jl2005c/jl2005bcd_decompress.c\
-		    jl2005c/jl2005bcd_decompress.h\
-		    jl2005c/jl2005c.h\
-		    jl2005c/img_enhance.c\
-		    jl2005c/img_enhance.h
-jl2005c_la_LDFLAGS = $(camlib_ldflags)
-jl2005c_la_DEPENDENCIES = $(camlib_dependencies)
-jl2005c_la_LIBADD = $(camlib_libadd) @LIBJPEG@
+# -*- Makefile-automake -*-
+
+EXTRA_DIST              += %reldir%/README.jl2005c
+camlibdoc_DATA          += %reldir%/README.jl2005c
+
+EXTRA_DIST              += %reldir%/README.jl2005bcd-compression
+camlibdoc_DATA          += %reldir%/README.jl2005bcd-compression
+
+EXTRA_DIST              += %reldir%/ChangeLog
+
+
+EXTRA_LTLIBRARIES       += jl2005c.la
+
+jl2005c_la_SOURCES       =
+jl2005c_la_SOURCES      += %reldir%/library.c
+jl2005c_la_SOURCES      += %reldir%/jl2005c.c
+jl2005c_la_SOURCES      += %reldir%/jpeg_memsrcdest.c
+jl2005c_la_SOURCES      += %reldir%/jpeg_memsrcdest.h
+jl2005c_la_SOURCES      += %reldir%/jl2005bcd_decompress.c
+jl2005c_la_SOURCES      += %reldir%/jl2005bcd_decompress.h
+jl2005c_la_SOURCES      += %reldir%/jl2005c.h
+jl2005c_la_SOURCES      += %reldir%/img_enhance.c
+jl2005c_la_SOURCES      += %reldir%/img_enhance.h
+
+jl2005c_la_CFLAGS        = $(camlib_cflags)
+jl2005c_la_CPPFLAGS      = $(camlib_cppflags)
+jl2005c_la_DEPENDENCIES  = $(camlib_dependencies)
+jl2005c_la_LDFLAGS       = $(camlib_ldflags)
+jl2005c_la_LIBADD        = $(camlib_libadd)
+
+jl2005c_la_CPPFLAGS     += $(LIBJPEG_CFLAGS)
+jl2005c_la_LIBADD       += $(LIBJPEG_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/README.jl2005bcd-compression -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/README.jl2005bcd-compression Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/README.jl2005c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/README.jl2005c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/img_enhance.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/img_enhance.c Changed

@@ -30,8 +30,9 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
-#include <gamma.h>
-#include <bayer.h>
+
+#include <libgphoto2/gamma.h>
+#include <libgphoto2/bayer.h>
 #include "img_enhance.h"
 
 #include <gphoto2/gphoto2.h>
@@ -63,7 +64,7 @@
 histogram (unsigned char *data, unsigned int size, int *htable_r,
 						int *htable_g, int *htable_b)
 {
-	int x;
+	unsigned int x;
 	/* Initializations */
 	for (x = 0; x < 0x100; x++) {
 		htable_rx = 0;
@@ -84,7 +85,8 @@
 int
 white_balance (unsigned char *data, unsigned int size, float saturation)
 {
-	int x, r, g, b, max, d;
+	unsigned int x, max;
+	int r, g, b, d;
 	double r_factor, g_factor, b_factor, max_factor;
 	int htable_r0x100, htable_g0x100, htable_b0x100;
 	unsigned char gtable0x100;
@@ -159,17 +161,17 @@
 		{
 			d = (datax + 0 << 8) * r_factor + 8;
 			d >>= 8;
-			if (d > 0xff) 
+			if (d > 0xff)
 				d = 0xff;
 			datax + 0 = d;
 			d = (datax + 1 << 8) * g_factor + 8;
 			d >>= 8;
-			if (d > 0xff) 
+			if (d > 0xff)
 				d = 0xff;
 			datax + 1 = d;
 			d = (datax + 2 << 8) * b_factor + 8;
 			d >>= 8;
-			if (d > 0xff) 
+			if (d > 0xff)
 				d = 0xff;
 			datax + 2 = d;
 		}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/img_enhance.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/img_enhance.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jl2005bcd_decompress.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jl2005bcd_decompress.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jl2005bcd_decompress.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jl2005bcd_decompress.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jl2005c.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jl2005c.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jl2005c.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jl2005c.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jpeg_memsrcdest.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jpeg_memsrcdest.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/jpeg_memsrcdest.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/jpeg_memsrcdest.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/jl2005c/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/jl2005c/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/dc120.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/dc120.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #define _POSIX_C_SOURCE 199309L
 
 #include "config.h"
@@ -31,24 +31,12 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  ifdef gettext_noop
-#    define _(String) dgettext (GETTEXT_PACKAGE, String)
-#    define N_(String) gettext_noop (String)
-#  else
-#    define _(String) (String)
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "dc120.h"
 #include "library.h"
 
+
 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);}
 
 int camera_id (CameraText *id) {
@@ -71,7 +59,7 @@
 	a.speed4 = 115200;
 	a.speed5 = 0;
 	a.operations        = 	GP_OPERATION_CAPTURE_IMAGE;
-	a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+	a.file_operations   = 	GP_FILE_OPERATION_DELETE |
 				GP_FILE_OPERATION_PREVIEW;
 	a.folder_operations = 	GP_FOLDER_OPERATION_NONE;
 
@@ -81,21 +69,21 @@
 }
 
 /** Parses a path for a folder and returns folder number and card */
-static int find_folder( Camera *camera, const char *folder, 
+static int find_folder( Camera *camera, const char *folder,
 			int *from_card, int *folder_nr, GPContext *context)
 {
     CameraList *albums = NULL;
     const char* album_name;
-    int folder_len;
+    size_t folder_len;
     int i;
     char *dc120_folder_card   = _("CompactFlash Card");
-    
+
     if( folder0 != '/' ) {
 	return (GP_ERROR);
     }
 
     folder++;
-    
+
     if( folder0 == '\0') {
 	/* From memory */
 	*from_card = FALSE;
@@ -112,7 +100,7 @@
 	*from_card = FALSE;
 	folder--; /* step back to slash */
     }
-    
+
     if ( (folder0 == 0) ||
 	 (folder0 == '/' && folder1 == 0) ) { /* ok, finished */
 	*folder_nr = 0;
@@ -120,25 +108,25 @@
     }
     else if( folder0 != '/' )
 	return (GP_ERROR);
-    
+
     folder++; /* remove slash */
-    
+
     /* Have trailing slash */
     folder_len = strlen(folder);
     if (folderfolder_len-1 == '/') {
 	folder_len--;
     }
-    
+
   /* ok, now we have a album. first get all albums */
     if( gp_list_new( &albums ) != (GP_OK) ) {
 	return (GP_ERROR);
     }
-    
+
     if( dc120_get_albums(camera, *from_card, albums, context) != (GP_OK) ) {
 	gp_list_free( albums );
 	return (GP_ERROR);
     }
-    
+
     /* no check if such a album exist */
     for( i = 0; i<gp_list_count( albums ); i++ )
     {
@@ -151,7 +139,7 @@
 	    return (GP_OK);
 	}
     }
-    
+
     /* oh, we did not find the folder. bummer. */
     gp_list_free( albums );
     return (GP_ERROR);
@@ -165,39 +153,39 @@
     int folder_nr;
     Camera *camera = data;
     char *dc120_folder_card   = _("CompactFlash Card");
-    
+
     res = find_folder( camera, folder, &from_card, &folder_nr, context);
     if( res != (GP_OK) ) {
 	return res;
     }
-    
+
     if( !from_card && folder_nr==0 ) {
 	gp_list_append(list, dc120_folder_card, NULL);
 	return (dc120_get_albums(camera, from_card, list, context));
-    } 
+    }
     else if( from_card && folder_nr==0 ) {
 	return (dc120_get_albums(camera, from_card, list, context));
-    } 
+    }
     else {
 	return (GP_OK);
     }
 }
 
 static int file_list_func (CameraFilesystem *fs, const char *folder,
-			   CameraList *list, void *data, GPContext *context) 
+			   CameraList *list, void *data, GPContext *context)
 {
     int res;
     int from_card;
     int folder_nr;
     Camera *camera = data;
-    
+
     res = find_folder( camera, folder, &from_card, &folder_nr, context);
     if( res != (GP_OK) ) {
 	return res;
     }
-    
+
     return dc120_get_filenames(camera, from_card, folder_nr, list, context);
-    
+
     /* Save the order of the pics (wtf: no filename access on dc120???) */
 }
 
@@ -205,7 +193,7 @@
 
 static int camera_file_action (Camera *camera, int action, CameraFile *file,
 			       const char *folder, const char *filename,
-			       GPContext *context) 
+			       GPContext *context)
 {
 	CameraList *files = NULL;
 	const char* file_name;
@@ -214,27 +202,27 @@
 	char *dot;
 	int picnum=0;
 	int result = GP_OK;
-	
+
 	/*  first find the file */
 	int from_card;
 	int folder_nr;
-	
+
 	result = find_folder( camera, folder, &from_card, &folder_nr, context );
 	if( result != (GP_OK) ) {
 		return result;
 	}
-	
+
 	result = gp_list_new( &files );
 	if( result != GP_OK ) {
 		goto fail;
 	}
-	
+
 	result = dc120_get_filenames(camera, from_card, folder_nr, files, context);
 	if( result != GP_OK ) {
 		goto fail;
 	}
-	
-	
+
+
 	/* now we have the list, search for the file. */
 	file_nr = -1;
 	for( i = 0; i<gp_list_count( files ); i++ ) {
@@ -245,18 +233,18 @@
 		}
 	}
 	gp_list_free( files );
-	
-	
+
+
 	if( file_nr == -1 ) { /* not found */
 		return GP_ERROR;
 	}
-	
-	
+
+
 	picnum = gp_filesystem_number(camera->fs, folder, filename, context);
 	if (picnum < 0)
 		return picnum;
-	
-	
+
+
 	if (action == DC120_ACTION_PREVIEW) { /* FIXME: marcus, fix type */
 		dot = strrchr(filename, '.');
 		if( dot && strlen( dot )>3 ) {
@@ -275,7 +263,7 @@
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *data, GPContext *context) 
+			  CameraFile *file, void *data, GPContext *context)
 {
 	Camera *camera = data;
 
@@ -291,14 +279,14 @@
 	}
 }
 
-static int delete_file_func (CameraFilesystem *fs, const char *folder, 
+static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
-			     GPContext *context) 
+			     GPContext *context)
 {
 	Camera *camera = data;
 	int retval;
 
-	retval = camera_file_action (camera, DC120_ACTION_DELETE, NULL, 
+	retval = camera_file_action (camera, DC120_ACTION_DELETE, NULL,
 				     folder, filename, context);
 
 	return (retval);
@@ -327,15 +315,15 @@
 	/* Set the filename */
 	strcpy(path->folder, "/");
 
-	CHECK_RESULT (gp_filesystem_append (camera->fs, 
-					    path->folder, 
+	CHECK_RESULT (gp_filesystem_append (camera->fs,
+					    path->folder,
 					    path->name, context));
         return (GP_OK);
 
 }
 
 static int camera_summary (Camera *camera, CameraText *summary,
-			   GPContext *context) 
+			   GPContext *context)
 {
     static char summary_string2048 = "";
     char buff1024;
@@ -344,41 +332,41 @@
     if (dc120_get_status (camera, &status, context))
     {
         strcpy(summary_string,"Kodak DC120\n");
-        
+
         snprintf(buff,1024,"Camera Identification: %s\n",status.camera_id);
         strcat(summary_string,buff);
-        
+
         snprintf(buff,1024,"Camera Type: %d\n",status.camera_type_id);
         strcat(summary_string,buff);
-        
+
         snprintf(buff,1024,"Firmware: %d.%d\n",status.firmware_major,status.firmware_minor);
         strcat(summary_string,buff);
-        
+
         snprintf(buff,1024,"Battery Status: %d\n",status.batteryStatusId);
         strcat(summary_string,buff);
-        
+
         snprintf(buff,1024,"AC Status: %d\n",status.acStatusId);
         strcat(summary_string,buff);
-        
+
         strftime(buff,1024,"Time: %a, %d %b %Y %T\n",localtime((time_t *)&status.time));
         strcat(summary_string,buff);
-        
+
         snprintf(buff,1024,"Total Pictures Taken: %d\n",
 		 status.taken_pict_mem + status.taken_pict_card );
         strcat(summary_string,buff);
-                
+
     }
-    
+
     strcpy(summary->text, summary_string);
-    
+
     return (GP_OK);
 }
 
 
 static int camera_manual (Camera *camera, CameraText *manual,
-			  GPContext *context) 
+			  GPContext *context)
 {
-	strcpy (manual->text, 
+	strcpy (manual->text,
 		_("The Kodak DC120 camera uses the KDC file format "
 		"for storing images. If you want to view the images you "
 		"download from your camera, you will need to download "
@@ -388,9 +376,9 @@
 	return (GP_OK);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy(about->text, 
+	strcpy(about->text,
 		_("Kodak DC120 Camera Library\n"
 		"Scott Fritzinger <scottf@gphoto.net>\n"
 		"Camera Library for the Kodak DC120 camera.\n"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/dc120.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/dc120.h Changed

@@ -40,33 +40,33 @@
 
   Commands & Byte field descriptions
   --------------------------------------------------------------
-  These are ones relavent to gPhoto
+  These are ones relevant to gPhoto
 
   * Album #0 is the root folder (directory/album/etc...)
 
   List albums (folders)
 	Packet: 44 00 00 00 00 00 00 1A
-	
+
 	Response:
 	ALBUMNAME1\0\0\0\0\0ALBUMNAME2\0\0\0\0\0ALBUMNAME3\0\0\0\0\0 ... CS
 
 	(258 bytes, 15 byte fixed-with fields in multiple packets)
-	CS (checksum)	
+	CS (checksum)
 
   Picture count in album
 	Packet: 45 LOC 00 00 AN 00 00 1A
-	
+
 		LOC (location): 00 (memory), 01 (card)
 		AN (album #)
 
 	Response: NP4 NP3 NP2 NP1 11 reserved bytes CS
-	
+
 		NP4 - NP1 (number of pictures): MSB to LSB number of pictures
 		CS (checksum)
 
   Set Active album for next taken picture
 	Packet: 49 00 AN 00 00 00 00 1A
-	
+
 		AN (album #)
 
   Set Image Quality
@@ -101,6 +101,9 @@
 
 */
 
+#ifndef CAMLIBS_KODAK_DC120_DC120_H
+#define CAMLIBS_KODAK_DC120_DC120_H
+
 #define COMM1	(unsigned char)0x00
 #define READY	(unsigned char)0x10
 #define ACK		(unsigned char)0xd1
@@ -115,3 +118,5 @@
 #define TIMEOUT		5000
 #define SLEEP_TIMEOUT 	50
 #define RETRIES		5
+
+#endif /* !defined(CAMLIBS_KODAK_DC120_DC120_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/library.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #define _POSIX_C_SOURCE 199309L
 #include "config.h"
 
@@ -28,27 +28,11 @@
 #include <time.h>
 #include <gphoto2/gphoto2.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "dc120.h"
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static char *
 dc120_packet_new (int command_byte) {
@@ -85,7 +69,7 @@
  */
 static int
 dc120_packet_write (Camera *camera, char *packet, int size, int read_response) {
-  
+
 	/* Writes the packet and returns the result */
 
 	int x=0;
@@ -97,7 +81,7 @@
 		usleep(SLEEP_TIMEOUT * 1000);
 
 	/* Return error if too many retries */
-	if (x++ > RETRIES) 
+	if (x++ > RETRIES)
 		return (GP_ERROR);
 
 	if (gp_port_write(camera->port, packet, size) < GP_OK)
@@ -148,7 +132,7 @@
 
 	id = gp_context_progress_start (context, num_packets, _("Getting data..."));
 read_data_write_again:
-	if (dc120_packet_write(camera, cmd_packet, 8, 1) < GP_OK) 
+	if (dc120_packet_write(camera, cmd_packet, 8, 1) < GP_OK)
 		return (GP_ERROR);
 
 	packets_received = 0;
@@ -171,7 +155,7 @@
 					return (GP_ERROR);
 			}
 			break;
-		  default: 		
+		  default:
 			packets_received++;
 
 			/* Default is packet was OK */
@@ -214,7 +198,7 @@
 	gp_context_progress_stop (context, id);
 
 	if ((unsigned char)p0 != CANCL)
-		/* Read in command completed. 
+		/* Read in command completed.
 		   (Shouldn't we check for command completed (Ralf)) */
 		dc120_packet_read(camera, p, 1);
 
@@ -222,7 +206,7 @@
 
 }
 
-int dc120_set_speed (Camera *camera, int speed) 
+int dc120_set_speed (Camera *camera, int speed)
 {
 	int error = GP_OK;
 	GPPortSettings settings;
@@ -274,7 +258,7 @@
 			break;
 	}
 
-	if (dc120_packet_write(camera, p, 8, 1) == GP_ERROR) 
+	if (dc120_packet_write(camera, p, 8, 1) == GP_ERROR)
 	{
 		error = GP_ERROR;
 		goto fail;
@@ -316,7 +300,7 @@
 	      free (p);
 	      return (GP_ERROR);
 	    }
-	    
+
             memset((char*)status,0,sizeof(*status));
 
             status->camera_type_id        = data1;
@@ -324,14 +308,14 @@
             status->firmware_minor        = data3;
             status->batteryStatusId       = data8;
             status->acStatusId            = data9;
-            
+
             /* seconds since unix epoc */
             status->time = CAMERA_EPOC + (
-		data12 * 0x1000000 + 
-                data13 * 0x10000 + 
-                data14 * 0x100 + 
+		data12 * 0x1000000 +
+                data13 * 0x10000 +
+                data14 * 0x100 +
                 data15) / 2;
-            
+
 	    status->af_mode               = data16 & 0x0f;
 	    status->zoom_mode             = (data16 & 0x30)>>4;
             status->flash_charged         = data18;
@@ -340,9 +324,9 @@
             status->exposure_compensation = (data2&0x40?-1:1) * (data21 & 0x3f);
             status->light_value           = data22;
             status->manual_exposure       = data23;
-            status->exposure_time = (data24 * 0x1000000 + 
-				     data25 * 0x10000 + 
-				     data26 * 0x100 + 
+            status->exposure_time = (data24 * 0x1000000 +
+				     data25 * 0x10000 +
+				     data26 * 0x100 +
 				     data27) / 2;
             status->shutter_delay         = data29;
             status->memory_card           = data30;
@@ -352,18 +336,18 @@
             status->distance_format       = data34;
             status->taken_pict_mem        = data36 * 0x100 + data37;
             for( i=0; i<4; i++ ) {
-		status->remaining_pic_memi     = 
-		    data46+i*2 * 0x100 + 
+		status->remaining_pic_memi     =
+		    data46+i*2 * 0x100 +
 		    data47+i*2;
 	    }
             status->taken_pict_card       = data56 * 0x100 + data57;
             for( i=0; i<4; i++ ) {
-		status->remaining_pic_cardi     = 
-		    data66+i*2 * 0x100 + 
+		status->remaining_pic_cardi     =
+		    data66+i*2 * 0x100 +
 		    data67+i*2;
 	    }
-            strncpy( status->card_id,   data + 77, 32 ); 
-            strncpy( status->camera_id, data + 90, 32 ); 
+            strncpy( status->card_id,   data + 77, 32 );
+            strncpy( status->camera_id, data + 90, 32 );
         }
 
 
@@ -408,7 +392,7 @@
 	return (GP_OK);
 }
 
-int dc120_get_filenames (Camera *camera, int from_card, int album_number, CameraList *list, GPContext *context) 
+int dc120_get_filenames (Camera *camera, int from_card, int album_number, CameraList *list, GPContext *context)
 {
 	CameraFile *file;
 	int x;
@@ -491,13 +475,13 @@
 	return (GP_OK);
 }
 
-static int dc120_get_file (Camera *camera, CameraFile *file, int file_number, char *cmd_packet, int *size, GPContext *context) 
+static int dc120_get_file (Camera *camera, CameraFile *file, int file_number, char *cmd_packet, int *size, GPContext *context)
 {
         CameraFile *size_file; /* file used to determine the filesize */
   	char *p;
 	const char *file_data;
 	long unsigned int file_size;
-	int offset;
+	unsigned int offset;
 
 	/* --- first read the file size --- */
 	p = dc120_packet_new(0x4A);
@@ -518,14 +502,14 @@
 	gp_file_get_data_and_size (size_file, &file_data, &file_size);
 
 	offset = 2 + (file_number-1) * 20;
-	if( file_size < offset+19 )
+	if( file_size < (offset+19) )
 	  {
 	    gp_file_free(size_file);
 	    free (p);
 	    return (GP_ERROR);
 	  }
-	
-	*size = (unsigned char)file_dataoffset + 16 * 256*256*256 + 
+
+	*size = (unsigned char)file_dataoffset + 16 * 256*256*256 +
 		(unsigned char)file_dataoffset + 17 * 256*256 +
 		(unsigned char)file_dataoffset + 18 * 256 +
 		(unsigned char)file_dataoffset + 19;
@@ -536,7 +520,7 @@
 
 	if (dc120_packet_read_data(camera, file, cmd_packet, size, 1024, context)==GP_ERROR)
 	    return (GP_ERROR);
-	
+
 
 	return (GP_OK);
 }
@@ -554,10 +538,10 @@
 
 		retval = dc120_packet_read(camera, p, 1);
 		switch (retval) {
-		   case GP_ERROR: 
-			return (GP_ERROR); 
+		   case GP_ERROR:
+			return (GP_ERROR);
 			break;
-		   case GP_ERROR_TIMEOUT: 
+		   case GP_ERROR_TIMEOUT:
 			break;
 		   default:
 			done = 1;
@@ -578,9 +562,9 @@
 
 	if (dc120_packet_write(camera, cmd_packet, 8, 1) == GP_ERROR)
 		return (GP_ERROR);
-	
+
 	if (dc120_packet_read(camera, p, 1)==GP_ERROR)
-		return (GP_ERROR);	
+		return (GP_ERROR);
 
 	if (dc120_wait_for_completion(camera, context)==GP_ERROR)
 		return (GP_ERROR);
@@ -588,7 +572,7 @@
 	return (GP_OK);
 }
 
-int dc120_file_action (Camera *camera, int action, int from_card, int album_number, 
+int dc120_file_action (Camera *camera, int action, int from_card, int album_number,
 		int file_number, CameraFile *file, GPContext *context) {
 
 	int retval;
@@ -625,11 +609,11 @@
 	return (retval);
 }
 
-int dc120_capture (Camera *camera, CameraFilePath *path, GPContext *context) 
+int dc120_capture (Camera *camera, CameraFilePath *path, GPContext *context)
 {
     int   retval;
     char *p      = dc120_packet_new(0x77);
-    
+
     /* Take the picture to Flash memory */
     if (dc120_packet_write(camera, p, 8, 1) == GP_ERROR) {
 	retval = (GP_ERROR);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc120/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc120/library.h Changed

@@ -19,15 +19,15 @@
  */
 
 
-#ifndef _DC120_LIBRARY_H_
-#define _DC120_LIBRARY_H_
+#ifndef CAMLIBS_KODAK_DC120_LIBRARY_H
+#define CAMLIBS_KODAK_DC120_LIBRARY_H
 
 
 #define CAMERA_EPOC              852094800
 
 #define DC120_ACTION_IMAGE      0
 #define DC120_ACTION_PREVIEW    1
-#define DC120_ACTION_DELETE     2   
+#define DC120_ACTION_DELETE     2
 
 /* Status structure. Copied from dc210, thus may not fit. */
 typedef struct {
@@ -65,9 +65,9 @@
 int   dc120_get_status   (Camera *camera, Kodak_dc120_status *status, GPContext *context);
 int   dc120_get_albums	 (Camera *camera, int from_card, CameraList *list, GPContext *context);
 int   dc120_get_filenames(Camera *camera, int from_card, int album_number, CameraList *list, GPContext *context);
-int   dc120_file_action	 (Camera *camera, int action, int from_card, int album_number, 
+int   dc120_file_action	 (Camera *camera, int action, int from_card, int album_number,
 			  int file_number, CameraFile *file, GPContext *context);
 int dc120_capture (Camera *camera, CameraFilePath *path, GPContext *context);
 
 
-#endif /* _DC120_LIBRARY_H_ */
+#endif /* !defined(CAMLIBS_KODAK_DC120_LIBRARY_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc210/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc210/Makefile-files Changed

@@ -1,11 +1,19 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_LTLIBRARIES += kodak_dc210.la
-EXTRA_DIST += kodak/dc210/ChangeLog kodak/dc210/TODO
+EXTRA_DIST                   += %reldir%/ChangeLog
+EXTRA_DIST                   += %reldir%/TODO
 
-kodak_dc210_la_SOURCES = \
-	kodak/dc210/dc210.c kodak/dc210/dc210.h \
-	kodak/dc210/library.c kodak/dc210/library.h
-kodak_dc210_la_LDFLAGS = $(camlib_ldflags)
-kodak_dc210_la_DEPENDENCIES = $(camlib_dependencies)
-kodak_dc210_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES            += kodak_dc210.la
+
+kodak_dc210_la_SOURCES        =
+kodak_dc210_la_SOURCES       += %reldir%/dc210.c
+kodak_dc210_la_SOURCES       += %reldir%/dc210.h
+kodak_dc210_la_SOURCES       += %reldir%/library.c
+kodak_dc210_la_SOURCES       += %reldir%/library.h
+
+kodak_dc210_la_CFLAGS        = $(camlib_cflags)
+kodak_dc210_la_CPPFLAGS      = $(camlib_cppflags)
+kodak_dc210_la_DEPENDENCIES  = $(camlib_dependencies)
+kodak_dc210_la_LDFLAGS       = $(camlib_ldflags)
+kodak_dc210_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc210/dc210.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc210/dc210.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #include "config.h"
 
 #include <stdlib.h>
@@ -84,16 +84,16 @@
 }
 
 static int file_list_func (CameraFilesystem *fs, const char *folder,
-			   CameraList *list, void *data, GPContext *context) 
+			   CameraList *list, void *data, GPContext *context)
 {
     Camera *camera = data;
-    
+
     return dc210_get_filenames(camera, list, context);
 }
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *data, GPContext *context) 
+			  CameraFile *file, void *data, GPContext *context)
 {
 	Camera *camera = data;
 
@@ -109,9 +109,9 @@
 	return GP_OK;
 }
 
-static int delete_file_func (CameraFilesystem *fs, const char *folder, 
+static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
-			     GPContext *context) 
+			     GPContext *context)
 {
 	Camera *camera = data;
 
@@ -124,7 +124,7 @@
 {
         Camera *camera = data;
 	dc210_picture_info picinfo;
-	
+
 	if (dc210_get_picture_info_by_name(camera, &picinfo, file) == GP_ERROR)
 		return GP_ERROR;
 
@@ -173,10 +173,10 @@
 	CameraWidget *section, *widget;
 	CameraAbilities abilities;
 	GPPortSettings settings;
-	int i;
+	unsigned int i;
 	char * wvalue;
 	char stringbuffer12;
-	
+
 	dc210_status status;
 
 	if (dc210_get_status(camera, &status) == GP_ERROR) return GP_ERROR;
@@ -192,9 +192,9 @@
         gp_widget_add_choice (widget, _("FlashPix"));
 
 	switch (status.file_type){
-	case DC210_FILE_TYPE_JPEG:  
+	case DC210_FILE_TYPE_JPEG:
 	  gp_widget_set_value (widget, _("JPEG")); break;
-	case DC210_FILE_TYPE_FPX:  
+	case DC210_FILE_TYPE_FPX:
 	  gp_widget_set_value (widget, _("FlashPix")); break;
 	};
 	gp_widget_get_value (widget, &wvalue);
@@ -205,9 +205,9 @@
         gp_widget_add_choice (widget, _("1152 x 864"));
 
 	switch (status.resolution){
-	case DC210_FILE_640:  
+	case DC210_FILE_640:
 	  gp_widget_set_value (widget, _("640 x 480")); break;
-	case DC210_FILE_1152:  
+	case DC210_FILE_1152:
 	  gp_widget_set_value (widget, _("1152 x 864")); break;
 	default:
 	  DC210_DEBUG("Undefined value for file resolution.\n"); break;
@@ -221,11 +221,11 @@
         gp_widget_add_choice (widget, _("High (good quality)"));
 
 	switch (status.compression_type){
-	case DC210_LOW_COMPRESSION:  
+	case DC210_LOW_COMPRESSION:
 	  gp_widget_set_value (widget, _("Low (best quality)")); break;
-	case DC210_MEDIUM_COMPRESSION:  
+	case DC210_MEDIUM_COMPRESSION:
 	  gp_widget_set_value (widget, _("Medium (better quality)")); break;
-	case DC210_HIGH_COMPRESSION:  
+	case DC210_HIGH_COMPRESSION:
 	  gp_widget_set_value (widget, _("High (good quality)")); break;
 	};
 	gp_widget_get_value (widget, &wvalue);
@@ -243,17 +243,17 @@
         gp_widget_add_choice (widget, _("Macro"));
 
 	switch (status.zoom){
-	case DC210_ZOOM_58:  
+	case DC210_ZOOM_58:
 	  gp_widget_set_value (widget, _("58 mm")); break;
-	case DC210_ZOOM_51:  
+	case DC210_ZOOM_51:
 	  gp_widget_set_value (widget, _("51 mm")); break;
-	case DC210_ZOOM_41:  
+	case DC210_ZOOM_41:
 	  gp_widget_set_value (widget, _("41 mm")); break;
-	case DC210_ZOOM_34:  
+	case DC210_ZOOM_34:
 	  gp_widget_set_value (widget, _("34 mm")); break;
-	case DC210_ZOOM_29:  
+	case DC210_ZOOM_29:
 	  gp_widget_set_value (widget, _("29 mm")); break;
-	case DC210_ZOOM_MACRO:  
+	case DC210_ZOOM_MACRO:
 	  gp_widget_set_value (widget, _("Macro")); break;
 	};
 	gp_widget_get_value (widget, &wvalue);
@@ -262,7 +262,7 @@
         gp_widget_append (section, widget);
 	for (i = 0; i < sizeof(exp_comp)/sizeof(*exp_comp); i++){
 		gp_widget_add_choice (widget, exp_compi);
-		if (status.exp_compensation + 4 == i)
+		if ((unsigned int)(status.exp_compensation + 4) == i)
 			gp_widget_set_value (widget, exp_compi);
 	};
 
@@ -273,11 +273,11 @@
         gp_widget_add_choice (widget, _("None"));
 
 	switch (status.flash){
-	case DC210_FLASH_AUTO:  
+	case DC210_FLASH_AUTO:
 	  gp_widget_set_value (widget, _("Auto")); break;
-	case DC210_FLASH_FORCE:  
+	case DC210_FLASH_FORCE:
 	  gp_widget_set_value (widget, _("Force")); break;
-	case DC210_FLASH_NONE:  
+	case DC210_FLASH_NONE:
 	  gp_widget_set_value (widget, _("None")); break;
 	};
 	gp_widget_get_value (widget, &wvalue);
@@ -300,7 +300,7 @@
         gp_widget_append (section, widget);
 	gp_widget_set_value (widget, dc210_system_time_callback);
 	gp_widget_set_info (widget, _("Set clock in camera"));
-	
+
 	gp_camera_get_abilities(camera, &abilities);
 	gp_port_get_settings (camera->port, &settings);
         gp_widget_new (GP_WIDGET_MENU, _("Port speed"), &widget);
@@ -353,7 +353,7 @@
 {
 	CameraWidget *w, *w2;
 	char *wvalue, *w2value;
-	int i;
+	unsigned int i;
 
 	gp_widget_get_child_by_label (window, _("File type"), &w);
 	if (gp_widget_changed (w)) {
@@ -449,11 +449,11 @@
 		gp_widget_get_value (w2, &w2value);
 		switch(wvalue0){
 		case 'A':
-			dc210_set_flash(camera, DC210_FLASH_AUTO, 
+			dc210_set_flash(camera, DC210_FLASH_AUTO,
 					w2value1 == 'n' ? 1 : 0);
 			break;
 		case 'F':
-			dc210_set_flash(camera, DC210_FLASH_FORCE, 
+			dc210_set_flash(camera, DC210_FLASH_FORCE,
 					w2value1 == 'n' ? 1 : 0);
 			break;
 		case 'N':
@@ -472,7 +472,7 @@
 		return (GP_ERROR_NOT_SUPPORTED);
 	};
 
-	if (dc210_capture(camera, path, context) == GP_ERROR) 
+	if (dc210_capture(camera, path, context) == GP_ERROR)
 		return GP_ERROR;
 
 	return gp_filesystem_append (camera->fs, path->folder, path->name, context);
@@ -493,7 +493,7 @@
 };
 
 static int camera_summary (Camera *camera, CameraText *summary,
-			   GPContext *context) 
+			   GPContext *context)
 {
     static char summary_string2048 = "";
     char buff1024;
@@ -502,7 +502,7 @@
     if (GP_OK == dc210_get_status (camera, &status))
     {
         strcpy(summary_string,"Kodak DC210\n");
-        
+
         snprintf(buff,1024,_("Pictures in camera: %d\n"),
 		 status.numPicturesInCamera);
         strcat(summary_string,buff);
@@ -523,35 +523,35 @@
         strcat(summary_string,buff);
 
 	switch (status.file_type){
-	case DC210_FILE_TYPE_JPEG: 
+	case DC210_FILE_TYPE_JPEG:
 		snprintf(buff, 1024, _("Filetype: JPEG (")); break;
-	case DC210_FILE_TYPE_FPX: 
+	case DC210_FILE_TYPE_FPX:
 		snprintf(buff, 1024, _("Filetype: FlashPix (")); break;
 	};
 	strcat(summary_string, buff);
-        
+
 	switch (status.compression_type){
-	case DC210_LOW_COMPRESSION:    
+	case DC210_LOW_COMPRESSION:
 		snprintf(buff, 1024, _("low compression, ")); break;
-	case DC210_MEDIUM_COMPRESSION: 
+	case DC210_MEDIUM_COMPRESSION:
 		snprintf(buff, 1024, _("medium compression, ")); break;
-	case DC210_HIGH_COMPRESSION:   
+	case DC210_HIGH_COMPRESSION:
 		snprintf(buff, 1024, _("high compression, ")); break;
-	default:                       
+	default:
 		snprintf(buff, 1024, _("unknown compression %d, "), status.compression_type); break;
 	};
 	strcat(summary_string, buff);
-        
+
 	switch (status.resolution){
-	case DC210_FILE_640: 
+	case DC210_FILE_640:
 		snprintf(buff, 1024, "640x480 pixel)\n"); break;
-	case DC210_FILE_1152: 
+	case DC210_FILE_1152:
 		snprintf(buff, 1024, "1152x864 pixel)\n"); break;
-	default: 
+	default:
 		snprintf(buff, 1024, _("unknown resolution %d)\n"), status.resolution); break;
 	};
 	strcat(summary_string, buff);
-        
+
 	/* battery check still doesn't work */
 	/* switch (status.battery){
 	case 0: snprintf(buff,1024,"Battery charge is good\n"); break;
@@ -559,37 +559,37 @@
 	case 2: snprintf(buff,1024,"Battery is not charged\n"); break;
 	};
         strcat(summary_string,buff);*/
-        
+
 	if (status.acstatus)
 		snprintf(buff,1024,_("AC adapter is connected.\n"));
 	else
 		snprintf(buff,1024,_("AC adapter is not connected.\n"));
         strcat(summary_string,buff);
-        
+
 	/* time string, do not change the % escapes */
         strftime(buff,1024,_("Time: %a, %d %b %Y %T\n"),
 		 localtime((time_t *)&status.time));
         strcat(summary_string,buff);
-        
+
 	switch (status.zoom){
-	case DC210_ZOOM_58: 
+	case DC210_ZOOM_58:
 		snprintf(buff, 1024, _("Zoom: 58 mm\n")); break;
-	case DC210_ZOOM_51: 
+	case DC210_ZOOM_51:
 		snprintf(buff, 1024, _("Zoom: 51 mm\n")); break;
-	case DC210_ZOOM_41: 
+	case DC210_ZOOM_41:
 		snprintf(buff, 1024, _("Zoom: 41 mm\n")); break;
-	case DC210_ZOOM_34: 
+	case DC210_ZOOM_34:
 		snprintf(buff, 1024, _("Zoom: 34 mm\n")); break;
-	case DC210_ZOOM_29: 
+	case DC210_ZOOM_29:
 		snprintf(buff, 1024, _("Zoom: 29 mm\n")); break;
-	case DC210_ZOOM_MACRO: 
+	case DC210_ZOOM_MACRO:
 		snprintf(buff, 1024, _("Zoom: macro\n")); break;
-	default: 
-		snprintf(buff, 1024, _("Unknown zoom mode %d\n"), 
+	default:
+		snprintf(buff, 1024, _("Unknown zoom mode %d\n"),
 			 status.zoom); break;
 	};
         strcat(summary_string,buff);
-        
+
 	if (status.exp_compensation > -5 && status.exp_compensation < 4)
 		snprintf(buff, 1024, _("Exposure compensation: %s\n"), exp_compstatus.exp_compensation + 4);
 	else
@@ -597,14 +597,14 @@
         strcat(summary_string,buff);
 
 	switch (status.flash){
-	case DC210_FLASH_AUTO: 
+	case DC210_FLASH_AUTO:
 		snprintf(buff, 1024, _("Flash mode: auto, ")); break;
-	case DC210_FLASH_FORCE: 
+	case DC210_FLASH_FORCE:
 		snprintf(buff, 1024, _("Flash mode: force, ")); break;
-	case DC210_FLASH_NONE: 
+	case DC210_FLASH_NONE:
 		snprintf(buff, 1024, _("Flash mode: off\n")); break;
-	default: 
-		snprintf(buff, 1024, _("Unknown flash mode %d, "), 
+	default:
+		snprintf(buff, 1024, _("Unknown flash mode %d, "),
 			 status.flash); break;
 	};
         strcat(summary_string,buff);
@@ -625,22 +625,22 @@
 		snprintf(buff,1024, _("Card name: %s\nFree space on card: %d kB\n"),
 			 status.album_name,
 			 status.card_status.space);
-	
+
         strcat(summary_string,buff);
 
     }
     else{
 	    DC210_DEBUG("Couldn't get summary for camera\n");
     };
-    
+
     strcpy(summary->text, summary_string);
-    
+
     return (GP_OK);
 }
 
 
 static int camera_manual (Camera *camera, CameraText *manual,
-			  GPContext *context) 
+			  GPContext *context)
 {
 	strcpy (manual->text, _("This library has been tested with a Kodak DC 215 Zoom camera. "
 				"It might work also with DC 200 and DC 210 cameras. "
@@ -651,9 +651,9 @@
 	return (GP_OK);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy(about->text, 
+	strcpy(about->text,
 		_("Camera Library for the Kodak DC215 Zoom camera.\n"
 		  "Michael Koltan <koltan@gmx.de>\n"));
 
@@ -669,7 +669,7 @@
 
 int camera_init (Camera *camera, GPContext *context) {
 
-	DC210_DEBUG("Initialising camera.\n");
+	DC210_DEBUG("Initializing camera.\n");
 
         /* First, set up all the function pointers */
 	camera->functions->get_config = camera_get_config;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc210/dc210.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc210/dc210.h Changed

@@ -18,8 +18,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef _DC210_H_
-#define _DC210_H_
+#ifndef CAMLIBS_KODAK_DC210_DC210_H
+#define CAMLIBS_KODAK_DC210_DC210_H
 
 typedef enum {
 	DC210_TOGGLE_OFF = 0,
@@ -73,29 +73,29 @@
 } dc210_card_status;
 
 typedef struct {
-	char                    camera_type_id;   
-	char                    firmwareMajor;    
-	char                    firmwareMinor;  
-	char                    battery;     	
-	char                    acstatus;       
-	long int                time;	        
-	dc210_zoom_type         zoom;     	
-	char                    flash_charged;	
-	dc210_compression_type  compression_type; 
+	char                    camera_type_id;
+	char                    firmwareMajor;
+	char                    firmwareMinor;
+	char                    battery;
+	char                    acstatus;
+	long int                time;
+	dc210_zoom_type         zoom;
+	char                    flash_charged;
+	dc210_compression_type  compression_type;
         signed char             exp_compensation;
 	dc210_flash_type        flash;
 	char                    preflash;
-	dc210_resolution_type   resolution;		
-        dc210_file_type_type    file_type;		
-	int                     totalPicturesTaken;     
-	int                     totalFlashesFired;      
-	int                     numPicturesInCamera;    
+	dc210_resolution_type   resolution;
+        dc210_file_type_type    file_type;
+	int                     totalPicturesTaken;
+	int                     totalFlashesFired;
+	int                     numPicturesInCamera;
 	dc210_card_status       card_status;
-	int                     remainingLow;           
-	int                     remainingMedium;        
-	int                     remainingHigh;          
+	int                     remainingLow;
+	int                     remainingMedium;
+	int                     remainingHigh;
 	int                     card_space;
-	char                    album_name12;         
+	char                    album_name12;
 } dc210_status;
 
 typedef struct {
@@ -193,7 +193,7 @@
 #define DC210_ILLEGAL_PACKET        0xE3
 #define DC210_CANCEL		    0xE4
 #define DC210_BUSY                  0xF0
-  
+
 /* initialization */
 int dc210_init_port (Camera *camera);
 
@@ -235,5 +235,5 @@
 int dc210_debug_callback(Camera * camera, CameraWidget * widget, GPContext * context);
 #endif
 
-#endif /* _DC210_H_ */
+#endif /* !defined(CAMLIBS_KODAK_DC210_DC210_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc210/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc210/library.c Changed

@@ -25,27 +25,11 @@
 #include <string.h>
 #include <gphoto2/gphoto2.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "dc210.h"
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static int dc210_cmd_error = 0;
 static const char ppmheader = "P6\n96 72\n255\n";
@@ -61,11 +45,11 @@
 
 ****************************************************************************/
 
-static void cfa2ppm 
+static void cfa2ppm
 (CameraFile * file)
 {
 	/* this is a very quick and dirty hack to convert cfa into ppm */
-	unsigned char bufTHUMBHEIGHTTHUMBWIDTH;  
+	unsigned char bufTHUMBHEIGHTTHUMBWIDTH;
 	unsigned char rgbTHUMBHEIGHTTHUMBWIDTH3;
 	unsigned char val;
 	unsigned int addval;
@@ -102,7 +86,7 @@
 			rgbyx+1RED = bufyx+1;
 			rgby+1xRED = bufyx+1;
 			rgby+1x+1RED = bufyx+1;
-			rgbyxBLUE = bufy+1x; 
+			rgbyxBLUE = bufy+1x;
 			rgbyx+1BLUE = bufy+1x;
 			rgby+1xBLUE = bufy+1x;
 			rgby+1x+1BLUE = bufy+1x;
@@ -112,7 +96,7 @@
 	for ( y = 1; y < THUMBHEIGHT - 2; y+= 2)
 		for ( x = 0; x < THUMBWIDTH - 2; x +=2){
 			/* 2 missing green values */
-			addval = rgbyxGREEN + rgbyx+2GREEN 
+			addval = rgbyxGREEN + rgbyx+2GREEN
 				+ rgby-1x+1GREEN + rgby+1x+1GREEN;
 			rgbyx+1GREEN = addval / 4;
 
@@ -124,7 +108,7 @@
 			addval = rgby-1xRED + rgby+1xRED;
 			rgbyxRED = addval / 2;
 
-			addval = rgby-1xRED + rgby-1x+2RED 
+			addval = rgby-1xRED + rgby-1x+2RED
 				+ rgby+1xRED + rgby+1x+2RED;
 			rgbyx+1RED = addval / 4;
 
@@ -135,7 +119,7 @@
 			addval = rgbyx-1BLUE + rgbyx+1BLUE;
 			rgbyxBLUE = addval / 2;
 
-			addval = rgbyx-1BLUE + rgbyx+1BLUE 
+			addval = rgbyx-1BLUE + rgbyx+1BLUE
 				+ rgby+2x-1BLUE + rgby+2x+1BLUE;
 			rgby+1xBLUE = addval / 4;
 
@@ -155,7 +139,7 @@
 static void dc210_cmd_init
 (char * cmd, unsigned char command_byte)
 {
-	/* utility procedure to initalize a command string */
+	/* utility procedure to initialize a command string */
 
 	memset (cmd, 0, 8);
 
@@ -177,8 +161,8 @@
 
 };
 
-static int dc210_write_single_char 
-(Camera *camera, unsigned char response) 
+static int dc210_write_single_char
+(Camera *camera, unsigned char response)
 {
 	/* utility procedure to write a single character */
 
@@ -193,7 +177,7 @@
 
 };
 
-static int dc210_read_single_char 
+static int dc210_read_single_char
 (Camera *camera, unsigned char * response)
 {
 
@@ -214,18 +198,18 @@
 				return GP_ERROR;
 			};
 		};
-		
+
 		return GP_OK;
 
 	};
-	
+
 	return GP_ERROR_TIMEOUT;
 
 };
 
 /* Command execution */
 
-static int dc210_execute_command 
+static int dc210_execute_command
 (Camera *camera, char *cmd)
 {
 
@@ -244,7 +228,7 @@
 	int i,k ;
 	unsigned char response;
 	signed char error;
-  
+
 	dc210_cmd_error = DC210_CMD_OKAY;
 
 	for (i = 0; i < RETRIES; i++){
@@ -269,7 +253,7 @@
 					return error;
 				};
 			};
-			
+
 			switch (response){
 			case DC210_COMMAND_ACK:
 				DC210_DEBUG("Command 0x%02X acknowledged.\n", (unsigned char) cmd0);
@@ -286,13 +270,13 @@
 			};
 			break;
 		};
-		
+
 	};
 
 	/* command does definitely not work */
 
 	DC210_DEBUG("Command definitely didn't work.\n");
-	
+
 	return GP_ERROR;
 
 };
@@ -331,7 +315,7 @@
 		if (error < 0) return GP_ERROR;
 
 		if (answer == DC210_CORRECT_PACKET) return GP_OK;
-		
+
 		if (answer != DC210_ILLEGAL_PACKET) {
 			DC210_DEBUG("Strange answer to command packet: 0x%02X.\n", answer);
 			return GP_ERROR;
@@ -345,11 +329,11 @@
 
 };
 
-static int dc210_wait_for_response 
+static int dc210_wait_for_response
 (Camera *camera, int expect_busy, GPContext *context)
 {
 	/* Waits for a command to finish.
-	   Expects either a timeout, a DC210_BUSY, 
+	   Expects either a timeout, a DC210_BUSY,
 	   a DC210_COMMAND_COMPLETE or a
 	   DC210_PACKET_FOLLOWING; all other answers
 	   are considered errors */
@@ -393,8 +377,8 @@
 
 };
 
-static int dc210_read_single_block 
-(Camera *camera, unsigned char * b, int blocksize) 
+static int dc210_read_single_block
+(Camera *camera, unsigned char * b, int blocksize)
 {
 
   int i, k, error;
@@ -413,7 +397,7 @@
       error = 0;
       break;
     };
-  
+
     if (error) return GP_ERROR;
 
     if (dc210_read_single_char(camera, (unsigned char *)&cs_read) < 0)
@@ -436,7 +420,7 @@
 };
 
 static int dc210_read_to_file
-(Camera *camera, CameraFile * f, int blocksize, long int expectsize, GPContext *context) 
+(Camera *camera, CameraFile * f, int blocksize, long int expectsize, GPContext *context)
 {
 
   int packets, k, l, fatal_error, packet_following;
@@ -469,7 +453,7 @@
 		  };
 		  /* read checksum */
 		  if (dc210_read_single_char(camera, &cs_read) == GP_ERROR){
-			  free(b); 
+			  free(b);
 			  return GP_ERROR;
 		  };
 		  /* test checksum */
@@ -544,7 +528,7 @@
 	default:
 		return GP_ERROR;
 	};
-	
+
 	if (dc210_execute_command(camera, cmd) == GP_ERROR) return GP_ERROR;
 
 	if (dc210_wait_for_response(camera, 0, NULL) != DC210_COMMAND_COMPLETE) return GP_ERROR;
@@ -572,7 +556,7 @@
 int dc210_set_zoom (Camera * camera, dc210_zoom_type zoom){
 
 	return dc210_set_option(camera, DC210_SET_ZOOM, zoom, 1);
-	
+
 };
 
 int dc210_set_file_type (Camera * camera, dc210_file_type_type file_type){
@@ -635,7 +619,7 @@
 	  while (NULL != (subst = strchr(data, ' '))) *subst = '_';
 	  if (strlen(data) < 8) strncat(data, "________", 8 - strlen(data));
   };
-  
+
   DC210_DEBUG("Album name is '%s'\n", data);
 
   dc210_cmd_init(cmd, DC210_CARD_FORMAT);
@@ -719,7 +703,7 @@
 
   char cmd8;
   dc210_cmd_init(cmd, DC210_CHECK_BATTERY);
-	
+
   if (dc210_execute_command(camera, cmd) == GP_ERROR) return GP_ERROR;
   if (dc210_wait_for_response(camera, 0, NULL) != DC210_COMMAND_COMPLETE) return GP_ERROR;
 
@@ -751,9 +735,9 @@
 	gp_port_set_settings (camera->port, settings);
 
 	/* ok, run a dummy command; if the camera was off,
-	   this will activate it and set the speed to 9600; 
+	   this will activate it and set the speed to 9600;
 	   but the command will return an error;
-	   It makes no sense to shorten the timout time, 
+	   It makes no sense to shorten the timout time,
 	   because the camera may need up to 10 seconds (information
 	   of the manual) to startup */
 	if (dc210_check_battery(camera) == GP_OK) return GP_OK;
@@ -763,7 +747,7 @@
 	   and has enough power.
 	   This is the time to send a break to reset the speed
 	   to 9600 */
-	
+
 	gp_camera_set_port_speed(camera, 9600);
 	gp_port_send_break(camera->port, 300);
 	usleep(300 * 1000);
@@ -804,7 +788,7 @@
 	GPPortSettings settings;
 
 	dc210_cmd_init((char*)cmd, DC210_SET_SPEED);
-	
+
 	switch (speed) {
 	case 9600:
 		cmd2 = 0x96; cmd3 = 0x00; break;
@@ -829,12 +813,12 @@
 	DC210_DEBUG("Port speed set to %d.\n", speed);
 
 	return GP_OK;
-  
+
 };
 
 /****** Picture actions *****/
 
-int dc210_take_picture 
+int dc210_take_picture
 (Camera * camera, GPContext * context)
 {
 	char cmd8;
@@ -852,7 +836,7 @@
 
 };
 
-int dc210_delete_picture 
+int dc210_delete_picture
 (Camera * camera, unsigned int picno)
 {
 
@@ -870,7 +854,7 @@
 
 };
 
-int dc210_delete_last_picture 
+int dc210_delete_last_picture
 (Camera * camera )
 {
 
@@ -886,7 +870,7 @@
 
 };
 
-int dc210_delete_picture_by_name 
+int dc210_delete_picture_by_name
 (Camera * camera, const char * filename )
 {
 
@@ -904,7 +888,7 @@
 
 };
 
-int dc210_download_last_picture 
+int dc210_download_last_picture
 (Camera * camera, CameraFile *file, dc210_picture_type type, GPContext *context)
 {
 
@@ -961,7 +945,7 @@
 int dc210_download_picture_by_name
 (Camera * camera, CameraFile *file, const char *filename, dc210_picture_type type, GPContext *context)
 {
-  
+
         char cmd8;
 	char cmd_packetDC210_CMD_DATA_SIZE;
 	dc210_picture_info picinfo;
@@ -988,15 +972,15 @@
 	case DC210_FULL_PICTURE:
 		if (picinfo.file_type == DC210_FILE_TYPE_JPEG)
 			gp_file_set_mime_type(file, GP_MIME_JPEG);
-		if (dc210_read_to_file(camera, file, 
-				       DC210_CARD_BLOCK_SIZE, 
+		if (dc210_read_to_file(camera, file,
+				       DC210_CARD_BLOCK_SIZE,
 				       picinfo.picture_size, context) == GP_ERROR)
 			return GP_ERROR;
 		break;
 	case DC210_CFA_THUMB:
 		/* this thumb type is much faster to download, because it has just
 		   a 6th of the size of rgb data */
-		if (dc210_read_to_file(camera, file, 
+		if (dc210_read_to_file(camera, file,
 				       DC210_DOWNLOAD_BLOCKSIZE, 48 * 72, NULL) == GP_ERROR)
 			return GP_ERROR;
 		/* convert cfa data to rgb: */
@@ -1008,16 +992,16 @@
 		   worth the 6 times longer download time */
 		gp_file_set_mime_type(file, GP_MIME_PPM);
 		gp_file_append(file, ppmheader, sizeof(ppmheader) - 1);
-		if (dc210_read_to_file(camera, file, 
+		if (dc210_read_to_file(camera, file,
 				       DC210_DOWNLOAD_BLOCKSIZE, 96 * 72 * 3, NULL) == GP_ERROR)
 			return GP_ERROR;
 		break;
 	};
-	
+
 	return GP_OK;
 };
 
-int dc210_capture (Camera *camera, CameraFilePath *path, GPContext *context) 
+int dc210_capture (Camera *camera, CameraFilePath *path, GPContext *context)
 {
 
 	dc210_status status;
@@ -1031,9 +1015,9 @@
 	pictures_in_camera = status.numPicturesInCamera;
 
 	if (dc210_take_picture(camera, context) == GP_ERROR) return GP_ERROR;
-	
+
 	if (dc210_get_status(camera, &status) == GP_ERROR) return GP_ERROR;
-	if (pictures_in_camera == status.numPicturesInCamera) return GP_ERROR; 
+	if (pictures_in_camera == status.numPicturesInCamera) return GP_ERROR;
 
 	if (dc210_get_picture_info(camera, &picinfo, status.numPicturesInCamera) == GP_ERROR) return GP_ERROR;
 
@@ -1058,20 +1042,20 @@
 	if (dc210_get_status(camera, &status) == GP_ERROR) return -1;
 
 	for (i = 1; i <= status.numPicturesInCamera; i++){
-		
+
 		if (dc210_get_picture_info(camera, &picinfo, i) == GP_ERROR) return -1;
-		
+
 		if (strcmp(picinfo.image_name, filename) == 0){
 			return i;
 		};
-		
-	}; 
+
+	};
 
 	return -1;
 
 };
 
-int dc210_get_filenames (Camera *camera, CameraList *list, GPContext *context) 
+int dc210_get_filenames (Camera *camera, CameraList *list, GPContext *context)
 {
 	char cmd8;
 	CameraFile *file;
@@ -1085,7 +1069,7 @@
 	dc210_cmd_init(cmd, DC210_GET_ALBUM_FILENAMES);
 
 	dc210_execute_command(camera, cmd);
-  
+
 	dc210_read_to_file(camera, file, DC210_DIRLIST_SIZE, 0, NULL);
 
 	gp_file_get_data_and_size(file, &data, &datasize);
@@ -1117,9 +1101,9 @@
 	picinfo->picture_number = data6 * 0x100 + data7;
 	picinfo->picture_size = data8 * 0x1000000 + data9 * 0x10000 + data10 * 0x100 + data11;
 	picinfo->preview_size = 96 * 72 * 3 + sizeof(ppmheader);
-	picinfo->picture_time = CAMERA_GET_EPOC + ((data12 * 0x1000000 + 
-						    data13 * 0x10000 + 
-						    data14 * 0x100 + 
+	picinfo->picture_time = CAMERA_GET_EPOC + ((data12 * 0x1000000 +
+						    data13 * 0x10000 +
+						    data14 * 0x100 +
 						    data15) >> 1);
 	picinfo->flash_used = data16;
 	picinfo->flash = data17;
@@ -1131,7 +1115,7 @@
 	picinfo->exposure_time = data28 * 0x1000000 + data29 * 0x10000 + data30 * 0x100 + data31;
 	strncpy(picinfo->image_name, (char *)&data32, 12);
 	picinfo->image_name12 = 0;
-	
+
 }
 
 int dc210_get_picture_info (Camera *camera, dc210_picture_info *picinfo, unsigned int picno) {
@@ -1143,13 +1127,13 @@
 	dc210_cmd_init(cmd, DC210_GET_PICINFO);
 	cmd3 = pic_offset & 0xFF;
 	cmd2 = (pic_offset >> 8) & 0xFF;
-	    
+
 	if (dc210_execute_command(camera, cmd) == GP_ERROR) return GP_ERROR;
 	if (dc210_read_single_block(camera, data, DC210_PICINFO_SIZE) == GP_ERROR) return GP_ERROR;
 	if (dc210_wait_for_response(camera, 0, NULL) != DC210_COMMAND_COMPLETE) return GP_ERROR;
-	
+
 	dc210_picinfo_from_block(picinfo, data);
-		
+
 	return GP_OK;
 
 };
@@ -1159,17 +1143,17 @@
 	char cmd8;
 	char cmd_packetDC210_CMD_DATA_SIZE;
 	unsigned char dataDC210_CARD_BLOCK_SIZE;
-	
+
 	dc210_cmd_init(cmd, DC210_CARD_GET_PICINFO);
 	dc210_cmd_packet_init(cmd_packet, filename);
-	    
+
 	if (dc210_execute_command(camera, cmd) == GP_ERROR) return GP_ERROR;
 	if (dc210_write_command_packet(camera, cmd_packet) == GP_ERROR) return GP_ERROR;
 	if (dc210_read_single_block(camera, data, DC210_CARD_BLOCK_SIZE) == GP_ERROR) return GP_ERROR;
 	if (dc210_wait_for_response(camera, 0, NULL) != DC210_COMMAND_COMPLETE) return GP_ERROR;
-	
+
 	dc210_picinfo_from_block(picinfo, data);
-		
+
 	return GP_OK;
 
 };
@@ -1183,7 +1167,7 @@
 	char dataDC210_STATUS_SIZE;
 	char cmd8;
 
-	/* you have to check the battery status explicitely 
+	/* you have to check the battery status explicitly
 	   before reading the status table*/
 	dc210_check_battery(camera);
 
@@ -1191,7 +1175,7 @@
 	dc210_get_card_status(camera, &(status->card_status));
 
 	dc210_cmd_init(cmd, DC210_GET_STATUS);
-	
+
 	if (dc210_execute_command(camera, cmd) == GP_ERROR) return GP_ERROR;
 	if (dc210_read_single_block(camera, (unsigned char *)data, DC210_STATUS_SIZE) == GP_ERROR) return GP_ERROR;
 	if (dc210_wait_for_response(camera, 0, NULL) != DC210_COMMAND_COMPLETE) return GP_ERROR;
@@ -1203,7 +1187,7 @@
 	else{
 		for (i = 0; i < DC210_STATUS_SIZE; i++){
 			if (oldstatusi != datai && (i < 12 || i > 15)){
-				DC210_DEBUG("Statusdata differs at offset %03d (old: 0x%02X, new: 0x%02X)\n", 
+				DC210_DEBUG("Statusdata differs at offset %03d (old: 0x%02X, new: 0x%02X)\n",
 					    i, (unsigned char) oldstatusi, (unsigned char) datai);
 			};
 		};
@@ -1215,13 +1199,13 @@
 	status->firmwareMinor         = data3;
 	status->battery               = data8;
 	status->acstatus              = data9;
-	
+
 	/* seconds since unix epoc */
-	status->time = CAMERA_GET_EPOC + ((unsigned char) data12 * 0x1000000 + 
-					  (unsigned char) data13 * 0x10000 + 
-					  (unsigned char) data14 * 0x100 + 
+	status->time = CAMERA_GET_EPOC + ((unsigned char) data12 * 0x1000000 +
+					  (unsigned char) data13 * 0x10000 +
+					  (unsigned char) data14 * 0x100 +
 					  (unsigned char) data15) / 2;
-	
+
 	status->zoom                  = data16;
 	status->compression_type      = data19;
 	status->flash                 = data20;
@@ -1257,7 +1241,7 @@
 	checksum = 0;
 	lastanswer = 0;
 	for ( i = 0; i < 2048; i++){
-	
+
 		error = gp_port_read(camera->port, &answer, 1);
 
 		if (error < 0){
@@ -1301,7 +1285,7 @@
 
 	dc210_cmd_init(cmd, cmdbyte);
 
-	memcpy(cmd + 2, databytes, 4); 
+	memcpy(cmd + 2, databytes, 4);
 
 	/* okay, write the command and wait for acknowledge */
 
@@ -1323,7 +1307,7 @@
 		DC210_DEBUG("Sorry, command 0x%02X not acknowledged.\n", cmdbyte);
 		return GP_OK;
 	default:
-		DC210_DEBUG("Unexpected response 0x%02X to command 0x%02X.\n", 
+		DC210_DEBUG("Unexpected response 0x%02X to command 0x%02X.\n",
 		       answer, cmdbyte);
 		return GP_OK;
 	};
@@ -1360,7 +1344,7 @@
 		DC210_DEBUG("Camera is busy.\n");
 		goto wait_finish;
 	default:
-		DC210_DEBUG("Unexpected response 0x%02X to command 0x%02X.\n", 
+		DC210_DEBUG("Unexpected response 0x%02X to command 0x%02X.\n",
 		       answer, cmdbyte);
 		return GP_OK;
 	};

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc210/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc210/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/dc240.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/dc240.c Changed

@@ -34,30 +34,14 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "dc240.h"
 #include "library.h"
 
+
 int
-camera_id (CameraText *id) 
+camera_id (CameraText *id)
 {
 	strcpy(id->text, "kodak-dc240");
 
@@ -82,7 +66,7 @@
   currently supported.
  */
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
         int i;
@@ -102,26 +86,26 @@
             a.usb_vendor  = camera_to_usbi.idVendor;
             a.usb_product = camera_to_usbi.idProduct;
             a.operations        = 	GP_OPERATION_CAPTURE_IMAGE;
-            a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+            a.file_operations   = 	GP_FILE_OPERATION_DELETE |
                                         GP_FILE_OPERATION_PREVIEW;
             a.folder_operations = 	GP_FOLDER_OPERATION_NONE;
-            
+
             gp_abilities_list_append(list, a);
         }
 	return (GP_OK);
 }
 
 static int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	dc240_close (camera, context);
-	
+
 	return (GP_OK);
 }
 
 static int
 folder_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
-		  void *data, GPContext *context) 
+		  void *data, GPContext *context)
 {
 	Camera *camera = data;
 
@@ -130,7 +114,7 @@
 
 static int
 file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
-		void *data, GPContext *context) 
+		void *data, GPContext *context)
 {
 	Camera *camera = data;
 
@@ -140,7 +124,7 @@
 static int
 get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 	       CameraFileType type, CameraFile *file, void *data,
-	       GPContext *context) 
+	       GPContext *context)
 {
 	Camera *camera = data;
 
@@ -163,13 +147,13 @@
 {
 	Camera *camera = data;
 
-	return (dc240_file_action (camera, DC240_ACTION_DELETE, NULL, folder, 
+	return (dc240_file_action (camera, DC240_ACTION_DELETE, NULL, folder,
     				   filename, context));
 }
 
 static int
 camera_capture (Camera *camera, CameraCaptureType type,
-		CameraFilePath *path, GPContext *context) 
+		CameraFilePath *path, GPContext *context)
 {
 	int result;
 
@@ -190,46 +174,46 @@
 }
 
 static int
-camera_summary (Camera *camera, CameraText *summary, GPContext *context) 
+camera_summary (Camera *camera, CameraText *summary, GPContext *context)
 {
     char buf 32 * 1024;
     char temp 1024;
     int retval;
     DC240StatusTable table;
-    
+
     retval = dc240_get_status (camera, &table, context);
     if (retval == GP_OK) {
 	sprintf (buf, _("Model: Kodak %s\n"), dc240_convert_type_to_camera(table.cameraType));
 	sprintf (temp, _("Firmware version: %d.%02d\n"), table.fwVersInt, table.fwVersDec);
 	strcat (buf, temp);
-	sprintf (temp, _("Battery status: %s, AC Adapter: %s\n"), 
-		 dc240_get_battery_status_str(table.battStatus), 
+	sprintf (temp, _("Battery status: %s, AC Adapter: %s\n"),
+		 dc240_get_battery_status_str(table.battStatus),
 		 dc240_get_ac_status_str(table.acAdapter));
 	strcat (buf, temp);
 	sprintf (temp, _("Number of pictures: %d\n"), table.numPict);
 	strcat (buf, temp);
-	sprintf (temp, _("Space remaining: High: %d, Medium: %d, Low: %d\n"), 
+	sprintf (temp, _("Space remaining: High: %d, Medium: %d, Low: %d\n"),
 		 table.remPictHigh, table.remPictMed, table.remPictLow);
 	strcat (buf, temp);
-	
+
 	sprintf (temp, _("Memory card status (%d): %s\n"), table.memCardStatus,
 		 dc240_get_memcard_status_str(table.memCardStatus));
 	strcat (buf, temp);
 
-	sprintf (temp, _("Total pictures captured: %d, Flashes fired: %d\n"), 
-		 table.totalPictTaken, table.totalStrobeFired); 
+	sprintf (temp, _("Total pictures captured: %d, Flashes fired: %d\n"),
+		 table.totalPictTaken, table.totalStrobeFired);
 	strcat (buf, temp);
-	
-	
+
+
 	strcpy(summary->text, buf);
     }
     return retval;
 }
 
 static int
-camera_about (Camera *camera, CameraText *about, GPContext *context) 
+camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy (about->text, 
+	strcpy (about->text,
 		_("Kodak DC240 Camera Library\n"
 		"Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser.fr>\n"
 		"Camera Library for the Kodak DC240, DC280, DC3400 and DC5000 cameras.\n"
@@ -246,11 +230,11 @@
 };
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
 	int ret, selected_speed = 0;
 	GPPortSettings settings;
-	
+
 	/* First, set up all the function pointers */
 	camera->functions->exit             = camera_exit;
 	camera->functions->capture          = camera_capture;
@@ -284,7 +268,7 @@
 	default:
 		return (GP_ERROR_UNKNOWN_PORT);
 	}
-	
+
 	ret = gp_port_set_settings (camera->port, settings);
 	if (ret < 0)
 		return (ret);
@@ -294,16 +278,16 @@
 		return (ret);
 
 	if (camera->port->type == GP_PORT_SERIAL) {
-		char buf8;	
+		char buf8;
 		/* Reset the camera to 9600 */
 		gp_port_send_break(camera->port, 1);
 
 		/* Used to have a 1500 msec pause here to give
 		 * the camera time to reset - but, since
 		 * the serial port sometimes returns a garbage
-		 * character or two after the break, we do 
+		 * character or two after the break, we do
 		 * a couple of TIMEOUT (750 msec) pauses here
-		 * force the delay as well as flush the port 
+		 * force the delay as well as flush the port
 		 */
 		gp_port_read(camera->port, buf, 8);
 		gp_port_read(camera->port, buf, 8);
@@ -317,7 +301,7 @@
 	ret = dc240_open (camera);
 	if (ret < 0)
 		return (ret);
-	
+
 	ret = dc240_packet_set_size (camera, HPBS+2);
 	if (ret < 0)
 		return (ret);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/dc240.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/dc240.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/library.c Changed

@@ -30,36 +30,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
+
+#include "libgphoto2/i18n.h"
 
 #include "dc240.h"
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
 
 #define GP_MODULE "dc240"
 
+/* do not sleep during fuzzing */
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+# define usleep(x)
+#endif
 
 /* legacy from dc240.h */
 /*
@@ -110,7 +98,7 @@
 dc240_packet_new_path (const char *folder, const char *filename) {
     unsigned char *p;
     char buf1024;
-    int x;
+    size_t x;
     unsigned char cs = 0;
 
     p = malloc(sizeof(char)*60);
@@ -165,10 +153,13 @@
 
     /* Read in the response from the camera if requested */
     while (read_response) {
-        if (gp_port_read(camera->port, in, 1) >= GP_OK) {
+	int ret;
+        if ((ret=gp_port_read(camera->port, in, 1)) >= GP_OK) {
             /* On error, read again */
 	    read_response = 0;
+            break;
 	}
+        if (ret == GP_ERROR_IO_READ) return ret; /* e.g. device detached? */
     }
 
     return GP_OK;
@@ -234,7 +225,7 @@
 	    break;
 	case GP_ERROR_TIMEOUT:
 	    GP_DEBUG ("GP_ERROR_TIMEOUT\n");
-	    /* in busy state, GP_ERROR_IO_READ can happend */
+	    /* in busy state, GP_ERROR_IO_READ can happened */
 	    break;
 	default:
 	    done = 1;
@@ -270,7 +261,7 @@
 	    break;
 	case GP_ERROR_IO_READ:
 	case GP_ERROR_TIMEOUT:
-	    /* in busy state, GP_ERROR_IO_READ can happend */
+	    /* in busy state, GP_ERROR_IO_READ can happened */
 	    break;
 	default:
 	    if (*p != DC240_SC_BUSY) {
@@ -458,7 +449,10 @@
     if (dc240_packet_exchange(camera, f, p1, p2, &size, 256, context) < 0)
         size = 0;
     else {
-	gp_file_get_data_and_size (f, (const char**)&fdata, &fsize);
+	int ret;
+	ret = gp_file_get_data_and_size (f, (const char**)&fdata, &fsize);
+	if (ret < GP_OK) return ret;
+	if (!fdata || (fsize < 4)) return GP_ERROR;
         size = (fdataoffset   << 24) |
                (fdataoffset+1 << 16) |
                (fdataoffset+2 << 8 ) |
@@ -615,7 +609,7 @@
 
 
 /*
-  Feed manually the stucture from data.
+  Feed manually the structure from data.
  */
 static int dc240_load_status_data_to_table (const unsigned char *fdata, DC240StatusTable *table)
 {
@@ -698,16 +692,21 @@
     retval = dc240_packet_exchange(camera, file, p, NULL, &size, 256, context);
 
     if (retval == GP_OK) {
-	gp_file_get_data_and_size (file, &fdata, &fsize);
+	retval = gp_file_get_data_and_size (file, &fdata, &fsize);
+	if (retval != GP_OK) goto exit;
 	if (fsize != 256) {
 	    GP_DEBUG ("wrong status packet size ! Size is %ld", fsize);
+	    retval = GP_ERROR;
+	    goto exit;
 	}
 	if (fdata 0 != 0x01) { /* see 2.6 for why 0x01 */
 	    GP_DEBUG ("not a status table. Is %d", fdata 0);
+	    retval = GP_ERROR;
+	    goto exit;
 	}
 	dc240_load_status_data_to_table ((uint8_t *)fdata, table);
     }
-
+exit:
     gp_file_free(file);
     free (p);
 
@@ -718,7 +717,8 @@
                              unsigned char attrib, GPContext *context) {
 
     CameraFile *file;
-    int x, y=0, z, size=256;
+    unsigned int x, y=0, z;
+    int size=256;
     char buf64;
     unsigned char *p1 = dc240_packet_new(0x99);
     unsigned char *p2 = dc240_packet_new_path(folder, NULL);
@@ -726,7 +726,7 @@
     unsigned long int fsize;
     int ret;
     int num_of_entries = 0; /* number of entries in the listing */
-    int total_size = 0; /* total useful size of the listing */
+    unsigned int total_size = 0; /* total useful size of the listing */
 
     gp_file_new(&file);
     ret = dc240_packet_exchange(camera, file, p1, p2, &size, 256, context);
@@ -738,13 +738,26 @@
     free(p2);
 
     /* Don't expect to have a fully useful buffer. */
-    gp_file_get_data_and_size (file, &fdata, &fsize);
+    ret = gp_file_get_data_and_size (file, &fdata, &fsize);
+    if (ret < 0) {
+	gp_file_free (file);
+        return ret;
+    }
+    if ((size < 1) || !fdata) {
+	gp_file_free (file);
+        return GP_ERROR;
+    }
 
     /* numbers in DC 240 are Big-Endian. */
     /* Conversion below should be endian neutral. */
     num_of_entries = be16atoh(&fdata 0) + 1;
     total_size = 2 + (num_of_entries * 20);
     GP_DEBUG ("number of file entries : %d, size = %ld", num_of_entries, fsize);
+    if (total_size > fsize) {
+        GP_DEBUG ("total_size %d > fsize %ld", total_size, fsize);
+	gp_file_free (file);
+        return GP_ERROR;
+    }
     for (x = 2; x < total_size; x += 20) {
         if ((fdatax != '.') && (attrib == (unsigned char)fdatax+11))  {
             /* Files have attrib 0x00, Folders have attrib 0x10 */
@@ -783,9 +796,9 @@
     case DC240_ACTION_PREVIEW:
         cmd_packet4 = 0x02;
         thumb = 1;
-        /* no break on purpose */
+	/* fallthrough */
     case DC240_ACTION_IMAGE:
-        if ((size = dc240_get_file_size(camera, folder, filename, thumb, context)) < 0) {
+        if ((size = dc240_get_file_size(camera, folder, filename, thumb, context)) < GP_OK) {
             retval = GP_ERROR;
             break;
         }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc240/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc240/library.h Changed

@@ -23,14 +23,14 @@
   Kodak DC 240/280/3400/5000 driver.
  */
 
-#ifndef __DC240_LIBRARY_H__
-#define __DC240_LIBRARY_H__
+#ifndef CAMLIBS_KODAK_DC240_LIBRARY_H
+#define CAMLIBS_KODAK_DC240_LIBRARY_H
 
 #define DC240_ACTION_PREVIEW    (uint8_t)0x93
 #define DC240_ACTION_IMAGE      (uint8_t)0x9A
 #define DC240_ACTION_DELETE     (uint8_t)0x9D
 
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 
 
 const char *dc240_convert_type_to_camera (uint16_t type);
@@ -71,7 +71,7 @@
     uint8_t ipChainDisable; /* 81 */ /* ????? what does that mean reserved on DC280 */
     uint8_t imageIncomplete; /* 82 */
     uint8_t timerMode; /* 83 */
-    
+
     uint16_t year; /* 88-89 BE */
     uint8_t month; /* 90 */
     uint8_t day; /* 91 */
@@ -79,7 +79,7 @@
     uint8_t minute; /* 93 */
     uint8_t second; /* 94 */
     uint8_t tenmSec; /* 95 */
-    
+
     uint8_t strobeMode; /* 97 */
     uint16_t exposureComp; /* 98-99 BE see note */
     uint8_t aeMode; /* 100 */
@@ -87,7 +87,7 @@
     uint8_t afMode; /* 102 */
     uint8_t awbMode; /* 103 */
     uint32_t zoomMag; /* 104-107 BE see doc */
-    
+
     uint8_t exposureMode; /* 129 */
 
     uint8_t sharpControl; /* 131 */
@@ -121,4 +121,4 @@
 			  GPContext *context);
 int   dc240_packet_set_size (Camera *camera, short int size);
 
-#endif /*__DC240_LIBRARY_H__*/
+#endif /* !defined(CAMLIBS_KODAK_DC240_LIBRARY_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/Makefile-files Changed

@@ -1,11 +1,18 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_LTLIBRARIES += kodak_dc3200.la
-EXTRA_DIST += kodak/dc3200/ChangeLog
+EXTRA_DIST                   += %reldir%/ChangeLog
 
-kodak_dc3200_la_SOURCES = \
-	kodak/dc3200/dc3200.c kodak/dc3200/dc3200.h \
-	kodak/dc3200/library.c kodak/dc3200/library.h
-kodak_dc3200_la_LDFLAGS = $(camlib_ldflags)
-kodak_dc3200_la_DEPENDENCIES = $(camlib_dependencies)
-kodak_dc3200_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES            += kodak_dc3200.la
+
+kodak_dc3200_la_SOURCES       =
+kodak_dc3200_la_SOURCES      += %reldir%/dc3200.c
+kodak_dc3200_la_SOURCES      += %reldir%/dc3200.h
+kodak_dc3200_la_SOURCES      += %reldir%/library.c
+kodak_dc3200_la_SOURCES      += %reldir%/library.h
+
+kodak_dc3200_la_CFLAGS        = $(camlib_cflags)
+kodak_dc3200_la_CPPFLAGS      = $(camlib_cppflags)
+kodak_dc3200_la_DEPENDENCIES  = $(camlib_dependencies)
+kodak_dc3200_la_LDFLAGS       = $(camlib_ldflags)
+kodak_dc3200_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/dc3200.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/dc3200.c Changed

@@ -39,21 +39,10 @@
 
 #include <gphoto2/gphoto2-library.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /*
  * FIXME: Use properly sized integer types. The dc3200 code used lots
@@ -65,14 +54,14 @@
 at a time. Please wait until the current \
 operation has finished.")
 
-int camera_id (CameraText *id) 
+int camera_id (CameraText *id)
 {
 	strcpy(id->text, "kodak-dc3200");
 
 	return (GP_OK);
 }
 
-int camera_abilities (CameraAbilitiesList *list) 
+int camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -136,7 +125,7 @@
 
 	/* setup the camera */
 	if (dc3200_setup(camera) == GP_ERROR)
-		return GP_ERROR;		
+		return GP_ERROR;
 
 	return GP_OK;
 }
@@ -160,7 +149,7 @@
 	time_t t;
 
 	time(&t);
-	
+
 	if(t - camera->pl->last > 9) {
 		/* we have to re-init the camera */
 		printf(_("camera inactive for > 9 seconds, re-initing.\n"));
@@ -179,7 +168,8 @@
 	long unsigned 	data_len = 0;
 	unsigned char	*ptr_data_buff;
 	char		filename13, *ptr;
-	int		res, i;
+	int		res;
+	unsigned int	i;
 
 	if(camera->pl->context)
 	{
@@ -205,7 +195,7 @@
 	{
 		return GP_ERROR;
 	}
-	
+
 	if (data == NULL)
 	{
 		return GP_ERROR;
@@ -222,14 +212,14 @@
 			i += 20;
 			continue;
 		}
-		
+
 		/* skip directories starting with . */
 		if(ptr_data_buff0 == '.') {
 			ptr_data_buff += 20;
 			i += 20;
 			continue;
 		}
-		
+
 		/* copy the filename */
 		strncpy(filename, (char *)ptr_data_buff, sizeof(filename));
 
@@ -239,10 +229,10 @@
 
 		/* in case of long directory */
 		filename12 = 0;
-		
+
 		/* append dir to the list */
 		gp_list_append(list, filename, NULL);
-		
+
 		ptr_data_buff += 20;
 		i += 20;
 	}
@@ -260,7 +250,8 @@
 	long unsigned	data_len = 0;
 	unsigned char	*ptr_data_buff;
 	char		filename13;
-	int		res, i;
+	int		res;
+	unsigned int	i;
 
 	if(camera->pl->context)
 	{
@@ -272,7 +263,7 @@
 	{
 		return GP_ERROR;
 	}
-	
+
 	/* get file list data */
 	res = dc3200_get_data (camera, &data, &data_len, CMD_LIST_FILES, folder,
 			       NULL);
@@ -280,7 +271,7 @@
 	{
 		return GP_ERROR;
 	}
-	
+
 	/* check the data length */
 	if(data_len%20 != 0 || data_len < 1)
 	{
@@ -295,7 +286,7 @@
 	/* add files to the list */
 	ptr_data_buff = data;
 	i = 0;
-	
+
 	while(i < data_len) {
 		/* files don't have 0x10 in their attribute */
 		if(ptr_data_buff11 & 0x10) {
@@ -303,7 +294,7 @@
 			i += 20;
 			continue;
 		}
-		
+
 		/* copy the first 8 bytes of filename */
 		strncpy(filename, (char *)ptr_data_buff, 8);
 		filename8 = 0;
@@ -311,7 +302,7 @@
 		strcat(filename, ".");
 		/* copy extension, last 3 bytes*/
 		strncat(filename, (char *)ptr_data_buff+8, 3);
-		
+
 		if(!strstr(filename, ".JPG") && !strstr(filename, ".jpg")) {
 			ptr_data_buff += 20;
 			i += 20;
@@ -320,7 +311,7 @@
 
 		/* append file to the list */
 		gp_list_append(list, filename, NULL);
-		
+
 		ptr_data_buff += 20;
 		i += 20;
 	}
@@ -331,7 +322,7 @@
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *user_data, 
+			  CameraFile *file, void *user_data,
 			  GPContext *context)
 {
 	Camera		*camera = user_data;
@@ -359,7 +350,7 @@
 				       CMD_GET_PREVIEW, folder, filename);
 		break;
 	case GP_FILE_TYPE_NORMAL:
-		res = dc3200_get_data (camera, &data, &data_len, 
+		res = dc3200_get_data (camera, &data, &data_len,
 				       CMD_GET_FILE, folder, filename);
 		break;
 	default:
@@ -411,11 +402,11 @@
 	{
 		return GP_ERROR;
 	}
-	
+
 	strcpy(file, folder);
 	if(folderstrlen(folder)-1 != '\\' || folderstrlen(folder)-1 != '/')
 		strcat(file, "\\");
-	strcat(file, filename);	
+	strcat(file, filename);
 
 	/* get file list data */
 	res = dc3200_get_data (camera, &data, &data_len, CMD_LIST_FILES, file,
@@ -441,7 +432,7 @@
 	info->file.fields = GP_FILE_INFO_SIZE | GP_FILE_INFO_TYPE;
 	info->file.size = bytes_to_l(data19, data18, data17, data16);
 	strcpy (info->file.type, GP_MIME_JPEG);
-	
+
 	info->preview.fields = GP_FILE_INFO_TYPE;
 	strcpy (info->preview.type, GP_MIME_JPEG);
 
@@ -451,7 +442,7 @@
 
 static int camera_manual (Camera *camera, CameraText *manual, GPContext *context)
 {
-	strcpy (manual->text, 
+	strcpy (manual->text,
 		_("Known problems:\n"
 		"\n"
 		"1. If the Kodak DC3200 does not receive a command at least "
@@ -464,7 +455,7 @@
 
 static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy	(about->text, 
+	strcpy	(about->text,
 		_("Kodak DC3200 Driver\n"
 		"Donn Morrison <dmorriso@gulf.uvic.ca>\n"
 		"\n"
@@ -479,7 +470,7 @@
 	.folder_list_func = folder_list_func
 };
 
-int camera_init (Camera *camera, GPContext *context) 
+int camera_init (Camera *camera, GPContext *context)
 {
 	int ret;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/dc3200.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/dc3200.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/library.c Changed

@@ -40,21 +40,10 @@
 #include <string.h>
 #include <errno.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "dc3200.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /*
  * FIXME: Use properly sized integer types. The dc3200 code used lots
@@ -241,20 +230,16 @@
 				return GP_ERROR;
 
 			/* concatenate the folder + filename */
-			strncpy(file, folder, strlen(folder));
-			filestrlen(folder) = 0;
+			strcpy(file, folder);
 			/* append the filename */
 			if(folderstrlen(folder)-1 != '\\')
-			strcat(file, "\\");
-			strncat(file, filename, strlen(filename));
+				strcat(file, "\\");
+			strcat(file, filename);
 
 		} else {
-			file = malloc(strlen(folder) + 2);
+			file = strdup(folder);
 			if(!file)
 				return GP_ERROR;
-
-			strncpy(file, folder, strlen(folder));
-			filestrlen(folder) = 0;
 		}
 	} else {
 		return GP_ERROR;
@@ -545,7 +530,7 @@
 
 	while(sends > 0) {
 		reads = READ_RETRIES;
-		/* check that we are acutally sending a command
+		/* check that we are actually sending a command
 		 * and not just waiting for data
 		 */
 		if(cmd != NULL && cmd_len > 0) {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/dc3200/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/dc3200/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/ez200/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/ez200/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/kodak/ez200/ez200.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/kodak/ez200/ez200.c Changed

@@ -28,6 +28,8 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
+#include "libgphoto2/i18n.h"
+
 #define PING 		0x05
 #define STATUS		0x06
 #define PICTURE		0x08
@@ -47,20 +49,6 @@
 
 #define GP_MODULE "ez200"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
 #define WRITE gp_port_usb_msg_write
 #define READ  gp_port_usb_msg_read
 
@@ -119,15 +107,17 @@
 static int
 ez200_read_data (GPPort *port, char *data, int size) {
 	int MAX_BULK = 0x1000;
+	int	ret;
 
 	/* Read Data by blocks */
 	while(size > 0) {
 		int len = (size>MAX_BULK)?MAX_BULK:size;
-	        gp_port_read  (port, data, len);
+	        ret = gp_port_read  (port, data, len);
+		if (ret < GP_OK) return ret;
 		data += len;
 		size -= len;
 	}
-        return 1;
+        return GP_OK;
 }
 
 static int
@@ -137,8 +127,7 @@
 	memset(c,0,sizeof(c));
 	/* ask picture n transfert */
     	READ(port, PICTURE, n, 1, c, 3);
-        ez200_read_data (port, data, size);
-        return GP_OK;
+        return ez200_read_data (port, data, size);
 }
 
 
@@ -162,7 +151,7 @@
    	unsigned short idProduct;
 } models = {
         {"Kodak EZ200", GP_DRIVER_STATUS_PRODUCTION, 0x040a, 0x0300},
-	{NULL,0,0}
+	{NULL,0,0,0}
 };
 
 int
@@ -247,7 +236,7 @@
 	       GPContext *context)
 {
     	Camera *camera = user_data;
-        int n, len;
+        int n, len, ret;
 	char *data, *data_start;
 
 	n = gp_filesystem_number(camera->fs, "/", filename, context);
@@ -264,8 +253,10 @@
 	data_start = data + (HEADER_SIZE - DATA_HEADER_SIZE);
 	GP_DEBUG("data - data_start : %p %p : %lx",data, data_start, (long) (data_start - data));
 
-    	ez200_read_picture_data   (camera->port, data_start, len, n);
-	ez200_read_picture_header (camera->port, data);
+    	ret = ez200_read_picture_data   (camera->port, data_start, len, n);
+	if (ret < GP_OK) return ret;
+	ret = ez200_read_picture_header (camera->port, data);
+	if (ret < GP_OK) return ret;
 	switch (type) {
 	case GP_FILE_TYPE_PREVIEW:
 	case GP_FILE_TYPE_NORMAL:
@@ -325,7 +316,7 @@
 		settings.usb.outep	= 0x03;
 		break;
 	default:
-		return ( GP_ERROR );
+		return GP_ERROR;
 	}
 
 	ret = gp_port_set_settings(camera->port,settings);
@@ -338,9 +329,8 @@
         /* Tell the CameraFilesystem where to get lists from */
 	gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
 
-	camera->pl = malloc (sizeof (CameraPrivateLibrary));
+	camera->pl = calloc (sizeof (CameraPrivateLibrary), 1);
 	if (!camera->pl) return GP_ERROR_NO_MEMORY;
-	memset (camera->pl, 0, sizeof (CameraPrivateLibrary));
 
 	/* Connect to the camera */
 	ez200_init (camera->port, &camera->pl->model, camera->pl->info);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/COPYING -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/COPYING Changed

@@ -1,7 +1,7 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright © 1989, 1991 Free Software Foundation, Inc.
+ Copyright Â© 1989, 1991 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright © <year>  <name of author>
+    Copyright Â© <year>  <name of author>
 
     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
@@ -313,7 +313,7 @@
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright © year  name of author
+    Gnomovision version 69, Copyright Â© year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/ChangeLog Changed

@@ -24,7 +24,7 @@
 	  12 on the C200.
 
 2003-05-25  Marcus Meissner <marcus@jet.franken.de>
-	    Aurélien Croc (AP²C) <programming@ap2c.com>
+	    AurÃ©lien Croc (APÂ²C) <programming@ap2c.com>
 
 	* qm150.c: Reverse engineered Konica Q-M150 camera serial
 	  protocol and implemented a basic driver. Still work in progress,
@@ -38,7 +38,7 @@
 
 	* Makefile.am: also tell driver that i18n stuff is in $(PACKAGE)/$(VERSION)
 
-2002-11-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-11-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* localization/Makefile.am: Install files in a $(PACKAGE)/$(VERSION)
 	  subdir.
@@ -48,24 +48,24 @@
 	* library.c: Got rid of some broken long*/int*/time_t* casts.
 	  (would break 64bit on big endian).
 
-2002-11-05  Lutz MÜller <lutz@users.sourceforge.net>
+2002-11-05  Lutz MÃller <lutz@users.sourceforge.net>
 
 	* Makefile.am
 	* localization/Makefile.am: Install files in a $(PACKAGE) subdir.
 
-2002-07-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Add a couple of 'gp_context_idle's.
 
-2002-07-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: We can't change the name of files.
 
-2002-07-04  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-04  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: (camera_capture): Fix bug.
 
-2002-05-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: ping the camera every minute to prevent shutdown.
 
@@ -74,13 +74,13 @@
 	* lowlevel.c: When reading we do not need to escape that much,
 	  the original HP PhotoSmart does not escape all characters.
 
-2002-03-04  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-04  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	With the help of Thomas Ronayne <trona@ameritech.net>:
 
 	* lowlevel.c: DEFAULT_TIMEOUT now 1000 - C200 needs it.
 
-2002-03-04  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-04  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	With the help of Thomas Ronayne <trona@ameritech.net>:
 
@@ -88,12 +88,12 @@
 	  to respond.
 	* library.c: The image ids for a C200 are 2 bytes long, not 4.
 
-2002-01-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.h: Removed.
 	* konica.c,h: Prepare support for progress information.
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* library.c: More progress reporting. Remove references to 
 	  gp_camera_set_error.
@@ -102,23 +102,23 @@
 
 	* library.c: fgetc() returns type int, not char.
 
-2002-01-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* README: Removed duplicate camera models.
 
-2002-01-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* konica.c: #define PACKET_SIZE instead of using a static variable.
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* lowlevel.c: Clean up.
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* lowlevel.c: Fix bug introduced with last patch.
 
-2001-12-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-09  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* lowlevel.c: Do not read one byte after another - that makes
 	  debugging output easier to read.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/EXPERTS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/EXPERTS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/Makefile-files Changed

@@ -1,27 +1,58 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += konica/EXPERTS konica/qm150.txt konica/README.konica konica/ChangeLog konica/COPYING konica/TODO
-camlibdoc_DATA += konica/README.konica
 
-konica_defs = \
-	-DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\"
+konicalocalizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica
 
-EXTRA_LTLIBRARIES += konica.la
+dist_konicalocalization_DATA =
+dist_konicalocalization_DATA += %reldir%/localization/english
+dist_konicalocalization_DATA += %reldir%/localization/french
+dist_konicalocalization_DATA += %reldir%/localization/german
+dist_konicalocalization_DATA += %reldir%/localization/japanese
+dist_konicalocalization_DATA += %reldir%/localization/korean
+dist_konicalocalization_DATA += %reldir%/localization/spanish
 
-konica_la_SOURCES = \
-	konica/lowlevel.c konica/lowlevel.h \
-	konica/konica.c konica/konica.h \
-	konica/library.c
-konica_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS)
-konica_la_LDFLAGS = $(camlib_ldflags)
-konica_la_DEPENDENCIES = $(camlib_dependencies)
-konica_la_LIBADD = $(camlib_libadd)
+konica_defs = -DLOCALIZATION=\"$(konicalocalizationdir)\"
 
 
-EXTRA_LTLIBRARIES += konica_qm150.la
+EXTRA_DIST          += %reldir%/COPYING
+EXTRA_DIST          += %reldir%/ChangeLog
+EXTRA_DIST          += %reldir%/EXPERTS
+EXTRA_DIST          += %reldir%/TODO
+EXTRA_DIST          += %reldir%/qm150.txt
 
-konica_qm150_la_SOURCES = konica/qm150.c
-konica_qm150_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS)
-konica_qm150_la_LDFLAGS = $(camlib_ldflags)
-konica_qm150_la_DEPENDENCIES = $(camlib_dependencies)
-konica_qm150_la_LIBADD = $(camlib_libadd)
+EXTRA_DIST          += %reldir%/README.konica
+camlibdoc_DATA      += %reldir%/README.konica
+
+
+EXTRA_LTLIBRARIES       += konica.la
+
+konica_la_SOURCES        =
+konica_la_SOURCES       += %reldir%/lowlevel.c
+konica_la_SOURCES       += %reldir%/lowlevel.h
+konica_la_SOURCES       += %reldir%/konica.c
+konica_la_SOURCES       += %reldir%/konica.h
+konica_la_SOURCES       += %reldir%/library.c
+
+konica_la_CFLAGS        = $(camlib_cflags)
+konica_la_CPPFLAGS      = $(camlib_cppflags)
+konica_la_DEPENDENCIES  = $(camlib_dependencies)
+konica_la_LDFLAGS       = $(camlib_ldflags)
+konica_la_LIBADD        = $(camlib_libadd)
+
+konica_la_CPPFLAGS     += $(konica_defs)
+
+
+EXTRA_LTLIBRARIES            += konica_qm150.la
+
+konica_qm150_la_SOURCES       = %reldir%/qm150.c
+
+konica_qm150_la_CFLAGS        = $(camlib_cflags)
+konica_qm150_la_CPPFLAGS      = $(camlib_cppflags)
+konica_qm150_la_DEPENDENCIES  = $(camlib_dependencies)
+konica_qm150_la_LDFLAGS       = $(camlib_ldflags)
+konica_qm150_la_LIBADD        = $(camlib_libadd)
+
+konica_qm150_la_CPPFLAGS     += $(konica_defs)
+
+konica_qm150_la_CPPFLAGS     += $(LIBEXIF_CFLAGS)
+konica_qm150_la_LIBADD       += $(LIBEXIF_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/README.konica -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/README.konica Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/konica.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/konica.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/konica.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/konica.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/library.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -30,26 +30,10 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "konica.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define C(r) {int ret=(r);if(ret<0) return(ret);}
 #define C_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);}
@@ -580,6 +564,8 @@
 	C(gp_filesystem_append (camera->fs, path->folder,
 					     path->name, context));
 
+	memset (&info, 0, sizeof (info));
+
 	info.preview.fields = GP_FILE_INFO_SIZE | GP_FILE_INFO_TYPE;
 	info.preview.size = buffer_size;
 	strcpy (info.preview.type, GP_MIME_JPEG);
@@ -1284,4 +1270,3 @@
 						       timeout_func);
         return (GP_OK);
 }
-

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/lowlevel.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/lowlevel.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/lowlevel.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/lowlevel.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/qm150.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/qm150.c Changed

@@ -8,18 +8,18 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  *
- * Modified by Aurélien Croc (AP²C) <programming@ap2c.com>
- * In particular : fix some bugs, and implementation of advanced 
+ * Modified by AurÃ©lien Croc (APÂ²C) <programming@ap2c.com>
+ * In particular : fix some bugs, and implementation of advanced
  * functions : delete some images, delete all images, capture new image,
  * update an image to the camera, get thumbnails, get information, get
  * summary, get configuration, get manual, get about, get EXIF informations
@@ -27,7 +27,7 @@
  */
 
 /* NOTES :
- * Becareful, image information number starts at 1 and finish at the 
+ * Becareful, image information number starts at 1 and finish at the
  * max image number. But when you want to work on the images, you must
  * read image informations, and check the real image number in the image
  * information header and use this number with all functions !!
@@ -49,20 +49,8 @@
 #  include <libexif/exif-utils.h>
 #endif
 
+#include "libgphoto2/i18n.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /* Functions codes */
 #define CAPTUREIMAGE_CMD2	0x30
@@ -136,30 +124,30 @@
 
 /** Local functions **********************************************************/
 
-/* 
+/*
  * Check the integrity of datas
  */
 static unsigned char
 k_calculate_checksum (unsigned char *buf, unsigned long int len)
 {
-	int i;
+	unsigned int i;
 	unsigned char result=0;
 	for (i=0; i < len; i++)
 		result += bufi;
 	return result;
 }
 
-/* 
+/*
  * Check the connection and the camera
  */
 static int
 k_ping (GPPort *port) {
 	char	cmd2, buf1;
 	int	ret;
-		
+
 	cmd0 = ESC;
 	cmd1 = PING;
-	ret = gp_port_write (port, cmd, 2); 
+	ret = gp_port_write (port, cmd, 2);
 	if (ret<GP_OK) return ret;
 	ret = gp_port_read (port, buf, 1);
 	if (ret<GP_OK) return ret;
@@ -167,11 +155,11 @@
 	return GP_OK;
 }
 
-/* 
- * Read image informations 
+/*
+ * Read image informations
  */
 static int
-k_info_img (unsigned int image_no, void *data, CameraFileInfo* info, 
+k_info_img (unsigned int image_no, void *data, CameraFileInfo* info,
 		int *data_number)
 {
 	unsigned char	cmd6, bufINFO_BUFFER;
@@ -185,7 +173,7 @@
 	cmd3 = 0x30 + ((image_no/100 )%10);
 	cmd4 = 0x30 + ((image_no/10  )%10);
 	cmd5 = 0x30 + ( image_no      %10);
-	ret = gp_port_write (camera->port, (char*)cmd, sizeof(cmd)); 
+	ret = gp_port_write (camera->port, (char*)cmd, sizeof(cmd));
 	if (ret<GP_OK) return ret;
 	ret = gp_port_read (camera->port, (char*)buf, INFO_BUFFER);
 	if (ret<GP_OK) return ret;
@@ -199,10 +187,10 @@
 	/* There is no audio support with this camera */
 	info->audio.fields = GP_FILE_INFO_NONE;
 	/* Preview informations */
-	info->preview.fields = GP_FILE_INFO_TYPE | GP_FILE_INFO_SIZE 
+	info->preview.fields = GP_FILE_INFO_TYPE | GP_FILE_INFO_SIZE
 		| GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT;
 	strcpy (info->preview.type, GP_MIME_JPEG);
-	info->preview.size = ((bufPREVIEW_SIZE_PTR << 24) | 
+	info->preview.size = ((bufPREVIEW_SIZE_PTR << 24) |
 		(bufPREVIEW_SIZE_PTR+1 << 16) | (bufPREVIEW_SIZE_PTR+2 << 8)
 		| bufPREVIEW_SIZE_PTR+3);
 	info->preview.width = PREVIEW_WIDTH;
@@ -230,7 +218,7 @@
  * type = GP_FILE_TYPE_NORMAL, GP_FILE_TYPE_PREVIEW or GP_FILE_TYPE_EXIF
  */
 static int
-k_getdata (int image_no, int type, unsigned int len, void *data, 
+k_getdata (int image_no, int type, unsigned int len, void *data,
 		unsigned char *d, GPContext *context)
 {
 	Camera *camera = data;
@@ -259,7 +247,7 @@
 
 	/* Download the required image */
 	if (type == GP_FILE_TYPE_NORMAL)
-		id = gp_context_progress_start (context, len, 
+		id = gp_context_progress_start (context, len,
 			_("Downloading image..."));
 	for (i=0; i <= (len+DATA_BUFFER-1)/DATA_BUFFER ; i++) {
 		unsigned char csum;
@@ -269,7 +257,7 @@
 		if (xret < GP_OK) {
 			if (type == GP_FILE_TYPE_NORMAL)
 				gp_context_progress_stop (context, id);
-			return xret; 
+			return xret;
 		}
 		ret = gp_port_read (camera->port, (char*)&csum, CSUM_LEN);
 		if (ret < GP_OK) {
@@ -297,7 +285,7 @@
 		}
 
 		/* acknowledge the packet */
-		ack = ACK; 
+		ack = ACK;
 		ret = gp_port_write (camera->port, (char*)&ack, ACK_LEN);
 		if (ret < GP_OK) {
 			if (type == GP_FILE_TYPE_NORMAL)
@@ -317,7 +305,7 @@
 			gp_context_progress_update (context, id, bytes_read);
 	}
 	/* acknowledge the packet */
-	ack = ACK; 
+	ack = ACK;
 	ret = gp_port_write (camera->port, (char*)&ack, ACK_LEN);
 	if (ret < GP_OK) {
 		if (type == GP_FILE_TYPE_NORMAL)
@@ -354,7 +342,7 @@
 
 	/* Search the image informations */
 	image_no++;
-	ret = k_info_img (image_no, data, (CameraFileInfo *)&file_info, 
+	ret = k_info_img (image_no, data, (CameraFileInfo *)&file_info,
 		&image_number);
 	image_no = image_number;
 	if (ret < GP_OK)
@@ -369,14 +357,14 @@
 				data, d, context);
 			if (ret < GP_OK) {
 				free(d);
-				return ret; 
+				return ret;
 			}
 			break;
 		case GP_FILE_TYPE_PREVIEW:
 			len = file_info.preview.size;
 			if (!(d = (unsigned char *)malloc(len)))
 				return (GP_ERROR_NO_MEMORY);
-			ret = k_getdata(image_no, GP_FILE_TYPE_PREVIEW, len, 
+			ret = k_getdata(image_no, GP_FILE_TYPE_PREVIEW, len,
 				data, d, context);
 			if (ret < GP_OK) {
 				free(d);
@@ -403,7 +391,7 @@
 			len = file_info.preview.size;
 			if (!(d = (unsigned char *)malloc(len)))
 				return (GP_ERROR_NO_MEMORY);
-			ret = k_getdata(image_no, GP_FILE_TYPE_EXIF, len, 
+			ret = k_getdata(image_no, GP_FILE_TYPE_EXIF, len,
 				data, d, context);
 			if (ret < GP_OK) {
 				free(d);
@@ -411,7 +399,7 @@
 			}
 			break;
 		default:
-			gp_context_error(context, 
+			gp_context_error(context,
 				_("Image type %d is not supported by this camera !"), type);
 			return (GP_ERROR_NOT_SUPPORTED);
 	}
@@ -426,7 +414,7 @@
  * The image mustn't be protected
  */
 static int
-delete_file_func (CameraFilesystem *fs, const char *folder, 
+delete_file_func (CameraFilesystem *fs, const char *folder,
 		const char *filename, void *data, GPContext *context)
 {
 	Camera *camera = data;
@@ -441,7 +429,7 @@
 	if (image_no < 0) return image_no;
 
 	image_no++;
-	ret = k_info_img (image_no, data, (CameraFileInfo *)&file_info, 
+	ret = k_info_img (image_no, data, (CameraFileInfo *)&file_info,
 		&image_no);
 	if (ret < GP_OK)
 		return ret;
@@ -468,7 +456,7 @@
 	if (ack != ACK) {
 		gp_context_error(context, _("Can't delete image %s."),filename);
 		return (GP_ERROR);
-	}	
+	}
 	return (GP_OK);
 }
 
@@ -499,7 +487,7 @@
 	if (ack != ACK) {
 		gp_context_error(context, _("Can't delete all images."));
 		return (GP_ERROR);
-	}	
+	}
 	return (GP_OK);
 }
 
@@ -511,7 +499,7 @@
  */
 static int
 put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
-		CameraFileType type, CameraFile *file, 
+		CameraFileType type, CameraFile *file,
 		void *data, GPContext *context)
 {
 	Camera *camera = data;
@@ -519,15 +507,16 @@
 	const char *d;
 	unsigned long int len, len_sent=0;
 	unsigned int id;
-	int ret,i;
-	
+	int ret;
+	unsigned int i;
+
 	GP_DEBUG ("*** ENTER: put_file_func ***");
 
 	/* Send function */
 	cmd0 = ESC;
 	cmd1 = UPLOADDATA;
-	ret = gp_port_write (camera->port, (char*)cmd, sizeof(cmd)); 
-	if (ret<GP_OK) 
+	ret = gp_port_write (camera->port, (char*)cmd, sizeof(cmd));
+	if (ret<GP_OK)
 		return ret;
 	gp_file_get_data_and_size(file, &d, &len);
 	id = gp_context_progress_start (context, len, _("Uploading image..."));
@@ -539,13 +528,13 @@
 		}
 		if (ack != ACK) {
 			gp_context_progress_stop (context, id);
-			gp_context_error(context, 
+			gp_context_error(context,
 				_("Can't upload this image to the camera. "
 				"An error has occurred."));
 			return (GP_ERROR);
 		}
 		state = NEXTFRAME;
-		ret = gp_port_write (camera->port, (char*)&state, STATE_LEN); 
+		ret = gp_port_write (camera->port, (char*)&state, STATE_LEN);
 		if (ret<GP_OK) {
 			gp_context_progress_stop (context, id);
 			return ret;
@@ -560,7 +549,7 @@
 			}
 			/* and complete with zeros */
 			memset(buf,0,DATA_BUFFER);
-			ret = gp_port_write (camera->port, (char*)buf, (DATA_BUFFER - 
+			ret = gp_port_write (camera->port, (char*)buf, (DATA_BUFFER -
 				(len - len_sent)));
 			if (ret<GP_OK) {
 				gp_context_progress_stop (context, id);
@@ -585,7 +574,7 @@
 				(unsigned char *)&di*DATA_BUFFER,
 				DATA_BUFFER);
 		}
-		ret = gp_port_write (camera->port, (char*)&sum, CSUM_LEN); 
+		ret = gp_port_write (camera->port, (char*)&sum, CSUM_LEN);
 		if (ret<GP_OK) {
 			gp_context_progress_stop (context, id);
 			return ret;
@@ -593,7 +582,7 @@
 		gp_context_progress_update (context, id, len_sent);
 	}
 	state = EOT;
-	ret = gp_port_write (camera->port, (char*)&state, STATE_LEN); 
+	ret = gp_port_write (camera->port, (char*)&state, STATE_LEN);
 	if (ret<GP_OK) {
 		gp_context_progress_stop (context, id);
 		return ret;
@@ -628,7 +617,7 @@
 	/* Just check if there is space available yet */
 	cmd0 = ESC;
 	cmd1 = GETCAMINFO;
-	ret = gp_port_write (camera->port, (char*)cmd, 2); 
+	ret = gp_port_write (camera->port, (char*)cmd, 2);
 	if (ret<GP_OK)
 		return ret;
 	ret = gp_port_read (camera->port, (char*)buf, INFO_BUFFER);
@@ -659,7 +648,7 @@
 		return (GP_ERROR);
 	}
 
-	/* Wait image writting in camera's memory */
+	/* Wait image writing in camera's memory */
 	for (i=0; i<=15; i++) {
 		sleep(1);
 		if ((ret = k_ping(camera->port)) == GP_OK)
@@ -755,7 +744,7 @@
 	timestamp = (bufTIMESTAMP_PTR << 24) + (bufTIMESTAMP_PTR+1 << 16)
 		+ (bufTIMESTAMP_PTR+2 << 8) + bufTIMESTAMP_PTR+3;
 	/*
-	 * This timestamp start the 1 January 1980 at 00:00 
+	 * This timestamp start the 1 January 1980 at 00:00
 	 * but UNIX timestamp start the 1 January 1970 at 00:00
 	 * so we calculate the UNIX timestamp with the camera's one
 	 */
@@ -874,14 +863,14 @@
                 	break;
 	        case 1:
 			if (bufRED_EYE_STATE_PTR == 1)
-	        	        gp_widget_set_value (widget, 
+	        	        gp_widget_set_value (widget,
 					_("On, red-eye reduction"));
 			else
 				gp_widget_set_value (widget, _("On"));
                 	break;
 	        case 0:
 			if (bufRED_EYE_STATE_PTR == 1)
-	        	        gp_widget_set_value (widget, 
+	        	        gp_widget_set_value (widget,
 					_("Auto, red-eye reduction"));
 			else
 				gp_widget_set_value (widget, _("Auto"));
@@ -1177,7 +1166,7 @@
 			snprintf(date_disp,sizeof(date_disp),_("MM/DD/YYYY"));
 			break;
 	}
-	snprintf(text->text, sizeof(text->text), 
+	snprintf(text->text, sizeof(text->text),
 			_("Model: %s\n"
 			"Capacity: %i Mb\n"
 			"Power: %s\n"
@@ -1230,7 +1219,7 @@
  * Camera's identification
  */
 int
-camera_id (CameraText *id) 
+camera_id (CameraText *id)
 {
 	strcpy(id->text, "konica qm150");
 	return (GP_OK);
@@ -1240,7 +1229,7 @@
  * List all camera's abilities
  */
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -1250,11 +1239,11 @@
 	a.port = GP_PORT_SERIAL;
 	a.speed0 = 115200;
 	a.speed1 = 0;
-	a.operations = GP_OPERATION_CAPTURE_IMAGE | 
+	a.operations = GP_OPERATION_CAPTURE_IMAGE |
 		GP_OPERATION_CAPTURE_PREVIEW | GP_OPERATION_CONFIG;
-	a.file_operations = GP_FILE_OPERATION_DELETE | 
+	a.file_operations = GP_FILE_OPERATION_DELETE |
 		GP_FILE_OPERATION_EXIF | GP_FILE_OPERATION_PREVIEW;
-	a.folder_operations = GP_FOLDER_OPERATION_DELETE_ALL | 
+	a.folder_operations = GP_FOLDER_OPERATION_DELETE_ALL |
 		GP_FOLDER_OPERATION_PUT_FILE;
 	gp_abilities_list_append(list, a);
 	return (GP_OK);
@@ -1274,11 +1263,12 @@
 	.delete_all_func = delete_all_func,
 };
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
 	GPPortSettings settings;
 	int speeds = { 115200, 9600, 19200, 38400, 57600, 115200 };
-	int ret, i;
+	int ret;
+	unsigned int i;
 	char cmd3, buf1;
 
 	/* First, set up all the function pointers. */
@@ -1305,7 +1295,7 @@
 	settings.serial.parity	= 0;
 	gp_port_set_settings (camera->port, settings);
 	/*
-	 * Once you have configured the port, you should check if a 
+	 * Once you have configured the port, you should check if a
 	 * connection to the camera can be established.
 	 */
 	for (i=0;i<sizeof(speeds)/sizeof(speeds0);i++) {
@@ -1320,7 +1310,7 @@
 	cmd0 = ESC;
 	cmd1 = SETSPEED;
 	cmd2 = 0x30 + 4; /* speed nr 4:(9600, 19200, 38400, 57600, 115200) */
-	ret = gp_port_write (camera->port, cmd, 3); 
+	ret = gp_port_write (camera->port, cmd, 3);
 	if (ret<GP_OK) return ret;
 	ret = gp_port_read (camera->port, buf, 1);
 	if (ret<GP_OK) return ret;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/konica/qm150.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/konica/qm150.txt Changed

@@ -28,18 +28,18 @@
 Camera's Information buffer :
 0x00 - 0x02 = Seems to be a signature ? 0x03 0x03 0x02
 0x03 - 0x04 = Len of the memory card (or just 0x04 ?!?)
-0x05 - 0x06 = Ne serait-ce pas la taille du buffer de données ?! NON !!! ERRONE
+0x05 - 0x06 = Ne serait-ce pas la taille du buffer de donnÃ©es ?! NON !!! ERRONE
 0x07        = AC / pile (0 = pile | 1 = AC)
 0x08 - 0x09 = Auto-extinction (en secondes)
 0x0A        = camera's mode (0x0 = play mode | 0x1 = rec mode)
 0x0B        = LCD (0 = on | 1 = off)
-0x0C        = Affichage de la barre sur l'écran du numérique (1 = absente | 0 = présente)
-0x0D        = Flash (0 = automatique | 1 = forcé | 2 = pas de flash)
+0x0C        = Affichage de la barre sur l'Ã©cran du numÃ©rique (1 = absente | 0 = prÃ©sente)
+0x0D        = Flash (0 = automatique | 1 = forcÃ© | 2 = pas de flash)
 0x0E        = Minuterie (0 = off | 1 = on)
-0x0F        = Qualité d'enregistrement (0 = Normal | 1 = forte qualité | 2 = économique)
+0x0F        = QualitÃ© d'enregistrement (0 = Normal | 1 = forte qualitÃ© | 2 = Ã©conomique)
 0x10        = white balance (0 = auto | 2 = office | 1 = Day-lt)
-0x11        = exposure : 0 à 8 = 0, 0.3, 0.5, 0.8, 1.0, 1.3, 1.5, 1.8, 2.0
-                         0xf8 à 0xff = -2.0, -1.8, -1.5, -1.3, -1.0, -0.8, -0.5, -0.3
+0x11        = exposure : 0 Ã  8 = 0, 0.3, 0.5, 0.8, 1.0, 1.3, 1.5, 1.8, 2.0
+                         0xf8 Ã  0xff = -2.0, -1.8, -1.5, -1.3, -1.0, -0.8, -0.5, -0.3
 0x12 - 0x13 = Images taken (MBR and LBR)
 0x14 - 0x15 = Image remaining (MBR and LBR)
 0x16        = Sharpness (0 = auto | 1 = sharp | 2 = soft)
@@ -48,7 +48,7 @@
 0x19        = Focus (0 = auto | 1 = 2.0m | 2 = 0.5m | 3 = 0.1m)
 0x1A        = Macro (0 = off | 1 = on)
 0x1B        = Zoom (0 = off | 1 = on)
-0x1C - 0x1D = Rapport avec la carte mémoire : surement sa présence + sa taille ?? 
+0x1C - 0x1D = Rapport avec la carte mÃ©moire : surement sa prÃ©sence + sa taille ??
 0x1E        = capture (0 = single | 1 = sequence 9)
 0x1F        = Date display (0 = off | 1 = on)
 0x20        = Date display in play mode (0 = on | 1 = off)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/Makefile-files Changed

@@ -1,14 +1,22 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += largan/lmini/README.largan-lmini largan/lmini/ChangeLog
-camlibdoc_DATA += largan/lmini/README.largan-lmini
+EXTRA_DIST                     += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += largan.la
+EXTRA_DIST                     += %reldir%/README.largan-lmini
+camlibdoc_DATA                 += %reldir%/README.largan-lmini
 
-largan_la_SOURCES = \
-	largan/lmini/largan.c \
-	largan/lmini/lmini.c largan/lmini/lmini.h \
-	largan/lmini/lmini_ccd.c largan/lmini/lmini_ccd.h
-largan_la_LDFLAGS = $(camlib_ldflags)
-largan_la_DEPENDENCIES = $(camlib_dependencies)
-largan_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES      += largan.la
+
+largan_la_SOURCES       =
+largan_la_SOURCES      += %reldir%/largan.c
+largan_la_SOURCES      += %reldir%/lmini.c
+largan_la_SOURCES      += %reldir%/lmini.h
+largan_la_SOURCES      += %reldir%/lmini_ccd.c
+largan_la_SOURCES      += %reldir%/lmini_ccd.h
+
+largan_la_CFLAGS        = $(camlib_cflags)
+largan_la_CPPFLAGS      = $(camlib_cppflags)
+largan_la_DEPENDENCIES  = $(camlib_dependencies)
+largan_la_LDFLAGS       = $(camlib_ldflags)
+largan_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/largan.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/largan.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/lmini.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/lmini.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/lmini.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/lmini.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/largan/lmini/lmini_ccd.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/largan/lmini/lmini_ccd.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/lg_gsm/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lg_gsm/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/lg_gsm/lg_gsm.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lg_gsm/lg_gsm.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/lg_gsm/lg_gsm.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lg_gsm/lg_gsm.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/lg_gsm/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lg_gsm/library.c Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lumix Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lumix/Makefile-files Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lumix/README.lumix Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/lumix/lumix.c Added

@@ -0,0 +1,1920 @@
+/** \file lumix.c
+ *
+ * \author Copyright 2019 Robert Hasson <robert_hasson@yahoo.com>
+ * \author Copyright 2019 Marcus Meissner <marcus@jet.franken.de>
+ *
+ * \par
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * \par
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * \par
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ */
+#include "config.h"
+
+
+#include <string.h>
+#include <errno.h>
+#include <curl/curl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/xmlreader.h>
+
+
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
+#include <stdlib.h>
+
+
+#include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-result.h>
+
+#include "libgphoto2/i18n.h"
+
+
+#define GP_MODULE "lumix"
+
+#define CHECK(result)                                   \
+{                                                       \
+	int res = (result);                             \
+	\
+	if (res < 0) {                                  \
+		gp_log (GP_LOG_DEBUG, "lumix", "Operation failed in %s (%i)!", __FUNCTION__, res);     \
+		return (res); 	\
+	}                      	\
+}
+
+
+char* CDS_Control  = ":60606/Server0/CDS_control";
+int ReadoutMode = 2; // this should be picked up from the settings.... 0-> JPG; 1->RAW; 2 -> Thumbnails
+char* cameraShutterSpeed = "B"; // //placeholder to store the value of the shutterspeed set in camera; "B" is for bulb.
+int captureDuration = 10; //placeholder to store the value of the bulb shot this should be taken as input. note that my primary goal is in fact to perform bulb captures. but this should be extended for sure to take Shutter Speed capture as set in camera
+
+static int NumberPix(Camera *camera);
+static char* loadCmd (Camera *camera,char* cmd);
+static char* switchToRecMode(Camera *camera);
+static char* switchToPlayMode(Camera *camera);
+
+typedef struct {
+	char   *data;
+	size_t 	size;
+} LumixMemoryBuffer;
+
+typedef struct {
+	char	*id;
+	char	*url_raw;
+	char	*url_movie;
+	char	*url_large;
+	char	*url_medium;
+	char	*url_thumb;
+} LumixPicture;
+
+struct _CameraPrivateLibrary {
+	/* all private data */
+
+	int		numpics;
+	LumixPicture	*pics;
+
+	int		liveview;
+	int		udpsocket;
+};
+
+
+static int
+camera_exit (Camera *camera, GPContext *context)
+{
+	if (camera->pl->udpsocket > 0) {
+		close (camera->pl->udpsocket);
+		camera->pl->udpsocket = 0;
+	}
+	return GP_OK;
+}
+
+static int
+camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
+{
+	int			valread;
+	struct sockaddr_in	serv_addr;
+	unsigned char		buffer65536;
+	GPPortInfo      	info;
+	int			i, start, end, tries;
+
+	if (!camera->pl->liveview) {
+		switchToRecMode (camera);
+		loadCmd(camera,"cam.cgi?mode=startstream&value=49199");
+		camera->pl->liveview = 1;
+		if (camera->pl->udpsocket <= 0) {
+			if ((camera->pl->udpsocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+				GP_LOG_E("\n Socket creation error \n");
+				return GP_ERROR;
+			}
+
+			gp_port_get_info (camera->port, &info);
+
+			memset(&serv_addr, 0, sizeof(serv_addr));
+
+			serv_addr.sin_family = AF_INET;
+			serv_addr.sin_port = htons(49199);
+			serv_addr.sin_addr.s_addr = 0;
+
+			if (bind(camera->pl->udpsocket, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
+				GP_LOG_E("bind Failed: %d", errno);
+				return GP_ERROR;
+			}
+		}
+	} else {
+		/* this reminds the camera we are still doing it */
+		loadCmd(camera,"cam.cgi?mode=getstate");
+	}
+	tries = 3;
+	while (tries--) {
+		valread = recv ( camera->pl->udpsocket, buffer, sizeof(buffer), 0);
+		if (valread == -1) {
+			GP_LOG_E("recv failed: %d", errno);
+			return GP_ERROR;
+		}
+
+		GP_LOG_DATA((char*)buffer,valread,"read from udp port");
+
+		if (valread == 0)
+			continue;
+
+		start = end = -1;
+		for (i = 0; i<valread-1; i++) {
+			if ((bufferi == 0xff) && (bufferi+1 == 0xd8)) {
+				start = i;
+			}
+			if ((bufferi == 0xff) && (bufferi+1 == 0xd9)) {
+				end = i+2;
+			}
+		}
+		//GP_LOG_DATA(buffer+start,end-start,"read from udp port");
+		gp_file_set_mime_type (file, GP_MIME_JPEG);
+		return gp_file_append (file, (char*)buffer+start, end-start);
+	}
+	return GP_ERROR;
+}
+
+static int camera_about (Camera *camera, CameraText *about, GPContext *context);
+
+
+/**
+ * Put a file onto the camera.
+ *
+ * This function is a CameraFilesystem method.
+ */
+int
+put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
+	       CameraFileType type, CameraFile *file, void *data, GPContext *context);
+int
+put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
+	       CameraFileType type, CameraFile *file, void *data, GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	/*
+	 * Upload the file to the camera. Use gp_file_get_data_and_size, etc
+	 */
+
+	return GP_OK;
+}
+
+
+/**
+ * Delete a file from the camera.
+ *
+ * This function is a CameraFilesystem method.
+ */
+int
+delete_file_func (CameraFilesystem *fs, const char *folder,
+		  const char *filename, void *data, GPContext *context);
+int
+delete_file_func (CameraFilesystem *fs, const char *folder,
+		  const char *filename, void *data, GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	/* Delete the file from the camera. */
+
+	return GP_OK;
+}
+
+
+/**
+ * Delete all files from the camera.
+ *
+ * This function is a CameraFilesystem method.
+ */
+int
+delete_all_func (CameraFilesystem *fs, const char *folder, void *data,
+		 GPContext *context);
+int
+delete_all_func (CameraFilesystem *fs, const char *folder, void *data,
+		 GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	/*
+	 * Delete all files in the given folder. If your camera doesn't have
+	 * such a functionality, just don't implement this function.
+	 */
+
+	return GP_OK;
+}
+
+
+/**
+ * Get the file info here and write it to space provided by caller.
+ *
+ * \param info Space provided by caller in which file info is written.
+ *
+ * This function is a CameraFilesystem method.
+ */
+int
+get_info_func (CameraFilesystem *fs, const char *folder, const char *filename,
+	       CameraFileInfo *info, void *data, GPContext *context);
+int
+get_info_func (CameraFilesystem *fs, const char *folder, const char *filename,
+	       CameraFileInfo *info, void *data, GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	return GP_OK;
+}
+
+#if 0
+static int
+set_info_func (CameraFilesystem *fs, const char *folder, const char *file,
+	       CameraFileInfo info, void *data, GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	/* Set the file info here from <info> */
+
+	return GP_OK;
+}
+#endif
+
+static int
+folder_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
+		  void *data, GPContext *context)
+{
+	/*Camera *camera = data;*/
+	/* currently no folders exposed */
+	return GP_OK;
+}
+
+
+/**
+ * List available files in the specified folder.
+ *
+ * This function is a CameraFilesystem method.
+ */
+static int
+file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
+		void *data, GPContext *context)
+{
+	Camera *camera = data;
+	int	i;
+
+	for (i=0;i<camera->pl->numpics;i++) {
+		if (camera->pl->picsi.url_raw) {
+			char	*s = strrchr(camera->pl->picsi.url_raw, '/')+1;
+			gp_list_append (list, s, NULL);
+			continue;
+		}
+		if (camera->pl->picsi.url_large) {
+			char	*s = strrchr(camera->pl->picsi.url_large, '/')+1;
+			gp_list_append (list, s, NULL);
+			continue;
+		}
+		if (camera->pl->picsi.url_movie) {
+			char	*s = strrchr(camera->pl->picsi.url_movie, '/')+1;
+			gp_list_append (list, s, NULL);
+			continue;
+		}
+	}
+	return GP_OK;
+}
+
+/**
+ * Get information on all available storages in the camera.
+ *
+ * This function is a CameraFilesystem method.
+ */
+int
+storage_info_func (CameraFilesystem *fs,
+		CameraStorageInformation **storageinformations,
+		int *nrofstorageinformations, void *data,
+		GPContext *context);
+int
+storage_info_func (CameraFilesystem *fs,
+		CameraStorageInformation **storageinformations,
+		int *nrofstorageinformations, void *data,
+		GPContext *context)
+{
+	/*Camera *camera = data;*/
+
+	/* List your storages here */
+
+	return GP_ERROR_NOT_SUPPORTED;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/**
+ * @name camlib API functions
+ *
+ * @{
+ */
+/**********************************************************************/
+
+
+static size_t
+write_callback(char *contents, size_t size, size_t nmemb, void *userp)
+{
+	size_t 			realsize = size * nmemb;
+	size_t 			oldsize;
+	LumixMemoryBuffer	*lmb = userp;
+
+	oldsize = lmb->size;
+	/* 1 additionally byte for 0x00 */
+	lmb->data = realloc(lmb->data, lmb->size+realsize+1);
+	lmb->size += realsize;
+	lmb->datalmb->size = 0x00;
+
+	GP_LOG_DATA(contents, realsize, "lumix read from url");
+
+	memcpy(lmb->data+oldsize,contents,realsize);
+	return realsize;
+}
+
+
+static char*
+loadCmd (Camera *camera,char* cmd) {
+	CURL		*curl;
+	CURLcode	res;
+	char		URL100;
+	GPPortInfo      info;
+	char		*xpath;
+	LumixMemoryBuffer	lmb;
+
+	curl = curl_easy_init();
+	gp_port_get_info (camera->port, &info);
+	gp_port_info_get_path (info, &xpath); /* xpath now contains ip:192.168.1.1 */
+	snprintf( URL,100, "http://%s/%s", xpath+strlen("ip:"), cmd);
+	GP_LOG_D("cam url is %s", URL);
+
+	curl_easy_setopt(curl, CURLOPT_URL, URL);
+
+	lmb.size = 0;
+	lmb.data = malloc(0);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &lmb);
+
+	res = curl_easy_perform(curl);
+	if(res != CURLE_OK) {
+		fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+		return NULL;
+	} else {
+		/* read the XML that is now in Buffer*/
+		GP_LOG_D("result %s\n", lmb.data);
+
+		/* <?xml version="1.0" encoding="UTF-8"?> <camrply><result>ok</result></camrply> */
+	}
+	curl_easy_cleanup(curl);
+	return lmb.data;
+}
+
+static char*
+switchToRecMode(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=camcmd&value=recmode");
+}
+
+static char*
+switchToPlayMode(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=camcmd&value=playmode");
+}
+
+#if 0
+static void Set_ISO(Camera *camera,const char * ISOValue) {
+	char buf200;
+	sprintf(buf, "?mode=setsetting&type=iso&value=%s",ISOValue);
+	loadCmd(camera,buf);
+}
+#endif
+
+static char*
+generic_setting_getter(Camera *camera, char *type) {
+	char		*result, *s;
+        xmlDocPtr       docin;
+        xmlNodePtr      docroot, output;
+	xmlAttr		*attr;
+	char		url50;
+
+	sprintf(url,"cam.cgi?mode=getsetting&type=%s", type);
+	result = loadCmd(camera, url);
+	docin = xmlReadMemory (result, strlen(result), "http://gphoto.org/", "utf-8", 0);
+
+	/*<?xml version="1.0" encoding="UTF-8"?>
+	 * <camrply><result>ok</result><settingvalue TYPE="CONTENT"></settingvalue></camrply>
+	 */
+
+	if (!docin) return NULL;
+	docroot = xmlDocGetRootElement (docin);
+	if (!docroot) {
+		xmlFreeDoc (docin);
+		return NULL;
+	}
+	if (strcmp((char*)docroot->name,"camrply")) {
+		GP_LOG_E ("docroot name unexpected %s", docroot->name);
+		return NULL;
+	}
+	output = docroot->children;
+	if (strcmp((char*)output->name, "result")) {
+		GP_LOG_E ("node name expected 'result', got %s", output->name);
+		return NULL;
+	}
+	if (strcmp((char*)xmlNodeGetContent (output),"ok")) {
+		GP_LOG_E ("result was not 'ok', got %s", (char*)xmlNodeGetContent (output));
+		return NULL;
+	}
+	output = xmlNextElementSibling (output);
+	if (strcmp((char*)output->name, "settingvalue")) {
+		GP_LOG_E ("node name expected 'settingvalue', got %s", output->name);
+		return NULL;
+	}
+	attr = output->properties;
+	if (strcmp((char*)attr->name, type)) {
+		GP_LOG_E ("attr name expected '%s', got %s", type, output->name);
+		return NULL;
+	}
+	s = (char*)xmlNodeGetContent (attr->children);
+	GP_LOG_D("%s content %s", type, s);
+	xmlFreeDoc (docin);
+	return strdup(s);
+}
+
+static char*
+Get_Clock(Camera *camera) {
+	return generic_setting_getter(camera,"clock");
+}
+
+static char*
+Get_Video_Quality(Camera *camera) {
+	return generic_setting_getter(camera,"videoquality");
+}
+
+static char*
+Get_ISO(Camera *camera) {
+	/* <?xml version="1.0" encoding="UTF-8"?>
+	 * <camrply><result>ok</result><settingvalue iso="auto"></settingvalue></camrply>
+	 */
+	return generic_setting_getter(camera,"iso");
+}
+
+static char*
+Get_ShutterSpeed(Camera *camera) {
+	/*<?xml version="1.0" encoding="UTF-8"?>
+	 * <camrply><result>ok</result><settingvalue shtrspeed="2560/256"></settingvalue></camrply>
+	 */
+	return generic_setting_getter(camera, "shtrspeed");
+}
+
+static char*
+Get_Aperture(Camera *camera) {
+	/* <?xml version="1.0" encoding="UTF-8"?>
+	 * <camrply><result>ok</result><settingvalue focal="1366/256"></settingvalue></camrply>
+	 */
+	return generic_setting_getter(camera, "focal");
+}
+
+static char*
+Get_AFMode(Camera *camera) {
+	return generic_setting_getter(camera,"afmode");
+}
+
+static char*
+Get_LiveViewSize(Camera *camera) {
+	return generic_setting_getter(camera,"liveviewsize");
+}
+
+static char*
+Get_DeviceName(Camera *camera) {
+	return generic_setting_getter(camera,"device_name");
+}
+
+static char*
+Get_FocusMode(Camera *camera) {
+	return generic_setting_getter(camera,"focusmode");
+}
+
+static char*
+Get_MFAssist(Camera *camera) {
+	return generic_setting_getter(camera,"mf_asst");
+}
+
+static char*
+Get_MFAssist_Mag(Camera *camera) {
+	return generic_setting_getter(camera,"mf_asst_mag");
+}
+
+static char*
+Get_ExTeleConv(Camera *camera) {
+	return generic_setting_getter(camera,"ex_tele_conv");
+}
+
+#if 0
+static char*
+Get_Capability(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=getinfo&type=capability");
+}
+#endif
+
+static char*
+Get_Lens(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=getinfo&type=lens");
+}
+
+#if 0
+static char*
+Get_AllMenu(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=getinfo&type=allmenu");
+}
+#endif
+
+#if 0
+static char*
+Get_CurMenu(Camera *camera) {
+	return loadCmd(camera,"cam.cgi?mode=getinfo&type=curmenu");
+}
+#endif
+
+static void Set_ShutterSpeed(Camera *camera,const char* SpeedValue) {
+	char buf200;
+	sprintf(buf, "cam.cgi?mode=setsetting&type=shtrspeed&value=%s",SpeedValue);
+	loadCmd(camera,buf);
+}
+
+static char*
+Get_Quality(Camera *camera) {
+	return generic_setting_getter(camera,"quality");
+}
+
+static void
+Set_quality(Camera *camera,const char* Quality) {
+	char buf200;
+	sprintf(buf,"cam.cgi?mode=setsetting&type=quality&value=%s", Quality);
+	loadCmd(camera,buf);
+}
+
+
+static int
+startCapture(Camera *camera) {
+	char *result;
+
+	result = loadCmd(camera,"cam.cgi?mode=camcmd&value=capture");
+
+	if (strstr(result,"<result>ok</result>")) return GP_OK;
+	if (strstr(result,"<result>err_busy</result>")) return GP_ERROR_CAMERA_BUSY;
+	return GP_ERROR;
+}
+
+static int
+stopCapture(Camera *camera) {
+	char	*result;
+
+	result = loadCmd(camera,"cam.cgi?mode=camcmd&value=capture_cancel");
+
+	if (strstr(result,"<result>ok</result>")) return GP_OK;
+	if (strstr(result,"<result>err_busy</result>")) return GP_ERROR_CAMERA_BUSY;
+	return GP_ERROR;
+}
+
+static void startMovie(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camcmd&value=video_recstart");
+}
+
+static void stopMovie(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camcmd&value=video_recstop");
+}
+
+#if 0
+static void zoomIn(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camcmd&value=tele-fast");
+}
+#endif
+
+#if 0
+static void zoomOut(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camcmd&value=wide-fast");
+}
+#endif
+
+#if 0
+static void zoomStop(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camcmd&value=zoomstop");
+}
+#endif
+
+#if 0
+static void focusIn(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camctrl&type=focus&value=tele-fast");
+}
+#endif
+
+#if 0
+static void focusOut(Camera *camera) {
+	loadCmd(camera,"cam.cgi?mode=camctrl&type=focus&value=wide-fast");
+}
+#endif
+
+/*
+
+this is the XML sample to be parsed by the function below   NumberPix()
+<?xml version="1.0" encoding="UTF-8"?>
+<camrply><result>ok</result><current_position>341</current_position><total_content_number>372</total_content_number><content_number>342</content_number></camrply>
+
+
+*/
+
+static int
+NumberPix(Camera *camera) {
+	xmlChar		*keyz = NULL;
+	int		numpics = 0;
+	char		*temp = loadCmd(camera,"cam.cgi?mode=get_content_info");
+	xmlDocPtr	doc = xmlParseDoc((unsigned char*) temp);
+	xmlNodePtr	cur = NULL;
+
+	cur = xmlDocGetRootElement(doc);
+
+	if (cur == NULL) {
+		GP_LOG_E("empty xml result document");
+		xmlFreeDoc(doc);
+		return GP_ERROR;
+	}
+	/*
+	 * busy mode:
+	 <?xml version="1.0" encoding="UTF-8"?> <camrply><result>err_busy</result></camrply>
+
+	 * regular return:
+	 <?xml version="1.0" encoding="UTF-8"?>
+	 <camrply><result>ok</result><current_position>2</current_position><total_content_number>651</total_content_number><content_number>651</content_number></camrply>
+	 */
+	if (strstr(temp, "<result>err_busy</result>")) {
+		xmlFreeDoc(doc);
+		return GP_ERROR_CAMERA_BUSY;
+	}
+
+	cur = cur->xmlChildrenNode;
+	while (cur != NULL) {
+		/*GP_LOG_D("NumberPix Decode current node is %s \n", (char*)cur);*/
+		if ((!xmlStrcmp(cur->name, (const xmlChar *)"content_number"))) {
+			keyz = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+			break;
+		}
+		cur = cur->next;
+	}
+	if (!keyz) {
+		xmlFreeDoc(doc);
+		return GP_ERROR;
+	}
+	GP_LOG_D("NumberPix Found is %s", (char *) keyz);
+	numpics = strtol((char*)keyz, NULL, 10);
+
+	xmlFreeDoc(doc);
+	return numpics;
+}
+
+/*utility function to creat a SOAP envelope for the lumix cam */
+static char*
+SoapEnvelop(int start, int num){
+	static char  Envelop1000;
+	snprintf(Envelop,1000, "<?xml version=\"1.0\" encoding=\"utf-8\"?><s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><u:Browse xmlns:u=\"urn:schemas-upnp-org:service:ContentDirectory:1\"xmlns:pana=\"urn:schemas-panasonic-com:pana\"><ObjectID>0</ObjectID><BrowseFlag>BrowseDirectChildren</BrowseFlag><Filter>*</Filter><StartingIndex>%d</StartingIndex><RequestedCount>%d</RequestedCount><SortCriteria></SortCriteria><pana:X_FromCP>LumixLink2.0</pana:X_FromCP></u:Browse></s:Body></s:Envelope>",start,num);
+
+	return Envelop;
+}
+
+/*
+ * retrieves the XML doc with the last num pictures avail in the camera.
+ */
+static char*
+GetPixRange(Camera *camera, int start, int num) {
+	long		NumPix;
+	int		numreadint;
+        xmlDocPtr       docin, docin2;
+        xmlNodePtr      docroot, docroot2, output, output2, next;
+	xmlChar 	*xchar, *numread;
+	char*		SoapMsg;
+	CURL 		*curl;
+	CURLcode	res;
+	struct curl_slist *list = NULL;
+	GPPortInfo      info;
+	char		*xpath;
+	LumixMemoryBuffer	lmb;
+	char		URL1000;
+
+	switchToPlayMode (camera);
+	NumPix  = NumberPix(camera);
+	//GP_LOG_D("NumPix is %d \n", NumPix);
+	if (NumPix < GP_OK) return NULL;
+
+	if (camera->pl->numpics < NumPix) {
+		camera->pl->pics = realloc(camera->pl->pics,NumPix * sizeof(camera->pl->pics0));
+		memset(camera->pl->pics+camera->pl->numpics, 0, (NumPix - camera->pl->numpics) * sizeof(camera->pl->pics0));
+		camera->pl->numpics = NumPix;
+	}
+
+	while (num > 0) {
+		SoapMsg = SoapEnvelop(start, num);
+		//GP_LOG_D("SoapMsg is %s \n", SoapMsg);
+
+		curl = curl_easy_init();
+
+		list = curl_slist_append(list, "SOAPaction: urn:schemas-upnp-org:service:ContentDirectory:1#Browse");
+		list = curl_slist_append(list, "Content-Type: text/xml; charset=\"utf-8\"");
+		list = curl_slist_append(list, "Accept: text/xml");
+
+		gp_port_get_info (camera->port, &info);
+		gp_port_info_get_path (info, &xpath); /* xpath now contains ip:192.168.1.1 */
+		snprintf( URL, 1000, "http://%s%s",xpath+strlen("ip:"), CDS_Control);
+		curl_easy_setopt(curl, CURLOPT_URL, URL);
+
+		lmb.size = 0;
+		lmb.data = malloc(0);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &lmb);
+
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+		curl_easy_setopt(curl, CURLOPT_POST,1);
+		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) strlen(SoapMsg));
+
+		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, SoapMsg);
+
+		GP_LOG_D("camera url is %s", URL);
+		GP_LOG_D("posting %s", SoapMsg);
+
+		res = curl_easy_perform(curl);
+		if(res != CURLE_OK) {
+			fprintf(stderr, "curl_easy_perform() failed: %s\n",
+			curl_easy_strerror(res));
+			curl_easy_cleanup(curl);
+			return NULL;
+		}
+		curl_easy_cleanup(curl);
+
+		docin = xmlReadMemory (lmb.data, lmb.size, "http://gphoto.org/", "utf-8", 0);
+		if (!docin) return NULL;
+		docroot = xmlDocGetRootElement (docin);
+		if (!docroot) {
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		if (strcmp((char*)docroot->name,"Envelope")) {
+			GP_LOG_E("root node is '%s', expected 'Envelope'", docroot->name);
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		output = xmlFirstElementChild (docroot);
+		if (strcmp((char*)output->name,"Body")) {
+			GP_LOG_E("second level node is %s, expected Body", docroot->name);
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		output = xmlFirstElementChild (output);
+		if (strcmp((char*)output->name,"BrowseResponse")) {
+			GP_LOG_E("third level node is %s, expected BrowseResponse", docroot->name);
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		output = xmlFirstElementChild (output);
+		if (strcmp((char*)output->name,"Result")) {
+			GP_LOG_E("fourth level node is %s, expected Result", docroot->name);
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		xchar = xmlNodeGetContent (output);
+		GP_LOG_D("content of %s is %s", output->name, xchar);
+	/*
+
+	<DIDL-Lite xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/">
+		<item id="1030822" parentID="0" restricted="0">
+			<dc:title>103-0822</dc:title>
+			<upnp:writeStatus>WRITABLE</upnp:writeStatus>
+			<upnp:class name="imageItem">object.item.imageItem</upnp:class>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_ORG">
+				http://192.168.54.1:50001/DO1030822.JPG
+			</res>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN">
+				http://192.168.54.1:50001/DT1030822.JPG
+			</res>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN">
+				http://192.168.54.1:50001/DL1030822.JPG
+			</res>
+		</item>
+	</DIDL-Lite>
+
+	*/
+		docin2 = xmlReadMemory ((char*)xchar, strlen((char*)xchar), "http://gphoto.org/", "utf-8", 0);
+		if (!docin2) return NULL;
+		docroot2 = xmlDocGetRootElement (docin2);
+		if (!docroot2) {
+			xmlFreeDoc (docin2);
+			return NULL;
+		}
+		if (strcmp((char*)docroot2->name,"DIDL-Lite")) {
+			GP_LOG_E("expected DIDL-Lite, got %s", docroot2->name);
+			xmlFreeDoc (docin2);
+			return NULL;
+		}
+		output2 = xmlFirstElementChild (docroot2);
+		if (strcmp((char*)output2->name,"item")) {
+			GP_LOG_E("expected item, got %s", output2->name);
+			xmlFreeDoc (docin2);
+			return NULL;
+		}
+	/*
+		<item id="1030822" parentID="0" restricted="0">
+			<dc:title>103-0822</dc:title>
+			<upnp:writeStatus>WRITABLE</upnp:writeStatus>
+			<upnp:class name="imageItem">object.item.imageItem</upnp:class>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_ORG">
+				http://192.168.54.1:50001/DO1030822.JPG
+			</res>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN">
+				http://192.168.54.1:50001/DT1030822.JPG
+			</res>
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN">
+				http://192.168.54.1:50001/DL1030822.JPG
+			</res>
+		</item>
+
+we have:
+Picture:
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_ORG
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN
+
+Movie:
+	http-get:*:application/octet-stream:DLNA.ORG_OP=01;PANASONIC.COM_PN=CAM_AVC_MP4_HP_2160_30P_AAC
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN
+	content is http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN
+
+Raw:
+	http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW_JPG
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN
+	http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN
+	http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW
+
+	*/
+		next = output2;
+		do {
+			char	*id = NULL;
+			int	i;
+			xmlNode	*child;
+			xmlAttr *attr = next->properties;
+
+			GP_LOG_D("got %s", next->name);
+
+			while (attr) {
+				GP_LOG_D("\t attribute %s", attr->name);
+				GP_LOG_D("\t attribute content %s", xmlNodeGetContent(attr->children));
+
+				if (!strcmp((char*)attr->name, "id")) {
+					id = (char*)xmlNodeGetContent(attr->children);
+					break;
+				}
+				attr = attr->next;
+			}
+			/* look if we have the id */
+			for (i=0;i<camera->pl->numpics;i++)
+				if (camera->pl->picsi.id && !strcmp(camera->pl->picsi.id, id))
+					break;
+			if (i<camera->pl->numpics) {
+				GP_LOG_D("already read id %s, is element %d\n", id, i);
+				continue;
+			}
+			for (i=0;i<camera->pl->numpics;i++)
+				if (!camera->pl->picsi.id)
+					break;
+			if (i==camera->pl->numpics) {
+				GP_LOG_D("no free slot found for id %s\n", id);
+				continue;
+			}
+			camera->pl->picsi.id = strdup(id);
+			child = next->children;
+
+		/*
+			<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN">
+				http://192.168.54.1:50001/DL1030822.JPG
+			</res>
+		*/
+			while (child) {
+				xmlAttr *attr;
+				xmlChar	*attrcontent;
+
+				if (strcmp((char*)child->name,"res")) {
+					GP_LOG_D("skipping %s", child->name);
+					child = child->next;
+					continue;
+				}
+				attr = child->properties;
+
+				if (strcmp((char*)attr->name,"protocolInfo")) {
+					GP_LOG_D("expected attribute protocolInfo, got %s", attr->name);
+				}
+				attrcontent = xmlNodeGetContent(attr->children);
+				GP_LOG_D("\t\tattribute content is %s", attrcontent);
+
+				GP_LOG_D("\t child content %s", xmlNodeGetContent(child));
+
+				if (strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_AVC_MP4")) {
+					camera->pl->picsi.url_movie = strdup((char*)xmlNodeGetContent(child));
+				}
+				// http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW
+				// but not
+				// http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW_JPG
+				if (strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_RAW") &&
+				    !strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_RAW_JPG")
+				) {
+					camera->pl->picsi.url_raw = strdup((char*)xmlNodeGetContent(child));
+				}
+				if (strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_ORG")) {
+					camera->pl->picsi.url_large = strdup((char*)xmlNodeGetContent(child));
+				}
+				if (strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_LRGTN")) {
+					camera->pl->picsi.url_medium = strdup((char*)xmlNodeGetContent(child));
+				}
+				if (strstr((char*)attrcontent,"PANASONIC.COM_PN=CAM_TN")) {
+					camera->pl->picsi.url_thumb = strdup((char*)xmlNodeGetContent(child));
+				}
+				child = child->next;
+			}
+		} while ((next = xmlNextElementSibling (next)));
+
+
+		output = xmlNextElementSibling (output);
+		if (strcmp((char*)output->name,"NumberReturned")) {
+			GP_LOG_E("fourth level node is %s, expected NumberReturned", output->name);
+			xmlFreeDoc (docin);
+			return NULL;
+		}
+		numread = xmlNodeGetContent (output);
+		GP_LOG_D("content of %s is %s", output->name, numread);
+
+		numreadint = 1;
+		sscanf((char*)numread,"%d", &numreadint);
+
+		start += numreadint;
+		num -= numreadint;
+	}
+	return strdup((char*)xchar);
+}
+
+static struct shuttermap {
+	char	*cameraspeed;
+	char	*speed;
+} shutterspeeds = {
+	{"3328/256","8000"},
+	{"3243/256","6400"},
+	{"3158/256","5000"},
+	{"3072/256","4000"},
+	{"2987/256","3200"},
+	{"2902/256","2500"},
+	{"2816/256","2000"},
+	{"2731/256","1600"},
+	{"2646/256","1300"},
+	{"2560/256","1000"},
+	{"2475/256","800"},
+	{"2390/256","640"},
+	{"2304/256","500"},
+	{"2219/256","400"},
+	{"2134/256","320"},
+	{"2048/256","250"},
+	{"1963/256","200"},
+	{"1878/256","160"},
+	{"1792/256","125"},
+	{"1707/256","100"},
+	{"1622/256","80"},
+	{"1536/256","60"},
+	{"1451/256","50"},
+	{"1366/256","40"},
+	{"1280/256","30"},
+	{"1195/256","25"},
+	{"1110/256","20"},
+	{"1024/256","15"},
+	{"939/256","13"},
+	{"854/256","10"},
+	{"768/256","8"},
+	{"683/256","6"},
+	{"598/256","5"},
+	{"512/256","4"},
+	{"427/256","3.2"},
+	{"342/256","2.5"},
+	{"256/256","2"},
+	{"171/256","1.6"},
+	{"86/256","1.3"},
+	{"0/256","1"},
+	{"-85/256","1.3s"},
+	{"-170/256","1.6s"},
+	{"-256/256","2s"},
+	{"-341/256","2.5s"},
+	{"-426/256","3.2s"},
+	{"-512/256","4s"},
+	{"-682/256","5s"},
+	{"-768/256","6s"},
+	{"-853/256","8s"},
+	{"-938/256","10s"},
+	{"-1024/256","13s"},
+	{"-1109/256","15s"},
+	{"-1194/256","20s"},
+	{"-1280/256","25s"},
+	{"-1365/256","30s"},
+	{"-1450/256","40s"},
+	{"-1536/256","50s"},
+	{"16384/256","60s"},
+	{"256/256","B"},
+};
+
+static struct aperturemap {
+	char	*cameraaperture;
+	char	*aperture;
+} apertures = {
+	{"392/256","1.7"},
+	{"427/256","1.8"},
+	{"512/256","2"},
+	{"598/256","2.2"},
+	{"683/256","2.5"},
+	{"768/256","2.8"},
+	{"854/256","3.2"},
+	{"938/256","3.5"},
+	{"1024/256","4"},
+	{"1110/256","4.5"},
+	{"1195/256","5"},
+	{"1280/256","5.6"},
+	{"1366/256","6.3"},
+	{"1451/256","7.1"},
+	{"1536/256","8"},
+	{"1622/256","9"},
+	{"1707/256","10"},
+	{"1792/256","11"},
+	{"1878/256","13"},
+	{"1963/256","14"},
+	{"2048/256","16"},
+};
+
+static int
+camera_config_get (Camera *camera, CameraWidget **window, GPContext *context)
+{
+        CameraWidget	*widget,*section;
+        int		valset;
+        unsigned int 	i;
+	char		*val;
+
+	switchToRecMode (camera);
+
+        gp_widget_new (GP_WIDGET_WINDOW, _("Lumix Configuration"), window);
+        gp_widget_set_name (*window, "config");
+
+	gp_widget_new (GP_WIDGET_SECTION, _("Camera Settings"), &section);
+	gp_widget_set_name (section, "settings");
+	gp_widget_append (*window, section);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Clock"), &widget);
+	gp_widget_set_name (widget, "clock");
+	gp_widget_set_value (widget, Get_Clock(camera));
+	gp_widget_append (section, widget);
+
+
+	val = Get_ShutterSpeed(camera);
+	if (!val) val = "unknown";
+	gp_widget_new (GP_WIDGET_RADIO, _("Shutterspeed"), &widget);
+	gp_widget_set_name (widget, "shutterspeed");
+	valset = 0;
+	for (i=0;i<sizeof(shutterspeeds)/sizeof(shutterspeeds0);i++) {
+		gp_widget_add_choice (widget, shutterspeedsi.speed);
+		if (!strcmp(val, shutterspeedsi.cameraspeed)) {
+			valset = 1;
+			gp_widget_set_value (widget, shutterspeedsi.speed);
+		}
+	}
+	if (!valset) gp_widget_set_value (widget, val);
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Quality"), &widget);
+	gp_widget_set_name (widget, "quality");
+	gp_widget_set_value (widget, Get_Quality(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Video Quality"), &widget);
+	gp_widget_set_name (widget, "videoquality");
+	gp_widget_set_value (widget, Get_Video_Quality(camera));
+	gp_widget_append (section, widget);
+
+
+	val = Get_Aperture(camera);
+	if (!val) val = "unknown";
+	gp_widget_new (GP_WIDGET_RADIO, _("Aperture"), &widget);
+	gp_widget_set_name (widget, "aperture");
+	valset = 0;
+	for (i=0;i<sizeof(apertures)/sizeof(apertures0);i++) {
+		gp_widget_add_choice (widget, aperturesi.aperture);
+		if (!strcmp(val, aperturesi.cameraaperture)) {
+			valset = 1;
+			gp_widget_set_value (widget, aperturesi.aperture);
+		}
+	}
+	if (!valset) gp_widget_set_value (widget, val);
+	gp_widget_append (section, widget);
+
+
+	gp_widget_new (GP_WIDGET_RADIO, _("ISO"), &widget);
+	gp_widget_set_name (widget, "iso");
+	gp_widget_set_value (widget, Get_ISO(camera));
+	gp_widget_add_choice (widget, "auto");
+	gp_widget_add_choice (widget, "80");
+	gp_widget_add_choice (widget, "100");
+	gp_widget_add_choice (widget, "200");
+	gp_widget_add_choice (widget, "400");
+	gp_widget_add_choice (widget, "800");
+	gp_widget_add_choice (widget, "1600");
+	gp_widget_add_choice (widget, "3200");
+	gp_widget_add_choice (widget, "6400");
+	gp_widget_add_choice (widget, "12800");
+	gp_widget_append (section, widget);
+
+	valset = 2;
+	gp_widget_new (GP_WIDGET_TOGGLE, _("Bulb"), &widget);
+	gp_widget_set_name (widget, "bulb");
+	gp_widget_set_value (widget, &valset);
+	gp_widget_append (section, widget);
+
+	valset = 2;
+	gp_widget_new (GP_WIDGET_TOGGLE, _("Movie"), &widget);
+	gp_widget_set_name (widget, "movie");
+	gp_widget_set_value (widget, &valset);
+	gp_widget_append (section, widget);
+
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Autofocus Mode"), &widget);
+	gp_widget_set_name (widget, "afmode");
+	gp_widget_set_value (widget, Get_AFMode(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Liveview Size"), &widget);
+	gp_widget_set_name (widget, "liveviewsize");
+	gp_widget_set_value (widget, Get_LiveViewSize(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Device Name"), &widget);
+	gp_widget_set_name (widget, "devicename");
+	gp_widget_set_value (widget, Get_DeviceName(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Focus Mode"), &widget);
+	gp_widget_set_name (widget, "focusmode");
+	gp_widget_set_value (widget, Get_FocusMode(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("MF Assist"), &widget);
+	gp_widget_set_name (widget, "mf_assist");
+	gp_widget_set_value (widget, Get_MFAssist(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("MF Assist Mag"), &widget);
+	gp_widget_set_name (widget, "mf_assist_mag");
+	gp_widget_set_value (widget, Get_MFAssist_Mag(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Ex Teleconv"), &widget);
+	gp_widget_set_name (widget, "ex_tele_conv");
+	gp_widget_set_value (widget, Get_ExTeleConv(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Lens"), &widget);
+	gp_widget_set_name (widget, "lens");
+	gp_widget_set_value (widget, Get_Lens(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_RADIO, _("Zoom"), &widget);
+	gp_widget_set_name (widget, "zoom");
+	gp_widget_set_value (widget, "none");
+	gp_widget_add_choice (widget, "wide-fast");
+	gp_widget_add_choice (widget, "wide-normal");
+	gp_widget_add_choice (widget, "tele-normal");
+	gp_widget_add_choice (widget, "tele-fast");
+	gp_widget_add_choice (widget, "stop");
+	gp_widget_append (section, widget);
+
+#if 0
+	gp_widget_new (GP_WIDGET_TEXT, _("Capability"), &widget);
+	gp_widget_set_name (widget, "capability");
+	gp_widget_set_value (widget, Get_Capability(camera));
+	gp_widget_append (section, widget);
+
+	/* lots of stuff ... lets see if we can use it */
+	gp_widget_new (GP_WIDGET_TEXT, _("All Menu"), &widget);
+	gp_widget_set_name (widget, "allmenu");
+	gp_widget_set_value (widget, Get_AllMenu(camera));
+	gp_widget_append (section, widget);
+
+	gp_widget_new (GP_WIDGET_TEXT, _("Cur Menu"), &widget);
+	gp_widget_set_name (widget, "curmenu");
+	gp_widget_set_value (widget, Get_CurMenu(camera));
+	gp_widget_append (section, widget);
+#endif
+
+	return GP_OK;
+}
+
+static int
+camera_config_set (Camera *camera, CameraWidget *window, GPContext *context)
+{
+	CameraWidget	*widget;
+	char		*val;
+	char		buf50;
+	int		ret;
+	unsigned int	i;
+
+	if ((GP_OK == gp_widget_get_child_by_name(window, "zoom", &widget)) && gp_widget_changed (widget)) {
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+
+		/* all valid values */
+		if (	strcmp(val, "wide-fast")	&&
+			strcmp(val, "wide-normal")	&&
+			strcmp(val, "tele-normal")	&&
+			strcmp(val, "tele-fast")	&&
+			strcmp(val, "stop")
+		)
+			return GP_ERROR_BAD_PARAMETERS;
+
+		if (!strcmp(val, "stop"))
+			val = "zoomstop";
+
+		sprintf(buf,"cam.cgi?mode=camcmd&value=%s", val);
+		loadCmd(camera,buf);
+	}
+
+	if ((GP_OK == gp_widget_get_child_by_name(window, "shutterspeed", &widget)) && gp_widget_changed (widget)) {
+		char *cameraspeed = NULL;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+		for (i=0;i<sizeof(shutterspeeds)/sizeof(shutterspeeds0);i++) {
+			if (!strcmp(val, shutterspeedsi.speed)) {
+				cameraspeed = shutterspeedsi.cameraspeed;
+				break;
+			}
+		}
+		if (!cameraspeed) cameraspeed = val;
+		Set_ShutterSpeed (camera, cameraspeed);
+	}
+
+	if ((GP_OK == gp_widget_get_child_by_name(window, "aperture", &widget)) && gp_widget_changed (widget)) {
+		char *cameraaperture = NULL;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+		for (i=0;i<sizeof(apertures)/sizeof(apertures0);i++) {
+			if (!strcmp(val, aperturesi.aperture)) {
+				cameraaperture = aperturesi.cameraaperture;
+				break;
+			}
+		}
+		if (!cameraaperture) cameraaperture = val;
+		sprintf(buf,"cam.cgi?mode=setsetting&type=focal&value=%s", cameraaperture);
+		loadCmd(camera,buf);
+	}
+	if ((GP_OK == gp_widget_get_child_by_name(window, "iso", &widget)) && gp_widget_changed (widget)) {
+		char buf50;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+		sprintf(buf,"cam.cgi?mode=setsetting&type=iso&value=%s", val);
+		loadCmd(camera,buf);
+	}
+	if ((GP_OK == gp_widget_get_child_by_name(window, "liveviewsize", &widget)) && gp_widget_changed (widget)) {
+		char buf50;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+		sprintf(buf,"cam.cgi?mode=setsetting&type=liveviewsize&value=%s", val);
+		loadCmd(camera,buf);
+	}
+	if ((GP_OK == gp_widget_get_child_by_name(window, "devicename", &widget)) && gp_widget_changed (widget)) {
+		char buf50;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+		sprintf(buf,"cam.cgi?mode=setsetting&type=device_name&value=%s", val);
+		loadCmd(camera,buf);
+	}
+	if ((GP_OK == gp_widget_get_child_by_name(window, "bulb", &widget)) && gp_widget_changed (widget)) {
+		int	val;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+
+		if (val) {
+			ret = startCapture (camera);
+			if (ret != GP_OK)
+				return ret;
+		} else {
+			stopCapture(camera);
+		}
+	}
+	if ((GP_OK == gp_widget_get_child_by_name(window, "movie", &widget)) && gp_widget_changed (widget)) {
+		int	val;
+
+		if (GP_OK != (ret = gp_widget_get_value (widget, &val)))
+			return ret;
+
+		if (val) {
+			startMovie (camera);
+		} else {
+			stopMovie(camera);
+		}
+	}
+	return GP_OK;
+}
+
+
+#if 0
+static int
+strend(const char *s, const char *t)
+{
+    size_t ls = strlen(s); // find length of s
+    size_t lt = strlen(t); // find length of t
+    if (ls >= lt)  // check if t can fit in s
+    {
+        // point s to where t should start and compare the strings from there
+        return (0 == memcmp(t, s + (ls - lt), lt));
+    }
+    return 0; // t was longer than s
+}
+
+static char*
+processNode(xmlTextReaderPtr reader) {
+	char* ret ="";
+	char* lookupImgtag="";
+
+	switch (ReadoutMode) {
+	case 0 : //'jpg
+		lookupImgtag = "CAM_RAW_JPG";
+	break;
+	case 1 :// 'raw
+		lookupImgtag = "CAM_RAW";
+	break;
+	case 2  ://'thumb
+		lookupImgtag = "CAM_LRGTN";
+	break;
+	}
+
+    const xmlChar *name;
+
+    name = xmlTextReaderConstName(reader);
+    if (name == NULL)
+	name = BAD_CAST "--";
+
+    if (xmlTextReaderNodeType(reader) == 1) {  // Element
+	while (xmlTextReaderMoveToNextAttribute(reader)) {
+		if (strend((char*)xmlTextReaderConstValue(reader),lookupImgtag)) {
+			xmlTextReaderRead(reader);
+			ret = (char*)xmlTextReaderConstValue(reader);
+			printf("the image file is %s\n" ,ret);
+		}
+	}
+    }
+    return ret;
+}
+
+/*
+
+below are 2 samples of XML files to be parsed one in case of a JPG/Thumb retrieve the other for RAW
+
+case JPG/Thumb
+
+<?xml version="1.0"?>
+-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+-<s:Body>
+-<u:BrowseResponse xmlns:u="urn:schemas-upnp-org:service:ContentDirectory:1">
+-<Result>
+-<DIDL-Lite xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">
+-<item restricted="0" parentID="0" id="1030516">
+<dc:title>103-0516</dc:title>
+<upnp:writeStatus>WRITABLE</upnp:writeStatus>
+<upnp:class name="imageItem">object.item.imageItem</upnp:class>
+<res protocolInfo="http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW_JPG">http://192.168.1.26:50001/DO1030516.JPG</res>
+<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN">http://192.168.1.26:50001/DT1030516.JPG</res>
+<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN">http://192.168.1.26:50001/DL1030516.JPG</res>
+<res protocolInfo="http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW">http://192.168.1.26:50001/DO1030516.RW2</res>
+</item>
+</DIDL-Lite>
+</Result>
+<NumberReturned>1</NumberReturned>
+<TotalMatches>343</TotalMatches>
+<UpdateID>1</UpdateID>
+</u:BrowseResponse>
+</s:Body>
+</s:Envelope>
+
+case RAW:
+<?xml version="1.0"?>
+-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+-<s:Body>
+-<u:BrowseResponse xmlns:u="urn:schemas-upnp-org:service:ContentDirectory:1">
+-<Result>
+-<DIDL-Lite xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">
+-<item restricted="0" parentID="0" id="1030517">
+<dc:title>103-0517</dc:title>
+<upnp:writeStatus>WRITABLE</upnp:writeStatus>
+<upnp:class name="imageItem">object.item.imageItem</upnp:class>
+<res protocolInfo="http-get:*:application/octet-stream;PANASONIC.COM_PN=CAM_RAW">http://192.168.1.26:50001/DO1030517.RAW</res>
+<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=01;DLNA.ORG_CI=1;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_TN">http://192.168.1.26:50001/DT1030517.JPG</res>
+<res protocolInfo="http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=00900000000000000000000000000000;PANASONIC.COM_PN=CAM_LRGTN">http://192.168.1.26:50001/DL1030517.JPG</res>
+</item>
+</DIDL-Lite>
+</Result>
+<NumberReturned>1</NumberReturned>
+<TotalMatches>344</TotalMatches>
+<UpdateID>1</UpdateID>
+</u:BrowseResponse>
+</s:Body>
+</s:Envelope>
+
+*/
+static int
+add_objectid_and_upload (Camera *camera, CameraFilePath *path, GPContext *context, char *ximage, size_t size) {
+        int                     ret;
+        CameraFile              *file = NULL;
+        CameraFileInfo          info;
+
+        ret = gp_file_new(&file);
+        if (ret!=GP_OK) return ret;
+        gp_file_set_mtime (file, time(NULL));
+        strcpy(info.file.type, GP_MIME_JPEG);
+
+        GP_LOG_D ("setting size");
+        ret = gp_file_set_data_and_size(file, ximage, size);
+        if (ret != GP_OK) {
+                gp_file_free (file);
+                return ret;
+        }
+        GP_LOG_D ("append to fs");
+        ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
+        if (ret != GP_OK) {
+                gp_file_free (file);
+                return ret;
+        }
+        GP_LOG_D ("adding filedata to fs");
+        ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
+        if (ret != GP_OK) {
+                gp_file_free (file);
+                return ret;
+        }
+
+        /* We have now handed over the file, disclaim responsibility by unref. */
+        gp_file_unref (file);
+
+        /* we also get the fs info for free, so just set it */
+        info.file.fields = GP_FILE_INFO_TYPE |
+                        /*GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |*/
+                        GP_FILE_INFO_SIZE /*| GP_FILE_INFO_MTIME */ ;
+        strcpy(info.file.type, GP_MIME_JPEG);
+
+        info.preview.fields = 0; /* so far none */
+/*
+        info.file.width         = oi->ImagePixWidth;
+        info.file.height        = oi->ImagePixHeight;
+        info.file.size          = oi->ObjectCompressedSize;
+        info.file.mtime         = time(NULL);
+
+        info.preview.fields = GP_FILE_INFO_TYPE |
+                        GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+                        GP_FILE_INFO_SIZE;
+        strcpy_mime (info.preview.type, params->deviceinfo.VendorExtensionID, oi->ThumbFormat);
+        info.preview.width      = oi->ThumbPixWidth;
+        info.preview.height     = oi->ThumbPixHeight;
+        info.preview.size       = oi->ThumbCompressedSize;
+*/
+
+        GP_LOG_D ("setting fileinfo in fs");
+        return gp_filesystem_set_info_noop(camera->fs, path->folder, path->name, info, context);
+}
+
+static int
+ReadImageFromCamera(Camera *camera, CameraFilePath *path, GPContext *context) {
+	char			*image;
+	long			nRead;
+	LumixMemoryBuffer	lmb;
+	int			ret;
+	char			* imageURL="";
+	xmlTextReaderPtr	reader;
+
+	switchToPlayMode (camera);
+
+	reader = xmlReaderForDoc((xmlChar*)GetPixRange(camera,NumberPix(camera)-1,1), NULL,"noname.xml", XML_PARSE_DTDATTR |  /* default DTD attributes */ XML_PARSE_NOENT);
+	ret = xmlTextReaderRead(reader);
+	while (ret == 1) {
+	    imageURL = processNode(reader);
+            if (strlen(imageURL))
+		break;
+            ret = xmlTextReaderRead(reader);
+	}
+
+	GP_DEBUG("the image URL is  %s\n",imageURL);
+	image = strdup(imageURL);
+	nRead = 0;
+	CURL* imageUrl;
+	imageUrl = curl_easy_init();
+	CURLcode res;
+	long http_response;
+	int ret_val=0;
+
+
+	while (ret_val!=2) {
+		GP_DEBUG("reading stream %s position %ld", image, nRead);
+
+		curl_easy_setopt(imageUrl, CURLOPT_URL, image);
+		//curl_easy_setopt(imageUrl,CURLOPT_TCP_KEEPALIVE,1L);
+		//curl_easy_setopt(imageUrl, CURLOPT_TCP_KEEPIDLE, 120L);
+		//curl_easy_setopt(imageUrl, CURLOPT_TCP_KEEPINTVL, 60L);
+
+#if 0
+		/* FIXME trick wont work anymore with new buffering code -Marcus */
+		if (nRead) {
+			curl_easy_setopt(imageUrl, CURLOPT_RESUME_FROM, nRead);
+			GetPix(camera,1);//'if the file not found happened then this trick is to get the camera in a readmode again and making sure it remembers the filename
+			GP_DEBUG("continuing the read where it stopped %s  position %ld", image,  nRead);
+		}
+#endif
+		lmb.size = 0;
+		lmb.data = malloc(0);
+		curl_easy_setopt(imageUrl, CURLOPT_WRITEFUNCTION, write_callback);
+		curl_easy_setopt(imageUrl, CURLOPT_WRITEDATA, &lmb);
+
+		res = curl_easy_perform(imageUrl);
+
+		if (res != CURLE_OK) {
+			GP_LOG_E("curl_easy_perform() failed: %s", curl_easy_strerror(res));
+			GP_DEBUG("error in reading stream %s  position %ld", image,  nRead);
+			curl_easy_getinfo(imageUrl, CURLINFO_RESPONSE_CODE, &http_response);
+			GP_DEBUG("CURLINFO_RESPONSE_CODE:%ld\n", http_response);
+		} else {
+			GP_DEBUG("read the whole file");
+			ret_val=2;
+		}
+	}
+	curl_easy_cleanup(imageUrl);
+	strcpy(path->name, strrchr(image,'/')+1);
+	strcpy(path->folder, "/");
+	return add_objectid_and_upload (camera, path, context, lmb.data, lmb.size);
+}
+#endif
+
+/**
+* Capture an image and tell libgphoto2 where to find it by filling
+* out the path.
+*
+* This function is a method of the Camera object.
+*/
+static int
+camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context) {
+	int	ret, tries, before, after;
+	char	*s, *url;
+
+
+	tries = 10;
+	do {
+		ret = NumberPix(camera);
+		if (ret == GP_ERROR_CAMERA_BUSY)
+			sleep(1);
+	} while ((ret == GP_ERROR_CAMERA_BUSY) && (tries--));
+
+	if (ret < GP_OK)
+		return ret;
+
+	before = ret;
+	GP_LOG_D("numberpix before=%d", ret);
+
+	switchToRecMode (camera);
+
+	sleep(2);
+
+	ret = startCapture (camera);
+	if (ret != GP_OK)
+		return ret;
+
+
+	if (strcmp(cameraShutterSpeed, "B")!=0) {
+		sleep(captureDuration); // Sleep for the duration to simulate exposure, if this is in Bulb mode
+	} else {
+		sleep(3);
+	}
+	stopCapture(camera);
+
+	tries = 10;
+	do {
+		ret = NumberPix(camera);
+		if (ret == GP_ERROR_CAMERA_BUSY)
+			sleep(1);
+	} while ((ret == GP_ERROR_CAMERA_BUSY) && (tries--));
+
+	if (ret < GP_OK)
+		return ret;
+
+	after = ret;
+	GP_LOG_D("numberpix after=%d", ret);
+
+	if (after > before)
+		GetPixRange(camera,before,after-before);
+	/* handle case where we have more than one picture, otherwise we just take one */
+	url = "unknown";
+	if (camera->pl->picsafter-1.url_large) url = camera->pl->picsafter-1.url_large;
+	if (camera->pl->picsafter-1.url_raw) url = camera->pl->picsafter-1.url_raw;
+	s = strrchr(url,'/')+1;
+	strcpy(path->name, s);
+	strcpy(path->folder, "/");
+	return GP_OK;
+}
+
+/**
+* Fill out the summary with textual information about the current
+* state of the camera (like pictures taken, etc.).
+*
+* This function is a method of the Camera object.
+*/
+static int
+camera_summary (Camera *camera, CameraText *summary, GPContext *context)
+{
+	return GP_OK;
+}
+
+
+/**
+* Return the camera drivers manual.
+* If you would like to tell the user some information about how
+* to use the camera or the driver, this is the place to do.
+*
+* This function is a method of the Camera object.
+*/
+static int camera_manual (Camera *camera, CameraText *manual, GPContext *context) {
+	return GP_OK;
+}
+
+
+/**
+* Return "About" content as textual description.
+* Will be translated.
+*
+* This function is a method of the Camera object.
+*/
+int  camera_about (Camera *camera, CameraText *about, GPContext *context);
+int camera_about (Camera *camera, CameraText *about, GPContext *context) {
+	strcpy (about->text, _("Lumix WiFi Library\n"
+	"Robert Hasson <robert_hasson@yahoo.com>\n"
+	"Connects to Lumix Cameras over Wifi.\n"
+	"using the http GET commands."));
+	return GP_OK;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/**
+* @name CameraFilesystem member functions
+*
+* @{
+*/
+/**********************************************************************/
+
+
+/**
+* Get the file from the camera.
+*
+* This function is a CameraFilesystem method.
+*/
+static int
+get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, CameraFileType type, CameraFile *file, void *data, GPContext *context)
+{
+	Camera		*camera = data;
+	int		i;
+	CURLcode	res;
+	CURL		*imageUrl;
+	long		http_response;
+	int		ret_val = 0;
+	long			nRead = 0;
+	LumixMemoryBuffer	lmb;
+	const char	*url;
+
+	for (i=0;i<camera->pl->numpics;i++) {
+		char *s;
+
+		if (camera->pl->picsi.url_movie) {
+			s = strrchr(camera->pl->picsi.url_movie,'/')+1;
+			if (!strcmp(s,filename)) {
+				url = camera->pl->picsi.url_movie;
+				break;
+			}
+		}
+		if (camera->pl->picsi.url_raw) {
+			s = strrchr(camera->pl->picsi.url_raw,'/')+1;
+			if (!strcmp(s,filename)) {
+				url = camera->pl->picsi.url_raw;
+				break;
+			}
+		}
+		if (camera->pl->picsi.url_large) {
+			s = strrchr(camera->pl->picsi.url_large,'/')+1;
+			if (!strcmp(s,filename)) {
+				url = camera->pl->picsi.url_large;
+				break;
+			}
+		}
+	}
+	if (i == camera->pl->numpics) /* not found */
+		return GP_ERROR;
+
+	switch (type) {
+	case GP_FILE_TYPE_PREVIEW:
+		if (camera->pl->picsi.url_thumb)
+			url = camera->pl->picsi.url_thumb;
+		break;
+	case GP_FILE_TYPE_NORMAL:
+	default:
+		/* just use regular url */
+		break;
+	}
+
+	switchToPlayMode (camera);
+
+	imageUrl = curl_easy_init();
+
+	while (ret_val != 2) {
+		GP_DEBUG("reading stream %s position %ld", url, nRead);
+
+		curl_easy_setopt(imageUrl, CURLOPT_URL, url);
+		//curl_easy_setopt(imageUrl,CURLOPT_TCP_KEEPALIVE,1L);
+		//curl_easy_setopt(imageUrl, CURLOPT_TCP_KEEPIDLE, 120L);
+		//curl_easy_setopt(imageUrl, CURLOPT_TCP_KEEPINTVL, 60L);
+
+#if 1
+		/* FIXME trick wont work anymore with new buffering code -Marcus */
+		if (nRead) {
+			curl_easy_setopt(imageUrl, CURLOPT_RESUME_FROM, nRead);
+			GetPixRange(camera,NumberPix(camera)-1,1);//'if the file not found happened then this trick is to get the camera in a readmode again and making sure it remembers the filename
+			GP_DEBUG("continuing the read where it stopped %s  position %ld", url,  nRead);
+		}
+#endif
+		lmb.size = 0;
+		lmb.data = malloc(0);
+		curl_easy_setopt(imageUrl, CURLOPT_WRITEFUNCTION, write_callback);
+		curl_easy_setopt(imageUrl, CURLOPT_WRITEDATA, &lmb);
+
+		res = curl_easy_perform(imageUrl);
+
+		if (res != CURLE_OK) {
+			GP_LOG_E("curl_easy_perform() failed: %s", curl_easy_strerror(res));
+			GP_DEBUG("error in reading stream %s  position %ld", url,  nRead);
+			curl_easy_getinfo(imageUrl, CURLINFO_RESPONSE_CODE, &http_response);
+			GP_DEBUG("CURLINFO_RESPONSE_CODE:%ld\n", http_response);
+			return GP_ERROR_IO;
+		} else {
+			GP_DEBUG("read the whole file");
+			ret_val=2;
+		}
+	}
+	curl_easy_cleanup(imageUrl);
+
+	return gp_file_set_data_and_size (file, lmb.data, lmb.size);
+}
+
+
+int camera_abilities (CameraAbilitiesList *list) {
+	CameraAbilities a;
+
+	memset(&a, 0, sizeof(a));
+	strcpy(a.model, "Panasonic:LumixGSeries");
+	a.status	= GP_DRIVER_STATUS_EXPERIMENTAL;
+	a.port		= GP_PORT_IP;
+	a.operations	= GP_CAPTURE_IMAGE| GP_OPERATION_CAPTURE_VIDEO | GP_OPERATION_CONFIG;
+	a.file_operations = GP_FILE_OPERATION_PREVIEW  ;
+	/* it should be possible to browse and DL images the files using the ReadImageFromCamera() function but for now lets keep it simple*/
+	a.folder_operations = GP_FOLDER_OPERATION_NONE;
+	return gp_abilities_list_append(list, a);
+}
+
+/**
+* All filesystem accessor functions.
+*
+* This should contain all filesystem accessor functions
+* available in the camera library. Non-present fields
+* are NULL.
+*
+*/
+CameraFilesystemFuncs fsfuncs = {
+	.file_list_func = file_list_func,
+	.folder_list_func = folder_list_func,
+//	.get_info_func = get_info_func,
+//	.set_info_func = set_info_func,
+	.get_file_func = get_file_func,
+//	.del_file_func = delete_file_func,
+//	.put_file_func = put_file_func,
+//	.delete_all_func = delete_all_func,
+//	.storage_info_func = storage_info_func
+};
+
+/**
+* Initialize a Camera object.
+*
+* Sets up all the proper object function pointers, initialize camlib
+* internal data structures, and probably establish a connection to
+* the camera.
+*
+* This is a camlib API function.
+*/
+int
+camera_init (Camera *camera, GPContext *context)
+{
+	GPPortInfo      info;
+	int		ret;
+	int		tries;
+	char		*result;
+
+	camera->pl = calloc(sizeof(CameraPrivateLibrary),1);
+
+	/* First, set up all the function pointers */
+	camera->functions->exit                 = camera_exit;
+	camera->functions->get_config           = camera_config_get;
+	camera->functions->set_config           = camera_config_set;
+	camera->functions->capture              = camera_capture;
+	camera->functions->capture_preview      = camera_capture_preview;
+	camera->functions->summary              = camera_summary;
+	camera->functions->manual               = camera_manual;
+	camera->functions->about                = camera_about;
+
+	LIBXML_TEST_VERSION
+
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	ret = gp_port_get_info (camera->port, &info);
+	if (ret != GP_OK) {
+		GP_LOG_E ("Failed to get port info?");
+		return ret;
+	}
+	gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
+
+	tries = 3;
+	while (tries--) {
+		result = loadCmd(camera,"cam.cgi?mode=accctrl&type=req_acc&value=0&value2=libgphoto2/lumix");
+		if (strstr(result,"ok,")) {
+			loadCmd(camera,"cam.cgi?mode=setsetting&type=device_name&value=libgphoto2/lumix");
+			break;
+		}
+	}
+
+	if (switchToRecMode (camera) != NULL) {
+		int numpix;
+
+		switchToPlayMode (camera);
+
+		numpix = NumberPix(camera);
+		GetPixRange(camera,0,numpix);
+		return GP_OK;
+	} else
+		return GP_ERROR_IO;
+}
+
+
+int
+camera_id (CameraText *id)
+{
+	strcpy(id->text, "Lumix Wifi");
+
+	return GP_OK;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mars/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mars/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mars/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mars/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mars/mars.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mars/mars.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mars/mars.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mars/mars.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/COPYING -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/COPYING Changed

@@ -1,7 +1,7 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright © 1989, 1991 Free Software Foundation, Inc.,
+ Copyright Â© 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright © 19yy  <name of author>
+    Copyright Â© 19yy  <name of author>
 
     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
@@ -313,7 +313,7 @@
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright © 19yy name of author
+    Gnomovision version 69, Copyright Â© 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/Makefile-files Changed

@@ -1,22 +1,28 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += minolta/dimagev/README.minolta-dimagev minolta/dimagev/COPYING 
-camlibdoc_DATA += minolta/dimagev/README.minolta-dimagev
+EXTRA_DIST              += %reldir%/COPYING
 
-EXTRA_LTLIBRARIES += dimagev.la
+EXTRA_DIST              += %reldir%/README.minolta-dimagev
+camlibdoc_DATA          += %reldir%/README.minolta-dimagev
 
-dimagev_la_SOURCES = \
-	minolta/dimagev/capture.c \
-	minolta/dimagev/data.c \
-	minolta/dimagev/delete.c \
-	minolta/dimagev/dimagev.c \
-	minolta/dimagev/dimagev.h \
-	minolta/dimagev/download.c \
-	minolta/dimagev/info.c \
-	minolta/dimagev/packet.c \
-	minolta/dimagev/status.c \
-	minolta/dimagev/upload.c \
-	minolta/dimagev/util.c
-dimagev_la_LDFLAGS = $(camlib_ldflags)
-dimagev_la_DEPENDENCIES = $(camlib_dependencies)
-dimagev_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES       += dimagev.la
+
+dimagev_la_SOURCES       =
+dimagev_la_SOURCES      += %reldir%/capture.c
+dimagev_la_SOURCES      += %reldir%/data.c
+dimagev_la_SOURCES      += %reldir%/delete.c
+dimagev_la_SOURCES      += %reldir%/dimagev.c
+dimagev_la_SOURCES      += %reldir%/dimagev.h
+dimagev_la_SOURCES      += %reldir%/download.c
+dimagev_la_SOURCES      += %reldir%/info.c
+dimagev_la_SOURCES      += %reldir%/packet.c
+dimagev_la_SOURCES      += %reldir%/status.c
+dimagev_la_SOURCES      += %reldir%/upload.c
+dimagev_la_SOURCES      += %reldir%/util.c
+
+dimagev_la_CFLAGS        = $(camlib_cflags)
+dimagev_la_CPPFLAGS      = $(camlib_cppflags)
+dimagev_la_DEPENDENCIES  = $(camlib_dependencies)
+dimagev_la_LDFLAGS       = $(camlib_ldflags)
+dimagev_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/README.minolta-dimagev -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/README.minolta-dimagev Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/capture.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/capture.c Changed

@@ -73,23 +73,23 @@
 
 	if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) {
 		GP_DEBUG( "dimagev_shutter::unable to write packet");
-		
+
 		if ( p != NULL ) {
 			free(p);
 		}
-		
+
 		return GP_ERROR_IO;
 	}
 
 	if ( p != NULL ) {
 		free(p);
 	}
-		
+
 
 	if ( sleep(1) != 0 ) {
 		GP_DEBUG( "dimagev_shutter::sleep() returned non-zero value");
 	}
-	
+
 	if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) {
 		GP_DEBUG( "dimagev_shutter::no response from camera");
 		return GP_ERROR_IO;
@@ -116,7 +116,7 @@
 	if ( sleep(1) != 0 ) {
 		GP_DEBUG( "dimagev_shutter::sleep() returned non-zero value");
 	}
-		
+
 
 	if ( ( p = dimagev_read_packet(dimagev) ) == NULL ) {
 		GP_DEBUG( "dimagev_shutter::unable to read packet");
@@ -148,7 +148,7 @@
 		GP_DEBUG( "dimagev_shutter::unable to send EOT");
 		return GP_ERROR_IO;
 	}
-		
+
 	if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) {
 		GP_DEBUG( "dimagev_shutter::no response from camera");
 		return GP_ERROR_IO;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/data.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/data.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/delete.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/delete.c Changed

@@ -73,7 +73,7 @@
 		free(p);
 		return GP_ERROR_IO;
 	}
-		
+
 	free(p);
 
 	switch ( char_buffer ) {
@@ -90,7 +90,7 @@
 			return GP_ERROR_IO;
 	}
 
-	
+
 	if ( ( p = dimagev_read_packet(dimagev) ) == NULL ) {
 		GP_DEBUG( "dimagev_delete_picture::unable to read packet");
 		return GP_ERROR_IO;
@@ -101,7 +101,7 @@
 		free(p);
 		return GP_ERROR;
 	}
-	
+
 	free(p);
 
 	if ( raw->buffer0 != (unsigned char) 0 ) {
@@ -121,7 +121,7 @@
 		GP_DEBUG( "dimagev_delete_picture::no response from camera");
 		return GP_ERROR_IO;
 	}
-		
+
 	switch ( char_buffer ) {
 		case DIMAGEV_ACK:
 			break;
@@ -183,7 +183,7 @@
 		free(p);
 		return GP_ERROR_IO;
 	}
-		
+
 	free(p);
 
 	switch ( char_buffer ) {
@@ -200,7 +200,7 @@
 			return GP_ERROR_IO;
 	}
 
-	
+
 	if ( ( p = dimagev_read_packet(dimagev) ) == NULL ) {
 		GP_DEBUG( "dimagev_delete_all::unable to read packet");
 		return GP_ERROR_IO;
@@ -211,7 +211,7 @@
 		free(p);
 		return GP_ERROR_NO_MEMORY;
 	}
-	
+
 	free(p);
 
 	if ( raw->buffer0 != (unsigned char) 0 ) {
@@ -231,7 +231,7 @@
 		GP_DEBUG( "dimagev_delete_all::no response from camera");
 		return GP_ERROR_IO;
 	}
-		
+
 	switch ( char_buffer ) {
 		case DIMAGEV_ACK:
 			break;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/dimagev.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/dimagev.c Changed

@@ -19,32 +19,20 @@
 *                                                                     *
 **********************************************************************/
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
 #include <stdio.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  ifdef gettext_noop
-#    define _(String) dgettext (GETTEXT_PACKAGE, String)
-#    define N_(String) gettext_noop (String)
-#  else
-#    define _(String) (String)
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "dimagev.h"
 
+
 #define GP_MODULE "dimagev"
 
-int camera_id (CameraText *id) 
+int camera_id (CameraText *id)
 {
 #if defined HAVE_STRNCPY
 	strncpy(id->text, "minolta-dimagev", sizeof(id->text));
@@ -55,7 +43,7 @@
 	return GP_OK;
 }
 
-int camera_abilities (CameraAbilitiesList *list) 
+int camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -71,9 +59,9 @@
 	a.speed1 = 0;
 	a.operations        = 	GP_OPERATION_CAPTURE_IMAGE |
 				GP_OPERATION_CAPTURE_PREVIEW;
-	a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+	a.file_operations   = 	GP_FILE_OPERATION_DELETE |
 				GP_FILE_OPERATION_PREVIEW;
-	a.folder_operations = 	GP_FOLDER_OPERATION_PUT_FILE | 
+	a.folder_operations = 	GP_FOLDER_OPERATION_PUT_FILE |
 				GP_FOLDER_OPERATION_DELETE_ALL;
 
 	gp_abilities_list_append(list, a);
@@ -81,7 +69,7 @@
 	return GP_OK;
 }
 
-static int camera_exit (Camera *camera, GPContext *context) 
+static int camera_exit (Camera *camera, GPContext *context)
 {
 	/* Set the camera back into a normal mode. */
 	if (camera->pl) {
@@ -114,8 +102,8 @@
 	return GP_OK;
 }
 
-static int file_list_func (CameraFilesystem *fs, const char *folder, 
-			   CameraList *list, void *data, GPContext *context) 
+static int file_list_func (CameraFilesystem *fs, const char *folder,
+			   CameraList *list, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int ret;
@@ -129,13 +117,13 @@
 		GP_DEBUG( "camera_file_list::unable to populate list");
 		return ret;
 	}
-		
+
 	return GP_OK;
 }
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *data, GPContext *context) 
+			  CameraFile *file, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int file_number=0, result;
@@ -166,9 +154,9 @@
 	return GP_OK;
 }
 
-static int delete_file_func (CameraFilesystem *fs, const char *folder, 
+static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
-			     GPContext *context) 
+			     GPContext *context)
 {
 	Camera *camera = data;
 	int file_number=0;
@@ -180,7 +168,7 @@
 	return dimagev_delete_picture(camera->pl, (file_number + 1 ));
 }
 
-static int camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context) 
+static int camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
 {
 	if (type != GP_CAPTURE_IMAGE)
 		return (GP_ERROR_NOT_SUPPORTED);
@@ -211,7 +199,7 @@
 }
 
 static int put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
-			  CameraFileType type, CameraFile *file, void *data, GPContext *context) 
+			  CameraFileType type, CameraFile *file, void *data, GPContext *context)
 {
 	Camera *camera = data;
 
@@ -219,14 +207,14 @@
 }
 
 static int delete_all_func (CameraFilesystem *fs, const char *folder,
-			    void *data, GPContext *context) 
+			    void *data, GPContext *context)
 {
 	Camera *camera = data;
 
 	return dimagev_delete_all(camera->pl);
 }
 
-static int camera_summary (Camera *camera, CameraText *summary, GPContext *context) 
+static int camera_summary (Camera *camera, CameraText *summary, GPContext *context)
 {
 	int i = 0, count = 0;
 
@@ -408,7 +396,7 @@
 			i = snprintf(&(summary->textcount), sizeof(summary->text) - count, _("Bad value for card status %d"), camera->pl->status->card_status);
 			break;
 	}
-	
+
 	if ( i > 0 ) {
 		count += i;
 	}
@@ -417,7 +405,7 @@
 	return GP_OK;
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
 #if defined HAVE_SNPRINTF
 	snprintf(about->text, sizeof(about->text),
@@ -437,7 +425,7 @@
 	.delete_all_func = delete_all_func,
 };
 
-int camera_init (Camera *camera, GPContext *context) 
+int camera_init (Camera *camera, GPContext *context)
 {
 	GPPortSettings settings;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/dimagev.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/dimagev.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/download.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/download.c Changed

@@ -47,7 +47,7 @@
 	GP_DEBUG( "dimagev_get_picture::file_number is %d", file_number);
 
 	/* Maybe check if it exists? Check the file type? */
-	
+
 	/* First make the command packet. */
 	command_buffer0 = 0x04;
 	command_buffer1 = (unsigned char)( file_number / 256 );
@@ -66,7 +66,7 @@
 		free(p);
 		return GP_ERROR_IO;
 	}
-		
+
 	free(p);
 
 	switch ( char_buffer ) {
@@ -94,7 +94,7 @@
 		free(p);
 		return GP_ERROR_NO_MEMORY;
 	}
-		
+
 	free(p);
 
 	total_packets = (int) r->buffer0;
@@ -118,7 +118,7 @@
 			free(data);
 			return GP_ERROR_IO;
 		}
-	
+
 		if ( ( p = dimagev_read_packet(dimagev) ) == NULL ) {
 			/*
 			GP_DEBUG( "dimagev_get_picture::unable to read packet");
@@ -146,7 +146,7 @@
 			free(p);
 			return GP_ERROR_NO_MEMORY;
 		}
-		
+
 		free(p);
 
 		memcpy(&( data ( size + 1)  ), r->buffer, (size_t) r->length );
@@ -169,7 +169,7 @@
 		free(data);
 		return GP_ERROR_IO;
 	}
-		
+
 	switch ( char_buffer ) {
 		case DIMAGEV_ACK:
 			break;
@@ -226,7 +226,7 @@
 		free(p);
 		return GP_ERROR_IO;
 	}
-		
+
 	free(p);
 
 	switch ( char_buffer ) {
@@ -254,7 +254,7 @@
 		free(p);
 		return GP_ERROR_NO_MEMORY;
 	}
-		
+
 	free(p);
 
 	/* Unlike normal images, we are guaranteed 9600 bytes *exactly*. */
@@ -279,7 +279,7 @@
 			free(ycrcb_data);
 			return GP_ERROR_IO;
 		}
-	
+
 		if ( ( p = dimagev_read_packet(dimagev) ) == NULL ) {
 			GP_DEBUG( "dimagev_get_thumbnail::unable to read packet");
 			free(ycrcb_data);
@@ -292,7 +292,7 @@
 			free(ycrcb_data);
 			return GP_ERROR_NO_MEMORY;
 		}
-		
+
 		free(p);
 
 		memcpy(&( ycrcb_data ( size + 1)  ), r->buffer, (size_t) r->length );
@@ -317,7 +317,7 @@
 		free(ycrcb_data);
 		return GP_ERROR_IO;
 	}
-		
+
 	switch ( char_buffer ) {
 		case DIMAGEV_ACK:
 			break;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/info.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/info.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/packet.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/packet.c Changed

@@ -48,16 +48,17 @@
 	 A packet must be at least eight bytes, with at least one byte of payload.
 */
 dimagev_packet *dimagev_make_packet(const unsigned char *const buffer, unsigned int length, unsigned int seq) {
-	unsigned int i=0, checksum=0;
+	int i=0;
+	unsigned int checksum=0;
 	dimagev_packet *p;
-	
+
 	if ( ( p = calloc(1, sizeof(dimagev_packet) ) ) == NULL ) {
 		GP_DEBUG("dimagev_make_packet::unable to allocate packet");
 		return NULL;
 	}
 
 	p->length = length + 7;
-	
+
 	p->buffer0 = DIMAGEV_STX;
 	p->buffer1 = seq & 0x000000ff;
 	p->buffer2 = ( p->length & 0x0000ff00) >> 8;
@@ -73,7 +74,7 @@
 	p->buffer(p->length - 3) = (unsigned char) ((checksum & 0x0000ff00) >> 8 );
 	p->buffer(p->length - 2) = (unsigned char) ( checksum & 0x000000ff );
 	p->buffer(p->length - 1) = (unsigned char) DIMAGEV_ETX;
-	
+
 	return p;
 }
 
@@ -149,14 +150,14 @@
 	if ( dimagev_verify_packet(p) < GP_OK ) {
 		GP_DEBUG( "dimagev_read_packet::got an invalid packet - will try to send NAK");
 		free(p);
-		
+
 		/* Send a NAK */
 		char_buffer = DIMAGEV_NAK;
 		if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) {
 			GP_DEBUG( "dimagev_read_packet::unable to send NAK");
 			return NULL;
 		}
-		
+
 		/* Who likes recursion? */
 		return dimagev_read_packet(dimagev);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/status.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/status.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/upload.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/upload.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/minolta/dimagev/util.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/minolta/dimagev/util.c Changed

@@ -72,8 +72,9 @@
 	unsigned char *rgb_data, *ycrcb_current, *rgb_current;
 	int count=0;
 	unsigned int magic_r, magic_g, magic_b;
+	const unsigned int size = 14413;
 
-	if ( ( rgb_data = malloc( 14413 ) ) == NULL ) {
+	if ( ( rgb_data = malloc( size ) ) == NULL ) {
 		GP_DEBUG( "dimagev_ycbcr_to_ppm::unable to allocate buffer for Y:Cb:Cr conversion");
 		return NULL;
 	}
@@ -82,14 +83,14 @@
 	rgb_current = &(rgb_data13);
 
 	/* This is the header for a PPM "rawbits" bitmap of size 80x60. */
-	strncpy((char *)rgb_data, "P6\n80 60\n255\n", 13);
+	strncpy((char *)rgb_data, "P6\n80 60\n255\n", size);
 
 	for ( count = 0 ; count < 9600 ; count+=4, ycrcb_current+=4, rgb_current+=6 ) {
 		magic_b = ( ( ycrcb_current2 > (unsigned char) 128 ? 128 : ycrcb_current2 ) - 128 ) * ( 2 - ( 2 * CR_COEFF ) ) + ycrcb_current0;
 		rgb_current2 = (unsigned char) ( magic_b > 255 ? 0 : magic_b );
 		magic_r = ( ( ycrcb_current3 > (unsigned char) 128 ? 128 : ycrcb_current3 ) - 128 ) * ( 2 - ( 2 * Y_COEFF ) ) + ycrcb_current0;
 		rgb_current0 = (unsigned char) ( magic_r > 255 ? 0 : magic_r );
-		magic_g = (( ycrcb_current0 - ( CR_COEFF * rgb_current2 ) ) - ( Y_COEFF * rgb_current0)) / CB_COEFF ; 
+		magic_g = (( ycrcb_current0 - ( CR_COEFF * rgb_current2 ) ) - ( Y_COEFF * rgb_current0)) / CB_COEFF ;
 		rgb_current1 = (unsigned char) ( magic_g > 255 ? 0 : magic_g );
 
 		/* Wipe everything clean. */
@@ -99,7 +100,7 @@
 		rgb_current5 = (unsigned char) ( magic_b > 255 ? 0 : magic_b );
 		magic_r = ( ( ycrcb_current3 > (unsigned char) 128 ? 128 : ycrcb_current3 ) - 128 ) * ( 2 - ( 2 * Y_COEFF ) ) + ycrcb_current1;
 		rgb_current3 = (unsigned char) ( magic_r > 255 ? 0 : magic_r );
-		magic_g = (( ycrcb_current1 - ( CR_COEFF * rgb_current5 ) ) - ( Y_COEFF * rgb_current3)) / CB_COEFF ; 
+		magic_g = (( ycrcb_current1 - ( CR_COEFF * rgb_current5 ) ) - ( Y_COEFF * rgb_current3)) / CB_COEFF ;
 		rgb_current4 = (unsigned char) ( magic_g > 255 ? 0 : magic_g );
 
 		/* Wipe everything clean. */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/Makefile-files Changed

@@ -1,14 +1,32 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += mustek/AUTHOR  mustek/README.mustek mustek/ChangeLog mustek/STATUS
-camlibdoc_DATA += mustek/README.mustek
+EXTRA_DIST             += %reldir%/AUTHOR
+EXTRA_DIST             += %reldir%/ChangeLog
+EXTRA_DIST             += %reldir%/STATUS
 
-EXTRA_LTLIBRARIES += mustek.la
+EXTRA_DIST             += %reldir%/README.mustek
+camlibdoc_DATA         += %reldir%/README.mustek
 
-mustek_la_SOURCES = \
-	mustek/mdc800.c mustek/core.c mustek/image.c \
-	mustek/io.c mustek/rs232.c mustek/usb.c mustek/core.h mustek/image.h \
-	mustek/io.h mustek/mdc800_spec.h mustek/print.h mustek/rs232.h mustek/usb.h
-mustek_la_LDFLAGS = $(camlib_ldflags)
-mustek_la_DEPENDENCIES = $(camlib_dependencies)
-mustek_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES      += mustek.la
+
+mustek_la_SOURCES       =
+mustek_la_SOURCES      += %reldir%/mdc800.c
+mustek_la_SOURCES      += %reldir%/core.c
+mustek_la_SOURCES      += %reldir%/image.c
+mustek_la_SOURCES      += %reldir%/io.c
+mustek_la_SOURCES      += %reldir%/rs232.c
+mustek_la_SOURCES      += %reldir%/usb.c
+mustek_la_SOURCES      += %reldir%/core.h
+mustek_la_SOURCES      += %reldir%/image.h
+mustek_la_SOURCES      += %reldir%/io.h
+mustek_la_SOURCES      += %reldir%/mdc800_spec.h
+mustek_la_SOURCES      += %reldir%/print.h
+mustek_la_SOURCES      += %reldir%/rs232.h
+mustek_la_SOURCES      += %reldir%/usb.h
+
+mustek_la_CFLAGS        = $(camlib_cflags)
+mustek_la_CPPFLAGS      = $(camlib_cppflags)
+mustek_la_DEPENDENCIES  = $(camlib_dependencies)
+mustek_la_LDFLAGS       = $(camlib_ldflags)
+mustek_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/README.mustek -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/README.mustek Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/STATUS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/STATUS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/core.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/core.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/core.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/core.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/image.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/image.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/image.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/image.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/io.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/io.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/io.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/io.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/mdc800.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/mdc800.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/mdc800_spec.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/mdc800_spec.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/print.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/print.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/rs232.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/rs232.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/usb.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/usb.c Changed

@@ -15,13 +15,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
- 
+
 /*
- * gphoto driver for the Mustek MDC800 Digital Camera. The driver 
- * supports rs232 and USB. 
+ * gphoto driver for the Mustek MDC800 Digital Camera. The driver
+ * supports rs232 and USB.
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 /*
 	Implemenation of the USB Version of ExecuteCommand
@@ -67,7 +67,7 @@
 
 
 /*
- * Waits for the camera 
+ * Waits for the camera
  * type: 0:  Wait until the camera gets ready
  *       1:  Read data from irq
  * The function stores the readen 8 Bytes in data.
@@ -104,7 +104,7 @@
 		{
 			if (!(mdc800_usb_isReady(data)||mdc800_usb_isBusy(data))) {
 			    fprintf(stderr,"got data.\n");
-				/* Data received successfull */
+				/* Data received successfully */
 				return GP_OK;
 			}
 		} else {
@@ -134,7 +134,7 @@
 	GPPortSettings settings;
 	int ret;
 
-	printf ("(mdc800_usb_sendCommand) id:%i (%i,%i,%i,%i,%i,%i),answer:%i\n",command1,command2,command3,command4,command5,command6,command7,length);		
+	printf ("(mdc800_usb_sendCommand) id:%i (%i,%i,%i,%i,%i,%i),answer:%i\n",command1,command2,command3,command4,command5,command6,command7,length);
 	/* Send the Command */
 	gp_port_set_timeout(port,MDC800_DEFAULT_TIMEOUT);
 
@@ -146,7 +146,7 @@
 	if (ret != GP_OK) {
 	    fprintf(stderr,"Camera did not get ready before mdc800_usb_sendCommand!\n");
 	}
-	
+
 	if ((ret=gp_port_write(port,(char*)command,8)) != 8)
 	{
 		printCError ("(mdc800_usb_sendCommand) sending Command fails (%d)!\n",ret);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/mustek/usb.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/mustek/usb.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/Makefile-files Changed

@@ -1,24 +1,39 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
 # SUBDIRS = coolshot l859
-EXTRA_DIST += panasonic/README.panasonic panasonic/ChangeLog
-camlibdoc_DATA += panasonic/README.panasonic
-
-EXTRA_LTLIBRARIES += panasonic_dc1000.la
-
-panasonic_dc1000_la_SOURCES = \
-	panasonic/dc1000.c panasonic/dc1000.h \
-	panasonic/dc.c panasonic/dc.h
-panasonic_dc1000_la_LDFLAGS = $(camlib_ldflags)
-panasonic_dc1000_la_DEPENDENCIES = $(camlib_dependencies)
-panasonic_dc1000_la_LIBADD = $(camlib_libadd)
-
-EXTRA_LTLIBRARIES += panasonic_dc1580.la
-
-panasonic_dc1580_la_SOURCES = \
-	panasonic/dc1580.c panasonic/dc1580.h \
-	panasonic/dc.c panasonic/dc.h \
-	panasonic/dc1000.h
-panasonic_dc1580_la_LDFLAGS = $(camlib_ldflags)
-panasonic_dc1580_la_DEPENDENCIES = $(camlib_dependencies)
-panasonic_dc1580_la_LIBADD = $(camlib_libadd)
+
+EXTRA_DIST                       += %reldir%/ChangeLog
+
+EXTRA_DIST                       += %reldir%/README.panasonic
+camlibdoc_DATA                   += %reldir%/README.panasonic
+
+
+EXTRA_LTLIBRARIES                += panasonic_dc1000.la
+
+panasonic_dc1000_la_SOURCES       =
+panasonic_dc1000_la_SOURCES      += %reldir%/dc1000.c
+panasonic_dc1000_la_SOURCES      += %reldir%/dc1000.h
+panasonic_dc1000_la_SOURCES      += %reldir%/dc.c
+panasonic_dc1000_la_SOURCES      += %reldir%/dc.h
+
+panasonic_dc1000_la_CFLAGS        = $(camlib_cflags)
+panasonic_dc1000_la_CPPFLAGS      = $(camlib_cppflags)
+panasonic_dc1000_la_DEPENDENCIES  = $(camlib_dependencies)
+panasonic_dc1000_la_LDFLAGS       = $(camlib_ldflags)
+panasonic_dc1000_la_LIBADD        = $(camlib_libadd)
+
+
+EXTRA_LTLIBRARIES                += panasonic_dc1580.la
+
+panasonic_dc1580_la_SOURCES       =
+panasonic_dc1580_la_SOURCES      += %reldir%/dc1580.c
+panasonic_dc1580_la_SOURCES      += %reldir%/dc1580.h
+panasonic_dc1580_la_SOURCES      += %reldir%/dc.c
+panasonic_dc1580_la_SOURCES      += %reldir%/dc.h
+panasonic_dc1580_la_SOURCES      += %reldir%/dc1000.h
+
+panasonic_dc1580_la_CFLAGS        = $(camlib_cflags)
+panasonic_dc1580_la_CPPFLAGS      = $(camlib_cppflags)
+panasonic_dc1580_la_DEPENDENCIES  = $(camlib_dependencies)
+panasonic_dc1580_la_LDFLAGS       = $(camlib_ldflags)
+panasonic_dc1580_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/README.panasonic -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/README.panasonic Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/coolshot/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/coolshot/Makefile-files Changed

@@ -1,13 +1,20 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += panasonic/coolshot/README.panasonic-coolshot panasonic/coolshot/ChangeLog
-camlibdoc_DATA += panasonic/coolshot/README.panasonic-coolshot
+EXTRA_DIST                         += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += panasonic_coolshot.la
+EXTRA_DIST                         += %reldir%/README.panasonic-coolshot
+camlibdoc_DATA                     += %reldir%/README.panasonic-coolshot
 
-panasonic_coolshot_la_SOURCES = \
-	panasonic/coolshot/coolshot.c \
-	panasonic/coolshot/library.c panasonic/coolshot/library.h
-panasonic_coolshot_la_LDFLAGS = $(camlib_ldflags)
-panasonic_coolshot_la_DEPENDENCIES = $(camlib_dependencies)
-panasonic_coolshot_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES                  += panasonic_coolshot.la
+
+panasonic_coolshot_la_SOURCES       =
+panasonic_coolshot_la_SOURCES      += %reldir%/coolshot.c
+panasonic_coolshot_la_SOURCES      += %reldir%/library.c
+panasonic_coolshot_la_SOURCES      += %reldir%/library.h
+
+panasonic_coolshot_la_CFLAGS        = $(camlib_cflags)
+panasonic_coolshot_la_CPPFLAGS      = $(camlib_cppflags)
+panasonic_coolshot_la_DEPENDENCIES  = $(camlib_dependencies)
+panasonic_coolshot_la_LDFLAGS       = $(camlib_ldflags)
+panasonic_coolshot_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/coolshot/coolshot.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/coolshot/coolshot.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/coolshot/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/coolshot/library.c Changed

@@ -25,7 +25,7 @@
 /****************************************************************/
 
 #define _POSIX_C_SOURCE 199309L
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -33,26 +33,11 @@
 #include <string.h>
 #include <gphoto2/gphoto2.h>
 #include <time.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE "coolshot"
 
@@ -398,7 +383,7 @@
 		last_good = 0;
 	}
 
-	id = gp_context_progress_start (context, thumbnail ? 1800 : 80000, 
+	id = gp_context_progress_start (context, thumbnail ? 1800 : 80000,
 		_("Downloading image..."));
 	while( strncmp( packet + 2, "DT", 2 ) == 0 ) {
 		/* process packet */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/coolshot/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/coolshot/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc.h Changed

@@ -1,3 +1,6 @@
+#ifndef CAMLIBS_PANASONIC_DC_H
+#define CAMLIBS_PANASONIC_DC_H
+
 /*
 	$Id$
 
@@ -9,20 +12,20 @@
 	and distributed under the terms of the gPhoto project license,  COPYING.
 	By continuing to use, modify, or distribute  this file you indicate that
 	you have read the license, understand and accept it fully.
-	
+
 	THIS  SOFTWARE IS PROVIDED AS IS AND COME WITH NO WARRANTY  OF ANY KIND,
 	EITHER  EXPRESSED OR IMPLIED.  IN NO EVENT WILL THE COPYRIGHT  HOLDER BE
 	LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE.
 
 	Note:
-	
+
 	This header contains common  typedefs,  constants and utility  functions
 	for Panasonic DC1000 and DC1580 cameras.
-*/	
+*/
 
 #include <stdio.h>
 #include <errno.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <gphoto2/gphoto2.h>
 
 #define DSC1	1	/* DC1000 */
@@ -34,7 +37,7 @@
 	fine		= 1,
 	superfine	= 2
 } dsc_quality_t;
-	
+
 struct _CameraPrivateLibrary {
 	char			*buf;
 	int			size;
@@ -48,7 +51,7 @@
 
 #define DSC_PAUSE	4 /* seconds to wait for camera to redraw screen */
 
-#define DSC_FULLIMAGE	0 
+#define DSC_FULLIMAGE	0
 #define DSC_THUMBNAIL	1
 
 #define EDSCSERRNO     -1 /* see errno value */
@@ -68,15 +71,15 @@
 
 int dsc1_setbaudrate(Camera *camera, int speed);
 	/* Set baud rate of connection. Part of hand shake procedure 	*/
-	/* Returns GP_OK if succesful and GP_ERROR otherwise.		*/
-	
+	/* Returns GP_OK if successful and GP_ERROR otherwise.		*/
+
 int dsc1_getmodel(Camera *camera);
 	/* Returns camera (sub)model, DSC1: DC1000, DSC2: DC1580, 	*/
 	/* 0: unknown, or GP_ERROR. Part of hand shake procedure. 	*/
 
 void dsc_dumpmem(void *buf, int size);
 	/* Print size bytes of memory at the buf pointer.		*/
-		
+
 const char *dsc_strerror(int error);
 	/* Convert error numbers into readable messages. 		*/
 
@@ -104,7 +107,7 @@
         dsc_errorprint(ERROR, __FILE__, __LINE__); \
         return GP_ERROR; \
         }
-        
+
 #define CHECK(OPERATION) \
         if ((result = OPERATION) < 0) { \
                 dsc_errorprint(EDSCSERRNO, __FILE__, __LINE__); \
@@ -112,3 +115,5 @@
         }
 
 /* End of dc.h */
+
+#endif /* !defined(CAMLIBS_PANASONIC_DC_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc1000.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc1000.c Changed

@@ -7,17 +7,17 @@
 	and distributed under the terms of the gPhoto project license,  COPYING.
 	By continuing to use, modify, or distribute  this file you indicate that
 	you have read the license, understand and accept it fully.
-	
+
 	THIS  SOFTWARE IS PROVIDED AS IS AND COME WITH NO WARRANTY  OF ANY KIND,
 	EITHER  EXPRESSED OR IMPLIED.  IN NO EVENT WILL THE COPYRIGHT  HOLDER BE
 	LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE.
 
 	Note:
-	
+
 	This is a Panasonic PV/NV-DC1000 camera gPhoto library source code.
-	
-*/	
- 
+
+*/
+
 #include "config.h"
 
 #include <stdlib.h>
@@ -27,23 +27,12 @@
 #endif
 #include <string.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "dc.h"
 #include "dc1000.h"
 
+
 #ifndef __FILE__
 #  define __FILE__ "dc1000.c"
 #endif
@@ -58,77 +47,77 @@
 /* dsc1_connect - try hand shake with camera and establish connection */
 
 static int dsc1_connect(Camera *camera, int speed) {
-	
+
 	uint8_t	data = 0;
-	
+
 	DEBUG_PRINT_MEDIUM(("Connecting a camera."));
-		
+
 	if (dsc1_setbaudrate(camera, speed) != GP_OK)
 		return GP_ERROR;
-	
+
 	if (dsc1_getmodel(camera) != DSC1)
 		RETURN_ERROR(EDSCBADDSC);
 		/* bad camera model */
-	
+
 	dsc1_sendcmd(camera, DSC1_CMD_CONNECT, &data, 1);
-	
-	if (dsc1_retrcmd(camera) != DSC1_RSP_OK) 
+
+	if (dsc1_retrcmd(camera) != DSC1_RSP_OK)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
 
 	DEBUG_PRINT_MEDIUM(("Camera connected successfully."));
-	
-	return GP_OK;	
+
+	return GP_OK;
 }
 
 /* dsc1_disconnect - reset camera, free buffers and close files */
 
 static int dsc1_disconnect(Camera *camera) {
-	
+
 	DEBUG_PRINT_MEDIUM(("Disconnecting the camera."));
-	
+
 	if (dsc1_sendcmd(camera, DSC1_CMD_RESET, NULL, 0) != GP_OK)
 		return GP_ERROR;
-	
-	if (dsc1_retrcmd(camera) != DSC1_RSP_OK) 
+
+	if (dsc1_retrcmd(camera) != DSC1_RSP_OK)
 		RETURN_ERROR(EDSCBADRSP)
-		/* bad response */	
-	else 
+		/* bad response */
+	else
 		sleep(DSC_PAUSE); /* let camera to redraw its screen */
-	
+
 	DEBUG_PRINT_MEDIUM(("Camera disconnected."));
-	
+
 	return GP_OK;
 }
 
 /* dsc1_getindex - retrieve the number of images stored in camera memory */
 
 static int dsc1_getindex(Camera *camera) {
-	
+
 	int	result = GP_ERROR;
 
 	DEBUG_PRINT_MEDIUM(("Retrieving the number of images."));
-		
+
 	if (dsc1_sendcmd(camera, DSC1_CMD_GET_INDEX, NULL, 0) != GP_OK)
 		return GP_ERROR;
-	
+
 	if (dsc1_retrcmd(camera) == DSC1_RSP_INDEX)
 		result = camera->pl->size / 2;
 	else
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
-	
+
 	DEBUG_PRINT_MEDIUM(("Number of images: %i", result));
-	
+
 	return result;
 }
 
 /* dsc1_delete - delete image #index from camera memory */
 
 static int dsc1_delete(Camera *camera, uint8_t index) {
-	
+
 	DEBUG_PRINT_MEDIUM(("Deleting image: %i.", index));
-		
+
 	if (index < 1)
 		RETURN_ERROR(EDSCBADNUM);
 		/* bad image number */
@@ -143,16 +132,16 @@
 	DEBUG_PRINT_MEDIUM(("Image: %i deleted.", index));
 
 	return GP_OK;
-}	
-	
+}
+
 /* dsc1_selectimage - select image to download, return its size */
 
 static int dsc1_selectimage(Camera *camera, uint8_t index)
 {
         int	size = 0;
-	
-	DEBUG_PRINT_MEDIUM(("Selecting image: %i.", index));	
-	
+
+	DEBUG_PRINT_MEDIUM(("Selecting image: %i.", index));
+
 	if (index < 1)
 		RETURN_ERROR(EDSCBADNUM);
 		/* bad image number */
@@ -163,7 +152,7 @@
 	if (dsc1_retrcmd(camera) != DSC1_RSP_IMGSIZE)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
-	
+
 	if (camera->pl->size != 4)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
@@ -171,8 +160,8 @@
 	size =	(uint32_t)camera->pl->buf3 |
 		((uint8_t)camera->pl->buf2 << 8) |
 		((uint8_t)camera->pl->buf1 << 16) |
-		((uint8_t)camera->pl->buf0 << 24);		
-	
+		((uint8_t)camera->pl->buf0 << 24);
+
 	DEBUG_PRINT_MEDIUM(("Selected image: %i, size: %i.", index, size));
 
 	return size;
@@ -181,26 +170,26 @@
 /* gp_port_readimageblock - read #block block (1024 bytes) of an image into buf */
 
 static int dsc1_readimageblock(Camera *camera, int block, char *buffer) {
-	
+
 	char	buf2;
-	
+
 	DEBUG_PRINT_MEDIUM(("Reading image block: %i.", block));
 
 	buf0 = (uint8_t)(block >> 8);
 	buf1 = (uint8_t)block;
-	
+
 	if (dsc1_sendcmd(camera, DSC1_CMD_GET_DATA, buf, 2) != GP_OK)
 		return GP_ERROR;
-	
+
 	if (dsc1_retrcmd(camera) != DSC1_RSP_DATA)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
 
 	if (buffer)
 		memcpy(buffer, camera->pl->buf, camera->pl->size);
-	
+
 	DEBUG_PRINT_MEDIUM(("Block: %i read in.", block));
-	
+
 	return camera->pl->size;
 }
 
@@ -212,15 +201,15 @@
 	char	*buffer = NULL;
 
 	DEBUG_PRINT_MEDIUM(("Reading image: %i.", index));
-		
+
 	if ((*size = dsc1_selectimage(camera, index)) < 0)
 		return NULL;
-	
+
 	if (!(buffer = (char*)malloc(*size))) {
 		DEBUG_PRINT_MEDIUM(("Failed to allocate memory for image data."));
 		return NULL;
 	}
-	
+
 	for (i = 0, s = 0; s < *size; i++) {
 		if ((rsize = dsc1_readimageblock(camera, i, &buffers)) == GP_ERROR) {
 			DEBUG_PRINT_MEDIUM(("Error during image transfer."));
@@ -231,7 +220,7 @@
 	}
 
 	DEBUG_PRINT_MEDIUM(("Image: %i read in.", index));
-	
+
 	return buffer;
 }
 #endif
@@ -239,11 +228,11 @@
 /* dsc1_setimageres - set image resolution based on its size, used on upload to camera */
 
 static int dsc1_setimageres(Camera *camera, int size) {
-	
+
 	dsc_quality_t	res;
-	
-	DEBUG_PRINT_MEDIUM(("Setting image resolution, image size: %i.", size));	
-	
+
+	DEBUG_PRINT_MEDIUM(("Setting image resolution, image size: %i.", size));
+
 	if (size < 65536)
 		res = normal;
 	else if (size < 196608)
@@ -257,7 +246,7 @@
 	if (dsc1_retrcmd(camera) != DSC1_RSP_OK)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
-		
+
 	DEBUG_PRINT_MEDIUM(("Image resolution set to: %i", res));
 
 	return GP_OK;
@@ -274,9 +263,9 @@
 	if (dsc1_retrcmd(camera) != DSC1_RSP_OK)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
-		
+
 	DEBUG_PRINT_MEDIUM(("Block: %i of size: %i written.", block, size));
-	
+
 	return GP_OK;
 }
 
@@ -287,24 +276,24 @@
 	int	blocks, blocksize, i;
 
 	DEBUG_PRINT_MEDIUM(("Writing an image of size: %i.", size));
-		
+
 	if ((dsc1_setimageres(camera, size)) != GP_OK)
 		return GP_ERROR;
-	
+
 	blocks = (size - 1)/DSC_BLOCKSIZE + 1;
-			
+
 	for (i = 0; i < blocks; i++) {
 		blocksize = size - i*DSC_BLOCKSIZE;
-		if (DSC_BLOCKSIZE < blocksize) 
+		if (DSC_BLOCKSIZE < blocksize)
 			blocksize = DSC_BLOCKSIZE;
 		if (dsc1_writeimageblock(camera, i, &bufferi*DSC_BLOCKSIZE, blocksize) != GP_OK) {
 			DEBUG_PRINT_MEDIUM(("Error during image transfer."));
 			return GP_ERROR;
 		}
 	}
-	
+
 	DEBUG_PRINT_MEDIUM(("Image written successfully."));
-	
+
 	return GP_OK;
 }
 #endif
@@ -320,11 +309,11 @@
 
 	if (dsc1_sendcmd(camera, DSC1_CMD_PREVIEW, &index, 1) != GP_OK)
 		return GP_ERROR;
-	
+
 	if (dsc1_retrcmd(camera) != DSC1_RSP_OK)
 		RETURN_ERROR(EDSCBADRSP);
 		/* bad response */
-	
+
 	return GP_OK;
 }
 #endif
@@ -352,9 +341,9 @@
 	a.speed0 	= 9600;
 	a.speed1 	= 19200;
 	a.speed2 	= 38400;
-	a.speed3 	= 57600;			
-	a.speed4 	= 115200;	
-	a.speed5 	= 0;	
+	a.speed3 	= 57600;
+	a.speed4 	= 115200;
+	a.speed5 	= 0;
 	a.operations        = GP_OPERATION_NONE;
 	a.file_operations   = GP_FILE_OPERATION_DELETE;
 	a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE;
@@ -379,14 +368,14 @@
 }
 
 static int file_list_func (CameraFilesystem *fs, const char *folder,
-			   CameraList *list, void *data, GPContext *context) 
+			   CameraList *list, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int 	count;
-	
+
 	if ((count = dsc1_getindex (camera)) == GP_ERROR)
 		return GP_ERROR;
-	
+
 	gp_list_populate (list, DSC_FILENAMEFMT, count);
 
 	return GP_OK;
@@ -394,7 +383,7 @@
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *data, GPContext *context) 
+			  CameraFile *file, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int	index, size, rsize, i, s;
@@ -407,17 +396,17 @@
 
 	/* index is the 0-based image number on the camera */
 	index = gp_filesystem_number (camera->fs, folder, filename, context);
-	if (index < 0) 
+	if (index < 0)
 		return (index);
 
 	if ((size = dsc1_selectimage(camera, index + 1)) < 0)
 		return (GP_ERROR);
-	
+
 	gp_file_set_mime_type (file, GP_MIME_JPEG);
 
 	id = gp_context_progress_start (context, size, _("Getting data..."));
 	for (i = 0, s = 0; s < size; i++) {
-		if ((rsize = dsc1_readimageblock(camera, i, NULL)) == GP_ERROR) 
+		if ((rsize = dsc1_readimageblock(camera, i, NULL)) == GP_ERROR)
 			return GP_ERROR;
 		s += rsize;
 		gp_file_append (file, camera->pl->buf, camera->pl->size);
@@ -426,13 +415,13 @@
 			return (GP_ERROR_CANCEL);
 	}
 	gp_context_progress_stop (context, id);
-	
+
 	return GP_OK;
 }
 
 static int put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
 			  CameraFileType type, CameraFile *file, void *user_data,
-			  GPContext *context) 
+			  GPContext *context)
 {
 	Camera *camera = user_data;
 	int	blocks, blocksize, i;
@@ -440,38 +429,38 @@
 	const char *data;
 	unsigned long int size;
 	unsigned int id;
-	
-	gp_context_status(context, _("Uploading image: %s."), name);	
-	
+
+	gp_context_status(context, _("Uploading image: %s."), name);
+
 /*	We can not figure out file type, at least by now.
 
 	if (strcmp(file->type, "image/jpg") != 0) {
 		dsc_print_message(camera, "JPEG image format allowed only.");
-		return GP_ERROR;		
+		return GP_ERROR;
 	}
-*/	
+*/
 	gp_file_get_data_and_size (file, &data, &size);
 	if (size > DSC_MAXIMAGESIZE) {
 		gp_context_message (context, _("File size is %ld bytes. "
 				   "The size of the largest file possible to "
-				   "upload is: %i bytes."), size, 
+				   "upload is: %i bytes."), size,
 				   DSC_MAXIMAGESIZE);
-		return GP_ERROR;		
+		return GP_ERROR;
 	}
 
 	result = dsc1_setimageres (camera, size);
 	if (result != GP_OK)
 		return (result);
-	
+
 	blocks = (size - 1)/DSC_BLOCKSIZE + 1;
 
 	id = gp_context_progress_start (context, blocks, _("Uploading..."));
 	for (i = 0; i < blocks; i++) {
 		blocksize = size - i*DSC_BLOCKSIZE;
-		if (DSC_BLOCKSIZE < blocksize) 
+		if (DSC_BLOCKSIZE < blocksize)
 			blocksize = DSC_BLOCKSIZE;
-		result = dsc1_writeimageblock (camera, i, 
-					       (char*)&datai*DSC_BLOCKSIZE, 
+		result = dsc1_writeimageblock (camera, i,
+					       (char*)&datai*DSC_BLOCKSIZE,
 					       blocksize);
 		if (result != GP_OK)
 			return (result);
@@ -487,7 +476,7 @@
 
 static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
-			     GPContext *context) 
+			     GPContext *context)
 {
 	Camera *camera = data;
 	int	index, result;
@@ -502,7 +491,7 @@
 	return dsc1_delete(camera, index);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
 	strcpy(about->text,
 			_("Panasonic DC1000 gPhoto library\n"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc1000.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc1000.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc1580.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc1580.c Changed

@@ -30,23 +30,12 @@
 #endif
 #include <string.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "dc.h"
 #include "dc1580.h"
 
+
 #ifndef __FILE__
 #  define __FILE__ "dc1580.c"
 #endif
@@ -76,7 +65,7 @@
 
 static int dsc2_sendcmd(Camera *camera, uint8_t cmd, long int data, uint8_t sequence) {
 
-        int     i;
+        unsigned int     i;
 
         DEBUG_PRINT_MEDIUM(("Sending command: 0x%02x, data: %i, sequence: %i.", cmd, data, sequence));
 
@@ -98,7 +87,7 @@
 /* dsc2_retrcmd - retrieve command and its data from DSC */
 
 static int dsc2_retrcmd(Camera *camera) {
-        
+
         int     result = GP_ERROR;
         int     s;
 
@@ -126,7 +115,7 @@
 /* dsc2_connect - try hand shake with camera and establish connection */
 
 static int dsc2_connect(Camera *camera, int speed) {
-        
+
         DEBUG_PRINT_MEDIUM(("Connecting camera with speed: %i.", speed));
 
         if (dsc1_setbaudrate(camera, speed) != GP_OK)
@@ -151,7 +140,7 @@
 /* dsc2_disconnect - reset camera, free buffers and close files */
 
 static int dsc2_disconnect(Camera *camera) {
-        
+
         DEBUG_PRINT_MEDIUM(("Disconnecting the camera."));
 
         if (dsc2_sendcmd(camera, DSC2_CMD_RESET, 0, 0) != GP_OK)
@@ -171,7 +160,7 @@
 /* dsc2_getindex - retrieve the number of images stored in camera memory */
 
 static int dsc2_getindex(Camera *camera) {
-        
+
         int     result = GP_ERROR;
 
         DEBUG_PRINT_MEDIUM(("Retrieving the number of images."));
@@ -197,7 +186,7 @@
 /* dsc2_delete - delete image #index from camera memory */
 
 static int dsc2_delete(Camera *camera, int index) {
-        
+
         DEBUG_PRINT_MEDIUM(("Deleting image: %i.", index));
 
         if (index < 1)
@@ -218,7 +207,7 @@
 /* dsc2_selectimage - select image to download, return its size */
 
 static int dsc2_selectimage(Camera *camera, int index, int thumbnail) {
-        
+
         int     size = 0;
 
         DEBUG_PRINT_MEDIUM(("Selecting image: %i, thumbnail: %i.", index, thumbnail));
@@ -252,7 +241,7 @@
 /* gp_port_readimageblock - read #block block (1024 bytes) of an image into buf */
 
 static int dsc2_readimageblock(Camera *camera, int block, char *buffer) {
-        
+
         DEBUG_PRINT_MEDIUM(("Reading image block: %i.", block));
 
         if (dsc2_sendcmd(camera, DSC2_CMD_GET_DATA, block, block) != GP_OK)
@@ -372,7 +361,7 @@
 
 #if 0
 static int dsc2_writeimage(Camera *camera, char *buffer, int size) {
-        
+
         int     blocks, blocksize, i;
 
         DEBUG_PRINT_MEDIUM(("Writing an image of size: %i.", size));
@@ -402,7 +391,7 @@
 
 #if 0
 static int dsc2_preview(Camera *camera, int index) {
-        
+
         if (index < 1)
                 RETURN_ERROR(EDSCBADNUM);
                 /* bad image number */
@@ -423,21 +412,21 @@
 /* Library interface functions */
 
 int camera_id (CameraText *id) {
-        
+
         strcpy(id->text, "panasonic-dc1580");
 
         return (GP_OK);
 }
 
 int camera_abilities (CameraAbilitiesList *list) {
-        
+
         CameraAbilities a;
         char    *models = {
                         "Panasonic:DC1580",
                         "Nikon:CoolPix 600",
                         NULL };
         int     i = 0, result;
-        
+
         while (modelsi) {
 		memset(&a, 0, sizeof(a));
 		a.status = GP_DRIVER_STATUS_PRODUCTION;
@@ -450,7 +439,7 @@
                 a.speed4     = 115200;
                 a.speed5     = 0;
                 a.operations        = 	GP_OPERATION_NONE;
-                a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+                a.file_operations   = 	GP_FILE_OPERATION_DELETE |
 					GP_FILE_OPERATION_PREVIEW;
                 a.folder_operations = 	GP_FOLDER_OPERATION_PUT_FILE;
 
@@ -478,9 +467,9 @@
 
         Camera  *camera = data;
         int     count, result;
-        
+
 	CHECK (count = dsc2_getindex(camera));
-        
+
         CHECK (gp_list_populate(list, DSC_FILENAMEFMT, count));
 
         return GP_OK;
@@ -555,7 +544,7 @@
 static int put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
 			  CameraFileType type, CameraFile *file, void *user_data,
 			  GPContext *context) {
-        
+
 	Camera *camera = user_data;
         int             blocks, blocksize, i, result;
 	const char      *data;
@@ -575,7 +564,7 @@
         if (size > DSC_MAXIMAGESIZE) {
                 gp_context_message (context, _("File size is %ld bytes. "
 				   "The size of the largest file possible to "
-				   "upload is: %i bytes."), size, 
+				   "upload is: %i bytes."), size,
 				   DSC_MAXIMAGESIZE);
                 return GP_ERROR;
         }
@@ -589,8 +578,8 @@
                 blocksize = size - i*DSC_BLOCKSIZE;
                 if (DSC_BLOCKSIZE < blocksize)
                         blocksize = DSC_BLOCKSIZE;
-		result = dsc2_writeimageblock(camera, i, 
-					       (char*)&datai*DSC_BLOCKSIZE, 
+		result = dsc2_writeimageblock(camera, i,
+					       (char*)&datai*DSC_BLOCKSIZE,
 					       blocksize);
 		if (result != GP_OK)
 			return result;
@@ -606,7 +595,7 @@
 static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
 			     GPContext *context) {
-        
+
 	Camera *camera = data;
         int     index, result;
 
@@ -619,7 +608,7 @@
         return dsc2_delete(camera, index);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
         strcpy(about->text,
                         _("Panasonic DC1580 gPhoto2 library\n"
@@ -638,7 +627,7 @@
 	.del_file_func = delete_file_func,
 };
 
-int camera_init (Camera *camera, GPContext *context) 
+int camera_init (Camera *camera, GPContext *context)
 {
         GPPortSettings settings;
         int result, selected_speed;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/dc1580.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/dc1580.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/l859/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/l859/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/l859/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/l859/Makefile-files Changed

@@ -1,11 +1,20 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += panasonic/l859/README.panasonic-l859 panasonic/l859/ChangeLog panasonic/l859/TODO
-camlibdoc_DATA += panasonic/l859/README.panasonic-l859
+EXTRA_DIST                     += %reldir%/ChangeLog
+EXTRA_DIST                     += %reldir%/TODO
 
-EXTRA_LTLIBRARIES += panasonic_l859.la
+EXTRA_DIST                     += %reldir%/README.panasonic-l859
+camlibdoc_DATA                 += %reldir%/README.panasonic-l859
 
-panasonic_l859_la_SOURCES = panasonic/l859/l859.c panasonic/l859/l859.h
-panasonic_l859_la_LDFLAGS = $(camlib_ldflags)
-panasonic_l859_la_DEPENDENCIES = $(camlib_dependencies)
-panasonic_l859_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES              += panasonic_l859.la
+
+panasonic_l859_la_SOURCES       =
+panasonic_l859_la_SOURCES      += %reldir%/l859.c
+panasonic_l859_la_SOURCES      += %reldir%/l859.h
+
+panasonic_l859_la_CFLAGS        = $(camlib_cflags)
+panasonic_l859_la_CPPFLAGS      = $(camlib_cppflags)
+panasonic_l859_la_DEPENDENCIES  = $(camlib_dependencies)
+panasonic_l859_la_LDFLAGS       = $(camlib_ldflags)
+panasonic_l859_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/l859/l859.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/l859/l859.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/panasonic/l859/l859.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/panasonic/l859/l859.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam300/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam300/Makefile-files Changed

@@ -1,11 +1,21 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += pccam300/README.pccam300 pccam300/pccam300-lsusb.txt pccam300/ChangeLog
-camlibdoc_DATA += pccam300/README.pccam300
+EXTRA_DIST               += %reldir%/ChangeLog
+EXTRA_DIST               += %reldir%/pccam300-lsusb.txt
 
-EXTRA_LTLIBRARIES += pccam300.la
+EXTRA_DIST               += %reldir%/README.pccam300
+camlibdoc_DATA           += %reldir%/README.pccam300
 
-pccam300_la_SOURCES = pccam300/pccam300.c pccam300/pccam300.h pccam300/library.c 
-pccam300_la_LDFLAGS = $(camlib_ldflags)
-pccam300_la_DEPENDENCIES = $(camlib_dependencies)
-pccam300_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES        += pccam300.la
+
+pccam300_la_SOURCES       =
+pccam300_la_SOURCES      += %reldir%/pccam300.c
+pccam300_la_SOURCES      += %reldir%/pccam300.h
+pccam300_la_SOURCES      += %reldir%/library.c
+
+pccam300_la_CFLAGS        = $(camlib_cflags)
+pccam300_la_CPPFLAGS      = $(camlib_cppflags)
+pccam300_la_DEPENDENCIES  = $(camlib_dependencies)
+pccam300_la_LDFLAGS       = $(camlib_ldflags)
+pccam300_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam300/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam300/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam300/pccam300.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam300/pccam300.c Changed

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <_stdint.h>
+#include <stdint.h>
 
 #include "pccam300.h"
 
@@ -52,7 +52,7 @@
 #endif
 
 /*
- * waits until the status value is 0 or 8. 
+ * waits until the status value is 0 or 8.
  * if status == 0xb0 or 0x40 we will wait some more
  */
 static int
@@ -152,7 +152,7 @@
                    unsigned char **data, unsigned int *size,
                    unsigned int *type)
 {
-	unsigned int data_size;
+	unsigned int data_size, alloc_size;
 	int r;
 	uint8_t *buf = NULL;
 
@@ -161,12 +161,15 @@
 	 * download of the file. */
 	CHECK (pccam300_get_filesize (port, index, &data_size));
 	CHECK (pccam300_get_filesize (port, index, &data_size));
-	
+
 	/* The jpeg header we will download after the data itself is 623
 	 * bytes long. The first 0x200 bytes of the data appear to be
 	 * garbage, they are overwritten by the header. */
 	*size = data_size + 623 - 0x200;
-	if (!(buf = malloc (*size)))
+
+	alloc_size = *size;
+	if (alloc_size < 623) alloc_size = 623;
+	if (!(buf = malloc (alloc_size)))
 		return GP_ERROR_NO_MEMORY;
 
 	/* Read the data into the buffer overlapping the header area by

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam300/pccam300.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam300/pccam300.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam600/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam600/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam600/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam600/Makefile-files Changed

@@ -1,11 +1,20 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += pccam600/README.pccam600 pccam600/ChangeLog
-camlibdoc_DATA += pccam600/README.pccam600
+EXTRA_DIST               += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += pccam600.la
+EXTRA_DIST               += %reldir%/README.pccam600
+camlibdoc_DATA           += %reldir%/README.pccam600
 
-pccam600_la_SOURCES = pccam600/pccam600.c pccam600/pccam600.h pccam600/library.c 
-pccam600_la_LDFLAGS = $(camlib_ldflags)
-pccam600_la_DEPENDENCIES = $(camlib_dependencies)
-pccam600_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES        += pccam600.la
+
+pccam600_la_SOURCES       =
+pccam600_la_SOURCES      += %reldir%/pccam600.c
+pccam600_la_SOURCES      += %reldir%/pccam600.h
+pccam600_la_SOURCES      += %reldir%/library.c
+
+pccam600_la_CFLAGS        = $(camlib_cflags)
+pccam600_la_CPPFLAGS      = $(camlib_cppflags)
+pccam600_la_DEPENDENCIES  = $(camlib_dependencies)
+pccam600_la_LDFLAGS       = $(camlib_ldflags)
+pccam600_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam600/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam600/library.c Changed

@@ -39,21 +39,10 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#define GP_MODULE "pccam600"
+#include "libgphoto2/i18n.h"
+
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#define GP_MODULE "pccam600"
 
 
 #define QUALITY_LO   0x56
@@ -79,7 +68,7 @@
 }
 
 int camera_abilities(CameraAbilitiesList *list)
-{        
+{
   int i;
   CameraAbilities a;
   for(i=0; modelsi.name; i++) {
@@ -92,19 +81,19 @@
     a.usb_product = modelsi.idProduct;
     a.operations        = 	GP_OPERATION_NONE;
     a.folder_operations = 	GP_FOLDER_OPERATION_NONE;
-    a.file_operations   =     GP_FILE_OPERATION_DELETE;	
+    a.file_operations   =     GP_FILE_OPERATION_DELETE;
     gp_abilities_list_append(list, a);
   }
   return GP_OK;
 }
-		     
-static int camera_exit(Camera *camera, GPContext *context){  
+
+static int camera_exit(Camera *camera, GPContext *context){
   return pccam600_close(camera->port, context);
 }
 
 static int file_list_func (CameraFilesystem *fs, const char *folder,
 			   CameraList *list, void *data, GPContext *context){
-  
+
   Camera *camera = data;
   CameraFileInfo info;
   int n,i,nr_of_blocks;
@@ -125,11 +114,12 @@
       for (i = offset; i <= 512-32; i=i+32)
 	{
 	  memcpy(file_entry,&(buffer)i,32);
+	  file_entry->name8 = 0;
 	  /*Fileentry valid? */
-	  if( !((file_entry->state & 0x02) != 2)  && 
+	  if( !((file_entry->state & 0x02) != 2)  &&
 	      !((file_entry->state & 0x08) == 8) )
 	    {
-	      info.file.fields = 0;
+	      memset (&info, 0, sizeof (info));
 	      temp = (char *)&(file_entry->name)5;
 	      if (strncmp(temp,"JPG",3) == 0)
 		{
@@ -165,7 +155,7 @@
 	      info.file.size = (file_entry->size1*256+
 				file_entry->size0) * 256;
 	      info.file.permissions = GP_FILE_PERM_READ | GP_FILE_PERM_DELETE;
-	      info.file.fields |= GP_FILE_INFO_SIZE | GP_FILE_INFO_PERMISSIONS 
+	      info.file.fields |= GP_FILE_INFO_SIZE | GP_FILE_INFO_PERMISSIONS
 		|GP_FILE_INFO_TYPE;
 	      CHECK(gp_filesystem_set_info_noop(fs, folder, (char *)file_entry->name, info, context));
 	    }
@@ -175,16 +165,16 @@
   return GP_OK;
 }
 
-static int camera_get_file (Camera *camera, GPContext *context, int index,  
-			    unsigned char **data, int *size) 
+static int camera_get_file (Camera *camera, GPContext *context, int index,
+			    unsigned char **data, int *size)
 {
   unsigned char buffer512;
   int nr_of_blocks = 0;
   int n,id,canceled=0;
   int picturebuffersize = 0;
-  int offset = 0;  
+  int offset = 0;
   nr_of_blocks = pccam600_get_file(camera->port,context,index);
-  if (nr_of_blocks < 0) 
+  if (nr_of_blocks < 0)
     return GP_ERROR_FILE_NOT_FOUND;
   picturebuffersize = nr_of_blocks * 512;
   id = gp_context_progress_start(context,nr_of_blocks,_("Downloading file..."));
@@ -209,7 +199,7 @@
 
 static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
-			  CameraFile *file, void *user_data, 
+			  CameraFile *file, void *user_data,
 			  GPContext *context)
 {
   Camera *camera =  user_data;
@@ -234,7 +224,7 @@
 {
   int totalmem;
   int  freemem;
-  char summary_text256;  
+  char summary_text256;
   CHECK(pccam600_get_mem_info(camera->port,context,&totalmem,&freemem));
   snprintf(summary_text,sizeof(summary_text),
   	   (" Total memory is %8d bytes.\n Free memory is  %8d bytes."),
@@ -245,7 +235,7 @@
 
 static int camera_about(Camera *camera, CameraText *about, GPContext *context)
 {
-  strcpy(about->text, 
+  strcpy(about->text,
 	 _("Creative PC-CAM600\nAuthor: Peter Kajberg <pbk@odense.kollegienet.dk>\n"));
   return GP_OK;
 }
@@ -273,7 +263,7 @@
   camera->functions->summary      = camera_summary;
   camera->functions->about        = camera_about;
   gp_log (GP_LOG_DEBUG, "pccam", "Initializing the camera\n");
-  switch (camera->port->type) 
+  switch (camera->port->type)
     {
     case GP_PORT_USB:
       CHECK(gp_port_get_settings(camera->port,&settings));
@@ -286,9 +276,9 @@
       break;
     case GP_PORT_SERIAL:
       return GP_ERROR_IO_SUPPORTED_SERIAL;
-    default: 
+    default:
       return GP_ERROR_NOT_SUPPORTED;
-    }    
+    }
   CHECK(pccam600_init(camera->port, context));
   return gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam600/pccam600.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam600/pccam600.c Changed

@@ -36,24 +36,14 @@
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#include "libgphoto2/i18n.h"
+
+
 #define GP_MODULE "pccam600"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /*
- *waits until the status value is 0 or 8. 
+ *waits until the status value is 0 or 8.
  *if status == 0xb0 or 0x40 we will wait some more
  */
 static int pccam600_wait_for_status(GPPort *port){
@@ -92,12 +82,12 @@
   return GP_OK;
 }
 
-int pccam600_get_mem_info(GPPort *port, GPContext *context, int *totalmem, 
+int pccam600_get_mem_info(GPPort *port, GPContext *context, int *totalmem,
 			    int *freemem)
 {
   unsigned char response4;
   gp_port_set_timeout(port, 400000);
-  CHECK(gp_port_usb_msg_read(port,0x60,0x00,0x03,(char*)response,0x04)); 
+  CHECK(gp_port_usb_msg_read(port,0x60,0x00,0x03,(char*)response,0x04));
   *totalmem = response2*65536+response1*256+response0;
   CHECK(pccam600_wait_for_status(port));
   CHECK(gp_port_usb_msg_read(port,0x60,0x00,0x04,(char*)response,0x04));
@@ -124,7 +114,7 @@
     gp_log(GP_LOG_DEBUG,"pccam600 library: pccam600_get_file_list",
 	   "nr_of_blocks is 0");
     gp_context_error(context,_("pccam600_init: Expected > %d blocks got %d"),
-		 0,nr_of_blocks); 
+		 0,nr_of_blocks);
     return GP_ERROR;
   }
   return nr_of_blocks / 2;
@@ -153,7 +143,7 @@
     gp_log(GP_LOG_DEBUG,
 	   "pccam600 library: pccam600_get_file","nr_of_msg is 0");
     gp_context_error(context,_("pccam600_init: Expected > %d blocks got %d"),
-		 0,nr_of_blocks); 
+		 0,nr_of_blocks);
     return GP_ERROR;
   }
   return nr_of_blocks / 2;
@@ -207,11 +197,16 @@
   gp_port_set_timeout(port,200000);
   CHECK(gp_port_usb_msg_read(port,0x08,0x00,0x1000,(char*)response,0x4));
   nr_of_blocks = response2*256+response1;
+
+  if (nr_of_blocks == 0) {
+    gp_context_error(context,_("pccam600_init: Expected %d blocks got %d"),64,nr_of_blocks);
+    return GP_ERROR;
+  }
+
   nr_of_blocks = 512 / nr_of_blocks;
   gp_log(GP_LOG_DEBUG,"pccam600 library: init","nr_of_blocks %d",nr_of_blocks);
-  if (nr_of_blocks == 0){
-    gp_context_error(context,_("pccam600_init: Expected %d blocks got %d"),
-		 64,nr_of_blocks); 
+  if (nr_of_blocks == 0) {
+    gp_context_error(context,_("pccam600_init: Expected %d blocks got %d"),64,nr_of_blocks);
     return GP_ERROR;
   }
   gp_port_set_timeout(port,500);
@@ -228,5 +223,5 @@
     }
   }
   return GP_OK;
-  
+
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pccam600/pccam600.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pccam600/pccam600.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/Makefile-files Changed

@@ -1,12 +1,36 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += pentax/README.pentax pentax/ChangeLog pentax/exiftool_pentax_lens.txt
+EXTRA_DIST             += %reldir%/ChangeLog
+EXTRA_DIST             += %reldir%/exiftool_pentax_lens.txt
 
-camlibdoc_DATA += pentax/README.pentax
-EXTRA_LTLIBRARIES += pentax.la
+EXTRA_DIST             += %reldir%/README.pentax
+camlibdoc_DATA         += %reldir%/README.pentax
 
-pentax_la_SOURCES = pentax/pslr.c pentax/library.c pentax/pslr_enum.c pentax/pslr_lens.c pentax/pslr_model.c pentax/pslr_enum.h pentax/pslr.h pentax/pslr_lens.h pentax/pslr_model.h pentax/pslr_scsi.h pentax/exiftool_pentax_lens.txt pentax/js0n.c pentax/js0n.h
-pentax_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) -DLIBGPHOTO2 -DPKTDATADIR='"/"'
-pentax_la_LDFLAGS = $(camlib_ldflags)
-pentax_la_DEPENDENCIES = $(camlib_dependencies)
-pentax_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES      += pentax.la
+
+pentax_la_SOURCES       =
+pentax_la_SOURCES      += %reldir%/pslr.c
+pentax_la_SOURCES      += %reldir%/library.c
+pentax_la_SOURCES      += %reldir%/pslr_enum.c
+pentax_la_SOURCES      += %reldir%/pslr_lens.c
+pentax_la_SOURCES      += %reldir%/pslr_model.c
+pentax_la_SOURCES      += %reldir%/pslr_enum.h
+pentax_la_SOURCES      += %reldir%/pslr.h
+pentax_la_SOURCES      += %reldir%/pslr_lens.h
+pentax_la_SOURCES      += %reldir%/pslr_model.h
+pentax_la_SOURCES      += %reldir%/pslr_scsi.h
+pentax_la_SOURCES      += %reldir%/exiftool_pentax_lens.txt
+pentax_la_SOURCES      += %reldir%/js0n.c
+pentax_la_SOURCES      += %reldir%/js0n.h
+
+pentax_la_CFLAGS        = $(camlib_cflags)
+pentax_la_CPPFLAGS      = $(camlib_cppflags)
+pentax_la_DEPENDENCIES  = $(camlib_dependencies)
+pentax_la_LDFLAGS       = $(camlib_ldflags)
+pentax_la_LIBADD        = $(camlib_libadd)
+
+pentax_la_CFLAGS       += $(NO_UNUSED_CFLAGS)
+
+pentax_la_CFLAGS       += -DLIBGPHOTO2
+pentax_la_CFLAGS       += -DPKTDATADIR='"/"'

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/exiftool_pentax_lens.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/exiftool_pentax_lens.txt Changed

@@ -45,6 +45,7 @@
 {4, 2, "smc PENTAX-FA 80-320mm F4.5-5.6"},
 {4, 3, "smc PENTAX-FA 43mm F1.9 Limited"},
 {4, 6, "smc PENTAX-FA 35-80mm F4-5.6"},
+{4, 8, "Irix 150mm F2.8 Macro"},
 {4, 9, "Irix 11mm F4 Firefly"},
 {4, 10, "Irix 15mm F2.4"},
 {4, 12, "smc PENTAX-FA 50mm F1.4"},
@@ -166,8 +167,9 @@
 {7, 243, "smc PENTAX-DA 70mm F2.4 Limited"},
 {7, 244, "smc PENTAX-DA 21mm F3.2 AL Limited"},
 {8, 0, "Sigma 50-150mm F2.8 II APO EX DC HSM"},
-{8, 3, "Sigma AF 18-125mm F3.5-5.6 DC"},
+{8, 3, "Sigma 18-125mm F3.8-5.6 DC HSM"},
 {8, 4, "Sigma 50mm F1.4 EX DG HSM"},
+{8, 6, "Sigma 4.5mm F2.8 EX DC Fisheye"},
 {8, 7, "Sigma 24-70mm F2.8 IF EX DG HSM"},
 {8, 8, "Sigma 18-250mm F3.5-6.3 DC OS HSM"},
 {8, 11, "Sigma 10-20mm F3.5 EX DC HSM"},
@@ -178,6 +180,7 @@
 {8, 16, "Sigma 70-200mm F2.8 EX DG Macro HSM II"},
 {8, 17, "Sigma 50-500mm F4.5-6.3 DG OS HSM"},
 {8, 18, "Sigma 8-16mm F4.5-5.6 DC HSM"},
+{8, 20, "Sigma 18-50mm F2.8-4.5 DC HSM"},
 {8, 21, "Sigma 17-50mm F2.8 EX DC OS HSM"},
 {8, 22, "Sigma 85mm F1.4 EX DG HSM"},
 {8, 23, "Sigma 70-200mm F2.8 APO EX DG OS HSM"},
@@ -195,6 +198,9 @@
 {8, 61, "HD PENTAX-D FA 28-105mm F3.5-5.6 ED DC WR"},
 {8, 62, "HD PENTAX-D FA 24-70mm F2.8 ED SDM WR"},
 {8, 63, "HD PENTAX-D FA 15-30mm F2.8 ED SDM WR"},
+{8, 64, "HD PENTAX-D FA* 50mm F1.4 SDM AW"},
+{8, 65, "HD PENTAX-D FA 70-210mm F4 ED SDM WR"},
+{8, 196, "HD PENTAX-DA* 11-18mm F2.8 ED DC AW"},
 {8, 197, "HD PENTAX-DA 55-300mm F4.5-6.3 ED PLM WR RE"},
 {8, 198, "smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE"},
 {8, 199, "HD PENTAX-DA 18-50mm F4-5.6 DC WR RE"},

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/js0n.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/js0n.c Changed

@@ -2,8 +2,20 @@
 // public domain or MIT license, contributions/improvements welcome via github at https://github.com/quartzjer/js0n
 
 #include <string.h> // one strncmp() is used to do key comparison, and a strlen(key) if no len passed in
+#include "js0n.h"
 
-// gcc started warning for the init syntax used here, is not helpful so don't generate the spam, supressing the warning is really inconsistently supported across versions
+
+#ifdef __clang__
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winitializer-overrides"
+
+/* allow GNU style 0 ... 255 range designators in initializers */
+#pragma clang diagnostic ignored "-Wgnu-designator"
+
+#else /* to clang or not to clang */
+
+// gcc started warning for the init syntax used here, is not helpful so don't generate the spam, suppressing the warning is really inconsistently supported across versions
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 #pragma GCC diagnostic push
 #endif
@@ -12,6 +24,12 @@
 #pragma GCC diagnostic ignored "-Winitializer-overrides"
 #pragma GCC diagnostic ignored "-Woverride-init"
 
+/* allow GNU style 0 ... 255 range designators in initializer */
+#pragma GCC diagnostic ignored "-Wpedantic"
+
+#endif /* to clang or not to clang */
+
+
 // only at depth 1, track start pointers to match key/value
 #define PUSH(i) if(depth == 1) { if(!index) { val = cur+i; }else{ if(klen && index == 1) start = cur+i; else index--; } }
 
@@ -27,7 +45,7 @@
 	size_t index = 1;
 	int depth = 0;
 	int utf8_remain = 0;
-	static void *gostruct = 
+	static void *gostruct =
 	{
 		0 ... 255 = &&l_bad,
 		'\t' = &&l_loop, ' ' = &&l_loop, '\r' = &&l_loop, '\n' = &&l_loop,
@@ -39,7 +57,7 @@
 		65 ... 90 = &&l_bare, // A-Z
 		97 ... 122 = &&l_bare // a-z
 	};
-	static void *gobare = 
+	static void *gobare =
 	{
 		0 ... 31 = &&l_bad,
 		32 ... 126 = &&l_loop, // could be more pedantic/validation-checking
@@ -47,7 +65,7 @@
 		',' = &&l_unbare, '' = &&l_unbare, '}' = &&l_unbare, ':' = &&l_unbare,
 		127 ... 255 = &&l_bad
 	};
-	static void *gostring = 
+	static void *gostring =
 	{
 		0 ... 31 = &&l_bad, 127 = &&l_bad,
 		32 ... 126 = &&l_loop,
@@ -64,17 +82,17 @@
 		128 ... 191 = &&l_utf_continue,
 		192 ... 255 = &&l_bad
 	};
-	static void *goesc = 
+	static void *goesc =
 	{
 		0 ... 255 = &&l_bad,
 		'"' = &&l_unesc, '\\' = &&l_unesc, '/' = &&l_unesc, 'b' = &&l_unesc,
 		'f' = &&l_unesc, 'n' = &&l_unesc, 'r' = &&l_unesc, 't' = &&l_unesc, 'u' = &&l_unesc
 	};
 	void **go = gostruct;
-	
+
 	if(!json || jlen <= 0 || !vlen) return 0;
 	*vlen = 0;
-	
+
 	// no key is array mode, klen provides requested index
 	if(!key)
 	{
@@ -89,14 +107,14 @@
 			goto *go(unsigned char)*cur;
 			l_loop:;
 	}
-	
+
 	if(depth) *vlen = jlen; // incomplete
 	return 0;
-	
+
 	l_bad:
 		*vlen = cur - json; // where error'd
 		return 0;
-	
+
 	l_up:
 		PUSH(0);
 		++depth;
@@ -116,11 +134,11 @@
 		CAP(-1);
 		go=gostruct;
 		goto l_loop;
-		
+
 	l_esc:
 		go = goesc;
 		goto l_loop;
-		
+
 	l_unesc:
 		go = gostring;
 		goto l_loop;
@@ -157,6 +175,15 @@
 
 }
 
+
+#ifdef __clang__
+
+#pragma clang diagnostic pop
+
+#else /* to clang or not to clang */
+
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 #pragma GCC diagnostic pop
 #endif
+
+#endif /* to clang or not to clang */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/js0n.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/js0n.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr.c Changed

@@ -1,6 +1,6 @@
 /*
     pkTriggerCord
-    Copyright (C) 2011-2018 Andras Salamon <andras.salamon@melda.info>
+    Copyright (C) 2011-2019 Andras Salamon <andras.salamon@melda.info>
     Remote control of Pentax DSLR cameras.
 
     Support for K200D added by Jens Dreyer <jens.dreyer@udo.edu> 04/2011
@@ -41,7 +41,13 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
+#ifdef RAD10
+#include <windows.h>
+#include <utime.h>
+#include "tdbtime.h"
+#else
 #include <unistd.h>
+#endif
 #include <stdbool.h>
 #include <stdarg.h>
 #include <dirent.h>
@@ -57,15 +63,6 @@
 #define BLOCK_RETRY 3 /* Number of retries, since we can occasionally
                        * get SCSI errors when downloading data */
 
-#define CHECK(x) do {                           \
-        int __r;                                \
-        __r = (x);                                                      \
-        if (__r != PSLR_OK) {                                           \
-            fprintf(stderr, "%s:%d:%s failed: %d\n", __FILE__, __LINE__, #x, __r); \
-            return __r;                                                 \
-        }                                                               \
-    } while (0)
-
 void sleep_sec(double sec) {
     int i;
     for (i=0; i<floor(sec); ++i) {
@@ -378,9 +375,7 @@
     } else {
         driveNum = 1;
         drives = malloc( driveNum * sizeof(char*) );
-        drives0 = malloc( strlen( device )+1 );
-        strncpy( drives0, device, strlen( device ) );
-        drives0strlen(device)='\0';
+        drives0 = strdup( device );
     }
     DPRINT("driveNum:%d\n",driveNum);
     int i;
@@ -505,7 +500,7 @@
     } else if ( adjust > 7 ) {
         snprintf( ret, 4, "%c%d", positiveChar, adjust-7);
     } else {
-        ret = "";
+        strcpy(ret,"");
     }
     return ret;
 }
@@ -516,11 +511,23 @@
     if ( adjust_mg != 7 || adjust_ba != 7 ) {
         snprintf(ret, 8, "%s%s", get_white_balance_single_adjust_str(adjust_mg, 'M', 'G'),get_white_balance_single_adjust_str(adjust_ba, 'B', 'A'));
     } else {
-        ret = "0";
+        strcpy(ret,"0");
     }
     return ret;
 }
 
+static
+char *pslr_get_af_name(pslr_handle_t h, uint32_t af_point) {
+    ipslr_handle_t *p = (ipslr_handle_t *) h;
+    if (p->model->af_point_num==11) {
+        return get_pslr_af11_point_str(af_point);
+    } else {
+        char *raw = malloc(11);
+        sprintf(raw, "%d", af_point);
+        return raw;
+    }
+}
+
 char *collect_status_info( pslr_handle_t h, pslr_status status ) {
     char *strbuffer = malloc(8192);
     sprintf(strbuffer,"%-32s: %d\n", "current iso", status.current_iso);
@@ -555,8 +562,8 @@
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "ae metering mode", get_pslr_ae_metering_str(status.ae_metering_mode));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "af mode", get_pslr_af_mode_str(status.af_mode));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "af point select", get_pslr_af_point_sel_str(status.af_point_select));
-    sprintf(strbuffer+strlen(strbuffer),"%-32s: %d\n", "selected af point", status.selected_af_point);
-    sprintf(strbuffer+strlen(strbuffer),"%-32s: %d\n", "focused af point", status.focused_af_point);
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "selected af point", pslr_get_af_name( h, status.selected_af_point));
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "focused af point", pslr_get_af_name( h, status.focused_af_point));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "drive mode", get_pslr_drive_mode_str(status.drive_mode));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %s\n", "auto bracket mode", status.auto_bracket_mode > 0 ? "on" : "off");
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %d\n", "auto bracket picture count", status.auto_bracket_picture_count);
@@ -592,6 +599,7 @@
             sprintf(strbuffer,"Unknown");
             break;
         default:
+            free(strbuffer);
             return NULL;
     }
     return strbuffer;
@@ -607,17 +615,18 @@
 char *collect_settings_info( pslr_handle_t h, pslr_settings settings ) {
     char *strbuffer = malloc(8192);
     sprintf(strbuffer,"%-32s: %-8s%s\n", "one push bracketing", get_special_setting_info(settings.one_push_bracketing.pslr_setting_status) ?: settings.one_push_bracketing.value ? "on" : "off", get_hardwired_setting_bool_info(settings.one_push_bracketing));
-    sprintf(strbuffer+strlen(strbuffer),"%-32s: %s%s\n", "bulb mode", get_special_setting_info(settings.bulb_mode_press_press.pslr_setting_status) ?: settings.bulb_mode_press_press.value ? "press-press" : "press-hold", get_hardwired_setting_bool_info(settings.bulb_mode_press_press));
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "bulb mode", get_special_setting_info(settings.bulb_mode_press_press.pslr_setting_status) ?: settings.bulb_mode_press_press.value ? "press-press" : "press-hold", get_hardwired_setting_bool_info(settings.bulb_mode_press_press));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "bulb timer", get_special_setting_info(settings.bulb_timer.pslr_setting_status) ?: settings.bulb_timer.value ? "on" : "off", get_hardwired_setting_bool_info(settings.bulb_timer));
     char *bulb_timer_sec = malloc(32);
     sprintf(bulb_timer_sec, "%d s", settings.bulb_timer_sec.value);
-    sprintf(strbuffer+strlen(strbuffer),"%-32s: %s%s\n", "bulb timer sec", get_special_setting_info(settings.bulb_timer_sec.pslr_setting_status) ?: bulb_timer_sec, get_hardwired_setting_uint16_info(settings.bulb_timer_sec));
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "bulb timer sec", get_special_setting_info(settings.bulb_timer_sec.pslr_setting_status) ?: bulb_timer_sec, get_hardwired_setting_uint16_info(settings.bulb_timer_sec));
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "remote bulb mode", get_special_setting_info(settings.remote_bulb_mode_press_press.pslr_setting_status) ?: settings.remote_bulb_mode_press_press.value ? "press-press" : "press-hold", get_hardwired_setting_bool_info(settings.remote_bulb_mode_press_press));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "using aperture ring", get_special_setting_info(settings.using_aperture_ring.pslr_setting_status) ?: settings.using_aperture_ring.value ? "on" : "off", get_hardwired_setting_bool_info(settings.using_aperture_ring));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "shake reduction", get_special_setting_info(settings.shake_reduction.pslr_setting_status) ?: settings.shake_reduction.value ? "on" : "off", get_hardwired_setting_bool_info(settings.shake_reduction));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "astrotracer", get_special_setting_info(settings.astrotracer.pslr_setting_status) ?: settings.astrotracer.value ? "on" : "off", get_hardwired_setting_bool_info(settings.astrotracer));
     char *astrotracer_timer_sec = malloc(32);
     sprintf(astrotracer_timer_sec, "%d s", settings.astrotracer_timer_sec.value);
-    sprintf(strbuffer+strlen(strbuffer),"%-32s: %s%s\n", "astrotracer timer sec", get_special_setting_info(settings.astrotracer_timer_sec.pslr_setting_status) ?: astrotracer_timer_sec, get_hardwired_setting_uint16_info(settings.astrotracer_timer_sec));
+    sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "astrotracer timer sec", get_special_setting_info(settings.astrotracer_timer_sec.pslr_setting_status) ?: astrotracer_timer_sec, get_hardwired_setting_uint16_info(settings.astrotracer_timer_sec));
     sprintf(strbuffer+strlen(strbuffer),"%-32s: %-8s%s\n", "horizon correction", get_special_setting_info(settings.horizon_correction.pslr_setting_status) ?: settings.horizon_correction.value ? "on" : "off", get_hardwired_setting_bool_info(settings.horizon_correction));
     return strbuffer;
 }
@@ -657,9 +666,20 @@
         return PSLR_NO_MEMORY;
     }
 
-    uint32_t bytes = pslr_buffer_read(h, buf, size);
-
-    if ( bytes != size ) {
+    uint32_t bufpos = 0;
+    while (true) {
+        uint32_t nextread = size - bufpos > 65536 ? 65536 : size - bufpos;
+        if (nextread == 0) {
+            break;
+        }
+        uint32_t bytes = pslr_buffer_read(h, buf+bufpos, nextread);
+        if (bytes == 0) {
+            break;
+        }
+        bufpos += bytes;
+    }
+    if ( bufpos != size ) {
+        free(buf);
         return PSLR_READ_ERROR;
     }
     pslr_buffer_close(h);
@@ -875,7 +895,7 @@
 int pslr_set_image_format(pslr_handle_t h, pslr_image_format_t format) {
     DPRINT("C\tpslr_set_image_format(%X)\n", format);
     ipslr_handle_t *p = (ipslr_handle_t *) h;
-    if (format < 0 || format > PSLR_IMAGE_FORMAT_MAX) {
+    if (format >= PSLR_IMAGE_FORMAT_MAX) {
         return PSLR_PARAM;
     }
     return ipslr_handle_command_x18( p, true, X18_IMAGE_FORMAT, 2, 1, format, 0);
@@ -884,7 +904,7 @@
 int pslr_set_raw_format(pslr_handle_t h, pslr_raw_format_t format) {
     DPRINT("C\tpslr_set_raw_format(%X)\n", format);
     ipslr_handle_t *p = (ipslr_handle_t *) h;
-    if (format < 0 || format > PSLR_RAW_FORMAT_MAX) {
+    if (format >= PSLR_RAW_FORMAT_MAX) {
         return PSLR_PARAM;
     }
     return ipslr_handle_command_x18( p, true, X18_RAW_FORMAT, 2, 1, format, 0);
@@ -893,7 +913,7 @@
 int pslr_set_color_space(pslr_handle_t h, pslr_color_space_t color_space) {
     DPRINT("C\tpslr_set_raw_format(%X)\n", color_space);
     ipslr_handle_t *p = (ipslr_handle_t *) h;
-    if (color_space < 0 || color_space > PSLR_COLOR_SPACE_MAX) {
+    if (color_space >= PSLR_COLOR_SPACE_MAX) {
         return PSLR_PARAM;
     }
     return ipslr_handle_command_x18( p, true, X18_COLOR_SPACE, 1, color_space, 0, 0);
@@ -965,9 +985,14 @@
     DPRINT("C\tpslr_set_exposure_mode(%X)\n", mode);
     ipslr_handle_t *p = (ipslr_handle_t *) h;
 
-    if (mode < 0 || mode >= PSLR_EXPOSURE_MODE_MAX) {
+    if (mode >= PSLR_EXPOSURE_MODE_MAX) {
         return PSLR_PARAM;
     }
+
+    if ( p->model->need_exposure_mode_conversion ) {
+        mode = exposure_mode_conversion( mode );
+    }
+
     return ipslr_handle_command_x18( p, true, X18_EXPOSURE_MODE, 2, 1, mode, 0);
 }
 
@@ -1046,7 +1071,7 @@
 
 uint32_t pslr_buffer_read(pslr_handle_t h, uint8_t *buf, uint32_t size) {
     ipslr_handle_t *p = (ipslr_handle_t *) h;
-    int i;
+    uint32_t i;
     uint32_t pos = 0;
     uint32_t seg_offs;
     uint32_t addr;
@@ -1101,7 +1126,7 @@
 
 uint32_t pslr_buffer_get_size(pslr_handle_t h) {
     ipslr_handle_t *p = (ipslr_handle_t *) h;
-    int i;
+    uint32_t i;
     uint32_t len = 0;
     for (i = 0; i < p->segment_count; i++) {
         len += p->segmentsi.length;
@@ -1236,8 +1261,6 @@
     return 2 + get_hw_jpeg_quality( p->model, jpeg_stars );
 }
 
-/* ----------------------------------------------------------------------- */
-
 static int ipslr_set_mode(ipslr_handle_t *p, uint32_t mode) {
     DPRINT("C\t\tipslr_set_mode(0x%x)\n", mode);
     CHECK(ipslr_write_args(p, 1, mode));
@@ -1319,8 +1342,9 @@
             int ret;
 
             ret = pslr_get_buffer_status(p, &x, &y);
-            if (ret != PSLR_OK)
+            if (ret != PSLR_OK) {
                 return ret;
+            }
             status->bufmask = x;
         }
         return PSLR_OK;
@@ -1680,10 +1704,9 @@
     return PSLR_OK;
 }
 
-/* ----------------------------------------------------------------------- */
-
 static int command(FDTYPE fd, int a, int b, int c) {
-    DPRINT("C\t\t\tcommand(fd=%x, %x, %x, %x)\n", fd, a, b, c);
+    DPRINT("C\t\t\tcommand(fd=%" PRIFDTYPE ", %x, %x, %x)\n",
+	   fd, a, b, c);
     uint8_t cmd8 = {0xf0, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     cmd2 = a;
@@ -1710,7 +1733,7 @@
 }
 
 static int get_status(FDTYPE fd) {
-    DPRINT("C\t\t\tget_status(0x%x)\n", fd);
+    DPRINT("C\t\t\tget_status(%" PRIFDTYPE ")\n", fd);
 
     uint8_t statusbuf8;
     memset(statusbuf,0,8);
@@ -1730,7 +1753,7 @@
 }
 
 static int get_result(FDTYPE fd) {
-    DPRINT("C\t\t\tget_result(0x%x)\n", fd);
+    DPRINT("C\t\t\tget_result(%" PRIFDTYPE ")\n", fd);
     uint8_t statusbuf8;
     while (1) {
         //DPRINT("read out status\n");
@@ -1754,13 +1777,13 @@
 }
 
 static int read_result(FDTYPE fd, uint8_t *buf, uint32_t n) {
-    DPRINT("C\t\t\tread_result(0x%x, size=%d)\n", fd, n);
+    DPRINT("C\t\t\tread_result(%" PRIFDTYPE ", size=%d)\n", fd, n);
     uint8_t cmd8 = {0xf0, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     int r;
-    int i;
+    uint32_t i;
     set_uint32_le(n, &cmd4);
     r = scsi_read(fd, cmd, sizeof (cmd), buf, n);
-    if (r != n) {
+    if ((uint32_t)r != n) {
         return PSLR_READ_ERROR;
     }  else {
         //  Print first 32 bytes of the result.
@@ -1786,7 +1809,7 @@
 
 char *copyright() {
     char *ret = malloc(sizeof(char)*1024);
-    sprintf(ret, "Copyright (C) 2011-2018 Andras Salamon\n\
+    sprintf(ret, "Copyright (C) 2011-2019 Andras Salamon\n\
 \n\
 Based on:\n\
 pslr-shoot (C) 2009 Ramiro Barreiro\n\

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_enum.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_enum.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_enum.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_enum.h Changed

@@ -1,6 +1,6 @@
 /*
     pkTriggerCord
-    Copyright (C) 2011-2018 Andras Salamon <andras.salamon@melda.info>
+    Copyright (C) 2011-2019 Andras Salamon <andras.salamon@melda.info>
     Remote control of Pentax DSLR cameras.
 
     based on:
@@ -26,8 +26,11 @@
     and GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef PSLR_ENUM_H
-#define PSLR_ENUM_H
+
+#ifndef CAMLIBS_PENTAX_PSLR_ENUM_H
+#define CAMLIBS_PENTAX_PSLR_ENUM_H
+
+#include <stdint.h>
 
 typedef enum {
     PSLR_COLOR_SPACE_SRGB,
@@ -58,7 +61,7 @@
     PSLR_FLASH_MODE_TRAILING_CURTAIN = 4,
     PSLR_FLASH_MODE_AUTO = 5,
     PSLR_FLASH_MODE_AUTO_REDEYE = 6,
-    // 7 not used
+    /* 7 not used */
     PSLR_FLASH_MODE_WIRELESS = 8,
     PSLR_FLASH_MODE_MAX = 9
 } pslr_flash_mode_t;
@@ -78,11 +81,26 @@
     PSLR_AF_POINT_SEL_AUTO_5,
     PSLR_AF_POINT_SEL_SELECT,
     PSLR_AF_POINT_SEL_SPOT,
-    PSLR_AF_POINT_SEL_AUTO_11, // maybe not for all cameras
+    PSLR_AF_POINT_SEL_AUTO_11, /* maybe not for all cameras */
+    PSLR_AF_POINT_SEL_EXPANDED, /* only for newer */
     PSLR_AF_POINT_SEL_MAX
 } pslr_af_point_sel_t;
 
 typedef enum {
+    PSLR_AF11_POINT_TOP_LEFT  = 0x01,
+    PSLR_AF11_POINT_TOP_MID   = 0x2,
+    PSLR_AF11_POINT_TOP_RIGHT = 0x4,
+    PSLR_AF11_POINT_FAR_LEFT  = 0x8,
+    PSLR_AF11_POINT_MID_LEFT  = 0x10,
+    PSLR_AF11_POINT_MID_MID   = 0x20,
+    PSLR_AF11_POINT_MID_RIGHT = 0x40,
+    PSLR_AF11_POINT_FAR_RIGHT = 0x80,
+    PSLR_AF11_POINT_BOT_LEFT  = 0x100,
+    PSLR_AF11_POINT_BOT_MID   = 0x200,
+    PSLR_AF11_POINT_BOT_RIGHT = 0x400
+} pslr_af11_point_t;
+
+typedef enum {
     PSLR_JPEG_IMAGE_TONE_NONE = -1,
     PSLR_JPEG_IMAGE_TONE_NATURAL,
     PSLR_JPEG_IMAGE_TONE_BRIGHT,
@@ -202,13 +220,15 @@
 pslr_af_point_sel_t get_pslr_af_point_sel( char *str );
 const char *get_pslr_af_point_sel_str( pslr_af_point_sel_t value );
 
+char *get_pslr_af11_point_str( uint32_t value );
+
 pslr_jpeg_image_tone_t get_pslr_jpeg_image_tone( char *str );
 const char *get_pslr_jpeg_image_tone_str( pslr_jpeg_image_tone_t value );
 
 pslr_white_balance_mode_t get_pslr_white_balance_mode( char *str );
 const char *get_pslr_white_balance_mode_str( pslr_white_balance_mode_t value );
 
-//pslr_custom_ev_steps_t get_pslr_custom_ev_steps( char *str );
+/* pslr_custom_ev_steps_t get_pslr_custom_ev_steps( char *str ); */
 const char *get_pslr_custom_ev_steps_str( pslr_custom_ev_steps_t value );
 
 const char *get_pslr_custom_sensitivity_steps_str( pslr_custom_sensitivity_steps_t value );
@@ -219,4 +239,4 @@
 
 const char *get_pslr_scene_mode_str( pslr_scene_mode_t value );
 
-#endif
+#endif /* !defined(CAMLIBS_PENTAX_PSLR_ENUM_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_lens.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_lens.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_lens.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_lens.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_model.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_model.c Changed

@@ -1,6 +1,6 @@
 /*
     pkTriggerCord
-    Copyright (C) 2011-2018 Andras Salamon <andras.salamon@melda.info>
+    Copyright (C) 2011-2019 Andras Salamon <andras.salamon@melda.info>
     Remote control of Pentax DSLR cameras.
 
     Support for K200D added by Jens Dreyer <jens.dreyer@udo.edu> 04/2011
@@ -39,8 +39,12 @@
 #include <string.h>
 #include <stdbool.h>
 #include <fcntl.h>
+#ifndef RAD10
 #include <unistd.h>
+#endif
 #include "js0n.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "pslr_model.h"
 #include "pslr.h"
@@ -50,6 +54,16 @@
 static char *jsontext=NULL;
 static int jsonsize;
 
+static int dir_exists(char *dir) {
+    int res = 0;
+    struct stat info;
+
+    if ( (stat(dir, &info) == 0) && (info.st_mode & S_IFDIR) ) {
+        res = 1;
+    }
+    return res;
+}
+
 static void ipslr_status_diff(uint8_t *buf) {
     int n;
     int diffs;
@@ -73,7 +87,7 @@
 }
 
 static
-uint16_t get_uint16_be(uint8_t *buf) {
+uint16_t get_uint16_be(const uint8_t *buf) {
     uint16_t res;
     res = buf0 << 8 | buf1;
     return res;
@@ -93,7 +107,7 @@
 }
 
 static
-uint16_t get_uint16_le(uint8_t *buf) {
+uint16_t get_uint16_le(const uint8_t *buf) {
     uint16_t res;
     res = buf1 << 8 | buf0;
     return res;
@@ -422,8 +436,9 @@
     status->zoom.nom = get_uint32_be(&buf0x198);
     status->zoom.denom = get_uint32_be(&buf0x19C);
     status->focus = get_int32_be(&buf0x1A0);
-    status->lens_id1 = (get_uint32_be( &buf0x188)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x188) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x194);
+    // selected_af_point: cannot find the field, 0xc8 is always zero
 }
 
 // Vince: K-r support 2011-06-22
@@ -440,7 +455,7 @@
     status->zoom.nom = get_uint32_be(&buf0x19C);
     status->zoom.denom = get_uint32_be(&buf0x1A0);
     status->focus = get_int32_be(&buf0x1A4);
-    status->lens_id1 = (get_uint32_be( &buf0x18C)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x18C) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x198);
 }
 
@@ -456,7 +471,7 @@
     status->zoom.nom = get_uint32_be(&buf0x1A0);
     status->zoom.denom = get_uint32_be(&buf0x1A4);
     status->focus = get_int32_be(&buf0x1A8); // ?
-    status->lens_id1 = (get_uint32_be( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x19C);
 
 // TODO: check these fields
@@ -479,7 +494,7 @@
     status->zoom.nom = get_uint32_be(&buf0x1A0);
     status->zoom.denom = 100;
     status->focus = get_int32_be(&buf0x1A8); // ?
-    status->lens_id1 = (get_uint32_be( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x19C);
 }
 
@@ -500,7 +515,7 @@
     status->zoom.nom = get_uint32_be(&buf0x1A0); // - good for K01
     status->zoom.denom = 100; // good for K-01
     status->focus = get_int32_be(&buf0x1A8); // ? - good for K01
-    status->lens_id1 = (get_uint32_be( &buf0x190)) & 0x0F; // - good for K01
+    status->lens_id1 = get_uint32_be(&buf0x190) & 0x0F; // - good for K01
     status->lens_id2 = get_uint32_be( &buf0x19C); // - good for K01
 }
 
@@ -516,7 +531,7 @@
     status->zoom.nom = get_uint32_be(&buf0x1A0);
     status->zoom.denom = get_uint32_be(&buf0x1A4);
     //    status->focus = get_int32_be(&buf0x1A8); // ?
-    status->lens_id1 = (get_uint32_be( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x19C);
 }
 
@@ -532,7 +547,7 @@
     status->zoom.nom = get_uint32_be(&buf0x1A0);
     status->zoom.denom = get_uint32_be(&buf0x1A4);
     //    status->focus = get_int32_be(&buf0x1A8); // ?
-    status->lens_id1 = (get_uint32_be( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x19C);
     // cannot read max_shutter_speed from status buffer, hardwire the values here
     status->max_shutter_speed.nom = 1;
@@ -550,7 +565,7 @@
     ipslr_status_parse_common( p, status, -4);
     status->zoom.nom = get_uint32_be(&buf0x180);
     status->zoom.denom = get_uint32_be(&buf0x184);
-    status->lens_id1 = (get_uint32_be( &buf0x170)) & 0x0F;
+    status->lens_id1 = get_uint32_be(&buf0x170) & 0x0F;
     status->lens_id2 = get_uint32_be( &buf0x17c);
 // TODO
 // status.focused = getInt32(statusBuf, 0x164);
@@ -570,8 +585,11 @@
     status->zoom.nom = get_uint32_le(&buf0x1A0);
     status->zoom.denom = get_uint32_le(&buf0x1A4);
     status->focus = get_int32_le(&buf0x1A8);
-    status->lens_id1 = (get_uint32_le( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_le(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_le( &buf0x19C);
+    // cannot read max_shutter_speed from status buffer, hardwire the values here
+    status->max_shutter_speed.nom = 1;
+    status->max_shutter_speed.denom = 8000;
 }
 
 static
@@ -587,7 +605,7 @@
     status->zoom.nom = get_uint32_le(&buf0x1A0);
     status->zoom.denom = get_uint32_le(&buf0x1A4);
     status->focus = get_int32_le(&buf0x1A8);
-    status->lens_id1 = (get_uint32_le( &buf0x190)) & 0x0F;
+    status->lens_id1 = get_uint32_le(&buf0x190) & 0x0F;
     status->lens_id2 = get_uint32_le( &buf0x19C);
 }
 
@@ -621,14 +639,18 @@
     status->battery_1 = get_uint32_le(&buf0x174);
     status->battery_2 = get_uint32_le(&buf0x178);
 
-    // selected_af_point is invalid
-    status->selected_af_point = 0;
+    // selected_af_point
+    // toprow left: 0x04000000
+    // toprow leftmiddle: 0x02000000
+    // toprow middle: 0x01000000
+    // toprow rightmiddle: 0x00800000
+    // bottomright: 0x00000004
 
     status->bufmask = get_uint16_le( &buf0x0C);
     status->zoom.nom = get_uint32_le(&buf0x1A4);
     status->zoom.denom = get_uint32_le(&buf0x1A8);
 //    status->focus = get_int32_le(&buf0x1A8);
-    status->lens_id1 = (get_uint32_le( &buf0x194)) & 0x0F;
+    status->lens_id1 = get_uint32_le(&buf0x194) & 0x0F;
     status->lens_id2 = get_uint32_le( &buf0x1A0);
 }
 
@@ -660,19 +682,44 @@
     status->manual_mode_ev = get_uint32_le(&buf0x160); // ?
     status->focused_af_point = get_uint32_le(&buf0x16c); // ?
 
+    switch ( status->af_point_select) {
+        case 0:
+            status->af_point_select=PSLR_AF_POINT_SEL_SPOT;
+            break;
+        case 1:
+            status->af_point_select=PSLR_AF_POINT_SEL_SELECT;
+            break;
+        case 2:
+            status->af_point_select=PSLR_AF_POINT_SEL_EXPANDED;
+            break;
+        case 5:
+            status->af_point_select=PSLR_AF_POINT_SEL_AUTO_5;
+            break;
+        case 6:
+            status->af_point_select=PSLR_AF_POINT_SEL_AUTO_11;
+            break;
+    }
+
     status->battery_1 = get_uint32_le(&buf0x174);
     status->battery_2 = get_uint32_le(&buf0x178);
     status->battery_3 = 0;
     status->battery_4 = 0;
 
-    // selected_af_point is invalid
-    status->selected_af_point = 0;
+    uint32_t converted_selected_af_point=0;
+    int convert_bit_index11 = { 26, 24, 22, 1, 16, 14, 12, 0, 6, 4, 2};
+    int bitidx=0;
+    for (bitidx=0; bitidx<11; ++bitidx) {
+        if (status->selected_af_point & 1<<convert_bit_indexbitidx) {
+            converted_selected_af_point |= 1 << bitidx;
+        }
+    }
+    status->selected_af_point = converted_selected_af_point;
 
     status->bufmask = get_uint16_le( &buf0x0C);
     status->zoom.nom = get_uint32_le(&buf0x1A4);
     status->zoom.denom = get_uint32_le(&buf0x1A8);
 //    status->focus = get_int32_le(&buf0x1A8);
-    status->lens_id1 = (get_uint32_le( &buf0x194)) & 0x0F;
+    status->lens_id1 = get_uint32_le(&buf0x194) & 0x0F;
     status->lens_id2 = get_uint32_le( &buf0x1A0);
     status->shake_reduction = get_uint32_le(&buf0xe4);
 }
@@ -749,7 +796,9 @@
     int jsonfd = open("pentax_settings.json", O_RDONLY);
     if (jsonfd == -1) {
         // cannot find in the current directory, also checking PKTDATADIR
-        jsonfd = open(PKTDATADIR "/pentax_settings.json", O_RDONLY);
+        if (dir_exists(PKTDATADIR)) {
+            jsonfd = open(PKTDATADIR "/pentax_settings.json", O_RDONLY);
+        }
         if (jsonfd == -1) {
             fprintf(stderr, "Cannot open pentax_settings.json file\n");
             return NULL;
@@ -758,8 +807,13 @@
     *jsonsize = lseek(jsonfd, 0, SEEK_END);
     lseek(jsonfd, 0, SEEK_SET);
     char *jsontext=malloc(*jsonsize);
-    read(jsonfd, jsontext, *jsonsize);
-    DPRINT("json text:\n%s\n", jsontext);
+    ssize_t ret = read(jsonfd, jsontext, *jsonsize);
+    if (ret < *jsonsize) {
+        fprintf(stderr, "Could not read pentax_settings.json file\n");
+        free(jsontext);
+        return NULL;
+    }
+    DPRINT("json text:\n%.*s\n", *jsonsize, jsontext);
     return jsontext;
 }
 
@@ -772,12 +826,12 @@
     size_t json_part_length;
     const char *json_part;
     if (!(json_part = js0n(cameraid, strlen(cameraid), jsontext, jsonsize, &json_part_length))) {
-        fprintf(stderr, "JSON error\n");
+        fprintf(stderr, "JSON: Cannot find camera model\n");
         return NULL;
     }
 
     if (!(json_part = js0n("fields", strlen("fields"), json_part, json_part_length, &json_part_length))) {
-        fprintf(stderr, "No fields defined for the camera\n");
+        fprintf(stderr, "JSON: No fields defined for the camera model\n");
         return NULL;
     }
     int ai=0;
@@ -835,6 +889,45 @@
     return ret;
 }
 
+static
+pslr_bool_setting ipslr_settings_parse_bool(const uint8_t *buf, const pslr_setting_def_t *def) {
+    pslr_bool_setting bool_setting;
+    if (def->value != NULL) {
+        bool_setting = (pslr_bool_setting) {
+            PSLR_SETTING_STATUS_HARDWIRED, strcmp("false", def->value) == 0 ? false : true
+        };
+    } else if (def->address != 0) {
+        uint8_t target = strcmp(def->type, "boolean!") == 0 ? 0 : 1;
+        bool_setting = (pslr_bool_setting) {
+            PSLR_SETTING_STATUS_READ, bufdef->address == target
+        };
+    } else {
+        bool_setting = (pslr_bool_setting) {
+            PSLR_SETTING_STATUS_NA, false
+        };
+    }
+    return bool_setting;
+}
+
+static
+pslr_uint16_setting ipslr_settings_parse_uint16(const uint8_t *buf, const pslr_setting_def_t *def) {
+    pslr_uint16_setting uint16_setting;
+    if (def->value != NULL) {
+        uint16_setting = (pslr_uint16_setting) {
+            PSLR_SETTING_STATUS_HARDWIRED, atoi(def->value)
+        };
+    } else if (def->address != 0) {
+        uint16_setting = (pslr_uint16_setting) {
+            PSLR_SETTING_STATUS_READ, get_uint16_be(&bufdef->address)
+        };
+    } else {
+        uint16_setting = (pslr_uint16_setting) {
+            PSLR_SETTING_STATUS_NA, 0
+        };
+    }
+    return uint16_setting;
+}
+
 void ipslr_settings_parser_json(const char *cameraid, ipslr_handle_t *p, pslr_settings *settings) {
     uint8_t *buf = p->settings_buffer;
     memset(settings, 0, sizeof (*settings));
@@ -845,58 +938,35 @@
     while (def_index < def_num) {
         pslr_bool_setting bool_setting;
         pslr_uint16_setting uint16_setting;
-        if (strncmp(defsdef_index.type, "boolean", 7)==0) {
-            if (defsdef_index.value!=NULL) {
-                bool_setting = (pslr_bool_setting) {
-                    PSLR_SETTING_STATUS_HARDWIRED, strcmp("false", defsdef_index.value)==0 ? false : true
-                };
-            } else if (defsdef_index.address!=0) {
-                uint8_t target = strcmp(defsdef_index.type, "boolean!")==0 ? 0 : 1;
-                bool_setting = (pslr_bool_setting) {
-                    PSLR_SETTING_STATUS_READ, bufdefsdef_index.address == target
-                };
-            } else {
-                bool_setting = (pslr_bool_setting) {
-                    PSLR_SETTING_STATUS_HARDWIRED, false
-                };
-            }
-        } else if (strcmp(defsdef_index.type, "uint16")==0) {
-            if (defsdef_index.value!=NULL) {
-                uint16_setting = (pslr_uint16_setting) {
-                    PSLR_SETTING_STATUS_HARDWIRED, strcmp("false", defsdef_index.value)==0 ? false : true
-                };
-            } else if (defsdef_index.address!=0) {
-                uint16_setting = (pslr_uint16_setting) {
-                    PSLR_SETTING_STATUS_READ, get_uint16_be(&bufdefsdef_index.address)
-                };
-            } else {
-                uint16_setting = (pslr_uint16_setting) {
-                    PSLR_SETTING_STATUS_NA, 0
-                };
-            }
+        pslr_setting_def_t def = defsdef_index;
+        if (strncmp(def.type, "boolean", 7) == 0) {
+            bool_setting = ipslr_settings_parse_bool(buf, &def);
+        } else if (strcmp(def.type, "uint16") == 0) {
+            uint16_setting = ipslr_settings_parse_uint16(buf, &def);
         } else {
-            fprintf(stderr, "Invalid json type: %s\n", defsdef_index.type);
+            fprintf(stderr, "Invalid json type: %s\n", def.type);
         }
-        if (strcmp(defsdef_index.name, "bulb_mode_press_press")==0) {
+        if (strcmp(def.name, "bulb_mode_press_press") == 0) {
             settings->bulb_mode_press_press = bool_setting;
-        } else if (strcmp(defsdef_index.name, "one_push_bracketing")==0) {
+        } else if (strcmp(def.name, "remote_bulb_mode_press_press") == 0) {
+            settings->remote_bulb_mode_press_press = bool_setting;
+        } else if (strcmp(def.name, "one_push_bracketing") == 0) {
             settings->one_push_bracketing = bool_setting;
-        } else if (strcmp(defsdef_index.name, "bulb_timer")==0) {
+        } else if (strcmp(def.name, "bulb_timer") == 0) {
             settings->bulb_timer = bool_setting;
-        } else if (strcmp(defsdef_index.name, "bulb_timer_sec")==0) {
+        } else if (strcmp(def.name, "bulb_timer_sec") == 0) {
             settings->bulb_timer_sec = uint16_setting;
-        } else if (strcmp(defsdef_index.name, "using_aperture_ring")==0) {
+        } else if (strcmp(def.name, "using_aperture_ring") == 0) {
             settings->using_aperture_ring = bool_setting;
-        } else if (strcmp(defsdef_index.name, "shake_reduction")==0) {
+        } else if (strcmp(def.name, "shake_reduction") == 0) {
             settings->shake_reduction = bool_setting;
-        } else if (strcmp(defsdef_index.name, "astrotracer")==0) {
+        } else if (strcmp(def.name, "astrotracer") == 0) {
             settings->astrotracer = bool_setting;
-        } else if (strcmp(defsdef_index.name, "astrotracer_timer_sec")==0) {
+        } else if (strcmp(def.name, "astrotracer_timer_sec") == 0) {
             settings->astrotracer_timer_sec = uint16_setting;
-        } else if (strcmp(defsdef_index.name, "horizon_correction")==0) {
+        } else if (strcmp(def.name, "horizon_correction") == 0) {
             settings->horizon_correction = bool_setting;
         }
-
         ++def_index;
     }
 }
@@ -924,7 +994,7 @@
     { 0x1309c, "K-3II",       false, false, true,  true,  false, true,  452,  4, {24, 14, 6, 2}, 9, 8000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_BLEACH_BYPASS,    true,  27, ipslr_status_parse_k3},
     { 0x12fca, "K-500",       false, true,  true,  false, false, false, 452,  3, {16, 12, 8, 5}, 9, 6000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_CROSS_PROCESSING, true,  11, ipslr_status_parse_k500},
     // only limited support from here
-    { 0x12994, "*ist D",      true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 3, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_NONE  , false, 11, NULL}, // buffersize: 264
+    { 0x12994, "*ist D",      true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 3, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_NONE,   false, 11, NULL},   // buffersize: 264
     { 0x12b60, "*ist DS2",    true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL},
     { 0x12b1a, "*ist DL",     true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL},
     { 0x12b80, "GX-1L",       true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL},
@@ -933,13 +1003,15 @@
     { 0x12ba2, "K100D Super", true,  true,  true,  false, false, false, 0,   3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL},
     { 0x1301a, "K-S1",        false, true,  true,  false, false, true,  452,  3, {20, 12, 6, 2}, 9, 6000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_CROSS_PROCESSING, true,  11, ipslr_status_parse_ks1},
     { 0x13024, "K-S2",        false, true,  true,  false, false, true,  452,  3, {20, 12, 6, 2}, 9, 6000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_CROSS_PROCESSING, true,  11, ipslr_status_parse_k3},
-    { 0x13092, "K-1",         false, false, true,  false, false, true,  456,  3, {36, 22, 12, 2}, 9, 8000, 100, 204800, 100, 204800, PSLR_JPEG_IMAGE_TONE_FLAT, true,  33, ipslr_status_parse_k1 },
-    { 0x13222, "K-70",        false, false, true,  true,  true,  true,  456,  3, {24, 14, 6, 2}, 9, 6000, 100, 102400, 100, 102400, PSLR_JPEG_IMAGE_TONE_AUTO, true,  11, ipslr_status_parse_k70}
-
+    { 0x13092, "K-1",         false, false, true,  true,  false, true,  456,  3, {36, 22, 12, 2}, 9, 8000, 100, 204800, 100, 204800, PSLR_JPEG_IMAGE_TONE_FLAT, true,  33, ipslr_status_parse_k1 },
+    { 0x13240, "K-1 II",      false, false, true,  true,  false, true,  456,  3, {36, 22, 12, 2}, 9, 8000, 100, 819200, 100, 819200, PSLR_JPEG_IMAGE_TONE_FLAT, true,  33, ipslr_status_parse_k1 },
+    { 0x13222, "K-70",        false, false, true,  true,  true,  true,  456,  3, {24, 14, 6, 2}, 9, 6000, 100, 102400, 100, 102400, PSLR_JPEG_IMAGE_TONE_AUTO, true,  11, ipslr_status_parse_k70},
+    { 0x1322c, "KP",          false, false, true,  true,  false, true,  456,   3, {24, 14, 6, 2}, 9, 6000, 100, 819200, 100, 819200, PSLR_JPEG_IMAGE_TONE_AUTO, true,  27, ipslr_status_parse_k70},
+    { 0x13010, "645Z",        false, false, true,  true,  false, false,  0,   3, {51, 32, 21, 3}, 9, 4000, 100, 204800, 100, 204800, PSLR_JPEG_IMAGE_TONE_CROSS_PROCESSING, true,  35, NULL}
 };
 
 ipslr_model_info_t *find_model_by_id( uint32_t id ) {
-    int i;
+    unsigned int i;
     for ( i = 0; i<sizeof (camera_models) / sizeof (camera_models0); i++) {
         if ( camera_modelsi.id == id ) {
             //    DPRINT("found %d\n",i);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_model.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_model.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/pentax/pslr_scsi.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/pentax/pslr_scsi.h Changed

@@ -1,6 +1,6 @@
 /*
     pkTriggerCord
-    Copyright (C) 2011-2018 Andras Salamon <andras.salamon@melda.info>
+    Copyright (C) 2011-2019 Andras Salamon <andras.salamon@melda.info>
     Remote control of Pentax DSLR cameras.
 
     based on:
@@ -24,8 +24,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PSLR_SCSI_H
-#define PSLR_SCSI_H
+#ifndef CAMLIBS_PENTAX_PSLR_SCSI_H
+#define CAMLIBS_PENTAX_PSLR_SCSI_H
 
 #include <stdint.h>
 #include <string.h>
@@ -47,6 +47,15 @@
 #endif
 #endif
 
+#define CHECK(x) do {							\
+	int __r;							\
+	__r = (x);							\
+	if (__r != PSLR_OK) {						\
+		fprintf(stderr, "%s:%d:%s failed: %d\n", __FILE__, __LINE__, #x, __r); \
+		return __r;						\
+	}								\
+} while (0)
+
 typedef enum {
     PSLR_OK = 0,
     PSLR_DEVICE_ERROR,
@@ -61,9 +70,11 @@
 /* This also could be used to specify FDTYPE HANDLE for Win32, but this seems tricky with includes */
 #ifdef LIBGPHOTO2
 #define FDTYPE GPPort*
+#define PRIFDTYPE "p"
 #else
 /* classic UNIX style handle */
 #define FDTYPE int
+#define PRIFDTYPE "d"
 #endif
 
 int scsi_read(FDTYPE sg_fd, uint8_t *cmd, uint32_t cmdLen,
@@ -72,11 +83,12 @@
 int scsi_write(FDTYPE sg_fd, uint8_t *cmd, uint32_t cmdLen,
                uint8_t *buf, uint32_t bufLen);
 
-char **get_drives(int *driveNum);
+char **get_drives(int *drive_num);
 
-pslr_result get_drive_info(char* driveName, FDTYPE* hDevice,
-                           char* vendorId, int vendorIdSizeMax,
-                           char* productId, int productIdSizeMax);
+pslr_result get_drive_info(char* drive_name, FDTYPE* device,
+                           char* vendor_id, int vendor_id_size_max,
+                           char* product_id, int product_id_size_max);
 
-void close_drive(FDTYPE *hDevice);
-#endif
+void close_drive(FDTYPE *device);
+
+#endif /* !defined(CAMLIBS_PENTAX_PSLR_SCSI_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/ChangeLog Changed

@@ -88,7 +88,7 @@
 
 	* pdc700.c: Do not cast bween time_t* and int*.
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
@@ -96,7 +96,7 @@
 
 	* pdc640.c: Added Jenoptik JD350v(ideo) USB support.
 
-2002-03-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Andrea Suatoni <a.suatoni@itaca.it>:
 
@@ -113,16 +113,16 @@
 	  camera's month datum is one-based but tm.tm_mon is
 	  zero-based.
 
-2002-01-15  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-15  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* pdc700.c: Introduced a bug in last fix...
 
-2002-01-15  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-15  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc700.c: When status is PDC_STATUS_FAIL, the camera will only 
 	  send the checksum, nothing else.
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc700.c: Remove references to gp_camera_set_error.
 
@@ -130,20 +130,20 @@
 
 	* jd350e.c: Added definitions of MIN and MAX
 
-2001-12-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc640.c: Includes again :-)
 
-2001-12-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc320.h
 	* pdc640.c: Still fixing includes
 
-2001-12-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc640.c: Fix includes.
 
-2001-11-28  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-28  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* pdc700.c: Rename PDC700_FIRST into PDC700_FAIL. Try to implement
 	  some error recovery strategy.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/Makefile-files Changed

@@ -1,31 +1,49 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += polaroid/jpeg.txt polaroid/jpeghead.h \
-	polaroid/pdc320.html polaroid/gt98x.html polaroid/ChangeLog
+EXTRA_DIST                      += %reldir%/ChangeLog
+EXTRA_DIST                      += %reldir%/gt98x.html
+EXTRA_DIST                      += %reldir%/jpeg.txt
+EXTRA_DIST                      += %reldir%/jpeghead.h
+EXTRA_DIST                      += %reldir%/pdc320.html
 
 
-EXTRA_LTLIBRARIES += polaroid_pdc320.la
+EXTRA_LTLIBRARIES               += polaroid_pdc320.la
 
-polaroid_pdc320_la_SOURCES = polaroid/pdc320.c polaroid/pdc320.h
-polaroid_pdc320_la_LDFLAGS = $(camlib_ldflags)
-polaroid_pdc320_la_DEPENDENCIES = $(camlib_dependencies)
-polaroid_pdc320_la_LIBADD = $(camlib_libadd)
+polaroid_pdc320_la_SOURCES       =
+polaroid_pdc320_la_SOURCES      += %reldir%/pdc320.c
+polaroid_pdc320_la_SOURCES      += %reldir%/pdc320.h
 
+polaroid_pdc320_la_CFLAGS        = $(camlib_cflags)
+polaroid_pdc320_la_CPPFLAGS      = $(camlib_cppflags)
+polaroid_pdc320_la_DEPENDENCIES  = $(camlib_dependencies)
+polaroid_pdc320_la_LDFLAGS       = $(camlib_ldflags)
+polaroid_pdc320_la_LIBADD        = $(camlib_libadd)
 
-EXTRA_LTLIBRARIES += polaroid_pdc640.la
 
-polaroid_pdc640_la_SOURCES = polaroid/pdc640.c \
-	polaroid/jd350e.h polaroid/jd350e.c \
-	polaroid/jd350e_red.h polaroid/jd350e_blue.h \
-	polaroid/dlink350f.c polaroid/dlink350f.h
-polaroid_pdc640_la_LDFLAGS = $(camlib_ldflags)
-polaroid_pdc640_la_DEPENDENCIES = $(camlib_dependencies)
-polaroid_pdc640_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES               += polaroid_pdc640.la
 
+polaroid_pdc640_la_SOURCES       =
+polaroid_pdc640_la_SOURCES      += %reldir%/pdc640.c
+polaroid_pdc640_la_SOURCES      += %reldir%/jd350e.h
+polaroid_pdc640_la_SOURCES      += %reldir%/jd350e.c
+polaroid_pdc640_la_SOURCES      += %reldir%/jd350e_red.h
+polaroid_pdc640_la_SOURCES      += %reldir%/jd350e_blue.h
+polaroid_pdc640_la_SOURCES      += %reldir%/dlink350f.c
+polaroid_pdc640_la_SOURCES      += %reldir%/dlink350f.h
 
-EXTRA_LTLIBRARIES += polaroid_pdc700.la
+polaroid_pdc640_la_CFLAGS        = $(camlib_cflags)
+polaroid_pdc640_la_CPPFLAGS      = $(camlib_cppflags)
+polaroid_pdc640_la_DEPENDENCIES  = $(camlib_dependencies)
+polaroid_pdc640_la_LDFLAGS       = $(camlib_ldflags)
+polaroid_pdc640_la_LIBADD        = $(camlib_libadd)
 
-polaroid_pdc700_la_SOURCES = polaroid/pdc700.c
-polaroid_pdc700_la_LDFLAGS = $(camlib_ldflags)
-polaroid_pdc700_la_DEPENDENCIES = $(camlib_dependencies)
-polaroid_pdc700_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES               += polaroid_pdc700.la
+
+polaroid_pdc700_la_SOURCES       = %reldir%/pdc700.c
+
+polaroid_pdc700_la_CFLAGS        = $(camlib_cflags)
+polaroid_pdc700_la_CPPFLAGS      = $(camlib_cppflags)
+polaroid_pdc700_la_DEPENDENCIES  = $(camlib_dependencies)
+polaroid_pdc700_la_LDFLAGS       = $(camlib_ldflags)
+polaroid_pdc700_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/dlink350f.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/dlink350f.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/dlink350f.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/dlink350f.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/jd350e.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/jd350e.c Changed

@@ -1,6 +1,6 @@
 /* jd350e.c
  *
- * White balancing and brightness correction for the Jenoptik 
+ * White balancing and brightness correction for the Jenoptik
  * JD350 entrance camera
  *
  * Copyright 2001 Michael Trawny <trawny99@users.sourceforge.net>
@@ -10,10 +10,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -55,8 +55,8 @@
 int jd350e_postprocessing(int width, int height, unsigned char* rgb){
 	int
 		x,y,
-		red_min=255, red_max=0, 
-		blue_min=255, blue_max=0, 
+		red_min=255, red_max=0,
+		blue_min=255, blue_max=0,
 		green_min=255, green_max=0;
 	double
 		min, max, amplify;
@@ -157,7 +157,7 @@
 	double		amplify;
 	unsigned char	*buf;
 	const int	brightness_adjust = 16;
-	
+
 	/* flip horizontal */
 #define RED(p,x,y,w) *((p)+3*((y)*(w)+(x))  )
 #define GREEN(p,x,y,w) *((p)+3*((y)*(w)+(x))+1)
@@ -172,7 +172,7 @@
 			SWAP( BLUE(rgb,x,y,width), BLUE(rgb,width-x-1,y,width));
 		}
 	}
-	
+
 	/* flip vertical */
 	buf = malloc(width*3);
 	if (!buf) return GP_ERROR_NO_MEMORY;
@@ -182,7 +182,7 @@
 		memcpy(rgb+(height-i-1)*width*3,buf,width*3);
 	}
 	free(buf);
-	
+
 	/* Normalize & adjust brightness ... */
 #define MINMAX(a,min,max) { (min)=MIN(min,a); (max)=MAX(max,a); }
 
@@ -201,7 +201,7 @@
 	for(i=0; i<(width*height*3); i++)
 	{
 		int val = amplify * (rgbi - min);
-		
+
 		if(val < brightness_adjust)
 		   rgbi = val * 2;
 		else if (val > (255 - brightness_adjust))
@@ -209,6 +209,6 @@
 		else
 		   rgbi = val + brightness_adjust;
 	}
-	
+
 	return GP_OK;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/jd350e.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/jd350e.h Changed

@@ -1,6 +1,6 @@
 /* jd350e.h
  *
- * White balancing and brightness correction for the Jenoptik 
+ * White balancing and brightness correction for the Jenoptik
  * JD350 entrance camera
  *
  * Copyright 2001 Michael Trawny <trawny99@users.sourceforge.net>
@@ -10,10 +10,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -21,9 +21,11 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __JD350E_H__
-#define __JD350E_H__
+#ifndef CAMLIBS_POLAROID_JD350E_H
+#define CAMLIBS_POLAROID_JD350E_H
+
 int jd350e_postprocessing(int width, int height, unsigned char* rgb);
 int jd350e_postprocessing_and_flip(int width, int height, unsigned char* rgb);
 int trust350fs_postprocessing(int width, int height, unsigned char* rgb);
-#endif
+
+#endif /* !defined(CAMLIBS_POLAROID_JD350E_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/jd350e_blue.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/jd350e_blue.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/jd350e_red.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/jd350e_red.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/jpeghead.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/jpeghead.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/pdc320.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/pdc320.c Changed

@@ -29,7 +29,7 @@
  *	http://www.polaroid.com/service/software/index.html
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -40,26 +40,10 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "pdc320.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE "pdc320"
 
@@ -138,7 +122,7 @@
 
 	while (checksum > 0xffff) {
 		checksum =
-			(checksum & 0xffff) + 
+			(checksum & 0xffff) +
 			((checksum >> 16) & 0xffff);
 	}
 	return 0xffff-checksum; /* neg checksum actually */
@@ -215,7 +199,7 @@
 	int i;
 
 	GP_DEBUG ("*** PDC320_INIT ***");
-	
+
 	/* The initial command is prefixed by 4 raw E6. */
 	memset(e6,0xe6,sizeof(e6));
 	CR (gp_port_write (port, (char *)e6, sizeof (e6) ));
@@ -278,7 +262,7 @@
 	int size, i;
 	unsigned char buf3, *xbuf;
 	unsigned char cmd2;
-	
+
 	cmd0 = 0x0c;
 	cmd1 = n;		/* n is from 1 on up */
 
@@ -346,7 +330,7 @@
 		/* Read the actual data */
 		usleep(1000);
 		CR_FREE (gp_port_read (camera->port, (char *)*data + i, len), *data);
-		
+
 		/* Read the checksum */
 		CR_FREE (gp_port_read (camera->port, (char *)buf, 2), *data);
 	}
@@ -363,7 +347,7 @@
 }
 
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	int i;
 	CameraAbilities a;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/pdc320.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/pdc320.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/pdc640.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/pdc640.c Changed

@@ -26,11 +26,14 @@
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
-#include <bayer.h>
+
+#include <libgphoto2/bayer.h>
+#include "libgphoto2/i18n.h"
 
 #include "jd350e.h"
 #include "dlink350f.h"
 
+
 #define GP_MODULE "pdc640"
 
 #define PDC640_PING  "\x01"
@@ -40,26 +43,6 @@
 
 #define CHECK_RESULT(result) {int __r = (result); if (__r < 0) return (__r);}
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
-
 typedef enum{
 	pdc640,
 	jd350e,
@@ -204,7 +187,13 @@
 			"dlink%04i.ppm"
 		}
 	},
-	{NULL,}
+	{NULL, 0, 0, {
+			0,
+			0,
+			NULL,
+			NULL
+		}
+	}
 };
 
 static int
@@ -511,7 +500,7 @@
 	int y;
 
 	/* Sanity checks */
-	if ((data == NULL) || (size < width * height))
+	if ((data == NULL) || (size  / width < height))
 		return (GP_ERROR_CORRUPTED_DATA);
 
 	/* Allocate a new buffer */
@@ -568,6 +557,7 @@
 
 	GP_DEBUG ("pdc640_deltacode ()");
 
+	if (width < 2) return GP_ERROR_CORRUPTED_DATA; /* invalid, we implicitly assume it to be 2 or higher in the decoder */
 	/* Create a buffer to store RGB data in */
 	size = width * height;
 	data = malloc (size * sizeof (char));
@@ -697,7 +687,7 @@
 	CHECK_RESULT (pdc640_transmit_pic (camera->port, cmd, width, thumbnail,
 					*data, *size));
 
-	if (thumbnail || (compression_type == 0 )) {
+	if (thumbnail || ((compression_type & 3) == 0 )) {
 		/* Process uncompressed data */
 		CHECK_RESULT (pdc640_processtn (width, height,
 						data, *size));

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/polaroid/pdc700.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/polaroid/pdc700.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -30,24 +30,8 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #define GP_MODULE "pdc700"
 
@@ -191,7 +175,7 @@
 static int
 calc_checksum (unsigned char *cmd, unsigned int len)
 {
-	int i;
+	unsigned int i;
 	unsigned char checksum;
 
 	for (checksum = 0, i = 0; i < len; i++)
@@ -233,6 +217,10 @@
 		return (GP_ERROR_CORRUPTED_DATA);
 	}
 	*b_len = (header2 << 8) | header 1;
+	if (*b_len > 2048) {
+		GP_DEBUG ("length %d too large", *b_len);
+		return GP_ERROR_CORRUPTED_DATA;
+	}
 
 	/* Read the remaining bytes */
 	CR (gp_port_read (camera->port, (char *)b, *b_len));
@@ -449,7 +437,7 @@
 	/* We don't know about the meaning of buf0-1 */
 
 	/* Check if this information is about the right picture */
-	if (n != (buf2 | (buf3 << 8))) {
+	if (n != (unsigned int)(buf2 | (buf3 << 8))) {
 		gp_context_error (context, _("Requested information about "
 			"picture %i (= 0x%x), but got information about "
 			"picture %i back"), n, cmd4 | (cmd5 << 8),

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ChangeLog Changed

@@ -116,7 +116,7 @@
 2009-07-10  Marcus Meissner  <marcus@jet.franken.de>
 
 	* ptp.c,ptp.h: Generic PTP wrapper function (no data, no output)
-	  to avoid coding all generic functions as seperate functions.
+	  to avoid coding all generic functions as separate functions.
 	  Converted all convertable functions to macros.
 
 2009-07-09  Axel Waggershauser  <awagger@web.de>
@@ -305,7 +305,7 @@
 	* library.c: Added Nikon Coolpix L16 , Nikon D700.
 
 	* ptp-unpack.c: Fixed a property handling issue
-	  with empty/non existant strings in the unpacker,
+	  with empty/non existent strings in the unpacker,
 	  triggered by the D700.
 
 	* README.ptp2: Added link to now official MTP 1.0 spec.
@@ -1091,7 +1091,7 @@
 
 2006-04-27  Marcus Meissner  <marcus@jet.franken.de>
 
-	* ptp.c: The iRiver devices occasionaly send a byte more than
+	* ptp.c: The iRiver devices occasionally send a byte more than
 	  we requested which could lead to memory corruption due to 
 	  logic that did not expect that.
 
@@ -1186,7 +1186,7 @@
 2006-02-05  Marcus Meissner  <marcus@jet.franken.de>
 
 	* library.c: Use event_check and event_wait
-	  functions from params struct. Initialise those
+	  functions from params struct. Initialize those
 	  entries.
 
 2006-01-31  Marcus Meissner  <marcus@jet.franken.de>
@@ -1760,7 +1760,7 @@
 2004-05-29 Mariusz Woloszyn
 
 	* library.c: Fixed a small problem that caused objects of undefined
-	type not beeing downloadable. Now they are downloadable if the Thumb
+	type not being downloadable. Now they are downloadable if the Thumb
 	type is known.
 
 2004-05-24  Marcus Meissner  <marcus@jet.franken.de>
@@ -2129,14 +2129,14 @@
 	* Makefile.am: changed driver name to ptp2
 
 2003-01-03 Mariusz Woloszyn
-	* Commited version 2 of libptp2 and ptp driver.
+	* Committed version 2 of libptp2 and ptp driver.
 	  This code is unfinished yet, but it's meant to be transport layer
 	  independent. It fixes a lot of other bugs also.
 
 2002-10-16 Stephen H. Westin
 	* library.c: Nikon D100 has a PTP mode
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
@@ -2179,7 +2179,7 @@
 	  prototype
 	  (all changes according to TODO, multi storage support)
 
-2002-01-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: No time for previews...
 
@@ -2188,7 +2188,7 @@
 	* ptp.c:  Fixed ptp_ek_sendfileobjectinfo to use packed structures
 	* library.: started implementation of upload file (for Kodak only!)
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* library.c: Remove references to gp_camera_set_error.
 
@@ -2235,7 +2235,7 @@
 2001-12-13 Mariusz Woloszyn
 	* added implementation of Object Format, fixing get_info_func
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* library.c: Add some debugging stuff.
 
@@ -2243,10 +2243,10 @@
 
 	* library.c: Updatet vendor & product numbers for Kodak DX-3900.
 
-2001-12-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* library.c: Fix warning
 
-2001-12-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* library.c: Fixed vendor/product if of HP PhotoSmart 318.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/Makefile-files Changed

@@ -1,20 +1,53 @@
-# -*- Makefile -*-
-
-EXTRA_DIST += ptp2/ptp-pack.c ptp2/PTPIP.TXT ptp2/README.ptp2 \
-	ptp2/TODO ptp2/ChangeLog ptp2/ptpip.html ptp2/TESTPLAN.ptp2
-camlibdoc_DATA += ptp2/README.ptp2
-
-EXTRA_LTLIBRARIES += ptp2.la
-
-ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS)
-ptp2_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) -Wshadow
-ptp2_la_SOURCES = \
-	ptp2/ptp.c ptp2/ptp.h ptp2/chdk_ptp.h ptp2/chdk_live_view.h \
-	ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \
-	ptp2/ptp-private.h ptp2/ptpip.c ptp2/config.c \
-	ptp2/music-players.h ptp2/device-flags.h \
-	ptp2/olympus-wrap.c ptp2/olympus-wrap.h \
-	ptp2/chdk.c
-ptp2_la_LDFLAGS = $(camlib_ldflags)
-ptp2_la_DEPENDENCIES = $(camlib_dependencies)
-ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) @LIBJPEG@
+# -*- Makefile-automake -*-
+
+EXTRA_DIST           += %reldir%/ChangeLog
+EXTRA_DIST           += %reldir%/PTPIP.TXT
+EXTRA_DIST           += %reldir%/TESTPLAN.ptp2
+EXTRA_DIST           += %reldir%/TODO
+EXTRA_DIST           += %reldir%/canon-eos-olc.txt
+EXTRA_DIST           += %reldir%/ptp-pack.c
+EXTRA_DIST           += %reldir%/ptpip.html
+
+EXTRA_DIST           += %reldir%/README.ptp2
+camlibdoc_DATA       += %reldir%/README.ptp2
+
+
+EXTRA_LTLIBRARIES    += ptp2.la
+
+ptp2_la_SOURCES       =
+ptp2_la_SOURCES      += %reldir%/ptp.c
+ptp2_la_SOURCES      += %reldir%/ptp.h
+ptp2_la_SOURCES      += %reldir%/chdk_ptp.h
+ptp2_la_SOURCES      += %reldir%/chdk_live_view.h
+ptp2_la_SOURCES      += %reldir%/library.c
+ptp2_la_SOURCES      += %reldir%/usb.c
+ptp2_la_SOURCES      += %reldir%/ptp-bugs.h
+ptp2_la_SOURCES      += %reldir%/ptp-private.h
+ptp2_la_SOURCES      += %reldir%/ptpip.c
+ptp2_la_SOURCES      += %reldir%/config.c
+ptp2_la_SOURCES      += %reldir%/music-players.h
+ptp2_la_SOURCES      += %reldir%/device-flags.h
+ptp2_la_SOURCES      += %reldir%/olympus-wrap.c
+ptp2_la_SOURCES      += %reldir%/olympus-wrap.h
+ptp2_la_SOURCES      += %reldir%/chdk.c
+ptp2_la_SOURCES      += %reldir%/fujiptpip.c
+ptp2_la_SOURCES      += %reldir%/ptpip-private.h
+
+ptp2_la_CFLAGS        = $(camlib_cflags)
+ptp2_la_CPPFLAGS      = $(camlib_cppflags)
+ptp2_la_DEPENDENCIES  = $(camlib_dependencies)
+ptp2_la_LDFLAGS       = $(camlib_ldflags)
+ptp2_la_LIBADD        = $(camlib_libadd)
+
+ptp2_la_CFLAGS       += -Wshadow
+
+ptp2_la_LIBADD       += $(LTLIBICONV)
+
+ptp2_la_CPPFLAGS     += $(LIBXML2_CFLAGS)
+ptp2_la_LIBADD       += $(LIBXML2_LIBS)
+
+ptp2_la_CPPFLAGS     += $(LIBJPEG_CFLAGS)
+ptp2_la_LIBADD       += $(LIBJPEG_LIBS)
+
+ptp2_la_CPPFLAGS     += $(LIBWS232_CFLAGS)
+ptp2_la_LIBADD       += $(LIBWS232_LIBS)

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/canon-eos-olc.txt Added

@@ -0,0 +1,78 @@
+Canon EOS / PowerShot OLC info. (Unclear what OLC means).
+
+The OLC info is a 1 binary block of data. Only the updates
+we want are sent, this is specified by a mask set via
+EOS_SetRequestOLCInfoGroup().
+
+Only 0x1fff are valid bits, setting 0x2000 or higher bits can crash
+the camera.
+
+Following bits are identified:
+
+0x1 - Button info, 2 bytes. Likely a 16 bit button number.
+
+0x2 - shutterspeed, 6 or 7 bytes. Shutterspeed seems to be
+      at offset 0x5, usual encoding same as the regular shutterspeed property.
+
+0x4 - Aperture, 5, 6 or 9 bytes.
+	for the 9 byte variant, it seems to be at offset 0x7.
+	for the 5,6 byte variants at offset 0x4.
+	Aperture is the same 1 byte encoded as with the regular aperture property.
+
+0x8 - ISO, 4 or 6 bytes.
+	seems to be at offset 0x3.
+
+0x10 - unknown, 4 byte
+
+0x20 - unknown, 6 bytes, perhaps self timer record?
+
+0x40 - exposure indicator, 7 or 8 byte.
+	
+
+0x80 - unknown, 4 byte
+
+0x100 - unknown, 6 or 7 byte, focus related? "focus info"
+
+0x200 - unknown, 7 bytes, focus mask?
+
+0x400 - unknown, 7 bytes
+
+0x800 - unknown, 8 bytes, could be mask of focus points selected
+
+0x1000 - has shuttercount on EOS 5ds, but 1 byte 0x00 on others.
+
+
+Recorded values:
+
+EOS 100D (Jim E, Marcus M):
+	type 7 0x07
+	0x1	- 2	01 00
+	0x2	- 6	00 00 00 00 00 00
+	0x4	- 5	00 00 55 30 00
+	0x8	- 4	01 01 00 00
+	0x10	- 4	04 01 00 49
+	0x20	- 6	00 00 00 00 00 00
+	0x40	- 7	00 00 00 00 00 00 00
+	0x80	- 4	00 00 00 00
+	0x100	- 6	00 00 00 00 00 00
+	0x200	- 5	00 00 00 00 00
+	0x400	- 5	00 00 00 00 00
+	0x800	- 8	00 00 00 00 00 00 00 00
+	0x1000	- 1	00
+
+
+EOS M6 Mark II (Marcus M):
+	type 18	0x12
+	0x1	- 2	01 00
+	0x2	- 7	00 00 00 00 00 00
+	0x4	- 9	00 00 00 50 00 25 00 00 00
+	0x8	- 6	01 01 00 00 68 28
+	0x10	- 4	04 01 00 e4
+	0x20	- 6	00 00 00 00 00 00
+	0x40	- 8	00 00 00 00 00 00 00 00
+	0x80	- 5	00 00 00 00 00
+	0x100	- 7	00 00 00 00 00 00 00
+	0x200	- 5	00 00 00 00 00
+	0x400	- 5	00 00 00 00 00
+	0x800	- 9	00 00 00 00 00 00 00 00 00
+	0x1000	- 8	00 00 00 00 00 00 00 00

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/chdk.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/chdk.c Changed

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <time.h>
+#include <unistd.h>
 
 #ifdef HAVE_LIBJPEG
 #  include <jpeglib.h>
@@ -35,24 +36,7 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-setting.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "ptp.h"
 #include "ptp-bugs.h"
@@ -63,8 +47,8 @@
 
 /* Include the rlibs.lua lua libs or try do it on our own? */
 
-/* capture: 
- * send LUA: 
+/* capture:
+ * send LUA:
  * init_usb_capture(0); is exiting capture
 
  * init_usb_capture(1,0,0)  1 = jpeg, 2 = raw, 4 = switch raw to dng
@@ -76,7 +60,7 @@
  * return ff_download(srcpaths,ropts)
  *
  * return ff_mdelete(paths)
- * 
+ *
  * return os.stat(path)
  * return os.utime(path)
  * return os.mkdir(path)
@@ -135,7 +119,7 @@
 					if (*table) {
 						*table = realloc(*table,strlen(*table)+strlen(msg->data)+1);
 						strcat(*table,msg->data);
-					} else { 
+					} else {
 						*table = strdup(msg->data);
 					}
 					break;
@@ -144,7 +128,7 @@
 					if (*table) {
 						*table = realloc(*table,strlen(*table)+strlen(msg->data)+1);
 						strcat(*table,msg->data);
-					} else { 
+					} else {
 						*table = strdup(msg->data);
 					}
 					break;
@@ -204,6 +188,7 @@
 	free(xfolder);
 
 	ret = chdk_generic_script_run (params, lua, &table, &retint, context);
+	free (lua);
 	if (ret != GP_OK)
 		return ret;
 	if (table) {
@@ -394,7 +379,7 @@
 	PTPDataHandler  	handler;
 	char 			*fn;
 
-	fn = malloc(1+strlen(folder)+1+strlen(filename)+1),
+	fn = malloc(1+strlen(folder)+1+strlen(filename)+1);
 	sprintf(fn,"A%s/%s",folder,filename);
 	ptp_init_camerafile_handler (&handler, file);
 	ret = ptp_chdk_download(params, fn, &handler);
@@ -528,7 +513,7 @@
 	ret = chdk_generic_script_run (params, "return get_flash_mode()", NULL, &retint, context);
 	sprintf (s, _("Flash Mode: %d\n"), retint); s += strlen(s);
         return ret;
-/* 
+/*
 Mode: 256
 SV96: 603, ISO: 243
 TV96: 478, Shutterspeed: 0
@@ -881,7 +866,7 @@
 chdk_get_capmode(CONFIG_GET_ARGS) {
 	char *s , *table = NULL;
 	int retint = 0;
-	const char *lua = 
+	const char *lua =
 PTP_CHDK_LUA_SERIALIZE \
 "capmode=require'capmode'\n"
 "str=''\n"
@@ -923,7 +908,7 @@
 chdk_put_capmode(CONFIG_PUT_ARGS) {
 	char *val;
 	char lua200;
-	const char *luastr = 
+	const char *luastr =
 "capmode=require'capmode'\n"
 "str='%s'\n"
 "for id,name in ipairs(capmode.mode_to_name) do\n"
@@ -1005,8 +990,8 @@
 
 static int
 chdk_get_onoff(CONFIG_GET_ARGS) {
-        int i;
-        char buf1024;
+        unsigned int	i;
+        char		buf1024;
 
         gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
         gp_widget_set_name (*widget, menu->name);
@@ -1022,8 +1007,8 @@
 
 static int
 chdk_put_onoff(CONFIG_PUT_ARGS) {
-        int i;
-        char *val;
+        unsigned int	i;
+        char		*val;
 
         CR (gp_widget_get_value(widget, &val));
         for (i=0;i<sizeof(chdkonoff)/sizeof(chdkonoffi);i++) {
@@ -1109,7 +1094,7 @@
 }
 
 static int
-chdk_camera_exit (Camera *camera, GPContext *context) 
+chdk_camera_exit (Camera *camera, GPContext *context)
 {
 	camera_unprepare_chdk_capture(camera, context);
         return GP_OK;
@@ -1158,7 +1143,7 @@
 
 #ifdef HAVE_LIBJPEG
 static void yuv_live_to_jpeg(unsigned char *p_yuv,
-			     int buf_width, int width, int height,
+			     unsigned int buf_width, unsigned int width, unsigned int height,
 			     int fb_type, CameraFile *file
 ) {
 	struct		jpeg_compress_struct cinfo;
@@ -1206,7 +1191,7 @@
 
 	jpeg_start_compress (&cinfo, TRUE);
 
-	tmprowbuf = malloc (cinfo.image_width * 3);
+	tmprowbuf = calloc (cinfo.image_width , 3);
 	row_ptr0 = &tmprowbuf0;
 
 	while (cinfo.next_scanline < cinfo.image_height) {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/chdk_live_view.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/chdk_live_view.h Changed

@@ -1,7 +1,7 @@
-#ifndef __LIVE_VIEW_H
-#define __LIVE_VIEW_H
+#ifndef CAMLIBS_PTP2_CHDK_LIVE_VIEW_H
+#define CAMLIBS_PTP2_CHDK_LIVE_VIEW_H
 
-// Note: used in modules and platform independent code. 
+// Note: used in modules and platform independent code.
 // Do not add platform dependent stuff in here (#ifdef/#endif compile options or camera dependent values)
 
 /*
@@ -9,12 +9,12 @@
 - Unless otherwise specified, all structure values are packed in camera native (little
   endian) byte order
 - Frame buffer and palette data are in native camera formats
-  Some documentation may be found at http://chdk.wikia.com/wiki/Frame_buffers 
+  Some documentation may be found at http://chdk.wikia.com/wiki/Frame_buffers
 - The frame buffer descriptions returned may not be correct depending on the
   camera model and various camera settings (shooting mode, digital zoom, aspect ratio)
   This may result in partial images, garbage in the "valid" area or incorrect position
 - In some cases, the requested data may not be available. If this happens, the framebuffer
-  or palette data offset will be zero. 
+  or palette data offset will be zero.
 - The frame buffer descriptions are returned regardless of whether the data is available
 - New enum values (e.g. aspect ratio, framebuffer type, palette type) may be added in minor
   versions.
@@ -74,7 +74,7 @@
     visible size in pixels
     describes data within the buffer which contains image data to be displayed
     any offsets within buffer data are added before sending, so the top left
-    pixel is always the first first byte of data.
+    pixel is always the first byte of data.
     width must always be <= buffer_width
     if buffer_width is > width, the additional data should be skipped
     visible_height also defines the number of data rows
@@ -107,4 +107,4 @@
     int bmo_desc_start; // added in protocol 2.2
 } lv_data_header;
 
-#endif // __LIVE_VIEW_H
+#endif /* !defined(CAMLIBS_PTP2_CHDK_LIVE_VIEW_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/chdk_ptp.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/chdk_ptp.h Changed

@@ -1,9 +1,9 @@
-#ifndef __CHDK_PTP_H
-#define __CHDK_PTP_H
+#ifndef CAMLIBS_PTP2_CHDK_PTP_H
+#define CAMLIBS_PTP2_CHDK_PTP_H
 
 // CHDK PTP protocol interface (can also be used in client PTP programs)
 
-// Note: used in modules and platform independent code. 
+// Note: used in modules and platform independent code.
 // Do not add platform dependent stuff in here (#ifdef/#endif compile options or camera dependent values)
 
 #define PTP_CHDK_VERSION_MAJOR 2  // increase only with backwards incompatible changes (and reset minor)
@@ -63,7 +63,7 @@
                             //   for script return and users this is ptp_chdk_script_data_type
                             //   for error ptp_chdk_script_error_type
                             // return param3 is script id of script that generated the message
-                            // return param4 is length of the message data. 
+                            // return param4 is length of the message data.
                             // return data is message.
                             // A minimum of 1 bytes of zeros is returned if the message has no data (empty string or type NONE)
   PTP_CHDK_WriteScriptMsg,  // write a message for scripts running on camera
@@ -77,12 +77,12 @@
                             //  param2 bitmask of data
                             //  output param1 = total size of data
                             //  return data is protocol information, frame buffer descriptions and selected display data
-                            //  Currently a data phase is always returned. Future versions may define other behavior 
+                            //  Currently a data phase is always returned. Future versions may define other behavior
                             //  for values in currently unused parameters.
   // Direct image capture over USB.
   // Use lua get_usb_capture_support for available data types, lua init_usb_capture for setup
   PTP_CHDK_RemoteCaptureIsReady, // Check if data is available
-                                 // return param1 is status 
+                                 // return param1 is status
                                  //  0 = not ready
                                  //  0x10000000 = remote capture not initialized
                                  //  otherwise bitmask of PTP_CHDK_CAPTURE_* datatypes
@@ -102,7 +102,7 @@
   PTP_CHDK_TYPE_BOOLEAN,
   PTP_CHDK_TYPE_INTEGER,
   PTP_CHDK_TYPE_STRING, // Empty strings are returned with length=0
-  PTP_CHDK_TYPE_TABLE,  // tables are converted to a string by usb_msg_table_to_string, 
+  PTP_CHDK_TYPE_TABLE,  // tables are converted to a string by usb_msg_table_to_string,
                         // this function can be overridden in lua to change the format
                         // the string may be empty for an empty table
 };
@@ -570,7 +570,7 @@
 /*
 Full jpeg file. Note supported on all cameras, use Lua get_usb_capture_support to check
 */
-#define PTP_CHDK_CAPTURE_JPG    0x1 
+#define PTP_CHDK_CAPTURE_JPG    0x1
 
 /*
 Raw framebuffer data, in camera native format.
@@ -579,7 +579,7 @@
 #define PTP_CHDK_CAPTURE_RAW    0x2
 
 /*
-DNG header. 
+DNG header.
 The header will be DNG version 1.3
 Does not include image data, clients wanting to create a DNG file should also request RAW
 Raw data for all known cameras will be packed, little endian. Client is responsible for
@@ -596,7 +596,7 @@
 
 Bad pixels will not be patched, but DNG opcodes will specify how to patch them
 */
-#define PTP_CHDK_CAPTURE_DNGHDR 0x4  
+#define PTP_CHDK_CAPTURE_DNGHDR 0x4
 
 // status from PTP_CHDK_RemoteCaptureIsReady if capture not enabled
 #define PTP_CHDK_CAPTURE_NOTSET 0x10000000
@@ -627,4 +627,4 @@
     PTP_CHDK_S_MSGSTATUS_BADID,  // specified ID is not running
 };
 
-#endif // __CHDK_PTP_H
+#endif /* !defined(CAMLIBS_PTP2_CHDK_PTP_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/config.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/config.c Changed

@@ -1,16 +1,16 @@
 /* config.c
  *
- * Copyright (C) 2003-2017 Marcus Meissner <marcus@jet.franken.de>
+ * Copyright (C) 2003-2021 Marcus Meissner <marcus@jet.franken.de>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -20,6 +20,7 @@
 #define _DEFAULT_SOURCE
 #include "config.h"
 
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -32,29 +33,13 @@
 # include <arpa/inet.h>
 #endif
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-setting.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "ptp.h"
 #include "ptp-bugs.h"
@@ -93,6 +78,7 @@
 	}
 	if ((prop & 0x7000) == 0x1000) { /* commands */
 		for (i=0; i<camera->pl->params.deviceinfo.OperationsSupported_len; i++) {
+
 			if (prop != camera->pl->params.deviceinfo.OperationsSupportedi)
 				continue;
 			if ((prop & 0xf000) == 0x1000) /* generic property */
@@ -105,22 +91,6 @@
 }
 
 static int
-have_eos_prop(Camera *camera, uint16_t vendor, uint16_t prop) {
-	unsigned int i;
-
-	/* The special Canon EOS property set gets special treatment. */
-	if ((camera->pl->params.deviceinfo.VendorExtensionID != PTP_VENDOR_CANON) ||
-	    (vendor != PTP_VENDOR_CANON)
-	)
-		return 0;
-	for (i=0;i<camera->pl->params.nrofcanon_props;i++)
-		if (camera->pl->params.canon_propsi.proptype == prop)
-			return 1;
-	return 0;
-}
-
-
-static int
 camera_prepare_chdk_capture(Camera *camera, GPContext *context) {
 	PTPParams		*params = &camera->pl->params;
 	int 			scriptid = 0, major = 0,minor = 0;
@@ -321,7 +291,7 @@
 	int			cardval = -1;
 
 	memset(&dpd,0,sizeof(dpd));
-	if (!have_eos_prop(camera, PTP_VENDOR_CANON, PTP_DPC_CANON_EOS_CaptureDestination) ) {
+	if (!have_eos_prop(params, PTP_VENDOR_CANON, PTP_DPC_CANON_EOS_CaptureDestination) ) {
 		GP_LOG_D ("No CaptureDestination property?");
 		return GP_OK;
 	}
@@ -340,8 +310,13 @@
 			GP_LOG_D ("Card value is %d",cardval);
 		}
 		if (cardval == -1) {
-			GP_LOG_D ("NO Card found - falling back to SDRAM!");
-			cardval = PTP_CANON_EOS_CAPTUREDEST_HD;
+			/* https://github.com/gphoto/gphoto2/issues/383 ... we dont get an enum, but the value is 2 ... */
+			if (dpd.CurrentValue.u32 != PTP_CANON_EOS_CAPTUREDEST_HD) {
+				cardval = dpd.CurrentValue.u32;
+			} else {
+				GP_LOG_D ("NO Card found - falling back to SDRAM!");
+				cardval = PTP_CANON_EOS_CAPTUREDEST_HD;
+			}
 		}
 	}
 
@@ -359,6 +334,8 @@
 			   "setdevicepropvalue of capturetarget to 0x%x failed", ct_val.u32);
 		if (ct_val.u32 == PTP_CANON_EOS_CAPTUREDEST_HD) {
 			uint16_t	ret;
+#if 0
+			int		uilocked = params->uilocked;
 
 			/* if we want to download the image from the device, we need to tell the camera
 			 * that we have enough space left. */
@@ -366,7 +343,14 @@
 			ret = ptp_canon_eos_pchddcapacity(params, 0x7fffffff, 0x00001000, 0x00000001);
 			 */
 
-			ret = ptp_canon_eos_pchddcapacity(params, 0x04ffffff, 0x00001000, 0x00000001);
+			if (!uilocked)
+				LOG_ON_PTP_E (ptp_canon_eos_setuilock (params));
+#endif
+			ret = ptp_canon_eos_pchddcapacity(params, 0x0fffffff, 0x00001000, 0x00000001);
+#if 0
+			if (!uilocked)
+				LOG_ON_PTP_E (ptp_canon_eos_resetuilock (params));
+#endif
 			/* not so bad if its just busy, would also fail later. */
 			if (ret == PTP_RC_DeviceBusy) ret = PTP_RC_OK;
 			C_PTP (ret);
@@ -394,7 +378,19 @@
 
 	GP_LOG_D ("preparing EOS capture...");
 
-	C_PTP (ptp_canon_eos_setremotemode(params, 1));
+	if (is_canon_eos_m(params)) {
+		int mode = 0x15;	/* default for EOS M and newer Powershot SX */
+
+		if (!strcmp(params->deviceinfo.Model,"Canon PowerShot SX540 HS")) mode = 0x11;	/* testing for https://github.com/gphoto/libgphoto2/issues/360 */
+		if (!strcmp(params->deviceinfo.Model,"Canon PowerShot SX600 HS")) goto skip;
+
+		if (!strcmp(params->deviceinfo.Model,"Canon PowerShot G5 X")) mode = 0x11;
+		if (!strcmp(params->deviceinfo.Model,"Canon EOS M6 Mark II")) mode = 0x1;
+		C_PTP (ptp_canon_eos_setremotemode(params, mode));
+	} else {
+		C_PTP (ptp_canon_eos_setremotemode(params, 1));
+	}
+skip:
 	C_PTP (ptp_canon_eos_seteventmode(params, 1));
 	params->eos_camerastatus = -1;	/* aka unknown */
 
@@ -431,10 +427,10 @@
 		ptp_free_EOS_DI (&x);
 	}
 
-	/* The new EOS occasionaly returned an empty event set ... likely because we are too fast. try again some times. */
+	/* The new EOS occasionally returned an empty event set ... likely because we are too fast. try again some times. */
 	C_PTP (ptp_check_eos_events (params));
 	tries = 10;
-	while (--tries && !have_eos_prop(camera,PTP_VENDOR_CANON,PTP_DPC_CANON_EOS_EVFOutputDevice)) {
+	while (--tries && !have_eos_prop(params,PTP_VENDOR_CANON,PTP_DPC_CANON_EOS_EVFOutputDevice)) {
 		GP_LOG_D("evfoutput device not found, retrying");
 		usleep(50*1000);
 		C_PTP (ptp_check_eos_events (params));
@@ -460,14 +456,26 @@
 	C_PTP (ptp_check_eos_events (params));
 	params->eos_captureenabled = 1;
 
-	if (is_canon_eos_m (params)) {
+	/* run this only on EOS M, not on PowerShot SX */
+	/* I lost track where it is needed.
+	 * Need it:
+	 * + EOS M10
+	 * + PowerShot SX 720HS
+	 * + PowerShot G9x mark II
+	 *
+	 * NOT NEEDED for EOS M6 Mark II ... this behaves like a regular EOS no-M and will disable tethering if we set output=8.
+	 */
+	if (	is_canon_eos_m (params) &&
+		(strcmp(params->deviceinfo.Model,"Canon EOS M6 Mark II") != 0)
+	) {
+		/* This code is needed on EOS m3 at least. might not be needed on others ... mess :/ */
 		PTPPropertyValue    ct_val;
 
 		GP_LOG_D ("EOS M detected");
 
 		C_PTP (ptp_canon_eos_seteventmode(params, 2));
-		ct_val.u16 = 0x0008;
-		C_PTP (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &ct_val, PTP_DTC_UINT16));
+		ct_val.u32 = 0x0008;
+		C_PTP (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &ct_val, PTP_DTC_UINT32));
 
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		usleep(1000*1000); /* 1 second */
@@ -482,7 +490,7 @@
 camera_prepare_capture (Camera *camera, GPContext *context)
 {
 	PTPParams		*params = &camera->pl->params;
-	
+
 	GP_LOG_D ("prepare_capture");
 	switch (params->deviceinfo.VendorExtensionID) {
 	case PTP_VENDOR_FUJI:
@@ -490,11 +498,18 @@
 			PTPPropertyValue propval;
 
 			/* without the firmware update ... not an error... */
-			if (!have_prop (camera, PTP_VENDOR_FUJI, 0xd207))
+			if (!have_prop (camera, PTP_VENDOR_FUJI, PTP_DPC_FUJI_PriorityMode))
 				return GP_OK;
 
+			/* timelapse does:
+			 * d38c -> 1	(PC Mode)
+			 * d207 -> 2	(USB control)
+			 */
+
+			propval.u16 = 0x0001;
+			LOG_ON_PTP_E (ptp_setdevicepropvalue (params, 0xd38c, &propval, PTP_DTC_UINT16));
 			propval.u16 = 0x0002;
-			LOG_ON_PTP_E (ptp_setdevicepropvalue (params, 0xd207, &propval, PTP_DTC_UINT16));
+			LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16));
 			return GP_OK;
 		}
 		break;
@@ -511,6 +526,14 @@
 			return camera_prepare_canon_eos_capture(camera,context);
 		gp_context_error(context, _("Sorry, your Canon camera does not support Canon capture"));
 		return GP_ERROR_NOT_SUPPORTED;
+	case PTP_VENDOR_PANASONIC: {
+		char buf1024;
+		if ((GP_OK != gp_setting_get("ptp2","capturetarget",buf)) || !strcmp(buf,"sdram"))
+			C_PTP (ptp_panasonic_setcapturetarget(params, 1));
+		else
+			C_PTP (ptp_panasonic_setcapturetarget(params, 0));
+		break;
+	}
 	default:
 		/* generic capture does not need preparation */
 		return GP_OK;
@@ -542,23 +565,32 @@
 	PTPParams		*params = &camera->pl->params;
 
 	/* just in case we had autofocus running */
-	CR (ptp_canon_eos_afcancel(params));
+	if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_AfCancel))
+		CR (ptp_canon_eos_afcancel(params));
 
 	if (is_canon_eos_m (params)) {
 		PTPPropertyValue    ct_val;
 
-		ct_val.u16 = 0x0000;
-		C_PTP (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &ct_val, PTP_DTC_UINT16));
+		ct_val.u32 = 0x0000;
+		C_PTP (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &ct_val, PTP_DTC_UINT32));
 	}
 
 	/* then emits 911b and 911c ... not done yet ... */
 	CR (camera_canon_eos_update_capture_target(camera, context, 1));
 
-	C_PTP (ptp_canon_eos_resetuilock (params));
+	if (ptp_operation_issupported(&camera->pl->params, PTP_OC_CANON_EOS_ResetUILock)) {
+		if (params->uilocked) {
+			LOG_ON_PTP_E (ptp_canon_eos_resetuilock (params));
+			params->uilocked = 0;
+		}
+	}
 
 	/* Drain the rest set of the event data */
 	C_PTP (ptp_check_eos_events (params));
+	/* Resets the camera state */
 	C_PTP (ptp_canon_eos_setremotemode(params, 0));
+	/* Enables camera display for some reason. */
+	C_PTP (ptp_canon_eos_setremotemode(params, 1));
 	C_PTP (ptp_canon_eos_seteventmode(params, 0));
 	params->eos_captureenabled = 0;
 	return GP_OK;
@@ -589,8 +621,13 @@
 			PTPPropertyValue propval;
 			PTPParams *params = &camera->pl->params;
 
+			if (params->inliveview) {
+				C_PTP_REP (ptp_terminateopencapture (params, params->opencapture_transid));
+				params->inliveview = 0;
+			}
+
 			propval.u16 = 0x0001;
-			C_PTP (ptp_setdevicepropvalue (params, 0xd207, &propval, PTP_DTC_UINT16));
+			C_PTP (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16));
 			return GP_OK;
 		}
 		break;
@@ -613,7 +650,9 @@
 		tries=50;
 	do {
 		res = ptp_nikon_device_ready(params);
-		if (res != PTP_RC_DeviceBusy)
+		if (	(res != PTP_RC_DeviceBusy) &&
+			(res != PTP_RC_NIKON_Bulb_Release_Busy)
+		)
 			return res;
 		if (waitms) usleep(waitms*1000)/*wait a bit*/;
 	} while (tries--);
@@ -624,8 +663,8 @@
 #define CONFIG_GET_ARGS Camera *camera, CameraWidget **widget, struct submenu* menu, PTPDevicePropDesc *dpd
 #define CONFIG_GET_NAMES camera, widget, menu, dpd
 typedef int (*get_func)(CONFIG_GET_ARGS);
-#define CONFIG_PUT_ARGS Camera *camera, CameraWidget *widget, PTPPropertyValue *propval, PTPDevicePropDesc *dpd
-#define CONFIG_PUT_NAMES camera, widget, propval, dpd
+#define CONFIG_PUT_ARGS Camera *camera, CameraWidget *widget, PTPPropertyValue *propval, PTPDevicePropDesc *dpd, int *alreadyset
+#define CONFIG_PUT_NAMES camera, widget, propval, dpd, alreadyset
 typedef int (*put_func)(CONFIG_PUT_ARGS);
 
 struct menu;
@@ -658,486 +697,259 @@
 	put_menu_func	putfunc;
 };
 
-struct deviceproptableu8 {
-	char		*label;
-	uint8_t		value;
-	uint16_t	vendor_id;
-};
-
-struct deviceproptableu16 {
-	char		*label;
-	uint16_t	value;
-	uint16_t	vendor_id;
-};
-
-struct deviceproptablei16 {
-	char		*label;
-	int16_t		value;
-	uint16_t	vendor_id;
-};
-
 /* Generic helper function for:
  *
- * ENUM UINT16 propertiess, with potential vendor specific variables.
+ * ENUM xINTxx propertiess, with potential vendor specific variables. \
  */
-static int
-_get_Generic16Table(CONFIG_GET_ARGS, struct deviceproptableu16* tbl, int tblsize) {
-	int i, j;
-	int isset = FALSE, isset2 = FALSE;
-
-	if (!(dpd->FormFlag & (PTP_DPFF_Enumeration|PTP_DPFF_Range))) {
-		GP_LOG_D ("no enumeration/range in 16bit table code... going on");
-	}
-	if (dpd->DataType != PTP_DTC_UINT16) {
-		GP_LOG_D ("no uint16 prop in 16bit table code");
-		return (GP_ERROR);
-	}
-
-	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
-	gp_widget_set_name (*widget, menu->name);
-	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
-		if (!dpd->FORM.Enum.NumberOfValues) {
-			/* fill in with all values we have in the table. */
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.vendor_id == 0) ||
-				    (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.u16) {
-						gp_widget_set_value (*widget, _(tblj.label));
-						isset2 = TRUE;
-					}
-				}
-			}
-			/* fallthrough in case we do not have currentvalue in the table. isset2 = FALSE */
-		}
-		for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
-			isset = FALSE;
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == dpd->FORM.Enum.SupportedValuei.u16) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.u16) {
-						isset2 = TRUE;
-						gp_widget_set_value (*widget, _(tblj.label));
-					}
-					isset = TRUE;
-					break;
-				}
-			}
-			if (!isset) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04x"), dpd->FORM.Enum.SupportedValuei.u16);
-				gp_widget_add_choice (*widget, buf);
-				if (dpd->FORM.Enum.SupportedValuei.u16 == dpd->CurrentValue.u16) {
-					isset2 = TRUE;
-					gp_widget_set_value (*widget, buf);
-				}
-			}
-		}
-	}
-	if (dpd->FormFlag & PTP_DPFF_Range) {
-		for (	i = dpd->FORM.Range.MinimumValue.u16;
-			i<=dpd->FORM.Range.MaximumValue.u16;
-			i+= dpd->FORM.Range.StepSize.u16
-		) {
-			isset = FALSE;
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == i) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (i == dpd->CurrentValue.u16) {
-						isset2 = TRUE;
-						gp_widget_set_value (*widget, _(tblj.label));
-					}
-					isset = TRUE;
-					break;
-				}
-			}
-			if (!isset) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04d"), i);
-				gp_widget_add_choice (*widget, buf);
-				if (i == dpd->CurrentValue.u16) {
-					isset2 = TRUE;
-					gp_widget_set_value (*widget, buf);
-				}
-			}
-
-			/* device might report stepsize 0. but we do at least 1 round */
-			if (dpd->FORM.Range.StepSize.u16 == 0)
-				break;
-		}
-	}
-	if (!isset2) {
-		for (j=0;j<tblsize;j++) {
-			if (((tblj.vendor_id == 0) ||
-			     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) &&
-			     (tblj.value == dpd->CurrentValue.u16)
-			) {
-				gp_widget_add_choice (*widget, _(tblj.label));
-				isset2 = TRUE;
-				gp_widget_set_value (*widget, _(tblj.label));
-			}
-		}
-		if (!isset2) {
-			char buf200;
-			sprintf(buf, _("Unknown value %04x"), dpd->CurrentValue.u16);
-			gp_widget_add_choice (*widget, buf);
-			gp_widget_set_value (*widget, buf);
-		}
-	}
-	return (GP_OK);
-}
-
-
-static int
-_put_Generic16Table(CONFIG_PUT_ARGS, struct deviceproptableu16* tbl, int tblsize) {
-	char *value;
-	int i, intval, j;
-	int foundvalue = 0;
-	uint16_t	u16val = 0;
-
-	CR (gp_widget_get_value (widget, &value));
-	for (i=0;i<tblsize;i++) {
-		if (!strcmp(_(tbli.label),value) &&
-		    ((tbli.vendor_id == 0) || (tbli.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-		) {
-			u16val = tbli.value;
-			foundvalue = 1;
-		
-			if (dpd->FormFlag & PTP_DPFF_Enumeration) {
-				for (j = 0; j<dpd->FORM.Enum.NumberOfValues; j++) {
-					if (u16val == dpd->FORM.Enum.SupportedValuej.u16) {
-						GP_LOG_D ("FOUND right value for %s in the enumeration at val %d", value, u16val);
-						propval->u16 = u16val;
-						return GP_OK;
-					}
-				}
-				GP_LOG_D ("did not find the right value for %s in the enumeration at val %d... continuing", value, u16val);
-				/* continue looking, but with this value as fallback */
-			} else {
-				GP_LOG_D ("not an enumeration ... return %s as %d", value, u16val);
-				propval->u16 = u16val;
-				return GP_OK;
-			}
-		}
-	}
-	if (foundvalue) {
-		GP_LOG_D ("Using fallback, not found in enum... return %s as %d", value, u16val);
-		propval->u16 = u16val;
-		return GP_OK;
-	}
-	if (!sscanf(value, _("Unknown value %04x"), &intval)) {
-		GP_LOG_E ("failed to find value %s in list", value);
-		return (GP_ERROR);
-	}
-	GP_LOG_D ("Using fallback, not found in enum... return %s as %d", value, u16val);
-	propval->u16 = intval;
-	return GP_OK;
-}
+#define GENERIC_TABLE(bits,type,dpc) \
+struct deviceproptable##bits {		\
+	char		*label;		\
+	type		value;		\
+	uint16_t	vendor_id;	\
+};\
+\
+static int \
+_get_Generic##bits##Table(CONFIG_GET_ARGS, struct deviceproptable##bits * tbl, int tblsize) { \
+	int i, j; \
+	int isset = FALSE, isset2 = FALSE; \
+ \
+	if (!(dpd->FormFlag & (PTP_DPFF_Enumeration|PTP_DPFF_Range))) { \
+		GP_LOG_D ("no enumeration/range in %sbit table code... going on", #bits); \
+	} \
+	if (dpd->DataType != dpc) { \
+		GP_LOG_D ("no %s prop in %sbit table code", #bits, #bits); \
+		return GP_ERROR; \
+	} \
+ \
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget); \
+	gp_widget_set_name (*widget, menu->name); \
+	if (dpd->FormFlag & PTP_DPFF_Enumeration) { \
+		if (!dpd->FORM.Enum.NumberOfValues) { \
+			/* fill in with all values we have in the table. */ \
+			for (j=0;j<tblsize;j++) { \
+				if ((tblj.vendor_id == 0) || \
+				    (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID) \
+				) { \
+					gp_widget_add_choice (*widget, _(tblj.label)); \
+					if (tblj.value == dpd->CurrentValue.bits) { \
+						gp_widget_set_value (*widget, _(tblj.label)); \
+						isset2 = TRUE; \
+					} \
+				} \
+			} \
+			/* fallthrough in case we do not have currentvalue in the table. isset2 = FALSE */ \
+		} \
+		for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) { \
+			isset = FALSE; \
+			for (j=0;j<tblsize;j++) { \
+				if ((tblj.value == dpd->FORM.Enum.SupportedValuei.bits) && \
+				    ((tblj.vendor_id == 0) || \
+				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) \
+				) { \
+					gp_widget_add_choice (*widget, _(tblj.label)); \
+					if (tblj.value == dpd->CurrentValue.bits) { \
+						isset2 = TRUE; \
+						gp_widget_set_value (*widget, _(tblj.label)); \
+					} \
+					isset = TRUE; \
+					break; \
+				} \
+			} \
+			if (!isset) { \
+				char buf200; \
+				sprintf(buf, _("Unknown value %04x"), dpd->FORM.Enum.SupportedValuei.bits); \
+				gp_widget_add_choice (*widget, buf); \
+				if (dpd->FORM.Enum.SupportedValuei.bits == dpd->CurrentValue.bits) { \
+					isset2 = TRUE; \
+					gp_widget_set_value (*widget, buf); \
+				} \
+			} \
+		} \
+	} \
+	if (dpd->FormFlag & PTP_DPFF_Range) { \
+		type r;	\
+		for (	r = dpd->FORM.Range.MinimumValue.bits; \
+			r<=dpd->FORM.Range.MaximumValue.bits; \
+			r+= dpd->FORM.Range.StepSize.bits \
+		) { \
+			isset = FALSE; \
+			for (j=0;j<tblsize;j++) { \
+				if ((tblj.value == r) && \
+				    ((tblj.vendor_id == 0) || \
+				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) \
+				) { \
+					gp_widget_add_choice (*widget, _(tblj.label)); \
+					if (r == dpd->CurrentValue.bits) { \
+						isset2 = TRUE; \
+						gp_widget_set_value (*widget, _(tblj.label)); \
+					} \
+					isset = TRUE; \
+					break; \
+				} \
+			} \
+			if (!isset) { \
+				char buf200; \
+				sprintf(buf, _("Unknown value %04x"), r); \
+				gp_widget_add_choice (*widget, buf); \
+				if (r == dpd->CurrentValue.bits) { \
+					isset2 = TRUE; \
+					gp_widget_set_value (*widget, buf); \
+				} \
+			} \
+ \
+			/* device might report stepsize 0. but we do at least 1 round */ \
+			if (dpd->FORM.Range.StepSize.bits == 0) \
+				break; \
+		} \
+	} \
+	if (!isset2) { \
+		for (j=0;j<tblsize;j++) { \
+			if (((tblj.vendor_id == 0) || \
+			     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) && \
+			     (tblj.value == dpd->CurrentValue.bits) \
+			) { \
+				gp_widget_add_choice (*widget, _(tblj.label)); \
+				isset2 = TRUE; \
+				gp_widget_set_value (*widget, _(tblj.label)); \
+			} \
+		} \
+		if (!isset2) { \
+			char buf200; \
+			sprintf(buf, _("Unknown value %04x"), dpd->CurrentValue.bits); \
+			gp_widget_add_choice (*widget, buf); \
+			gp_widget_set_value (*widget, buf); \
+		} \
+	} \
+	return (GP_OK); \
+} \
+\
+\
+static int \
+_put_Generic##bits##Table(CONFIG_PUT_ARGS, struct deviceproptable##bits * tbl, int tblsize) { \
+	char *value; \
+	int i, intval, j; \
+	int foundvalue = 0; \
+	type bits##val = 0; \
+ \
+	CR (gp_widget_get_value (widget, &value)); \
+	for (i=0;i<tblsize;i++) { \
+		if ((!strcmp(_(tbli.label),value) || !strcmp(tbli.label,value)) && \
+		    ((tbli.vendor_id == 0) || (tbli.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) \
+		) { \
+			bits##val = tbli.value; \
+			foundvalue = 1; \
+		 \
+			if (dpd->FormFlag & PTP_DPFF_Enumeration) { \
+				for (j = 0; j<dpd->FORM.Enum.NumberOfValues; j++) { \
+					if (bits##val == dpd->FORM.Enum.SupportedValuej.bits) { \
+						GP_LOG_D ("FOUND right value for %s in the enumeration at val %d", value, bits##val); \
+						propval->bits = bits##val; \
+						return GP_OK; \
+					} \
+				} \
+				GP_LOG_D ("did not find the right value for %s in the enumeration at val %d... continuing", value, bits##val); \
+				/* continue looking, but with this value as fallback */ \
+			} else { \
+				GP_LOG_D ("not an enumeration ... return %s as %d", value, bits##val); \
+				propval->bits = bits##val; \
+				return GP_OK; \
+			} \
+		} \
+	} \
+	if (foundvalue) { \
+		GP_LOG_D ("Using fallback, not found in enum... return %s as %d", value, bits##val); \
+		propval->bits = bits##val; \
+		return GP_OK; \
+	} \
+	if (!sscanf(value, _("Unknown value %04x"), &intval)) { \
+		GP_LOG_E ("failed to find value %s in list", value); \
+		return GP_ERROR; \
+	} \
+	GP_LOG_D ("Using fallback, not found in enum... return %s as %d", value, bits##val); \
+	propval->bits = intval; \
+	return GP_OK; \
+}
+
+GENERIC_TABLE(u32,uint32_t,PTP_DTC_UINT32)
+GENERIC_TABLE(u16,uint16_t,PTP_DTC_UINT16)
+GENERIC_TABLE(i16,int16_t, PTP_DTC_INT16)
+GENERIC_TABLE(u8, uint8_t, PTP_DTC_UINT8)
+GENERIC_TABLE(i8, int8_t,  PTP_DTC_INT8)
 
 #define GENERIC16TABLE(name,tbl) 			\
 static int						\
 _get_##name(CONFIG_GET_ARGS) {				\
-	return _get_Generic16Table(CONFIG_GET_NAMES,	\
+	return _get_Genericu16Table(CONFIG_GET_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }							\
 							\
 static int __unused__					\
 _put_##name(CONFIG_PUT_ARGS) {				\
-	return _put_Generic16Table(CONFIG_PUT_NAMES,	\
+	return _put_Genericu16Table(CONFIG_PUT_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }
 
-static int
-_get_GenericI16Table(CONFIG_GET_ARGS, struct deviceproptablei16* tbl, int tblsize) {
-	int i, j;
-	int isset = FALSE, isset2 = FALSE;
-
-	if (!(dpd->FormFlag & (PTP_DPFF_Range|PTP_DPFF_Enumeration))) {
-		GP_LOG_D ("no enumeration/range in 16bit table code");
-	}
-	if (dpd->DataType != PTP_DTC_INT16) {
-		GP_LOG_D ("no int16 prop in 16bit table code");
-		return (GP_ERROR);
-	}
-
-	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
-	gp_widget_set_name (*widget, menu->name);
-	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
-		if (!dpd->FORM.Enum.NumberOfValues) {
-			/* fill in with all values we have in the table. */
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.vendor_id == 0) ||
-				    (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.i16) {
-						gp_widget_set_value (*widget, _(tblj.label));
-						isset2 = TRUE;
-					}
-				}
-			}
-			/* fallthrough */
-		}
-		for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
-			isset = FALSE;
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == dpd->FORM.Enum.SupportedValuei.i16) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.i16) {
-						gp_widget_set_value (*widget, _(tblj.label));
-						isset2 = TRUE;
-					}
-					isset = TRUE;
-					break;
-				}
-			}
-			if (!isset) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04x"), dpd->FORM.Enum.SupportedValuei.i16);
-				gp_widget_add_choice (*widget, buf);
-				if (dpd->FORM.Enum.SupportedValuei.i16 == dpd->CurrentValue.i16)
-					gp_widget_set_value (*widget, buf);
-			}
-		}
-	}
-	if (dpd->FormFlag & PTP_DPFF_Range) {
-		for (i = dpd->FORM.Range.MinimumValue.i16; i<=dpd->FORM.Range.MaximumValue.i16; i+= dpd->FORM.Range.StepSize.i16) {
-			int isset3 = FALSE;
-
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == i) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (i == dpd->CurrentValue.i16) {
-						isset2 = TRUE;
-						gp_widget_set_value (*widget, _(tblj.label));
-					}
-					isset3 = TRUE;
-					break;
-				}
-			}
-			if (!isset3) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04d"), i);
-				gp_widget_add_choice (*widget, buf);
-				if (i == dpd->CurrentValue.i16) {
-					isset2 = TRUE;
-					gp_widget_set_value (*widget, buf);
-				}
-			}
-
-			/* device might report stepsize 0. but we do at least 1 round */
-			if (dpd->FORM.Range.StepSize.i16 == 0)
-				break;
-		}
-	}
-	if (!isset2) {
-		char buf200;
-
-		/* if we are not in enum or range mode, but have a value, check our internal table */
-		for (j=0;j<tblsize;j++) {
-			if (((tblj.vendor_id == 0) ||
-			     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID)) &&
-			     (tblj.value == dpd->CurrentValue.i16)
-			) {
-				isset2 = TRUE;
-				gp_widget_add_choice (*widget, _(tblj.label));
-				gp_widget_set_value (*widget, _(tblj.label));
-				break;
-			}
-		}
-		if (!isset2) {
-			sprintf(buf, _("Unknown value %04x"), dpd->CurrentValue.i16);
-			gp_widget_add_choice (*widget, buf);
-			gp_widget_set_value (*widget, buf);
-		}
-	}
-	return (GP_OK);
-}
-
-
-static int
-_put_GenericI16Table(CONFIG_PUT_ARGS, struct deviceproptablei16* tbl, int tblsize) {
-	char *value;
-	int i, intval;
-
-	CR (gp_widget_get_value (widget, &value));
-	for (i=0;i<tblsize;i++) {
-		if (!strcmp(_(tbli.label),value) &&
-		    ((tbli.vendor_id == 0) || (tbli.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-		) {
-			propval->i16 = tbli.value;
-			return GP_OK;
-		}
-	}
-	if (!sscanf(value, _("Unknown value %04d"), &intval)) {
-		GP_LOG_E ("failed to find value %s in list", value);
-		return (GP_ERROR);
-	}
-	propval->i16 = intval;
-	return GP_OK;
+#define GENERIC32TABLE(name,tbl) 			\
+static int						\
+_get_##name(CONFIG_GET_ARGS) {				\
+	return _get_Genericu32Table(CONFIG_GET_NAMES,	\
+		tbl,sizeof(tbl)/sizeof(tbl0)		\
+	);						\
+}							\
+							\
+static int __unused__					\
+_put_##name(CONFIG_PUT_ARGS) {				\
+	return _put_Genericu32Table(CONFIG_PUT_NAMES,	\
+		tbl,sizeof(tbl)/sizeof(tbl0)		\
+	);						\
 }
 
 #define GENERICI16TABLE(name,tbl) 			\
 static int						\
 _get_##name(CONFIG_GET_ARGS) {				\
-	return _get_GenericI16Table(CONFIG_GET_NAMES,	\
+	return _get_Generici16Table(CONFIG_GET_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }							\
 							\
 static int __unused__					\
 _put_##name(CONFIG_PUT_ARGS) {				\
-	return _put_GenericI16Table(CONFIG_PUT_NAMES,	\
+	return _put_Generici16Table(CONFIG_PUT_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }
 
-static int
-_get_Generic8Table(CONFIG_GET_ARGS, struct deviceproptableu8* tbl, int tblsize) {
-	int i, j;
-	int isset = FALSE, isset2 = FALSE;
-
-	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
-		if ((dpd->DataType != PTP_DTC_UINT8) && (dpd->DataType != PTP_DTC_INT8)) {
-			GP_LOG_D ("no int8 prop in 8bit table code");
-			return GP_ERROR;
-		}
-		gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
-		gp_widget_set_name (*widget, menu->name);
-		for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
-			isset = FALSE;
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == dpd->FORM.Enum.SupportedValuei.u8) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.u8) {
-						isset2 = TRUE;
-						gp_widget_set_value (*widget, _(tblj.label));
-					}
-					isset = TRUE;
-					break;
-				}
-			}
-			if (!isset) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04x"), dpd->FORM.Enum.SupportedValuei.u8);
-				gp_widget_add_choice (*widget, buf);
-				if (dpd->FORM.Enum.SupportedValuei.u8 == dpd->CurrentValue.u8)
-					gp_widget_set_value (*widget, buf);
-			}
-		}
-		if (!isset2) {
-			char buf200;
-			sprintf(buf, _("Unknown value %04x"), dpd->CurrentValue.u8);
-			gp_widget_add_choice (*widget, buf);
-			gp_widget_set_value (*widget, buf);
-		}
-		return (GP_OK);
-	}
-	if (dpd->FormFlag & PTP_DPFF_Range) {
-		if ((dpd->DataType != PTP_DTC_UINT8) && (dpd->DataType != PTP_DTC_INT8)) {
-			GP_LOG_D ("no int8 prop in 8bit table code");
-			return GP_ERROR;
-		}
-		gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
-		gp_widget_set_name (*widget, menu->name);
-		for (	i = dpd->FORM.Range.MinimumValue.u8;
-			i <= dpd->FORM.Range.MaximumValue.u8;
-			i+= dpd->FORM.Range.StepSize.u8
-		) {
-			isset = FALSE;
-			for (j=0;j<tblsize;j++) {
-				if ((tblj.value == i) &&
-				    ((tblj.vendor_id == 0) ||
-				     (tblj.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-				) {
-					gp_widget_add_choice (*widget, _(tblj.label));
-					if (tblj.value == dpd->CurrentValue.u8) {
-						isset2 = TRUE;
-						gp_widget_set_value (*widget, _(tblj.label));
-					}
-					isset = TRUE;
-					break;
-				}
-			}
-			if (!isset) {
-				char buf200;
-				sprintf(buf, _("Unknown value %04x"), i);
-				gp_widget_add_choice (*widget, buf);
-				if (i == dpd->CurrentValue.u8) {
-					isset2 = TRUE;
-					gp_widget_set_value (*widget, buf);
-				}
-			}
-
-			/* device might report stepsize 0. but we do at least 1 round */
-			if (dpd->FORM.Range.StepSize.i16 == 0)
-				break;
-		}
-		if (!isset2) {
-			char buf200;
-			sprintf(buf, _("Unknown value %04x"), dpd->CurrentValue.u8);
-			gp_widget_add_choice (*widget, buf);
-			gp_widget_set_value (*widget, buf);
-		}
-		return (GP_OK);
-	}
-	return (GP_ERROR);
-}
-
-
-static int
-_put_Generic8Table(CONFIG_PUT_ARGS, struct deviceproptableu8* tbl, int tblsize) {
-	char *value;
-	int i, intval;
-
-	CR (gp_widget_get_value(widget, &value));
-	for (i=0;i<tblsize;i++) {
-		if (!strcmp(_(tbli.label),value) &&
-		    ((tbli.vendor_id == 0) || (tbli.vendor_id == camera->pl->params.deviceinfo.VendorExtensionID))
-		) {
-			propval->u8 = tbli.value;
-			return GP_OK;
-		}
-	}
-	if (!sscanf(value, _("Unknown value %04x"), &intval))
-		return (GP_ERROR);
-	propval->u8 = intval;
-	return GP_OK;
-}
-
 #define GENERIC8TABLE(name,tbl) 			\
 static int						\
 _get_##name(CONFIG_GET_ARGS) {				\
-	return _get_Generic8Table(CONFIG_GET_NAMES,	\
+	return _get_Genericu8Table(CONFIG_GET_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }							\
 							\
 static int __unused__					\
 _put_##name(CONFIG_PUT_ARGS) {				\
-	return _put_Generic8Table(CONFIG_PUT_NAMES,	\
+	return _put_Genericu8Table(CONFIG_PUT_NAMES,	\
 		tbl,sizeof(tbl)/sizeof(tbl0)		\
 	);						\
 }
 
+#define GENERICI8TABLE(name,tbl) 			\
+static int						\
+_get_##name(CONFIG_GET_ARGS) {				\
+	return _get_Generici8Table(CONFIG_GET_NAMES,	\
+		tbl,sizeof(tbl)/sizeof(tbl0)		\
+	);						\
+}							\
+							\
+static int __unused__					\
+_put_##name(CONFIG_PUT_ARGS) {				\
+	return _put_Generici8Table(CONFIG_PUT_NAMES,	\
+		tbl,sizeof(tbl)/sizeof(tbl0)		\
+	);						\
+}
 
 static int
 _get_AUINT8_as_CHAR_ARRAY(CONFIG_GET_ARGS) {
@@ -1173,6 +985,22 @@
 }
 
 static int
+_get_STR_ENUMList (CONFIG_GET_ARGS) {
+	int j;
+
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return GP_ERROR;
+	if (dpd->DataType != PTP_DTC_STR)
+		return GP_ERROR;
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	for (j=0;j<dpd->FORM.Enum.NumberOfValues; j++)
+		gp_widget_add_choice (*widget,dpd->FORM.Enum.SupportedValuej.str);
+	gp_widget_set_value (*widget,dpd->CurrentValue.str);
+	return GP_OK;
+}
+
+static int
 _put_STR(CONFIG_PUT_ARGS) {
 	const char *string;
 
@@ -1189,7 +1017,7 @@
 	CR (gp_widget_get_value(widget, &value));
 	memset(propval,0,sizeof(PTPPropertyValue));
 	/* add \0 ? */
-	C_MEM (propval->a.v = malloc((strlen(value)+1)*sizeof(PTPPropertyValue)));
+	C_MEM (propval->a.v = calloc((strlen(value)+1),sizeof(PTPPropertyValue)));
 	propval->a.count = strlen(value)+1;
 	for (i=0;i<strlen(value)+1;i++)
 		propval->a.vi.u8 = valuei;
@@ -1199,7 +1027,7 @@
 static int
 _get_Range_INT8(CONFIG_GET_ARGS) {
 	float CurrentValue;
-	
+
 	if (dpd->FormFlag != PTP_DPFF_Range)
 		return (GP_ERROR_NOT_SUPPORTED);
 	if (dpd->DataType != PTP_DTC_INT8)
@@ -1225,7 +1053,7 @@
 static int
 _get_Range_UINT8(CONFIG_GET_ARGS) {
 	float CurrentValue;
-	
+
 	if (dpd->FormFlag != PTP_DPFF_Range)
 		return (GP_ERROR_NOT_SUPPORTED);
 	if (dpd->DataType != PTP_DTC_UINT8)
@@ -1248,81 +1076,152 @@
 	return (GP_OK);
 }
 
+static int
+_get_Fuji_Totalcount(CONFIG_GET_ARGS) {
+	char buf20;
+
+	sprintf(buf,"%d",dpd->CurrentValue.u32 >> 16);
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	gp_widget_set_value (*widget, buf);
+	return	GP_OK;
+}
+
 /* generic int getter */
 static int
 _get_INT(CONFIG_GET_ARGS) {
 	char value64;
+	float	rvalue = 0;
 
 	switch (dpd->DataType) {
 	case PTP_DTC_UINT32:
-		sprintf (value, "%u", dpd->CurrentValue.u32 );
+		sprintf (value, "%u", dpd->CurrentValue.u32 ); rvalue = dpd->CurrentValue.u32;
 		break;
 	case PTP_DTC_INT32:
-		sprintf (value, "%d", dpd->CurrentValue.i32 );
+		sprintf (value, "%d", dpd->CurrentValue.i32 ); rvalue = dpd->CurrentValue.i32;
 		break;
 	case PTP_DTC_UINT16:
-		sprintf (value, "%u", dpd->CurrentValue.u16 );
+		sprintf (value, "%u", dpd->CurrentValue.u16 ); rvalue = dpd->CurrentValue.u16;
 		break;
 	case PTP_DTC_INT16:
-		sprintf (value, "%d", dpd->CurrentValue.i16 );
+		sprintf (value, "%d", dpd->CurrentValue.i16 ); rvalue = dpd->CurrentValue.i16;
 		break;
 	case PTP_DTC_UINT8:
-		sprintf (value, "%u", dpd->CurrentValue.u8 );
+		sprintf (value, "%u", dpd->CurrentValue.u8 ); rvalue = dpd->CurrentValue.u8;
 		break;
 	case PTP_DTC_INT8:
-		sprintf (value, "%d", dpd->CurrentValue.i8 );
+		sprintf (value, "%d", dpd->CurrentValue.i8 ); rvalue = dpd->CurrentValue.i8;
 		break;
 	default:
 		sprintf (value,_("unexpected datatype %i"),dpd->DataType);
 		return GP_ERROR;
 	}
-	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
-	gp_widget_set_name (*widget, menu->name);
-	gp_widget_set_value (*widget,value);
+	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+		gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+		gp_widget_set_name (*widget, menu->name);
+		gp_widget_set_value (*widget, value); /* text */
+	} else {
+		if (dpd->FormFlag == PTP_DPFF_Range) {
+			gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
+			gp_widget_set_name (*widget, menu->name);
+			gp_widget_set_value (*widget, &rvalue); /* float */
+		} else {
+			gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+			gp_widget_set_name (*widget, menu->name);
+			gp_widget_set_value (*widget, value); /* text */
+		}
+	}
+
+	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+		int i;
+
+		for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++) {
+			switch (dpd->DataType) {
+			case PTP_DTC_UINT32:	sprintf (value, "%u", dpd->FORM.Enum.SupportedValuei.u32 ); break;
+			case PTP_DTC_INT32:	sprintf (value, "%d", dpd->FORM.Enum.SupportedValuei.i32 ); break;
+			case PTP_DTC_UINT16:	sprintf (value, "%u", dpd->FORM.Enum.SupportedValuei.u16 ); break;
+			case PTP_DTC_INT16:	sprintf (value, "%d", dpd->FORM.Enum.SupportedValuei.i16 ); break;
+			case PTP_DTC_UINT8:	sprintf (value, "%u", dpd->FORM.Enum.SupportedValuei.u8  ); break;
+			case PTP_DTC_INT8:	sprintf (value, "%d", dpd->FORM.Enum.SupportedValuei.i8  ); break;
+			default: sprintf (value,_("unexpected datatype %i"),dpd->DataType); return GP_ERROR;
+			}
+			gp_widget_add_choice (*widget,value);
+		}
+	}
+	if (dpd->FormFlag == PTP_DPFF_Range) {
+		float b = 0, t = 0, s = 0;
+
+#define X(type,u) case type: b = (float)dpd->FORM.Range.MinimumValue.u; t = (float)dpd->FORM.Range.MaximumValue.u; s = (float)dpd->FORM.Range.StepSize.u; break;
+		switch (dpd->DataType) {
+		X(PTP_DTC_UINT32,u32)
+		X(PTP_DTC_INT32,i32)
+		X(PTP_DTC_UINT16,u16)
+		X(PTP_DTC_INT16,i16)
+		X(PTP_DTC_UINT8,u8)
+		X(PTP_DTC_INT8,i8)
+		}
+#undef X
+		gp_widget_set_range (*widget, b, t, s);
+	}
 	return GP_OK;
 }
 
 static int
 _put_INT(CONFIG_PUT_ARGS) {
-	char *value;
-	unsigned int u;
-	int i;
+	if (dpd->FormFlag == PTP_DPFF_Range) {
+		float f;
 
-	CR (gp_widget_get_value(widget, &value));
+		CR (gp_widget_get_value(widget, &f));
+		switch (dpd->DataType) {
+		case PTP_DTC_UINT32:	propval->u32 = f; break;
+		case PTP_DTC_INT32:	propval->i32 = f; break;
+		case PTP_DTC_UINT16:	propval->u16 = f; break;
+		case PTP_DTC_INT16:	propval->i16 = f; break;
+		case PTP_DTC_UINT8:	propval->u8 = f; break;
+		case PTP_DTC_INT8:	propval->i8 = f; break;
+		}
+		return GP_OK;
+	} else {
+		char *value;
+		unsigned int u;
+		int i;
 
-	switch (dpd->DataType) {
-	case PTP_DTC_UINT32:
-	case PTP_DTC_UINT16:
-	case PTP_DTC_UINT8:
-		C_PARAMS (1 == sscanf (value, "%u", &u ));
-		break;
-	case PTP_DTC_INT32:
-	case PTP_DTC_INT16:
-	case PTP_DTC_INT8:
-		C_PARAMS (1 == sscanf (value, "%d", &i ));
-		break;
-	default:
-		return GP_ERROR;
-	}
-	switch (dpd->DataType) {
-	case PTP_DTC_UINT32:
-		propval->u32 = u;
-		break;
-	case PTP_DTC_INT32:
-		propval->i32 = i;
-		break;
-	case PTP_DTC_UINT16:
-		propval->u16 = u;
-		break;
-	case PTP_DTC_INT16:
-		propval->i16 = i;
-		break;
-	case PTP_DTC_UINT8:
-		propval->u8 = u;
-		break;
-	case PTP_DTC_INT8:
-		propval->i8 = i;
-		break;
+		CR (gp_widget_get_value(widget, &value));
+
+		switch (dpd->DataType) {
+		case PTP_DTC_UINT32:
+		case PTP_DTC_UINT16:
+		case PTP_DTC_UINT8:
+			C_PARAMS (1 == sscanf (value, "%u", &u ));
+			break;
+		case PTP_DTC_INT32:
+		case PTP_DTC_INT16:
+		case PTP_DTC_INT8:
+			C_PARAMS (1 == sscanf (value, "%d", &i ));
+			break;
+		default:
+			return GP_ERROR;
+		}
+		switch (dpd->DataType) {
+		case PTP_DTC_UINT32:
+			propval->u32 = u;
+			break;
+		case PTP_DTC_INT32:
+			propval->i32 = i;
+			break;
+		case PTP_DTC_UINT16:
+			propval->u16 = u;
+			break;
+		case PTP_DTC_INT16:
+			propval->i16 = i;
+			break;
+		case PTP_DTC_UINT8:
+			propval->u8 = u;
+			break;
+		case PTP_DTC_INT8:
+			propval->i8 = i;
+			break;
+		}
 	}
 	return GP_OK;
 }
@@ -1396,19 +1295,25 @@
 	PTPPropertyValue	propval;						\
 	inttype			origval;						\
 	time_t			start,end;						\
+	int			tries = 100;	/* 100 steps allowed towards the new value */	\
+	int			firstloop = 1;						\
 											\
 	GP_LOG_D("setting 0x%04x to 0x%08x", prop, value);				\
 											\
+	C_PTP_REP (ptp_sony_getalldevicepropdesc (params));				\
 	C_PTP_REP (ptp_generic_getdevicepropdesc (params, prop, &dpd));			\
 	if (value == dpd.CurrentValue.bits) {						\
 		GP_LOG_D("value is already 0x%08x", value);				\
 		return GP_OK;								\
 	}										\
+fallback:										\
+	useenumorder = useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration) && dpd.FORM.Enum.NumberOfValues; \
 	do {										\
+		int posorig = -1, posnew = -1, posnow = -1; \
 		origval = dpd.CurrentValue.bits;					\
 		/* if it is a ENUM, the camera will walk through the ENUM */		\
-		if (useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration)) {		\
-			int i, posorig = -1, posnew = -1;				\
+		if (useenumorder) {		\
+			int i;				\
 											\
 			for (i=0;i<dpd.FORM.Enum.NumberOfValues;i++) {			\
 				if (origval == dpd.FORM.Enum.SupportedValuei.bits)	\
@@ -1425,10 +1330,22 @@
 			GP_LOG_D("posnew %d, posorig %d, value %d", posnew, posorig, value);	\
 			if (posnew == posorig)						\
 				break;							\
+			/*								\
+			Note: Sony seems to report values in an enum that are not	\
+			actually supported under certain configurations (e.g. ISO).	\
+			If we use `posnew - posorig` to ask camera to jump to the	\
+			required position, it will end up overshooting, and on the next	\
+			cycle will try to move by the same `posnew - posorig` in the	\
+			opposite direction, overshoot again, and so on infinitely.	\
+			Instead, we have to ask camera to +/- values one by one and read	\
+			back the value it _actually_ switched to each time.		\
+			Update: try the large jump first, if that does not work, use single jumps \
+			*/ 								\
 			if (posnew > posorig)						\
-				propval.u8 = 0x01;					\
+				propval.u8 = firstloop?(posnew-posorig):0x01;		\
 			else								\
-				propval.u8 = 0xff;					\
+				propval.u8 = firstloop?(0x100-(posorig-posnew)):0xff;	\
+			firstloop = 0;							\
 		} else {								\
 			if (value == origval)						\
 				break;							\
@@ -1461,6 +1378,31 @@
 			time(&end);							\
 		} while (end-start <= 3);						\
 											\
+		int overshoot = 0; \
+		if (useenumorder) { \
+			for (int i=0;i<dpd.FORM.Enum.NumberOfValues;i++) {			\
+				if (dpd.CurrentValue.bits == dpd.FORM.Enum.SupportedValuei.bits) {	\
+					posnow = i;					\
+					break;						\
+				}							\
+			}								\
+			GP_LOG_D("posnow %d, value %d", posnow, dpd.CurrentValue.bits);	\
+											\
+			/*								\
+			 If we made a small +-1 adjustment, check for overshoot.	\
+			 However, use enum position instead of value itself for comparisons as enums		\
+			 are not always sorted (e.g. Auto ISO has higher numerical value but comes earlier).	\
+		    */ 									\
+			overshoot = ((propval.u8 == 0x01) && (posnow > posnew)) || ((propval.u8 == 0xff) && (posnow < posnew)); \
+		} else { 								\
+			overshoot = ((propval.u8 == 0x01) && (dpd.CurrentValue.bits > value)) || ((propval.u8 == 0xff) && (dpd.CurrentValue.bits < value)); \
+		} 									\
+											\
+		if (overshoot) {							\
+			GP_LOG_D ("We overshooted value, maybe not exact match possible. Break!");	\
+			break;								\
+		}									\
+											\
 		if (dpd.CurrentValue.bits == value) {					\
 			GP_LOG_D ("Value matched!");					\
 			break;								\
@@ -1470,20 +1412,12 @@
 			break;								\
 		}									\
 		/* We did not get there. Did we hit 0? */				\
-		if (useenumorder && (dpd.FormFlag & PTP_DPFF_Enumeration)) {		\
-			int i, posnow = -1;						\
-											\
-			for (i=0;i<dpd.FORM.Enum.NumberOfValues;i++) {			\
-				if (dpd.CurrentValue.bits == dpd.FORM.Enum.SupportedValuei.bits) {	\
-					posnow = i;					\
-					break;						\
-				}							\
-			}								\
+		if (useenumorder) {							\
 			if (posnow == -1) {						\
-				gp_context_error (context, _("Now value is not in enumeration."));\
-				return GP_ERROR_BAD_PARAMETERS;				\
+				GP_LOG_D ("Now value is not in enumeration, falling back to ordered tries.");\
+				useenumorder = 0;					\
+				goto fallback;						\
 			}								\
-			GP_LOG_D("posnow %d, value %d", posnow, dpd.CurrentValue.bits);	\
 			if ((posnow == 0) && (propval.u8 == 0xff)) {			\
 				gp_context_error (context, _("Sony was not able to set the new value, is it valid?"));	\
 				GP_LOG_D ("hit bottom of enumeration, not good.");	\
@@ -1495,7 +1429,7 @@
 				return GP_ERROR;					\
 			}								\
 		} 									\
-	} while (1);									\
+	} while (tries--);/* occasionally we fail, make an escape path */		\
 	return GP_OK;									\
 }
 
@@ -1531,6 +1465,8 @@
 	{ N_("Shade"),			0x8011, PTP_VENDOR_NIKON },
 	{ N_("Color Temperature"),	0x8012, PTP_VENDOR_NIKON },
 	{ N_("Preset"),			0x8013, PTP_VENDOR_NIKON },
+	{ N_("Off"),			0x8014, PTP_VENDOR_NIKON },
+	{ N_("Natural light auto"),	0x8016, PTP_VENDOR_NIKON },
 
 	{ N_("Fluorescent Lamp 1"),	0x8001, PTP_VENDOR_FUJI },
 	{ N_("Fluorescent Lamp 2"),	0x8002, PTP_VENDOR_FUJI },
@@ -1568,6 +1504,23 @@
 };
 GENERIC16TABLE(WhiteBalance,whitebalance)
 
+static struct deviceproptableu16 olympus_whitebalance = {
+	{ N_("Automatic"),		0x0001, 0 },
+	{ N_("Daylight"),		0x0002, 0 },
+	{ N_("Shade"),			0x0003, 0 },
+	{ N_("Cloudy"),			0x0004, 0 },
+	{ N_("Tungsten"),		0x0005, 0 },
+	{ N_("Fluorescent"),		0x0006, 0 },
+	{ N_("Underwater"),		0x0007, 0 },
+	{ N_("Flash"),			0x0008, 0 },
+	{ N_("Preset 1"),		0x0009, 0 },
+	{ N_("Preset 2"),		0x000a, 0 },
+	{ N_("Preset 3"),		0x000b, 0 },
+	{ N_("Preset 4"),		0x000c, 0 },
+	{ N_("Custom"),			0x000d, 0 },
+};
+GENERIC16TABLE(Olympus_WhiteBalance,olympus_whitebalance)
+
 static struct deviceproptableu16 fuji_imageformat = {
 	{ N_("RAW"),			1,	PTP_VENDOR_FUJI },
 	{ N_("JPEG Fine"),		2,	PTP_VENDOR_FUJI },
@@ -1577,6 +1530,19 @@
 };
 GENERIC16TABLE(Fuji_ImageFormat,fuji_imageformat)
 
+static struct deviceproptableu16 olympus_imageformat = {
+	{ N_("RAW"),			0x020,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Large Fine JPEG"),	0x101,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Large Normal JPEG"),	0x102,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Medium Normal JPEG"),	0x103,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Small Normal JPEG"),	0x104,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Large Fine JPEG+RAW"),	0x121,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Large Normal JPEG+RAW"),	0x122,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Medium Normal JPEG+RAW"),	0x123,	PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Small Normal JPEG+RAW"),	0x124,	PTP_VENDOR_GP_OLYMPUS_OMD },
+};
+GENERIC16TABLE(Olympus_Imageformat,olympus_imageformat)
+
 static struct deviceproptableu16 fuji_releasemode = {
 	{ N_("Single frame"),		1,	PTP_VENDOR_FUJI },
 	{ N_("Continuous low speed"),	2,	PTP_VENDOR_FUJI },
@@ -1586,41 +1552,107 @@
 };
 GENERIC16TABLE(Fuji_ReleaseMode,fuji_releasemode)
 
+static struct deviceproptableu16 fuji_filmsimulation = {
+	{ N_("PROVIA/Standard"),            1,	PTP_VENDOR_FUJI },
+	{ N_("Velvia/Vivid"),               2,	PTP_VENDOR_FUJI },
+	{ N_("ASTIA/Soft"),                 3,	PTP_VENDOR_FUJI },
+	{ N_("PRO Neg.Hi"),                 4,	PTP_VENDOR_FUJI },
+	{ N_("PRO Neg.Std"),                5,	PTP_VENDOR_FUJI },
+	{ N_("Black & White"),              6,	PTP_VENDOR_FUJI },
+	{ N_("Black & White+Ye Filter"),    7,	PTP_VENDOR_FUJI },
+	{ N_("Black & White+R Filter"),     8,	PTP_VENDOR_FUJI },
+	{ N_("Black & White+G Filter"),     9,	PTP_VENDOR_FUJI },
+	{ N_("Sepia"),                      10,	PTP_VENDOR_FUJI },
+	{ N_("Classic Chrome"),             11,	PTP_VENDOR_FUJI },
+	{ N_("ACROS"),                      12,	PTP_VENDOR_FUJI },
+	{ N_("ACROS+Ye Filter"),            13,	PTP_VENDOR_FUJI },
+	{ N_("ACROS+R Filter,"),            14,	PTP_VENDOR_FUJI },
+	{ N_("ACROS+G Filter"),             15,	PTP_VENDOR_FUJI },
+	{ N_("ETERNA/Cinema"),              16,	PTP_VENDOR_FUJI },
+	{ N_("Classic Neg"),                17,	PTP_VENDOR_FUJI },
+	{ N_("ETERNA BLEACH BYPASS"),       18,	PTP_VENDOR_FUJI },
+};
+GENERIC16TABLE(Fuji_FilmSimulation,fuji_filmsimulation)
+
+static struct deviceproptableu16 fuji_prioritymode = {
+	{ N_("Camera"),	1,	PTP_VENDOR_FUJI },
+	{ N_("USB"),	2,	PTP_VENDOR_FUJI },
+};
+GENERIC16TABLE(Fuji_PriorityMode,fuji_prioritymode)
+
 static int
-_get_ImageSize(CONFIG_GET_ARGS) {
+_get_ExpCompensation(CONFIG_GET_ARGS) {
 	int j;
+	char buf13;
 
 	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
-		return(GP_ERROR);
-	if (dpd->DataType != PTP_DTC_STR)
-		return(GP_ERROR);
+		return GP_ERROR;
+	if (dpd->DataType != PTP_DTC_INT16)
+		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	for (j=0;j<dpd->FORM.Enum.NumberOfValues; j++) {
-		gp_widget_add_choice (*widget,dpd->FORM.Enum.SupportedValuej.str);
+		sprintf(buf, "%g", dpd->FORM.Enum.SupportedValuej.i16/1000.0);
+		gp_widget_add_choice (*widget,buf);
 	}
-	gp_widget_set_value (*widget,dpd->CurrentValue.str);
+	sprintf(buf, "%g", dpd->CurrentValue.i16/1000.0);
+	gp_widget_set_value (*widget,buf);
 	return GP_OK;
 }
 
 static int
-_put_ImageSize(CONFIG_PUT_ARGS) {
-	char *value;
+_put_ExpCompensation(CONFIG_PUT_ARGS) {
+	char	*value;
+	float	x;
+	int16_t	val, targetval = 0;
+	int	mindist = 65535, j;
 
 	CR (gp_widget_get_value(widget, &value));
-	C_MEM (propval->str = strdup (value));
-	return(GP_OK);
+	if (1 != sscanf(value,"%g", &x))
+		return GP_ERROR;
+
+	/* float processing is not always hitting the right values, but close */
+	val = x*1000.0;
+	for (j=0;j<dpd->FORM.Enum.NumberOfValues; j++) {
+		if (abs(dpd->FORM.Enum.SupportedValuej.i16 - val) < mindist) {
+			mindist = abs(dpd->FORM.Enum.SupportedValuej.i16 - val);
+			targetval = dpd->FORM.Enum.SupportedValuej.i16;
+		}
+	}
+	propval->i16 = targetval;
+	return GP_OK ;
 }
 
+/* old method, uses stepping */
+static int
+_put_Sony_ExpCompensation(CONFIG_PUT_ARGS) {
+	int ret;
 
+	ret = _put_ExpCompensation(CONFIG_PUT_NAMES);
+	if (ret != GP_OK) return ret;
+	*alreadyset = 1;
+	return _put_sony_value_i16 (&camera->pl->params, dpd->DevicePropertyCode, propval->i16, 0);
+}
+
+/* new method, can set directly */
 static int
-_get_ExpCompensation(CONFIG_GET_ARGS) {
+_put_Sony_ExpCompensation2(CONFIG_PUT_ARGS) {
+	int ret;
+
+	ret = _put_ExpCompensation(CONFIG_PUT_NAMES);
+	if (ret != GP_OK) return ret;
+	*alreadyset = 1;
+	return translate_ptp_result (ptp_sony_setdevicecontrolvaluea (&camera->pl->params, dpd->DevicePropertyCode, propval, PTP_DTC_INT16));
+}
+
+static int
+_get_Olympus_ExpCompensation(CONFIG_GET_ARGS) {
 	int j;
 	char buf13;
 
 	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
 		return GP_ERROR;
-	if (dpd->DataType != PTP_DTC_INT16)
+	if (dpd->DataType != PTP_DTC_UINT16)
 		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
@@ -1634,7 +1666,7 @@
 }
 
 static int
-_put_ExpCompensation(CONFIG_PUT_ARGS) {
+_put_Olympus_ExpCompensation(CONFIG_PUT_ARGS) {
 	char	*value;
 	float	x;
 	int16_t	val, targetval = 0;
@@ -1656,14 +1688,6 @@
 	return GP_OK ;
 }
 
-static int
-_put_Sony_ExpCompensation(CONFIG_PUT_ARGS) {
-	int ret;
-
-	ret = _put_ExpCompensation(CONFIG_PUT_NAMES);
-	if (ret != GP_OK) return ret;
-	return _put_sony_value_i16 (&camera->pl->params, PTP_DPC_ExposureBiasCompensation, propval->i16, 0);
-}
 
 static struct deviceproptableu16 canon_assistlight = {
 	{ N_("On"),	0x0000, PTP_VENDOR_CANON },
@@ -1688,7 +1712,7 @@
 	float	f, t, b, s;
 
 	if (!(dpd->FormFlag & PTP_DPFF_Range))
-		return (GP_ERROR);
+		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
 	gp_widget_set_name (*widget,menu->name);
 	f = (float)dpd->CurrentValue.u16;
@@ -1697,7 +1721,7 @@
 	s = (float)dpd->FORM.Range.StepSize.u16;
 	gp_widget_set_range (*widget, b, t, s);
 	gp_widget_set_value (*widget, &f);
-	return (GP_OK);
+	return GP_OK;
 }
 
 static int
@@ -1711,13 +1735,75 @@
 }
 
 static int
+_get_Canon_EOS_ZoomRange(CONFIG_GET_ARGS) {
+	float	f, t, b, s;
+
+/*
+	if (!(dpd->FormFlag & PTP_DPFF_Range))
+		return GP_ERROR;
+*/
+	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	f = (float)dpd->CurrentValue.u32;
+	b = 0.0;
+	t = 1000.0;
+	s = 1.0;
+	gp_widget_set_range (*widget, b, t, s);
+	gp_widget_set_value (*widget, &f);
+	return GP_OK;
+}
+
+static int
+_put_Canon_EOS_ZoomRange(CONFIG_PUT_ARGS)
+{
+	float	f;
+
+	CR (gp_widget_get_value(widget, &f));
+	propval->u32 = (unsigned int)f;
+	return GP_OK;
+}
+
+
+/* This seems perhaps focal length * 1.000.000 */
+static int
+_get_Sony_Zoom(CONFIG_GET_ARGS) {
+	float	f, t, b, s;
+
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+	if (!(dpd->FormFlag & PTP_DPFF_Range))
+		return GP_ERROR;
+	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	f = (float)dpd->CurrentValue.u32 / 1000000;
+	b = (float)dpd->FORM.Range.MinimumValue.u32 / 1000000;
+	t = (float)dpd->FORM.Range.MaximumValue.u32 / 1000000;
+	s = 1;
+	gp_widget_set_range (*widget, b, t, s);
+	gp_widget_set_value (*widget, &f);
+	return GP_OK;
+}
+
+static int
+_put_Sony_Zoom(CONFIG_PUT_ARGS)
+{
+	float	f;
+	PTPParams *params = &camera->pl->params;
+
+	CR (gp_widget_get_value(widget, &f));
+	propval->u32 = (uint32_t)f*1000000;
+	*alreadyset = 1;
+	return _put_sony_value_u32(params, PTP_DPC_SONY_Zoom, propval->u32, 0);
+}
+
+static int
 _get_Nikon_WBBias(CONFIG_GET_ARGS) {
 	float	f, t, b, s;
 
 	if (dpd->DataType != PTP_DTC_INT8)
-		return (GP_ERROR);
+		return GP_ERROR;
 	if (!(dpd->FormFlag & PTP_DPFF_Range))
-		return (GP_ERROR);
+		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
 	gp_widget_set_name (*widget,menu->name);
 	f = (float)dpd->CurrentValue.i8;
@@ -1739,23 +1825,40 @@
 	return (GP_OK);
 }
 
+/* This can get type 1 (INT8) , 2 (UINT8) and 4 (UINT16) */
 static int
 _get_Nikon_UWBBias(CONFIG_GET_ARGS) {
 	float	f, t, b, s;
 
-	if (dpd->DataType != PTP_DTC_UINT8)
-		return (GP_ERROR);
 	if (!(dpd->FormFlag & PTP_DPFF_Range))
-		return (GP_ERROR);
+		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
 	gp_widget_set_name (*widget,menu->name);
-	f = (float)dpd->CurrentValue.u8;
-	b = (float)dpd->FORM.Range.MinimumValue.u8;
-	t = (float)dpd->FORM.Range.MaximumValue.u8;
-	s = (float)dpd->FORM.Range.StepSize.u8;
+	switch (dpd->DataType) {
+	case PTP_DTC_UINT16:
+		f = (float)dpd->CurrentValue.u16;
+		b = (float)dpd->FORM.Range.MinimumValue.u16;
+		t = (float)dpd->FORM.Range.MaximumValue.u16;
+		s = (float)dpd->FORM.Range.StepSize.u16;
+		break;
+	case PTP_DTC_UINT8:
+		f = (float)dpd->CurrentValue.u8;
+		b = (float)dpd->FORM.Range.MinimumValue.u8;
+		t = (float)dpd->FORM.Range.MaximumValue.u8;
+		s = (float)dpd->FORM.Range.StepSize.u8;
+		break;
+	case PTP_DTC_INT8:
+		f = (float)dpd->CurrentValue.i8;
+		b = (float)dpd->FORM.Range.MinimumValue.i8;
+		t = (float)dpd->FORM.Range.MaximumValue.i8;
+		s = (float)dpd->FORM.Range.StepSize.i8;
+		break;
+	default:
+		return GP_ERROR;
+	}
 	gp_widget_set_range (*widget, b, t, s);
 	gp_widget_set_value (*widget, &f);
-	return (GP_OK);
+	return GP_OK;
 }
 
 static int
@@ -1764,8 +1867,20 @@
 	float	f;
 
 	CR (gp_widget_get_value(widget, &f));
-	propval->u8 = (unsigned char)f;
-	return (GP_OK);
+	switch (dpd->DataType) {
+	case PTP_DTC_UINT16:
+		propval->u16 = (unsigned short)f;
+		break;
+	case PTP_DTC_UINT8:
+		propval->u8 = (unsigned char)f;
+		break;
+	case PTP_DTC_INT8:
+		propval->i8 = (char)f;
+		break;
+	default:
+		return GP_ERROR;
+	}
+	return GP_OK;
 }
 
 static int
@@ -1864,7 +1979,7 @@
 	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
 		char *val;
 		int ival;
-		
+
 		CR (gp_widget_get_value(widget, &val));
 		sscanf (val, "%d", &ival);
 		propval->i8 = ival;
@@ -1873,6 +1988,48 @@
 	return (GP_ERROR);
 }
 
+static int
+_get_Nikon_MovieLoopLength(CONFIG_GET_ARGS) {
+
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+
+	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
+		char buf20;
+		int i, isset = FALSE;
+
+		gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+		gp_widget_set_name (*widget,menu->name);
+		for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
+
+			sprintf (buf, "%d", dpd->FORM.Enum.SupportedValuei.u32/10);
+			gp_widget_add_choice (*widget, buf);
+			if (dpd->FORM.Enum.SupportedValuei.u32 == dpd->CurrentValue.u32) {
+				gp_widget_set_value (*widget, buf);
+				isset = TRUE;
+			}
+		}
+		if (!isset && (dpd->FORM.Enum.NumberOfValues > 0)) {
+			sprintf (buf, "%d", dpd->FORM.Enum.SupportedValue0.u32/10);
+			gp_widget_set_value (*widget, buf);
+		}
+		return GP_OK;
+	}
+	return GP_ERROR;
+}
+
+static int
+_put_Nikon_MovieLoopLength(CONFIG_PUT_ARGS)
+{
+	char *val;
+	int ival;
+
+	CR (gp_widget_get_value(widget, &val));
+	sscanf (val, "%d", &ival);
+	propval->u32 = ival*10;
+	return GP_OK;
+}
+
 
 static struct deviceproptableu8 canon_quality = {
 	{ N_("undefined"),	0x00, 0 },
@@ -1899,7 +2056,7 @@
 	{ N_("A_DEP"),		0x05, 0 },
 	{ N_("M_DEP"),		0x06, 0 },
 	{ N_("Bulb"),		0x07, 0 },
-	/* Marcus: The SDK has more listed, but I have never seen them 
+	/* Marcus: The SDK has more listed, but I have never seen them
 	 * enumerated by the cameras. Lets leave them out for now. */
 };
 GENERIC8TABLE(Canon_ShootMode,canon_shootmode)
@@ -1921,9 +2078,50 @@
 	{ N_("Landscape"),	0x000d, 0 },
 	{ N_("Closeup"),	0x000e, 0 },
 	{ N_("Flash Off"),	0x000f, 0 },
+
+	{ N_("C2"),			0x0010, 0 },
+	{ N_("C3"),			0x0011, 0 },
+	{ N_("Creative Auto"),		0x0013, 0 },
+	{ N_("Movie"),			0x0014, 0 },
+	{ N_("Auto"),			0x0016, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Handheld Night Scene"),	0x0017, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR Backlight Control"),	0x0018, 0 },	/* EOS M6 Mark 2 */
+	{ N_("SCN"),			0x0019, 0 },
+	{ N_("Food"),			0x001b, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Grainy B/W"),		0x001e, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Soft focus"),		0x001f, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Toy camera effect"),	0x0020, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Fish-eye effect"),	0x0021, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Water painting effect"),	0x0022, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Miniature effect"),	0x0023, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR art standard"),	0x0024, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR art vivid"),		0x0025, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR art bold"),		0x0026, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR art embossed"),	0x0027, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Panning"),		0x002d, 0 },	/* EOS M6 Mark 2 */
+	{ N_("HDR"),			0x0031, 0 },
+	{ N_("Self Portrait"),		0x0032, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Hybrid Auto"),		0x0033, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Smooth skin"),		0x0034, 0 },	/* EOS M6 Mark 2 */
+	{ N_("Fv"),			0x0037, 0 },	/* EOS M6 Mark 2 */
 };
 GENERIC16TABLE(Canon_EOS_AutoExposureMode,canon_eos_autoexposuremode)
 
+static struct deviceproptableu32 canon_eos_alomode = {
+	{ N_("Standard"),				0x10000, 0 },
+	{ N_("Standard (disabled in manual exposure)"),	0x00000, 0 },
+	{ N_("Low"),					0x10101, 0 },
+	{ N_("Low (disabled in manual exposure)"),	0x00101, 0 },
+	{ N_("Off"),					0x10303, 0 },
+	{ N_("Off (disabled in manual exposure)"),	0x00303, 0 },
+	{ N_("High"),					0x10202, 0 },
+	{ N_("High (disabled in manual exposure)"),	0x00202, 0 },
+	{ N_("x1"),	0x1, 0 },
+	{ N_("x2"),	0x2, 0 },
+	{ N_("x3"),	0x3, 0 },
+};
+GENERIC32TABLE(Canon_EOS_AloMode,canon_eos_alomode)
+
 static struct deviceproptableu8 canon_flash = {
 	{ N_("off"),				0, 0 },
 	{ N_("auto"),				1, 0 },
@@ -1950,6 +2148,93 @@
 };
 GENERIC8TABLE(Nikon_FlashCommanderMode,nikon_flashcommandermode)
 
+static struct deviceproptableu8 nikon_liveviewsize = {
+	{ N_("QVGA"),		1, 0 },
+	{ N_("VGA"),		2, 0 },
+	{ N_("XGA"),		3, 0 },
+};
+GENERIC8TABLE(Nikon_LiveViewSize,nikon_liveviewsize)
+
+static struct deviceproptableu16 fuji_liveviewsize = {
+	{ N_("XGA"),		1, 0 },
+	{ N_("VGA"),		2, 0 },
+	{ N_("QVGA"),		3, 0 },
+};
+GENERIC16TABLE(Fuji_LiveViewSize,fuji_liveviewsize)
+
+static struct deviceproptableu8 sony_qx_liveviewsize = {
+	{ "640x480",		1, 0 },
+	{ "1024x768",		2, 0 },
+	{ "1920x1280",		3, 0 },
+};
+GENERIC8TABLE(Sony_QX_LiveViewSize,sony_qx_liveviewsize)
+
+static struct deviceproptablei8 sony_prioritymode = {
+	{ N_("Camera"),		0, 0 },
+	{ N_("Application"),	1, 0 },
+};
+GENERICI8TABLE(Sony_PriorityMode,sony_prioritymode)
+
+static int
+_get_Canon_LiveViewSize(CONFIG_GET_ARGS) {
+	unsigned int i;
+	unsigned int have = 0;
+	char buf20;
+
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return GP_ERROR;
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+/* actually it is a flag value, 1 = TFT, 2 = PC, 4 = MOBILE, 8 = MOBILE2 */
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++) {
+		if ((dpd->FORM.Enum.SupportedValuei.u32 & 0xe) == 0x2) {
+			if (!(have & 0x2))
+				gp_widget_add_choice (*widget, _("Large"));
+			have |= 0x2;
+			continue;
+		}
+		if ((dpd->FORM.Enum.SupportedValuei.u32 & 0xe) == 0x4) {
+			if (!(have & 0x4))
+				gp_widget_add_choice (*widget, _("Medium"));
+			have |= 0x4;
+			continue;
+		}
+		if ((dpd->FORM.Enum.SupportedValuei.u32 & 0xe) == 0x8) {
+			if (!(have & 0x8))
+				gp_widget_add_choice (*widget, _("Small"));
+			have |= 0x8;
+			continue;
+		}
+	}
+	if ((dpd->CurrentValue.u32 & 0xe) == 0x8) { gp_widget_set_value (*widget, _("Small")); return GP_OK; }
+	if ((dpd->CurrentValue.u32 & 0xe) == 0x4) { gp_widget_set_value (*widget, _("Medium")); return GP_OK; }
+	if ((dpd->CurrentValue.u32 & 0xe) == 0x2) { gp_widget_set_value (*widget, _("Large")); return GP_OK; }
+	sprintf(buf,"val %x", dpd->CurrentValue.u32);
+	gp_widget_set_value (*widget, buf);
+	return GP_OK;
+}
+
+static int
+_put_Canon_LiveViewSize(CONFIG_PUT_ARGS) {
+	char		*val;
+	unsigned int	outputval = 0;
+
+	CR (gp_widget_get_value (widget, &val));
+	if (!strcmp(val,_("Large"))) { outputval = 0x2; }
+	if (!strcmp(val,_("Medium"))) { outputval = 0x4; }
+	if (!strcmp(val,_("Small"))) { outputval = 0x8; }
+
+	if (outputval == 0)
+		return GP_ERROR_BAD_PARAMETERS;
+	/* replace the current outputsize, but keep the TFT flag */
+	propval->u32 = (dpd->CurrentValue.u32 & ~0xe) | outputval;
+	return GP_OK;
+}
+
 static struct deviceproptableu8 nikon_flashcommanderpower = {
 	{ N_("Full"),		0, 0 },
 	{ "1/2",		1, 0 },
@@ -2087,6 +2372,7 @@
 	{ N_("Faithful"),	0x85, 0 },
 	{ N_("Monochrome"),	0x86, 0 },
 	{ N_("Auto"),		0x87, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("Fine detail"),	0x88, 0 },
 	{ N_("User defined 1"),	0x21, 0 },
 	{ N_("User defined 2"),	0x22, 0 },
 	{ N_("User defined 3"),	0x23, 0 },
@@ -2099,14 +2385,14 @@
 	{ "bulb",	0x000c,0 },
 	{ "30",		0x0010,0 },
 	{ "25",		0x0013,0 },
-	{ "20",		0x0014,0 }, /* + 1/3 */
+	{ "20.3",	0x0014,0 }, /* + 1/3 */
 	{ "20",		0x0015,0 },
 	{ "15",		0x0018,0 },
 	{ "13",		0x001b,0 },
 	{ "10",		0x001c,0 },
-	{ "10",		0x001d,0 }, /* 10.4 */
+	{ "10.3",	0x001d,0 }, /* 10.4 */
 	{ "8",		0x0020,0 },
-	{ "6",		0x0023,0 }, /* + 1/3 */
+	{ "6.3",	0x0023,0 }, /* + 1/3 */
 	{ "6",		0x0024,0 },
 	{ "5",		0x0025,0 },
 	{ "4",		0x0028,0 },
@@ -2211,17 +2497,20 @@
 static struct deviceproptableu8 sony_aspectratio = {
 	{ N_("3:2"),		0x01, 0 },
 	{ N_("16:9"),		0x02, 0 },
+	{ N_("4:3"),		0x03, 0 },
+	{ N_("1:1"),		0x04, 0 },
 };
 GENERIC8TABLE(Sony_AspectRatio,sony_aspectratio)
 
 /* values are from 6D */
-static struct deviceproptableu16 canon_eos_aspectratio = {
+static struct deviceproptableu32 canon_eos_aspectratio = {
 	{ "3:2",	0x0000, 0},
 	{ "1:1",	0x0001, 0},
 	{ "4:3",	0x0002, 0},
 	{ "16:9",	0x0007, 0},
+	{ "1.6x",	0x000d, 0}, /* guess , EOS R */
 };
-GENERIC16TABLE(Canon_EOS_AspectRatio,canon_eos_aspectratio)
+GENERIC32TABLE(Canon_EOS_AspectRatio,canon_eos_aspectratio)
 
 /* actually in 1/10s of a second, but only 3 values in use */
 static struct deviceproptableu16 canon_selftimer = {
@@ -2231,25 +2520,41 @@
 };
 GENERIC16TABLE(Canon_SelfTimer,canon_selftimer)
 
-/* FIXME: Canon EOS 5D Mark III has more enumerations. Need to determine
- * what they mean.
- */
-/* actually it is a flag value, 1 = TFT, 2 = PC */
-static struct deviceproptableu16 canon_eos_cameraoutput = {
+/* actually it is a flag value, 1 = TFT, 2 = PC, 4 = MOBILE, 8 = MOBILE2 */
+static struct deviceproptableu32 canon_eos_cameraoutput = {
 	{ N_("Off"),		0, 0 }, /*On 5DM3, LCD/TFT is off, mirror down and optical view finder enabled */
 	{ N_("TFT"),		1, 0 },
 	{ N_("PC"), 		2, 0 },
 	{ N_("TFT + PC"), 	3, 0 },
-	/*The below show up as possible on Canon 5D MIII, but unknown what exactly they are */
-	{ N_("Setting 4"),	4, 0 },
-	{ N_("Setting 5"),	5, 0 }, /*5DM3 - Appears to be dup of enum: 1. Probably something else is also enabled. */
-	{ N_("Setting 6"),	6, 0 }, /*5DM3 - Appears to be dup of enum: 2. */
-	{ N_("Setting 7"),	7, 0 }, /*5DM3 - Appears to be dup of enum: 3. */
+	{ N_("MOBILE"),		4, 0 },
+	{ N_("TFT + MOBILE"),	5, 0 },
+	{ N_("PC + MOBILE"),	6, 0 },
+	{ N_("TFT + PC + MOBILE"), 7, 0 },
+	{ N_("MOBILE2"),	8, 0 },
+	{ N_("TFT + MOBILE2"),	9, 0 },
+	{ N_("PC + MOBILE2"),	10, 0 },
+	{ N_("TFT + PC + MOBILE2"), 11, 0 },
+};
+GENERIC32TABLE(Canon_EOS_CameraOutput,canon_eos_cameraoutput)
+
+static struct deviceproptableu32 canon_eos_afmethod = {
+	{ N_("Quick"),			0, 0 },
+	{ N_("Live"),			1, 0 },
+	{ N_("LiveFace"), 		2, 0 },
+	{ N_("LiveMulti"), 		3, 0 },
+	{ N_("LiveZone"),		4, 0 },
+	{ N_("LiveSingleExpandCross"),	5, 0 },
+	{ N_("LiveSingleExpandSurround"),	6, 0 },
+	{ N_("LiveZoneLargeH"), 	7, 0 },
+	{ N_("LiveZoneLargeV"),		8, 0 },
+	{ N_("LiveCatchAF"),		9, 0 },
+	{ N_("LiveSpotAF"),		10, 0 },
 };
-GENERIC16TABLE(Canon_EOS_CameraOutput,canon_eos_cameraoutput)
+GENERIC32TABLE(Canon_EOS_AFMethod,canon_eos_afmethod)
 
 static struct deviceproptableu16 canon_eos_evfrecordtarget = {
 	{ N_("None"),		0, 0 },
+	{ N_("SDRAM"),		3, 0 },
 	{ N_("Card"),		4, 0 },
 };
 GENERIC16TABLE(Canon_EOS_EVFRecordTarget,canon_eos_evfrecordtarget)
@@ -2342,7 +2647,6 @@
 	return GP_OK;
 }
 
-
 static struct deviceproptableu16 canon_isospeed = {
 	{ N_("Factory Default"),0xffff, 0 },
 	{ "6",			0x0028, 0 },
@@ -2379,16 +2683,23 @@
 	{ "32000",		0x008b, 0 },
 	{ "40000",		0x008d, 0 },
 	{ "51200",		0x0090, 0 },
+	{ "64000",		0x0093, 0 },
+	{ "80000",		0x0095, 0 },
 	{ "102400",		0x0098, 0 },
+	{ "204800",		0x00a0, 0 },
+	{ "409600",		0x00a8, 0 },
+	{ "819200",		0x00b0, 0 },
 	{ N_("Auto"),		0x0000, 0 },
+	{ N_("Auto ISO"),	0x0001, 0 },
 };
 GENERIC16TABLE(Canon_ISO,canon_isospeed)
 
 /* see ptp-pack.c:ptp_unpack_EOS_ImageFormat */
 static struct deviceproptableu16 canon_eos_image_format = {
-	{ N_("RAW"),				0x0400, 0 },
-	{ N_("mRAW"),				0x1400, 0 },
-	{ N_("sRAW"),				0x2400, 0 },
+	{ N_("RAW"),				0x0c00, 0 },
+	{ N_("mRAW"),				0x1c00, 0 },
+	{ N_("sRAW"),				0x2c00, 0 },
+	{ N_("cRAW"),				0x0b00, 0 },
 	{ N_("Large Fine JPEG"),		0x0300, 0 },
 	{ N_("Large Normal JPEG"),		0x0200, 0 },
 	{ N_("Medium Fine JPEG"),		0x1300, 0 },
@@ -2399,38 +2710,68 @@
 	{ N_("Small Normal JPEG"),		0xd200, 0 },
 	{ N_("Smaller JPEG"),			0xe300, 0 },
 	{ N_("Tiny JPEG"),			0xf300, 0 },
-	{ N_("RAW + Large Fine JPEG"),		0x0403, 0 },
-	{ N_("mRAW + Large Fine JPEG"),		0x1403, 0 },
-	{ N_("sRAW + Large Fine JPEG"),		0x2403, 0 },
-	{ N_("RAW + Medium Fine JPEG"),		0x0413, 0 },
-	{ N_("mRAW + Medium Fine JPEG"),	0x1413, 0 },
-	{ N_("sRAW + Medium Fine JPEG"),	0x2413, 0 },
-	{ N_("RAW + Small Fine JPEG"),		0x0423, 0 },
-	{ N_("RAW + Small Fine JPEG"),		0x04d3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("mRAW + Small Fine JPEG"),		0x1423, 0 },
-	{ N_("mRAW + Small Fine JPEG"),		0x14d3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("sRAW + Small Fine JPEG"),		0x2423, 0 },
-	{ N_("sRAW + Small Fine JPEG"),		0x24d3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("RAW + Large Normal JPEG"),	0x0402, 0 },
-	{ N_("mRAW + Large Normal JPEG"),	0x1402, 0 },
-	{ N_("sRAW + Large Normal JPEG"),	0x2402, 0 },
-	{ N_("RAW + Medium Normal JPEG"),	0x0412, 0 },
-	{ N_("mRAW + Medium Normal JPEG"),	0x1412, 0 },
-	{ N_("sRAW + Medium Normal JPEG"),	0x2412, 0 },
-	{ N_("RAW + Small Normal JPEG"),	0x0422, 0 },
-	{ N_("RAW + Small Normal JPEG"),	0x04d2, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("mRAW + Small Normal JPEG"),	0x1422, 0 },
-	{ N_("mRAW + Small Normal JPEG"),	0x14d2, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("sRAW + Small Normal JPEG"),	0x2422, 0 },
-	{ N_("sRAW + Small Normal JPEG"),	0x24d2, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("RAW + Smaller JPEG"),		0x04e3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("mRAW + Smaller JPEG"),		0x14e3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("sRAW + Smaller JPEG"),		0x24e3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("RAW + Tiny JPEG"),		0x04f3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("mRAW + Tiny JPEG"),		0x14f3, 0 }, /*Canon EOS 5D Mark III*/
-	{ N_("sRAW + Tiny JPEG"),		0x24f3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("RAW + Large Fine JPEG"),		0x0c03, 0 },
+	{ N_("mRAW + Large Fine JPEG"),		0x1c03, 0 },
+	{ N_("sRAW + Large Fine JPEG"),		0x2c03, 0 },
+	{ N_("cRAW + Large Fine JPEG"),		0x0b03, 0 },
+	{ N_("RAW + Medium Fine JPEG"),		0x0c13, 0 },
+	{ N_("mRAW + Medium Fine JPEG"),	0x1c13, 0 },
+	{ N_("sRAW + Medium Fine JPEG"),	0x2c13, 0 },
+	{ N_("cRAW + Medium Fine JPEG"),	0x0b13, 0 },
+	{ N_("RAW + Small Fine JPEG"),		0x0c23, 0 },
+	{ N_("RAW + Small Fine JPEG"),		0x0cd3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("mRAW + Small Fine JPEG"),		0x1c23, 0 },
+	{ N_("mRAW + Small Fine JPEG"),		0x1cd3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("sRAW + Small Fine JPEG"),		0x2c23, 0 },
+	{ N_("sRAW + Small Fine JPEG"),		0x2cd3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("cRAW + Small Fine JPEG"),		0x0bd3, 0 },
+	{ N_("RAW + Large Normal JPEG"),	0x0c02, 0 },
+	{ N_("mRAW + Large Normal JPEG"),	0x1c02, 0 },
+	{ N_("sRAW + Large Normal JPEG"),	0x2c02, 0 },
+	{ N_("cRAW + Large Normal JPEG"),	0x0b02, 0 },
+	{ N_("RAW + Medium Normal JPEG"),	0x0c12, 0 },
+	{ N_("mRAW + Medium Normal JPEG"),	0x1c12, 0 },
+	{ N_("sRAW + Medium Normal JPEG"),	0x2c12, 0 },
+	{ N_("cRAW + Medium Normal JPEG"),	0x0b12, 0 },
+	{ N_("RAW + Small Normal JPEG"),	0x0c22, 0 },
+	{ N_("RAW + Small Normal JPEG"),	0x0cd2, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("mRAW + Small Normal JPEG"),	0x1c22, 0 },
+	{ N_("mRAW + Small Normal JPEG"),	0x1cd2, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("sRAW + Small Normal JPEG"),	0x2c22, 0 },
+	{ N_("sRAW + Small Normal JPEG"),	0x2cd2, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("cRAW + Small Normal JPEG"),	0x0bd2, 0 },
+	{ N_("RAW + Smaller JPEG"),		0x0ce3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("mRAW + Smaller JPEG"),		0x1ce3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("sRAW + Smaller JPEG"),		0x2ce3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("cRAW + Smaller JPEG"),		0x0be3, 0 }, /*Canon EOS M50*/
+	{ N_("RAW + Tiny JPEG"),		0x0cf3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("mRAW + Tiny JPEG"),		0x1cf3, 0 }, /*Canon EOS 5D Mark III*/
+	{ N_("sRAW + Tiny JPEG"),		0x2cf3, 0 }, /*Canon EOS 5D Mark III*/
 	/* There are more RAW + 'smallish' JPEG combinations for at least the 5DM3 possible.
 	   Axel was simply to lazy to exercise the combinatorial explosion. :-/ */
+	/* 1DX series 0 compression options */
+	{ N_("Small"),				0x2100, 0 },
+	{ N_("Medium 1"),			0x5100, 0 },
+	{ N_("Medium 2"),			0x6100, 0 },
+	{ N_("Large"),				0x0100, 0 },
+	{ N_("Small + RAW"),			0x0c21, 0 },
+	{ N_("Medium 1 + RAW"),			0x0c51, 0 },
+	{ N_("Medium 2 + RAW"),			0x0c61, 0 },
+	{ N_("Large + RAW"),			0x0c01, 0 },
+	{ N_("Small + cRAW"),			0x0b21, 0 },
+	{ N_("Medium 1 + cRAW"),		0x0b51, 0 },
+	{ N_("Medium 2 + cRAW"),		0x0b61, 0 },
+	{ N_("Large + cRAW"),			0x0b01, 0 },
+
+	/* 1DX mark ii */
+	{ N_("Large + mRAW"),			0x1c01, 0 },
+	{ N_("Medium 1 + mRAW"),		0x1c51, 0 },
+	{ N_("Medium 2 + mRAW"),		0x1c61, 0 },
+	{ N_("Small + mRAW"),			0x1c21, 0 },
+	{ N_("Large + sRAW"),			0x2c01, 0 },
+	{ N_("Medium 1 + sRAW"),		0x2c51, 0 },
+	{ N_("Medium 2 + sRAW"),		0x2c61, 0 },
+	{ N_("Small + sRAW"),			0x2c21, 0 },
 };
 GENERIC16TABLE(Canon_EOS_ImageFormat,canon_eos_image_format)
 
@@ -2451,36 +2792,32 @@
 };
 GENERIC16TABLE(Canon_EOS_AEB,canon_eos_aeb)
 
-#if 0
-/* actually a 32bit property */
-static struct deviceproptableu16 canon_eos_alomode = {
-	/* needs decoding, seems to composed of flags */
-};
-GENERIC16TABLE(Canon_EOS_AloMode,canon_eos_alomode)
-#endif
-
 static struct deviceproptableu16 canon_eos_drive_mode = {
 	{ N_("Single"),			0x0000, 0 },
 	{ N_("Continuous"),		0x0001, 0 },
+	{ N_("Video"),			0x0002, 0 },
 	{ N_("Continuous high speed"),	0x0004, 0 },
 	{ N_("Continuous low speed"),	0x0005, 0 },
 	{ N_("Single: Silent shooting"),0x0006, 0 },
+	{ N_("Continuous timer"),	0x0007, 0 },
 	{ N_("Timer 10 sec"),		0x0010, 0 },
 	{ N_("Timer 2 sec"),		0x0011, 0 },
 	{ N_("Super high speed continuous shooting"),		0x0012, 0 },
 	{ N_("Single silent"),		0x0013, 0 },
 	{ N_("Continuous silent"),	0x0014, 0 },
+	{ N_("Silent HS continuous"),	0x0015, 0 },
+	{ N_("Silent LS continuous"),	0x0016, 0 },
 };
 GENERIC16TABLE(Canon_EOS_DriveMode,canon_eos_drive_mode)
 
 static int
-_get_ISO(CONFIG_GET_ARGS) {
+_get_Olympus_ISO(CONFIG_GET_ARGS) {
 	int i;
 
 	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
-		return (GP_ERROR);
+		return GP_ERROR;
 	if (dpd->DataType != PTP_DTC_UINT16)
-		return (GP_ERROR);
+		return GP_ERROR;
 
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
@@ -2488,20 +2825,30 @@
 		char	buf20;
 
 		sprintf(buf,"%d",dpd->FORM.Enum.SupportedValuei.u16);
+		if (dpd->FORM.Enum.SupportedValuei.u16 == 0xffff) { strcpy(buf,_("Auto")); }
+		if (dpd->FORM.Enum.SupportedValuei.u16 == 0xfffd) { strcpy(buf,_("Low")); }
 		gp_widget_add_choice (*widget,buf);
 		if (dpd->FORM.Enum.SupportedValuei.u16 == dpd->CurrentValue.u16)
 			gp_widget_set_value (*widget,buf);
 	}
-	return (GP_OK);
+	return GP_OK;
 }
 
 static int
-_put_ISO(CONFIG_PUT_ARGS)
+_put_Olympus_ISO(CONFIG_PUT_ARGS)
 {
 	char *value;
 	unsigned int	u;
 
 	CR (gp_widget_get_value(widget, &value));
+	if (!strcmp(value,_("Auto"))) {
+		propval->u16 = 0xffff;
+		return GP_OK;
+	}
+	if (!strcmp(value,_("Low"))) {
+		propval->u16 = 0xfffd;
+		return GP_OK;
+	}
 
 	if (sscanf(value, "%ud", &u)) {
 		propval->u16 = u;
@@ -2511,40 +2858,274 @@
 }
 
 static int
-_get_ISO32(CONFIG_GET_ARGS) {
-	int i;
+_get_Olympus_OMD_Bulb(CONFIG_GET_ARGS) {
+	int val;
 
-	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
-		return GP_ERROR;
-	if (dpd->DataType != PTP_DTC_UINT32)
-		return GP_ERROR;
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return (GP_OK);
+}
 
-	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
-	gp_widget_set_name (*widget, menu->name);
-	for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
-		char	buf20;
+static int
+_put_Olympus_OMD_Bulb(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	int val;
+	GPContext *context = ((PTPData *) params->data)->context;
 
-		sprintf(buf,"%d",dpd->FORM.Enum.SupportedValuei.u32);
-		gp_widget_add_choice (*widget,buf);
-		if (dpd->FORM.Enum.SupportedValuei.u32 == dpd->CurrentValue.u32)
-			gp_widget_set_value (*widget,buf);
+	CR (gp_widget_get_value(widget, &val));
+	if (val) {
+		int ret = ptp_olympus_omd_bulbstart (params);
+		if (ret == PTP_RC_GeneralError) {
+			gp_context_error (((PTPData *) camera->pl->params.data)->context,
+			_("For bulb capture to work, make sure the mode dial is switched to 'M' and set 'shutterspeed' to 'bulb'."));
+			return translate_ptp_result (ret);
+		}
+		C_PTP_REP (ret);
+	} else {
+		C_PTP_REP (ptp_olympus_omd_bulbend (params));
 	}
 	return GP_OK;
 }
 
+static struct deviceproptableu16 fuji_action = {
+	{ N_("Shoot"),			0x0304, 0 },
+	{ N_("Bulb On"),		0x0500, 0 },
+	{ N_("Bulb Off"),		0x000c, 0 },
+	{ N_("AF"),			0x0200, 0 },
+	{ N_("Cancel AF"),		0x0004, 0 },
+/* D208 is some kind of control, likely bitmasked. reported like an enum.
+ * 0x200 seems to mean focusing?
+ * 0x208 capture?
+ * camera starts with 0x304
+ *
+ * After setting usually it does "initiatecapture" to trigger this mode operation.
+ *
+ * xt2:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5
+ * xt3:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9200,0x40,0x9300,5,0x804,0x80
+ * xt30:   0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9200,0x40,0x9300,5
+ * xt4:    0x104,0x200,0x4,0x304,0x500,0xc,0x8000,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe,0x9200,0x40,0x804,0x80
+ * xh1:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5
+ * gfx100: 0x104,0x200,0x4,0x304,0x500,0xc,0x8000,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe,0x9200
+ * gfx50r: 0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe
+ * xpro2:  0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1
+ *
+ * 0x304 is for regular capture         SDK_ShootS2toS0 (default) (SDK_Shoot)
+ * 0x200 seems for autofocus (s1?)      SDK_ShootS1
+ * 0x500 start bulb? 0xc end bulb?      SDK_StartBulb
+ * 0xc                                  SDK_EndBulb
+ * 0x600                                SDK_1PushAF
+ * 0x4                                  SDK_CancelS1
+ * 0x300                                SDK_ShootS2
+ * 0x8000 migh be autowhitebalance
+ * working bulb transition (with autofocus):
+ * 	0x200 -> wait for d209 turn from 1 to 2 -> 0x500 -> wait BULBTIME seconds -> 0xc
+ * seen in fuji webcam traces:
+ * 	0x9300 -> wait for d209 turn from 1 to 2 -> 0x0005
+ * 	0x9000 -> ? not sure, was polling with d212 ?  -> 0x0002
+ */
+};
+GENERIC16TABLE(Fuji_Action,fuji_action)
+
+static int
+_get_Fuji_AFDrive(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
 static int
-_put_ISO32(CONFIG_PUT_ARGS)
+_put_Fuji_AFDrive(CONFIG_PUT_ARGS)
 {
-	char *value;
-	unsigned int	u;
+	PTPParams		*params = &(camera->pl->params);
+	GPContext		*context = ((PTPData *) params->data)->context;
+	PTPPropertyValue	pval;
 
-	CR (gp_widget_get_value(widget, &value));
+	/* Focusing first ... */
+	pval.u16 = 0x9300;
+	C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &pval, PTP_DTC_UINT16));
+	C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+
+	/* poll camera until it is ready */
+	pval.u16 = 0x0001;
+	while (pval.u16 == 0x0001) {
+		C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &pval, PTP_DTC_UINT16));
+		GP_LOG_D ("XXX Ready to shoot? %X", pval.u16);
+	}
+
+	/* 2 - means OK apparently, 3 - means failed and initiatecapture will get busy. */
+	if (pval.u16 == 3) { /* reported on out of focus */
+		gp_context_error (context, _("Fuji Capture failed: Perhaps no auto-focus?"));
+		return GP_ERROR;
+	}
 
-	if (sscanf(value, "%ud", &u)) {
-		propval->u32 = u;
+	/* release focus lock */
+
+	pval.u16 = 0x0005;
+	C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &pval, PTP_DTC_UINT16));
+	C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+	return GP_OK;
+}
+
+static struct deviceproptableu16 fuji_focuspoints = {
+	{ N_("91 Points (7x13)"),   0x0001, 0 },
+	{ N_("325 Points (13x25)"), 0x0002, 0 },
+	{ N_("117 Points (9x13)"),  0x0003, 0 },
+	{ N_("425 Points (17x25)"), 0x0004, 0 },
+};
+GENERIC16TABLE(Fuji_FocusPoints,fuji_focuspoints)
+
+static int
+_get_Fuji_FocusPoint(CONFIG_GET_ARGS) {
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	gp_widget_set_value (*widget, dpd->CurrentValue.str);
+	return GP_OK;
+}
+
+static int
+_put_Fuji_FocusPoint(CONFIG_PUT_ARGS) {
+        PTPParams *params = &(camera->pl->params);
+        GPContext *context = ((PTPData *) params->data)->context;
+        PTPPropertyValue pval;
+        char *focus_point;
+
+        CR (gp_widget_get_value(widget, &focus_point));
+        C_MEM (pval.str = strdup(focus_point));
+        C_PTP_REP(ptp_setdevicepropvalue(params, PTP_DPC_FUJI_FocusArea4, &pval, PTP_DTC_STR));
+	*alreadyset = 1;
+        return GP_OK;
+}
+
+
+static int
+_get_Fuji_Bulb(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
+static int
+_put_Fuji_Bulb(CONFIG_PUT_ARGS)
+{
+	PTPParams		*params = &(camera->pl->params);
+	int			val;
+	GPContext		*context = ((PTPData *) params->data)->context;
+	PTPPropertyValue	pval;
+
+	CR (gp_widget_get_value(widget, &val));
+	if (val) {
+		/* Focusing first ... */
+		pval.u16 = 0x0200;
+		C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &pval, PTP_DTC_UINT16));
+		C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+
+		/* poll camera until it is ready */
+		pval.u16 = 0x0001;
+		while (pval.u16 == 0x0001) {
+			C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &pval, PTP_DTC_UINT16));
+			GP_LOG_D ("XXX Ready to shoot? %X", pval.u16);
+		}
+
+		/* 2 - means OK apparently, 3 - means failed and initiatecapture will get busy. */
+		if (pval.u16 == 3) { /* reported on out of focus */
+			gp_context_error (context, _("Fuji Capture failed: Perhaps no auto-focus?"));
+			return GP_ERROR;
+		}
+
+		/* now start bulb capture */
+		pval.u16 = 0x0500;
+		C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &pval, PTP_DTC_UINT16));
+
+		C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+	} else {
+		pval.u16 = 0x000c;
+		C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &pval, PTP_DTC_UINT16));
+
+		C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+	}
+	return GP_OK;
+}
+
+#define SONY_ISO_MASK 0x00ffffffU
+#define SONY_ISO_NR_SHIFT 24
+
+static void _stringify_Sony_ISO(uint32_t raw_iso, char *buf) {
+	char *buf_pos = buf;
+
+	uint32_t base_iso = raw_iso & SONY_ISO_MASK;
+	if (base_iso == SONY_ISO_MASK) {
+		buf_pos += sprintf(buf_pos,_("Auto ISO"));
+	} else {
+		buf_pos += sprintf(buf_pos,"%d",base_iso);
+	}
+
+	uint8_t noise_reduction = raw_iso >> SONY_ISO_NR_SHIFT;
+	if (noise_reduction) {
+		buf_pos += sprintf(buf_pos, " ");
+		buf_pos += sprintf(buf_pos,_("Multi Frame Noise Reduction"));
+		if (noise_reduction == 2) {
+			// Distinguish Standard vs High modes for MFNR.
+			buf_pos += sprintf(buf_pos,"+");
+		}
+	}
+}
+
+static int _parse_Sony_ISO(const char *buf, uint32_t *raw_iso) {
+	const char *s;
+	int len;
+
+	if (sscanf(buf, "%d%n", raw_iso, &len) == 0) {
+		s = _("Auto ISO");
+		len = strlen(s);
+
+		if (strncmp(buf, s, len) != 0) {
+			return GP_ERROR_BAD_PARAMETERS;
+		}
+		*raw_iso = SONY_ISO_MASK;
+	}
+	buf += len;
+
+	// If this is the end of string, we're done - no MFNR.
+	if (*buf == 0)
 		return GP_OK;
+
+	// Otherwise value should be followed by space...
+	if (*buf != ' ')
+		return GP_ERROR_BAD_PARAMETERS;
+	buf++;
+
+	// ...and by the actual MFNR string.
+	s = _("Multi Frame Noise Reduction");
+	len = strlen(s);
+	if (strncmp(buf, s, len) != 0)
+		return GP_ERROR_BAD_PARAMETERS;
+	buf += len;
+
+	uint8_t noise_reduction = 1;
+
+	if (*buf == '+') {
+		// If there's a `+`, it's a High mode for MFNR.
+		noise_reduction = 2;
+		buf++;
 	}
-	return GP_ERROR;
+
+	// There is still something unrecognized in the end of the string.
+	if (*buf != 0)
+		return GP_ERROR_BAD_PARAMETERS;
+
+	*raw_iso |= noise_reduction << SONY_ISO_NR_SHIFT;
+	return GP_OK;
 }
 
 static int
@@ -2559,18 +3140,10 @@
 
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
+
 	for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
-		if (dpd->FORM.Enum.SupportedValuei.u32 == 0x00ffffffU) {
-			sprintf(buf,_("Auto ISO"));
-		} else if (dpd->FORM.Enum.SupportedValuei.u32 == 0x01ffffffU) {
-			sprintf(buf,_("Auto ISO Multi Frame Noise Reduction"));
-		} else {
-			if (dpd->FORM.Enum.SupportedValuei.u32 & 0xff000000) {
-				sprintf(buf,_("%d Multi Frame Noise Reduction"),dpd->FORM.Enum.SupportedValuei.u32 & 0xffff);
-			} else {
-				sprintf(buf,"%d",dpd->FORM.Enum.SupportedValuei.u32);
-			}
-		}
+		_stringify_Sony_ISO(dpd->FORM.Enum.SupportedValuei.u32, buf);
+
 		gp_widget_add_choice (*widget,buf);
 		if (dpd->FORM.Enum.SupportedValuei.u32 == dpd->CurrentValue.u32) {
 			isset=1;
@@ -2578,28 +3151,51 @@
 		}
 	}
 	if (!isset) {
-		if (dpd->CurrentValue.u32 == 0x00ffffffU)
-			sprintf(buf,_("Auto ISO"));
-		else if (dpd->CurrentValue.u32 == 0x01ffffffU)
-			sprintf(buf,_("Auto ISO Multi Frame Noise Reduction"));
-		else {
-			if (dpd->CurrentValue.u32 & 0xff000000) {
-				sprintf(buf,_("%d Multi Frame Noise Reduction"),dpd->CurrentValue.u32 & 0xffff);
-			} else {
-				sprintf(buf,"%d",dpd->CurrentValue.u32);
-			}
-		}
+		_stringify_Sony_ISO(dpd->CurrentValue.u32, buf);
 		gp_widget_set_value (*widget,buf);
 	}
 	return GP_OK;
 }
 
+/* old method, using stepping */
 static int
 _put_Sony_ISO(CONFIG_PUT_ARGS)
 {
+	const char	*value;
+	uint32_t	raw_iso;
+	PTPParams	*params = &(camera->pl->params);
+
+	CR (gp_widget_get_value(widget, &value));
+	CR (_parse_Sony_ISO(value, &raw_iso));
+
+	propval->u32 = raw_iso;
+	*alreadyset = 1;
+
+	return _put_sony_value_u32(params, dpd->DevicePropertyCode, raw_iso, 1);
+}
+
+/* new method, can just set the value via setcontroldevicea */
+static int
+_put_Sony_ISO2(CONFIG_PUT_ARGS)
+{
+	const char 	*value;
+	uint32_t	raw_iso;
+	PTPParams	*params = &(camera->pl->params);
+
+	CR (gp_widget_get_value(widget, &value));
+	CR (_parse_Sony_ISO(value, &raw_iso));
+
+	propval->u32 = raw_iso;
+
+	*alreadyset = 1;
+	return translate_ptp_result (ptp_sony_setdevicecontrolvaluea(params, dpd->DevicePropertyCode, propval, PTP_DTC_UINT32));
+}
+
+static int
+_put_Sony_QX_ISO(CONFIG_PUT_ARGS)
+{
 	char 		*value;
 	uint32_t	u;
-	PTPParams	*params = &(camera->pl->params);
 
 	CR (gp_widget_get_value(widget, &value));
 	if (!strcmp(value,_("Auto ISO"))) {
@@ -2615,11 +3211,52 @@
 		return GP_ERROR;
 
 	if (strstr(value,_("Multi Frame Noise Reduction")))
-		u |= 0x10000;
+		u |= 0x1000000;
 
 setiso:
 	propval->u32 = u;
-	return _put_sony_value_u32(params, PTP_DPC_SONY_ISO, u, 1);
+
+	/*return translate_ptp_result (ptp_sony_qx_setdevicecontrolvaluea(params, dpd->DevicePropertyCode, propval, PTP_DTC_UINT32));*/
+
+	return GP_OK; /* will be set by generic code */
+}
+
+
+static int
+_get_Olympus_AspectRatio(CONFIG_GET_ARGS) {
+	int i;
+
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return GP_ERROR;
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
+		char	buf20;
+
+		sprintf(buf,"%d:%d",(dpd->FORM.Enum.SupportedValuei.u32 >> 16), dpd->FORM.Enum.SupportedValuei.u32 & 0xffff);
+		gp_widget_add_choice (*widget,buf);
+		if (dpd->FORM.Enum.SupportedValuei.u32 == dpd->CurrentValue.u32)
+			gp_widget_set_value (*widget,buf);
+	}
+	return GP_OK;
+}
+
+static int
+_put_Olympus_AspectRatio(CONFIG_PUT_ARGS)
+{
+	char		*value;
+	unsigned int	x,y;
+
+	CR (gp_widget_get_value(widget, &value));
+
+	if (2 == sscanf(value, "%d:%d", &x, &y)) {
+		propval->u32 = (x<<16) | y;
+		return GP_OK;
+	}
+	return GP_ERROR;
 }
 
 
@@ -2780,15 +3417,97 @@
 	return GP_ERROR;
 }
 
+/* the common sony f-numbers */
+static int sony_fnumbers = {
+	100,
+	110,
+	120,
+	140,
+	160,
+	180,
+	200,
+	220,
+	250,
+	280,
+	320,
+	350,
+	400,
+	450,
+	500,
+	560,
+	630,
+	710,
+	800,
+	900,
+	1000,
+	1100,
+	1300,
+	1400,
+	1600,
+	1800,
+	2000,
+	2200,
+	2500,
+	2900,
+	3200,
+	3600,
+	4200,
+	4500,
+	5000,
+	5700,
+	6400,
+};
+
+static int
+_get_Sony_FNumber(CONFIG_GET_ARGS) {
+	unsigned int	i, isset = 0;
+	char	buf20;
+
+	GP_LOG_D ("get_Sony_FNumber");
+	if (!(dpd->FormFlag & (PTP_DPFF_Enumeration|PTP_DPFF_Range)))
+		return GP_ERROR;
+	if (dpd->DataType != PTP_DTC_UINT16)
+		return GP_ERROR;
+
+	if (dpd->FormFlag & PTP_DPFF_Enumeration)
+		return _get_FNumber(CONFIG_GET_NAMES);	/* just use the normal code */
+
+	/* Range */
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i=0;i<sizeof(sony_fnumbers)/sizeof(sony_fnumbers0); i++) {
+		sprintf(buf,"f/%g",sony_fnumbersi/100.0);
+		gp_widget_add_choice (*widget,buf);
+		if (sony_fnumbersi == dpd->CurrentValue.u16) {
+			isset = 1;
+			gp_widget_set_value (*widget,buf);
+		}
+	}
+	if (!isset) {
+		sprintf(buf,"f/%g",dpd->CurrentValue.u16/100.0);
+		gp_widget_set_value (*widget,buf);
+	}
+	GP_LOG_D ("get_Sony_FNumber via range and table");
+	return GP_OK;
+}
+
+
 static int
 _put_Sony_FNumber(CONFIG_PUT_ARGS)
 {
-	float			fvalue;
-	PTPParams		*params = &(camera->pl->params);
-
-	CR (gp_widget_get_value (widget, &fvalue));
+	float		fvalue = 0.0;
+	char *		value;
+	PTPParams	*params = &(camera->pl->params);
 
-	propval->u16 = fvalue*100; /* probably not used */
+	CR (gp_widget_get_value (widget, &value));
+	if (strstr (value, "f/") == value)
+		value += strlen("f/");
+	if (sscanf(value, "%g", &fvalue))
+		propval->u16 = fvalue*100;
+	else
+		return GP_ERROR;
+	*alreadyset = 1;
 	return _put_sony_value_u16 (params, PTP_DPC_FNumber, fvalue*100, 0);
 }
 
@@ -2864,14 +3583,79 @@
 	/* match the closest value */
 	for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
 		/*GP_LOG_D ("delta is currently %d, val is %f, supval is %u, abs is %u",delta,val,dpd->FORM.Enum.SupportedValuei.u32,abs(val - dpd->FORM.Enum.SupportedValuei.u32));*/
-		if (abs(val - dpd->FORM.Enum.SupportedValuei.u32)<delta) {
+		if (abs((int)(val - dpd->FORM.Enum.SupportedValuei.u32))<delta) {
 			xval = dpd->FORM.Enum.SupportedValuei.u32;
-			delta = abs(val - dpd->FORM.Enum.SupportedValuei.u32);
+			delta = abs((int)(val - dpd->FORM.Enum.SupportedValuei.u32));
 		}
 	}
 	GP_LOG_D ("value %s is %f, closest match was %d",value,val,xval);
 	propval->u32 = xval;
-	return (GP_OK);
+	return GP_OK;
+}
+
+static int
+_get_Video_Framerate(CONFIG_GET_ARGS) {
+	char		buf20;
+
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+
+	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+		gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+		/* value will be set below */
+	} else {
+		if (dpd->FormFlag == PTP_DPFF_Range) {
+			gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
+			float val = dpd->CurrentValue.u32 / 1000000.0;
+			gp_widget_set_value (*widget, &val);
+		} else {
+			gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+			sprintf (buf, "%0.4f", (1.0*dpd->CurrentValue.u32) / 1000000.0);
+			gp_widget_set_value (*widget, buf);
+		}
+	}
+
+	gp_widget_set_name (*widget, menu->name);
+
+	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+		int		i;
+
+		for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
+			sprintf (buf,"%0.4f", (1.0*dpd->FORM.Enum.SupportedValuei.u32)/1000000.0);
+			gp_widget_add_choice (*widget,buf);
+			if (dpd->FORM.Enum.SupportedValuei.u32 == dpd->CurrentValue.u32)
+				gp_widget_set_value (*widget,buf);
+		}
+	}
+	if (dpd->FormFlag == PTP_DPFF_Range) {
+		float b, t, s;
+
+		b = (1.0*dpd->FORM.Range.MinimumValue.u32) / 1000000.0;
+		t = (1.0*dpd->FORM.Range.MaximumValue.u32) / 1000000.0;
+		s = (1.0*dpd->FORM.Range.StepSize.u32) / 1000000.0;
+		gp_widget_set_range (*widget, b, t, s);
+	}
+	return GP_OK;
+}
+
+static int
+_put_Video_Framerate(CONFIG_PUT_ARGS)
+{
+	float		val;
+	char		*value;
+
+	if (dpd->FormFlag == PTP_DPFF_Range) {
+		CR (gp_widget_get_value (widget, &val));
+	} else {
+		CR (gp_widget_get_value (widget, &value));
+
+		if (!sscanf(value,_("%f"),&val)) {
+			GP_LOG_E ("failed to parse: %s", value);
+			return GP_ERROR;
+		}
+	}
+	propval->u32 = val * 1000000;
+	return GP_OK;
 }
 
 static int
@@ -3047,10 +3831,17 @@
 	{ N_("Night Landscape"),0x8016, PTP_VENDOR_NIKON},
 	{ N_("Children"),	0x8017, PTP_VENDOR_NIKON},
 	{ N_("Automatic (No Flash)"),	0x8018, PTP_VENDOR_NIKON},
+	{ N_("U1"),		0x8050, PTP_VENDOR_NIKON},
+	{ N_("U2"),		0x8051, PTP_VENDOR_NIKON},
+	{ N_("U3"),		0x8052, PTP_VENDOR_NIKON},
 
 	{ N_("Intelligent Auto"),		0x8000, PTP_VENDOR_SONY},
 	{ N_("Superior Auto"),			0x8001, PTP_VENDOR_SONY},
-	{ N_("Movie"),				0x8050, PTP_VENDOR_SONY},
+	{ N_("Movie (P)"),				0x8050, PTP_VENDOR_SONY},
+	{ N_("Movie (A)"),				0x8051, PTP_VENDOR_SONY},
+	{ N_("Movie (S)"),				0x8052, PTP_VENDOR_SONY},
+	{ N_("Movie (M)"),				0x8053, PTP_VENDOR_SONY},
+	{ N_("Movie (Scene)"),			0x8054, PTP_VENDOR_SONY},
 	{ N_("Tele-zoom Cont. Priority AE"),	0x8031, PTP_VENDOR_SONY},
 	{ N_("Sweep Panorama"),			0x8041, PTP_VENDOR_SONY},
 	{ N_("Intelligent Auto Flash Off"),	0x8060, PTP_VENDOR_SONY},
@@ -3061,7 +3852,9 @@
 	{ N_("Night Scene"),			0x8013, PTP_VENDOR_SONY},
 	{ N_("Hand-held Twilight"),		0x8016, PTP_VENDOR_SONY},
 	{ N_("Night Portrait"),			0x8017, PTP_VENDOR_SONY},
+	{ N_("Anti Motion Blur"),		0x8018, PTP_VENDOR_SONY},
 	{ N_("Picture Effect"),			0x8070, PTP_VENDOR_SONY},
+	{ N_("S&Q"),				0x8084, PTP_VENDOR_SONY}, /* on A7III */
 };
 GENERIC16TABLE(ExposureProgram,exposure_program_modes)
 
@@ -3171,7 +3964,9 @@
 
 /* Generic Nikon 1 ISO */
 static struct deviceproptableu8 nikon_1_iso = {
-	{ "100",	0x0a, 0 },
+	{ "ISO Auto 6400",	0x01, 0 },
+	{ "ISO Auto 3200",	0x02, 0 },
+	{ "ISO Auto 800",	0x03, 0 },
 	{ "110",	0x0b, 0 },
 	{ "125",	0x0c, 0 },
 	{ "140",	0x0d, 0 },
@@ -3210,7 +4005,7 @@
 	/* values from a J3 */
 	{ N_("Auto"),			0x00, 0 },
 	{ N_("Tungsten"),		0x01, 0 },
-	{ N_("Flourescent"),		0x02, 0 },
+	{ N_("Fluorescent"),		0x02, 0 },
 	{ N_("Daylight"),		0x03, 0 },
 	{ N_("Flash"),			0x04, 0 },
 	{ N_("Cloudy"),			0x05, 0 },
@@ -3230,6 +4025,54 @@
 };
 GENERIC8TABLE(Nikon_HDRHighDynamic,nikon_hdrhighdynamic);
 
+static struct deviceproptableu8 nikon_aebracketstep = {
+	{ N_("1/3 EV"),	0, 0 },
+	{ N_("1/2 EV"),	1, 0 },
+	{ N_("2/3 EV"),	2, 0 },
+	{ N_("1 EV"),	3, 0 },
+	{ N_("2 EV"),	4, 0 },
+	{ N_("3 EV"),	5, 0 },
+};
+GENERIC8TABLE(Nikon_AEBracketStep,nikon_aebracketstep);
+
+static struct deviceproptableu8 nikon_wbbracketstep = {
+	{ N_("1 EV"),	0, 0 },
+	{ N_("2 EV"),	1, 0 },
+	{ N_("3 EV"),	2, 0 },
+};
+GENERIC8TABLE(Nikon_WBBracketStep,nikon_wbbracketstep);
+
+static struct deviceproptableu8 nikon_adlbracketstep = {
+	{ N_("Auto"),		0, 0 },
+	{ N_("Low"),		1, 0 },
+	{ N_("Normal"),		2, 0 },
+	{ N_("High"),		3, 0 },
+	{ N_("Extra high"),	4, 0 },
+};
+GENERIC8TABLE(Nikon_ADLBracketStep,nikon_adlbracketstep);
+
+static struct deviceproptableu8 nikon_bracketpattern = {
+	{ N_("2 images (normal and under)"),			0, 0 },
+	{ N_("2 images (normal and over)"),			1, 0 },
+	{ N_("3 images (normal and 2 unders)"),			2, 0 },
+	{ N_("3 images (normal and 2 overs)"),			3, 0 },
+	{ N_("3 images (normal, under and over)"),		4, 0 },
+	{ N_("5 images (normal, 2 unders and 2 overs)"),	5, 0 },
+	{ N_("7 images (normal, 3 unders and 3 overs)"),	6, 0 },
+	{ N_("9 images (normal, 4 unders and 4 overs)"),	7, 0 },
+	{ N_("0 image"),					8, 0 },
+};
+GENERIC8TABLE(Nikon_BracketPattern,nikon_bracketpattern);
+
+static struct deviceproptableu8 nikon_adlbracketpattern = {
+	{ N_("2 shots (Off -> User setting)"),				0, 0 },
+	{ N_("3 shots (Off -> Low -> User setting)"),			1, 0 },
+	{ N_("4 shots (Off -> Low -> Normal -> High)"),			2, 0 },
+	{ N_("5 shots (Off -> Low -> Normal -> High -> Extra High)"),	3, 0 },
+	{ N_("0 image"),						4, 0 },
+};
+GENERIC8TABLE(Nikon_ADLBracketPattern,nikon_adlbracketpattern);
+
 static struct deviceproptableu8 nikon_hdrsmoothing = {
 	{ N_("Auto"),		3, 0 },
 	{ N_("Low"),		2, 0 },
@@ -3290,6 +4133,16 @@
 };
 GENERIC8TABLE(NIKON_1_ExposureProgram,nikon_1_exposure_program_modes)
 
+/* from z6 sdk */
+static struct deviceproptableu8 nikon_usermode = {
+	{ "P",			19, 0 },
+	{ "S",			20, 0 },
+	{ "A",			21, 0 },
+	{ "M",			22, 0 },
+	{ N_("Auto"),		23, 0 },
+};
+GENERIC8TABLE(NIKON_UserMode,nikon_usermode)
+
 static struct deviceproptableu16 capture_mode = {
 	{ N_("Single Shot"),		0x0001, 0 },
 	{ N_("Burst"),			0x0002, 0 },
@@ -3301,6 +4154,7 @@
 	{ N_("Quick Response Remote"),	0x8014, PTP_VENDOR_NIKON}, /* others nikons */
 	{ N_("Delayed Remote"),		0x8015, PTP_VENDOR_NIKON}, /* d90 */
 	{ N_("Quiet Release"),		0x8016, PTP_VENDOR_NIKON}, /* d5000 */
+	{ N_("Continuous Quiet Release"),	0x8018, PTP_VENDOR_NIKON}, /* d850 */
 
 	{ N_("Continuous Low Speed"),	0x8012, PTP_VENDOR_SONY},
 	{ N_("Selftimer 2s"),		0x8005, PTP_VENDOR_SONY},
@@ -3312,6 +4166,8 @@
 	{ N_("Selftimer 5s 5 Pictures"),0x800d, PTP_VENDOR_SONY},
 	{ N_("Selftimer 2s 3 Pictures"),0x800e, PTP_VENDOR_SONY},
 	{ N_("Selftimer 2s 5 Pictures"),0x800f, PTP_VENDOR_SONY},
+	{ N_("Continuous Hi+ Speed"),   0x8010, PTP_VENDOR_SONY}, /* A7III */
+	{ N_("Continuous Med Speed"),   0x8015, PTP_VENDOR_SONY}, /* A7III */
 
 	{ N_("Bracketing C 0.3 Steps 3 Pictures"),	0x8337, PTP_VENDOR_SONY},
 	{ N_("Bracketing C 0.3 Steps 5 Pictures"),	0x8537, PTP_VENDOR_SONY},
@@ -3389,6 +4245,23 @@
 };
 GENERIC16TABLE(Nikon_D7100_FocusMetering,nikon_d7100_focus_metering)
 
+static struct deviceproptableu16 nikon_d850_focus_metering = {
+	{ N_("Dynamic-area AF (25 points)"),0x0002, 	PTP_VENDOR_NIKON},
+	{ N_("Single-point AF"),			0x8010, PTP_VENDOR_NIKON},
+	{ N_("Auto-area AF"),				0x8011, PTP_VENDOR_NIKON},
+	{ N_("3D-tracking"),				0x8012, PTP_VENDOR_NIKON},
+	{ N_("Dynamic-area AF (72 points)"),		0x8013, PTP_VENDOR_NIKON},
+	{ N_("Dynamic-area AF (153 points)"),		0x8014, PTP_VENDOR_NIKON},
+	{ N_("Group-area AF"),				0x8015, PTP_VENDOR_NIKON},
+	{ N_("Dynamic-area AF (9 points)"),		0x8016, PTP_VENDOR_NIKON},
+
+	{ N_("Pinpoint AF"),		0x8017, PTP_VENDOR_NIKON}, /* on Z */
+	{ N_("Wide-area AF (S)"),	0x8018, PTP_VENDOR_NIKON}, /* on Z */
+	{ N_("Wide-area AF (L)"),	0x8019, PTP_VENDOR_NIKON}, /* on Z */
+	{ N_("Wide-area AF (C1)"),	0x801e, PTP_VENDOR_NIKON}, /* on Z */
+	{ N_("Wide-area AF (C2)"),	0x801f, PTP_VENDOR_NIKON}, /* on Z */
+};
+GENERIC16TABLE(Nikon_D850_FocusMetering,nikon_d850_focus_metering)
 
 static struct deviceproptableu8 nikon_colormodel = {
 	{ N_("sRGB (portrait)"),0x00, 0 },
@@ -3409,7 +4282,6 @@
 };
 GENERIC16TABLE(Canon_EOS_ColorSpace,canon_eos_colorspace)
 
-
 static struct deviceproptableu8 nikon_evstep = {
 	{ "1/3",	0, 0 },
 	{ "1/2",	1, 0 },
@@ -3434,7 +4306,7 @@
 static int
 _get_Canon_CameraOrientation(CONFIG_GET_ARGS) {
 	char	orient50; /* needs also to fit the translated string */
-	int	i;
+	unsigned int	i;
 
 	if (dpd->DataType != PTP_DTC_UINT16)
 		return (GP_ERROR);
@@ -3474,6 +4346,23 @@
 };
 GENERIC8TABLE(Nikon_AutofocusArea,nikon_afsensor)
 
+static struct deviceproptableu16 sony_focusarea = {
+		{ N_("Wide"), 0x01, 0 },
+		{ N_("Zone"),	0x02, 0 },
+		{ N_("Center"),	0x03, 0 },
+		{ N_("Flexible Spot: S"),	0x101, 0 },
+		{ N_("Flexible Spot: M"),	0x102, 0 },
+		{ N_("Flexible Spot: L"),	0x103, 0 },
+		{ N_("Expand Flexible Spot"),	0x104, 0 },
+		{ N_("Lock-on AF: Wide"),	0x201, 0 },
+		{ N_("Lock-on AF: Zone"),	0x202, 0 },
+		{ N_("Lock-on AF: Center"),	0x203, 0 },
+		{ N_("Lock-on AF: Flexible Spot: S"),	0x204, 0 },
+		{ N_("Lock-on AF: Flexible Spot: M"),	0x205, 0 },
+		{ N_("Lock-on AF: Flexible Spot: L"),	0x206, 0 },
+		{ N_("Lock-on AF: Expand Flexible Spot"),	0x207, 0 },
+};
+GENERIC16TABLE(Sony_FocusArea,sony_focusarea)
 
 static struct deviceproptableu16 exposure_metering = {
 	{ N_("Average"),	0x0001, 0 },
@@ -3481,10 +4370,19 @@
 	{ N_("Multi Spot"),	0x0003, 0 },
 	{ N_("Center Spot"),	0x0004, 0 },
 	{ N_("Spot"),		0x8001, PTP_VENDOR_FUJI },
+	{ N_("ESP"),		0x8001, PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Spot+Highlights"),0x8011, PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("Spot+Shadows"),	0x8012, PTP_VENDOR_GP_OLYMPUS_OMD },
+	/* next ones taken from A7III */
+	{ N_("Multi"),			0x8001, PTP_VENDOR_SONY },
+	{ N_("Center"),			0x8002, PTP_VENDOR_SONY },
+	{ N_("Entire Screen Avg."),	0x8003, PTP_VENDOR_SONY },
+	{ N_("Spot Standard"),		0x8004, PTP_VENDOR_SONY },
+	{ N_("Spot Large"),		0x8005, PTP_VENDOR_SONY },
+	{ N_("Highlight"),		0x8006, PTP_VENDOR_SONY },
 };
 GENERIC16TABLE(ExposureMetering,exposure_metering)
 
-
 static struct deviceproptableu16 flash_mode = {
 	{ N_("Automatic Flash"),		0x0001, 0 },
 	{ N_("Flash off"),			0x0002, 0 },
@@ -3502,7 +4400,7 @@
 	{ N_("Slow sync"),				0x8004, PTP_VENDOR_FUJI},
 	{ N_("Rear-curtain with slow sync"),		0x8005, PTP_VENDOR_FUJI},
 	{ N_("Rear-curtain sync"),			0x8006, PTP_VENDOR_FUJI},
-	
+
 	{ N_("Rear Curtain Sync"),			0x8003, PTP_VENDOR_SONY},
 	{ N_("Wireless Sync"),				0x8004, PTP_VENDOR_SONY},
 	{ N_("Slow Sync"),				0x8032, PTP_VENDOR_SONY},
@@ -3564,7 +4462,7 @@
 
 static int
 _put_FocalLength(CONFIG_PUT_ARGS) {
-	int i;
+	unsigned int i;
 	float value_float;
 	uint32_t curdiff, newval;
 
@@ -3572,14 +4470,14 @@
 	propval->u32 = 100*value_float;
 	if (dpd->FormFlag & PTP_DPFF_Range)
 		return GP_OK;
-	/* If FocalLength is enumerated, we need to hit the 
+	/* If FocalLength is enumerated, we need to hit the
 	 * values exactly, otherwise nothing will happen.
 	 * (problem encountered on my Nikon P2)
 	 */
 	curdiff = 10000;
 	newval = propval->u32;
 	for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
-		uint32_t diff = abs(dpd->FORM.Enum.SupportedValuei.u32  - propval->u32);
+		uint32_t diff = abs((int)(dpd->FORM.Enum.SupportedValuei.u32  - propval->u32));
 
 		if (diff < curdiff) {
 			newval = dpd->FORM.Enum.SupportedValuei.u32;
@@ -3591,6 +4489,60 @@
 }
 
 static int
+_get_VideoFormat(CONFIG_GET_ARGS) {
+	int i, valset = 0;
+	char buf200;
+
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return GP_ERROR;
+
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return GP_ERROR;
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	/* We use FOURCC values, which should be 4 characters always */
+
+	for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
+		sprintf (buf, "%c%c%c%c",
+			(dpd->FORM.Enum.SupportedValuei.u32     )  & 0xff,
+			(dpd->FORM.Enum.SupportedValuei.u32 >> 8)  & 0xff,
+			(dpd->FORM.Enum.SupportedValuei.u32 >> 16) & 0xff,
+			(dpd->FORM.Enum.SupportedValuei.u32 >> 24) & 0xff
+		);
+		gp_widget_add_choice (*widget,buf);
+		if (dpd->CurrentValue.u32 == dpd->FORM.Enum.SupportedValuei.u32) {
+			gp_widget_set_value (*widget, buf);
+			valset = 1;
+		}
+	}
+	if (!valset) {
+		sprintf (buf, "%c%c%c%c",
+			(dpd->CurrentValue.u32     )  & 0xff,
+			(dpd->CurrentValue.u32 >> 8)  & 0xff,
+			(dpd->CurrentValue.u32 >> 16) & 0xff,
+			(dpd->CurrentValue.u32 >> 24) & 0xff
+		);
+		sprintf (buf, _("%d mm"), dpd->CurrentValue.u16);
+		gp_widget_set_value (*widget, buf);
+	}
+	return GP_OK;
+}
+
+static int
+_put_VideoFormat(CONFIG_PUT_ARGS) {
+	const unsigned char *value_str;
+
+	CR (gp_widget_get_value (widget, &value_str));
+	if (strlen((char*)value_str) < 4)
+		return GP_ERROR_BAD_PARAMETERS;
+	/* we could check if we have it in the ENUM */
+	propval->u32 = value_str0 | (value_str1 << 8) | (value_str2 << 16) | (value_str3 << 24);
+	return GP_OK;
+}
+
+static int
 _get_FocusDistance(CONFIG_GET_ARGS) {
 	if (!(dpd->FormFlag & (PTP_DPFF_Range|PTP_DPFF_Enumeration)))
 		return (GP_ERROR);
@@ -3748,6 +4700,102 @@
 }
 
 static int
+_get_Olympus_ShutterSpeed(CONFIG_GET_ARGS) {
+	int i, valset = 0;
+	char buf200;
+	int x,y;
+
+	if (dpd->DataType != PTP_DTC_UINT32)
+		return (GP_ERROR);
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return (GP_ERROR);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i = 0; i<dpd->FORM.Enum.NumberOfValues; i++) {
+		if (dpd->FORM.Enum.SupportedValuei.u32 == 0xfffffffc) {
+			sprintf(buf,_("Bulb"));
+			goto choicefound;
+		}
+		if (dpd->FORM.Enum.SupportedValuei.u32 == 0xfffffffa) {
+		 	sprintf(buf,_("Composite"));
+		 	goto choicefound;
+		 }
+		if (dpd->FORM.Enum.SupportedValuei.u32 == 0xfffffffb) {
+			sprintf(buf,_("Time"));
+			goto choicefound;
+		}
+
+		x = dpd->FORM.Enum.SupportedValuei.u32>>16;
+		y = dpd->FORM.Enum.SupportedValuei.u32&0xffff;
+
+		if (((y % 10) == 0) && ((x % 10) == 0)) {
+			y /= 10;
+			x /= 10;
+		}
+		if (y == 1) { /* x/1 */
+			sprintf (buf, "%d", x);
+		} else {
+			sprintf (buf, "%d/%d",x,y);
+		}
+
+choicefound:
+
+		gp_widget_add_choice (*widget,buf);
+		if (dpd->CurrentValue.u32 == dpd->FORM.Enum.SupportedValuei.u32) {
+			gp_widget_set_value (*widget, buf);
+			valset = 1;
+		}
+	}
+	if (!valset) {
+		x = dpd->CurrentValue.u32>>16;
+		y = dpd->CurrentValue.u32&0xffff;
+		if (y == 1) {
+			sprintf (buf, "%d",x);
+		} else {
+			sprintf (buf, "%d/%d",x,y);
+		}
+		gp_widget_set_value (*widget, buf);
+	}
+	return GP_OK;
+}
+
+static int
+_put_Olympus_ShutterSpeed(CONFIG_PUT_ARGS) {
+	int x,y;
+	const char *value_str;
+
+	gp_widget_get_value (widget, &value_str);
+
+	if (!strcmp(value_str,_("Bulb"))) {
+		propval->u32 = 0xfffffffc;
+		return GP_OK;
+	}
+	if (!strcmp(value_str,_("Composite"))) {
+	 	propval->u32 = 0xfffffffa;
+	 	return GP_OK;
+	 }
+	if (!strcmp(value_str,_("Time"))) {
+		propval->u32 = 0xfffffffb;
+		return GP_OK;
+	}
+
+	if (strchr(value_str, '/')) {
+		if (2 != sscanf (value_str, "%d/%d", &x, &y))
+			return GP_ERROR;
+	} else {
+		if (!sscanf (value_str, "%d", &x))
+			return GP_ERROR;
+		y = 10;
+		x *=10;
+	}
+
+	propval->u32 = (x<<16) | y;
+	return GP_OK;
+}
+
+static int
 _get_Ricoh_ShutterSpeed(CONFIG_GET_ARGS) {
 	int i, valset = 0;
 	char buf200;
@@ -3817,22 +4865,407 @@
 	return GP_OK;
 }
 
+struct sigma_aperture {
+	uint8_t		numval;
+	const char*	val;
+} sigma_apertures = {
+	{8,	"1.0"},
+	{11,	"1.1"},
+	{13,	"1.2"},
+	{16,	"1.4"},
+	{19,	"1.6"},
+	{21,	"1.8"},
+	{24,	"2.0"},
+	{27,	"2.2"},
+	{29,	"2.5"},
+	{32,	"2.8"},
+	{35,	"3.2"},
+	{40,	"4.0"},
+	{43,	"4.5"},
+	{45,	"5.0"},
+	{48,	"5.6"},
+	{51,	"6.3"},
+	{53,	"7.1"},
+	{56,	"8.0"},
+	{59,	"9.0"},
+	{61,	"10"},
+	{64,	"11"},
+	{67,	"13"},
+	{69,	"14"},
+	{72,	"16"},
+	{75,	"18"},
+	{77,	"20"},
+	{80,	"22"},
+	{83,	"25"},
+	{85,	"29"},
+	{88,	"32"},
+	{91,	"36"},
+	{93,	"40"},
+	{96,	"45"},
+	{99,	"51"},
+	{101,	"57"},
+	{104,	"64"},
+	{107,	"72"},
+	{109,	"81"},
+	{112,	"91"},
+};
+
+static int
+_get_SigmaFP_Aperture(CONFIG_GET_ARGS) {
+	char		buf200;
+	unsigned char	*xdata = NULL;
+	unsigned int	xsize = 0;
+	unsigned int	i, valset = 0;
+	unsigned int	aperture;
+	PTPParams	*params = &(camera->pl->params);
+
+	/* shutterspeed is in datagroup1, bit 1 presence, offset 4 */
+	C_PTP (ptp_sigma_fp_getdatagroup1 (params, &xdata, &xsize));
+
+	/* byte 0: 	count of bytes
+	 * byte 1,2: 	bitmask of presence
+	 * byte 3... 	start
+	 * bytelast	checksum
+	 */
+
+	if (!(xdata1 & (1<<1))) {
+		free (xdata);
+		return GP_ERROR;
+	}
+	aperture = xdata4;
+	free (xdata);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i=0;i<sizeof(sigma_apertures)/sizeof(sigma_apertures0);i++) {
+		gp_widget_add_choice (*widget, _(sigma_aperturesi.val));
+		if (aperture == sigma_aperturesi.numval) {
+			gp_widget_set_value (*widget, _(sigma_aperturesi.val));
+			valset = 1;
+		}
+	}
+	if (!valset) {
+		sprintf(buf,"unknown value 0x%x", aperture);
+		gp_widget_set_value (*widget, buf);
+	}
+	return GP_OK;
+}
+
+static int
+_put_SigmaFP_Aperture(CONFIG_PUT_ARGS) {
+	const char	*value_str;
+	unsigned char	datagrp122;
+	unsigned int	aperture = 0;
+	unsigned int	i, chksum = 0, valfound = 0;
+	PTPParams	*params = &(camera->pl->params);
+
+	gp_widget_get_value (widget, &value_str);
+	memset(datagrp1,0,sizeof(datagrp1));
+
+	for (i=0;i<sizeof(sigma_apertures)/sizeof(sigma_apertures0);i++) {
+		if (!strcmp(value_str,_(sigma_aperturesi.val))) {
+			aperture = sigma_aperturesi.numval;
+			valfound = 1;
+			break;
+		}
+	}
+	if (!valfound && !sscanf (value_str, "unknown value 0x%x", &aperture)) {
+		return GP_ERROR;
+	}
+	datagrp10 = 0x13;
+	datagrp11 = (1<<1);
+	datagrp12 = 0;
+	datagrp13 = 0;
+	datagrp14 = aperture;
+	chksum = 0;
+	for (i=0;i<21;i++)
+		chksum+=datagrp1i;
+	datagrp121 = chksum & 0xff;
+	C_PTP (ptp_sigma_fp_setdatagroup1 (params, datagrp1, 22));
+	return GP_OK;
+}
+
+struct sigma_shutterspeed {
+	uint8_t		numval;
+	const char*	val;
+} sigma_shutterspeeds = {
+	{8,	N_("bulb")	},
+	{16,	"30"		},
+	{19,	"25"		},
+	{21,	"20"		},
+	{24,	"15"		},
+	{27,	"13"		},
+	{29,	"10"		},
+	{32,	"8"		},
+	{35,	"6"		},
+	{37,	"5"		},
+	{40,	"4"		},
+	{43,	"3.2"		},
+	{44,	"3"		},	/* 1/2 */
+	{45,	"2.5"		},
+	{48,	"2"		},
+	{51,	"1.6"		},
+	{53,	"1.3"		},
+	{56,	"1"		},
+	{59,	"0.8"		},
+	{61,	"0.6"		},
+	{64,	"0.5"		},
+	{67,	"0.4"		},
+	{69,	"0.3"		},
+	{72,	"1/4"		},
+	{75,	"1/5"		},
+	{77,	"1/6"		},
+	{80,	"1/8"		},
+	{83,	"1/10"		},
+	{85,	"1/13"		},
+	{88,	"1/15"		},
+	{91,	"1/20"		},
+	{93,	"1/25"		},
+	{96,	"1/30"		},
+	{99,	"1/40"		},
+	{101,	"1/50"		},
+	{104,	"1/60"		},
+	{107,	"1/80"		},
+	{109,	"1/100"		},
+	{112,	"1/125"		},
+	{115,	"1/160"		},
+	{117,	"1/200"		},
+	{120,	"1/250"		},
+	{123,	"1/320"		},
+	{125,	"1/400"		},
+	{128,	"1/500"		},
+	{131,	"1/640"		},
+	{133,	"1/800"		},
+	{136,	"1/1000"	},
+	{139,	"1/1250"	},
+	{141,	"1/1600"	},
+	{144,	"1/2000"	},
+	{147,	"1/2500"	},
+	{149,	"1/3200"	},
+	{152,	"1/4000"	},
+	{155,	"1/5000"	},
+	{157,	"1/6000"	},
+	{160,	"1/8000"	},
+	{162,	N_("Sync")	},
+	{163,	"1/10000"	},
+	{165,	"1/12800"	},
+	{168,	"1/16000"	},
+	{171,	"1/20000"	},
+	{173,	"1/25600"	},
+	{176,	"1/32000"	},
+};
+
+static int
+_get_SigmaFP_ShutterSpeed(CONFIG_GET_ARGS) {
+	char		buf200;
+	unsigned char	*xdata = NULL;
+	unsigned int	xsize = 0;
+	unsigned int	i, valset = 0;
+	unsigned int	shutterspeed;
+	PTPParams	*params = &(camera->pl->params);
+
+	/* shutterspeed is in datagroup1, bit 0 presence */
+	C_PTP (ptp_sigma_fp_getdatagroup1 (params, &xdata, &xsize));
+
+	/* byte 0: 	count of bytes
+	 * byte 1,2: 	bitmask of presence
+	 * byte 3... 	start
+	 * bytelast	checksum
+	 */
+
+	if (!(xdata1 & (1<<0))) {
+		free (xdata);
+		return GP_ERROR;
+	}
+	shutterspeed = xdata3;
+	free (xdata);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i=0;i<sizeof(sigma_shutterspeeds)/sizeof(sigma_shutterspeeds0);i++) {
+		gp_widget_add_choice (*widget, _(sigma_shutterspeedsi.val));
+		if (shutterspeed == sigma_shutterspeedsi.numval) {
+			gp_widget_set_value (*widget, _(sigma_shutterspeedsi.val));
+			valset = 1;
+		}
+	}
+	if (!valset) {
+		sprintf(buf,"unknown value 0x%x", shutterspeed);
+		gp_widget_set_value (*widget, buf);
+	}
+	return GP_OK;
+}
+
+static int
+_put_SigmaFP_ShutterSpeed(CONFIG_PUT_ARGS) {
+	const char	*value_str;
+	unsigned char	datagrp122;
+	unsigned int	shutterspeed = 0;
+	unsigned int	i, chksum = 0, valfound = 0;
+	PTPParams	*params = &(camera->pl->params);
+
+	gp_widget_get_value (widget, &value_str);
+	memset(datagrp1,0,sizeof(datagrp1));
+
+	for (i=0;i<sizeof(sigma_shutterspeeds)/sizeof(sigma_shutterspeeds0);i++) {
+		if (!strcmp(value_str,_(sigma_shutterspeedsi.val))) {
+			shutterspeed = sigma_shutterspeedsi.numval;
+			valfound = 1;
+			break;
+		}
+	}
+	if (!valfound && !sscanf (value_str, "unknown value 0x%x", &shutterspeed)) {
+		return GP_ERROR;
+	}
+	datagrp10 = 0x13;
+	datagrp11 = (1<<0);
+	datagrp12 = 0;
+	datagrp13 = shutterspeed;
+	chksum = 0;
+	for (i=0;i<21;i++)
+		chksum+=datagrp1i;
+	datagrp121 = chksum & 0xff;
+	C_PTP (ptp_sigma_fp_setdatagroup1 (params, datagrp1, 22));
+	return GP_OK;
+}
+
+/* This list is taken from Sony A58... fill in more if your Sony has more */
+static struct sonyshutter {
+	int dividend, divisor;
+} sony_shuttertable = {
+	{30,1},
+	{25,1},
+	{20,1},
+	{15,1},
+	{13,1},
+	{10,1},
+	{8,1},
+	{6,1},
+	{5,1},
+	{4,1},
+	{32,10},
+	{25,10},
+	{2,1},
+	{16,10},
+	{13,10},
+	{1,1},
+	{8,10},
+	{6,10},
+	{5,10},
+	{4,10},
+	{1,3},
+	{1,4},
+	{1,5},
+	{1,6},
+	{1,8},
+	{1,10},
+	{1,13},
+	{1,15},
+	{1,20},
+	{1,25},
+	{1,30},
+	{1,40},
+	{1,50},
+	{1,60},
+	{1,80},
+	{1,100},
+	{1,125},
+	{1,160},
+	{1,200},
+	{1,250},
+	{1,320},
+	{1,400},
+	{1,500},
+	{1,640},
+	{1,800},
+	{1,1000},
+	{1,1250},
+	{1,1600},
+	{1,2000},
+	{1,2500},
+	{1,3200},
+	{1,4000},
+	/* A7 series */
+	{1,5000},
+	{1,6400},
+	{1,8000},
+	/* A9, some RX series cameras */
+	{1,10000},
+	{1,12500},
+	{1,16000},
+	{1,20000},
+	{1,25000},
+	{1,32000},
+};
+
 static int
 _get_Sony_ShutterSpeed(CONFIG_GET_ARGS) {
-	int x,y;
-	char buf20;
+	int			x,y;
+	char			buf20;
+	PTPParams		*params = &(camera->pl->params);
+	GPContext 		*context = ((PTPData *) params->data)->context;
 
 	if (dpd->DataType != PTP_DTC_UINT32)
 		return GP_ERROR;
 
+	if (have_prop (camera, PTP_VENDOR_SONY, PTP_DPC_SONY_ShutterSpeed2))
+		C_PTP_REP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_ShutterSpeed2, dpd));
+
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 
+	/* new style has an ENUM again */
+	if (dpd->FormFlag & PTP_DPFF_Enumeration) {
+		unsigned int i;
+
+		for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++) {
+			x = dpd->FORM.Enum.SupportedValuei.u32 >> 16;
+			y = dpd->FORM.Enum.SupportedValuei.u32 & 0xffff;
+
+			// Sony reports high shutter speeds as 300/10, 250/10, etc.
+			// Normalize them to integers for better output and to match
+			// `sony_shuttertable` format.
+			if (y == 10 && x % 10 == 0) {
+				x /= 10;
+				y = 1;
+			}
+
+			if (y == 1)
+				sprintf (buf, "%d",x);
+			else
+				sprintf (buf, "%d/%d",x,y);
+			gp_widget_add_choice (*widget, buf);
+		}
+		gp_widget_add_choice (*widget, _("Bulb"));
+	} else {
+		unsigned int i;
+		/* use our static table */
+		for (i=0;i<sizeof(sony_shuttertable)/sizeof(sony_shuttertable0);i++) {
+			x = sony_shuttertablei.dividend;
+			y = sony_shuttertablei.divisor;
+			if (y == 1)
+				sprintf (buf, "%d",x);
+			else
+				sprintf (buf, "%d/%d",x,y);
+			gp_widget_add_choice (*widget, buf);
+		}
+		gp_widget_add_choice (*widget, _("Bulb"));
+	}
+
 	if (dpd->CurrentValue.u32 == 0) {
 		strcpy(buf,_("Bulb"));
 	} else {
 		x = dpd->CurrentValue.u32>>16;
 		y = dpd->CurrentValue.u32&0xffff;
+
+		// Normalize current value from 300/10, 250/10 etc. to integers too.
+		if (y == 10 && x % 10 == 0) {
+			x /= 10;
+			y = 1;
+		}
+
 		if (y == 1)
 			sprintf (buf, "%d",x);
 		else
@@ -3844,14 +5277,15 @@
 
 static int
 _put_Sony_ShutterSpeed(CONFIG_PUT_ARGS) {
-	int			x,y,a,b;
+	int			x,y,a,b,direction,position_current,position_new;
 	const char		*val;
-	float 			old,new;
+	float 			old,new,current;
 	PTPPropertyValue	value;
 	uint32_t		new32, origval;
 	PTPParams		*params = &(camera->pl->params);
 	GPContext 		*context = ((PTPData *) params->data)->context;
 	time_t			start,end;
+	unsigned int		i;
 
 	CR (gp_widget_get_value (widget, &val));
 
@@ -3862,6 +5296,7 @@
 		y = dpd->CurrentValue.u32&0xffff;
 	}
 	old = ((float)x)/(float)y;
+	current = old;
 
 	if (!strcmp(val,_("Bulb"))) {
 		new32 = 0;
@@ -3876,18 +5311,81 @@
 		}
 		new32 = (x<<16)|y;
 	}
+	/* new style */
+	if (have_prop (camera, PTP_VENDOR_SONY, PTP_DPC_SONY_ShutterSpeed2)) {
+		propval->u32 = new32;
+		return translate_ptp_result (ptp_sony_setdevicecontrolvaluea(params, PTP_DPC_SONY_ShutterSpeed2, propval, PTP_DTC_UINT32));
+	}
+	/* old style uses stepping */
+
 	new = ((float)x)/(float)y;
+
+	if (old > new) {
+		value.u8 = 0x01;
+		direction = 1;
+	}
+	else {
+		value.u8 = 0xff;
+		direction = -1;
+	}
+
+	if (direction == 1) {
+		position_new = sizeof(sony_shuttertable)/sizeof(sony_shuttertable0)-1;
+
+		for (i=0;i<sizeof(sony_shuttertable)/sizeof(sony_shuttertable0);i++) {
+			a = sony_shuttertablei.dividend;
+			b = sony_shuttertablei.divisor;
+			position_new = i;
+			if (new >= ((float)a)/(float)b)
+				break;
+		}
+	} else {
+		position_new = 0;
+
+		for (i=sizeof(sony_shuttertable)/sizeof(sony_shuttertable0)-1;i--;) {
+			a = sony_shuttertablei.dividend;
+			b = sony_shuttertablei.divisor;
+			position_new = i;
+			if (new <= ((float)a)/(float)b)
+				break;
+		}
+	}
+
 	do {
 		origval = dpd->CurrentValue.u32;
 		if (old == new)
 			break;
-		if (old > new)
-			value.u8 = 0x01;
-		else
-			value.u8 = 0xff;
+
+		for (i=0;i<sizeof(sony_shuttertable)/sizeof(sony_shuttertable0);i++) {
+			a = sony_shuttertablei.dividend;
+			b = sony_shuttertablei.divisor;
+			position_current = i;
+			if (current >= ((float)a)/(float)b)
+				break;
+		}
+
+		/* If something failed, fall back to single step, https://github.com/gphoto/libgphoto2/issues/694 */
+		if (position_current == position_new) {
+			GP_LOG_D ("posNew and pos_current both %d, fall back to single step", position_current);
+			if (old > new) {
+				value.u8 = 0x01;
+				direction = 1;
+			}
+			else {
+				value.u8 = 0xff;
+				direction = -1;
+			}
+		} else {
+			// Calculating jump width
+			if (direction > 0)
+				value.u8 = 0x00 + position_new - position_current;
+			else
+				value.u8 = 0x100 + position_new - position_current;
+		}
+
 		a = dpd->CurrentValue.u32>>16;
 		b = dpd->CurrentValue.u32&0xffff;
-		C_PTP_REP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_ShutterSpeed, &value, PTP_DTC_UINT8 ));
+		C_PTP_REP (ptp_sony_setdevicecontrolvalueb (params, dpd->DevicePropertyCode, &value, PTP_DTC_UINT8 ));
 
 		GP_LOG_D ("shutterspeed value is (0x%x vs target 0x%x)", origval, new32);
 
@@ -3895,7 +5393,7 @@
 		time(&start);
 		do {
 			C_PTP_REP (ptp_sony_getalldevicepropdesc (params));
-			C_PTP_REP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_ShutterSpeed, dpd));
+			C_PTP_REP (ptp_generic_getdevicepropdesc (params, dpd->DevicePropertyCode, dpd));
 
 			if (dpd->CurrentValue.u32 == new32) {
 				GP_LOG_D ("Value matched!");
@@ -3903,6 +5401,8 @@
 			}
 			a = dpd->CurrentValue.u32>>16;
 			b = dpd->CurrentValue.u32&0xffff;
+			current = ((float)a)/((float)b);
+
 			if ((a*y != 0) && (a*y == b*x)) {
 				GP_LOG_D ("Value matched via math(tm) %d/%d == %d/%d!",x,y,a,b);
 				break;
@@ -3918,6 +5418,15 @@
 			time(&end);
 		} while (end-start <= 3);
 
+		if (direction > 0 && current <= new) {
+			GP_LOG_D ("Overshooted value, maybe choice not available!");
+			break;
+		}
+		if (direction < 0 && current >= new) {
+			GP_LOG_D ("Overshooted value, maybe choice not available!");
+			break;
+		}
+
 		if (dpd->CurrentValue.u32 == new32) {
 			GP_LOG_D ("Value matched!");
 			break;
@@ -3931,11 +5440,11 @@
 			break;
 		}
 	} while (1);
+	*alreadyset = 1;
 	propval->u32 = new;
 	return GP_OK;
 }
 
-
 static int
 _get_Nikon_FocalLength(CONFIG_GET_ARGS) {
 	char	len20;
@@ -3963,6 +5472,37 @@
 }
 
 static int
+_get_Olympus_Aperture(CONFIG_GET_ARGS) {
+	char	len20;
+	int	i;
+
+	if (dpd->DataType != PTP_DTC_UINT16)
+		return GP_ERROR;
+	if (!(dpd->FormFlag & PTP_DPFF_Enumeration))
+		return GP_ERROR;
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	for (i=0;i<dpd->FORM.Enum.NumberOfValues; i++) {
+		sprintf (len, "%.1f", dpd->FORM.Enum.SupportedValuei.u16 * 0.1);
+		gp_widget_add_choice (*widget, len);
+	}
+	sprintf (len, "%.1f", dpd->CurrentValue.u16 * 0.1);
+	gp_widget_set_value (*widget, len);
+	return GP_OK;
+}
+
+static int
+_put_Olympus_Aperture(CONFIG_PUT_ARGS) {
+	char	*val;
+	float	f;
+
+	gp_widget_get_value (widget, &val);
+	sscanf (val, "%f", &f);
+	propval->u16 = 10*f;
+	return GP_OK;
+}
+
+static int
 _get_Nikon_LightMeter(CONFIG_GET_ARGS) {
 	char	meter20;
 
@@ -3981,9 +5521,9 @@
 	float value_float;
 
 	if (!(dpd->FormFlag & PTP_DPFF_Range))
-		return (GP_ERROR);
+		return GP_ERROR;
 	if (dpd->DataType != PTP_DTC_INT8)
-		return (GP_ERROR);
+		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	gp_widget_set_range (*widget,
@@ -3993,7 +5533,7 @@
 	);
 	value_float = dpd->CurrentValue.i8/6.0;
 	gp_widget_set_value (*widget, &value_float);
-	return (GP_OK);
+	return GP_OK;
 }
 
 static int
@@ -4070,13 +5610,46 @@
 	{ N_("Wide-area AF"),		1, 0 },
 	{ N_("Normal-area AF"),		2, 0 },
 	{ N_("Subject-tracking AF"),	3, 0 },
+	{ N_("Spot-area AF"),		4, 0 },
+};
+GENERIC8TABLE(Nikon_LiveViewAFU,nikon_liveviewaf)
+
+/* varies between nikons */
+static struct deviceproptableu8 nikon_liveviewimagezoomratio = {
+	{ N_("Entire Display"),	0, 0 },
+	{ N_("25%"),		2, 0 },
+	{ N_("50%"),		4, 0 },
+	{ N_("100%"),		6, 0 },
+	{ N_("200%"),		7, 0 },
+};
+GENERIC8TABLE(Nikon_LiveViewImageZoomRatio,nikon_liveviewimagezoomratio)
+
+/* varies between nikons */
+static struct deviceproptableu8 nikon_liveviewimagezoomratio_d5000 = {
+	{ N_("Entire Display"),	0, 0 },
+	{ N_("25%"),		1, 0 },
+	{ N_("33%"),		2, 0 },
+	{ N_("50%"),		3, 0 },
+	{ N_("66%"),		4, 0 },
+	{ N_("100%"),		5, 0 },
+};
+GENERIC8TABLE(Nikon_LiveViewImageZoomRatio_D5000,nikon_liveviewimagezoomratio_d5000)
+
+static struct deviceproptablei8 nikon_liveviewafi = {
+	{ N_("Face-priority AF"),	0, 0 },
+	{ N_("Wide-area AF"),		1, 0 },
+	{ N_("Normal-area AF"),		2, 0 },
+	{ N_("Subject-tracking AF"),	3, 0 },
+	{ N_("Spot-area AF"),		4, 0 },
 };
-GENERIC8TABLE(Nikon_LiveViewAF,nikon_liveviewaf)
+GENERICI8TABLE(Nikon_LiveViewAFI,nikon_liveviewafi)
 
 static struct deviceproptableu8 nikon_liveviewaffocus = {
-	{ N_("Single-servo AF"),	0, 0 },
-	{ N_("Full-time-servo AF"),	2, 0 },
-	{ N_("Manual Focus"),		4, 0 },
+	{ N_("Single-servo AF"),		0, 0 },
+	{ N_("Continuous-servo AF"),		1, 0 },
+	{ N_("Full-time-servo AF"),		2, 0 },
+	{ N_("Manual Focus (fixed)"),		3, 0 },
+	{ N_("Manual Focus (selection)"),	4, 0 },
 };
 GENERIC8TABLE(Nikon_LiveViewAFFocus,nikon_liveviewaffocus)
 
@@ -4131,6 +5704,15 @@
 };
 GENERIC8TABLE(Nikon_CenterWeight,nikon_centerweight)
 
+static struct deviceproptableu8 nikon_d850_centerweight = {
+	{ N_("8 mm"),	0x00, 0 },
+	{ N_("12 mm"),	0x01, 0 },
+	{ N_("15 mm"),	0x02, 0 },
+	{ N_("20 mm"),	0x03, 0 },
+	{ N_("Average"),0x04, 0 },
+};
+GENERIC8TABLE(Nikon_D850_CenterWeight,nikon_d850_centerweight)
+
 static struct deviceproptableu8 nikon_flashshutterspeed = {
 	{ N_("1/60"),	0x00, 0 },
 	{ N_("1/30"),	0x01, 0 },
@@ -4208,17 +5790,92 @@
 };
 GENERICI16TABLE(Fuji_ShutterSpeed,fuji_shutterspeed)
 
+static struct deviceproptableu32 fuji_new_shutterspeed = {
+	{ N_("bulb"),	0xffffffff, 0 },
+	{ "60m",	64000180, 0 },
+	{ "30m",	64000150, 0 },
+	{ "15m",	64000120, 0 },
+	{ "8m",		64000090, 0 },
+	{ "4m",		64000060, 0 },
+	{ "2m",		64000030, 0 },
+	{ "60s",	64000000, 0 },
+	{ "50s",	50796833, 0 },
+	{ "40s",	40317473, 0 },
+	{ "30s",	32000000, 0 },
+	{ "25s",	25398416, 0 },
+	{ "20s",	20158736, 0 },
+	{ "15s",	16000000, 0 },
+	{ "13s",	12699208, 0 },
+	{ "10s",	10079368, 0 },
+	{ "8s",		8000000, 0 },
+	{ "6s",		6349604, 0 },
+	{ "5s",		5039684, 0 },
+	{ "4s",		4000000, 0 },
+	{ "3s",		3174802, 0 },
+	{ "2.5s",	2519842, 0 },
+	{ "2s",		2000000, 0 },
+	{ "1.6s",	1587401, 0 },
+	{ "1.3s",	1259921, 0 },
+	{ "1s",		1000000, 0 },
+	{ "0.8s",	793700, 0 },
+	{ "0.6s",	629960, 0 },
+	{ "1/2",	500000, 0 },
+	{ "0.4s",	396850, 0 },
+	{ "1/3",	314980, 0 },
+	{ "1/4",	250000, 0 },
+	{ "1/5",	198425, 0 },
+	{ "1/6",	157490, 0 },
+	{ "1/8",	125000, 0 },
+	{ "1/10",	99212, 0 },
+	{ "1/13",	78745, 0 },
+	{ "1/15",	62500, 0 },
+	{ "1/20",	49606, 0 },
+	{ "1/25",	39372, 0 },
+	{ "1/30",	31250, 0 },
+	{ "1/40",	24803, 0 },
+	{ "1/50",	19686, 0 },
+	{ "1/60",	15625, 0 },
+	{ "1/80",	12401, 0 },
+	{ "1/100",	9843, 0 },
+	{ "1/125",	7812, 0 },
+	{ "1/160",	6200, 0 },
+	{ "1/200",	4921, 0 },
+	{ "1/250",	3906, 0 },
+	{ "1/320",	3100, 0 },
+	{ "1/400",	2460, 0 },
+	{ "1/500",	1953, 0 },
+	{ "1/640",	1550, 0 },
+	{ "1/800",	1230, 0 },
+	{ "1/1000",	976, 0 },
+	{ "1/1250",	775, 0 },
+	{ "1/1600",	615, 0 },
+	{ "1/2000",	488, 0 },
+	{ "1/2500",	387, 0 },
+	{ "1/3200",	307, 0 },
+	{ "1/4000",	244, 0 },
+	{ "1/5000",	193, 0 },
+	{ "1/6400",	153, 0 },
+	{ "1/8000",	122, 0 },
+	{ "1/10000",	96, 0 },
+	{ "1/13000",	76, 0 },
+	{ "1/16000",	61, 0 },
+	{ "1/20000",	48, 0 },
+	{ "1/25000",	38, 0 },
+	{ "1/32000",	30, 0 },
+};
+GENERIC32TABLE(Fuji_New_ShutterSpeed,fuji_new_shutterspeed)
+
 static struct deviceproptableu8 nikon_remotetimeout = {
-	{ N_("1 minute"),	0x00, 0 },
-	{ N_("5 minutes"),	0x01, 0 },
-	{ N_("10 minutes"),	0x02, 0 },
-	{ N_("15 minutes"),	0x03, 0 },
+	{ N_("1 minute"),	0x00,	0 },
+	{ N_("5 minutes"),	0x01,	0 },
+	{ N_("10 minutes"),	0x02,	0 },
+	{ N_("15 minutes"),	0x03,	0 },
 };
 GENERIC8TABLE(Nikon_RemoteTimeout,nikon_remotetimeout)
 
 static struct deviceproptableu8 nikon_optimizeimage = {
-	{ N_("Normal"),		0x00, 0 },
-	{ N_("Vivid"),		0x01, 0 },
+	{ N_("Normal"),		0x00,	0 },
+	{ N_("Vivid"),		0x01,	0 },
 	{ N_("Sharper"),	0x02, 0 },
 	{ N_("Softer"),		0x03, 0 },
 	{ N_("Direct Print"),	0x04, 0 },
@@ -4276,12 +5933,17 @@
 	{ N_("AF-S"),		0x8010, PTP_VENDOR_NIKON },
 	{ N_("AF-C"),		0x8011, PTP_VENDOR_NIKON },
 	{ N_("AF-A"),		0x8012, PTP_VENDOR_NIKON },
+	{ N_("AF-F"),		0x8013, PTP_VENDOR_NIKON },
 	{ N_("Single-Servo AF"),0x8001, PTP_VENDOR_FUJI },
 	{ N_("Continuous-Servo AF"),0x8002, PTP_VENDOR_FUJI },
 
+	{ N_("C-AF"),		0x8002, PTP_VENDOR_GP_OLYMPUS_OMD },
+	{ N_("S-AF+MF"),	0x8001, PTP_VENDOR_GP_OLYMPUS_OMD },
+
 	{ N_("AF-A"),		0x8005, PTP_VENDOR_SONY },
 	{ N_("AF-C"),		0x8004, PTP_VENDOR_SONY },
 	{ N_("DMF"),		0x8006, PTP_VENDOR_SONY },
+
 };
 GENERIC16TABLE(FocusMode,focusmodes)
 
@@ -4309,17 +5971,18 @@
 			break;
 		}
 	}
+	*alreadyset = 1;
 	return GP_OK;
 }
 
 
-static struct deviceproptableu16 eos_focusmodes = {
+static struct deviceproptableu32 eos_focusmodes = {
 	{ N_("One Shot"),	0x0000, 0 },
 	{ N_("AI Servo"),	0x0001, 0 },
 	{ N_("AI Focus"),	0x0002, 0 },
 	{ N_("Manual"),		0x0003, 0 },
 };
-GENERIC16TABLE(Canon_EOS_FocusMode,eos_focusmodes)
+GENERIC32TABLE(Canon_EOS_FocusMode,eos_focusmodes)
 
 static struct deviceproptableu16 eos_quickreviewtime = {
 	{ N_("None"),		0x0000, 0 },
@@ -4344,12 +6007,11 @@
 	{ N_("Custom Whitebalance PC-2"),	11, 0 },
 	{ N_("Custom Whitebalance PC-3"),	12, 0 },
 	{ N_("Missing Number"),		13, 0 },
-	/*{ N_("Flourescent H"),		14, 0 }, ... dup? */
+	/*{ N_("Fluorescent H"),		14, 0 }, ... dup? */
 };
 GENERIC8TABLE(Canon_WhiteBalance,canon_whitebalance)
 
-/* confirmed against EOS 450D - Marcus */
-/* I suspect every EOS uses a different table :( */
+/* check against SDK */
 static struct deviceproptableu8 canon_eos_whitebalance = {
 	{ N_("Auto"),		0, 0 },
 	{ N_("Daylight"),	1, 0 },
@@ -4360,13 +6022,17 @@
 	{ N_("Manual"),		6, 0 },
 	{"Unknown 7",		7, 0 },
 	{ N_("Shadow"),		8, 0 },
-	{ N_("Color Temperature"),9, 0 }, /* from eos 40d / 5D Mark II dump */
-	{ "Unknown 10",		10, 0 },
-	{ "Unknown 11",		11, 0 },
-	{ N_("Custom WB 2"),	15, 0 },
-	{ N_("Custom WB 3"),	16, 0 },
-	{ N_("Custom WB 4"),	18, 0 },
-	{ N_("Custom WB 5"),	19, 0 },
+	{ N_("Color Temperature"),9, 0 },
+	{ N_("Custom Whitebalance: PC-1"),		10, 0 },
+	{ N_("Custom Whitebalance: PC-2"),		11, 0 },
+	{ N_("Custom Whitebalance: PC-3"),		12, 0 },
+	{ N_("Manual 2"),	15, 0 },
+	{ N_("Manual 3"),	16, 0 },
+	{ N_("Manual 4"),	18, 0 },
+	{ N_("Manual 5"),	19, 0 },
+	{ N_("Custom Whitebalance: PC-4"),		20, 0 },
+	{ N_("Custom Whitebalance: PC-5"),		21, 0 },
+	{ N_("AWB White"),	23, 0 },
 };
 GENERIC8TABLE(Canon_EOS_WhiteBalance,canon_eos_whitebalance)
 
@@ -4460,9 +6126,20 @@
 GENERIC16TABLE(Canon_PhotoEffect,canon_photoeffect)
 
 
+/* FIXME: actually uint32 in SDK doc? also non-standard type in debuglogs */
+static struct deviceproptableu16 canon_bracketmode = {
+	{ N_("AE bracket"),	1, 0 },
+	{ N_("ISO bracket"),	2, 0 },
+	{ N_("WB bracket"),	4, 0 },
+	{ N_("FE bracket"),	8, 0 },
+	{ N_("Bracket off"),	0xffff, 0 },
+};
+GENERIC16TABLE(Canon_BracketMode,canon_bracketmode)
+
 static struct deviceproptableu16 canon_aperture = {
 	{ N_("implicit auto"),	0x0, 0 },
 	{ N_("auto"),	0xffff, 0 },
+	{ N_("auto"),	0x00b0, 0 },
 	{ "1",		0x0008, 0 },
 	{ "1.1",	0x000b, 0 },
 	{ "1.2",	0x000c, 0 },
@@ -4550,7 +6227,155 @@
 };
 GENERIC16TABLE(Fuji_Aperture,fuji_aperture)
 
-
+/* The j5 only reports some of those, there is no clear pattern... fill in with more 1 series */
+static struct deviceproptableu8 nikon_1_aperture = {
+	/* 1 */
+	/* 1.1 */
+	/* 1.2 */
+	/* 1.3 */
+	/* 1.4 */
+	/* 1.5 */
+	/* 1.6 */
+	/* 1.7 */
+	{ "1.8",	10, 0 },
+	/* 1.9 */
+	{ "2",		12, 0 },
+	{ "2.2",	14, 0 },
+	/* 2.4 */
+	{ "2.5",	16, 0 },
+	/* 2.7 */
+	{ "2.8",	18, 0 },
+	/* 3 */
+	{ "3.2",	20, 0 },
+	{ "3.5",	22, 0 },
+	/* 3.8 */
+	{ "4",		24, 0 },
+	/* 4.2 */
+	{ "4.5",	26, 0 },
+	/* 4.8 */
+	{ "5",		28, 0 },
+	/* 5.3 */
+	{ "5.6",	30, 0 },
+	/* 6 */
+	{ "6.3",	32, 0 },
+	/* 6.7 */
+	{ "7.1",	34, 0 },
+	/* 7.6 */
+	{ "8",		36, 0 },
+	/* 8.5 */
+	{ "9", 		38, 0 },
+	/* 9.5 */
+	{ "10", 	40, 0 },
+	{ "11", 	42, 0 },
+	/* 12 */
+	{ "13",		44, 0 },
+	{ "14", 	46, 0 },
+	/* 15 */
+	{ "16",		48, 0 },
+	/* 17 */
+	/* 18 */
+	/* 19 */
+	/* 20 */
+	/* 21 */
+	/* 22 */
+	/* 24 */
+	/* 25 */
+	/* 27.6 */
+	/* 29 */
+	/* 30 */
+	/* 32 */
+	/* 0 */
+};
+GENERIC8TABLE(Nikon_1_Aperture,nikon_1_aperture)
+
+/* The j5 only reports some of those, there is no clear pattern... fill in with more 1 series */
+static struct deviceproptablei8 nikon_1_shutterspeedi = {
+	{ "Bulb",	-31, 0 },
+	{ "30",		-30, 0 },
+	{ "25",		-28, 0 },
+	{ "20",		-26, 0 },
+	{ "15",		-24, 0 },
+	{ "13",		-22, 0 },
+	{ "10",		-20, 0 },
+	{ "8",		-18, 0 },
+	{ "6",		-16, 0 },
+	{ "5",		-14, 0 },
+	{ "4",		-12, 0 },
+	{ "3",		-10, 0 },
+	{ "25/10",	-8, 0 },
+	{ "2",		-6, 0 },
+	{ "16/10",	-4, 0 },
+	/* { "15/10",	xx, 0 }, not in j5 */
+	{ "13/10",	-2, 0 },
+	{ "1",		 0, 0 },
+	{ "10/13",	 2, 0 }, /* 1 1/3 */
+	/* { "10/15", 	xx, 0 }, not in j5 */
+	{ "10/16",	 4, 0 },
+	{ "1/2",	 6, 0 },
+	{ "10/25",	 8, 0 },
+	{ "1/3",	10, 0 },
+	{ "1/4",	12, 0 },
+	{ "1/5",	14, 0 },
+	{ "1/6",	16, 0 },
+	{ "1/8",	18, 0 },
+	{ "1/10",	20, 0 },
+	{ "1/13",	22, 0 },
+	{ "1/15",	24, 0 },
+	{ "1/20",	26, 0 },
+	{ "1/25",	28, 0 },
+	{ "1/30",	30, 0 },
+	{ "1/40",	32, 0 },
+	/* { "1/45", xx, 0 }, not in j5 */
+	{ "1/50",	34, 0 },
+	{ "1/60",	36, 0 },
+	{ "1/80",	38, 0 },
+	/* { "1/90", xx, 0 } not in j5 */
+	{ "1/100",	40, 0 },
+	{ "1/125",	42, 0 },
+	{ "1/160",	44, 0 },
+	/* { "1/180", xx, 0 }, not in j5 */
+	{ "1/200",	46, 0 },
+	{ "1/250",	48, 0 },
+	{ "1/320",	50, 0 },
+	/* { "1/350", xx, 0 }, not in j5 */
+	{ "1/400",	52, 0 },
+	{ "1/500",	54, 0 },
+	{ "1/640",	56, 0 },
+	/* { "1/750",	xx, 0 }, not in j5 */
+	{ "1/800", 	58, 0 },
+	{ "1/1000",	60, 0 },
+	{ "1/1250",	62, 0 },
+	/* { "1/1500", xx, 0}, not in j5 */
+	{ "1/1600",	64, 0 },
+	{ "1/2000",	66, 0 },
+	{ "1/2500",	68, 0 },
+	/* { "1/3000",	xx, 0 }, not in j5 */
+	{ "1/3200",	70, 0 },
+	{ "1/4000",	72, 0 },
+	{ "1/5000",	74, 0 },
+	/*{ "1/6000",	xx, 0 }, not in j5 */
+	{ "1/6400",	76, 0 },
+	{ "1/8000",	78, 0 },
+	/* { "1/9000", xx , 0}, not in j5 */
+	{ "1/10000",	80, 0 },
+	/* { "1/12500", xx, 0 }, not in j5 */
+	{ "1/13000",	82, 0 },
+	/* { "1/15000", xx, 0 }, not in j5 */
+	{ "1/16000",	84, 0 },
+};
+GENERICI8TABLE(Nikon_1_ShutterSpeedI,nikon_1_shutterspeedi)
+
+static int
+_get_Nikon_1_ShutterSpeedU(CONFIG_GET_ARGS) {
+	dpd->DataType = PTP_DTC_INT8;
+	return _get_Nikon_1_ShutterSpeedI(CONFIG_GET_NAMES);
+}
+
+static int
+_put_Nikon_1_ShutterSpeedU(CONFIG_PUT_ARGS) {
+	dpd->DataType = PTP_DTC_INT8;
+	return _put_Nikon_1_ShutterSpeedI(CONFIG_PUT_NAMES);
+}
 
 static struct deviceproptableu8 nikon_bracketset = {
 	{ N_("AE & Flash"),	0, 0 },
@@ -4616,7 +6441,7 @@
 	{"AF-S Nikkor 35mm 1:1.8G DX", 			159, 0},
 	{"Sigma EX 30mm 1:1.4 DC HSM",			248, 0}, /* from mge */
 };
-GENERIC8TABLE(Nikon_LensID,nikon_lensid)
+GENERIC8TABLE(Nikon_LensID,nikon_lensid) /* FIXME: seen UINT8 and UINT16 types now */
 
 static struct deviceproptableu8 nikon_microphone = {
 	{N_("Auto sensitivity"),	0, 0},
@@ -4634,6 +6459,26 @@
 };
 GENERIC8TABLE(Nikon_MovieQuality, nikon_moviequality);
 
+static struct deviceproptableu8 nikon_d850_moviequality = {
+ 	{"3840x2160; 30p",	0, 0},
+	{"3840x2160; 25p",	1, 0},
+	{"3840x2160; 24p",	2, 0},
+
+ 	{"1920x1080; 60p",	3, 0},
+	{"1920x1080; 50p",	4, 0},
+	{"1920x1080; 30p",	5, 0},
+	{"1920x1080; 25p",	6, 0},
+	{"1920x1080; 24p",	7, 0},
+
+	{"1280x720; 60p",	8, 0},
+	{"1280x720; 50p",	9, 0},
+
+	{"1920x1080; 30p x4 (slow-mo)", 10, 0},
+	{"1920x1080; 25p x4 (slow-mo)",	11, 0},
+	{"1920x1080; 24p x5 (slow-mo)",	12, 0},
+};
+GENERIC8TABLE(Nikon_D850_MovieQuality, nikon_d850_moviequality);
+
 static struct deviceproptableu8 nikon_d5100_moviequality = {
 	{"640x424; 25fps; normal",		0, 0},
 	{"640x424; 25fps; high quality",	1, 0},
@@ -4856,6 +6701,63 @@
 };
 GENERIC8TABLE(Nikon_D3s_PADVPValue,nikon_d3s_padvpvalue)
 
+static struct deviceproptableu8 nikon_z6_padvpvalue = {
+	{ "1/4000",	0x00, 0 },
+	{ "1/3200",	0x01, 0 },
+	{ "1/2500",	0x02, 0 },
+	{ "1/2000",	0x03, 0 },
+	{ "1/1600",	0x04, 0 },
+	{ "1/1250",	0x05, 0 },
+	{ "1/1000",	0x06, 0 },
+	{ "1/800",	0x07, 0 },
+	{ "1/640",	0x08, 0 },
+	{ "1/500",	0x09, 0 },
+	{ "1/400",	0x0a, 0 },
+	{ "1/320",	0x0b, 0 },
+	{ "1/250",	0x0c, 0 },
+	{ "1/200",	0x0d, 0 },
+	{ "1/160",	0x0e, 0 },
+	{ "1/125",	0x0f, 0 },
+	{ "1/100",	0x10, 0 },
+	{ "1/80",	0x11, 0 },
+	{ "1/60",	0x12, 0 },
+	{ "1/50",	0x13, 0 },
+	{ "1/40",	0x14, 0 },
+	{ "1/30",	0x15, 0 },
+	{ "1/25",	0x16, 0 },
+	{ "1/20",	0x17, 0 },
+	{ "1/15",	0x18, 0 },
+	{ "1/13",	0x19, 0 },
+	{ "1/10",	0x1a, 0 },
+	{ "1/8",	0x1b, 0 },
+	{ "1/6",	0x1c, 0 },
+	{ "1/5",	0x1d, 0 },
+	{ "1/4",	0x1e, 0 },
+	{ "1/3",	0x1f, 0 },
+	{ "1/2.5",	0x20, 0 },
+	{ "1/2",	0x21, 0 },
+	{ "1/1.6",	0x22, 0 },
+	{ "1/1.3",	0x23, 0 },
+	{ "1",		0x24, 0 },
+	{ "1.3",	0x25, 0 },
+	{ "1.6",	0x26, 0 },
+	{ "2",		0x27, 0 },
+	{ "2.5",	0x28, 0 },
+	{ "3",		0x29, 0 },
+	{ "4",		0x2a, 0 },
+	{ "5",		0x2b, 0 },
+	{ "6",		0x2c, 0 },
+	{ "8",		0x2d, 0 },
+	{ "10",		0x2e, 0 },
+	{ "13",		0x2f, 0 },
+	{ "15",		0x30, 0 },
+	{ "20",		0x31, 0 },
+	{ "25",		0x32, 0 },
+	{ "30",		0x33, 0 },
+	{ N_("auto"),	0x34, 0 },
+};
+GENERIC8TABLE(Nikon_Z6_PADVPValue,nikon_z6_padvpvalue)
+
 static struct deviceproptableu8 nikon_d90_activedlighting = {
 	{ N_("Extra high"), 0x00,   0 },
 	{ N_("High"),       0x01,   0 },
@@ -4866,6 +6768,16 @@
 };
 GENERIC8TABLE(Nikon_D90_ActiveDLighting,nikon_d90_activedlighting)
 
+static struct deviceproptablei8 nikon_d850_activedlighting = {
+	{ N_("Auto"),		0x00,   0 },
+	{ N_("Off"),		0x01,   0 },
+	{ N_("Low"),		0x02,   0 },
+	{ N_("Normal"),		0x03,   0 },
+	{ N_("High"),		0x04,   0 },
+	{ N_("Extra high"),	0x05,   0 },
+};
+GENERICI8TABLE(Nikon_D850_ActiveDLighting,nikon_d850_activedlighting)
+
 static struct deviceproptableu8 nikon_1_compression = {
 	{ N_("JPEG Normal"),	0x00, PTP_VENDOR_NIKON },
 	{ N_("JPEG Fine"),	0x01, PTP_VENDOR_NIKON },
@@ -4908,6 +6820,41 @@
 };
 GENERIC8TABLE(Nikon_D40_Compression,nikon_d40_compression)
 
+static struct deviceproptableu8 nikon_d850_compression = {
+	{ N_("JPEG Basic"),  0x00, PTP_VENDOR_NIKON },
+	{ N_("JPEG Basic*"), 0x01, PTP_VENDOR_NIKON },
+	{ N_("JPEG Normal"), 0x02, PTP_VENDOR_NIKON },
+	{ N_("JPEG Normal*"),   0x03, PTP_VENDOR_NIKON },
+	{ N_("JPEG Fine"),   0x04, PTP_VENDOR_NIKON },
+	{ N_("JPEG Fine*"),   0x05, PTP_VENDOR_NIKON },
+	{ N_("TIFF"),   0x06, PTP_VENDOR_NIKON },
+	{ N_("NEF (Raw)"),   0x07, PTP_VENDOR_NIKON },
+	{ N_("NEF+Basic"),   0x08, PTP_VENDOR_NIKON },
+	{ N_("NEF+Basic*"),   0x09, PTP_VENDOR_NIKON },
+	{ N_("NEF+Normal"),   0x0A, PTP_VENDOR_NIKON },
+	{ N_("NEF+Normal*"),   0x0B, PTP_VENDOR_NIKON },
+	{ N_("NEF+Fine"),   0x0C, PTP_VENDOR_NIKON },
+	{ N_("NEF+Fine*"),   0x0D, PTP_VENDOR_NIKON },
+};
+GENERIC8TABLE(Nikon_D850_Compression,nikon_d850_compression)
+
+static struct deviceproptableu8 nikon_d7500_compression = {
+	{ N_("JPEG Basic"),  0x00, PTP_VENDOR_NIKON },
+	{ N_("JPEG Basic*"), 0x01, PTP_VENDOR_NIKON },
+	{ N_("JPEG Normal"), 0x02, PTP_VENDOR_NIKON },
+	{ N_("JPEG Normal*"),   0x03, PTP_VENDOR_NIKON },
+	{ N_("JPEG Fine"),   0x04, PTP_VENDOR_NIKON },
+	{ N_("JPEG Fine*"),   0x05, PTP_VENDOR_NIKON },
+	{ N_("NEF (Raw)"),   0x07, PTP_VENDOR_NIKON },
+	{ N_("NEF+Basic"),   0x08, PTP_VENDOR_NIKON },
+	{ N_("NEF+Basic*"),   0x09, PTP_VENDOR_NIKON },
+	{ N_("NEF+Normal"),   0x0A, PTP_VENDOR_NIKON },
+	{ N_("NEF+Normal*"),   0x0B, PTP_VENDOR_NIKON },
+	{ N_("NEF+Fine"),   0x0C, PTP_VENDOR_NIKON },
+	{ N_("NEF+Fine*"),   0x0D, PTP_VENDOR_NIKON },
+};
+GENERIC8TABLE(Nikon_D7500_Compression,nikon_d7500_compression)
+
 static struct deviceproptableu8 compressionsetting = {
 	{ N_("JPEG Basic"),	0x00, PTP_VENDOR_NIKON },
 	{ N_("JPEG Normal"),	0x01, PTP_VENDOR_NIKON },
@@ -4917,14 +6864,79 @@
 	{ N_("NEF+Normal"),	0x06, PTP_VENDOR_NIKON },
 	{ N_("NEF+Fine"),	0x07, PTP_VENDOR_NIKON },
 
-	{ N_("Standard"),	0x02, PTP_VENDOR_SONY },
-	{ N_("Fine"),		0x03, PTP_VENDOR_SONY },
-	{ N_("Extra Fine"),	0x04, PTP_VENDOR_SONY },
-	{ N_("RAW"),		0x10, PTP_VENDOR_SONY },
-	{ N_("RAW+JPEG"),	0x13, PTP_VENDOR_SONY },
+	{ N_("Light"),			0x01, PTP_VENDOR_SONY },
+	{ N_("Standard"),		0x02, PTP_VENDOR_SONY },
+	{ N_("Fine"),			0x03, PTP_VENDOR_SONY },
+	{ N_("Extra Fine"),		0x04, PTP_VENDOR_SONY },
+	{ N_("RAW"),			0x10, PTP_VENDOR_SONY },
+	{ N_("RAW+JPEG (Light)"),	0x11, PTP_VENDOR_SONY },
+	{ N_("RAW+JPEG (Std)"),		0x12, PTP_VENDOR_SONY },
+	{ N_("RAW+JPEG (Fine)"),	0x13, PTP_VENDOR_SONY },
+	{ N_("RAW+JPEG (X.Fine)"),	0x14, PTP_VENDOR_SONY },
+	/* HEIF 4:2:0 4:2:2 is not exposed here */
+	{ N_("HEIF (Light)"),		0x31, PTP_VENDOR_SONY },
+	{ N_("HEIF (Std)"),		0x32, PTP_VENDOR_SONY },
+	{ N_("HEIF (Fine)"),		0x33, PTP_VENDOR_SONY },
+	{ N_("HEIF (X.Fine)"),		0x34, PTP_VENDOR_SONY },
+	{ N_("RAW+HEIF (Light)"),	0x41, PTP_VENDOR_SONY },
+	{ N_("RAW+HEIF (Std)"),		0x42, PTP_VENDOR_SONY },
+	{ N_("RAW+HEIF (Fine)"),	0x43, PTP_VENDOR_SONY },
+	{ N_("RAW+HEIF (X.Fine)"),	0x44, PTP_VENDOR_SONY },
 };
 GENERIC8TABLE(CompressionSetting,compressionsetting)
 
+static struct deviceproptableu8 sony_300_compression = {
+	{ N_("RAW"),         0x01, PTP_VENDOR_SONY },
+	{ N_("RAW+JPEG"),    0x02, PTP_VENDOR_SONY },
+	{ N_("JPEG"),        0x03, PTP_VENDOR_SONY },
+};
+GENERIC8TABLE(Sony_300_CompressionSetting,sony_300_compression)
+
+static struct deviceproptableu8 sony_300_jpegcompression = {
+	{ N_("n/a"),         0x00, PTP_VENDOR_SONY },
+	{ N_("X.Fine"),      0x01, PTP_VENDOR_SONY },
+	{ N_("Fine"),        0x02, PTP_VENDOR_SONY },
+	{ N_("Std"),         0x03, PTP_VENDOR_SONY },
+	{ N_("Light"),       0x04, PTP_VENDOR_SONY },
+};
+GENERIC8TABLE(Sony_300_JpegCompressionSetting,sony_300_jpegcompression)
+
+static struct deviceproptableu8 sony_qx_compression = {
+	{ N_("Standard"),	0x02, 0 },
+	{ N_("Fine"),		0x03, 0 },
+	{ N_("Extra Fine"),	0x04, 0 },
+	{ N_("RAW"),		0x10, 0 },
+	{ N_("RAW+JPEG"),	0x13, 0 },
+};
+GENERIC8TABLE(Sony_QX_Compression,sony_qx_compression)
+
+static struct deviceproptableu8 sony_pc_save_image_size = {
+	{ N_("Original"), 0x01, 0 },
+	{ N_("2M"),       0x02, 0 },
+};
+GENERIC8TABLE(Sony_PcSaveImageSize, sony_pc_save_image_size)
+
+static struct deviceproptableu8 sony_pc_save_image_format = {
+	{ N_("RAW & JPEG"),   0x01, 0 },
+	{ N_("JPEG Only"),    0x02, 0 },
+	{ N_("RAW Only"),     0x03, 0 },
+	{ N_("RAW & HEIF"),   0x04, 0 },
+	{ N_("HEIF Only"),    0x05, 0 }
+};
+GENERIC8TABLE(Sony_PcSaveImageFormat, sony_pc_save_image_format)
+
+static struct deviceproptableu8 sony_sensorcrop = {
+	{ N_("Off"),	0x01, 0 },
+	{ N_("On"),	0x02, 0 },
+};
+GENERIC8TABLE(Sony_SensorCrop,sony_sensorcrop)
+
+static struct deviceproptableu8 sony_liveviewsettingeffect = {
+		{ N_("On"),  0x01, 0 },
+		{ N_("Off"), 0x02, 0 },
+};
+GENERIC8TABLE(Sony_LiveViewSettingEffect,sony_liveviewsettingeffect)
+
 /* Sony specific, we need to wait for it settle (around 1 second), otherwise we get trouble later on */
 static int
 _put_Sony_CompressionSetting(CONFIG_PUT_ARGS) {
@@ -4949,6 +6961,7 @@
 			break;
 		}
 	}
+	*alreadyset = 1;
 	return GP_OK;
 }
 
@@ -4994,6 +7007,8 @@
 static struct deviceproptableu8 nikon_rawcompression = {
 	{ N_("Lossless"),	0x00, 0 },
 	{ N_("Lossy"),		0x01, 0 },
+	{ N_("High Efficiency*"),0x03, 0 },
+	{ N_("High Efficiency"),0x04, 0 },
 };
 GENERIC8TABLE(Nikon_RawCompression,nikon_rawcompression)
 
@@ -5128,6 +7143,18 @@
 };
 GENERIC8TABLE(Nikon_D3s_ShootingSpeed,nikon_d3s_shootingspeed)
 
+static struct deviceproptableu8 nikon_d850_shootingspeed = {
+	{ N_("8 fps"),	0x01, 0 },
+	{ N_("7 fps"),	0x02, 0 },
+	{ N_("6 fps"),	0x03, 0 },
+	{ N_("5 fps"),	0x04, 0 },
+	{ N_("4 fps"),	0x05, 0 },
+	{ N_("3 fps"),	0x06, 0 },
+	{ N_("2 fps"),	0x07, 0 },
+	{ N_("1 fps"),	0x08, 0 },
+};
+GENERIC8TABLE(Nikon_D850_ShootingSpeed,nikon_d850_shootingspeed)
+
 static struct deviceproptableu8 nikon_d3s_shootingspeedhigh = {
 	{ N_("11 fps"),	0x00, 0 },
 	{ N_("10 fps"),	0x01, 0 },
@@ -5168,34 +7195,33 @@
 };
 GENERIC8TABLE(Nikon_MenusAndPlayback,nikon_menus_and_playback)
 
+static struct deviceproptableu8 nikon_vignettecorrection = {
+	{ N_("High"),		0x0, 0 },
+	{ N_("Normal"),		0x1, 0 },
+	{ N_("Moderate"),	0x2, 0 },
+	{ N_("Off"),		0x3, 0 },
+};
+GENERIC8TABLE(Nikon_VignetteCorrection,nikon_vignettecorrection)
 
-static int
-_get_BurstNumber(CONFIG_GET_ARGS) {
-	float value_float , start=0.0, end=0.0, step=0.0;
-
-	if (!(dpd->FormFlag & PTP_DPFF_Range))
-		return (GP_ERROR);
-	if (dpd->DataType != PTP_DTC_UINT16)
-		return (GP_ERROR);
-	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
-	gp_widget_set_name (*widget, menu->name);
-	start = dpd->FORM.Range.MinimumValue.u16;
-	end = dpd->FORM.Range.MaximumValue.u16;
-	step = dpd->FORM.Range.StepSize.u16;
-	gp_widget_set_range (*widget, start, end, step);
-	value_float = dpd->CurrentValue.u16;
-	gp_widget_set_value (*widget, &value_float);
-	return (GP_OK);
-}
+static struct deviceproptableu8 nikon_hdmidatadepth = {
+	{ "8",		0x0, 0 },
+	{ "10",		0x1, 0 },
+};
+GENERIC8TABLE(Nikon_HDMIDataDepth,nikon_hdmidatadepth)
 
-static int
-_put_BurstNumber(CONFIG_PUT_ARGS) {
-	float val;
+static struct deviceproptableu8 nikon_facedetection = {
+	{ N_("Off"),				0x0, 0 },
+	{ N_("Face detection"),			0x1, 0 },
+	{ N_("Face and pupil detection"),	0x2, 0 },
+	{ N_("Animal detection"),		0x3, 0 },
+};
+GENERIC8TABLE(Nikon_FaceDetection,nikon_facedetection)
 
-	CR (gp_widget_get_value(widget, &val));
-	propval->u16 = val;
-	return GP_OK;
-}
+static struct deviceproptableu32 canon_eos_movieservoaf = {
+	{ N_("Off"),	0x0, 0 },
+	{ N_("On"),	0x1, 0 },
+};
+GENERIC32TABLE(Canon_EOS_MovieServoAF,canon_eos_movieservoaf)
 
 static int
 _get_BatteryLevel(CONFIG_GET_ARGS) {
@@ -5206,6 +7232,21 @@
 		return GP_ERROR;
 	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
 
+	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+		unsigned int i, highest = 0, factor = 1;
+
+		gp_widget_set_name (*widget, menu->name);
+
+		/* This is for Canon ... they have enums  0,1,2,3 and 0,25,50,75,100 .. For the 0-3 enum, multiply by 33 */
+		for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++) {
+			if (dpd->FORM.Enum.SupportedValuei.u8 > highest)
+				highest = dpd->FORM.Enum.SupportedValuei.u8;
+		}
+		if (highest == 3) factor = 33;
+
+		sprintf (buffer, "%d%%", dpd->CurrentValue.u8 * factor);
+		return gp_widget_set_value(*widget, buffer);
+	}
 	if (dpd->FormFlag == PTP_DPFF_Range) {
 		gp_widget_set_name (*widget, menu->name);
 		start = dpd->FORM.Range.MinimumValue.u8;
@@ -5397,7 +7438,7 @@
 	PTPParams	*params = &(camera->pl->params);
 	GPContext 	*context = ((PTPData *) params->data)->context;
 
-	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_AfDrive)) 
+	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_AfDrive))
 		return (GP_ERROR_NOT_SUPPORTED);
 
 	C_PTP (ptp_nikon_afdrive (&camera->pl->params));
@@ -5463,7 +7504,7 @@
 	int		val;
 	PTPParams	*params = &(camera->pl->params);
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_DoAf)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_DoAf))
 		return (GP_ERROR_NOT_SUPPORTED);
 
 	CR (gp_widget_get_value(widget, &val));
@@ -5487,7 +7528,7 @@
 _put_Canon_EOS_AFCancel(CONFIG_PUT_ARGS) {
 	PTPParams *params = &(camera->pl->params);
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_AfCancel)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_AfCancel))
 		return (GP_ERROR_NOT_SUPPORTED);
 
 	C_PTP (ptp_canon_eos_afcancel (params));
@@ -5513,7 +7554,7 @@
 	PTPParams	*params = &(camera->pl->params);
 	GPContext 	*context = ((PTPData *) params->data)->context;
 
-	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_MfDrive)) 
+	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_MfDrive))
 		return (GP_ERROR_NOT_SUPPORTED);
 	gp_widget_get_value(widget, &val);
 
@@ -5561,14 +7602,40 @@
 	char*		val;
 	unsigned int	xval = 0;
 
-	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_SetControlMode)) 
+	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_ChangeCameraMode))
 		return GP_ERROR_NOT_SUPPORTED;
 	gp_widget_get_value(widget, &val);
 
-	if (!sscanf(val,"%d",&xval))	
+	if (!sscanf(val,"%d",&xval))
 		return GP_ERROR;
 
-	C_PTP (ptp_nikon_setcontrolmode (&camera->pl->params, xval));
+	C_PTP (ptp_nikon_changecameramode (&camera->pl->params, xval));
+	params->controlmode = xval;
+	return GP_OK;
+}
+
+static int
+_get_Nikon_ApplicationMode2(CONFIG_GET_ARGS) {
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	gp_widget_set_value(*widget, "0");
+	return (GP_OK);
+}
+
+static int
+_put_Nikon_ApplicationMode2(CONFIG_PUT_ARGS) {
+	PTPParams *params = &(camera->pl->params);
+	char*		val;
+	unsigned int	xval = 0;
+
+	if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_ChangeApplicationMode))
+		return GP_ERROR_NOT_SUPPORTED;
+	gp_widget_get_value(widget, &val);
+
+	if (!sscanf(val,"%d",&xval))
+		return GP_ERROR;
+
+	C_PTP (ptp_nikon_changeapplicationmode (&camera->pl->params, xval));
 	return GP_OK;
 }
 
@@ -5598,7 +7665,7 @@
 /* On EOS 7D:
  * 9128 1 0  (half?)
  * 9128 2 0  (full?)
- * paramters: press mode, ? afmode ? SDK seems to suggest 1==NonAF, 0 == AF
+ * parameters: press mode, ? afmode ? SDK seems to suggest 1==NonAF, 0 == AF
  */
 
 static int
@@ -5607,10 +7674,10 @@
 	PTPParams	*params = &(camera->pl->params);
 	GPContext 	*context = ((PTPData *) params->data)->context;
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn))
 		return (GP_ERROR_NOT_SUPPORTED);
 
-	/* If someone has set the capture target inbetween */
+	/* If someone has set the capture target between */
 	CR (camera_canon_eos_update_capture_target( camera, context, -1 ));
 
 	gp_widget_get_value(widget, &val);
@@ -5710,7 +7777,7 @@
 	unsigned int	xval;
 	PTPParams *params = &(camera->pl->params);
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_DriveLens)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_DriveLens))
 		return (GP_ERROR_NOT_SUPPORTED);
 	gp_widget_get_value(widget, &val);
 
@@ -5731,6 +7798,102 @@
 	return GP_OK;
 }
 
+static int
+_get_Panasonic_MFDrive(CONFIG_GET_ARGS) {
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+
+	gp_widget_add_choice (*widget, _("Near 1"));
+	gp_widget_add_choice (*widget, _("Near 2"));
+	gp_widget_add_choice (*widget, _("None"));
+	gp_widget_add_choice (*widget, _("Far 1"));
+	gp_widget_add_choice (*widget, _("Far 2"));
+
+	gp_widget_set_value (*widget, _("None"));
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_MFDrive(CONFIG_PUT_ARGS) {
+	const char*     val;
+	unsigned int    xval;
+	uint16_t	direction = 0; // 0=near
+	uint16_t	mode = 0x02;
+	PTPParams	*params = &(camera->pl->params);
+
+	gp_widget_get_value(widget, &val);
+
+	if (!strcmp (val, _("None"))) return GP_OK;
+
+	if (!sscanf (val, _("Near %d"), &xval)) {
+		if (!sscanf (val, _("Far %d"), &xval)) {
+			GP_LOG_D ("Could not parse %s", val);
+			return GP_ERROR;
+		} else {
+			direction = 1; // far
+		}
+	}
+	if(direction) { // far
+		if(xval == 1) mode = 0x03;
+		if(xval == 2) mode = 0x04;
+	} else { // near
+		if(xval == 1) mode = 0x02;
+		if(xval == 2) mode = 0x01;
+	}
+	gp_widget_set_value (widget, _("None")); /* Marcus: not right here */
+	C_PTP_MSG (ptp_panasonic_manualfocusdrive (params, mode), "Panasonic manual focus drive 0x%x failed", xval);
+	return GP_OK;
+}
+
+
+static int
+_get_Olympus_OMD_MFDrive(CONFIG_GET_ARGS) {
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+
+	gp_widget_add_choice (*widget, _("Near 1"));
+	gp_widget_add_choice (*widget, _("Near 2"));
+	gp_widget_add_choice (*widget, _("Near 3"));
+	gp_widget_add_choice (*widget, _("None"));
+	gp_widget_add_choice (*widget, _("Far 1"));
+	gp_widget_add_choice (*widget, _("Far 2"));
+	gp_widget_add_choice (*widget, _("Far 3"));
+
+	gp_widget_set_value (*widget, _("None"));
+	return (GP_OK);
+}
+
+static int
+_put_Olympus_OMD_MFDrive(CONFIG_PUT_ARGS) {
+	const char*	val;
+	unsigned int	xval;
+	uint32_t direction = 0x01;
+	uint32_t step_size = 0x0e;
+	PTPParams *params = &(camera->pl->params);
+
+	if (!ptp_operation_issupported(params, PTP_OC_OLYMPUS_OMD_MFDrive))
+		return (GP_ERROR_NOT_SUPPORTED);
+	gp_widget_get_value(widget, &val);
+
+	if (!strcmp (val, _("None"))) return GP_OK;
+
+	if (!sscanf (val, _("Near %d"), &xval)) {
+		if (!sscanf (val, _("Far %d"), &xval)) {
+			GP_LOG_D ("Could not parse %s", val);
+			return GP_ERROR;
+		} else {
+			direction = 0x02;
+		}
+	}
+	if(xval == 1) step_size = 0x03;
+	if(xval == 2) step_size = 0x0e;
+	if(xval == 3) step_size = 0x3c;
+
+	C_PTP_MSG (ptp_olympus_omd_move_focus (params, direction, step_size),
+		   "Olympus manual focus drive 0x%x failed", xval);
+	return GP_OK;
+}
+
 
 static int
 _get_Canon_EOS_Zoom(CONFIG_GET_ARGS) {
@@ -5748,7 +7911,7 @@
 	unsigned int	xval;
 	PTPParams *params = &(camera->pl->params);
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_Zoom)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_Zoom))
 		return (GP_ERROR_NOT_SUPPORTED);
 
 	gp_widget_get_value(widget, &val);
@@ -5781,7 +7944,7 @@
 	unsigned int	x,y;
 	PTPParams *params = &(camera->pl->params);
 
-	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_ZoomPosition)) 
+	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_ZoomPosition))
 		return (GP_ERROR_NOT_SUPPORTED);
 
 	gp_widget_get_value(widget, &val);
@@ -5814,18 +7977,18 @@
 	int		script_id;
 	unsigned int	status;
 	int		luastatus;
-	
+
 	CR (gp_widget_get_value(widget, &script));
 
 //  Nafraf: Working on this!!!
 //
-//  gphoto: config.c   
+//  gphoto: config.c
 //  ret = ptp_chdk_exec_lua (params, val, &output);
 //
 //  chdkptp: chdkptp.c
-//    ret = ptp_chdk_exec_lua (params, 
+//    ret = ptp_chdk_exec_lua (params,
 //                (char *)luaL_optstring(L,2,""),
-//                luaL_optnumber(L,3,0), 
+//                luaL_optnumber(L,3,0),
 //                &ptp_cs->script_id,
 //                &status)
 //
@@ -5949,14 +8112,67 @@
 }
 
 static int
+_get_Canon_RemoteMode(CONFIG_GET_ARGS) {
+	char		buf200;
+	PTPParams	*params = &(camera->pl->params);
+	uint32_t	mode;
+
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	if (ptp_operation_issupported (params, PTP_OC_CANON_EOS_GetRemoteMode)) {
+		C_PTP (ptp_canon_eos_getremotemode (params, &mode));
+		sprintf (buf, "%d", mode);
+	} else {
+		strcpy (buf, "0");
+	}
+	return gp_widget_set_value  (*widget, buf);
+}
+
+static int
+_put_Canon_RemoteMode(CONFIG_PUT_ARGS) {
+	uint32_t	mode;
+	char		*val;
+	PTPParams	*params = &(camera->pl->params);
+
+	CR (gp_widget_get_value(widget, &val));
+	if (!sscanf (val, "%d", &mode))
+		return GP_ERROR;
+	C_PTP (ptp_canon_eos_setremotemode (params, mode));
+	return GP_OK;
+}
+
+
+static int
+_get_Canon_EventMode(CONFIG_GET_ARGS) {
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	return gp_widget_set_value  (*widget, "0");
+}
+
+static int
+_put_Canon_EventMode(CONFIG_PUT_ARGS) {
+	uint32_t	mode;
+	char		*val;
+	PTPParams	*params = &(camera->pl->params);
+
+	CR (gp_widget_get_value(widget, &val));
+	if (!sscanf (val, "%d", &mode))
+		return GP_ERROR;
+	C_PTP (ptp_canon_eos_seteventmode (params, mode));
+	return GP_OK;
+}
+
+
+static int
 _get_Canon_EOS_ViewFinder(CONFIG_GET_ARGS) {
 	int val;
+	PTPParams		*params = &(camera->pl->params);
 
 	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
-	val = 2;	/* always changed, unless we can find out the state ... */
+	val = params->inliveview;	/* try returning live view mode */
 	gp_widget_set_value  (*widget, &val);
-	return (GP_OK);
+	return GP_OK;
 }
 
 static int
@@ -5985,11 +8201,68 @@
 	else
 		xval.u32 = 0;
 	C_PTP_MSG (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &xval, PTP_DTC_UINT32),
-		   "ptp2_eos_viewfinder enable", "setval of evf outputmode to %d failed", xval.u32);
+		   "ptp2_eos_viewfinder enable: failed to set evf outputmode to %d", xval.u32);
+        return GP_OK;
+}
+
+static int
+_get_Canon_EOS_TestOLC(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	val = 2;
+	gp_widget_set_value  (*widget, &val);
 	return GP_OK;
 }
 
 static int
+_put_Canon_EOS_TestOLC(CONFIG_PUT_ARGS) {
+	int			val;
+	PTPParams		*params = &(camera->pl->params);
+	unsigned int		i;
+
+	CR (gp_widget_get_value(widget, &val));
+	if (val) {
+		/* idea is to request all OLCs seperately to see the sizes in the logfile */
+		for (i=0;i<13;i++) {	/* 0x1 -> 0x1000 */
+			C_PTP (ptp_canon_eos_setrequestolcinfogroup(params, (1<<i)));
+			ptp_check_eos_events (params);
+		}
+		C_PTP (ptp_canon_eos_setrequestolcinfogroup(params, 0x1fff));
+	}
+        return GP_OK;
+}
+
+static int
+_get_Panasonic_ViewFinder(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+	val = 2;	/* always changed, unless we can find out the state ... */
+	gp_widget_set_value  (*widget, &val);
+	return (GP_OK);
+}
+
+static int
+_put_Panasonic_ViewFinder(CONFIG_PUT_ARGS) {
+	int			val;
+	uint16_t		res;
+	PTPParams		*params = &(camera->pl->params);
+
+	CR (gp_widget_get_value(widget, &val));
+	if (val) {
+		res = ptp_panasonic_liveview (params, 1);
+		params->inliveview = 1;
+	} else {
+		res = ptp_panasonic_liveview (params, 0);
+		params->inliveview = 0;
+	}
+	return translate_ptp_result (res);
+}
+
+static int
 _get_Nikon_ViewFinder(CONFIG_GET_ARGS) {
 	int			val;
 	PTPPropertyValue	value;
@@ -6013,6 +8286,8 @@
 	if (!ptp_operation_issupported(params, PTP_OC_NIKON_StartLiveView))
 		return GP_ERROR_NOT_SUPPORTED;
 
+	C_PTP_REP (ptp_nikon_device_ready(params));
+
 	CR (gp_widget_get_value (widget, &val));
 	if (val) {
 		PTPPropertyValue	value;
@@ -6020,7 +8295,35 @@
 		if (LOG_ON_PTP_E (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewStatus, &value, PTP_DTC_UINT8)) != PTP_RC_OK)
 			value.u8 = 0;
 
-                if (!value.u8) {
+		if (have_prop(camera, params->deviceinfo.VendorExtensionID, PTP_DPC_NIKON_LiveViewProhibitCondition)) {
+			C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewProhibitCondition, &value, PTP_DTC_UINT32));
+
+			if (value.u32) {
+				/* we could have multiple reasons, but just report the first one. by decreasing order of possibility */
+				if (value.u32 & (1<<8)) { gp_context_error (context, _("Liveview cannot start: Battery exhausted")); return GP_ERROR; }
+				if (value.u32 & (1<<17)){ gp_context_error (context, _("Liveview cannot start: Temperature too high")); return GP_ERROR; }
+				if (value.u32 & (1<<9)) { gp_context_error (context, _("Liveview cannot start: TTL error")); return GP_ERROR; }
+				if (value.u32 & (1<<22)){ gp_context_error (context, _("Liveview cannot start: In Mirror-up operation")); return GP_ERROR; }
+				if (value.u32 & (1<<24)){ gp_context_error (context, _("Liveview cannot start: Lens is retracting")); return GP_ERROR; }
+				if (value.u32 & (1<<5)) { gp_context_error (context, _("Liveview cannot start: Minimum aperture warning")); return GP_ERROR; }
+				if (value.u32 & (1<<15)){ gp_context_error (context, _("Liveview cannot start: Processing of shooting operation")); return GP_ERROR; }
+				if (value.u32 & (1<<2)) { gp_context_error (context, _("Liveview cannot start: Sequence error")); return GP_ERROR; }
+				if (value.u32 & (1<<31)){ gp_context_error (context, _("Liveview cannot start: Exposure Program Mode is not P/A/S/M")); return GP_ERROR; }
+				if (value.u32 & (1<<21)){ gp_context_error (context, _("Liveview cannot start: Bulb warning")); return GP_ERROR; }
+				if (value.u32 & (1<<20)){ gp_context_error (context, _("Liveview cannot start: Card unformatted")); return GP_ERROR; }
+				if (value.u32 & (1<<19)){ gp_context_error (context, _("Liveview cannot start: Card error")); return GP_ERROR; }
+				if (value.u32 & (1<<18)){ gp_context_error (context, _("Liveview cannot start: Card protected")); return GP_ERROR; }
+				if (value.u32 & (1<<14)){ gp_context_error (context, _("Liveview cannot start: Recording destination card, but no card or card protected")); return GP_ERROR; }
+				if (value.u32 & (1<<12)){ gp_context_error (context, _("Liveview cannot start: Pending unretrieved SDRAM image")); return GP_ERROR; }
+				if (value.u32 & (1<<12)){ gp_context_error (context, _("Liveview cannot start: Pending unretrieved SDRAM image")); return GP_ERROR; }
+				if (value.u32 & (1<<4)) { gp_context_error (context, _("Liveview cannot start: Fully pressed button")); return GP_ERROR; }
+
+				gp_context_error (context, _("Liveview cannot start: code 0x%08x"), value.u32);
+				return GP_ERROR;
+			}
+		}
+
+		if (!value.u8) {
 			value.u8 = 1;
 			LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_NIKON_RecordingMedia, &value, PTP_DTC_UINT8));
 			C_PTP_REP_MSG (ptp_nikon_start_liveview (params),
@@ -6030,8 +8333,19 @@
 			params->inliveview = 1;
 		}
 	} else {
-		if (ptp_operation_issupported(params, PTP_OC_NIKON_EndLiveView))
-			C_PTP (ptp_nikon_end_liveview (params));
+		if (ptp_operation_issupported(params, PTP_OC_NIKON_EndLiveView)) {
+			// busy check here needed for some nikons to
+			// prevent bad camera state
+			C_PTP_REP (ptp_nikon_device_ready(params));
+
+			uint16_t res = ptp_nikon_end_liveview (params);
+			// printf("Live view end code: %d\n", res);
+			if (res == 0xa004) {
+				// PTP_C(ptp_nikon_device_ready(params));
+				return GP_ERROR_CAMERA_BUSY;
+			}
+			C_PTP(res);
+		}
 		params->inliveview = 0;
 	}
 	return GP_OK;
@@ -6110,11 +8424,13 @@
 
 	if (!sscanf(val,"0x%x", &opcode))
 		return GP_ERROR_BAD_PARAMETERS;
+	GP_LOG_D ("opcode 0x%x", opcode);
 	nparams = 0; x = val;
 	while ((x = strchr(x,',')) && (nparams<5)) {
 		x++;
 		if (!sscanf(x,"0x%x", &xparamsnparams))
 			return GP_ERROR_BAD_PARAMETERS;
+		GP_LOG_D ("param %d 0x%x", nparams, xparamsnparams);
 		nparams++;
 	}
 	ptp.Code = opcode;
@@ -6135,6 +8451,30 @@
 }
 
 static int
+_get_Canon_EOS_MovieModeSw(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return (GP_OK);
+}
+
+static int
+_put_Canon_EOS_MovieModeSw(CONFIG_PUT_ARGS) {
+	int		val;
+	PTPParams	*params = &(camera->pl->params);
+	CR (gp_widget_get_value(widget, &val));
+
+	if(val)
+		C_PTP_MSG (ptp_generic_no_data(params, PTP_OC_CANON_EOS_MovieSelectSWOn, 0), "Failed to set MovieSetSelectSWOn");
+	else
+		C_PTP_MSG (ptp_generic_no_data(params, PTP_OC_CANON_EOS_MovieSelectSWOff, 0), "Failed to set MovieSetSelectSWOff");
+	return GP_OK;
+}
+
+static int
 _get_Sony_Movie(CONFIG_GET_ARGS) {
 	int val;
 
@@ -6159,8 +8499,124 @@
 	else
 		value.u16 = 1;
         C_PTP_REP (ptp_sony_setdevicecontrolvalueb (params, 0xD2C8, &value, PTP_DTC_UINT16 ));
+	*alreadyset = 1;
 	return GP_OK;
 }
+
+static int
+_get_Sony_QX_Movie(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
+static int
+_put_Sony_QX_Movie(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	int val;
+	PTPPropertyValue	value;
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	CR (gp_widget_get_value(widget, &val));
+	if (val)
+		value.u16 = 2;
+	else
+		value.u16 = 1;
+        C_PTP_REP (ptp_sony_qx_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_Movie_Rec, &value, PTP_DTC_UINT16 ));
+	*alreadyset = 1;
+	return GP_OK;
+}
+
+static int
+_get_Nikon_MovieProhibitCondition(CONFIG_GET_ARGS) {
+	char 			buf2000;
+	PTPPropertyValue	value;
+	PTPParams 		*params = &(camera->pl->params);
+
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+
+	value.u32 = 0;
+	LOG_ON_PTP_E (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_MovRecProhibitCondition, &value, PTP_DTC_UINT32));
+	if (value.u32) {
+		strcpy(buf,N_("Movie prohibit conditions: "));
+#define X(bit,str)					\
+		if (value.u32 & (1<<bit)) {		\
+			value.u32 &= ~(1<<bit);		\
+			strcat(buf, _(str));		\
+			if (value.u32) strcat(buf, ",");\
+		}
+
+		X(14,N_("Not in application mode"));
+		X(13,N_("Set liveview selector is enabled"));
+		X(12,N_("In enlarged liveview"));
+		X(12,N_("In enlarged liveview"));
+		X(11,N_("Card protected"));
+		X(10,N_("Already in movie recording"));
+		X( 9,N_("Images / movies not yet record in buffer"));
+		X( 3,N_("Card full"));
+		X( 2,N_("Card not formatted"));
+		X( 1,N_("Card error"));
+		X( 0,N_("No card"));
+#undef X
+		if (value.u32) { sprintf(buf+strlen(buf),"unhandled bitmask %x", value.u32); }
+	} else {
+		strcpy(buf,N_("No movie prohibit conditions"));
+	}
+	gp_widget_set_value  (*widget, buf);
+	return GP_OK;
+}
+
+static int
+_get_Nikon_LiveViewProhibitCondition(CONFIG_GET_ARGS) {
+	char 			buf2000;
+	PTPPropertyValue	value;
+	PTPParams 		*params = &(camera->pl->params);
+
+	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+
+	value.u32 = 0;
+	LOG_ON_PTP_E (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewProhibitCondition, &value, PTP_DTC_UINT32));
+	if (value.u32) {
+		strcpy(buf,N_("Live View prohibit conditions: "));
+#define X(bit,str)					\
+		if (value.u32 & (1<<bit)) {		\
+			value.u32 &= ~(1<<bit);		\
+			strcat(buf, _(str));		\
+			if (value.u32) strcat(buf, ",");\
+		}
+		X( 2,N_("Sequence error"));
+		X( 4,N_("Fully pressed button"));
+		X( 5,N_("Minimum aperture warning"));
+		X( 8,N_("Battery exhausted"));
+		X( 9,N_("TTL error"));
+		X(12,N_("Pending unretrieved SDRAM image"));
+		X(14,N_("Recording destination card, but no card or card protected"));
+		X(15,N_("Processing of shooting operation"));
+		X(17,N_("Temperature too high"));
+		X(18,N_("Card protected"));
+		X(19,N_("Card error"));
+		X(20,N_("Card unformatted"));
+		X(21,N_("Bulb warning"));
+		X(22,N_("In Mirror-up operation"));
+		X(24,N_("Lens is retracting"));
+		X(31,N_("Exposure Program Mode is not P/A/S/M"));
+#undef X
+		if (value.u32) { sprintf(buf+strlen(buf),"unhandled bitmask %x", value.u32); }
+	} else {
+		strcpy(buf,N_("Liveview should not be prohibited"));
+	}
+	gp_widget_set_value  (*widget, buf);
+	return GP_OK;
+}
+
+
 static int
 _get_Nikon_Movie(CONFIG_GET_ARGS) {
 	int val;
@@ -6178,11 +8634,10 @@
 	PTPParams *params = &(camera->pl->params);
 	int val, ret;
 	GPContext *context = ((PTPData *) params->data)->context;
+	PTPPropertyValue	value;
 
 	CR (gp_widget_get_value(widget, &val));
 	if (val) {
-		PTPPropertyValue	value;
-
 		if (have_prop(camera,PTP_VENDOR_NIKON,PTP_DPC_NIKON_ApplicationMode)) {
 			value.u8 = 0;
 			C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_ApplicationMode, &value, PTP_DTC_UINT8));
@@ -6191,6 +8646,9 @@
 				C_PTP (ptp_setdevicepropvalue (params, PTP_DPC_NIKON_ApplicationMode, &value, PTP_DTC_UINT8));
 			}
 		}
+		if (ptp_operation_issupported(params, PTP_OC_NIKON_ChangeApplicationMode)) {
+			C_PTP (ptp_nikon_changeapplicationmode (params, 1));
+		}
 
                 ret = ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewStatus, &value, PTP_DTC_UINT8);
                 if (ret != PTP_RC_OK)
@@ -6204,9 +8662,69 @@
 			C_PTP_REP_MSG (nikon_wait_busy(params, 50, 1000),
 				       _("Nikon enable liveview failed"));
 		}
+
+		if (have_prop(camera,PTP_VENDOR_NIKON,PTP_DPC_NIKON_MovRecProhibitCondition)) {
+			value.u32 = 0;
+			LOG_ON_PTP_E (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_MovRecProhibitCondition, &value, PTP_DTC_UINT32));
+			if (value.u32) {
+				if (value.u32 & (1<<14)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Camera is not in application mode")); return GP_ERROR; }
+				if (value.u32 & (1<<13)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Set liveview selector is enabled")); return GP_ERROR; }
+				if (value.u32 & (1<<12)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("In enlarged liveview")); return GP_ERROR; }
+				if (value.u32 & (1<<11)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Card protected")); return GP_ERROR; }
+				if (value.u32 & (1<<10)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Already in movie recording")); return GP_ERROR; }
+				if (value.u32 & (1<< 9)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Images / movies not yet record in buffer")); return GP_ERROR; }
+				if (value.u32 & (1<< 3)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Card full")); return GP_ERROR; }
+				if (value.u32 & (1<< 2)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Card not formatted")); return GP_ERROR; }
+				if (value.u32 & (1<< 1)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("Card error")); return GP_ERROR; }
+				if (value.u32 & (1<< 0)) { gp_context_error (context, _("Movie recording cannot start: %s."),_("No card")); return GP_ERROR; }
+				gp_context_error (context, _("Movie recording cannot start: code 0x%08x."), value.u32);
+				return GP_ERROR;
+			}
+		}
+
 		C_PTP_REP (ptp_nikon_startmovie (params));
-	} else
+	} else {
+		unsigned int i, havec108 = 0;
+
 		C_PTP_REP (ptp_nikon_stopmovie (params));
+
+		for (i=0;i<params->deviceinfo.EventsSupported_len;i++)
+			if (params->deviceinfo.EventsSupportedi == PTP_EC_Nikon_MovieRecordComplete) {
+				havec108 = 1;
+				break;
+			}
+
+		/* takes 3 seconds for a 10 second movie on Z6 */
+		if (havec108) {
+			int tries = 100, found = 0;
+			do {
+				PTPContainer	event;
+
+				ret = ptp_check_event (params);
+				if (ret != PTP_RC_OK)
+					break;
+
+				while (ptp_get_one_event_by_type (params, PTP_EC_Nikon_MovieRecordComplete, &event)) {
+					GP_LOG_D ("Event: movie rec completed.");
+					found = 1;
+					break;
+				}
+				usleep(100*1000);
+			} while (!found && tries--);
+		}
+		/* switch Application Mode off again, otherwise we cannot get to the filesystem */
+		if (have_prop(camera,PTP_VENDOR_NIKON,PTP_DPC_NIKON_ApplicationMode)) {
+			value.u8 = 1;
+			C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_ApplicationMode, &value, PTP_DTC_UINT8));
+			if (value.u8 != 0) {
+				value.u8 = 0;
+				C_PTP (ptp_setdevicepropvalue (params, PTP_DPC_NIKON_ApplicationMode, &value, PTP_DTC_UINT8));
+			}
+		}
+		if (ptp_operation_issupported(params, PTP_OC_NIKON_ChangeApplicationMode)) {
+			C_PTP (ptp_nikon_changeapplicationmode (params, 0));
+		}
+	}
 	return GP_OK;
 }
 
@@ -6232,7 +8750,7 @@
 		PTPPropertyValue propval2;
 		char buf20;
 
-		C_PTP (ptp_nikon_setcontrolmode (params, 1));
+		C_PTP (ptp_nikon_changecameramode (params, 1));
 		propval2.u16 = 1; /* Exposure Mode to Full Manual */
 		C_PTP (ptp_setdevicepropvalue (params, PTP_DPC_ExposureProgramMode, &propval2, PTP_DTC_UINT16));
 		propval2.u32 = 0xffffffff; /* Exposure Time to bulb */
@@ -6252,7 +8770,6 @@
 	}
 }
 
-
 static int
 _get_OpenCapture(CONFIG_GET_ARGS) {
 	int val;
@@ -6303,7 +8820,57 @@
 	xpropval.u16 = val ? 2 : 1;
 
 	C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_AutoFocus, &xpropval, PTP_DTC_UINT16));
+	*alreadyset = 1;
+	return GP_OK;
+}
+
+static int
+_get_Sony_ManualFocus(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
+	gp_widget_set_range(*widget, -7.0, 7.0, 1.0);
+	gp_widget_set_name (*widget,menu->name);
+	val = 0.0; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return (GP_OK);
+}
+
+static int
+_put_Sony_ManualFocus(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	float val;
+	PTPPropertyValue xpropval;
+
+	CR (gp_widget_get_value(widget, &val));
 
+	if(val != 0.0) {
+		/* value 2 seems to set it to autofocusmode. see issue https://github.com/gphoto/libgphoto2/issues/434
+		xpropval.u16 = 2;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, 0xd2d2, &xpropval, PTP_DTC_UINT16));
+		*/
+		if(val <= -7) xpropval.i16 = - 7;
+		else if(val <= -6.0) xpropval.i16 = -6;
+		else if(val <= -5.0) xpropval.i16 = -5;
+		else if(val <= -4.0) xpropval.i16 = -4;
+		else if(val <= -3.0) xpropval.i16 = -3;
+		else if(val <= -2.0) xpropval.i16 = -2;
+		else if(val <= -1.0) xpropval.i16 = -1;
+		else if(val <= 1.0) xpropval.i16 = 1;
+		else if(val <= 2.0) xpropval.i16 = 2;
+		else if(val <= 3.0) xpropval.i16 = 3;
+		else if(val <= 4.0) xpropval.i16 = 4;
+		else if(val <= 5.0) xpropval.i16 = 5;
+		else if(val <= 6.0) xpropval.i16 = 6;
+		else if(val <= 7.0) xpropval.i16 = 7;
+		else xpropval.i16 = 0;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_NearFar, &xpropval, PTP_DTC_INT16));
+	} else {
+		xpropval.u16 = 1;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, 0xd2d2, &xpropval, PTP_DTC_UINT16));
+	}
+	*alreadyset = 1;
 	return GP_OK;
 }
 
@@ -6329,7 +8896,7 @@
 	xpropval.u16 = val ? 2 : 1;
 
 	C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_Capture, &xpropval, PTP_DTC_UINT16));
-
+	*alreadyset = 1;
 	return GP_OK;
 }
 
@@ -6365,9 +8932,892 @@
 		xpropval.u16 = 1;
 		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_AutoFocus, &xpropval, PTP_DTC_UINT16));
 	}
+	*alreadyset = 1;
+	return GP_OK;
+}
+
+static int
+_get_Sony_FocusMagnifyProp(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
+static int
+_put_Sony_FocusMagnifyProp(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	int val;
+	PTPPropertyValue xpropval;
+
+	CR (gp_widget_get_value(widget, &val));
+	xpropval.u16 = val ? 2 : 1;
+
+	C_PTP (ptp_sony_setdevicecontrolvalueb (params, dpd->DevicePropertyCode, &xpropval, PTP_DTC_UINT16));
+	*alreadyset = 1;
+	return GP_OK;
+}
+
+static int
+_get_Panasonic_Movie(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_Movie(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	int val;
+
+	CR (gp_widget_get_value(widget, &val));
+	if (val) {
+		C_PTP_MSG (ptp_panasonic_movierec (params, 1), "failed to start movie capture");
+		return GP_OK;
+	} else {
+		C_PTP_MSG (ptp_panasonic_movierec (params, 0), "failed to stop movie capture");
+		return GP_OK;
+	}
+}
+
+
+static int
+_put_Panasonic_Shutter(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char *xval;
+	uint32_t val;
+	float f;
+
+	CR (gp_widget_get_value(widget, &xval));
+	if(xval0 == 'b' || xval0 == 'B') {
+		val = 0xFFFFFFFF;
+	} else if(xval1 == '/') {
+		sscanf (xval, "1/%f", &f);
+		f *= 1000;
+		val = (uint32_t) f;
+	} else {
+		sscanf (xval, "%f", &f);
+		f *= 1000;
+		val = (uint32_t) f;
+		val |= 0x80000000;
+	}
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_ShutterSpeed_Param, (unsigned char*)&val, 4));
+}
+
+static int
+_get_Panasonic_Shutter(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_ShutterSpeed, 4, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	uint32_t i;
+	float f;
+	char buf16;
+	for (i = 0; i < listCount; i++) {
+		if(currentVal == 0xFFFFFFFF) {
+			sprintf (buf, "bulb");
+		} else if(listi & 0x80000000) {
+			listi &= ~0x80000000;
+			f = (float) listi;
+			f /= 1000;
+			if(listi % 1000 == 0) {
+				sprintf (buf, "%.0f", f);
+			} else {
+				sprintf (buf, "%.1f", f);
+			}
+		} else {
+			f = (float) listi;
+			f /= 1000;
+			if(listi % 1000 == 0) {
+				sprintf (buf, "1/%.0f", f);
+			} else {
+				sprintf (buf, "1/%.1f", f);
+			}
+		}
+		gp_widget_add_choice (*widget, buf);
+	}
+
+	if(currentVal == 0) {
+		uint16_t valuesize;
+		ptp_panasonic_getdeviceproperty(params, 0x2000030, &valuesize, &currentVal);
+	}
+
+	if(currentVal == 0xFFFFFFFF) {
+		sprintf (buf, "bulb");
+	} else if(currentVal & 0x80000000) {
+		currentVal &= ~0x80000000;
+		f = (float) currentVal;
+		f /= 1000;
+		if(currentVal % 1000 == 0) {
+			sprintf (buf, "%.0f", f);
+		} else {
+			sprintf (buf, "%.1f", f);
+		}
+	} else {
+		f = (float) currentVal;
+		f /= 1000;
+		if(currentVal % 1000 == 0) {
+			sprintf (buf, "1/%.0f", f);
+		} else {
+			sprintf (buf, "1/%.1f", f);
+		}
+	}
+
+	gp_widget_set_value (*widget, &buf);
+
+	free(list);
+
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_ISO(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char *xval;
+	unsigned int ival;
+	uint32_t val;
+
+	CR (gp_widget_get_value(widget, &xval));
+	sscanf (xval, "%d", &ival);
+	val = ival;
+
+	//printf("setting ISO to %lu (%s)\n", val, xval);
+
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_ISO_Param, (unsigned char*)&val, 4));
+}
+
+static int
+_get_Panasonic_ISO(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+	uint16_t valsize;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_ISO, 4, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	uint32_t i;
+	char buf16;
+	for (i = 0; i < listCount; i++) {
+		sprintf (buf, "%d", (unsigned int)listi);
+		gp_widget_add_choice (*widget, buf);
+	}
+	ptp_panasonic_getdeviceproperty(params, PTP_DPC_PANASONIC_ISO_Param, &valsize, &currentVal);
+
+	sprintf (buf, "%d", (unsigned int)currentVal);
+	gp_widget_set_value (*widget, buf);
+
+	free(list);
+
+	return GP_OK;
+}
+
+static
+struct {
+	char*	str;
+	uint16_t val;
+} panasonic_wbtable = {
+	{ N_("Automatic"),	0x0002	},
+	{ N_("Daylight"),	0x0004	},
+	{ N_("Tungsten"),	0x0006	},
+	{ N_("Flourescent"),	0x0005	},
+	{ N_("Flash"),		0x0007	},
+	{ N_("Cloudy"),		0x8008	},
+	{ N_("White set"),	0x8009	},
+	{ N_("Black White"),	0x800A	},
+	{ N_("Preset 1"),	0x800B	},
+	{ N_("Preset 2"),	0x800C	},
+	{ N_("Preset 3"),	0x800D	},
+	{ N_("Preset 4"),	0x800E	},
+	{ N_("Shadow"),		0x800F	},
+	{ N_("Temperature 1"),	0x8010	},
+	{ N_("Temperature 2"),	0x8011	},
+	{ N_("Temperature 3"),	0x8012	},
+	{ N_("Temperature 4"),	0x8013	},
+	{ N_("Automatic Cool"),	0x8014	},
+	{ N_("Automatic Warm"),	0x8015	},
+};
+
+static int
+_put_Panasonic_AdjustGM(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val;
+
+    CR (gp_widget_get_value(widget, &xval));
+    int16_t adj;
+    sscanf (xval, "%hd", &adj);
+    if (adj < 0) {
+        adj = abs(adj) + 0x8000;
+    }
+    val = adj;
+
+    return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_ADJ_GM, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_AdjustGM(CONFIG_GET_ARGS) {
+    uint32_t currentVal = 0;
+    char buf32;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    uint16_t valsize;
+    C_PTP_REP (ptp_panasonic_getdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_ADJ_GM, &valsize, &currentVal));
+
+    //printf("retrieved %x with size %x\n", currentVal, valsize);
+    if (currentVal & 0x8000) {
+        currentVal = (currentVal & 0x7FFF) * -1;
+    }
+    sprintf(buf, "%d\n", currentVal);
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    gp_widget_set_value(*widget, &buf);
+    return GP_OK;
+}
+
+static int
+_put_Panasonic_AdjustAB(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val;
+
+    CR (gp_widget_get_value(widget, &xval));
+    int16_t adj;
+    sscanf (xval, "%hd", &adj);
+    if (adj < 0) {
+        adj = abs(adj) + 0x8000;
+    }
+    val = adj;
+
+    return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_ADJ_AB, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_AdjustAB(CONFIG_GET_ARGS) {
+    uint32_t currentVal = 0;
+    char buf32;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    uint16_t valsize;
+    C_PTP_REP (ptp_panasonic_getdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_ADJ_AB, &valsize, &currentVal));
+
+    //printf("retrieved %x with size %x\n", currentVal, valsize);
+    if (currentVal & 0x8000) {
+        currentVal = (currentVal & 0x7FFF) * -1;
+    }
+    sprintf(buf, "%d\n", currentVal);
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    gp_widget_set_value(*widget, &buf);
+    return GP_OK;
+}
+
+static int
+_put_Panasonic_ColorTemp(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val;
+
+    CR (gp_widget_get_value(widget, &xval));
+    uint16_t KSet;
+    sscanf (xval, "%hd", &KSet);
+    val = KSet;
+
+    return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_KSet, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_ColorTemp(CONFIG_GET_ARGS) {
+    uint32_t currentVal;
+    uint32_t listCount;
+    uint32_t *list;
+    uint32_t i;
+    int	valset = 0;
+    char	buf32;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_WhiteBalance_KSet, 2, &currentVal, &list, &listCount));
+
+    //printf("retrieved %lu property values\n", listCount);
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    for (i = 0; i < listCount; i++) {
+        sprintf(buf,_("%d"), listi);
+        if (listi == currentVal) {
+            gp_widget_set_value (*widget, buf);
+            valset = 1;
+        }
+
+        gp_widget_add_choice (*widget, buf);
+    }
+    free(list);
+    if (!valset) {
+        sprintf(buf,_("Unknown 0x%04x"), currentVal);
+        gp_widget_set_value (*widget, buf);
+    }
+    return GP_OK;
+}
+
+static
+struct {
+    char*	str;
+    uint16_t val;
+} panasonic_aftable = {
+    { N_("AF"),             0x0000	},
+    { N_("AF macro"),       0x0001	},
+    { N_("AF macro (D)"),   0x0002	},
+    { N_("MF"),             0x0003	},
+    { N_("AF_S"),           0x0004	},
+    { N_("AF_C"),           0x0005	},
+    { N_("AF_F"),           0x0006	},
+};
+
+static int
+_put_Panasonic_AFMode(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val = 0;
+    uint32_t i, found;
+
+    CR (gp_widget_get_value(widget, &xval));
+
+    for (i=0;i<sizeof(panasonic_aftable)/sizeof(panasonic_aftable0);i++) {
+        if (!strcmp(panasonic_aftablei.str, xval)) {
+            val = panasonic_aftablei.val;
+	    found = 1;
+            break;
+        }
+    }
+    if (!found) return GP_ERROR;
+
+    return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_AFArea_AFModeParam, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_AFMode(CONFIG_GET_ARGS) {
+    uint32_t currentVal;
+    uint32_t listCount;
+    uint32_t *list;
+    uint32_t i, j;
+    int	valset = 0;
+    char	buf32;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_AFArea_AFModeParam, 2, &currentVal, &list, &listCount));
+
+    //printf("retrieved %lu property values\n", listCount);
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    for (i = 0; i < listCount; i++) {
+        for (j=0;j<sizeof(panasonic_aftable)/sizeof(panasonic_aftable0);j++) {
+            sprintf(buf,_("%d"), listi);
+            if ((listi == currentVal) && (j == currentVal)) {
+                gp_widget_set_value (*widget, panasonic_aftablej.str);
+                valset = 1;
+                break;
+            }
+        }
+    }
+    for (j=0;j<sizeof(panasonic_aftable)/sizeof(panasonic_aftable0);j++) {
+        gp_widget_add_choice (*widget, panasonic_aftablej.str);
+    }
+    free(list);
+    if (!valset) {
+        sprintf(buf,_("Unknown 0x%04x"), currentVal);
+        gp_widget_set_value (*widget, buf);
+    }
+    return GP_OK;
+}
+
+static
+struct {
+    char*	str;
+    uint16_t val;
+} panasonic_mftable = {
+    { N_("Stop"),        0x0000	},
+    { N_("Far fast"),    0x0001	},
+    { N_("Far slow"),    0x0002	},
+    { N_("Near slow"),   0x0003	},
+    { N_("Near fast"),   0x0004	},
+};
+
+static int
+_put_Panasonic_MFAdjust(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val = 0;
+    uint32_t i;
+
+    CR (gp_widget_get_value(widget, &xval));
+    for (i=0;i<sizeof(panasonic_mftable)/sizeof(panasonic_mftable0);i++) {
+        if(!strcmp(panasonic_mftablei.str, xval)) {
+            val = panasonic_mftablei.val;
+            break;
+        }
+    }
+
+    return translate_ptp_result (ptp_panasonic_manualfocusdrive (params, (uint16_t)val));
+}
+
+static int
+_get_Panasonic_MFAdjust(CONFIG_GET_ARGS) {
+    uint32_t i;
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget,menu->name);
+
+    for (i=0;i<sizeof(panasonic_mftable)/sizeof(panasonic_mftable0);i++) {
+        gp_widget_add_choice (*widget, panasonic_mftablei.str);
+    }
+    gp_widget_set_value (*widget, _("None"));
+    return GP_OK;
+}
+
+static
+struct {
+    char*	str;
+    uint16_t val;
+} panasonic_rmodetable = {
+    { N_("P"),   0x0000	},
+    { N_("A"),   0x0001	},
+    { N_("S"),   0x0002	},
+    { N_("M"),   0x0003	},
+};
+
+static int
+_get_Panasonic_ExpMode(CONFIG_GET_ARGS) {
+
+    uint32_t currentVal;
+    uint32_t listCount;
+    uint32_t *list;
+    uint32_t i,j;
+    int	valset = 0;
+    char	buf32;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, 0x06000011, 2, &currentVal, &list, &listCount));
+
+    //printf("retrieved %lu property values\n", listCount);
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    for (j=0;j<sizeof(panasonic_rmodetable)/sizeof(panasonic_rmodetable0);j++) {
+        gp_widget_add_choice (*widget, panasonic_rmodetablej.str);
+    }
+
+    for (i = 0; i < listCount; i++) {
+        for (j=0;j<sizeof(panasonic_rmodetable)/sizeof(panasonic_rmodetable0);j++) {
+            sprintf(buf,_("%d"), listi);
+            if ((listi == currentVal) && (j == currentVal)) {
+                gp_widget_set_value (*widget, panasonic_rmodetablej.str);
+                valset = 1;
+                break;
+            }
+    	}
+    }
+    free(list);
+    if (!valset) {
+        sprintf(buf,_("Unknown 0x%04x"), currentVal);
+        gp_widget_set_value (*widget, buf);
+    }
+    return GP_OK;
+}
+
+static int
+_put_Panasonic_ExpMode(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+    uint32_t val = 0;
+    uint32_t i;
+
+    CR (gp_widget_get_value(widget, &xval));
+    for (i=0;i<sizeof(panasonic_rmodetable)/sizeof(panasonic_rmodetable0);i++) {
+        if(!strcmp(panasonic_rmodetablei.str, xval)) {
+            val = panasonic_rmodetablei.val;
+            break;
+        }
+    }
+
+    //printf("val : %d\n", val);
+    return translate_ptp_result (ptp_panasonic_recordmode(params, (uint16_t)val));
+}
+static
+struct {
+    char*	str;
+    uint16_t val;
+} panasonic_recordtable = {
+    { N_("Standby"),        0x0000	},
+    { N_("Recording"),      0x0001	},
+    { N_("Playing"),        0x0002	},
+    { N_("Other process."), 0x0003	},
+    { N_("Other playing"),  0x0004	},
+    { N_("Noise reduction"),0x0005	},
+    { N_("Displaying menu"),0x0006	},
+    { N_("Streaming"),   	0x0007	},
+};
+
+static int
+_get_Panasonic_Recording(CONFIG_GET_ARGS) {
+    uint32_t currentVal = 0;
+    char buf32;
+    uint32_t i;
+    PTPParams *params = &(camera->pl->params);
+    GPContext *context = ((PTPData *) params->data)->context;
+
+    uint16_t valsize;
+    C_PTP_REP (ptp_panasonic_getrecordingstatus(params, 0x12000013, &valsize, &currentVal));
+
+    gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+    gp_widget_set_name (*widget, menu->name);
+
+    for(i = 0; i < sizeof(panasonic_recordtable) / sizeof(panasonic_recordtable0); i++) {
+        if (currentVal == panasonic_recordtablei.val) {
+            strcpy(buf, panasonic_recordtablei.str);
+        }
+    }
+
+    gp_widget_set_value(*widget, &buf);
+    return GP_OK;
+}
+
+    static int
+_put_Panasonic_Recording(CONFIG_PUT_ARGS)
+{
+    PTPParams *params = &(camera->pl->params);
+    char *xval;
+
+    CR (gp_widget_get_value(widget, &xval));
+    if (!strcmp(xval, "start")) {
+        return translate_ptp_result (ptp_panasonic_startrecording(params));
+    } else if (!strcmp(xval, "stop")) {
+        return translate_ptp_result (ptp_panasonic_stoprecording(params));
+    } else {
+        return GP_ERROR;
+    }
+}
+
+static int
+_put_Panasonic_Whitebalance(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char	*xval;
+	uint32_t val = 0;
+/*
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+*/
+	int	ival;
+	unsigned int j;
+
+	CR (gp_widget_get_value(widget, &xval));
+
+	/* C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_WhiteBalance, 2, &currentVal, &list, &listCount)); */
+
+	if (sscanf(xval,_("Unknown 0x%04x"), &ival))
+		val = ival;
+	for (j=0;j<sizeof(panasonic_wbtable)/sizeof(panasonic_wbtable0);j++) {
+		if (!strcmp(xval,_(panasonic_wbtablej.str))) {
+			val = panasonic_wbtablej.val;
+			break;
+		}
+	}
+	/* free(list); */
+	GP_LOG_D("setting whitebalance to 0x%04x", val);
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_WhiteBalance_Param, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_Whitebalance(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+	uint32_t i,j;
+	int	valset = 0;
+	char	buf32;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_WhiteBalance_Param, 2, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i = 0; i < listCount; i++) {
+		sprintf(buf,_("Unknown 0x%04x"), listi);
+		for (j=0;j<sizeof(panasonic_wbtable)/sizeof(panasonic_wbtable0);j++) {
+			if (panasonic_wbtablej.val == listi) {
+				strcpy(buf,_(panasonic_wbtablej.str));
+				break;
+			}
+		}
+		if (listi == currentVal) {
+			gp_widget_set_value (*widget, buf);
+			valset = 1;
+		}
+
+		gp_widget_add_choice (*widget, buf);
+	}
+	free(list);
+	if (!valset) {
+		sprintf(buf,_("Unknown 0x%04x"), currentVal);
+		gp_widget_set_value (*widget, buf);
+	}
 	return GP_OK;
 }
+static int
+_put_Panasonic_Exposure(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char *xval;
+	uint32_t val;
+	float f;
 
+	CR (gp_widget_get_value(widget, &xval));
+
+	sscanf (xval, "%f", &f);
+
+	if (f < 0)
+		val = (uint32_t)(0x8000 | (int)(((-f)*3)));
+	else
+		val = (uint32_t) (f*3);
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, PTP_DPC_PANASONIC_Exposure_Param, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_Exposure(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+	uint32_t i;
+	char	buf16;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, PTP_DPC_PANASONIC_Exposure, 2, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i = 0; i < listCount; i++) {
+		int val = (int)listi;
+
+		if (val & 0x8000)
+			val = -(val & 0x7fff);
+		sprintf (buf, "%f", val/3.0);
+		gp_widget_add_choice (*widget, buf);
+		if ((int)listi == (int)currentVal) {
+			sprintf (buf, "%f", val/3.0);
+			gp_widget_set_value (*widget, &buf);
+		}
+	}
+	free(list);
+
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_LiveViewSize(CONFIG_PUT_ARGS)
+{
+	PTPParams		*params = &(camera->pl->params);
+	char			*xval;
+	unsigned int		height, width, freq, x;
+	PanasonicLiveViewSize	liveviewsize;
+
+	CR (gp_widget_get_value(widget, &xval));
+	if (!sscanf(xval, "%dx%d %d %dHZ", &width, &height, &x, &freq))
+		return GP_ERROR;
+	liveviewsize.width	= width;
+	liveviewsize.height	= height;
+	liveviewsize.freq	= freq;
+	liveviewsize.x		= x;
+	return translate_ptp_result (ptp_panasonic_9415(params, &liveviewsize));
+}
+
+static int
+_get_Panasonic_LiveViewSize(CONFIG_GET_ARGS) {
+	unsigned int		i;
+	char			buf100;
+	PTPParams		*params = &(camera->pl->params);
+	GPContext		*context = ((PTPData *) params->data)->context;
+	PanasonicLiveViewSize	liveviewsize, *liveviewsizes = NULL;
+	unsigned int		nrofliveviewsizes = 0;
+
+	C_PTP_REP (ptp_panasonic_9414_0d800012(params, &liveviewsizes, &nrofliveviewsizes));
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	for (i = 0;i < nrofliveviewsizes; i++) {
+		sprintf(buf,"%dx%d %d %dHZ", liveviewsizesi.width, liveviewsizesi.height, liveviewsizesi.x, liveviewsizesi.freq);
+                gp_widget_add_choice (*widget, buf);
+	}
+	free (liveviewsizes);
+
+	C_PTP_REP (ptp_panasonic_9414_0d800011(params, &liveviewsize));
+	sprintf(buf,"%dx%d %d %dHZ", liveviewsize.width, liveviewsize.height, liveviewsize.x, liveviewsize.freq);
+	gp_widget_set_value (*widget, buf);
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_FNumber(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char *xval;
+	uint32_t val;
+
+	CR (gp_widget_get_value(widget, &xval));
+	float f;
+	sscanf (xval, "%f", &f);
+	val = (uint32_t) (f*10);
+
+	//printf("setting ISO to %lu (%s)\n", val, xval);
+
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, 0x2000041, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_FNumber(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint16_t valsize;
+	uint32_t *list;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, 0x2000040, 2, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	uint32_t i;
+	float f;
+	char buf16;
+	for (i = 0; i < listCount; i++) {
+		f = (float) listi;
+		f /= 10.0;
+		if(listi % 10 == 0) {
+			sprintf (buf, "%.0f", f);
+		} else {
+			sprintf (buf, "%.1f", f);
+		}
+		gp_widget_add_choice (*widget, buf);
+	}
+	ptp_panasonic_getdeviceproperty(params, 0x2000041, &valsize, &currentVal);
+
+	f = (float) currentVal;
+	f /= 10.0;
+	if(currentVal % 10 == 0) {
+		sprintf (buf, "%.0f", f);
+	} else {
+		sprintf (buf, "%.1f", f);
+	}
+
+	gp_widget_set_value (*widget, &buf);
+
+	free(list);
+
+	return GP_OK;
+}
+
+static int
+_put_Panasonic_ImageFormat(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	char *xval;
+	uint32_t val;
+	unsigned int uval;
+
+	CR (gp_widget_get_value(widget, &xval));
+
+	sscanf (xval, "%u", &uval);
+	val = uval;
+	//printf("setting ImageFormat to %lu (%s)\n", val, xval);
+
+	return translate_ptp_result (ptp_panasonic_setdeviceproperty(params, 0x20000A2, (unsigned char*)&val, 2));
+}
+
+static int
+_get_Panasonic_ImageFormat(CONFIG_GET_ARGS) {
+	uint32_t currentVal;
+	uint32_t listCount;
+	uint32_t *list;
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_panasonic_getdevicepropertydesc(params, 0x20000A2, 2, &currentVal, &list, &listCount));
+
+	//printf("retrieved %lu property values\n", listCount);
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_set_name (*widget, menu->name);
+
+	uint32_t i;
+	char buf16;
+	for (i = 0; i < listCount; i++) {
+		sprintf (buf, "%u", (unsigned int)listi);
+		gp_widget_add_choice (*widget, buf);
+	}
+
+	sprintf (buf, "%u", (unsigned int)currentVal);
+	gp_widget_set_value (*widget, buf);
+
+	free(list);
+
+	return GP_OK;
+}
 
 static int
 _get_Canon_EOS_Bulb(CONFIG_GET_ARGS) {
@@ -6421,10 +9871,37 @@
 	GPContext *context = ((PTPData *) params->data)->context;
 
 	CR (gp_widget_get_value(widget, &val));
-	if (val)
-		C_PTP_REP (ptp_canon_eos_setuilock (params));
-	else
-		C_PTP_REP (ptp_canon_eos_resetuilock (params));
+
+	if (val) {
+		if (!params->uilocked)
+			C_PTP_REP (ptp_canon_eos_setuilock (params));
+		params->uilocked = 1;
+	} else {
+		if (params->uilocked)
+			C_PTP_REP (ptp_canon_eos_resetuilock (params));
+		params->uilocked = 0;
+	}
+	return GP_OK;
+}
+
+static int
+_get_Canon_EOS_PopupFlash(CONFIG_GET_ARGS) {
+	int val;
+
+	gp_widget_new (GP_WIDGET_TOGGLE, _(menu->label), widget);
+	gp_widget_set_name (*widget,menu->name);
+	val = 2; /* always changed */
+	gp_widget_set_value  (*widget, &val);
+	return GP_OK;
+}
+
+static int
+_put_Canon_EOS_PopupFlash(CONFIG_PUT_ARGS)
+{
+	PTPParams *params = &(camera->pl->params);
+	GPContext *context = ((PTPData *) params->data)->context;
+
+	C_PTP_REP (ptp_canon_eos_popupflash (params));
 	return GP_OK;
 }
 
@@ -6453,6 +9930,39 @@
 	return GP_OK;
 }
 
+static int
+_get_Nikon_Thumbsize(CONFIG_GET_ARGS) {
+	char buf1024;
+
+	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
+	gp_widget_add_choice (*widget, _("normal"));
+	gp_widget_add_choice (*widget, _("large"));
+	gp_widget_set_name (*widget, menu->name);
+	strcpy(buf,"normal");
+	gp_setting_get("ptp2","thumbsize", buf);
+	gp_widget_set_value  (*widget, N_(buf));
+	return GP_OK;
+}
+
+static int
+_put_Nikon_Thumbsize(CONFIG_PUT_ARGS) {
+	char *buf;
+	PTPParams	*params = &(camera->pl->params);
+	GPContext	*context = ((PTPData *) params->data)->context;
+
+	CR (gp_widget_get_value  (widget, &buf));
+	if (!strcmp(buf,_("normal"))) {
+		gp_setting_set("ptp2","thumbsize","normal");
+		return GP_OK;
+	}
+	if (!strcmp(buf,_("large"))) {
+		gp_setting_set("ptp2","thumbsize","large");
+		return GP_OK;
+	}
+	gp_context_error (context, _("Unknown thumb size value '%s'."), buf);
+	return GP_ERROR;
+}
+
 static struct {
 	char	*name;
 	char	*label;
@@ -6463,7 +9973,7 @@
 
 static int
 _get_CaptureTarget(CONFIG_GET_ARGS) {
-	int i;
+	unsigned int i;
 	char buf1024;
 
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
@@ -6481,10 +9991,11 @@
 
 static int
 _put_CaptureTarget(CONFIG_PUT_ARGS) {
-	int		i;
+	unsigned int	i;
 	char		*val;
 	PTPParams	*params = &(camera->pl->params);
 	GPContext	*context = ((PTPData *) params->data)->context;
+	char		buf1024;
 
 	CR (gp_widget_get_value(widget, &val));
 	for (i=0;i<sizeof(capturetargets)/sizeof(capturetargetsi);i++) {
@@ -6501,9 +10012,69 @@
 	)
 		CR (camera_canon_eos_update_capture_target( camera, context, -1 ));
 
+	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) {
+		uint16_t	target;
+
+		C_PTP (ptp_panasonic_getcapturetarget(params, &target));
+		if ((GP_OK != gp_setting_get("ptp2","capturetarget",buf)) || !strcmp(buf,"sdram"))
+			C_PTP (ptp_panasonic_setcapturetarget(params, 1));
+		else
+			C_PTP (ptp_panasonic_setcapturetarget(params, 0));
+	}
 	return GP_OK;
 }
 
+static struct deviceproptableu16 sony_capturetarget = {
+	{ "sdram",		0x0001, 0 },
+	{ "card",		0x0010, 0 },
+	{ "card+sdram",		0x0011, 0 },
+};
+GENERIC16TABLE(Sony_CaptureTarget,sony_capturetarget)
+
+static struct deviceproptableu32 audio_format = {
+	{ "PCM",		0x0001, 0 },
+	{ "ADPCM",		0x0002, 0 },
+	{ "IEEE float",		0x0003, 0 },
+	{ "VSELP",		0x0004, 0 },
+	{ "IBM CVSD",		0x0005, 0 },
+	{ "a-Law",		0x0006, 0 },
+	{ "u-Law",		0x0007, 0 },
+	{ "DTS",		0x0008, 0 },
+	{ "DRM",		0x0009, 0 },
+	{ "OKI-ADPCM",		0x0010, 0 },
+	{ "IMA-ADPCM",		0x0011, 0 },
+	{ "Mediaspace ADPCM",	0x0012, 0 },
+	{ "Sierra ADPCM",	0x0013, 0 },
+	{ "G723 ADPCM",		0x0014, 0 },
+	{ "DIGISTD",		0x0015, 0 },
+	{ "DIGIFIX",		0x0016, 0 },
+	{ "Dolby AC2",		0x0030, 0 },
+	{ "GSM 610",		0x0031, 0 },
+	{ "Rockwell ADPCM",	0x003b, 0 },
+	{ "Rockwell DIGITALK",	0x003c, 0 },
+	{ "G721 ADPCM",		0x0040, 0 },
+	{ "G728 CELP",		0x0041, 0 },
+	{ "MPEG",		0x0050, 0 },
+	{ "RT24",		0x0052, 0 },
+	{ "PAC",		0x0053, 0 },
+	{ "MP3",		0x0055, 0 },
+	{ "G726 ADPCM",		0x0064, 0 },
+	{ "G722 ADPCM",		0x0065, 0 },
+	{ "IBM u-Law",		0x0101, 0 },
+	{ "IBM a-Law",		0x0102, 0 },
+	{ "IBM ADPCM",		0x0103, 0 },
+	{ "Ogg Vorbis 1",	0x674f, 0 },
+	{ "Ogg Vorbis 1 PLUS",	0x676f, 0 },
+	{ "Ogg Vorbis 2",	0x6750, 0 },
+	{ "Ogg Vorbis 2 PLUS",	0x6770, 0 },
+	{ "Ogg Vorbis 3",	0x6751, 0 },
+	{ "Ogg Vorbis 3 PLUS",	0x6771, 0 },
+	{ "Ogg Vorbis 3 PLUS",	0x6771, 0 },
+	/* Development 0xffff */
+	/* Reserved 0xffff...  */
+};
+GENERIC32TABLE(Audio_Format,audio_format)
+
 static struct {
 	char	*name;
 	char	*label;
@@ -6514,7 +10085,7 @@
 
 static int
 _get_CHDK(CONFIG_GET_ARGS) {
-	int i;
+	unsigned int i;
 	char buf1024;
 
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
@@ -6531,7 +10102,7 @@
 
 static int
 _put_CHDK(CONFIG_PUT_ARGS) {
-	int i;
+	unsigned int i;
 	char *val;
 
 	CR (gp_widget_get_value(widget, &val));
@@ -6554,7 +10125,7 @@
 
 static int
 _get_Autofocus(CONFIG_GET_ARGS) {
-	int i;
+	unsigned int i;
 	char buf1024;
 
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
@@ -6571,7 +10142,7 @@
 
 static int
 _put_Autofocus(CONFIG_PUT_ARGS) {
-	int i;
+	unsigned int i;
 	char *val;
 
 	CR (gp_widget_get_value(widget, &val));
@@ -6617,7 +10188,7 @@
 	}
 
 	/* FIXME: deleted entry still exists, rebuild tree if deleted = 1 ? */
-	
+
 	return GP_OK;
 }
 
@@ -6676,7 +10247,7 @@
 			          params->wifi_profilesi.device_type);
 			gp_widget_set_value(child2, buffer);
 			gp_widget_append(child, child2);
-			
+
 			gp_widget_new (GP_WIDGET_TEXT, "Dates", &child2);
 			snprintf (buffer, 4096,
 				_("Creation date: %s, Last usage date: %s"),
@@ -6698,7 +10269,7 @@
 static int
 _get_nikon_wifi_profile_prop(CONFIG_GET_ARGS) {
 	char buffer1024;
-	
+
 	gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	gp_setting_get("ptp2_wifi",menu->name,buffer);
@@ -6719,7 +10290,7 @@
 _get_nikon_wifi_profile_channel(CONFIG_GET_ARGS) {
 	char buffer1024;
 	float val;
-	
+
 	gp_widget_new (GP_WIDGET_RANGE, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	gp_setting_get("ptp2_wifi", menu->name, buffer);
@@ -6728,7 +10299,7 @@
 	if (!val)
 		val = 1.0;
 	gp_widget_set_value(*widget, &val);
-	
+
 	return (GP_OK);
 }
 
@@ -6757,18 +10328,18 @@
 	char buffer1024;
 	int i;
 	int val;
-	
+
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	gp_setting_get("ptp2_wifi", menu->name, buffer);
 	val = atoi(buffer);
-	
+
 	for (i = 0; encryption_valuesi; i++) {
 		gp_widget_add_choice(*widget, _(encryption_valuesi));
 		if (i == val)
 			gp_widget_set_value(*widget, _(encryption_valuesi));
 	}
-	
+
 	return (GP_OK);
 }
 
@@ -6802,18 +10373,18 @@
 	char buffer1024;
 	int i;
 	int val;
-	
+
 	gp_widget_new (GP_WIDGET_RADIO, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 	gp_setting_get("ptp2_wifi", menu->name, buffer);
 	val = atoi(buffer);
-	
+
 	for (i = 0; accessmode_valuesi; i++) {
 		gp_widget_add_choice(*widget, _(accessmode_valuesi));
 		if (i == val)
 			gp_widget_set_value(*widget, _(accessmode_valuesi));
 	}
-	
+
 	return (GP_OK);
 }
 
@@ -6905,7 +10476,7 @@
 		/* Encryption */
 		gp_setting_get("ptp2_wifi","encryption",buffer);
 		profile.encryption = atoi(buffer);
-		
+
 		if (profile.encryption != 0) {
 			gp_setting_get("ptp2_wifi","key",buffer);
 			i = 0;
@@ -6950,7 +10521,7 @@
 {
 	int submenuno, ret;
 	CameraWidget *subwidget;
-	
+
 	gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget);
 	gp_widget_set_name (*widget, menu->name);
 
@@ -6961,7 +10532,7 @@
 		if (ret == GP_OK)
 			gp_widget_append (*widget, subwidget);
 	}
-	
+
 	return GP_OK;
 }
 
@@ -6970,7 +10541,7 @@
 {
 	int submenuno, ret;
 	CameraWidget *subwidget;
-	
+
 	for (submenuno = 0; create_wifi_profile_submenusubmenuno.name ; submenuno++ ) {
 		struct submenu *cursub = create_wifi_profile_submenu+submenuno;
 
@@ -6983,7 +10554,7 @@
 
 	        gp_widget_set_changed (subwidget, FALSE);
 
-		ret = cursub->putfunc (camera, subwidget, NULL, NULL);
+		ret = cursub->putfunc (camera, subwidget, NULL, NULL, NULL);
 	}
 
 	return GP_OK;
@@ -7029,7 +10600,7 @@
 {
 	int submenuno, ret;
 	CameraWidget *subwidget;
-	
+
 	for (submenuno = 0; wifi_profiles_menusubmenuno.name ; submenuno++ ) {
 		struct submenu *cursub = wifi_profiles_menu+submenuno;
 
@@ -7037,7 +10608,7 @@
 		if (ret != GP_OK)
 			continue;
 
-		ret = cursub->putfunc (camera, subwidget, NULL, NULL);
+		ret = cursub->putfunc (camera, subwidget, NULL, NULL, NULL);
 	}
 
 	return GP_OK;
@@ -7097,33 +10668,54 @@
 static struct submenu camera_actions_menu = {
 	/* { N_("Viewfinder Mode"), "viewfinder", PTP_DPC_CANON_ViewFinderMode, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_ViewFinderMode, _put_Canon_ViewFinderMode}, */
 	/*{ N_("Synchronize camera date and time with PC"),"syncdatetime", PTP_DPC_CANON_UnixTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_SyncTime, _put_Canon_SyncTime },*/
-	{ N_("Synchronize camera date and time with PC"),"syncdatetimeutc", PTP_DPC_CANON_EOS_UTCTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_SyncTime, _put_Canon_SyncTime },
+	{ N_("Synchronize camera date and time with PC (UTC)"),"syncdatetimeutc", PTP_DPC_CANON_EOS_UTCTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_SyncTime, _put_Canon_SyncTime },
 	{ N_("Synchronize camera date and time with PC"),"syncdatetime", PTP_DPC_CANON_EOS_CameraTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_SyncTime, _put_Canon_SyncTime },
 
 	{ N_("Auto-Focus"),                     "autofocus",        PTP_DPC_SONY_AutoFocus, PTP_VENDOR_SONY,   PTP_DTC_UINT16,  _get_Sony_Autofocus,            _put_Sony_Autofocus },
+	{ N_("Manual-Focus"),                   "manualfocus",      PTP_DPC_SONY_NearFar,   PTP_VENDOR_SONY,   PTP_DTC_INT16,   _get_Sony_ManualFocus,          _put_Sony_ManualFocus },
 	{ N_("Capture"),                        "capture",          PTP_DPC_SONY_Capture,   PTP_VENDOR_SONY,   PTP_DTC_UINT16,  _get_Sony_Capture,              _put_Sony_Capture },
 	{ N_("Power Down"),                     "powerdown",        0,  0,                  PTP_OC_PowerDown,                   _get_PowerDown,                 _put_PowerDown },
 	{ N_("Focus Lock"),                     "focuslock",        0,  PTP_VENDOR_CANON,   PTP_OC_CANON_FocusLock,             _get_Canon_FocusLock,           _put_Canon_FocusLock },
 	{ N_("Bulb Mode"),                      "bulb",             PTP_DPC_SONY_StillImage,PTP_VENDOR_SONY,   0,               _get_Sony_Bulb,                 _put_Sony_Bulb },
 	{ N_("Bulb Mode"),                      "bulb",             0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_BulbStart,         _get_Canon_EOS_Bulb,            _put_Canon_EOS_Bulb },
 	{ N_("Bulb Mode"),                      "bulb",             0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_TerminateCapture,      _get_Nikon_Bulb,                _put_Nikon_Bulb },
+	{ N_("Bulb Mode"),                      "bulb",             0,  PTP_VENDOR_GP_OLYMPUS_OMD,   PTP_OC_OLYMPUS_OMD_Capture,      _get_Olympus_OMD_Bulb,                _put_Olympus_OMD_Bulb },
+	{ N_("Bulb Mode"),                      "bulb",             0,  PTP_VENDOR_FUJI,    PTP_OC_InitiateCapture,             _get_Fuji_Bulb,                 _put_Fuji_Bulb },
 	{ N_("UI Lock"),                        "uilock",           0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_SetUILock,         _get_Canon_EOS_UILock,          _put_Canon_EOS_UILock },
+	{ N_("Popup Flash"),                    "popupflash",       0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_PopupBuiltinFlash, _get_Canon_EOS_PopupFlash,      _put_Canon_EOS_PopupFlash },
 	{ N_("Drive Nikon DSLR Autofocus"),     "autofocusdrive",   0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_AfDrive,               _get_Nikon_AFDrive,             _put_Nikon_AFDrive },
 	{ N_("Drive Canon DSLR Autofocus"),     "autofocusdrive",   0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_DoAf,              _get_Canon_EOS_AFDrive,         _put_Canon_EOS_AFDrive },
+	{ N_("Drive Fuji Autofocus"),           "autofocusdrive",   0,  PTP_VENDOR_FUJI,    0,               			_get_Fuji_AFDrive,              _put_Fuji_AFDrive },
 	{ N_("Drive Nikon DSLR Manual focus"),  "manualfocusdrive", 0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_MfDrive,               _get_Nikon_MFDrive,             _put_Nikon_MFDrive },
 	{ N_("Set Nikon Autofocus area"),       "changeafarea",     0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_ChangeAfArea,          _get_Nikon_ChangeAfArea,        _put_Nikon_ChangeAfArea },
-	{ N_("Set Nikon Control Mode"),         "controlmode",      0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_SetControlMode,        _get_Nikon_ControlMode,         _put_Nikon_ControlMode },
+	{ N_("Set Nikon Control Mode"),         "controlmode",      0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_ChangeCameraMode,      _get_Nikon_ControlMode,         _put_Nikon_ControlMode },
 	{ N_("Drive Canon DSLR Manual focus"),  "manualfocusdrive", 0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_DriveLens,         _get_Canon_EOS_MFDrive,         _put_Canon_EOS_MFDrive },
 	{ N_("Cancel Canon DSLR Autofocus"),    "cancelautofocus",  0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_AfCancel,          _get_Canon_EOS_AFCancel,        _put_Canon_EOS_AFCancel },
+	{ N_("Drive Olympus OMD Manual focus"), "manualfocusdrive", 0,  PTP_VENDOR_GP_OLYMPUS_OMD, PTP_OC_OLYMPUS_OMD_MFDrive,	_get_Olympus_OMD_MFDrive,	_put_Olympus_OMD_MFDrive },
+	{ N_("Drive Panasonic Manual focus"),   "manualfocusdrive", 0,  PTP_VENDOR_PANASONIC, PTP_OC_PANASONIC_ManualFocusDrive,_get_Panasonic_MFDrive,		_put_Panasonic_MFDrive },
+	{ N_("Get Fuji focuspoint"),		"focuspoint",	    PTP_DPC_FUJI_FocusPoint,  PTP_VENDOR_FUJI, PTP_DTC_STR,	_get_Fuji_FocusPoint,		_put_Fuji_FocusPoint },
+	{ N_("Fuji FocusPoint Grid dimensions"),"focuspoints",	    PTP_DPC_FUJI_FocusPoints, PTP_VENDOR_FUJI, 0,		_get_Fuji_FocusPoints,		_put_Fuji_FocusPoints },
+	{ N_("Fuji Zoom Position"),		"zoompos",	    PTP_DPC_FUJI_LensZoomPos, PTP_VENDOR_FUJI, PTP_DTC_UINT16,	_get_INT,			_put_None },
+
 	{ N_("Canon EOS Zoom"),                 "eoszoom",          0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_Zoom,              _get_Canon_EOS_Zoom,            _put_Canon_EOS_Zoom },
 	{ N_("Canon EOS Zoom Position"),        "eoszoomposition",  0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_ZoomPosition,      _get_Canon_EOS_ZoomPosition,    _put_Canon_EOS_ZoomPosition },
 	{ N_("Canon EOS Viewfinder"),           "viewfinder",       0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_GetViewFinderData, _get_Canon_EOS_ViewFinder,      _put_Canon_EOS_ViewFinder },
+	{ N_("Panasonic Viewfinder"),           "viewfinder",       0,  PTP_VENDOR_PANASONIC, 0, 								_get_Panasonic_ViewFinder,      _put_Panasonic_ViewFinder },
 	{ N_("Nikon Viewfinder"),               "viewfinder",       0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_StartLiveView,         _get_Nikon_ViewFinder,          _put_Nikon_ViewFinder },
 	{ N_("Canon EOS Remote Release"),       "eosremoterelease", 0,  PTP_VENDOR_CANON,   PTP_OC_CANON_EOS_RemoteReleaseOn,   _get_Canon_EOS_RemoteRelease,   _put_Canon_EOS_RemoteRelease },
 	{ N_("CHDK Script"),                    "chdk_script",      0,  PTP_VENDOR_CANON,   PTP_OC_CHDK,                        _get_Canon_CHDK_Script,         _put_Canon_CHDK_Script },
 	{ N_("Movie Capture"),                  "movie",            0,  0,                  PTP_OC_InitiateOpenCapture,         _get_OpenCapture,               _put_OpenCapture },
 	{ N_("Movie Capture"),                  "movie",            0,  PTP_VENDOR_NIKON,   PTP_OC_NIKON_StartMovieRecInCard,   _get_Nikon_Movie,               _put_Nikon_Movie },
 	{ N_("Movie Capture"),                  "movie",            0,  PTP_VENDOR_SONY,    PTP_OC_SONY_SDIOConnect,            _get_Sony_Movie,                _put_Sony_Movie },
+	{ N_("Movie Capture"),                  "movie",            0,  PTP_VENDOR_SONY,    PTP_OC_SONY_QX_Connect,             _get_Sony_QX_Movie,             _put_Sony_QX_Movie },
+	{ N_("Movie Capture"),                  "movie",            0,  PTP_VENDOR_PANASONIC,PTP_OC_PANASONIC_MovieRecControl,  _get_Panasonic_Movie,           _put_Panasonic_Movie },
+	{ N_("Movie Mode"),                     "eosmoviemode",     0,  PTP_VENDOR_CANON,   0,                                  _get_Canon_EOS_MovieModeSw,     _put_Canon_EOS_MovieModeSw },
+	{ N_("Focus Magnify"),                  "focusmagnify",     PTP_DPC_SONY_FocusMagnify, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp,     _put_Sony_FocusMagnifyProp },
+	{ N_("Focus Magnify Exit"),             "focusmagnifyexit", PTP_DPC_SONY_FocusMagnifyExit, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp, _put_Sony_FocusMagnifyProp },
+	{ N_("Focus Magnify Up"),               "focusmagnifyup",   PTP_DPC_SONY_FocusMagnifyUp, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp,   _put_Sony_FocusMagnifyProp },
+	{ N_("Focus Magnify Down"),             "focusmagnifydown", PTP_DPC_SONY_FocusMagnifyDown, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp, _put_Sony_FocusMagnifyProp },
+	{ N_("Focus Magnify Left"),             "focusmagnifyleft", PTP_DPC_SONY_FocusMagnifyLeft, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp, _put_Sony_FocusMagnifyProp },
+	{ N_("Focus Magnify Right"),            "focusmagnifyright",PTP_DPC_SONY_FocusMagnifyRight, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_FocusMagnifyProp,_put_Sony_FocusMagnifyProp },
 	{ N_("PTP Opcode"),                     "opcode",           0,  0,                  PTP_OC_GetDeviceInfo,               _get_Generic_OPCode,            _put_Generic_OPCode },
 	{ 0,0,0,0,0,0,0 },
 };
@@ -7145,16 +10737,26 @@
 	{ N_("Battery Level"),          "batterylevel",     PTP_DPC_BatteryLevel,                   0,                  PTP_DTC_UINT8,  _get_BatteryLevel,              _put_None },
 	{ N_("Battery Level"),          "batterylevel",     PTP_DPC_CANON_EOS_BatteryPower,         PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_BatteryLevel,    _put_None },
 	{ N_("Battery Level"),          "batterylevel",     PTP_DPC_SONY_BatteryLevel,              PTP_VENDOR_SONY,    PTP_DTC_INT8,   _get_SONY_BatteryLevel,         _put_None },
+	{ N_("Mirror Up Status"),       "mirrorupstatus",   PTP_DPC_NIKON_MirrorUpStatus,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,		_put_None },
+	{ N_("Mirror Lock"),       	"mirrorlock",       PTP_DPC_CANON_EOS_MirrorUpSetting,      PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,			_put_INT },
+	{ N_("Mirror Lock Status"),     "mirrorlockstatus", PTP_DPC_CANON_EOS_MirrorLockupState,    PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,			_put_None },
+	{ N_("Mirror Down Status"),     "mirrordownstatus", PTP_DPC_CANON_EOS_MirrorDownStatus,     PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,			_put_None },
+	{ N_("Mirror Up Shooting Count"),"mirrorupshootingcount", PTP_DPC_NIKON_MirrorUpReleaseShootingCount, PTP_VENDOR_NIKON, PTP_DTC_UINT8,  _get_INT,		_put_None },
+	{ N_("Continuous Shooting Count"),"continousshootingcount", PTP_DPC_NIKON_ContinousShootingCount, PTP_VENDOR_NIKON, PTP_DTC_UINT8,_get_INT,			_put_None },
 	{ N_("Camera Orientation"),     "orientation",      PTP_DPC_NIKON_CameraOrientation,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_CameraOrientation,   _put_None },
-	{ N_("Camera Orientation"),     "orientation2",     PTP_DPC_NIKON_AngleLevel,               PTP_VENDOR_NIKON,   PTP_DTC_INT32,  _get_Nikon_AngleLevel,          _put_None },
+	{ N_("Camera Orientation"),     "orientation2",     PTP_DPC_NIKON_AngleLevel,               PTP_VENDOR_NIKON,   PTP_DTC_INT32,  _get_Nikon_AngleLevel,		_put_None },
 	{ N_("Camera Orientation"),     "orientation",      PTP_DPC_CANON_RotationAngle,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_CameraOrientation,   _put_None },
 	{ N_("Flash Open"),             "flashopen",        PTP_DPC_NIKON_FlashOpen,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_None },
+	{ N_("Active Folder"),          "activefolder",     PTP_DPC_NIKON_ActiveFolder,             PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_INT,         		_put_None },
 	{ N_("Flash Charged"),          "flashcharged",     PTP_DPC_NIKON_FlashCharged,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_None },
 	{ N_("Lens Name"),              "lensname",         PTP_DPC_NIKON_LensID,                   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LensID,              _put_None },
 	{ N_("Lens Name"),              "lensname",         PTP_DPC_CANON_EOS_LensName,             PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_None },
+	{ N_("Lens Name"),              "lensname",         PTP_DPC_FUJI_LensNameAndSerial,         PTP_VENDOR_FUJI,    PTP_DTC_STR,    _get_STR,                       _put_None },
 	{ N_("Serial Number"),          "eosserialnumber",  PTP_DPC_CANON_EOS_SerialNumber,         PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_None },
 	{ N_("Shutter Counter"),        "shuttercounter",   PTP_DPC_CANON_EOS_ShutterCounter,       PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("Shutter Counter"),        "shuttercounter",   PTP_DPC_FUJI_TotalShotCount,            PTP_VENDOR_FUJI,    PTP_DTC_UINT32, _get_Fuji_Totalcount,           _put_None },
 	{ N_("Available Shots"),        "availableshots",   PTP_DPC_CANON_EOS_AvailableShots,       PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("Available Shots"),        "availableshots",   PTP_DPC_NIKON_ExposureRemaining,        PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
 	{ N_("Focal Length Minimum"),   "minfocallength",   PTP_DPC_NIKON_FocalLengthMin,           PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_FocalLength,         _put_None },
 	{ N_("Focal Length Maximum"),   "maxfocallength",   PTP_DPC_NIKON_FocalLengthMax,           PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_FocalLength,         _put_None },
 	{ N_("Maximum Aperture at Focal Length Minimum"), "apertureatminfocallength", PTP_DPC_NIKON_MaxApAtMinFocalLength, PTP_VENDOR_NIKON, PTP_DTC_UINT16, _get_Nikon_ApertureAtFocalLength, _put_None },
@@ -7165,6 +10767,9 @@
 	{ N_("AF Locked"),              "aflocked",         PTP_DPC_NIKON_AFLockStatus,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_None },
 	{ N_("AE Locked"),              "aelocked",         PTP_DPC_NIKON_AELockStatus,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_None },
 	{ N_("FV Locked"),              "fvlocked",         PTP_DPC_NIKON_FVLockStatus,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_None },
+	{ N_("Movie Switch"),	        "eosmovieswitch",   PTP_DPC_CANON_EOS_FixedMovie,           PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("Movie Prohibit Condition"), "movieprohibit",  PTP_DPC_NIKON_MovRecProhibitCondition,  PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_MovieProhibitCondition, _put_None },
+	{ N_("Liveview Prohibit Condition"), "liveviewprohibit", PTP_DPC_NIKON_LiveViewProhibitCondition, PTP_VENDOR_NIKON, PTP_DTC_UINT32, _get_Nikon_LiveViewProhibitCondition, _put_None },
 	{ 0,0,0,0,0,0,0 },
 };
 
@@ -7173,8 +10778,11 @@
 	{ N_("Camera Date and Time"),   "datetime",             PTP_DPC_CANON_UnixTime,             PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_UINT32_as_localtime,       _put_UINT32_as_localtime },
 	{ N_("Camera Date and Time"),   "datetime",             PTP_DPC_CANON_EOS_CameraTime,       PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_UINT32_as_localtime,       _put_UINT32_as_localtime },
 	{ N_("Camera Date and Time"),   "datetime",             PTP_DPC_DateTime,                   0,                  PTP_DTC_STR,    _get_STR_as_time,               _put_STR_as_time },
+	{ N_("Camera Date and Time"),   "datetime",             PTP_DPC_SONY_QX_DateTime,           PTP_VENDOR_SONY,    PTP_DTC_STR,    _get_STR_as_time,               _put_STR_as_time },
 	{ N_("Beep Mode"),              "beep",                 PTP_DPC_CANON_BeepMode,             PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_BeepMode,            _put_Canon_BeepMode },
 	{ N_("Image Comment"),          "imagecomment",         PTP_DPC_NIKON_ImageCommentString,   PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
+	{ N_("Image Comment"),          "imagecomment",         PTP_DPC_FUJI_Comment,               PTP_VENDOR_FUJI,    PTP_DTC_STR,    _get_STR,                       _put_STR },
+	{ N_("Device Name"),            "devicename",           PTP_DPC_FUJI_DeviceName,            PTP_VENDOR_FUJI,    PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("WLAN GUID"),          	"guid",         	PTP_DPC_NIKON_GUID,   		    PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("Enable Image Comment"),   "imagecommentenable",   PTP_DPC_NIKON_ImageCommentEnable,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
 	{ N_("LCD Off Time"),           "lcdofftime",           PTP_DPC_NIKON_MonitorOff,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LCDOffTime,          _put_Nikon_LCDOffTime },
@@ -7183,7 +10791,7 @@
 	{ N_("CSM Menu"),               "csmmenu",              PTP_DPC_NIKON_CSMMenu,              PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
 	{ N_("Reverse Command Dial"),   "reversedial",          PTP_DPC_NIKON_ReverseCommandDial,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
 	{ N_("Camera Output"),          "output",               PTP_DPC_CANON_CameraOutput,         PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_CameraOutput,        _put_Canon_CameraOutput },
-	{ N_("Camera Output"),          "output",               PTP_DPC_CANON_EOS_EVFOutputDevice,  PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_CameraOutput,    _put_Canon_EOS_CameraOutput },
+	{ N_("Camera Output"),          "output",               PTP_DPC_CANON_EOS_EVFOutputDevice,  PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_EOS_CameraOutput,    _put_Canon_EOS_CameraOutput },
 	{ N_("Recording Destination"),  "movierecordtarget",    PTP_DPC_CANON_EOS_EVFRecordStatus,  PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_EVFRecordTarget, _put_Canon_EOS_EVFRecordTarget },
 	{ N_("EVF Mode"),               "evfmode",              PTP_DPC_CANON_EOS_EVFMode,          PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_EVFMode,         _put_Canon_EOS_EVFMode },
 	{ N_("Owner Name"),             "ownername",            PTP_DPC_CANON_CameraOwner,          PTP_VENDOR_CANON,   PTP_DTC_AUINT8, _get_AUINT8_as_CHAR_ARRAY,      _put_AUINT8_as_CHAR_ARRAY },
@@ -7192,49 +10800,77 @@
 	{ N_("Artist"),                 "artist",               PTP_DPC_NIKON_ArtistName,           PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("CCD Number"),             "ccdnumber",            PTP_DPC_NIKON_CCDNumber,            PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR,                       _put_None },
 	{ N_("Copyright"),              "copyright",            PTP_DPC_CANON_EOS_Copyright,        PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
+	{ N_("Nickname"),               "nickname",             PTP_DPC_CANON_EOS_CameraNickname,   PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
+	{ N_("Copyright"),              "copyright",            PTP_DPC_FUJI_Copyright,             PTP_VENDOR_FUJI,    PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("Copyright"),              "copyright",            PTP_DPC_NIKON_CopyrightInfo,        PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("Clean Sensor"),           "cleansensor",          PTP_DPC_NIKON_CleanImageSensor,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_CleanSensor,         _put_Nikon_CleanSensor },
 	{ N_("Flicker Reduction"),      "flickerreduction",     PTP_DPC_NIKON_FlickerReduction,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_FlickerReduction,    _put_Nikon_FlickerReduction },
 	{ N_("Custom Functions Ex"),    "customfuncex",         PTP_DPC_CANON_EOS_CustomFuncEx,     PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_STR },
 	{ N_("Focus Info"),             "focusinfo",            PTP_DPC_CANON_EOS_FocusInfoEx,      PTP_VENDOR_CANON,   PTP_DTC_STR,    _get_STR,                       _put_None },
 	{ N_("Focus Area"),             "focusarea",            PTP_DPC_CANON_EOS_AFSelectFocusArea,PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_INT },
-	{ N_("Auto Power Off"),         "autopoweroff",         PTP_DPC_CANON_EOS_AutoPowerOff,     PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_INT,                       _put_INT },
+	{ N_("Strobo Firing"),          "strobofiring",         PTP_DPC_CANON_EOS_StroboFiring,     PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("Flash Charging State"),   "flashcharged",         PTP_DPC_CANON_EOS_FlashChargingState,PTP_VENDOR_CANON,  PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("One Shot Raw On"),        "oneshotrawon",         PTP_DPC_CANON_EOS_OneShotRawOn,     PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_None },
+	{ N_("Auto Power Off"),         "autopoweroff",         PTP_DPC_CANON_EOS_AutoPowerOff,     PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_INT },
 	{ N_("Depth of Field"),         "depthoffield",         PTP_DPC_CANON_EOS_DepthOfFieldPreview, PTP_VENDOR_CANON,PTP_DTC_UINT32, _get_INT,                       _put_INT },
 	{ N_("Menus and Playback"),     "menusandplayback",     PTP_DPC_NIKON_MenusAndPlayback,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_MenusAndPlayback,    _put_Nikon_MenusAndPlayback },
+	{ N_("External Recording Control"),     "externalrecordingcontrol", PTP_DPC_NIKON_ExternalRecordingControl,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,    _put_Nikon_OffOn_UINT8 },
+	{ N_("Camera Action"),          "cameraaction", 	0xd208, 			    PTP_VENDOR_FUJI,	PTP_DTC_UINT16,	_get_Fuji_Action,		_put_Fuji_Action },
+	{ N_("Priority Mode"),		"prioritymode",		PTP_DPC_SONY_PriorityMode,  	    PTP_VENDOR_SONY,	PTP_DTC_INT8, 	_get_Sony_PriorityMode,     	_put_Sony_PriorityMode },
+	{ N_("Priority Mode"),          "prioritymode",         PTP_DPC_FUJI_PriorityMode,          PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_PriorityMode,         _put_Fuji_PriorityMode },
 
 /* virtual */
+	{ N_("Thumb Size"),		"thumbsize",    0,  PTP_VENDOR_NIKON,   0,  _get_Nikon_Thumbsize,   _put_Nikon_Thumbsize },
 	{ N_("Fast Filesystem"),	"fastfs",	0,  PTP_VENDOR_NIKON,   0,  _get_Nikon_FastFS,      _put_Nikon_FastFS },
 	{ N_("Capture Target"),		"capturetarget",0,  PTP_VENDOR_NIKON,   0,  _get_CaptureTarget,     _put_CaptureTarget },
 	{ N_("Autofocus"),		"autofocus",    0,  PTP_VENDOR_NIKON,   0,  _get_Autofocus,         _put_Autofocus },
 	{ N_("Capture Target"),		"capturetarget",0,  PTP_VENDOR_CANON,   0,  _get_CaptureTarget,     _put_CaptureTarget },
+	{ N_("Capture Target"),		"capturetarget",0,  PTP_VENDOR_PANASONIC,0, _get_CaptureTarget,     _put_CaptureTarget },
+	{ N_("Capture Target"),		"capturetarget",PTP_DPC_SONY_StillImageStoreDestination,  PTP_VENDOR_SONY,0, _get_Sony_CaptureTarget,     _put_Sony_CaptureTarget },
 	{ N_("CHDK"),     		"chdk",		PTP_OC_CHDK,  PTP_VENDOR_CANON,   0,  _get_CHDK,     _put_CHDK },
 	{ N_("Capture"),		"capture",	0,  PTP_VENDOR_CANON,   0,  _get_Canon_CaptureMode, _put_Canon_CaptureMode },
+	{ N_("Remote Mode"),		"remotemode",	PTP_OC_CANON_EOS_SetRemoteMode,  PTP_VENDOR_CANON,   0,  _get_Canon_RemoteMode, _put_Canon_RemoteMode },
+	{ N_("Event Mode"),		"eventmode",	PTP_OC_CANON_EOS_SetEventMode,   PTP_VENDOR_CANON,   0,  _get_Canon_EventMode,  _put_Canon_EventMode },
+	{ N_("Test OLC"),		"testolc",	PTP_OC_CANON_EOS_SetRequestOLCInfoGroup,   PTP_VENDOR_CANON,   0,  _get_Canon_EOS_TestOLC,  _put_Canon_EOS_TestOLC },
 	{ 0,0,0,0,0,0,0 },
 };
 
 /* think of this as properties of the "film" */
 static struct submenu image_settings_menu = {
 	{ N_("Image Quality"),          "imagequality",         PTP_DPC_CANON_ImageQuality,             PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_Quality,             _put_Canon_Quality },
+	{ N_("Image Format"),           "imageformat",          PTP_DPC_OLYMPUS_ImageFormat,            PTP_VENDOR_GP_OLYMPUS_OMD,   PTP_DTC_UINT16,  _get_Olympus_Imageformat, _put_Olympus_Imageformat },
 	{ N_("Image Format"),           "imageformat",          PTP_DPC_CANON_FullViewFileFormat,       PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_Capture_Format,      _put_Canon_Capture_Format },
 	{ N_("Image Format"),           "imageformat",          PTP_DPC_CANON_EOS_ImageFormat,          PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ImageFormat,     _put_Canon_EOS_ImageFormat },
 	{ N_("Image Format SD"),        "imageformatsd",        PTP_DPC_CANON_EOS_ImageFormatSD,        PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ImageFormat,     _put_Canon_EOS_ImageFormat },
 	{ N_("Image Format CF"),        "imageformatcf",        PTP_DPC_CANON_EOS_ImageFormatCF,        PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ImageFormat,     _put_Canon_EOS_ImageFormat },
 	{ N_("Image Format"),           "imageformat",          PTP_DPC_FUJI_Quality,                   PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_ImageFormat,          _put_Fuji_ImageFormat },
+	{ N_("Image Format"),           "imageformat",          0,					PTP_VENDOR_PANASONIC,PTP_DTC_UINT16, _get_Panasonic_ImageFormat,    _put_Panasonic_ImageFormat },
 	{ N_("Image Format Ext HD"),    "imageformatexthd",     PTP_DPC_CANON_EOS_ImageFormatExtHD,     PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ImageFormat,     _put_Canon_EOS_ImageFormat },
-	{ N_("Image Size"),             "imagesize",            PTP_DPC_ImageSize,                      0,                  PTP_DTC_STR,    _get_ImageSize,                 _put_ImageSize },
+	{ N_("Film Simulation"),        "filmsimulation",       PTP_DPC_FUJI_FilmSimulation,            PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_FilmSimulation,       _put_Fuji_FilmSimulation },
+	{ N_("Image Size"),             "imagesize",            PTP_DPC_ImageSize,                      0,                  PTP_DTC_STR,    _get_STR_ENUMList,              _put_STR },
+	{ N_("Raw Image Size"),         "rawimagesize",         PTP_DPC_NIKON_RawImageSize,             PTP_VENDOR_NIKON,   PTP_DTC_STR,    _get_STR_ENUMList,              _put_STR },
 	{ N_("Image Size"),             "imagesize",            PTP_DPC_NIKON_1_ImageSize,              PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon1_ImageSize,          _put_Nikon1_ImageSize },
 	{ N_("Image Size"),             "imagesize",            PTP_DPC_SONY_ImageSize,                 PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_ImageSize,            _put_Sony_ImageSize },
 	{ N_("Image Size"),             "imagesize",            PTP_DPC_CANON_ImageSize,                PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_Size,                _put_Canon_Size },
 	{ N_("ISO Speed"),              "iso",                  PTP_DPC_CANON_ISOSpeed,                 PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ISO,                 _put_Canon_ISO },
-	{ N_("ISO Speed"),              "iso",                  PTP_DPC_ExposureIndex,                  0,                  PTP_DTC_UINT16, _get_ISO,                       _put_ISO },
-	{ N_("Movie ISO Speed"),        "movieiso",             PTP_DPC_NIKON_MovieISO,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_ISO32,                     _put_ISO32 },
+	{ N_("ISO Speed"),              "iso",                  PTP_DPC_ExposureIndex,                  PTP_VENDOR_FUJI,    PTP_DTC_INT32,  _get_INT,                       _put_INT },
+	{ N_("ISO Speed"),              "iso",                  PTP_DPC_ExposureIndex,                  0,                  PTP_DTC_UINT16, _get_INT,                       _put_INT },
+	{ N_("Movie ISO Speed"),        "movieiso",             PTP_DPC_NIKON_MovieISO,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_INT,                       _put_INT },
 	{ N_("ISO Speed"),              "iso",                  PTP_DPC_CANON_EOS_ISOSpeed,             PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ISO,                 _put_Canon_ISO },
+	{ N_("ISO Speed"),              "iso",                  PTP_DPC_SONY_QX_ISO,                    PTP_VENDOR_SONY,    PTP_DTC_UINT32, _get_Sony_ISO,                  _put_Sony_QX_ISO },
+	/* these 2 iso will overwrite and conflict with each other... the older Sony do not have d226, so it should pick the next entry ... */
+	{ N_("ISO Speed"),              "iso",                  PTP_DPC_SONY_ISO2,                      PTP_VENDOR_SONY,    PTP_DTC_UINT32, _get_Sony_ISO,                  _put_Sony_ISO2 },
 	{ N_("ISO Speed"),              "iso",                  PTP_DPC_SONY_ISO,                       PTP_VENDOR_SONY,    PTP_DTC_UINT32, _get_Sony_ISO,                  _put_Sony_ISO },
 	{ N_("ISO Speed"),              "iso",                  PTP_DPC_NIKON_1_ISO,                    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_ISO,               _put_Nikon_1_ISO },
+	{ N_("ISO Speed"),              "iso",                  PTP_DPC_OLYMPUS_ISO,                    PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT16,  _get_Olympus_ISO,       _put_Olympus_ISO },
+	{ N_("ISO Speed"),              "iso",             	0,         		    		PTP_VENDOR_PANASONIC,   PTP_DTC_UINT32, _get_Panasonic_ISO,         _put_Panasonic_ISO },
 	{ N_("ISO Auto"),               "isoauto",              PTP_DPC_NIKON_ISO_Auto,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
+	{ N_("Auto ISO"),               "autoiso",              PTP_DPC_NIKON_ISOAuto,                  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
+	{ N_("WhiteBalance"),           "whitebalance",         PTP_DPC_OLYMPUS_WhiteBalance,           PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT16,  _get_Olympus_WhiteBalance, _put_Olympus_WhiteBalance },
 	{ N_("WhiteBalance"),           "whitebalance",         PTP_DPC_CANON_WhiteBalance,             PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_WhiteBalance,        _put_Canon_WhiteBalance },
 	{ N_("WhiteBalance"),           "whitebalance",         PTP_DPC_CANON_EOS_WhiteBalance,         PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_EOS_WhiteBalance,    _put_Canon_EOS_WhiteBalance },
 	{ N_("Color Temperature"),      "colortemperature",     PTP_DPC_CANON_EOS_ColorTemperature,     PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                       _put_INT },
+	{ N_("Color Temperature"),      "colortemperature",     PTP_DPC_FUJI_ColorTemperature,          PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_INT,                       _put_INT },
 	{ N_("Color Temperature"),      "colortemperature",     PTP_DPC_SONY_ColorTemp,                 PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_INT,                       _put_INT },
 	{ N_("WhiteBalance"),           "whitebalance",         PTP_DPC_WhiteBalance,                   0,                  PTP_DTC_UINT16, _get_WhiteBalance,              _put_WhiteBalance },
 	{ N_("WhiteBalance"),           "whitebalance",         PTP_DPC_NIKON_1_WhiteBalance,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_WhiteBalance,      _put_Nikon_1_WhiteBalance },
@@ -7246,7 +10882,18 @@
 	{ N_("Color Model"),            "colormodel",           PTP_DPC_NIKON_ColorModel,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ColorModel,          _put_Nikon_ColorModel },
 	{ N_("Color Space"),            "colorspace",           PTP_DPC_NIKON_ColorSpace,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ColorSpace,          _put_Nikon_ColorSpace },
 	{ N_("Color Space"),            "colorspace",           PTP_DPC_CANON_EOS_ColorSpace,           PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ColorSpace,      _put_Canon_EOS_ColorSpace },
-	{ N_("Auto ISO"),               "autoiso",              PTP_DPC_NIKON_ISOAuto,                  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,         _put_Nikon_OnOff_UINT8 },
+	{ N_("Color Space"),            "colorspace",           PTP_DPC_FUJI_ColorSpace,                PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Canon_EOS_ColorSpace,      _put_Canon_EOS_ColorSpace }, /* uses 1 for sRGB, and 2 for AdobeRGB too, same as EOS */
+	{ N_("Video Format"),           "videoformat",          PTP_DPC_VideoFormat,                    0,                  PTP_DTC_UINT32, _get_VideoFormat,               _put_VideoFormat },
+	{ N_("Video Resolution"),       "videoresolution",      PTP_DPC_VideoResolution,                0,                  PTP_DTC_STR   , _get_STR_ENUMList,              _put_STR },
+	{ N_("Video Quality"),          "videoquality",         PTP_DPC_VideoQuality,                   0,                  PTP_DTC_UINT16, _get_INT,                       _put_INT },
+	{ N_("Video Framerate"),        "videoframerate",       PTP_DPC_VideoFrameRate,                 0,                  PTP_DTC_UINT32, _get_Video_Framerate,           _put_Video_Framerate },
+	{ N_("Video Contrast"),         "videocontrast",        PTP_DPC_VideoContrast,                  0,                  PTP_DTC_UINT32, _get_INT,                       _put_INT },
+	{ N_("Video Brightness"),       "videobrightness",      PTP_DPC_VideoBrightness,                0,                  PTP_DTC_UINT32, _get_INT,                       _put_INT },
+	{ N_("Audio Format"),           "audioformat",          PTP_DPC_AudioFormat,                    0,                  PTP_DTC_UINT32, _get_Audio_Format,              _put_Audio_Format },
+	{ N_("Audio Bitrate"),          "audiobitrate",         PTP_DPC_AudioBitrate,                   0,                  PTP_DTC_UINT32, _get_INT,                       _put_INT },
+	{ N_("Audio Sampling Rate"),    "audiosamplingrate",    PTP_DPC_AudioSamplingRate,              0,                  PTP_DTC_UINT32, _get_INT,                       _put_INT },
+	{ N_("Audio Bit per Sample"),   "audiobitpersample",    PTP_DPC_AudioBitPerSample,              0,                  PTP_DTC_UINT16, _get_INT,                       _put_INT },
+	{ N_("Audio Volume"),           "audiovolume",          PTP_DPC_AudioVolume,                    0,                  PTP_DTC_UINT32, _get_INT,                       _put_INT },
 	{ 0,0,0,0,0,0,0 },
 };
 
@@ -7255,14 +10902,30 @@
 	{ N_("Long Exp Noise Reduction"),       "longexpnr",                PTP_DPC_NIKON_1_LongExposureNoiseReduction, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8,            _put_Nikon_OnOff_UINT8 },
 	{ N_("Auto Focus Mode 2"),              "autofocusmode2",           PTP_DPC_NIKON_A4AFActivation,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Zoom"),                           "zoom",                     PTP_DPC_CANON_Zoom,                     PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ZoomRange,               _put_Canon_ZoomRange },
+	{ N_("Zoom"),                           "zoom",                     PTP_DPC_CANON_EOS_PowerZoomPosition,    PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_EOS_ZoomRange,           _put_Canon_EOS_ZoomRange },
+	{ N_("Zoom"),                           "zoom",                     PTP_DPC_SONY_Zoom,    	            PTP_VENDOR_SONY,    PTP_DTC_UINT32, _get_Sony_Zoom,                     _put_Sony_Zoom },
+	{ N_("Zoom Speed"),                     "zoomspeed",                PTP_DPC_CANON_EOS_PowerZoomSpeed,       PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_INT,                           _put_INT },
 	{ N_("Assist Light"),                   "assistlight",              PTP_DPC_CANON_AssistLight,              PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_AssistLight,             _put_Canon_AssistLight },
 	{ N_("Rotation Flag"),                  "autorotation",             PTP_DPC_CANON_RotationScene,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_AutoRotation,            _put_Canon_AutoRotation },
 	{ N_("Self Timer"),                     "selftimer",                PTP_DPC_CANON_SelfTime,                 PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_SelfTimer,               _put_Canon_SelfTimer },
 	{ N_("Assist Light"),                   "assistlight",              PTP_DPC_NIKON_AFAssist,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
+	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_OLYMPUS_ExposureCompensation,   PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT16,  _get_Olympus_ExpCompensation,_put_Olympus_ExpCompensation },
+	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_SONY_ExposureCompensation,      PTP_VENDOR_SONY,    PTP_DTC_INT16,  _get_ExpCompensation,               _put_Sony_ExpCompensation2 },
+	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_SONY_QX_ExposureCompensation,   PTP_VENDOR_SONY,    PTP_DTC_INT16,  _get_ExpCompensation,               _put_ExpCompensation },
 	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_ExposureBiasCompensation,       PTP_VENDOR_SONY,    PTP_DTC_INT16,  _get_ExpCompensation,               _put_Sony_ExpCompensation },
 	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_ExposureBiasCompensation,       0,                  PTP_DTC_INT16,  _get_ExpCompensation,               _put_ExpCompensation },
+	{ N_("Movie Exposure Compensation"),    "movieexposurecompensation",PTP_DPC_NIKON_MovieExposureBiasCompensation,PTP_VENDOR_NIKON,PTP_DTC_INT16, _get_ExpCompensation,               _put_ExpCompensation },
 	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_CANON_ExpCompensation,          PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_ExpCompensation,         _put_Canon_ExpCompensation },
 	{ N_("Exposure Compensation"),          "exposurecompensation",     PTP_DPC_CANON_EOS_ExpCompensation,      PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_ExpCompensation2,        _put_Canon_ExpCompensation2 },
+	{ N_("Exposure Compensation"),		"exposurecompensation",	    0, 					    PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_Exposure,         _put_Panasonic_Exposure },
+	{ N_("White Balance"),			"whitebalance",	    0, 					    	PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_Whitebalance,         _put_Panasonic_Whitebalance },
+	{ N_("Color temperature"),              "colortemperature",         0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_ColorTemp,        _put_Panasonic_ColorTemp },
+	{ N_("Adjust A/B"),                     "whitebalanceadjustab",      0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_AdjustAB,         _put_Panasonic_AdjustAB }, 
+	{ N_("Adjust G/M"),                     "whitebalanceadjustgm",      0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_AdjustGM,         _put_Panasonic_AdjustGM }, 
+	{ N_("AF Mode"),                        "afmode",                   0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_AFMode,           _put_Panasonic_AFMode }, 
+	{ N_("MF Adjust"),                      "mfadjust",                 0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_MFAdjust,         _put_Panasonic_MFAdjust }, 
+	{ N_("Exp mode"),                       "expmode",                 0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_ExpMode,          _put_Panasonic_ExpMode }, 
+	{ N_("Start/Stop recording"),           "recording",                 0,                                      PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_Recording,       _put_Panasonic_Recording }, 
 	/* these cameras also have PTP_DPC_ExposureBiasCompensation, avoid overlap */
 	{ N_("Exposure Compensation"),          "exposurecompensation2",    PTP_DPC_NIKON_ExposureCompensation,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Flash Compensation"),             "flashcompensation",        PTP_DPC_CANON_FlashCompensation,        PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_ExpCompensation,         _put_Canon_ExpCompensation },
@@ -7284,27 +10947,38 @@
 	{ N_("Flash Command B Value"),          "flashcommandbvalue",       PTP_DPC_NIKON_FlashCommandBValue,       PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_FlashCommandXValue,      _put_Nikon_FlashCommandXValue },
 	{ N_("AF Area Illumination"),           "af-area-illumination",     PTP_DPC_NIKON_AFAreaIllumination,       PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_AFAreaIllum,             _put_Nikon_AFAreaIllum },
 	{ N_("AF Beep Mode"),                   "afbeep",                   PTP_DPC_NIKON_BeepOff,                  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
-	{ N_("F-Number"),                       "f-number",                 PTP_DPC_FNumber,                        PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_FNumber,                       _put_Sony_FNumber },
+	{ N_("F-Number"),                       "f-number",                 PTP_DPC_FNumber,                        PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_Sony_FNumber,                  _put_Sony_FNumber },
+	{ N_("F-Number"),                       "f-number",                 PTP_DPC_SONY_QX_Aperture,               PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_FNumber,                       _put_FNumber },
 	{ N_("F-Number"),                       "f-number",                 PTP_DPC_FNumber,                        0,                  PTP_DTC_UINT16, _get_FNumber,                       _put_FNumber },
+	{ N_("F-Number"),			"f-number",		    0,					    PTP_VENDOR_PANASONIC,PTP_DTC_INT32, _get_Panasonic_FNumber,             _put_Panasonic_FNumber },
+	{ N_("Live View Size"),			"liveviewsize",		    0,					    PTP_VENDOR_PANASONIC,PTP_DTC_INT32, _get_Panasonic_LiveViewSize,        _put_Panasonic_LiveViewSize },
 	{ N_("Movie F-Number"),                 "movief-number",            PTP_DPC_NIKON_MovieFNumber,             PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_FNumber,                       _put_FNumber },
 	{ N_("Flexible Program"),               "flexibleprogram",          PTP_DPC_NIKON_FlexibleProgram,          PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Range_INT8,                    _put_Range_INT8 },
+	{ N_("Image Quality"),			"imagequality",		    PTP_DPC_SONY_CompressionSetting,	    PTP_VENDOR_SONY,	PTP_DTC_UINT8,	_get_Sony_300_CompressionSetting,   _put_Sony_300_CompressionSetting },
 	{ N_("Image Quality"),                  "imagequality",             PTP_DPC_CompressionSetting,             PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_CompressionSetting,            _put_Sony_CompressionSetting },
 	{ N_("Image Quality"),                  "imagequality",             PTP_DPC_CompressionSetting,             0,                  PTP_DTC_UINT8,  _get_CompressionSetting,            _put_CompressionSetting },
+	{ N_("JPEG Quality"),			"jpegquality",              PTP_DPC_SONY_JpegQuality,               PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_300_JpegCompressionSetting,   _put_Sony_300_JpegCompressionSetting },
+	{ N_("PC Save Image Size"),		"pcsaveimgsize",            PTP_DPC_SONY_PcSaveImageSize,           PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_PcSaveImageSize,          _put_Sony_PcSaveImageSize },
+	{ N_("PC Save Image Format"),		"pcsaveimgformat",	    PTP_DPC_SONY_PcSaveImageFormat,         PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_PcSaveImageFormat,        _put_Sony_PcSaveImageFormat },
 	{ N_("Focus Distance"),                 "focusdistance",            PTP_DPC_FocusDistance,                  0,                  PTP_DTC_UINT16, _get_FocusDistance,                 _put_FocusDistance },
 	{ N_("Focal Length"),                   "focallength",              PTP_DPC_FocalLength,                    0,                  PTP_DTC_UINT32, _get_FocalLength,                   _put_FocalLength },
 	{ N_("Focus Mode"),                     "focusmode",                PTP_DPC_FocusMode,                      PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_FocusMode,                     _put_Sony_FocusMode },
 	{ N_("Focus Mode"),                     "focusmode",                PTP_DPC_FocusMode,                      0,                  PTP_DTC_UINT16, _get_FocusMode,                     _put_FocusMode },
+	{ N_("Focus Mode"),                     "focusmode",                PTP_DPC_OLYMPUS_FocusMode,              PTP_VENDOR_GP_OLYMPUS_OMD,  PTP_DTC_UINT16, _get_FocusMode,             _put_FocusMode },
 	/* Nikon DSLR have both PTP focus mode and Nikon specific focus mode */
 	{ N_("Focus Mode 2"),                   "focusmode2",               PTP_DPC_NIKON_AutofocusMode,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_AFMode,                  _put_Nikon_AFMode },
-	{ N_("Focus Mode"),                     "focusmode",                PTP_DPC_CANON_EOS_FocusMode,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_FocusMode,           _put_Canon_EOS_FocusMode },
+	{ N_("Focus Mode"),                     "focusmode",                PTP_DPC_CANON_EOS_FocusMode,            PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_EOS_FocusMode,           _put_Canon_EOS_FocusMode },
 	{ N_("Continuous AF"),                  "continuousaf",             PTP_DPC_CANON_EOS_ContinousAFMode,      PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_EOS_ContinousAF,         _put_Canon_EOS_ContinousAF },
 	{ N_("Effect Mode"),                    "effectmode",               PTP_DPC_EffectMode,                     0,                  PTP_DTC_UINT16, _get_EffectMode,                    _put_EffectMode },
 	{ N_("Effect Mode"),                    "effectmode",               PTP_DPC_NIKON_EffectMode,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_NIKON_EffectMode,              _put_NIKON_EffectMode },
 	{ N_("Exposure Program"),               "expprogram",               PTP_DPC_ExposureProgramMode,            0,                  PTP_DTC_UINT16, _get_ExposureProgram,               _put_ExposureProgram },
 	{ N_("Exposure Program"),               "expprogram2",              PTP_DPC_NIKON_1_Mode,                   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_NIKON_1_ExposureProgram,       _put_NIKON_1_ExposureProgram },
+	{ N_("User Mode"),               	"usermode",                 PTP_DPC_NIKON_UserMode,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_NIKON_UserMode,                _put_NIKON_UserMode },
 	{ N_("Scene Mode"),                     "scenemode",                PTP_DPC_NIKON_SceneMode,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_NIKON_SceneMode,               _put_NIKON_SceneMode },
 	{ N_("Aspect Ratio"),                   "aspectratio",              PTP_DPC_SONY_AspectRatio,               PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_AspectRatio,              _put_Sony_AspectRatio },
+	{ N_("Aspect Ratio"),                   "aspectratio",              PTP_DPC_OLYMPUS_AspectRatio,            PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT32,  _get_Olympus_AspectRatio,   _put_Olympus_AspectRatio },
 	{ N_("Aspect Ratio"),                   "aspectratio",              PTP_DPC_CANON_EOS_MultiAspect,          PTP_VENDOR_CANON,   PTP_DTC_UINT32,  _get_Canon_EOS_AspectRatio,        _put_Canon_EOS_AspectRatio },
+	{ N_("AF Method"),	        	"afmethod",		    PTP_DPC_CANON_EOS_LvAfSystem,	    PTP_VENDOR_CANON,   PTP_DTC_UINT32,  _get_Canon_EOS_AFMethod,     _put_Canon_EOS_AFMethod },
 	{ N_("Storage Device"),                 "storageid",                PTP_DPC_CANON_EOS_CurrentStorage,       PTP_VENDOR_CANON,   PTP_DTC_UINT32,  _get_Canon_EOS_StorageID  ,        _put_Canon_EOS_StorageID },
 	{ N_("High ISO Noise Reduction"),       "highisonr",		    PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_HighIsoNr,     _put_Canon_EOS_HighIsoNr },
 	{ N_("HDR Mode"),                       "hdrmode",                  PTP_DPC_NIKON_HDRMode,                  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
@@ -7314,27 +10988,41 @@
 	{ N_("Still Capture Mode"),             "capturemode",              PTP_DPC_FUJI_ReleaseMode,               PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_ReleaseMode,              _put_Fuji_ReleaseMode },
 	{ N_("Canon Shooting Mode"),            "shootingmode",             PTP_DPC_CANON_ShootingMode,             PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_ShootMode,               _put_Canon_ShootMode },
 	{ N_("Canon Auto Exposure Mode"),       "autoexposuremode",         PTP_DPC_CANON_EOS_AutoExposureMode,     PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_AutoExposureMode,    _put_Canon_EOS_AutoExposureMode },
+	{ N_("Canon Auto Exposure Mode Dial"),  "autoexposuremodedial",     PTP_DPC_CANON_EOS_AEModeDial,           PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_AutoExposureMode,    _put_Canon_EOS_AutoExposureMode },
 	{ N_("Drive Mode"),                     "drivemode",                PTP_DPC_CANON_EOS_DriveMode,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_DriveMode,           _put_Canon_EOS_DriveMode },
 	{ N_("Picture Style"),                  "picturestyle",             PTP_DPC_CANON_EOS_PictureStyle,         PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_EOS_PictureStyle,        _put_Canon_EOS_PictureStyle },
 	{ N_("Focus Metering Mode"),            "focusmetermode",           PTP_DPC_FocusMeteringMode,              0,                  PTP_DTC_UINT16, _get_FocusMetering,                 _put_FocusMetering },
+	{ N_("Focus Metering Mode"),            "exposuremetermode",        PTP_DPC_OLYMPUS_ExposureMeteringMode,   PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT16, _get_ExposureMetering,       _put_ExposureMetering },
 	{ N_("Exposure Metering Mode"),         "exposuremetermode",        PTP_DPC_ExposureMeteringMode,           0,                  PTP_DTC_UINT16, _get_ExposureMetering,              _put_ExposureMetering },
+	{ N_("Aperture"),                       "aperture",                 PTP_DPC_OLYMPUS_Aperture,               PTP_VENDOR_GP_OLYMPUS_OMD,   PTP_DTC_UINT16, _get_Olympus_Aperture,     _put_Olympus_Aperture },
 	{ N_("Aperture"),                       "aperture",                 PTP_DPC_CANON_Aperture,                 PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_Aperture,                _put_Canon_Aperture },
 	{ N_("Aperture"),                       "aperture",                 PTP_DPC_FUJI_Aperture,                  PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_Aperture,                 _put_Fuji_Aperture },
 	{ N_("AV Open"),                        "avopen",                   PTP_DPC_CANON_AvOpen,                   PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_Aperture,                _put_Canon_Aperture },
 	{ N_("AV Max"),                         "avmax",                    PTP_DPC_CANON_AvMax,                    PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_Aperture,                _put_Canon_Aperture },
 	{ N_("Aperture"),                       "aperture",                 PTP_DPC_CANON_EOS_Aperture,             PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_Aperture,                _put_Canon_Aperture },
+	{ N_("Aperture"),                       "aperture",                 PTP_DPC_NIKON_1_FNumber,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_Aperture,              _put_Nikon_1_Aperture },
+	{ N_("Shutterspeed"),                   "shutterspeed2",            PTP_DPC_NIKON_1_ShutterSpeed,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_1_ShutterSpeedI,         _put_Nikon_1_ShutterSpeedI },
+	{ N_("Shutterspeed"),                   "shutterspeed2",            PTP_DPC_NIKON_1_ShutterSpeed,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_ShutterSpeedU,         _put_Nikon_1_ShutterSpeedU },
+	{ N_("Aperture 2"),                     "aperture2",                PTP_DPC_NIKON_1_FNumber2,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_Aperture,              _put_Nikon_1_Aperture },
 	{ N_("Focusing Point"),                 "focusingpoint",            PTP_DPC_CANON_FocusingPoint,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_FocusingPoint,           _put_Canon_FocusingPoint },
 	{ N_("Sharpness"),                      "sharpness",                PTP_DPC_Sharpness,                      0,                  PTP_DTC_UINT8,  _get_Sharpness,                     _put_Sharpness },
 	{ N_("Capture Delay"),                  "capturedelay",             PTP_DPC_CaptureDelay,                   0,                  PTP_DTC_UINT32, _get_Milliseconds,                  _put_Milliseconds },
+	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_ExposureTime,		    PTP_VENDOR_FUJI,    PTP_DTC_UINT32,	_get_Fuji_New_ShutterSpeed,	    _put_Fuji_New_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_ExposureTime,                   0,                  PTP_DTC_UINT32, _get_ExpTime,                       _put_ExpTime },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_CANON_ShutterSpeed,             PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ShutterSpeed,            _put_Canon_ShutterSpeed },
+	{ N_("Shutter Speed"),                  "shutterspeed",             0,						PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_Shutter,         _put_Panasonic_Shutter },
 	/* these cameras also have PTP_DPC_ExposureTime, avoid overlap */
 	{ N_("Shutter Speed 2"),                "shutterspeed2",            PTP_DPC_NIKON_ExposureTime,             PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_ShutterSpeed,            _put_Nikon_ShutterSpeed },
 	{ N_("Movie Shutter Speed 2"),          "movieshutterspeed",        PTP_DPC_NIKON_MovieShutterSpeed,        PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_ShutterSpeed,            _put_Nikon_ShutterSpeed },
+	/* olympus uses also a 16 bit/16bit separation */
+	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_OLYMPUS_Shutterspeed,           PTP_VENDOR_GP_OLYMPUS_OMD,   PTP_DTC_UINT32, _get_Olympus_ShutterSpeed, _put_Olympus_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_CANON_EOS_ShutterSpeed,         PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ShutterSpeed,            _put_Canon_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_FUJI_ShutterSpeed,              PTP_VENDOR_FUJI,    PTP_DTC_INT16,  _get_Fuji_ShutterSpeed,             _put_Fuji_ShutterSpeed },
+	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_SONY_ShutterSpeed2,             PTP_VENDOR_SONY,    PTP_DTC_UINT32,  _get_Sony_ShutterSpeed,             _put_Sony_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_SONY_ShutterSpeed,              PTP_VENDOR_SONY,    PTP_DTC_UINT32,  _get_Sony_ShutterSpeed,             _put_Sony_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_RICOH_ShutterSpeed,             PTP_VENDOR_PENTAX,  PTP_DTC_UINT64, _get_Ricoh_ShutterSpeed,            _put_Ricoh_ShutterSpeed },
+	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_GP_SIGMA_FP_ShutterSpeed,       PTP_VENDOR_GP_SIGMAFP, PTP_DTC_UINT64, _get_SigmaFP_ShutterSpeed,       _put_SigmaFP_ShutterSpeed },
+	{ N_("Aperture"),                  	"aperture",		    PTP_DPC_GP_SIGMA_FP_Aperture,           PTP_VENDOR_GP_SIGMAFP, PTP_DTC_UINT64, _get_SigmaFP_Aperture,           _put_SigmaFP_Aperture },
 	{ N_("Metering Mode"),                  "meteringmode",             PTP_DPC_CANON_MeteringMode,             PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_MeteringMode,            _put_Canon_MeteringMode },
 	{ N_("Metering Mode"),                  "meteringmode",             PTP_DPC_CANON_EOS_MeteringMode,         PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_MeteringMode,            _put_Canon_MeteringMode },
 	{ N_("AF Distance"),                    "afdistance",               PTP_DPC_CANON_AFDistance,               PTP_VENDOR_CANON,   PTP_DTC_UINT8,  _get_Canon_AFDistance,              _put_Canon_AFDistance },
@@ -7342,9 +11030,16 @@
 	{ N_("Exposure Delay Mode"),            "exposuredelaymode",        PTP_DPC_NIKON_ExposureDelayMode,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Exposure Lock"),                  "exposurelock",             PTP_DPC_NIKON_AELockMode,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("AE-L/AF-L Mode"),                 "aelaflmode",               PTP_DPC_NIKON_AELAFLMode,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_AELAFLMode,              _put_Nikon_AELAFLMode },
-	{ N_("Live View AF Mode"),              "liveviewafmode",           PTP_DPC_NIKON_LiveViewAFArea,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_LiveViewAF,              _put_Nikon_LiveViewAF },
-	{ N_("Live View AF Mode"),              "liveviewafmode",           PTP_DPC_NIKON_LiveViewAFArea,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewAF,              _put_Nikon_LiveViewAF },
+	{ N_("Live View AF Mode"),              "liveviewafmode",           PTP_DPC_NIKON_LiveViewAFArea,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_LiveViewAFI,             _put_Nikon_LiveViewAFI },
+	{ N_("Live View AF Mode"),              "liveviewafmode",           PTP_DPC_NIKON_LiveViewAFArea,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewAFU,             _put_Nikon_LiveViewAFU },
 	{ N_("Live View AF Focus"),             "liveviewaffocus",          PTP_DPC_NIKON_LiveViewAFFocus,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewAFFocus,         _put_Nikon_LiveViewAFFocus },
+	{ N_("Live View Exposure Preview"),     "liveviewexposurepreview",  PTP_DPC_NIKON_LiveViewExposurePreview,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
+	{ N_("Live View Image Zoom Ratio"),     "liveviewimagezoomratio",   PTP_DPC_NIKON_LiveViewImageZoomRatio,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewImageZoomRatio,  _put_Nikon_LiveViewImageZoomRatio },
+	{ N_("Live View White Balance"),        "liveviewwhitebalance",     PTP_DPC_NIKON_LiveViewWhiteBalance,     PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_WhiteBalance,                  _put_WhiteBalance },
+	{ N_("Live View Size"),                 "liveviewsize",             PTP_DPC_FUJI_LiveViewImageSize,         PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Fuji_LiveViewSize,             _put_Fuji_LiveViewSize },
+	{ N_("Live View Size"),                 "liveviewsize",             PTP_DPC_SONY_QX_LiveviewResolution,     PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_QX_LiveViewSize,          _put_Sony_QX_LiveViewSize },
+	{ N_("Live View Size"),                 "liveviewsize",             PTP_DPC_CANON_EOS_EVFOutputDevice,      PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_LiveViewSize,            _put_Canon_LiveViewSize },
+	{ N_("Live View Setting Effect"),       "liveviewsettingeffect",    PTP_DPC_SONY_LiveViewSettingEffect,     PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_LiveViewSettingEffect,    _put_Sony_LiveViewSettingEffect },
 	{ N_("File Number Sequencing"),         "filenrsequencing",         PTP_DPC_NIKON_FileNumberSequence,       PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Flash Sign"),                     "flashsign",                PTP_DPC_NIKON_FlashSign,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Modelling Flash"),                "modelflash",               PTP_DPC_NIKON_E4ModelingFlash,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
@@ -7354,15 +11049,29 @@
 	{ N_("Release without CF card"),        "nocfcardrelease",          PTP_DPC_NIKON_NoCFCard,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Flash Mode Manual Power"),        "flashmodemanualpower",     PTP_DPC_NIKON_FlashModeManualPower,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_FlashModeManualPower,    _put_Nikon_FlashModeManualPower },
 	{ N_("Auto Focus Area"),                "autofocusarea",            PTP_DPC_NIKON_AutofocusArea,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_AutofocusArea,           _put_Nikon_AutofocusArea },
-	{ N_("Flash Exposure Compensation"),    "flashexposurecompensation", PTP_DPC_NIKON_FlashExposureCompensation, PTP_VENDOR_NIKON, PTP_DTC_UINT8,  _get_Nikon_FlashExposureCompensation, _put_Nikon_FlashExposureCompensation },
+	{ N_("Focus Area"),                     "focusarea",                PTP_DPC_SONY_FocusArea,                 PTP_VENDOR_SONY,    PTP_DTC_UINT16, _get_Sony_FocusArea,                _put_Sony_FocusArea },
+	{ N_("Flash Exposure Compensation"),    "flashexposurecompensation", PTP_DPC_NIKON_FlashExposureCompensation, PTP_VENDOR_NIKON, PTP_DTC_INT8,   _get_Nikon_FlashExposureCompensation, _put_Nikon_FlashExposureCompensation },
 	{ N_("Bracketing"),                     "bracketing",               PTP_DPC_NIKON_Bracketing,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Bracketing"),                     "bracketmode",              PTP_DPC_NIKON_E6ManualModeBracketing,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ManualBracketMode,       _put_Nikon_ManualBracketMode },
-	{ N_("Bracket Mode"),                   "bracketmode",              PTP_DPC_CANON_EOS_BracketMode,          PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_INT,                           _put_None /*FIXME*/ },
+	{ N_("Bracket Mode"),                   "bracketmode",              PTP_DPC_CANON_EOS_BracketMode,          PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_BracketMode,             _put_Canon_BracketMode },
 	{ N_("EV Step"),                        "evstep",                   PTP_DPC_NIKON_EVStep,                   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_EVStep,                  _put_Nikon_EVStep },
 	{ N_("Bracket Set"),                    "bracketset",               PTP_DPC_NIKON_BracketSet,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_BracketSet,              _put_Nikon_BracketSet },
 	{ N_("Bracket Order"),                  "bracketorder",             PTP_DPC_NIKON_BracketOrder,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_BracketOrder,            _put_Nikon_BracketOrder },
-	{ N_("Burst Number"),                   "burstnumber",              PTP_DPC_BurstNumber,                    0,                  PTP_DTC_UINT16, _get_BurstNumber,                   _put_BurstNumber },
-	{ N_("Burst Interval"),                 "burstinterval",            PTP_DPC_BurstNumber,                    0,                  PTP_DTC_UINT16, _get_Milliseconds,                  _put_Milliseconds },
+	{ N_("AE Bracketing Step"),             "aebracketingstep",         PTP_DPC_NIKON_AutoExposureBracketStep,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_AEBracketStep,           _put_Nikon_AEBracketStep },
+	{ N_("WB Bracketing Step"),             "wbbracketingstep",         PTP_DPC_NIKON_WhiteBalanceBracketStep,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_WBBracketStep,           _put_Nikon_WBBracketStep },
+	{ N_("AE Bracketing Pattern"),          "aebracketingpattern",      PTP_DPC_NIKON_AutoExposureBracketProgram,PTP_VENDOR_NIKON,	PTP_DTC_UINT8,  _get_Nikon_BracketPattern,          _put_Nikon_BracketPattern },
+	{ N_("WB Bracketing Pattern"),          "wbbracketingpattern",      PTP_DPC_NIKON_WhiteBalanceBracketProgram,PTP_VENDOR_NIKON,	PTP_DTC_UINT8,  _get_Nikon_BracketPattern,          _put_Nikon_BracketPattern },
+	{ N_("AE Bracketing Count"),            "aebracketingcount",        PTP_DPC_NIKON_AutoExposureBracketCount, PTP_VENDOR_NIKON,	PTP_DTC_UINT8,  _get_INT,          		    _put_None },
+	{ N_("ADL Bracketing Pattern"),         "adlbracketingpattern",     PTP_DPC_NIKON_ADLBracketingPattern,	    PTP_VENDOR_NIKON,	PTP_DTC_UINT8,  _get_Nikon_ADLBracketPattern,       _put_Nikon_ADLBracketPattern },
+	{ N_("ADL Bracketing Step"),            "adlbracketingstep",        PTP_DPC_NIKON_ADLBracketingStep,	    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ADLBracketStep,          _put_Nikon_ADLBracketStep },
+	{ N_("WB Preset Comment 1"),		"wbpresetcomment1",	    PTP_DPC_NIKON_WhiteBalancePresetName1,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("WB Preset Comment 2"),		"wbpresetcomment2",	    PTP_DPC_NIKON_WhiteBalancePresetName2,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("WB Preset Comment 3"),		"wbpresetcomment3",	    PTP_DPC_NIKON_WhiteBalancePresetName3,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("WB Preset Comment 4"),		"wbpresetcomment4",	    PTP_DPC_NIKON_WhiteBalancePresetName4,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("WB Preset Comment 5"),		"wbpresetcomment5",	    PTP_DPC_NIKON_WhiteBalancePresetName5,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("WB Preset Comment 6"),		"wbpresetcomment6",	    PTP_DPC_NIKON_WhiteBalancePresetName6,  PTP_VENDOR_NIKON,   PTP_DTC_STR,	_get_STR,          		    _put_STR },
+	{ N_("Burst Number"),                   "burstnumber",              PTP_DPC_BurstNumber,                    0,                  PTP_DTC_UINT16, _get_INT,                           _put_INT },
+	{ N_("Burst Interval"),                 "burstinterval",            PTP_DPC_BurstInterval,                  0,                  PTP_DTC_UINT16, _get_Milliseconds,                  _put_Milliseconds },
 	{ N_("Maximum Shots"),                  "maximumshots",             PTP_DPC_NIKON_MaximumShots,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_INT,                           _put_None },
 
 	/* Newer Nikons have UINT8 ranges */
@@ -7373,6 +11082,7 @@
 	{ N_("Flash White Balance Bias"),       "flashwhitebias",           PTP_DPC_NIKON_WhiteBalanceFlashBias,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_UWBBias,                 _put_Nikon_UWBBias },
 	{ N_("Cloudy White Balance Bias"),      "cloudywhitebias",          PTP_DPC_NIKON_WhiteBalanceCloudyBias,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_UWBBias,                 _put_Nikon_UWBBias },
 	{ N_("Shady White Balance Bias"),       "shadewhitebias",           PTP_DPC_NIKON_WhiteBalanceShadeBias,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_UWBBias,                 _put_Nikon_UWBBias },
+	{ N_("Natural light auto White Balance Bias"),	"naturallightautowhitebias",	PTP_DPC_NIKON_WhiteBalanceNaturalLightAutoBias,    PTP_VENDOR_NIKON,   PTP_DTC_UINT16,  _get_Nikon_UWBBias,	_put_Nikon_UWBBias },
 	/* older Nikons have INT8 ranges */
 	{ N_("Auto White Balance Bias"),        "autowhitebias",            PTP_DPC_NIKON_WhiteBalanceAutoBias,     PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_WBBias,                  _put_Nikon_WBBias },
 	{ N_("Tungsten White Balance Bias"),    "tungstenwhitebias",        PTP_DPC_NIKON_WhiteBalanceTungstenBias, PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_WBBias,                  _put_Nikon_WBBias },
@@ -7394,21 +11104,25 @@
 	{ N_("Remote Timeout"),                 "remotetimeout",            PTP_DPC_NIKON_RemoteTimeout,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_RemoteTimeout,           _put_Nikon_RemoteTimeout },
 	{ N_("Remote Mode"),                    "remotemode",               PTP_DPC_NIKON_RemoteMode,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_RemoteMode,              _put_Nikon_RemoteMode },
 	{ N_("Application Mode"),               "applicationmode",          PTP_DPC_NIKON_ApplicationMode,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ApplicationMode,         _put_Nikon_ApplicationMode },
+	{ N_("Application Mode"),               "applicationmode",          PTP_OC_NIKON_ChangeApplicationMode,     PTP_VENDOR_NIKON,   0,              _get_Nikon_ApplicationMode2,        _put_Nikon_ApplicationMode2 },
 	{ N_("Optimize Image"),                 "optimizeimage",            PTP_DPC_NIKON_OptimizeImage,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OptimizeImage,           _put_Nikon_OptimizeImage },
 	{ N_("Sharpening"),                     "sharpening",               PTP_DPC_NIKON_ImageSharpening,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_Sharpening,              _put_Nikon_Sharpening },
 	{ N_("Tone Compensation"),              "tonecompensation",         PTP_DPC_NIKON_ToneCompensation,         PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ToneCompensation,        _put_Nikon_ToneCompensation },
 	{ N_("Saturation"),                     "saturation",               PTP_DPC_NIKON_Saturation,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_Saturation,              _put_Nikon_Saturation },
 	{ N_("Hue Adjustment"),                 "hueadjustment",            PTP_DPC_NIKON_HueAdjustment,            PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_HueAdjustment,           _put_Nikon_HueAdjustment },
 	{ N_("Auto Exposure Bracketing"),       "aeb",                      PTP_DPC_CANON_EOS_AEB,                  PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_AEB,                 _put_Canon_EOS_AEB },
-#if 0
 	{ N_("Auto Lighting Optimization"),     "alomode",                  PTP_DPC_CANON_EOS_AloMode,              PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_AloMode,             _put_Canon_EOS_AloMode },
-#endif
 	{ N_("Movie Sound"),                    "moviesound",               PTP_DPC_NIKON_MovVoice,                 PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
 	{ N_("Manual Movie Setting"),           "manualmoviesetting",       PTP_DPC_NIKON_ManualMovieSetting,       PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 	{ N_("Microphone"),                     "microphone",               PTP_DPC_NIKON_MovMicrophone,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_Microphone,              _put_Nikon_Microphone },
 	{ N_("Reverse Indicators"),             "reverseindicators",        PTP_DPC_NIKON_IndicatorDisp,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
-	{ N_("Auto Distortion Control"),        "autodistortioncontrol",    PTP_DPC_NIKON_AutoDistortionControl,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,             _put_Nikon_OffOn_UINT8 },
+	{ N_("Auto Distortion Control"),        "autodistortioncontrol",    PTP_DPC_NIKON_AutoDistortionControl,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
+	{ N_("Vignette Correction"),            "vignettecorrection",       PTP_DPC_NIKON_VignetteCtrl,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_VignetteCorrection,      _put_Nikon_VignetteCorrection },
 	{ N_("Video Mode"),                     "videomode",                PTP_DPC_NIKON_VideoMode,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_VideoMode,               _put_Nikon_VideoMode },
+	{ N_("Sensor Crop"),                    "sensorcrop",               PTP_DPC_SONY_SensorCrop,                PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_SensorCrop,               _put_Sony_SensorCrop },
+	{ N_("HDMI Output Data Depth"),         "hdmioutputdatadepth",      PTP_DPC_NIKON_HDMIOutputDataDepth,      PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_HDMIDataDepth,           _put_Nikon_HDMIDataDepth },
+	{ N_("Face Detection"),                 "facedetection",            PTP_DPC_NIKON_FaceDetection,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_FaceDetection,           _put_Nikon_FaceDetection },
+	{ N_("Movie Servo AF"),                 "movieservoaf",             PTP_DPC_CANON_EOS_MovieServoAF,         PTP_VENDOR_CANON,   PTP_DTC_UINT32, _get_Canon_EOS_MovieServoAF,        _put_Canon_EOS_MovieServoAF },
 
 	{ 0,0,0,0,0,0,0 },
 };
@@ -7449,6 +11163,50 @@
 	{ 0,0,0,0,0,0,0 },
 };
 
+static struct submenu nikon_d850_capture_settings = {
+	{ N_("Image Quality"),          	"imagequality",			PTP_DPC_CompressionSetting,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D850_Compression,       _put_Nikon_D850_Compression },
+	{ N_("Image Rotation Flag"),            "imagerotationflag",    PTP_DPC_NIKON_ImageRotation,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OffOn_UINT8,            _put_Nikon_OffOn_UINT8 },
+	{ N_("Active D-Lighting"),              "dlighting",            PTP_DPC_NIKON_ActiveDLighting,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,   _get_Nikon_D850_ActiveDLighting,   _put_Nikon_D850_ActiveDLighting },
+	{ N_("Continuous Shooting Speed Slow"), "shootingspeed",        PTP_DPC_NIKON_D1ShootingSpeed,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D850_ShootingSpeed,     _put_Nikon_D850_ShootingSpeed },
+	{ N_("Movie Resolution"),               "moviequality",         PTP_DPC_NIKON_MovScreenSize,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D850_MovieQuality,      _put_Nikon_D850_MovieQuality },
+	{ N_("Center Weight Area"),             "centerweightsize",     PTP_DPC_NIKON_CenterWeightArea, PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D850_CenterWeight,      _put_Nikon_D850_CenterWeight },
+	{ N_("Focus Metering Mode"),            "focusmetermode",       PTP_DPC_FocusMeteringMode,	PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_Nikon_D850_FocusMetering,     _put_Nikon_D850_FocusMetering },
+	{ 0,0,0,0,0,0,0 },
+};
+
+static struct submenu nikon_d7500_capture_settings = {
+	{ N_("Image Quality"), "imagequality", PTP_DPC_CompressionSetting, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_D7500_Compression, _put_Nikon_D7500_Compression },
+	{ 0,0,0,0,0,0,0 },
+};
+
+/* D780 has the same list as the D7500 */
+static struct submenu nikon_d780_capture_settings = {
+	{ N_("Image Quality"), "imagequality", PTP_DPC_CompressionSetting, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_D7500_Compression, _put_Nikon_D7500_Compression },
+	{ 0,0,0,0,0,0,0 },
+};
+
+/* D500 has the same list as the D850 */
+static struct submenu nikon_d500_capture_settings = {
+	{ N_("Image Quality"), "imagequality", PTP_DPC_CompressionSetting, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_D850_Compression, _put_Nikon_D850_Compression },
+	{ 0,0,0,0,0,0,0 },
+};
+
+/* D5000...
+ * compression is same as D90
+ */
+static struct submenu nikon_d5000_capture_settings = {
+	{ N_("Image Quality"),                  "imagequality",         PTP_DPC_CompressionSetting,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_Compression,     _put_Nikon_D90_Compression },
+	{ N_("Live View Image Zoom Ratio"),     "liveviewimagezoomratio",   PTP_DPC_NIKON_LiveViewImageZoomRatio,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewImageZoomRatio_D5000,  _put_Nikon_LiveViewImageZoomRatio_D5000 },
+	{ 0,0,0,0,0,0,0 },
+};
+
+static struct submenu nikon_z6_capture_settings = {
+	{ N_("Image Quality"),          	"imagequality",		PTP_DPC_CompressionSetting,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D850_Compression,	_put_Nikon_D850_Compression },
+	{ N_("Focus Metering Mode"),            "focusmetermode",       PTP_DPC_FocusMeteringMode,	PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_Nikon_D850_FocusMetering,	_put_Nikon_D850_FocusMetering },
+	{ N_("Minimum Shutter Speed"),  	"minimumshutterspeed",  PTP_DPC_NIKON_PADVPMode,	PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_Z6_PADVPValue,		_put_Nikon_Z6_PADVPValue },
+	{ 0,0,0,0,0,0,0 },
+};
+
 static struct submenu nikon_d5100_capture_settings = {
 	{ N_("Movie Quality"),          "moviequality",         PTP_DPC_NIKON_MovScreenSize,        0,                  PTP_DTC_UINT8,  _get_Nikon_D5100_MovieQuality,      _put_Nikon_D5100_MovieQuality },
 	{ N_("Exposure Program"),       "expprogram",           PTP_DPC_ExposureProgramMode,        0,                  PTP_DTC_UINT16, _get_NIKON_D5100_ExposureProgram,   _put_NIKON_D5100_ExposureProgram },
@@ -7463,16 +11221,15 @@
 	{ N_("Exposure Program"),               "expprogram",           PTP_DPC_ExposureProgramMode,    0,                  PTP_DTC_UINT16, _get_NIKON_D7100_ExposureProgram,   _put_NIKON_D7100_ExposureProgram },
 	{ N_("Minimum Shutter Speed"),          "minimumshutterspeed",  PTP_DPC_NIKON_PADVPMode,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D7100_PADVPValue,        _put_Nikon_D7100_PADVPValue },
 	{ N_("Continuous Shooting Speed Slow"), "shootingspeed",        PTP_DPC_NIKON_D1ShootingSpeed,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D7100_ShootingSpeed,     _put_Nikon_D7100_ShootingSpeed },
-	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",       PTP_DPC_NIKON_ISOAutoHiLimit,   PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D7100_ISOAutoHiLimit,    _put_Nikon_D7100_ISOAutoHiLimit },
+	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",       PTP_DPC_NIKON_ISOAutoHiLimit,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D7100_ISOAutoHiLimit,    _put_Nikon_D7100_ISOAutoHiLimit },
 	{ N_("Flash Sync. Speed"),              "flashsyncspeed",       PTP_DPC_NIKON_FlashSyncSpeed,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D7100_FlashSyncSpeed,    _put_Nikon_D7100_FlashSyncSpeed },
 	{ N_("Focus Metering"),                 "focusmetering",        PTP_DPC_FocusMeteringMode,      PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D7100_FocusMetering,     _put_Nikon_D7100_FocusMetering },
 	{ 0,0,0,0,0,0,0 },
 };
 static struct submenu nikon_d90_capture_settings = {
 	{ N_("Minimum Shutter Speed"),          "minimumshutterspeed",  PTP_DPC_NIKON_PADVPMode,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_PADVPValue,      _put_Nikon_D90_PADVPValue },
-	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",       PTP_DPC_NIKON_ISOAutoHiLimit,   PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_ISOAutoHiLimit,  _put_Nikon_D90_ISOAutoHiLimit },
-	{ N_("Active D-Lighting"),              "dlighting",            PTP_DPC_NIKON_ActiveDLighting,  PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_ActiveDLighting, _put_Nikon_D90_ActiveDLighting },
-	{ N_("High ISO Noise Reduction"),       "highisonr",            PTP_DPC_NIKON_NrHighISO,        PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_HighISONR,       _put_Nikon_D90_HighISONR },
+	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",       PTP_DPC_NIKON_ISOAutoHiLimit,   PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ISOAutoHiLimit,  _put_Nikon_D90_ISOAutoHiLimit },
+	{ N_("Active D-Lighting"),              "dlighting",            PTP_DPC_NIKON_ActiveDLighting,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ActiveDLighting, _put_Nikon_D90_ActiveDLighting },
 	{ N_("Image Quality"),                  "imagequality",         PTP_DPC_CompressionSetting,     PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_Compression,     _put_Nikon_D90_Compression },
 	{ N_("Continuous Shooting Speed Slow"), "shootingspeed",        PTP_DPC_NIKON_D1ShootingSpeed,  PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ShootingSpeed,   _put_Nikon_D90_ShootingSpeed },
 	{ 0,0,0,0,0,0,0 },
@@ -7481,7 +11238,7 @@
 /* One D3s reporter is Matthias Blaicher */
 static struct submenu nikon_d3s_capture_settings = {
 	{ N_("Minimum Shutter Speed"),          "minimumshutterspeed",      PTP_DPC_NIKON_PADVPMode,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_PADVPValue,              _put_Nikon_D3s_PADVPValue },
-	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",           PTP_DPC_NIKON_ISOAutoHiLimit,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D3s_ISOAutoHiLimit,          _put_Nikon_D3s_ISOAutoHiLimit },
+	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",           PTP_DPC_NIKON_ISOAutoHiLimit,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_ISOAutoHiLimit,          _put_Nikon_D3s_ISOAutoHiLimit },
 	{ N_("Continuous Shooting Speed Slow"), "shootingspeed",            PTP_DPC_NIKON_D1ShootingSpeed,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_ShootingSpeed,           _put_Nikon_D3s_ShootingSpeed },
 	{ N_("Continuous Shooting Speed High"), "shootingspeedhigh",        PTP_DPC_NIKON_ContinuousSpeedHigh,      PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_ShootingSpeedHigh,       _put_Nikon_D3s_ShootingSpeedHigh },
 	{ N_("Flash Sync. Speed"),              "flashsyncspeed",           PTP_DPC_NIKON_FlashSyncSpeed,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_FlashSyncSpeed,          _put_Nikon_D3s_FlashSyncSpeed },
@@ -7497,8 +11254,7 @@
 	{ N_("AF On Button"),                   "afonbutton",               PTP_DPC_NIKON_NormalAFOn,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_NormalAFOn,              _put_Nikon_D3s_NormalAFOn },
 
 	/* same as D90 */
-	{ N_("High ISO Noise Reduction"),       "highisonr",                PTP_DPC_NIKON_NrHighISO,                PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_HighISONR,               _put_Nikon_D90_HighISONR },
-	{ N_("Active D-Lighting"),              "dlighting",                PTP_DPC_NIKON_ActiveDLighting,          PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_ActiveDLighting,         _put_Nikon_D90_ActiveDLighting },
+	{ N_("Active D-Lighting"),              "dlighting",                PTP_DPC_NIKON_ActiveDLighting,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ActiveDLighting,         _put_Nikon_D90_ActiveDLighting },
 
 	{ 0,0,0,0,0,0,0 },
 };
@@ -7506,25 +11262,31 @@
 static struct submenu nikon_generic_capture_settings = {
 	/* filled in with D90 values */
 	{ N_("Minimum Shutter Speed"),          "minimumshutterspeed",      PTP_DPC_NIKON_PADVPMode,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_PADVPValue,          _put_Nikon_D90_PADVPValue },
-	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",           PTP_DPC_NIKON_ISOAutoHiLimit,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_ISOAutoHiLimit,      _put_Nikon_D90_ISOAutoHiLimit },
-	{ N_("Active D-Lighting"),              "dlighting",                PTP_DPC_NIKON_ActiveDLighting,          PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_ActiveDLighting,     _put_Nikon_D90_ActiveDLighting },
-	{ N_("High ISO Noise Reduction"),       "highisonr",                PTP_DPC_NIKON_NrHighISO,                PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_HighISONR,           _put_Nikon_D90_HighISONR },
-	{ N_("Movie High ISO Noise Reduction"), "moviehighisonr",           PTP_DPC_NIKON_MovieNrHighISO,           PTP_VENDOR_NIKON,   PTP_DTC_INT8,   _get_Nikon_D90_HighISONR,           _put_Nikon_D90_HighISONR },
+	{ N_("ISO Auto Hi Limit"),              "isoautohilimit",           PTP_DPC_NIKON_ISOAutoHiLimit,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ISOAutoHiLimit,      _put_Nikon_D90_ISOAutoHiLimit },
+	{ N_("Active D-Lighting"),              "dlighting",                PTP_DPC_NIKON_ActiveDLighting,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ActiveDLighting,     _put_Nikon_D90_ActiveDLighting },
+	{ N_("High ISO Noise Reduction"),       "highisonr",                PTP_DPC_NIKON_NrHighISO,                PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_HighISONR,           _put_Nikon_D90_HighISONR },
+	{ N_("Movie High ISO Noise Reduction"), "moviehighisonr",           PTP_DPC_NIKON_MovieNrHighISO,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_HighISONR,           _put_Nikon_D90_HighISONR },
 	{ N_("Continuous Shooting Speed Slow"), "shootingspeed",            PTP_DPC_NIKON_D1ShootingSpeed,          PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D90_ShootingSpeed,       _put_Nikon_D90_ShootingSpeed },
 	{ N_("Maximum continuous release"),     "maximumcontinousrelease",  PTP_DPC_NIKON_D2MaximumShots,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Range_UINT8,                   _put_Range_UINT8 },
 	{ N_("Movie Quality"),                  "moviequality",             PTP_DPC_NIKON_MovScreenSize,            PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_MovieQuality,            _put_Nikon_MovieQuality },
 	{ N_("Movie Quality"),                  "moviequality",             PTP_DPC_NIKON_1_MovQuality,             PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_MovieQuality,          _put_Nikon_1_MovieQuality },
+	{ N_("Movie Loop Length"),              "movielooplength",          PTP_DPC_NIKON_MovieLoopLength,          PTP_VENDOR_NIKON,   PTP_DTC_UINT32, _get_Nikon_MovieLoopLength,         _put_Nikon_MovieLoopLength },
 	{ N_("High ISO Noise Reduction"),       "highisonr",                PTP_DPC_NIKON_1_HiISONoiseReduction,    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_HighISONR,             _put_Nikon_1_HighISONR },
+	{ N_("Auto ISO"),			"autoiso",		    PTP_DPC_NIKON_ISOAuto,		    PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_OnOff_UINT8,             _put_Nikon_OnOff_UINT8 },
 
 	{ N_("Raw Compression"),                "rawcompression",           PTP_DPC_NIKON_RawCompression,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_RawCompression,          _put_Nikon_RawCompression },
 
 	{ N_("Image Quality 2"),                "imagequality2",            PTP_DPC_NIKON_1_ImageCompression,       PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_1_Compression,           _put_Nikon_1_Compression },
+	{ N_("Image Quality"),                  "imagequality",             PTP_DPC_SONY_QX_CompressionSetting,     PTP_VENDOR_SONY,    PTP_DTC_UINT8,  _get_Sony_QX_Compression,           _put_Sony_QX_Compression },
 
 	/* And some D3s values */
 	{ N_("Continuous Shooting Speed High"), "shootingspeedhigh",        PTP_DPC_NIKON_ContinuousSpeedHigh,      PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_ShootingSpeedHigh,   _put_Nikon_D3s_ShootingSpeedHigh },
 	{ N_("Flash Sync. Speed"),              "flashsyncspeed",           PTP_DPC_NIKON_FlashSyncSpeed,           PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_FlashSyncSpeed,      _put_Nikon_D3s_FlashSyncSpeed },
 	{ N_("Flash Shutter Speed"),            "flashshutterspeed",        PTP_DPC_NIKON_FlashShutterSpeed,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_D3s_FlashShutterSpeed,   _put_Nikon_D3s_FlashShutterSpeed },
 
+	{ N_("Live View Size"),                 "liveviewsize",             PTP_DPC_NIKON_LiveViewImageSize,        PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_LiveViewSize,            _put_Nikon_LiveViewSize },
+	{ N_("Live View Zoom Area"),            "liveviewzoomarea",         PTP_DPC_NIKON_LiveViewZoomArea,         PTP_VENDOR_NIKON,   PTP_DTC_UINT16, _get_INT,                           _put_INT },
+
 	{ 0,0,0,0,0,0,0 },
 };
 
@@ -7544,10 +11306,25 @@
 
 
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0421, nikon_d90_capture_settings,     NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0423, nikon_d5000_capture_settings,   NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x043c, nikon_d500_capture_settings,    NULL,   NULL },
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0426, nikon_d3s_capture_settings,     NULL,   NULL },
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0429, nikon_d5100_capture_settings,   NULL,   NULL },
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0430, nikon_d7100_capture_settings,   NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0440, nikon_d7500_capture_settings,   NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0446, nikon_d780_capture_settings,    NULL,   NULL },
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0414, nikon_d40_capture_settings,     NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0441, nikon_d850_capture_settings,    NULL,   NULL },
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0442, nikon_z6_capture_settings,      NULL,   NULL },	/* Z7 */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0443, nikon_z6_capture_settings,      NULL,   NULL }, /* Z6 */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0444, nikon_z6_capture_settings,      NULL,   NULL }, /* Z50 */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0448, nikon_z6_capture_settings,      NULL,   NULL }, /* Z5 guessed */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x044b, nikon_z6_capture_settings,      NULL,   NULL }, /* Z7_2 guessed */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x044c, nikon_z6_capture_settings,      NULL,   NULL }, /* Z6_2 guessed */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x044f, nikon_z6_capture_settings,      NULL,   NULL }, /* Zfc guessed */
+        { N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0450, nikon_z6_capture_settings,      NULL,   NULL }, /* Z9 */
+        { N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0451, nikon_z6_capture_settings,      NULL,   NULL }, /* Z8 */
+	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0x0452, nikon_z6_capture_settings,      NULL,   NULL }, /* Z30 guessed */
 	{ N_("Capture Settings"),           "capturesettings",  0x4b0,  0,      nikon_generic_capture_settings, NULL,   NULL },
 	{ N_("Capture Settings"),           "capturesettings",  0,      0,      capture_settings_menu,          NULL,   NULL },
 
@@ -7567,7 +11344,8 @@
 	unsigned int	menuno, submenuno;
 	int 		ret;
 	uint16_t	*setprops = NULL;
-	int		i, nrofsetprops = 0;
+	unsigned int	i;
+	int		nrofsetprops = 0;
 	PTPParams	*params = &camera->pl->params;
 	CameraAbilities	ab;
 
@@ -7596,7 +11374,8 @@
 			camera_prepare_capture (camera, context);
 		ptp_check_eos_events (params);
 		/* Otherwise the camera will auto-shutdown */
-		C_PTP (ptp_canon_eos_keepdeviceon (params));
+		if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_KeepDeviceOn))
+			C_PTP (ptp_canon_eos_keepdeviceon (params));
 	}
 
 	if (mode == MODE_GET) {
@@ -7687,11 +11466,19 @@
 						/* array is not compatible to non-array */
 						if (((cursub->type ^ dpd.DataType) & PTP_DTC_ARRAY_MASK) == PTP_DTC_ARRAY_MASK)
 							continue;
+						/* FIXME: continue to search here instead of below? */
 					}
 					ret = cursub->getfunc (camera, &widget, cursub, &dpd);
 					if ((ret == GP_OK) && (dpd.GetSet == PTP_DPGS_Get))
 						gp_widget_set_readonly (widget, 1);
 					ptp_free_devicepropdesc(&dpd);
+
+					if (ret != GP_OK) {
+						/* the type might not have matched, try the next */
+						GP_LOG_E ("Widget get of property '%s' failed, trying to see if we have another...", cursub->label);
+						nrofsetprops--;
+						continue;
+					}
 					if (mode == MODE_SINGLE_GET) {
 						*outwidget = widget;
 						free (setprops);
@@ -7711,6 +11498,9 @@
 
 						GP_LOG_D ("Getting function prop '%s' / 0x%04x", cursub->label, cursub->type );
 						ret = cursub->getfunc (camera, &widget, cursub, NULL);
+						if (ret == GP_OK && cursub->putfunc == _put_None) {
+							gp_widget_set_readonly(widget, 1);
+						}
 						if (mode == MODE_SINGLE_GET) {
 							*outwidget = widget;
 							free (setprops);
@@ -7727,7 +11517,8 @@
 					gp_widget_append (section, widget);
 				continue;
 			}
-			if (have_eos_prop(camera,cursub->vendorid,cursub->propid)) {
+			/* Canon EOS special handling */
+			if (have_eos_prop(params,cursub->vendorid,cursub->propid)) {
 				PTPDevicePropDesc	dpd;
 
 				if ((mode == MODE_SINGLE_GET) && strcmp (cursub->name, confname))
@@ -7745,6 +11536,38 @@
 					GP_LOG_D ("Failed to parse value of property '%s' / 0x%04x: error code %d", cursub->label, cursub->propid, ret);
 					continue;
 				}
+				if (cursub->putfunc == _put_None) {
+					gp_widget_set_readonly(widget, 1);
+				}
+				if (mode == MODE_SINGLE_GET) {
+					*outwidget = widget;
+					free (setprops);
+					return GP_OK;
+				}
+				if (mode == MODE_GET)
+					gp_widget_append (section, widget);
+				continue;
+			}
+			/* Sigma FP special handling */
+			if (have_sigma_prop(params,cursub->vendorid,cursub->propid)) {
+				PTPDevicePropDesc	dpd;
+
+				if ((mode == MODE_SINGLE_GET) && strcmp (cursub->name, confname))
+					continue;
+				if (mode == MODE_LIST) {
+					gp_list_append (list, cursub->name, NULL);
+					continue;
+				}
+				GP_LOG_D ("Getting property '%s' / 0x%04x", cursub->label, cursub->propid );
+				memset(&dpd,0,sizeof(dpd));
+				ret = cursub->getfunc (camera, &widget, cursub, &dpd);
+				if (ret != GP_OK) {
+					GP_LOG_D ("Failed to parse value of property '%s' / 0x%04x: error code %d", cursub->label, cursub->propid, ret);
+					continue;
+				}
+				if (cursub->putfunc == _put_None) {
+					gp_widget_set_readonly(widget, 1);
+				}
 				if (mode == MODE_SINGLE_GET) {
 					*outwidget = widget;
 					free (setprops);
@@ -7844,28 +11667,28 @@
 		case PTP_DPFF_None: break;
 		case PTP_DPFF_Range:
 			switch (dpd.DataType) {
-#define X(dtc,val) 										\
+#define X(dtc,val,vartype,format) 										\
 			case dtc: 								\
 				if (type == GP_WIDGET_RANGE) {					\
 					gp_widget_set_range ( widget, (float) dpd.FORM.Range.MinimumValue.val, (float) dpd.FORM.Range.MaximumValue.val, (float) dpd.FORM.Range.StepSize.val);\
 				} else {							\
-					long k;							\
+					vartype k;							\
 					for (k=dpd.FORM.Range.MinimumValue.val;k<=dpd.FORM.Range.MaximumValue.val;k+=dpd.FORM.Range.StepSize.val) { \
-						sprintf (buf, "%ld", k); 			\
+						sprintf (buf, #format, k); 			\
 						gp_widget_add_choice (widget, buf);		\
 						if (dpd.FORM.Range.StepSize.val == 0) break;	\
 					}							\
 				} 								\
 				break;
 
-		X(PTP_DTC_INT8,i8)
-		X(PTP_DTC_UINT8,u8)
-		X(PTP_DTC_INT16,i16)
-		X(PTP_DTC_UINT16,u16)
-		X(PTP_DTC_INT32,i32)
-		X(PTP_DTC_UINT32,u32)
-		X(PTP_DTC_INT64,i64)
-		X(PTP_DTC_UINT64,u64)
+		X(PTP_DTC_INT8,i8,int8_t,%d)
+		X(PTP_DTC_UINT8,u8,uint8_t,%u)
+		X(PTP_DTC_INT16,i16,int16_t,%d)
+		X(PTP_DTC_UINT16,u16,uint16_t,%u)
+		X(PTP_DTC_INT32,i32,int32_t,%d)
+		X(PTP_DTC_UINT32,u32,uint32_t,%u)
+		X(PTP_DTC_INT64,i64,int64_t,%ld)
+		X(PTP_DTC_UINT64,u64,uint64_t,%lu)
 #undef X
 			default:break;
 			}
@@ -7946,7 +11769,7 @@
 		return GP_ERROR_BAD_PARAMETERS;
 	}
 	return GP_OK;
-} 
+}
 
 int
 camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
@@ -8026,6 +11849,7 @@
 		/* Standard menu with submenus */
 		for (submenuno = 0; menusmenuno.submenussubmenuno.label ; submenuno++ ) {
 			struct submenu *cursub = menusmenuno.submenus+submenuno;
+			int alreadyset = 0;
 
 			ret = GP_OK;
 			if (mode == MODE_SET) {
@@ -8065,30 +11889,35 @@
 						/* array is not compatible to non-array */
 						if (((cursub->type ^ dpd.DataType) & PTP_DTC_ARRAY_MASK) == PTP_DTC_ARRAY_MASK)
 							continue;
+						/* FIXME: continue to search here perhaps instead of below? */
 					}
 					if (dpd.GetSet == PTP_DPGS_GetSet) {
-						ret = cursub->putfunc (camera, widget, &propval, &dpd);
+						ret = cursub->putfunc (camera, widget, &propval, &dpd, &alreadyset);
 					} else {
-						gp_context_error (context, _("Sorry, the property '%s' / 0x%04x is currently ready-only."), _(cursub->label), cursub->propid);
+						gp_context_error (context, _("Sorry, the property '%s' / 0x%04x is currently read-only."), _(cursub->label), cursub->propid);
 						ret = GP_ERROR_NOT_SUPPORTED;
 					}
 					if (ret == GP_OK) {
-						ret_ptp = LOG_ON_PTP_E (ptp_generic_setdevicepropvalue (params, cursub->propid, &propval, cursub->type));
-						if (ret_ptp != PTP_RC_OK) {
-							gp_context_error (context, _("The property '%s' / 0x%04x was not set (0x%04x: %s)"),
-									  _(cursub->label), cursub->propid, ret_ptp, _(ptp_strerror(ret_ptp, params->deviceinfo.VendorExtensionID)));
-							ret = translate_ptp_result (ret_ptp);
+						if (!alreadyset) {
+							ret_ptp = LOG_ON_PTP_E (ptp_generic_setdevicepropvalue (params, cursub->propid, &propval, cursub->type));
+							if (ret_ptp != PTP_RC_OK) {
+								gp_context_error (context, _("The property '%s' / 0x%04x was not set (0x%04x: %s)"),
+										  _(cursub->label), cursub->propid, ret_ptp, _(ptp_strerror(ret_ptp, params->deviceinfo.VendorExtensionID)));
+								ret = translate_ptp_result (ret_ptp);
+							}
 						}
 						ptp_free_devicepropvalue (cursub->type, &propval);
 					}
 					ptp_free_devicepropdesc(&dpd);
+					if (ret != GP_OK) continue; /* see if we have another match */
 				} else {
-					ret = cursub->putfunc (camera, widget, NULL, NULL);
+					ret = cursub->putfunc (camera, widget, NULL, NULL, NULL);
 				}
 				if (mode == MODE_SINGLE_SET)
-					return GP_OK;
+					return ret;
 			}
-			if (have_eos_prop(camera,cursub->vendorid,cursub->propid)) {
+			/* Canon EOS special handling */
+			if (have_eos_prop(params,cursub->vendorid,cursub->propid)) {
 				PTPDevicePropDesc	dpd;
 
 				if ((mode == MODE_SINGLE_SET) && strcmp (confname, cursub->name))
@@ -8098,13 +11927,15 @@
 					GP_LOG_D ("Setting property '%s' / 0x%04x", cursub->label, cursub->propid);
 					memset(&dpd,0,sizeof(dpd));
 					ptp_canon_eos_getdevicepropdesc (params,cursub->propid, &dpd);
-					ret = cursub->putfunc (camera, widget, &propval, &dpd);
+					ret = cursub->putfunc (camera, widget, &propval, &dpd, &alreadyset);
 					if (ret == GP_OK) {
-						ret_ptp = LOG_ON_PTP_E (ptp_canon_eos_setdevicepropvalue (params, cursub->propid, &propval, cursub->type));
-						if (ret_ptp != PTP_RC_OK) {
-							gp_context_error (context, _("The property '%s' / 0x%04x was not set (0x%04x: %s)."),
-									  _(cursub->label), cursub->propid, ret_ptp, _(ptp_strerror(ret_ptp, params->deviceinfo.VendorExtensionID)));
-							ret = translate_ptp_result (ret_ptp);
+						if (!alreadyset) {
+							ret_ptp = LOG_ON_PTP_E (ptp_canon_eos_setdevicepropvalue (params, cursub->propid, &propval, cursub->type));
+							if (ret_ptp != PTP_RC_OK) {
+								gp_context_error (context, _("The property '%s' / 0x%04x was not set (0x%04x: %s)."),
+										  _(cursub->label), cursub->propid, ret_ptp, _(ptp_strerror(ret_ptp, params->deviceinfo.VendorExtensionID)));
+								ret = translate_ptp_result (ret_ptp);
+							}
 						}
 						ptp_free_devicepropvalue(cursub->type, &propval);
 					} else
@@ -8112,10 +11943,31 @@
 					ptp_free_devicepropdesc(&dpd);
 				} else {
 					GP_LOG_D ("Setting virtual property '%s' / 0x%04x", cursub->label, cursub->propid);
-					ret = cursub->putfunc (camera, widget, &propval, &dpd);
+					/* if it is a OPC, check for its presence. Otherwise just use the widget. */
+					if (	((cursub->type & 0x7000) != 0x1000) ||
+						 ptp_operation_issupported(params, cursub->type)
+					)
+						ret = cursub->putfunc (camera, widget, &propval, &dpd, &alreadyset);
+					else
+						continue;
 				}
 				if (mode == MODE_SINGLE_SET)
-					return GP_OK;
+					return ret;
+			}
+			/* Sigma FP special handling */
+			if (have_sigma_prop(params,cursub->vendorid,cursub->propid)) {
+				PTPDevicePropDesc	dpd; /* fake, unused here for now */
+
+				if ((mode == MODE_SINGLE_SET) && strcmp (confname, cursub->name))
+					continue;
+				gp_widget_set_changed (widget, FALSE); /* clear flag */
+				GP_LOG_D ("Setting property '%s' / 0x%04x", cursub->label, cursub->propid);
+				memset(&dpd,0,sizeof(dpd));
+				ret = cursub->putfunc (camera, widget, &propval, &dpd, &alreadyset);
+				if (ret != GP_OK)
+					gp_context_error (context, _("Parsing the value of widget '%s' / 0x%04x failed with %d."), _(cursub->label), cursub->propid, ret);
+				if (mode == MODE_SINGLE_SET)
+					return ret;
 			}
 			if (ret != GP_OK)
 				return ret;
@@ -8160,7 +12012,7 @@
 		if (ret != PTP_RC_OK)
 			continue;
 		if (dpd.GetSet != PTP_DPGS_GetSet) {
-			gp_context_error (context, _("Sorry, the property '%s' / 0x%04x is currently ready-only."), _(label), propid);
+			gp_context_error (context, _("Sorry, the property '%s' / 0x%04x is currently read-only."), _(label), propid);
 			return GP_ERROR_NOT_SUPPORTED;
 		}
 
@@ -8229,3 +12081,230 @@
 {
 	return _set_config (camera, confname, widget, context);
 }
+
+int
+camera_lookup_by_property(Camera *camera, PTPDevicePropDesc *dpd, char **name, char **content, GPContext *context)
+{
+	unsigned int	menuno, submenuno;
+	int 		ret;
+	PTPParams	*params = &camera->pl->params;
+	CameraAbilities	ab;
+	uint16_t	propid = dpd->DevicePropertyCode;
+	CameraWidget	*widget;
+
+	*name = NULL;
+	*content = NULL;
+
+	SET_CONTEXT(camera, context);
+
+	memset (&ab, 0, sizeof(ab));
+	gp_camera_get_abilities (camera, &ab);
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
+		(ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) ||
+		 ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn)
+		)
+	) {
+		if (!params->eos_captureenabled)
+			camera_prepare_capture (camera, context);
+		ptp_check_eos_events (params);
+		/* Otherwise the camera will auto-shutdown */
+		if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_KeepDeviceOn))
+			C_PTP (ptp_canon_eos_keepdeviceon (params));
+	}
+
+	for (menuno = 0; menuno < sizeof(menus)/sizeof(menus0) ; menuno++ ) {
+		if (!menusmenuno.submenus) { /* Custom menu ... not exposed to by-property method */
+			continue;
+		}
+		if ((menusmenuno.usb_vendorid != 0) && (ab.port == GP_PORT_USB)) {
+			if (menusmenuno.usb_vendorid != ab.usb_vendor)
+				continue;
+			if (	menusmenuno.usb_productid &&
+				(menusmenuno.usb_productid != ab.usb_product)
+			)
+				continue;
+			GP_LOG_D ("usb vendor/product specific path entered");
+		}
+
+		for (submenuno = 0; menusmenuno.submenussubmenuno.name ; submenuno++ ) {
+			struct submenu		*cursub = menusmenuno.submenus+submenuno;
+			CameraWidgetType	type;
+
+			widget = NULL;
+
+			if (	(cursub->propid == propid) &&
+				have_prop(camera,cursub->vendorid,cursub->propid)
+			) {
+
+				/* ok, looking good */
+				if (	((cursub->propid & 0x7000) == 0x5000) ||
+					(NIKON_1(params) && ((cursub->propid & 0xf000) == 0xf000))
+				) {
+					GP_LOG_D ("Getting table based PTP property '%s' / 0x%04x", cursub->label, cursub->propid );
+					if (cursub->type != dpd->DataType) {
+						GP_LOG_E ("Type of property '%s' expected: 0x%04x got: 0x%04x", cursub->label, cursub->type, dpd->DataType );
+						/* str is incompatible to all others */
+						if ((PTP_DTC_STR == cursub->type) || (PTP_DTC_STR == dpd->DataType))
+							continue;
+						/* array is not compatible to non-array */
+						if (((cursub->type ^ dpd->DataType) & PTP_DTC_ARRAY_MASK) == PTP_DTC_ARRAY_MASK)
+							continue;
+						/* FIXME: continue to search here instead of below? */
+						continue;
+					}
+					ret = cursub->getfunc (camera, &widget, cursub, dpd);
+
+					if (ret != GP_OK) {
+						/* the type might not have matched, try the next */
+						GP_LOG_E ("Widget get of property '%s' failed, trying to see if we have another...", cursub->label);
+						continue;
+					}
+					CR (gp_widget_get_name (widget, (const char**)name));
+					*name = strdup(*name?*name:"<null>");
+					CR (gp_widget_get_type (widget, &type));
+					switch (type) {
+					case GP_WIDGET_RADIO:
+					case GP_WIDGET_MENU:
+					case GP_WIDGET_TEXT: {
+						char *val;
+						CR (gp_widget_get_value (widget, &val));
+						*content = strdup(val?val:"<null>");
+						break;
+					}
+					case GP_WIDGET_RANGE: {
+						char buf20;
+						float fval;
+						CR (gp_widget_get_value (widget, &fval));
+						sprintf(buf,"%f",fval);
+						*content = strdup(buf);
+						break;
+					}
+					default:
+						*content = strdup("Unhandled type");
+						/* FIXME: decode value ... ? date? toggle? */
+						break;
+					}
+					gp_widget_free (widget);
+					return GP_OK;
+				}
+				continue;
+			}
+			/* Canon EOS special handling */
+			if (	(cursub->propid == propid) &&
+				have_eos_prop(params,cursub->vendorid,cursub->propid)
+			) {
+				GP_LOG_D ("Getting EOS property '%s' / 0x%04x", cursub->label, cursub->propid );
+				ret = cursub->getfunc (camera, &widget, cursub, dpd);
+				if (ret != GP_OK) {
+					GP_LOG_D ("Failed to parse value of property '%s' / 0x%04x: error code %d", cursub->label, cursub->propid, ret);
+					continue;
+				}
+				CR (gp_widget_get_name (widget, (const char**)name));
+				*name = strdup(*name);
+				CR (gp_widget_get_type (widget, &type));
+				switch (type) {
+				case GP_WIDGET_RADIO:
+				case GP_WIDGET_MENU:
+				case GP_WIDGET_TEXT: {
+					char *val;
+					CR (gp_widget_get_value (widget, &val));
+					*content = strdup(val);
+					break;
+				}
+				case GP_WIDGET_RANGE: {
+					char buf20;
+					float fval;
+					CR (gp_widget_get_value (widget, &fval));
+					sprintf(buf,"%f",fval);
+					*content = strdup(buf);
+					break;
+				}
+				default:
+					*content = strdup("Unhandled type");
+					/* FIXME: decode value ... ? date? toggle? */
+					break;
+				}
+				gp_widget_free (widget);
+				return GP_OK;
+			}
+			/* Sigma FP special handling */
+			if (have_sigma_prop(params,cursub->vendorid,cursub->propid) &&
+				(cursub->propid == propid)
+			) {
+				GP_LOG_D ("Getting Sigma property '%s' / 0x%04x", cursub->label, cursub->propid );
+				ret = cursub->getfunc (camera, &widget, cursub, dpd);
+				if (ret != GP_OK) {
+					GP_LOG_D ("Failed to parse value of property '%s' / 0x%04x: error code %d", cursub->label, cursub->propid, ret);
+					continue;
+				}
+				CR (gp_widget_get_name (widget, (const char**)name));
+				*name = strdup(*name);
+				CR (gp_widget_get_type (widget, &type));
+				switch (type) {
+				case GP_WIDGET_RADIO:
+				case GP_WIDGET_MENU:
+				case GP_WIDGET_TEXT: {
+					char *val;
+					CR (gp_widget_get_value (widget, &val));
+					*content = strdup(val?val:"NULL");
+					break;
+				}
+				case GP_WIDGET_RANGE: {
+					char buf20;
+					float fval;
+					CR (gp_widget_get_value (widget, &fval));
+					sprintf(buf,"%f",fval);
+					*content = strdup(buf);
+					break;
+				}
+				default:
+					*content = strdup("Unhandled type");
+					/* FIXME: decode value ... ? date? toggle? */
+					break;
+				}
+				gp_widget_free (widget);
+				return GP_OK;
+			}
+		}
+	}
+
+	if (have_prop(camera, params->deviceinfo.VendorExtensionID, propid)) {
+		char			buf21, *label;
+
+		GP_LOG_D ("Getting generic PTP property 0x%04x", propid );
+		sprintf(buf,"%04x", propid);
+
+		label = (char*)ptp_get_property_description(params, propid);
+		if (!label) {
+			sprintf (buf, N_("PTP Property 0x%04x"), propid);
+			label = buf;
+		}
+		*name = strdup (label);
+		switch (dpd->DataType) {
+#define X(dtc,val,fmt) 							\
+		case dtc:						\
+			sprintf (buf, fmt, dpd->CurrentValue.val);	\
+			*content = strdup (buf);				\
+			return GP_OK;					\
+
+		X(PTP_DTC_INT8,i8,"%d")
+		X(PTP_DTC_UINT8,u8,"%d")
+		X(PTP_DTC_INT16,i16,"%d")
+		X(PTP_DTC_UINT16,u16,"%d")
+		X(PTP_DTC_INT32,i32,"%d")
+		X(PTP_DTC_UINT32,u32,"%d")
+		X(PTP_DTC_INT64,i64,"%ld")
+		X(PTP_DTC_UINT64,u64,"%ld")
+#undef X
+		case PTP_DTC_STR:
+			*content = strdup (dpd->CurrentValue.str?dpd->CurrentValue.str:"<null>");
+			return GP_OK;
+		default:
+			sprintf(buf, "Unknown type 0x%04x", dpd->DataType);
+			*content = strdup (buf);
+			return GP_OK;
+		}
+	}
+	/* not found */
+	return GP_ERROR_BAD_PARAMETERS;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/device-flags.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/device-flags.h Changed

@@ -80,11 +80,11 @@
  * (64 bytes).
  *
  * This behaviour is most probably a workaround due to the fact
- * that the hardware USB slave controller in the device cannot
- * handle zero writes at all, and the usage of the USB 1.1
- * endpoint size is due to the fact that the device will "gear
- * down" on a USB 1.1 hub, and since 64 bytes is a multiple of
- * 512 bytes, it will work with USB 1.1 and USB 2.0 alike.
+ * that the USB controller in the device cannot handle zero writes
+ * at all, and the usage of the USB 1.1 endpoint size is due to the
+ * fact that the device will "gear down" on a USB 1.1 hub, and since
+ * 64 bytes is a multiple of 512 bytes, it will work with USB 1.1 and
+ * USB 2.0 alike.
  */
 #define DEVICE_FLAG_NO_ZERO_READS 0x00000008
 /**
@@ -171,7 +171,7 @@
  */
 #define DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR 0x00000800
 /**
- * Samsung has implimented its own playlist format as a .spl file
+ * Samsung has implemented its own playlist format as a .spl file
  * stored in the normal file system, rather than a proper mtp
  * playlist. There are multiple versions of the .spl format
  * identified by a line in the file: VERSION X.XX
@@ -179,7 +179,7 @@
  */
 #define DEVICE_FLAG_PLAYLIST_SPL_V1 0x00001000
 /**
- * Samsung has implimented its own playlist format as a .spl file
+ * Samsung has implemented its own playlist format as a .spl file
  * stored in the normal file system, rather than a proper mtp
  * playlist. There are multiple versions of the .spl format
  * identified by a line in the file: VERSION X.XX
@@ -275,11 +275,10 @@
  */
 #define DEVICE_FLAG_FORCE_RESET_ON_CLOSE	0x10000000
 /**
- * Early Creative Zen (etc) models actually only support
- * command 9805 (Get object property list) and will hang
- * if you try to get individual properties of an object.
+ * On 2016 EOS cameras, do not close the session on exiting,
+ * as the device will only report ptp errors afterwards.
  */
-#define DEVICE_FLAG_BROKEN_GET_OBJECT_PROPVAL	0x20000000
+#define DEVICE_FLAG_DONT_CLOSE_SESSION          0x20000000
 /**
  * It seems that some devices return an bad data when
  * using the GetObjectInfo operation. So in these cases
@@ -291,12 +290,15 @@
  * 32 bit.
  */
 #define DEVICE_FLAG_PROPLIST_OVERRIDES_OI	0x40000000
-
 /**
- * On 2016 EOS cameras, do not close the session on exiting,
- * as the device will only report ptp errors afterwards.
+ * The MTP stack of Samsung Galaxy devices has a mysterious bug in
+ * GetPartialObject. When GetPartialObject is invoked to read the last
+ * bytes of a file and the amount of data to read is such that the
+ * last USB packet sent in the reply matches exactly the USB 2.0
+ * packet size, then the Samsung Galaxy device hangs, resulting in a
+ * timeout error.
  */
-#define DEVICE_FLAG_DONT_CLOSE_SESSION		0x80000000
+#define DEVICE_FLAG_SAMSUNG_OFFSET_BUG		0x80000000
 
 /**
  * All these bug flags need to be set on SONY NWZ Walkman
@@ -307,7 +309,7 @@
   (DEVICE_FLAG_UNLOAD_DRIVER | \
    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | \
    DEVICE_FLAG_UNIQUE_FILENAMES | \
-   DEVICE_FLAG_FORCE_RESET_ON_CLOSE )
+   DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
 /**
  * All these bug flags need to be set on Android devices,
  * they claim to support MTP operations they actually
@@ -320,7 +322,8 @@
    DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | \
    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
    DEVICE_FLAG_UNLOAD_DRIVER | \
-   DEVICE_FLAG_LONG_TIMEOUT )
+   DEVICE_FLAG_LONG_TIMEOUT | \
+   DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
 /**
  * All these bug flags appear on a number of SonyEricsson
  * devices including Android devices not using the stock
@@ -338,4 +341,4 @@
 #define DEVICE_FLAGS_ARICENT_BUGS \
   (DEVICE_FLAG_IGNORE_HEADER_ERRORS | \
    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
-   DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST )
+   DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST)

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/fujiptpip.c Added

@@ -0,0 +1,1014 @@
+/* fujiptpip.c
+ *
+ * Copyright (C) 2020 Marcus Meissner <marcus@jet.franken.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+/*
+ * This is a copy of ptpip.c...
+ *
+ * This is working, but might be buggy.
+ *
+ * Only the setup packet is similar to PTP/IP.
+ * The rest speaks a protocol very like to the USB Bulk protocol.
+ *
+ * <32bit length> <16 bit transfertype> <16 bit code> <32bit transaction id> <...data...>
+ *
+ *
+ * transfertype as usual:
+ * - 1: send command (with optional parameters)
+ * - 2: send data (data follows transid)
+ * - 3: response (and optional parameters)
+ * - 4: event (over event pipe)
+ *
+ * For JPEG pipe, also <length> <data...> blobs are sent. There is a 14 byte blob in front of the FF D8 start.
+ *
+ * There are 3 TCP pipes:
+ * - command pipe , port 55740
+ * - event pipe , port 55741 (camera remote port starts listen when you run "InitiateOpenCapture")
+ * - jpeg pipe , port 55742 (camera remote port starts listen when you run "InitiateOpenCapture")
+ */
+#define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+#include <errno.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
+#include "ptpip-private.h"
+
+#include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-setting.h>
+
+#include "libgphoto2/i18n.h"
+
+#include "ptp.h"
+#include "ptp-private.h"
+
+#define PTPIP_VERSION_MAJOR 0x0001
+#define PTPIP_VERSION_MINOR 0x0000
+
+#include "ptp.h"
+#include "ptp-bugs.h"
+
+#include "ptp-pack.c"
+
+#define fujiptpip_len		0
+#define fujiptpip_type		4	/* not always present */
+
+#define fujiptpip_cmd_dataphase	4
+#define fujiptpip_cmd_code	6
+#define fujiptpip_cmd_transid	8
+#define fujiptpip_cmd_param1	12
+#define fujiptpip_cmd_param2	16
+#define fujiptpip_cmd_param3	20
+#define fujiptpip_cmd_param4	24
+#define fujiptpip_cmd_param5	28
+
+#define PTP_EVENT_CHECK			0x0000	/* waits for */
+#define PTP_EVENT_CHECK_FAST		0x0001	/* checks */
+static uint16_t ptp_fujiptpip_check_event (PTPParams* params);
+static uint16_t ptp_fujiptpip_event (PTPParams* params, PTPContainer* event, int wait);
+
+/* send / receive functions */
+uint16_t
+ptp_fujiptpip_sendreq (PTPParams* params, PTPContainer* req, int dataphase)
+{
+	int		ret;
+	int		len = fujiptpip_cmd_param1 +req->Nparam*4;
+	unsigned char 	*request = malloc(len);
+
+	switch (req->Nparam) {
+	default:
+	case 0: GP_LOG_D ("Sending PTP_OC 0x%0x (%s) request...", req->Code, ptp_get_opcode_name(params, req->Code));
+		break;
+	case 1: GP_LOG_D ("Sending PTP_OC 0x%0x (%s) (0x%x) request...", req->Code, ptp_get_opcode_name(params, req->Code), req->Param1);
+		break;
+	case 2: GP_LOG_D ("Sending PTP_OC 0x%0x (%s) (0x%x,0x%x) request...", req->Code, ptp_get_opcode_name(params, req->Code), req->Param1, req->Param2);
+		break;
+	case 3: GP_LOG_D ("Sending PTP_OC 0x%0x (%s) (0x%x,0x%x,0x%x) request...", req->Code, ptp_get_opcode_name(params, req->Code), req->Param1, req->Param2, req->Param3);
+		break;
+	}
+
+	ptp_fujiptpip_check_event (params);
+
+	/*htod32a(&requestptpip_type,PTPIP_CMD_REQUEST);*/
+	htod32a(&requestfujiptpip_len,len);
+	/* sending data = 2, receiving data or no data = 1 */
+	/*if ((dataphase&PTP_DP_DATA_MASK) == PTP_DP_SENDDATA)
+		htod16a(&requestfujiptpip_cmd_dataphase,2);
+	else*/
+		htod16a(&requestfujiptpip_cmd_dataphase,1);
+	htod16a(&requestfujiptpip_cmd_code,req->Code);
+	htod32a(&requestfujiptpip_cmd_transid,req->Transaction_ID);
+
+	switch (req->Nparam) {
+	case 5: htod32a(&requestfujiptpip_cmd_param5,req->Param5);/* fallthrough */
+	case 4: htod32a(&requestfujiptpip_cmd_param4,req->Param4);/* fallthrough */
+	case 3: htod32a(&requestfujiptpip_cmd_param3,req->Param3);/* fallthrough */
+	case 2: htod32a(&requestfujiptpip_cmd_param2,req->Param2);/* fallthrough */
+	case 1: htod32a(&requestfujiptpip_cmd_param1,req->Param1);/* fallthrough */
+	case 0:
+	default:
+		break;
+	}
+	GP_LOG_DATA ( (char*)request, len, "ptpip/oprequest data:");
+	ret = ptpip_write_with_timeout (params->cmdfd, request, len, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+	free (request);
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror ("sendreq/write to cmdfd");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
+	}
+	if (ret != len) {
+		GP_LOG_E ("ptp_fujiptpip_sendreq() len =%d but ret=%d", len, ret);
+		return PTP_RC_OK;
+	}
+	return PTP_RC_OK;
+}
+
+static uint16_t
+ptp_fujiptpip_generic_read (PTPParams *params, int fd, PTPIPHeader *hdr, unsigned char**data, int withtype) {
+	int	ret, len, curread;
+	unsigned char *xhdr;
+	unsigned int hdrlen;
+
+	xhdr = (unsigned char*)hdr; curread = 0;
+	hdrlen = len = sizeof (PTPIPHeader);
+	if (!withtype)
+		hdrlen = len = sizeof(uint32_t);
+
+	while (curread < len) {
+		ret = ptpip_read_with_timeout (fd, xhdr + curread, len - curread, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+		if (ret == PTPSOCK_ERR) {
+			ptpip_perror ("read fujiptpip generic");
+			if (ptpip_get_socket_error() == ETIMEDOUT)
+				return PTP_ERROR_TIMEOUT;
+			return PTP_ERROR_IO;
+		}
+		GP_LOG_DATA ((char*)xhdr+curread, ret, "ptpip/generic_read header:");
+		curread += ret;
+		if (ret == 0) {
+			GP_LOG_E ("End of stream after reading %d bytes of ptpipheader", curread);
+			return PTP_RC_GeneralError;
+		}
+	}
+	len = dtoh32 (hdr->length) - hdrlen;
+	if (len < 0) {
+		GP_LOG_E ("len < 0, %d?", len);
+		return PTP_RC_GeneralError;
+	}
+	*data = malloc (len);
+	if (!*data) {
+		GP_LOG_E ("malloc failed.");
+		return PTP_RC_GeneralError;
+	}
+	curread = 0;
+	while (curread < len) {
+		ret = ptpip_read_with_timeout (fd, (*data)+curread, len-curread, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+		if (ret == PTPSOCK_ERR) {
+			GP_LOG_E ("error %d in reading PTPIP data", ptpip_get_socket_error());
+			free (*data);*data = NULL;
+			if (ptpip_get_socket_error() == ETIMEDOUT)
+				return PTP_ERROR_TIMEOUT;
+			return PTP_ERROR_IO;
+		} else {
+			GP_LOG_DATA ((char*)((*data)+curread), ret, "ptpip/generic_read data:");
+		}
+		if (ret == 0)
+			break;
+		curread += ret;
+	}
+	if (curread != len) {
+		GP_LOG_E ("read PTPIP data, ret %d vs len %d", ret, len);
+		free (*data);*data = NULL;
+		return PTP_RC_GeneralError;
+	}
+	return PTP_RC_OK;
+}
+
+static uint16_t
+ptp_fujiptpip_cmd_read (PTPParams* params, PTPIPHeader *hdr, unsigned char** data) {
+	ptp_fujiptpip_check_event (params);
+	return ptp_fujiptpip_generic_read (params, params->cmdfd, hdr, data, 0);
+}
+
+static uint16_t
+ptp_fujiptpip_evt_read (PTPParams* params, PTPIPHeader *hdr, unsigned char** data) {
+	return ptp_fujiptpip_generic_read (params, params->evtfd, hdr, data, 0);
+}
+
+static uint16_t
+ptp_fujiptpip_jpg_read (PTPParams* params, PTPIPHeader *hdr, unsigned char** data) {
+	return ptp_fujiptpip_generic_read (params, params->jpgfd, hdr, data, 0);
+}
+
+static uint16_t
+ptp_fujiptpip_check_event (PTPParams* params) {
+	PTPContainer	event;
+	uint16_t	ret;
+
+	event.Code = 0;
+	ret = ptp_fujiptpip_event (params, &event, PTP_EVENT_CHECK_FAST);
+	if (ret != PTP_RC_OK)
+		return ret;
+	if (event.Code == 0)
+		return ret;
+	return ptp_add_event (params, &event);
+}
+
+#define fujiptpip_data_datatype		4
+#define fujiptpip_data_code		6
+#define fujiptpip_data_transid		8
+#define fujiptpip_data_payload		12
+
+#define WRITE_BLOCKSIZE 65536
+uint16_t
+ptp_fujiptpip_senddata (PTPParams* params, PTPContainer* ptp,
+		uint64_t size, PTPDataHandler *handler
+) {
+	unsigned char	requestfujiptpip_data_payload;
+	unsigned int	curwrite, towrite;
+	int		ret;
+	unsigned char*	xdata;
+
+	GP_LOG_D ("Sending PTP_OC 0x%0x (%s) data...", ptp->Code, ptp_get_opcode_name(params, ptp->Code));
+	//htod32a(&requestptpip_type,PTPIP_START_DATA_PACKET);
+	htod32a(&requestfujiptpip_len,sizeof(request)+size);
+	htod16a(&requestfujiptpip_data_datatype,2);
+	htod16a(&requestfujiptpip_data_code,ptp->Code);
+	htod32a(&requestfujiptpip_data_transid,ptp->Transaction_ID);
+	GP_LOG_DATA ((char*)request, sizeof(request), "ptpip/senddata header:");
+	ret = ptpip_write_with_timeout (params->cmdfd, request, sizeof(request), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror ("sendreq/write to cmdfd");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
+	}
+	if (ret != sizeof(request)) {
+		GP_LOG_E ("ptp_fujiptpip_senddata() len=%d but ret=%d", (int)sizeof(request), ret);
+		return PTP_RC_GeneralError;
+	}
+	xdata = malloc(WRITE_BLOCKSIZE);
+	if (!xdata) return PTP_RC_GeneralError;
+	curwrite = 0;
+	while (curwrite < size) {
+		unsigned long written, towrite2, xtowrite;
+
+		ptp_fujiptpip_check_event (params);
+
+		towrite = size - curwrite;
+		if (towrite > WRITE_BLOCKSIZE) {
+			towrite	= WRITE_BLOCKSIZE;
+		}
+		ret = handler->getfunc (params, handler->priv, towrite, xdata, &xtowrite);
+		if (ret == -1) {
+			ptpip_perror ("getfunc in senddata failed");
+			free (xdata);
+			return PTP_RC_GeneralError;
+		}
+		towrite2 = xtowrite;
+		GP_LOG_DATA ((char*)xdata, towrite2, "ptpip/senddata data:");
+		written = 0;
+		while (written < towrite2) {
+			ret = write (params->cmdfd, xdata+written, towrite2-written);
+			if (ret == PTPSOCK_ERR) {
+				ptpip_perror ("write in senddata failed");
+				free (xdata);
+				if (ptpip_get_socket_error() == ETIMEDOUT)
+					return PTP_ERROR_TIMEOUT;
+				return PTP_ERROR_IO;
+			}
+			written += ret;
+		}
+		curwrite += towrite;
+	}
+	free (xdata);
+	return PTP_RC_OK;
+}
+
+#define fujiptpip_getdata_payload		8
+
+static unsigned char hardcoded_deviceinfo = {
+100, 0,			/* standard version */
+PTP_VENDOR_FUJI, 0,	/* vendor extension id */
+0, 0, 100, 0,		/* vendor ext version */
+
+0x16,
+0x66, 0x00,
+0x75, 0x00,
+0x6a, 0x00,
+0x69, 0x00,
+0x66, 0x00,
+0x69, 0x00,
+0x6c, 0x00,
+0x6d, 0x00,
+0x2e, 0x00,
+0x63, 0x00,
+0x6f, 0x00,
+0x2e, 0x00,
+0x6a, 0x00,
+0x70, 0x00,
+0x3a, 0x00,
+0x20, 0x00,
+0x31, 0x00,
+0x2e, 0x00,
+0x30, 0x00,
+0x3b, 0x00,
+0x20, 0x00,
+0x00, 0x00,
+
+0x00, 0x00,	/* functional mode */
+
+0x22, 0x00, 0x00, 0x00,	/* opcodes */
+0x01, 0x10,
+0x02, 0x10,
+0x03, 0x10,
+0x04, 0x10,
+0x05, 0x10,
+0x06, 0x10,
+0x07, 0x10,
+0x08, 0x10,
+0x09, 0x10,
+0x0a, 0x10,
+0x0b, 0x10,
+0x0e, 0x10,
+0x0f, 0x10,
+0x14, 0x10,
+0x15, 0x10,
+0x16, 0x10,
+0x17, 0x10,
+0x18, 0x10,
+0x1b, 0x10,
+0x1c, 0x10,
+0x0c, 0x90,
+0x0d, 0x90,
+0x1d, 0x90,
+0x01, 0x98,
+0x02, 0x98,
+0x03, 0x98,
+0x05, 0x98,
+	/* manually added */
+0x22, 0x90,
+0x26, 0x90,
+0x27, 0x90,
+0x2b, 0x90,
+0x2c, 0x90,
+0x2d, 0x90,
+0x2e, 0x90,
+
+0x06, 0x00, 0x00, 0x00, /* events */
+0x02, 0x40,
+0x03, 0x40,
+0x04, 0x40,
+0x05, 0x40,
+0x0d, 0x40,
+0x06, 0xc0,
+
+0xa8, 0x00, 0x00, 0x00, /* device prop codes */
+0x01, 0x50, 0x03, 0x50, 0x05, 0x50, 0x0a, 0x50, 0x0b, 0x50, 0x0c, 0x50, 0x0e, 0x50, 0x0f,
+0x50, 0x11, 0x50, 0x12, 0x50, 0x15, 0x50, 0x18, 0x50, 0x19, 0x50, 0x1c, 0x50, 0x01, 0xd0, 0x02,
+0xd0, 0x03, 0xd0, 0x04, 0xd0, 0x05, 0xd0, 0x07, 0xd0, 0x08, 0xd0, 0x09, 0xd0, 0x0a, 0xd0, 0x0b,
+0xd0, 0x0c, 0xd0, 0x0d, 0xd0, 0x0e, 0xd0, 0x0f, 0xd0, 0x10, 0xd0, 0x11, 0xd0, 0x12, 0xd0, 0x13,
+0xd0, 0x14, 0xd0, 0x15, 0xd0, 0x16, 0xd0, 0x17, 0xd0, 0x18, 0xd0, 0x19, 0xd0, 0x1a, 0xd0, 0x1b,
+0xd0, 0x1c, 0xd0, 0x00, 0xd1, 0x01, 0xd1, 0x02, 0xd1, 0x03, 0xd1, 0x04, 0xd1, 0x05, 0xd1, 0x06,
+0xd1, 0x07, 0xd1, 0x08, 0xd1, 0x09, 0xd1, 0x0a, 0xd1, 0x0b, 0xd1, 0x0c, 0xd1, 0x0d, 0xd1, 0x0e,
+0xd1, 0x0f, 0xd1, 0x10, 0xd1, 0x11, 0xd1, 0x12, 0xd1, 0x13, 0xd1, 0x14, 0xd1, 0x15, 0xd1, 0x16,
+0xd1, 0x17, 0xd1, 0x18, 0xd1, 0x19, 0xd1, 0x1a, 0xd1, 0x1b, 0xd1, 0x1c, 0xd1, 0x1d, 0xd1, 0x1e,
+0xd1, 0x1f, 0xd1, 0x20, 0xd1, 0x21, 0xd1, 0x22, 0xd1, 0x23, 0xd1, 0x24, 0xd1, 0x25, 0xd1, 0x26,
+0xd1, 0x27, 0xd1, 0x28, 0xd1, 0x29, 0xd1, 0x2a, 0xd1, 0x2b, 0xd1, 0x2c, 0xd1, 0x2d, 0xd1, 0x2e,
+0xd1, 0x2f, 0xd1, 0x30, 0xd1, 0x31, 0xd1, 0x32, 0xd1, 0x33, 0xd1, 0x34, 0xd1, 0x35, 0xd1, 0x36,
+0xd1, 0x37, 0xd1, 0x38, 0xd1, 0x39, 0xd1, 0x3a, 0xd1, 0x3b, 0xd1, 0x3c, 0xd1, 0x3d, 0xd1, 0x3e,
+0xd1, 0x3f, 0xd1, 0x40, 0xd1, 0x41, 0xd1, 0x42, 0xd1, 0x43, 0xd1, 0x44, 0xd1, 0x45, 0xd1, 0x46,
+0xd1, 0x47, 0xd1, 0x48, 0xd1, 0x49, 0xd1, 0x4a, 0xd1, 0x4b, 0xd1, 0x4c, 0xd1, 0x4d, 0xd1, 0x4e,
+0xd1, 0x4f, 0xd1, 0x50, 0xd1, 0x51, 0xd1, 0x52, 0xd1, 0x53, 0xd1, 0x54, 0xd1, 0x55, 0xd1, 0x57,
+0xd1, 0x58, 0xd1, 0x59, 0xd1, 0x5a, 0xd1, 0x5b, 0xd1, 0x5c, 0xd1, 0x5d, 0xd1, 0x5e, 0xd1, 0x5f,
+0xd1, 0x60, 0xd1, 0x61, 0xd1, 0x00, 0xd2, 0x01, 0xd2, 0x02, 0xd2, 0x03, 0xd2, 0x04, 0xd2, 0x05,
+0xd2, 0x06, 0xd2, 0x07, 0xd2, 0x08, 0xd2, 0x09, 0xd2, 0x0a, 0xd2, 0x0b, 0xd2, 0x0c, 0xd2, 0x0d,
+0xd2, 0x0e, 0xd2, 0x0f, 0xd2, 0x10, 0xd2, 0x11, 0xd2, 0x12, 0xd2, 0x13, 0xd2, 0x14, 0xd2, 0x15,
+0xd2, 0x16, 0xd2, 0x17, 0xd2, 0x18, 0xd2, 0x19, 0xd2, 0x1a, 0xd2, 0x1b, 0xd2, 0x06, 0xd4, 0x07,
+0xd4,
+
+0x03, 0x00, 0x00, 0x00,	/* capture formats */
+0x00, 0x38,
+0x01, 0x38,
+0x03, 0xb1,
+
+0x04, 0x00, 0x00, 0x00,	/* image formats */
+0x00, 0x38,
+0x01, 0x38,
+0x03, 0xb1,
+0x0d, 0x38,
+
+0x09,		/* vendor "FUJIFILM" */
+0x46, 0x00,
+0x55, 0x00,
+0x4a, 0x00,
+0x49, 0x00,
+0x46, 0x00,
+0x49, 0x00,
+0x4c, 0x00,
+0x4d, 0x00,
+0x00, 0x00,
+
+0x06,		/* device "X-T42" */
+0x58, 0x00,
+0x2d, 0x00,
+0x54, 0x00,
+0x34, 0x00,
+0x32, 0x00,
+0x00, 0x00,
+
+0x05,		/* device version ... "1.01" */
+0x31, 0x00,
+0x2e, 0x00,
+0x30, 0x00,
+0x31, 0x00,
+0x00, 0x00,
+
+0x1f,		/* serial number */
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x30, 0x00,
+0x00, 0x00,
+};
+
+uint16_t
+ptp_fujiptpip_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler) {
+	PTPIPHeader		hdr;
+	unsigned char		*xdata = NULL;
+	uint16_t 		ret;
+	int			xret;
+
+	GP_LOG_D ("Reading PTP_OC 0x%0x (%s) data...", ptp->Code, ptp_get_opcode_name(params, ptp->Code));
+	ret = ptp_fujiptpip_cmd_read (params, &hdr, &xdata);
+	if (ret != PTP_RC_OK)
+		return ret;
+
+	/* the Fuji X-T4 does only return an empty deviceinfo ... so we synthesize one */
+	if ((ptp->Code == PTP_OC_GetDeviceInfo) && (dtoh32(hdr.length)-fujiptpip_getdata_payload-4 == 0)) {
+		GP_LOG_D("synthesizing Fuji DeviceInfo");
+		xret = handler->putfunc (params, handler->priv, sizeof(hardcoded_deviceinfo),hardcoded_deviceinfo);
+	} else {
+		GP_LOG_DATA ((char*)(xdata+fujiptpip_getdata_payload), dtoh32(hdr.length)-fujiptpip_getdata_payload-4, "fujiptpip/getdatda data:");
+		xret = handler->putfunc (params, handler->priv,
+			dtoh32(hdr.length)-fujiptpip_getdata_payload-4, xdata+fujiptpip_getdata_payload
+		);
+	}
+	free (xdata);
+	if (xret != PTP_RC_OK) {
+		GP_LOG_E ("failed to putfunc of returned data");
+		return GP_ERROR;
+	}
+	return PTP_RC_OK;
+}
+
+#define fujiptpip_dataphase	0
+#define fujiptpip_resp_code	2
+#define fujiptpip_resp_transid	4
+#define fujiptpip_resp_param1	8
+#define fujiptpip_resp_param2	12
+#define fujiptpip_resp_param3	16
+#define fujiptpip_resp_param4	20
+#define fujiptpip_resp_param5	24
+
+uint16_t
+ptp_fujiptpip_getresp (PTPParams* params, PTPContainer* resp)
+{
+	PTPIPHeader	hdr;
+	unsigned char	*data = NULL;
+	uint16_t 	ret;
+	int		n;
+
+	GP_LOG_D ("Reading PTP_OC 0x%0x (%s) response...", resp->Code, ptp_get_opcode_name(params, resp->Code));
+	ret = ptp_fujiptpip_cmd_read (params, &hdr, &data);
+	if (ret != PTP_RC_OK)
+		return GP_ERROR;
+
+	switch (dtoh16a(data)) {
+	case 3:
+		GP_LOG_D("PTPIP_CMD_RESPONSE");
+		resp->Code		= dtoh16a(&datafujiptpip_resp_code);
+		resp->Transaction_ID	= dtoh32a(&datafujiptpip_resp_transid);
+		n = (dtoh32(hdr.length) - sizeof(uint32_t) - fujiptpip_resp_param1)/sizeof(uint32_t);
+		switch (n) {
+		case 5: resp->Param5 = dtoh32a(&datafujiptpip_resp_param5);/* fallthrough */
+		case 4: resp->Param4 = dtoh32a(&datafujiptpip_resp_param4);/* fallthrough */
+		case 3: resp->Param3 = dtoh32a(&datafujiptpip_resp_param3);/* fallthrough */
+		case 2: resp->Param2 = dtoh32a(&datafujiptpip_resp_param2);/* fallthrough */
+		case 1: resp->Param1 = dtoh32a(&datafujiptpip_resp_param1);/* fallthrough */
+		case 0: break;
+		default:
+			GP_LOG_E ("response got %d parameters?", n);
+			break;
+		}
+		break;
+	default:
+		GP_LOG_E ("response type %d packet?", dtoh16a(data));
+		break;
+	}
+	free (data);
+	return PTP_RC_OK;
+}
+
+#define fujiptpip_initcmd_packet_size		82
+#define fujiptpip_initcmd_protocolversion	8
+#define fujiptpip_initcmd_guid			12
+#define fujiptpip_initcmd_name			28
+
+static uint16_t
+ptp_fujiptpip_init_command_request (PTPParams* params)
+{
+	char		hostname100;
+	unsigned char*	cmdrequest;
+	unsigned int	i, namelen;
+	int 		len, ret;
+	unsigned char	guid16;
+
+	ptp_nikon_getptpipguid(guid);
+#if !defined (WIN32)
+	if (gethostname (hostname, sizeof(hostname)))
+		return PTP_RC_GeneralError;
+#else
+	DWORD hostname_size = (DWORD)sizeof(hostname);
+	if (!GetComputerNameA(hostname, &hostname_size))
+		return PTP_RC_GeneralError;
+#endif
+	len = fujiptpip_initcmd_packet_size; // Fuji X-Acquire always sends packets of fixed length 82. At least the X-T4 just closes the socket when sending packets of other lengths.
+	namelen = (len - fujiptpip_initcmd_name - 1) / 2; // Length in UCS-2 characters, excluding the 0 byte at the end.
+	if(strlen(hostname) < namelen)
+		namelen = strlen(hostname);
+
+	cmdrequest = malloc(len);
+	memset(cmdrequest, 0, len);
+	htod32a(&cmdrequestfujiptpip_type,PTPIP_INIT_COMMAND_REQUEST);
+	htod32a(&cmdrequestfujiptpip_len,len);
+
+	htod32a(&cmdrequestfujiptpip_initcmd_protocolversion, 0x8f53e4f2);	/* magic number */
+
+	memcpy(&cmdrequestfujiptpip_initcmd_guid, guid, 16);
+	for (i=0;i<namelen;i++) {
+		/* -> ucs-2 in little endian */
+		cmdrequestfujiptpip_initcmd_name+i*2 = hostnamei;
+		cmdrequestfujiptpip_initcmd_name+i*2+1 = 0;
+	}
+
+	/*
+	htod16a(&cmdrequestfujiptpip_initcmd_name+(strlen(hostname)+1)*2,PTPIP_VERSION_MINOR);
+	htod16a(&cmdrequestfujiptpip_initcmd_name+(strlen(hostname)+1)*2+2,PTPIP_VERSION_MAJOR);
+	*/
+
+
+	GP_LOG_DATA ((char*)cmdrequest, len, "ptpip/init_cmd data:");
+	ret = ptpip_write_with_timeout (params->cmdfd, cmdrequest, len, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+	free (cmdrequest);
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror("write init cmd request");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
+	}
+	GP_LOG_D ("return %d / len %d", ret, len);
+	if (ret != len) {
+		GP_LOG_E ("return %d vs len %d", ret, len);
+		return PTP_RC_GeneralError;
+	}
+	return PTP_RC_OK;
+}
+
+#define ptpip_cmdack_idx	0
+#define ptpip_cmdack_guid	4
+#define ptpip_cmdack_name	20
+
+static uint16_t
+ptp_fujiptpip_init_command_ack (PTPParams* params)
+{
+	PTPIPHeader	hdr;
+	unsigned char	*data = NULL;
+	uint16_t 	ret;
+	int		i;
+	unsigned short	*name;
+
+	ret = ptp_fujiptpip_generic_read (params, params->cmdfd, &hdr, &data, 1);
+	if (ret != PTP_RC_OK)
+		return ret;
+	if (hdr.type != dtoh32(PTPIP_INIT_COMMAND_ACK)) {
+		GP_LOG_E ("bad type returned %d", htod32(hdr.type));
+		free (data);
+		if (hdr.type == PTPIP_INIT_FAIL) /* likely reason is permission denied */
+			return PTP_RC_AccessDenied;
+		return PTP_RC_GeneralError;
+	}
+	params->eventpipeid = dtoh32a(&dataptpip_cmdack_idx);
+	memcpy (params->cameraguid, &dataptpip_cmdack_guid, 16);
+	name = (unsigned short*)&dataptpip_cmdack_name;
+	for (i=0;namei;i++) /* EMPTY */;
+	params->cameraname = calloc((i+1),sizeof(uint16_t));
+	for (i=0;namei;i++)
+		params->cameranamei = namei;
+	free (data);
+	return PTP_RC_OK;
+}
+
+#define fujiptpip_eventinit_idx	8
+#define fujiptpip_eventinit_size	12
+
+int
+ptp_fujiptpip_init_event (PTPParams* params, const char *address)
+{
+	char 		*addr, *s, *p;
+	int		port, eventport, tries;
+	struct sockaddr_in	saddr;
+
+	memset(&saddr,0,sizeof(saddr));
+
+	GP_LOG_D ("connecting to %s.", address);
+	if (NULL == strchr (address,':'))
+		return GP_ERROR_BAD_PARAMETERS;
+
+	addr = strdup (address);
+	if (!addr)
+		return GP_ERROR_NO_MEMORY;
+	s = strchr (addr,':');
+	if (!s) {
+		GP_LOG_E ("addr %s should contain a :", address);
+		free (addr);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	*s = '\0';
+	p = strchr (s+1,':');
+	port = 55740;
+	eventport = port+1;
+	if (p) {
+		*p = '\0';
+		if (!sscanf (p+1,"%d",&port)) {
+			fprintf(stderr,"failed to scan for port in %s\n", p+1);
+			free (addr);
+			return GP_ERROR_BAD_PARAMETERS;
+		}
+		/* different event port ? */
+		p = strchr (p+1,':');
+		if (p) {
+			if (!sscanf (p+1,"%d",&eventport)) {
+				fprintf(stderr,"failed to scan for eventport in %s\n", p+1);
+				free (addr);
+				return GP_ERROR_BAD_PARAMETERS;
+			}
+		}
+	}
+#ifdef HAVE_INET_ATON
+	if (!inet_aton (s+1,  &saddr.sin_addr)) {
+#else
+	if (inet_pton(AF_INET, s+1, &saddr.sin_addr) != 1) {
+#endif
+		fprintf(stderr,"failed to scan for addr in %s\n", s+1);
+		free (addr);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	free (addr);
+
+	tries = 2;
+	saddr.sin_family	= AF_INET;
+	saddr.sin_port		= htons(eventport);
+	do {
+		if (PTPSOCK_ERR != ptpip_connect_with_timeout (params->evtfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS))
+			break;
+		if ((ptpip_get_socket_error() == ECONNREFUSED) && (tries--)) {
+			GP_LOG_D ("event connect failed, retrying after short wait");
+			int sleep_ms = 100;
+#ifdef WIN32
+			Sleep(sleep_ms);
+#else
+			usleep(sleep_ms*1000);
+#endif
+			continue;
+		}
+		GP_LOG_E ("could not connect event");
+		PTPSOCK_CLOSE (params->evtfd);
+		return GP_ERROR_IO;
+	} while (1);
+	GP_LOG_D ("fujiptpip event connected!");
+	tries = 2;
+	saddr.sin_family	= AF_INET;
+	saddr.sin_port		= htons(eventport+1);
+	do {
+		if (PTPSOCK_ERR != ptpip_connect_with_timeout (params->jpgfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS))
+			break;
+		if ((ptpip_get_socket_error() == ECONNREFUSED) && (tries--)) {
+			GP_LOG_D ("jpeg connect failed, retrying after short wait");
+			int sleep_ms = 100;
+#ifdef WIN32
+			Sleep(sleep_ms);
+#else
+			usleep(sleep_ms*1000);
+#endif
+			continue;
+		}
+		GP_LOG_E ("could not connect jpeg");
+		PTPSOCK_CLOSE (params->jpgfd);
+		return GP_ERROR_IO;
+	} while (1);
+	return GP_OK;
+}
+
+
+/* Event handling functions */
+
+/* PTP Events wait for or check mode */
+
+#define ptpip_event_type    	0
+#define ptpip_event_code    	2
+#define ptpip_event_transid	4
+#define ptpip_event_param1	8
+#define ptpip_event_param2	12
+#define ptpip_event_param3	16
+#define ptpip_event_param4	20
+
+static uint16_t
+ptp_fujiptpip_event (PTPParams* params, PTPContainer* event, int wait)
+{
+	fd_set		infds;
+	struct timeval	timeout;
+	int ret;
+	unsigned char*	data = NULL;
+	PTPIPHeader	hdr;
+	int n;
+
+	while (1) {
+		FD_ZERO(&infds);
+		FD_SET(params->evtfd, &infds);
+		timeout.tv_sec = 0;
+		if (wait == PTP_EVENT_CHECK_FAST)
+			timeout.tv_usec = 1;
+		else
+			timeout.tv_usec = 1000; /* 1/1000 second  .. perhaps wait longer? */
+
+		ret = select (params->evtfd+1, &infds, NULL, NULL, &timeout);
+		if (1 != ret) {
+			if (-1 == ret) {
+				GP_LOG_D ("select returned error, errno is %d", ptpip_get_socket_error());
+				return PTP_ERROR_IO;
+			}
+			return PTP_ERROR_TIMEOUT;
+		}
+
+		ret = ptp_fujiptpip_evt_read (params, &hdr, &data);
+		if (ret != PTP_RC_OK)
+			return ret;
+		GP_LOG_D ("length %d", hdr.length);
+		break;
+	}
+
+	event->Code		= dtoh16a(&dataptpip_event_code);
+	event->Transaction_ID	= dtoh32a(&dataptpip_event_transid);
+	n = (dtoh32(hdr.length) - sizeof(uint32_t) - ptpip_event_param1)/sizeof(uint32_t);
+	switch (n) {
+	case 4: event->Param4 = dtoh32a(&dataptpip_event_param4);/* fallthrough */
+	case 3: event->Param3 = dtoh32a(&dataptpip_event_param3);/* fallthrough */
+	case 2: event->Param2 = dtoh32a(&dataptpip_event_param2);/* fallthrough */
+	case 1: event->Param1 = dtoh32a(&dataptpip_event_param1);/* fallthrough */
+	case 0: break;
+	default:
+		GP_LOG_E ("response got %d parameters?", n);
+		break;
+	}
+	free (data);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_fujiptpip_event_check_queue (PTPParams* params, PTPContainer* event) {
+	/* the fast check just takes 1ms, so lets keep it */
+	return ptp_fujiptpip_event (params, event, PTP_EVENT_CHECK_FAST);
+}
+
+uint16_t
+ptp_fujiptpip_event_check (PTPParams* params, PTPContainer* event) {
+	return ptp_fujiptpip_event (params, event, PTP_EVENT_CHECK_FAST);
+}
+
+uint16_t
+ptp_fujiptpip_event_wait (PTPParams* params, PTPContainer* event) {
+	return ptp_fujiptpip_event (params, event, PTP_EVENT_CHECK);
+}
+
+uint16_t
+ptp_fujiptpip_jpeg (PTPParams* params, unsigned char** xdata, unsigned int *xsize)
+{
+	fd_set		infds;
+	struct timeval	timeout;
+	int ret;
+	unsigned char*	data = NULL;
+	PTPIPHeader	hdr;
+
+	while (1) {
+		FD_ZERO(&infds);
+		FD_SET(params->jpgfd, &infds);
+		timeout.tv_sec = 1;
+		timeout.tv_usec = 0;
+
+		ret = select (params->jpgfd+1, &infds, NULL, NULL, &timeout);
+		if (1 != ret) {
+			if (-1 == ret) {
+				GP_LOG_D ("select returned error, errno is %d", ptpip_get_socket_error());
+				return PTP_ERROR_IO;
+			}
+			return PTP_ERROR_TIMEOUT;
+		}
+
+		ret = ptp_fujiptpip_jpg_read (params, &hdr, &data);
+		if (ret != PTP_RC_OK)
+			return ret;
+
+		*xdata = data;
+		*xsize = hdr.length - sizeof(uint32_t);
+		break;
+	}
+	return PTP_RC_OK;
+}
+
+
+int
+ptp_fujiptpip_connect (PTPParams* params, const char *address) {
+	char 		*addr, *s, *p;
+	int		port, eventport, connect_tries;
+	struct sockaddr_in	saddr;
+	uint16_t	ret;
+
+	memset(&saddr,0,sizeof(saddr));
+
+	GP_LOG_D ("connecting to %s.", address);
+	if (NULL == strchr (address,':'))
+		return GP_ERROR_BAD_PARAMETERS;
+
+	addr = strdup (address);
+	if (!addr)
+		return GP_ERROR_NO_MEMORY;
+	s = strchr (addr,':');
+	if (!s) {
+		GP_LOG_E ("addr %s should contain a :", address);
+		free (addr);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	*s = '\0';
+	p = strchr (s+1,':');
+	port = 55740;
+	eventport = port+1;
+	if (p) {
+		*p = '\0';
+		if (!sscanf (p+1,"%d",&port)) {
+			fprintf(stderr,"failed to scan for port in %s\n", p+1);
+			free (addr);
+			return GP_ERROR_BAD_PARAMETERS;
+		}
+		/* different event port ? */
+		p = strchr (p+1,':');
+		if (p) {
+			if (!sscanf (p+1,"%d",&eventport)) {
+				fprintf(stderr,"failed to scan for eventport in %s\n", p+1);
+				free (addr);
+				return GP_ERROR_BAD_PARAMETERS;
+			}
+		}
+	}
+#ifdef HAVE_INET_ATON
+	if (!inet_aton (s+1,  &saddr.sin_addr)) {
+#else
+	if (inet_pton(AF_INET, s+1, &saddr.sin_addr) != 1) {
+#endif
+		fprintf(stderr,"failed to scan for addr in %s\n", s+1);
+		free (addr);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	saddr.sin_port		= htons(port);
+	saddr.sin_family	= AF_INET;
+	free (addr);
+	PTPSOCK_SOCKTYPE cmdfd = params->cmdfd = socket (PF_INET, SOCK_STREAM, PTPSOCK_PROTO);
+	if (cmdfd == PTPSOCK_INVALID) {
+		ptpip_perror ("socket cmd");
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	if (ptpip_set_nonblock(cmdfd) == -1) {
+		ptpip_perror("cmdfd set nonblocking");
+		PTPSOCK_CLOSE (params->cmdfd);
+		return GP_ERROR_IO;
+	}
+	PTPSOCK_SOCKTYPE evtfd = params->evtfd = socket (PF_INET, SOCK_STREAM, PTPSOCK_PROTO);
+	if (evtfd == PTPSOCK_INVALID) {
+		ptpip_perror ("socket evt");
+		PTPSOCK_CLOSE (params->cmdfd);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	if (ptpip_set_nonblock(evtfd) == -1) {
+		ptpip_perror("evtfd set nonblocking");
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
+		return GP_ERROR_IO;
+	}
+	PTPSOCK_SOCKTYPE jpgfd = params->jpgfd = socket (PF_INET, SOCK_STREAM, 0);
+	if (jpgfd == PTPSOCK_INVALID) {
+		ptpip_perror ("socket jpg");
+		PTPSOCK_CLOSE (params->evtfd);
+		PTPSOCK_CLOSE (params->cmdfd);
+		return GP_ERROR_BAD_PARAMETERS;
+	}
+	if (ptpip_set_nonblock(jpgfd) == -1) {
+		ptpip_perror("jpgfd set nonblocking");
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
+		PTPSOCK_CLOSE (params->jpgfd);
+		return GP_ERROR_IO;
+	}
+	if (PTPSOCK_ERR == ptpip_connect_with_timeout (params->cmdfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS)) {
+		ptpip_perror ("connect cmd");
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
+		PTPSOCK_CLOSE (params->jpgfd);
+		return GP_ERROR_IO;
+	}
+	connect_tries = 0;
+	do {
+		ret = ptp_fujiptpip_init_command_request (params);
+		if (ret != PTP_RC_OK) {
+			PTPSOCK_CLOSE (params->cmdfd);
+			PTPSOCK_CLOSE (params->evtfd);
+			PTPSOCK_CLOSE (params->jpgfd);
+			return translate_ptp_result (ret);
+		}
+		connect_tries++;
+		ret = ptp_fujiptpip_init_command_ack (params);
+		if (ret == PTP_RC_AccessDenied && connect_tries < 2) {
+#ifdef WIN32
+			Sleep(500);
+#else
+			usleep(500*1000);
+#endif
+			continue;
+		}
+		if (ret != PTP_RC_OK) {
+			PTPSOCK_CLOSE (params->cmdfd);
+			PTPSOCK_CLOSE (params->evtfd);
+			PTPSOCK_CLOSE (params->jpgfd);
+			return translate_ptp_result (ret);
+		}
+	} while(connect_tries < 2);
+	GP_LOG_D ("fujiptpip connected!");
+	return GP_OK;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/library.c Changed

@@ -1,7 +1,7 @@
 /* library.c
  *
  * Copyright (C) 2001-2005 Mariusz Woloszyn <emsi@ipartners.pl>
- * Copyright (C) 2003-2018 Marcus Meissner <marcus@jet.franken.de>
+ * Copyright (C) 2003-2021 Marcus Meissner <marcus@jet.franken.de>
  * Copyright (C) 2005 Hubert Figuiere <hfiguiere@teaser.fr>
  * Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
  *
@@ -22,6 +22,7 @@
  */
 
 #define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
 #include "config.h"
 
 #include <stdlib.h>
@@ -33,29 +34,13 @@
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
 #include <langinfo.h>
 #endif
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-setting.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "ptp.h"
 #include "ptp-bugs.h"
@@ -63,6 +48,10 @@
 #include "ptp-pack.c"
 #include "olympus-wrap.h"
 
+#ifdef HAVE_LIBWS232
+#include <winsock2.h>
+#endif
+
 #define USB_START_TIMEOUT 8000
 #define USB_CANON_START_TIMEOUT 1500	/* 1.5 seconds (0.5 was too low) */
 #define USB_NORMAL_TIMEOUT 20000
@@ -75,7 +64,7 @@
 
 /* below macro makes a copy of fn without leading character ('/'),
  * removes the '/' at the end if present, and calls folder_to_handle()
- * funtion proviging as the first argument the string after the second '/'.
+ * function proviging as the first argument the string after the second '/'.
  * for example if fn is '/store_00010001/DCIM/somefolder/', the macro will
  * call folder_to_handle() with 'DCIM/somefolder' as the very first argument.
  * it's used to omit storage pseudofolder and remove trailing '/'
@@ -213,6 +202,9 @@
 waiting_for_timeout (int *current_wait, struct timeval start, int timeout) {
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
         int time_to_timeout = timeout - time_since (start);
+
+	if (time_to_timeout <= 0) /* we timed out already ... */
+		return 0;
         *current_wait += 50; /* increase sleep time by 50ms per cycle */
         if (*current_wait > 200)
                 *current_wait = 200; /* 200ms is the maximum sleep time */
@@ -228,7 +220,7 @@
 }
 
 /* Changes the ptp deviceinfo with additional hidden information available,
- * or stuff that requires special tricks 
+ * or stuff that requires special tricks
  */
 int
 fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
@@ -237,6 +229,24 @@
 
         gp_camera_get_abilities(camera, &a);
 
+	/* Panasonic GH5, GC9 */
+	if (    (di->VendorExtensionID == PTP_VENDOR_PANASONIC) &&
+		(camera->port->type == GP_PORT_USB) &&
+		(a.usb_product == 0x2382)
+	) {
+		C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 9)));
+		di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_PANASONIC_GetProperty;
+		di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_PANASONIC_SetProperty;
+		di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_PANASONIC_ListProperty;
+		di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_PANASONIC_InitiateCapture;
+		di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_PANASONIC_Liveview;
+		di->OperationsSupporteddi->OperationsSupported_len+5  = PTP_OC_PANASONIC_LiveviewImage;
+		di->OperationsSupporteddi->OperationsSupported_len+6  = PTP_OC_PANASONIC_MovieRecControl;
+		di->OperationsSupporteddi->OperationsSupported_len+7  = PTP_OC_PANASONIC_GetLiveViewParameters;
+		di->OperationsSupporteddi->OperationsSupported_len+8  = PTP_OC_PANASONIC_SetLiveViewParameters;
+		di->OperationsSupported_len += 9;
+	}
+
 	/* Panasonic hack */
 	if (	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
 		(camera->port->type == GP_PORT_USB) &&
@@ -256,6 +266,23 @@
 		C_PTP (ptp_getdeviceinfo (params, di));
 		return GP_OK;
 	}
+	/* SIGMA FP */
+	if (	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
+		(camera->port->type == GP_PORT_USB) &&
+		(a.usb_vendor == 0x1003)
+	) {
+		di->VendorExtensionID = PTP_VENDOR_GP_SIGMAFP;
+		return GP_OK;
+	}
+
+	/* LEICA */
+	if (    (di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
+		(camera->port->type == GP_PORT_USB) &&
+		(a.usb_vendor == 0x1a98)
+	) {
+		di->VendorExtensionID = PTP_VENDOR_GP_LEICA;
+	}
+
 	/* XML style Olympus E series control. internal deviceInfos is encoded in XML. */
 	if (	di->Manufacturer && !strcmp(di->Manufacturer,"OLYMPUS") &&
 		(params->device_flags & DEVICE_FLAG_OLYMPUS_XML_WRAPPED)
@@ -280,7 +307,7 @@
 
 		/* Dup and merge the lists */
 #define DI_MERGE(x) \
-		C_MEM (newdi.x = malloc(sizeof(outerdi->x0)*(ndi.x##_len + outerdi->x##_len)));\
+		C_MEM (newdi.x = calloc(sizeof(outerdi->x0),(ndi.x##_len + outerdi->x##_len)));\
 		for (i = 0; i < outerdi->x##_len ; i++) 					\
 			newdi.xi = outerdi->xi;						\
 		for (i = 0; i < ndi.x##_len ; i++)						\
@@ -311,6 +338,8 @@
 			a.usb_vendor = 0x4a9;
 		if (strstr (di->Manufacturer,"Nikon"))
 			a.usb_vendor = 0x4b0;
+		if (strstr (di->Manufacturer,"FUJIFILM"))
+			a.usb_vendor = 0x4cb;
 	}
 	/* Switch the PTP vendor, so that the vendor specific sets become available. */
 	if (	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
@@ -323,8 +352,12 @@
 	}
 
 	/* Newer Canons say that they are MTP devices. Restore Canon vendor extid. */
-	if (	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
-		(camera->port->type == GP_PORT_USB) &&
+	if (	(	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT)  ||
+			(di->VendorExtensionID == PTP_VENDOR_MTP)
+		) &&
+		(	(camera->port->type == GP_PORT_USB) ||
+			(camera->port->type == GP_PORT_PTPIP)
+		) &&
 		(a.usb_vendor == 0x4a9)
 	) {
 		/*camera->pl->bugs |= PTP_MTP;*/
@@ -332,8 +365,12 @@
 	}
 
 	/* Newer Nikons (D40) say that they are MTP devices. Restore Nikon vendor extid. */
-	if (	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) &&
-		(camera->port->type == GP_PORT_USB) &&
+	if (	(	(di->VendorExtensionID == PTP_VENDOR_MICROSOFT) ||
+			(di->VendorExtensionID == PTP_VENDOR_MTP)
+		) &&
+		(	(camera->port->type == GP_PORT_USB) ||
+			(camera->port->type == GP_PORT_PTPIP)
+		) &&
 		(a.usb_vendor == 0x4b0)
 	) {
 		/*camera->pl->bugs |= PTP_MTP;*/
@@ -350,6 +387,92 @@
 		di->VendorExtensionID = PTP_VENDOR_FUJI;
 	}
 
+	/* Olympus seems to use OMSYSTEM as manufacturer for the OM-1 */
+	if (    di->Manufacturer && 
+		(	!strcmp(di->Manufacturer,"OLYMPUS")  || !strcmp(di->Manufacturer,"OMSYSTEM")) &&
+		(	!strncmp(di->Model,"E-M",3) || !strncmp(di->Model,"OM-",3))
+	) {
+		GP_LOG_D ("Setting Olympus VendorExtensionID to PTP_VENDOR_GP_OLYMPUS_OMD");
+		di->VendorExtensionID = PTP_VENDOR_GP_OLYMPUS_OMD;
+	}
+
+	if (di->VendorExtensionID == PTP_VENDOR_FUJI) {
+		C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported0)*(di->DevicePropertiesSupported_len + 60)));
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+0 = PTP_DPC_ExposureTime;
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+1 = PTP_DPC_FNumber;
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+2 = 0xd38c;	/* PC Mode */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+3 = 0xd171;	/* Focus control */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+4 = 0xd21c;	/* Needed for X-T2? */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+5 = 0xd347;	/* Focus Position */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+6 = PTP_DPC_FUJI_LensZoomPos;
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+7 = 0xd242;
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+8 = PTP_DPC_FUJI_LiveViewImageSize; /* xt3 confirmed */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+9 = 0xd168; /* video out on/off (unconfirmed) */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+10 = PTP_DPC_FUJI_LiveViewImageQuality; /* xt3 confirmed */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+11 = PTP_DPC_FUJI_ForceMode; /* on xt3 set by webcam app to 1 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+12 = 0xd16e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+13 = 0xd372; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+14 = 0xd020; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+15 = 0xd022; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+16 = 0xd023; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+17 = 0xd024; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+18 = 0xd025; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+19 = 0xd026; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+20 = 0xd027; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+21 = 0xd029; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+22 = 0xd16f; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+23 = 0xd02f; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+24 = 0xd395; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+25 = 0xd320; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+26 = 0xd321; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+27 = 0xd322; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+28 = 0xd323; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+29 = 0xd346; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+30 = 0xd34a; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+31 = 0xd34b; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+32 = 0xd34d; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+33 = 0xd351; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+34 = 0xd35e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+35 = 0xd173; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+36 = 0xd365; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+37 = 0xd366; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+38 = 0xd374; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+39 = 0xd310; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+40 = 0xd359; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+41 = 0xd375; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+42 = 0xd376; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+43 = 0xd36e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+44 = 0xd33f; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+45 = 0xd364; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+46 = 0xd34e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+47 = 0xd02e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+48 = 0xd36d; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+49 = 0xd38a; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+50 = 0xd36a; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+51 = 0xd36b; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+52 = 0xd36f; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+53 = 0xd370; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+54 = 0xd222; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+55 = 0xd223; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+56 = 0xd38c; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+57 = 0xd38d; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+58 = 0xd38e; /* seen on xt3 */
+		di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+59 = 0xd17b; /* seen on xt3 */
+		di->DevicePropertiesSupported_len += 60;
+
+		if (ptp_operation_issupported(&camera->pl->params, PTP_OC_FUJI_GetDeviceInfo)) {
+			uint16_t	*props;
+			unsigned int	numprops;
+
+			C_PTP (ptp_fuji_getdeviceinfo (params, &props, &numprops));
+			free (di->DevicePropertiesSupported);
+
+			di->DevicePropertiesSupported		= props;
+			di->DevicePropertiesSupported_len	= numprops;
+		}
+
+	}
+
 	/* Nikon DSLR hide its newer opcodes behind another vendor specific query,
 	 * do that and merge it into the generic PTP deviceinfo. */
 	if (di->VendorExtensionID == PTP_VENDOR_NIKON) {
@@ -359,8 +482,8 @@
 		/* Nikon V* and J* advertise the new Nikon stuff, but only do the generic
 		 * PTP capture. FIXME: could use flags. */
 		if (params->deviceinfo.Model && (
-			(params->deviceinfo.Model0=='J') ||	/* J1 - J3 currently */
-			(params->deviceinfo.Model0=='V') ||	/* V1 - V3 currently */
+			(params->deviceinfo.Model0=='J') ||
+			(params->deviceinfo.Model0=='V') ||
 			((params->deviceinfo.Model0=='S') && strlen(params->deviceinfo.Model) < 3)	/* S1 - S2 currently */
 				/* but not S7000 */
 			)
@@ -369,24 +492,59 @@
 				GP_LOG_E ("if camera is Nikon 1 series, camera should probably have flag NIKON_1 set. report that to the libgphoto2 project");
 				camera->pl->params.device_flags |= PTP_NIKON_1;
 			}
-
-			/* The 1 hides some commands from us ... */
-			if ( ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_CheckEvent) &&
-			    !ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)
+			C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 3)));
+			/* Nikon J5 does not advertise the PTP_OC_NIKON_InitiateCaptureRecInMedia cmd ... gnh */
+			/* logic: If we have one 0x920x command, we will probably have 0x9207 too. and getvendorpropcodes ... */
+
+			/* Marcus note: GetVendorPropCodes crashes at least the V1, the J1 and J2.
+			 * but it works on the J3, J4...
+ 			 * V1: crashes protocol flow
+ 			 * J1: crashes protocol flow
+ 			 * J2: crashes protocol flow
+ 			 * J3: works
+ 			 * J4: works
+			 * J5: reports invalid opcode
+			 */
+			if (	!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_InitiateCaptureRecInMedia) &&
+				 ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_StartLiveView)
 			) {
-				C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 2)));
+				di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_InitiateCaptureRecInMedia;
+				di->OperationsSupported_len++;
+			}
+
+			if (ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_InitiateCaptureRecInMedia)) {
 				di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_GetVendorPropCodes;
 				di->OperationsSupported_len++;
+			}
 
-				/* Nikon J5 does not advertise the PTP_OC_NIKON_InitiateCaptureRecInMedia cmd ... gnh */
-				/* logic: If we have one 0x920x command, we will probably have 0x9207 too. */
-				if (	!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_InitiateCaptureRecInMedia) &&
-					 ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_StartLiveView)
-				) {
-					di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_InitiateCaptureRecInMedia;
-					di->OperationsSupported_len++;
+			/* V1 and J1 are a less reliable then the newer 1 versions, no changecamera mode, no getevent, no initiatecapturerecinsdram */
+			if (	!strcmp(params->deviceinfo.Model,"V1") ||
+				!strcmp(params->deviceinfo.Model,"S1") ||
+				!strcmp(params->deviceinfo.Model,"J1")
+			) {
+				/* on V1 and J1 even the 90c7 getevents does not work */
+				/* V1: see https://github.com/gphoto/libgphoto2/issues/569 */
+				/* J1: see https://github.com/gphoto/libgphoto2/issues/716 */
+				/* S1: see https://github.com/gphoto/libgphoto2/issues/845 */
+				for (i=0;i<di->OperationsSupported_len;i++) {
+					if (di->OperationsSupportedi == PTP_OC_NIKON_GetEvent) {
+						GP_LOG_D("On Nikon S1/J1/V1: disable NIKON_GetEvent as its unreliable");
+						di->OperationsSupportedi = PTP_OC_GetDeviceInfo; /* overwrite */
+					}
+					if (di->OperationsSupportedi == PTP_OC_NIKON_InitiateCaptureRecInSdram) {
+						GP_LOG_D("On Nikon S1/J1/V1: disable NIKON_InitiateCaptureRecInSdram as its unreliable");
+						di->OperationsSupportedi = PTP_OC_InitiateCapture; /* overwrite */
+					}
+					if (!strcmp(params->deviceinfo.Model,"S1") &&
+						(di->OperationsSupportedi == PTP_OC_NIKON_InitiateCaptureRecInMedia))
+					{
+						GP_LOG_D("On Nikon S1: disable NIKON_InitiateCaptureRecInMedia as its unreliable");
+						di->OperationsSupportedi = PTP_OC_InitiateCapture; /* overwrite */
+					}
 				}
-				/* probably more */
+			} else {
+				di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_ChangeCameraMode;
+				di->OperationsSupported_len++;
 			}
 		}
 		if (params->deviceinfo.Model && !strcmp(params->deviceinfo.Model,"COOLPIX A")) {
@@ -394,53 +552,70 @@
 			if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) {
 				C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 10)));
 				di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_GetVendorPropCodes;
-				di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_CheckEvent;
+				di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_GetEvent;
 				di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_AfDrive;
-				di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_NIKON_SetControlMode;
+				di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_NIKON_ChangeCameraMode;
 				di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_NIKON_DeviceReady;
 				di->OperationsSupporteddi->OperationsSupported_len+5  = PTP_OC_NIKON_StartLiveView;
 				di->OperationsSupporteddi->OperationsSupported_len+6 = PTP_OC_NIKON_EndLiveView;
 				di->OperationsSupporteddi->OperationsSupported_len+7 = PTP_OC_NIKON_GetLiveViewImg;
 				di->OperationsSupporteddi->OperationsSupported_len+8 = PTP_OC_NIKON_ChangeAfArea;
-				di->OperationsSupporteddi->OperationsSupported_len+9 = PTP_OC_NIKON_InitiateCaptureRecInMedia;					
+				di->OperationsSupporteddi->OperationsSupported_len+9 = PTP_OC_NIKON_InitiateCaptureRecInMedia;
 				di->OperationsSupported_len += 10;
 			}
 		}
 		if (params->deviceinfo.Model && (sscanf(params->deviceinfo.Model,"D%d", &nikond)))
 		{
 			if ((nikond >= 3000) && (nikond < 3199)) {
-				GP_LOG_D("The D3xxx series hides commands from us ... adding all D3000 ones");
+				GP_LOG_D("The D3xxx series hides commands from us ... ");
+				/* Most commands we guessed do not work (anymore). One user searched for those, remove the ones we do not have.
+				 * https://github.com/gphoto/libgphoto2/issues/140
+				 */
 				if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) {
-					C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 15)));
-					di->OperationsSupporteddi->OperationsSupported_len+0  = PTP_OC_NIKON_GetVendorPropCodes;
-					di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_CheckEvent;
-					di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_Capture;
-					di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_NIKON_AfDrive;
-					di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_NIKON_SetControlMode;
-					di->OperationsSupporteddi->OperationsSupported_len+5  = PTP_OC_NIKON_DeviceReady;
-					di->OperationsSupporteddi->OperationsSupported_len+6  = PTP_OC_NIKON_AfCaptureSDRAM;
-					di->OperationsSupporteddi->OperationsSupported_len+7  = PTP_OC_NIKON_DelImageSDRAM;
+					C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 6)));
+					di->OperationsSupporteddi->OperationsSupported_len+0  = PTP_OC_NIKON_AfDrive;
+					di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_DeviceReady;
+					di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_GetPreviewImg;
+					di->OperationsSupporteddi->OperationsSupported_len+3 = PTP_OC_NIKON_MfDrive;
+					di->OperationsSupporteddi->OperationsSupported_len+4 = PTP_OC_NIKON_ChangeAfArea;
+					di->OperationsSupporteddi->OperationsSupported_len+5 = PTP_OC_NIKON_AfDriveCancel;
+					di->OperationsSupported_len += 6;
+				}
+			}
+			if ((nikond >= 3200) && (nikond < 3299)) {
+				GP_LOG_D("The D3200 hides commands from us ... adding some D7100 ones");
+				if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) {
+					/* see https://github.com/gphoto/gphoto2/issues/331 and https://github.com/gphoto/gphoto2/issues/332 */
+					C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 14)));
+					di->OperationsSupporteddi->OperationsSupported_len+0  = PTP_OC_NIKON_GetEvent;
+					di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_InitiateCaptureRecInSdram;
+					di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_AfDrive;
+					di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_NIKON_ChangeCameraMode;
+					di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_NIKON_DeviceReady;
+					di->OperationsSupporteddi->OperationsSupported_len+5  = PTP_OC_NIKON_AfCaptureSDRAM;
+					di->OperationsSupporteddi->OperationsSupported_len+6  = PTP_OC_NIKON_DelImageSDRAM;
+
+					di->OperationsSupporteddi->OperationsSupported_len+7  = PTP_OC_NIKON_GetPreviewImg;
+					di->OperationsSupporteddi->OperationsSupported_len+8  = PTP_OC_NIKON_StartLiveView;
+					di->OperationsSupporteddi->OperationsSupported_len+9  = PTP_OC_NIKON_EndLiveView;
+					di->OperationsSupporteddi->OperationsSupported_len+10 = PTP_OC_NIKON_GetLiveViewImg;	/* confirmed works */
+					di->OperationsSupporteddi->OperationsSupported_len+11 = PTP_OC_NIKON_ChangeAfArea;
+					di->OperationsSupporteddi->OperationsSupported_len+12 = PTP_OC_NIKON_InitiateCaptureRecInMedia;	/* works to some degree */
+					di->OperationsSupporteddi->OperationsSupported_len+13 = PTP_OC_NIKON_AfDriveCancel;
+					/* probably more */
+					di->OperationsSupported_len += 14;
 
-					di->OperationsSupporteddi->OperationsSupported_len+8  = PTP_OC_NIKON_GetPreviewImg;
-					di->OperationsSupporteddi->OperationsSupported_len+9  = PTP_OC_NIKON_StartLiveView;
-					di->OperationsSupporteddi->OperationsSupported_len+10 = PTP_OC_NIKON_EndLiveView;
-					di->OperationsSupporteddi->OperationsSupported_len+11 = PTP_OC_NIKON_GetLiveViewImg;
-					di->OperationsSupporteddi->OperationsSupported_len+12 = PTP_OC_NIKON_MfDrive;
-					di->OperationsSupporteddi->OperationsSupported_len+13 = PTP_OC_NIKON_ChangeAfArea;
-					di->OperationsSupporteddi->OperationsSupported_len+14 = PTP_OC_NIKON_AfDriveCancel;
-					/* only opcodes up to 9206 ... I think. */
-					di->OperationsSupported_len += 15;
 				}
 			}
-			if ((nikond >= 3200) && (nikond < 3999)) {
+			if ((nikond >= 3300) && (nikond < 3999)) {
 				GP_LOG_D("The D3xxx series hides commands from us ... adding all D7100 ones");
 				if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) {
 					C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 19)));
 					di->OperationsSupporteddi->OperationsSupported_len+0  = PTP_OC_NIKON_GetVendorPropCodes;
-					di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_CheckEvent;
-					di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_Capture;
+					di->OperationsSupporteddi->OperationsSupported_len+1  = PTP_OC_NIKON_GetEvent;
+					di->OperationsSupporteddi->OperationsSupported_len+2  = PTP_OC_NIKON_InitiateCaptureRecInSdram;
 					di->OperationsSupporteddi->OperationsSupported_len+3  = PTP_OC_NIKON_AfDrive;
-					di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_NIKON_SetControlMode;
+					di->OperationsSupporteddi->OperationsSupported_len+4  = PTP_OC_NIKON_ChangeCameraMode;
 					di->OperationsSupporteddi->OperationsSupported_len+5  = PTP_OC_NIKON_DeviceReady;
 					di->OperationsSupporteddi->OperationsSupported_len+6  = PTP_OC_NIKON_AfCaptureSDRAM;
 					di->OperationsSupporteddi->OperationsSupported_len+7  = PTP_OC_NIKON_DelImageSDRAM;
@@ -453,12 +628,12 @@
 					di->OperationsSupporteddi->OperationsSupported_len+13 = PTP_OC_NIKON_ChangeAfArea;
 					di->OperationsSupporteddi->OperationsSupported_len+14 = PTP_OC_NIKON_InitiateCaptureRecInMedia;
 					di->OperationsSupporteddi->OperationsSupported_len+15 = PTP_OC_NIKON_AfDriveCancel;
-					di->OperationsSupporteddi->OperationsSupported_len+15 = PTP_OC_NIKON_AfDriveCancel;
 					di->OperationsSupporteddi->OperationsSupported_len+16 = PTP_OC_NIKON_StartMovieRecInCard;
 					di->OperationsSupporteddi->OperationsSupported_len+17 = PTP_OC_NIKON_EndMovieRec;
 					di->OperationsSupporteddi->OperationsSupported_len+18 = PTP_OC_NIKON_TerminateCapture;
 					/* probably more */
 					di->OperationsSupported_len += 19;
+
 				}
 			}
 		}
@@ -479,6 +654,7 @@
 				free (xprops);
 			}
 		}
+
 		/* For nikon 1 j5, they have blanked this space */
 		if (camera->pl->params.device_flags & PTP_NIKON_1) {
 			for (i=0;i<di->DevicePropertiesSupported_len;i++)
@@ -487,20 +663,26 @@
 			/* The J5 so far goes up to 0xf01c */
 #define NIKON_1_ADDITIONAL_DEVPROPS 29
 			if (i==di->DevicePropertiesSupported_len) {
-				di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported0)*(di->DevicePropertiesSupported_len + NIKON_1_ADDITIONAL_DEVPROPS));
+				di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported0)*(di->DevicePropertiesSupported_len + NIKON_1_ADDITIONAL_DEVPROPS+3));
 				if (!di->DevicePropertiesSupported) {
 					C_MEM (di->DevicePropertiesSupported);
 				}
 				for (i=0;i<NIKON_1_ADDITIONAL_DEVPROPS;i++)
 					di->DevicePropertiesSupportedi+di->DevicePropertiesSupported_len = 0xf000 | i;
-				di->DevicePropertiesSupported_len += NIKON_1_ADDITIONAL_DEVPROPS;
+
+				/* is returned by the J5, but readonly */
+				di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+NIKON_1_ADDITIONAL_DEVPROPS = PTP_DPC_NIKON_ExposureTime;	// OKAY in J5
+				di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+NIKON_1_ADDITIONAL_DEVPROPS+1 = PTP_DPC_NIKON_LiveViewProhibitCondition;	// hack
+				di->DevicePropertiesSupporteddi->DevicePropertiesSupported_len+NIKON_1_ADDITIONAL_DEVPROPS+2 = PTP_DPC_NIKON_LiveViewStatus;	// hack
+
+				di->DevicePropertiesSupported_len += NIKON_1_ADDITIONAL_DEVPROPS + 3;
 			}
 		}
 
 #if 0
 		if (!ptp_operation_issupported(&camera->pl->params, 0x9207)) {
 			C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + 2)));
-			di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_Capture;
+			di->OperationsSupporteddi->OperationsSupported_len+0 = PTP_OC_NIKON_InitiateCaptureRecInSdram;
 			di->OperationsSupporteddi->OperationsSupported_len+1 = PTP_OC_NIKON_AfCaptureSDRAM;
 			di->OperationsSupported_len+=2;
 		}
@@ -521,6 +703,7 @@
 			int opcodes = 0, propcodes = 0, events = 0, j,k,l;
 			uint16_t  	*xprops;
 			unsigned int	xsize;
+			PTPPropertyValue propval;
 
 			C_PTP (ptp_sony_sdioconnect (&camera->pl->params, 1, 0, 0));
 			C_PTP (ptp_sony_sdioconnect (&camera->pl->params, 2, 0, 0));
@@ -531,7 +714,7 @@
 				case 0x1000: opcodes++; break;
 				case 0x4000: events++; break;
 				case 0x5000: propcodes++; break;
-				default: 
+				default:
 					GP_LOG_E ("ptp_sony_get_vendorpropcodes() unknown opcode %x", xpropsi);
 					break;
 				}
@@ -552,7 +735,7 @@
 				case 0x5000:
 					di->DevicePropertiesSupported(j++)+di->DevicePropertiesSupported_len = xpropsi;
 					break;
-				default: 
+				default:
 					break;
 				}
 			}
@@ -561,6 +744,61 @@
 			di->OperationsSupported_len += opcodes;
 			free (xprops);
 			C_PTP (ptp_sony_sdioconnect (&camera->pl->params, 3, 0, 0));
+
+			propval.i8 = 1; /* application */
+			LOG_ON_PTP_E (ptp_sony_setdevicecontrolvaluea (params, PTP_DPC_SONY_PriorityMode, &propval, PTP_DTC_INT8));
+
+			/* remember for sony zv-1 hack */
+			params->starttime = time_now();
+		}
+		/* Sony QX */
+		if (ptp_operation_issupported(&camera->pl->params, PTP_OC_SONY_QX_Connect)) {
+			int opcodes = 0, propcodes = 0, events = 0, j,k,l;
+			uint16_t  	*xprops;
+			unsigned int	xsize;
+
+			C_PTP (ptp_sony_qx_connect (&camera->pl->params, 1, 0xda01, 0xda01));
+			C_PTP (ptp_sony_qx_connect (&camera->pl->params, 2, 0xda01, 0xda01));
+
+			C_PTP (ptp_sony_qx_get_vendorpropcodes (&camera->pl->params, &xprops, &xsize));
+
+			for (i=0;i<xsize;i++) {
+				switch (xpropsi & 0x7000) {
+				case 0x1000: opcodes++; break;
+				case 0x4000: events++; break;
+				case 0x5000: propcodes++; break;
+				default:
+					GP_LOG_E ("ptp_qx_sony_get_vendorpropcodes() unknown opcode %x", xpropsi);
+					break;
+				}
+			}
+			C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported0)*(di->DevicePropertiesSupported_len + propcodes)));
+			C_MEM (di->OperationsSupported       = realloc(di->OperationsSupported,      sizeof(di->OperationsSupported0)*(di->OperationsSupported_len + opcodes)));
+			C_MEM (di->EventsSupported           = realloc(di->EventsSupported,          sizeof(di->EventsSupported0)*(di->EventsSupported_len + events)));
+			j = 0; k = 0; l = 0;
+			for (i=0;i<xsize;i++) {
+				GP_LOG_D ("sony code: %x", xpropsi);
+				switch (xpropsi & 0x7000) {
+				case 0x1000:
+					di->OperationsSupported(k++)+di->OperationsSupported_len = xpropsi;
+					break;
+				case 0x4000:
+					di->EventsSupported(l++)+di->EventsSupported_len = xpropsi;
+					break;
+				case 0x5000:
+					di->DevicePropertiesSupported(j++)+di->DevicePropertiesSupported_len = xpropsi;
+					break;
+				default:
+					break;
+				}
+			}
+			di->DevicePropertiesSupported_len += propcodes;
+			di->EventsSupported_len += events;
+			di->OperationsSupported_len += opcodes;
+			free (xprops);
+			C_PTP (ptp_sony_qx_connect (&camera->pl->params, 3, 0xda01, 0xda01));
+
+			C_PTP (ptp_sony_qx_getalldevicepropdesc (&camera->pl->params));
 		}
 	}
 #if 0 /* Marcus: not regular ptp properties, not queryable via getdevicepropertyvalue */
@@ -593,8 +831,13 @@
 
 	do {
 		res = ptp_nikon_device_ready(params);
-		if (res != PTP_RC_DeviceBusy)
+                if (    (res != PTP_RC_DeviceBusy) &&
+                        (res != PTP_RC_NIKON_Bulb_Release_Busy)
+                ) {
+			if (res == PTP_RC_NIKON_Silent_Release_Busy)	/* seems to mean something like "not relevant" ... will repeat forever */
+				return PTP_RC_OK;
 			return res;
+		}
 		if (waitms) usleep(waitms*1000)/*wait a bit*/;
 	} while (tries--);
 	return res;
@@ -750,6 +993,8 @@
 	{"Kodak:Z990",   0x040a, 0x0613, 0},
 	/* ra4veiV6@lavabit.com */
 	{"Kodak:C1530",  0x040a, 0x0617, 0},
+	/* via email to gphoto-devel */
+	{"Kodak:M531 2nd id",	0x040a, 0x0665, 0},
 
 	/* HP PTP cameras */
 #if 0
@@ -770,7 +1015,7 @@
 	{"HP:PhotoSmart 320 (PTP mode)", 0x03f0, 0x6602, 0},
 	{"HP:PhotoSmart 720 (PTP mode)", 0x03f0, 0x6702, 0},
 	{"HP:PhotoSmart 620 (PTP mode)", 0x03f0, 0x6802, 0},
-	{"HP:PhotoSmart 735 (PTP mode)", 0x03f0, 0x6a02, 0},	
+	{"HP:PhotoSmart 735 (PTP mode)", 0x03f0, 0x6a02, 0},
 	{"HP:PhotoSmart 707 (PTP mode)", 0x03f0, 0x6b02, 0},
 	{"HP:PhotoSmart 733 (PTP mode)", 0x03f0, 0x6c02, 0},
 	{"HP:PhotoSmart 607 (PTP mode)", 0x03f0, 0x6d02, 0},
@@ -810,6 +1055,8 @@
 	{"HP:PhotoSmart M737 (PTP mode)", 0x03f0, 0x9602, 0},
 	/* https://bugs.launchpad.net/bugs/178916 */
 	{"HP:PhotoSmart R742 (PTP mode)", 0x03f0, 0x9702, 0},
+	/* private email */
+	{"HP:PhotoSmart E331 (PTP mode)", 0x03f0, 0x9a02, 0},
 	/* http://sourceforge.net/tracker/index.php?func=detail&aid=1814147&group_id=8874&atid=358874 */
 	{"HP:PhotoSmart M547 (PTP mode)", 0x03f0, 0x9b02, 0},
 
@@ -864,6 +1111,7 @@
 	/* Fernando Santoro <fernando.lopezjr@gmail.com> */
 	{"Sony:DSC-A100 (PTP mode)",  0x054c, 0x02c0, 0},
 	/* Sam Tseng <samtz1223@gmail.com> */
+	/* this seems not to have a separate control mode id, see https://github.com/gphoto/libgphoto2/issues/288 */
 	{"Sony:DSC-A900 (PTP mode)",  0x054c, 0x02e7, PTP_CAP},
 	/* new id?! Reported by Ruediger Oertel. */
 	{"Sony:DSC-W200 (PTP mode)",  0x054c, 0x02f8, 0},
@@ -875,6 +1123,8 @@
 	{"Sony:DSC-HX5V (PTP mode)",  0x054c, 0x0491, 0},
 	/* tux droid <gnutuxdroid@gmail.com> */
 	{"Sony:SLT-A55 (PTP mode)",   0x054c, 0x04a3, 0},
+	/* em33kay@gmail.com */
+	{"Sony:NEX5 (PTP mode)",      0x054c, 0x04a5, 0},
 	/* http://sourceforge.net/tracker/?func=detail&atid=358874&aid=3515558&group_id=8874 */
 	{"Sony:SLT-A35 (PTP mode)",   0x054c, 0x04a7, 0},
 	/* t.ludewig@gmail.com */
@@ -892,6 +1142,8 @@
 	/* Jose Velez <jvelez00@gmail.com> */
 	{"Sony:NEX-7 (PTP mode)",     0x054c, 0x057d, 0},
 
+	/* email */
+	{"Sony:HDR-PJ710V (PTP mode)",0x054c, 0x05f7, 0},
 	/* https://sourceforge.net/p/libmtp/bugs/1459/ */
 	{"Sony:HDR-PJ260VE (PTP mode)",0x054c, 0x0603, 0},
 
@@ -931,26 +1183,45 @@
 	/* Thorsten Ludewig <t.ludewig@gmail.com> */
 	{"Sony:Alpha-A3000",	      0x054c, 0x074e, 0},
 
+	/* bertrand.chambon@free.fr */
+	{"Sony:Alpha-A68 (MTP)",      0x054c, 0x0779, 0},
 	/* https://github.com/gphoto/libgphoto2/issues/70 */
 	{"Sony:Alpha-A6300 (MTP)",    0x054c, 0x077a, 0},
 
+	/* gphoto-devel  email report */
+	{"Sony:DSC-HX80",	      0x054c, 0x0780, 0},
+
 	/* https://github.com/gphoto/libgphoto2/issues/190 */
 	{"Sony:Alpha-A6500",	      0x054c, 0x0784, 0},
 
+	/* bertrand.chambon@free.fr */
+	{"Sony:Alpha-A68 (Control)",  0x054c, 0x079b, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/70 */
+	{"Sony:Alpha-A6300 (Control)",0x054c, 0x079c, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Anja Stock at SUSE */
+	{"Sony:DSC-RX10M3 (Control)",  	0x054c, 0x079d, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Elijah Parker <mail@timelapseplus.com> */
+	{"Sony:Alpha-A99 M2 (Control)", 0x054c, 0x079e, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Elijah Parker <mail@timelapseplus.com> */
+	{"Sony:DSC-RX100V (Control)", 0x054c, 0x07a3, PTP_CAP},
 	/* hanes442@icloud.com */
 	{"Sony:DSC-RX100M5 (Control)",0x054c, 0x07a3, PTP_CAP},
 
+
+	/* Elijah Parker <mail@timelapseplus.com> */
 	/* https://github.com/gphoto/libgphoto2/issues/190 */
-	{"Sony:Alpha-A6500 (Control)",0x054c, 0x07a4, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Sony:Alpha-A6500 (Control)", 0x054c, 0x07a4, PTP_CAP|PTP_CAP_PREVIEW},
 
+	/* Elijah Parker <mail@timelapseplus.com> */
 	/* https://sourceforge.net/p/gphoto/support-requests/127/ */
-	{"Sony:Alpha-A5000 (Control)",0x054c, 0x07c6, PTP_CAP},
-
-	/* https://github.com/gphoto/libgphoto2/issues/70 */
-	{"Sony:Alpha-A6300 (Control)",0x054c, 0x079c, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Sony:Alpha-A5000 (Control)", 0x054c, 0x07c6, PTP_CAP},
 
-	/* Anja Stock at SUSE */
-	{"Sony:DSC-RX10M3 (Control)",  	0x054c, 0x079d, PTP_CAP|PTP_CAP_PREVIEW},
+	/* jackden@gmail.com */
+	{"Sony:DSC-RX100M6 (MTP)",  0x054c, 0x0830, 0},
 
 	/* https://sourceforge.net/p/libmtp/support-requests/246/ */
 	{"Sony:DSC-HX400V (MTP)",      0x054c, 0x08ac, 0},
@@ -958,12 +1229,21 @@
 	/* https://sourceforge.net/p/libmtp/bugs/1310/ */
 	{"Sony:DSC-HX60V (MTP)",      0x054c, 0x08ad, 0},
 
+	/* https://github.com/gphoto/libgphoto2/issues/355 */
+	{"Sony:DSC-WX350 (MTP)",      0x054c, 0x08b0, 0},
+
 	/* Sascha Peilicke at SUSE */
 	{"Sony:Alpha-A6000 (MTP)",    0x054c, 0x08b7, 0},
 
 	/* https://sourceforge.net/p/gphoto/feature-requests/456/ */
 	{"Sony:Alpha-A7S (MTP)",      0x054c, 0x08e2, 0},
 
+	/* David Farrier <farrier@iglou.com> */
+	{"Sony:RX100M3 (MTP)",        0x054c, 0x08e3, 0},
+
+	/* via email to gphoto-devel */
+	{"Sony:DSC-WX220 (MTP)",      0x054c, 0x08d7, 0},
+
 	/* Markus Oertel */
 	{"Sony:Alpha-A5100 (MTP)",    0x054c, 0x08e7, 0},
 
@@ -980,33 +1260,119 @@
 	/* Nick Clarke <nick.clarke@gmail.com> */
 	{"Sony:Alpha-A77 M2 (Control)", 0x054c, 0x0953, PTP_CAP|PTP_CAP_PREVIEW},
 
+	/* http://sourceforge.net/p/gphoto/feature-requests/456/ */
+	{"Sony:Alpha-A7S (Control)",    0x054c, 0x0954, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* Markus Oertel */
+	/* Preview confirmed by Adrian Schroeter, preview might need the firmware getting updated */
 	{"Sony:Alpha-A5100 (Control)",  0x054c, 0x0957, PTP_CAP|PTP_CAP_PREVIEW},
 
-	/* http://sourceforge.net/p/gphoto/feature-requests/456/ */
-	{"Sony:Alpha-A7S (Control)",    0x054c, 0x0954, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/343  */
+	{"Sony:Alpha-A7III (Control)",  0x054c, 0x096f, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Adrian Schroeter */
+	{"Sony:ILCE-7R M2 (MTP)",        	0x054c, 0x09e7, 0},
 
 	/* https://sourceforge.net/p/gphoto/feature-requests/472/ */
-	{"Sony:DSC-HX90V (MTP)",        0x054c, 0x09e8, 0},
+	{"Sony:DSC-HX90V (MTP)",        	0x054c, 0x09e8, 0},
 
 	/* titan232@gmail.com */
-	{"Sony:ILCE-7M2 (Control)",     0x054c, 0x0a6a, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Sony:ILCE-7M2 (Control)",     	0x054c, 0x0a6a, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Andre Crone, andre@elysia.nl */
-	{"Sony:Alpha-A7r II (Control)",	0x054c, 0x0a6b, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Sony:Alpha-A7r II (Control)",		0x054c, 0x0a6b, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Andre Crone <andre@elysia.nl> */
-	{"Sony:DSC-RX100M4",          	0x054c, 0x0a6d, 0},
+	{"Sony:DSC-RX100M4",          		0x054c, 0x0a6d, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* via email to gphoto-devel */
+	{"Sony:Alpha-RX1R II (Control)",	0x054c,0x0a70, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Andre Crone <andre@elysia.nl>, adjusted */
-	{"Sony:Alpha-A7S II (Control)",0x054c,0x0a71, PTP_CAP},
+	{"Sony:Alpha-A7S II (Control)",		0x054c,0x0a71, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* brandonlampert@gmail.com */
+	{"Sony:DSC-QX30U",			0x054c,0x0a77, PTP_CAP_PREVIEW},
 
 	/* Demo7up <demo7up@gmail.com> */
-	{"Sony:UMC-R10C",		0x054c,0x0a79, 0},
+	{"Sony:UMC-R10C",			0x054c,0x0a79, 0},
+
+	{"Sony:DSC-RX0 (MTP)", 			0x054c, 0x0bfd, 0},
+
+	/* https://github.com/gphoto/libgphoto2/issues/230 */
+	{"Sony:Alpha-A7R III (MTP mode)",	0x054c,0x0c00, 0},
+
+	/* https://github.com/gphoto/libgphoto2/issues/343 */
+	{"Sony:Alpha-A7 III (MTP mode)",	0x054c,0x0c03, 0},
+
+	/* andreas@harth.org */
+	{"Sony:ZV-1", 				0x054c,0x0c1b, 0},
+
+	/* Elijah Parker, mail@timelapseplus.com */
+	{"Sony:Alpha-A9 (Control)",     	0x054c, 0x0c2a, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Richard Brown at SUSE */
+	{"Sony:Alpha-RX10M4 (Control)", 	0x054c,0x0c2f, PTP_CAP|PTP_CAP_PREVIEW},
 
+	{"Sony:DSC-RX0 (PC Control)",		0x054c, 0x0c32, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Elijah Parker, mail@timelapseplus.com */
 	/* https://github.com/gphoto/libgphoto2/issues/230 */
-	{"Sony:Alpha-A7R III (MTP mode)",0x054c,0x0c00, 0},
-	{"Sony:Alpha-A7R III (Control)", 0x054c,0x0c33, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Sony:Alpha-A7r III (PC Control)",	0x054c, 0x0c33, PTP_CAP|PTP_CAP_PREVIEW}, /* FIXME: crosscheck */
+	{"Sony:Alpha-A7 III (PC Control)",	0x054c, 0x0c34, PTP_CAP|PTP_CAP_PREVIEW}, /* FIXME: crosscheck */
+
+	/* jackden@gmail.com */
+	{"Sony:DSC-RX100M6 (PC Control)",  	0x054c, 0x0c38, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* andreas@harth.org */
+	{"Sony:ZV-1 (PC Control)",		0x054c, 0x0c44, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/419 */
+	{"Sony:DSC RX0 II (PC Control)",	0x054c, 0x0ca6, PTP_CAP|PTP_CAP_PREVIEW},
+	/* orbital sailor <gamerdude1080@hotmail.com> */
+	{"Sony:ILCE-6400 (PC Control)",		0x054c, 0x0caa, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Elias Asikainen <elias.asikainen@sulzerschmid.ch> */
+	{"Sony:DSC-RX100M7 (PC Control)",	0x054c, 0x0cae, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Mikael Ståldal <mikael@staldal.nu> */
+	{"Sony:DSC-RX100M5A (MTP)",		0x054c, 0x0cb1, 0},
+	{"Sony:DSC-RX100M5A (PC Control)",	0x054c, 0x0cb2, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Elijah Parker, mail@timelapseplus.com */
+	{"Sony:DSC-A7r IV (Control)",		0x054c, 0x0ccc, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Ingvar Stepanyan <rreverser@google.com> */
+	{"Sony:Alpha-A6600 (MTP)",	0x054c, 0x0d0f, 0},
+	{"Sony:Alpha-A6600 (PC Control)",	0x054c, 0x0d10, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* email report */
+	{"Sony:DSC-A7S III (MTP)",		0x054c, 0x0d17, 0},
+	/* Elijah Parker, mail@timelapseplus.com */
+	{"Sony:DSC-A7S III (Control)",		0x054c, 0x0d18, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/892 */
+	{"Sony:ILCE-1 (Control)",		0x054c, 0x0d1c, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* via email */
+	{"Sony:ILCE-7C (Control)",		0x054c, 0x0d2b, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* via email */
+	{"Sony:ZV-E10 (Control)",		0x054c, 0x0d97, PTP_CAP|PTP_CAP_PREVIEW},
+	
+	/* Thomas Schaad, napstertom@gmail.com */
+	{"Sony:ILCE-7RM3A (PC Control)",	0x054c, 0x0d9b, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/749 */
+	{"Sony:ILCE-7RM4A (PC Control)",	0x054c, 0x0d9f, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/896 */
+	{"Sony:ILME-FX3 (PC Control)",		0x054c, 0x0da3, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/pull/782 */
+	{"Sony:Alpha-A7 IV (MTP mode)",		0x054c, 0x0da6, 0},
+	{"Sony:Alpha-A7 IV (PC Control)",	0x054c, 0x0da7, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* The A7-RV */
+	{"Sony:ILCE-7RM5 (PC Control)",		0x054c, 0x0e0c, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Nikon Coolpix 2500: M. Meissner, 05 Oct 2003 */
 	{"Nikon:Coolpix 2500 (PTP mode)", 0x04b0, 0x0109, 0},
@@ -1038,7 +1404,7 @@
 	/* Nikon Coolpix 2200 */
 	{"Nikon:Coolpix 2200 (PTP mode)", 0x04b0, 0x0122, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 
-	/* Jonathan Marten <jonathanmarten@users.sf.net> 
+	/* Jonathan Marten <jonathanmarten@users.sf.net>
 	 * https://sourceforge.net/p/gphoto/bugs/968/ */
 	{"Nikon:Coolpix 2200v1.1 (PTP mode)", 0x04b0, 0x0123, PTP_CAP|PTP_NO_CAPTURE_COMPLETE},
 
@@ -1095,6 +1461,8 @@
 	{"Nikon:Coolpix S60 (PTP mode)",  0x04b0, 0x0171, 0},
 	/* Mike Strickland <livinwell@georgianatives.net> */
 	{"Nikon:Coolpix P90 (PTP mode)",  0x04b0, 0x0173, 0},
+	/* https://github.com/gphoto/gphoto2/issues/214 */
+	{"Nikon:Coolpix L100 (PTP mode)", 0x04b0, 0x0174, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 	/* Christoph Muehlmann <c.muehlmann@nagnag.de> */
 	{"Nikon:Coolpix S220 (PTP mode)", 0x04b0, 0x0177, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 	/* */
@@ -1139,6 +1507,9 @@
 	/* https://github.com/gphoto/libgphoto2/issues/150 */
 	{"Nikon:Coolpix P900 (PTP mode)", 0x04b0, 0x019c, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 
+	/* https://github.com/gphoto/libgphoto2/issues/141 */
+	{"Nikon:Coolpix A900 (PTP mode)", 0x04b0, 0x019e, PTP_CAP|PTP_NIKON_BROKEN_CAP},
+
 	/* https://github.com/gphoto/libgphoto2/issues/138 */
 	{"Nikon:KeyMission 360 (PTP mode)",0x04b0, 0x019f, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 
@@ -1167,7 +1538,7 @@
 
 	/* t.ludewig@gmail.com */
 	/* N CP A seems capture capable, but does not list vendor commands */
-	/* Reports 0x400d aka CaptureComplete event ... but has no 
+	/* Reports 0x400d aka CaptureComplete event ... but has no
 	 * vendor commands? yeah right ... */
 	/* It might be similar to the 1? lets try ... Marcus 20140706 */
 	{"Nikon:Coolpix A (PTP mode)",	  0x04b0, 0x0226, PTP_CAP|PTP_NIKON_1}, /* PTP_CAP */
@@ -1179,10 +1550,16 @@
 	{"Nikon:Coolpix P7800 (PTP mode)", 0x04b0, 0x0229, 0},
 
 	/* t.ludewig@gmail.com */
-	/* Also reports 0x400d aka CaptureComplete event ... but has no 
+	/* Also reports 0x400d aka CaptureComplete event ... but has no
 	 * vendor commands? yeah right... */
 	{"Nikon:Coolpix P520 (PTP mode)", 0x04b0, 0x0228, 0}, /* PTP_CAP */
 
+	/* checamon <checamon@gmail.com> */
+	{"Nikon:Coolpix B700 (PTP mode)", 0x04b0, 0x0231, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/477 */
+	{"Nikon:Coolpix P1000 (PTP mode)",0x04b0, 0x0232, PTP_CAP/*|PTP_CAP_PREVIEW*/},
+
 	/* Nikon Coolpix 2000 */
 	{"Nikon:Coolpix 2000 (PTP mode)", 0x04b0, 0x0302, 0},
 	/* From IRC reporter. */
@@ -1214,7 +1591,10 @@
 	/* Mdasoh Kyaeppd at IRC */
 	{"Nikon:Coolpix S6300 (PTP mode)",0x04b0, 0x032c, PTP_CAP},
 	/* sakax <sakamotox@gmail.com> */
-	{"Nikon:Coolpix S2600 (PTP mode)",0x04b0, 0x032d, PTP_CAP},
+	{"Nikon:Coolpix S2600 (PTP mode)",0x04b0, 0x032d, PTP_CAP|PTP_NIKON_BROKEN_CAP},
+
+	/* dougvj@gmail.com */
+	{"Nikon:Coolpix L810  (PTP mode)",0x04b0, 0x032f, PTP_CAP},
 
 	/* Borja Latorre <borja.latorre@csic.es> */
 	{"Nikon:Coolpix S3200",		  0x04b0, 0x0334, PTP_CAP},
@@ -1254,6 +1634,14 @@
 	/* https://sourceforge.net/p/libmtp/bugs/1743/ */
 	{"Nikon:Coolpix L340", 	  	  0x04b0, 0x0361, PTP_CAP},
 
+	/* via email to gphoto-devel */
+	{"Nikon:Coolpix B500", 	  	  0x04b0, 0x0362, PTP_CAP},
+
+	/* Krystal Puga <krystalvp@gmail.com> */
+	{"Nikon:KeyMission 170", 	  0x04b0, 0x0364, PTP_CAP},
+	/* https://github.com/gphoto/libgphoto2/issues/780 */
+	{"Nikon:P950", 	  		  0x04b0, 0x036d, PTP_CAP|PTP_CAP_PREVIEW|PTP_NIKON_BROKEN_CAP},
+
 	/* Nikon D100 has a PTP mode: westin 2002.10.16 */
 	{"Nikon:DSC D100 (PTP mode)",     0x04b0, 0x0402, 0},
 	/* D2H SLR in PTP mode from Steve Drew <stevedrew@gmail.com> */
@@ -1300,7 +1688,7 @@
 	/* Matthias Blaicher <blaicher@googlemail.com> */
 	{"Nikon:DSC D3s (PTP mode)",      0x04b0, 0x0426, PTP_CAP|PTP_CAP_PREVIEW},
 	/* SWPLinux IRC reporter... does not have liveview -lowend model. */
-	{"Nikon:DSC D3100 (PTP mode)",	  0x04b0, 0x0427, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Nikon:DSC D3100 (PTP mode)",	  0x04b0, 0x0427, PTP_CAP},
 	/* http://sourceforge.net/tracker/?func=detail&atid=358874&aid=3140014&group_id=8874 */
 	{"Nikon:DSC D7000 (PTP mode)",    0x04b0, 0x0428, PTP_CAP|PTP_CAP_PREVIEW},
 
@@ -1374,7 +1762,44 @@
 	/* Andre Crone <visuals@elysia.nl> */
 	{"Nikon:DSC D850",                0x04b0, 0x0441, PTP_CAP|PTP_CAP_PREVIEW},
 
+	/* Horshack ?? <horshack@live.com> */
+	{"Nikon:Z7",                	  0x04b0, 0x0442, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Marcus Meissner */
+	{"Nikon:Z6",                	  0x04b0, 0x0443, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Daniel Baertschi <daniel@avisec.ch> */
+	{"Nikon:Z50",                	  0x04b0, 0x0444, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Schreiber, Steve via Gphoto-devel */
+	{"Nikon:DSC D3500",		  0x04b0, 0x0445, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* timelapse-VIEW */
+	{"Nikon:DSC D780",		  0x04b0, 0x0446, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* by email */
+	{"Nikon:DSC D6",		  0x04b0, 0x0447, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Thomas Schaad */
+	{"Nikon:Z5",                      0x04b0, 0x0448, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Fahrion <fahrion.2600@gmail.com> */
+	{"Nikon:Z7_2",                	  0x04b0, 0x044b, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Thomas Schaad <tom@avisec.ch> */
+	{"Nikon:Z6_2",                	  0x04b0, 0x044c, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Nikon:Zfc",                     0x04b0, 0x044f, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Stefan Weiberg at SUSE */
+	{"Nikon:Z9",			  0x04b0, 0x0450, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Ben Govero */
+	{"Nikon:Z8",			  0x04b0, 0x0451, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Z://github.com/gphoto/libgphoto2/pull/750#issuecomment-1189987634 */
+	{"Nikon:Z30",			  0x04b0, 0x0452, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* http://sourceforge.net/tracker/?func=detail&aid=3536904&group_id=8874&atid=108874 */
+	/* https://github.com/gphoto/libgphoto2/issues/569 */
 	{"Nikon:V1",    		  0x04b0, 0x0601, PTP_CAP|PTP_NIKON_1},
 	/* https://sourceforge.net/tracker/?func=detail&atid=358874&aid=3556403&group_id=8874 */
 	{"Nikon:J1",    		  0x04b0, 0x0602, PTP_CAP|PTP_NIKON_1},
@@ -1410,6 +1835,8 @@
 	{"Panasonic:Lumix FZ5",           0x04da, 0x2372, 0},
 #endif
 
+	/* so the GX8 reports the same USB ids as others, but has capture support. See debuglog. */
+	{"Panasonic:DMC-GX8",             0x04da, 0x2374, PTP_CAP|PTP_CAP_PREVIEW},
 	{"Panasonic:DMC-FZ20",            0x04da, 0x2374, 0},
 	{"Panasonic:DMC-FZ45",            0x04da, 0x2374, 0},
 	{"Panasonic:DMC-FZ38",            0x04da, 0x2374, 0},
@@ -1428,6 +1855,9 @@
 	/* Constantin B <klochto@gmail.com> */
 	{"Panasonic:DMC-GF1",             0x04da, 0x2374, 0},
 
+	{"Panasonic:DC-GH5",		  0x04da, 0x2382, PTP_CAP|PTP_CAP_PREVIEW},
+
+
 	/* Søren Krarup Olesen <sko@acoustics.aau.dk> */
 	{"Leica:D-LUX 2",		  0x04da, 0x2375, 0},
 	/* Graham White <g.graham.white@gmail.com> */
@@ -1473,7 +1903,15 @@
 	/* Rafał Bryndza <abigor82@gmail.com> */
 	{"Olympus:E-M5",		  0x07b4, 0x012f, 0},
 	/* Richard Wonka <richard.wonka@gmail.com> */
-	{"Olympus:E-M5 Mark II",	  0x07b4, 0x0130, 0},
+	{"Olympus:E-M5 Mark II",	  0x07b4, 0x0130, PTP_CAP|PTP_CAP_PREVIEW},
+	/* same id also on E-M1 */
+	{"Olympus:E-M1 Mark II",	  0x07b4, 0x0130, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Olympus:E-M1",	  	  0x07b4, 0x0130, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* from timelapse-VIEW */
+	{"Olympus:E-M1 MII",  	  	  0x07b4, 0x0135, PTP_CAP|PTP_CAP_PREVIEW},
+	/* email */
+	{"Olympus:OM-1",  	  	  0x07b4, 0x0136, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* IRC report */
 	{"Casio:EX-Z120",                 0x07cf, 0x1042, 0},
@@ -1678,7 +2116,7 @@
 
 	/* Olaf Hering at SUSE */
 	{"Canon:PowerShot A590 IS",		0x04a9, 0x3176, PTPBUG_DELETE_SENDS_EVENT},
-	
+
 	/* Dmitriy Khanzhin <jinn@altlinux.org> */
 	{"Canon:PowerShot A580",		0x04a9, 0x3177, PTPBUG_DELETE_SENDS_EVENT},
 
@@ -1787,6 +2225,8 @@
 	{"Canon:PowerShot SX210 IS",		0x04a9, 0x31f6, PTPBUG_DELETE_SENDS_EVENT},
 	/* name correct? https://bugs.launchpad.net/ubuntu/+source/gvfs/+bug/1296275?comments=all */
 	{"Canon:Digital IXUS 300 HS",		0x04a9, 0x31f7, PTPBUG_DELETE_SENDS_EVENT},
+	/* via email */
+	{"Canon:PowerShot G12",			0x04a9, 0x320f, PTPBUG_DELETE_SENDS_EVENT},
 	/* http://sourceforge.net/tracker/index.php?func=detail&aid=3153412&group_id=8874&atid=358874 */
 	{"Canon:PowerShot SX130 IS",		0x04a9, 0x3211, PTPBUG_DELETE_SENDS_EVENT},
 	/* novell bugzilla 871944 */
@@ -1914,6 +2354,9 @@
 	/* Andrés Farfán <nafraf@linuxmail.org> */
 	{"Canon:PowerShot SX510 HS",		0x04a9, 0x3277, PTPBUG_DELETE_SENDS_EVENT},
 
+	/* Wolfram Sang <wsa@kernel.org> */
+	{"Canon:Digital IXUS 132",		0x04a9, 0x327d, PTPBUG_DELETE_SENDS_EVENT},
+
 	/* thinkgareth <thinkgareth@users.sf.net> */
 	{"Canon:EOS 1200D",			0x04a9, 0x327f, PTP_CAP|PTP_CAP_PREVIEW},
 
@@ -1923,6 +2366,9 @@
 	/* https://github.com/gphoto/libgphoto2/issues/92 */
 	{"Canon:EOS 5D Mark IV",		0x04a9, 0x3281, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
 
+	/* Marcus parents  ... preview works a bit, capture on a full moon */
+	{"Canon:PowerShot SX600 HS",		0x04a9, 0x3286, PTP_CAP|PTP_CAP_PREVIEW|PTPBUG_DELETE_SENDS_EVENT},
+
 	/* https://sourceforge.net/p/gphoto/feature-requests/445/ */
 	{"Canon:PowerShot Elph135",		0x04a9, 0x3288, PTPBUG_DELETE_SENDS_EVENT},
 
@@ -1935,7 +2381,7 @@
 	/* needs dont close session */
 	{"Canon:EOS 80D",			0x04a9, 0x3294, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
 	/* Andre Crone <andre@elysia.nl */
-	{"Canon:EOS 5DS",			0x04a9, 0x3295, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Canon:EOS 5DS",			0x04a9, 0x3295, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
 	/* Nykhedimus S <nykhedimus@gmail.com> */
 	{"Canon:EOS M3",			0x04a9, 0x3299, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW},
 	/* Shaul Badusa <shaulikoo@gmail.com> */
@@ -1943,6 +2389,12 @@
 	/* pravsripad@gmail.com */
 	{"Canon:PowerShot SX520 HS",		0x04a9, 0x329b, PTPBUG_DELETE_SENDS_EVENT},
 
+	/* sparkycoladev@gmail.com */
+	{"Canon:PowerShot G7 X",		0x04a9, 0x329d, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
+
+	/* Sascha Wolff <sascha.wolff1@gmail.com> */
+	{"Canon:PowerShot SX530 HS",		0x04a9, 0x329f, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
+
 	/* Marcus Meissner <marcus@jet.franken.de> */
 	{"Canon:EOS M10",			0x04a9, 0x32a0, PTP_CAP|PTP_CAP_PREVIEW},
 
@@ -1961,24 +2413,44 @@
 	{"Canon:PowerShot ELPH 350 HS",		0x04a9, 0x32ab, PTPBUG_DELETE_SENDS_EVENT},
 
 	/* Andre Crone <andre@elysia.nl */
-	{"Canon:EOS 5DS R",			0x04a9, 0x32af, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Canon:EOS 5DS R",			0x04a9, 0x32af, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
+
+	/* Erwin.Segerer@gmx.de */
+	{"Canon:PowerShot G5X",			0x04a9, 0x32b3, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Barney Livingston <barney.livingston@lobsterpictures.tv> */
 	{"Canon:EOS 1300D",			0x04a9, 0x32b4, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Rebel T6 is the same camera. Jasem Mutlaq <mutlaqja@ikarustech.com> */
+	{"Canon:EOS Rebel T6",			0x04a9, 0x32b4, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Jim Howard <jh.xsnrg@gmail.com> */
 	{"Canon:EOS M5",			0x04a9, 0x32bb, PTP_CAP|PTP_CAP_PREVIEW},
 
-	{"Canon:PowerShot G7 X Mark II",        0x04a9, 0x32bc, 0},
+	/* Hubert F */
+	{"Canon:PowerShot G7 X Mark II",        0x04a9, 0x32bc, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/325 */
+	{"Canon:PowerShot SX540 HS",		0x04a9, 0x32be, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* https://github.com/gphoto/libgphoto2/issues/84 */
-	{"Canon:Digital Ixus 180",		0x04a9, 0x32c0, 0},
+	{"Canon:Digital IXUS 180",		0x04a9, 0x32c0, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* https://github.com/gphoto/libgphoto2/issues/316 */
+	{"Canon:SX 720HS",			0x04a9, 0x32c2, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Sagufta Kapadia <sagufta.kapadia@gmail.com> */
+	{"Canon:SX 620HS",			0x04a9, 0x32c3, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* https://github.com/gphoto/libgphoto2/issues/235 */
 	{"Canon:EOS M6",			0x04a9, 0x32c5, PTP_CAP|PTP_CAP_PREVIEW},
 
+	/* https://github.com/gphoto/libgphoto2/issues/379 */
+	{"Canon:PowerShot G9 X Mark II",	0x04a9, 0x32c7, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* Viktors Berstis <gpjm@berstis.com> */
 	{"Canon:EOS Rebel T7i",			0x04a9, 0x32c9, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/338 */
+	{"Canon:EOS 800D",			0x04a9, 0x32c9, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Thomas Schaaf <thomas.schaaf@komola.de> */
 	{"Canon:EOS 6d Mark II",		0x04a9, 0x32ca, PTP_CAP|PTP_CAP_PREVIEW},
@@ -1992,6 +2464,66 @@
 	/* Geza Lore <gezalore@gmail.com> */
 	{"Canon:EOS M100",          		0x04a9, 0x32d1, PTP_CAP|PTP_CAP_PREVIEW},
 
+	/* https://github.com/gphoto/libgphoto2/issues/58 */
+	{"Canon:EOS M50",          		0x04a9, 0x32d2, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Marcus Meissner */
+	{"Canon:Digital IXUS 185",          	0x04a9, 0x32d4, 0},
+
+	/* Slavko Kocjancic <eslavko@gmail.com> */
+	{"Canon:Digital PowerShot SX730HS",	0x04a9, 0x32d6, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Jasem Mutlaq <mutlaqja@ikarustech.com> */
+	{"Canon:EOS 4000D",			0x04a9, 0x32d9, PTP_CAP|PTP_CAP_PREVIEW|PTPBUG_DELETE_SENDS_EVENT},
+
+	/* Elijah Parker <mail@timelapseplus.com> */
+	{"Canon:EOS R",          		0x04a9, 0x32da, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
+
+	/* Christian Muehlhaeuser <muesli@gmail.com> */
+	{"Canon:EOS 2000D",			0x04a9, 0x32e1, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION|PTPBUG_DELETE_SENDS_EVENT},
+	/* https://github.com/gphoto/gphoto2/issues/247, from logfile */
+	{"Canon:EOS 1500D",          		0x04a9, 0x32e1, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION|PTPBUG_DELETE_SENDS_EVENT},
+
+	/* from Enno at SUSE */
+	{"Canon:EOS RP",          		0x04a9, 0x32e2, PTP_CAP|PTP_CAP_PREVIEW|PTP_DONT_CLOSE_SESSION},
+
+	/* https://github.com/gphoto/libgphoto2/issues/316 */
+	{"Canon:PowerShot SX740 HS",		0x04a9, 0x32e4, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/*Marc Wetli <wetli@egoshooting.com> */
+	{"Canon:EOS M6 Mark II",		0x04a9, 0x32e7, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* id from timelapse-view */
+	{"Canon:EOS 1D X MarkIII",		0x04a9, 0x32e8, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Roland Förg <roland.foerg@arcor.de> */
+	{"Canon:EOS 250D",			0x04a9, 0x32e9, PTP_CAP|PTP_CAP_PREVIEW},
+
+	/* Matthias <matthias@mail-s.eu> */
+	{"Canon:EOS 90D",			0x04a9, 0x32ea, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/gphoto2/issues/347 */
+	{"Canon:PowerShot SX70 HS",		0x04a9, 0x32ee, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/614 */
+	{"Canon:EOS M200",			0x04a9, 0x32ef, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/781 */
+	{"Canon:EOS Rebel T8i",			0x04a9, 0x32f1, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/810 */
+	{"Canon:EOS 850D",			0x04a9, 0x32f1, PTP_CAP|PTP_CAP_PREVIEW},
+	/* from timelapse-view */
+	{"Canon:EOS R5",			0x04a9, 0x32f4, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Steve Rencontre <steve@rsn-tech.co.uk> */
+	{"Canon:EOS R6",			0x04a9, 0x32f5, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/832 */
+	{"Canon:EOS R7",			0x04a9, 0x32f7, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Marc Wetli */
+	{"Canon:EOS R10",			0x04a9, 0x32f8, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/642 */
+	{"Canon:EOS M50m2",			0x04a9, 0x32f9, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Ingmar Rieger via email */
+	{"Canon:EOS R5 C",			0x04a9, 0x3303, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/881 */
+	{"Canon:EOS R6m2",			0x04a9, 0x330b, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* Konica-Minolta PTP cameras */
 	{"Konica-Minolta:DiMAGE A2 (PTP mode)",        0x132b, 0x0001, 0},
 	{"Konica-Minolta:DiMAGE Z2 (PictBridge mode)", 0x132b, 0x0007, 0},
@@ -1999,6 +2531,7 @@
 	{"Konica-Minolta:DiMAGE Z3 (PictBridge mode)", 0x132b, 0x0018, 0},
 	{"Konica-Minolta:DiMAGE A200 (PictBridge mode)",0x132b, 0x0019, 0},
 	{"Konica-Minolta:DiMAGE Z5 (PictBridge mode)", 0x132b, 0x0022, 0},
+	{"Konica-Minolta:DiMAGE Z6 (PictBridge mode)", 0x132b, 0x0033, 0},
 
 	/* Fuji PTP cameras */
 	{"Fuji:FinePix S7000",			0x04cb, 0x0142, 0},
@@ -2078,6 +2611,8 @@
 	{"Fuji:FinePix HS30EXR",		0x04cb, 0x0271, 0},
 	/* Marcel Bonnet <marcelbonnet@gmail.com> */
 	{"Fuji:FinePix S2980",			0x04cb, 0x027d, 0},
+	/* Michael Martin <mischel88@web.de> */
+	{"Fuji:FinePix X-E1",			0x04cb, 0x0283, 0},
 	/* t.ludewig@gmail.com */
 	{"Fuji:FinePix XF1",			0x04cb, 0x0288, 0},
 	/* Steve Dahl <dahl@goshawk.com> */
@@ -2088,25 +2623,68 @@
 	{"Fuji:FinePix X20",			0x04cb, 0x02a6, 0},
 	/* https://sourceforge.net/p/libmtp/bugs/1040/ */
 	{"Fuji:Fujifilm X-E2",			0x04cb, 0x02b5, 0},
-	/* Vladimir K <enewsletters@inbox.ru> */
-	{"Fuji:Fujifilm X-T1",			0x04cb, 0x02bf, 0},
+	/* https://github.com/gphoto/libgphoto2/issues/283 */
+	{"Fuji:Fujifilm X-M1",			0x04cb, 0x02b6, 0},
+	/* luigiwriter2@gmail.com */
+	{"Fuji:FinePix S8600 ",			0x04cb, 0x02b9, 0},
+	/* https://github.com/gphoto/libgphoto2/issues/281 */
+	{"Fuji:Fujifilm X70",			0x04cb, 0x02ba, 0},
+	/* Vladimir K <enewsletters@inbox.ru>, https://github.com/gphoto/libgphoto2/issues/283 */
+	{"Fuji:Fujifilm X-T1",			0x04cb, 0x02bf, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/281 */
+	{"Fuji:Fujifilm X30",			0x04cb, 0x02c1, 0},
+	/* https://sourceforge.net/p/gphoto/feature-requests/464/ */
+	{"Fuji:Fujifilm X-A2",			0x04cb, 0x02c6, 0},
 	/* https://github.com/gphoto/libgphoto2/issues/32 */
 	{"Fuji:Fujifilm X-T10",			0x04cb, 0x02c8, 0},
 	/* with new updated firmware 4.0, https://github.com/gphoto/libgphoto2/issues/220 */
-	{"Fuji:Fujifilm X-Pro2",		0x04cb, 0x02cb, PTP_CAP},
+	{"Fuji:Fujifilm X-Pro2",		0x04cb, 0x02cb, PTP_CAP|PTP_CAP_PREVIEW},
 	/* with new updated firmware 1.1 */
-	{"Fuji:Fujifilm X-T2",			0x04cb, 0x02cd, PTP_CAP},
-
+	{"Fuji:Fujifilm X-T2",			0x04cb, 0x02cd, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/283 */
+	{"Fuji:Fujifilm X100F",			0x04cb, 0x02d1, 0},
 	/* https://github.com/gphoto/libgphoto2/issues/133 */
-	{"Fuji:GFX 50 S",			0x04cb, 0x02d3, 0},
+	{"Fuji:GFX 50 S",			0x04cb, 0x02d3, PTP_CAP|PTP_CAP_PREVIEW},
 	/* https://github.com/gphoto/libgphoto2/issues/170 */
 	{"Fuji:Fujifilm X-T20",			0x04cb, 0x02d4, 0},
+	/* Рустем Валиев <rustvt@gmail.com> */
+	{"Fuji:Fujifilm X-A5",			0x04cb, 0x02d5, 0},
+	/* Daniel Queen <dqueen510@gmail.com> */
+	/* USB Raw Converter/Backup Restore mode, firmware version 1.20 or newer */
+	{"Fuji:Fujifilm X-E3",			0x04cb, 0x02d6, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/283 */
+	{"Fuji:Fujifilm X-H1",			0x04cb, 0x02d7, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Seth Cohen <forwardthinking.llc@gmail.com> */
+	{"Fuji:GFX 50 R",			0x04cb, 0x02dc, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Stefan Weiberg at SUSE */
+	{"Fuji:Fujifilm X-T3",			0x04cb, 0x02dd, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/gphoto2/issues/256 */
+	{"Fuji:Fujifilm GFX100",		0x04cb, 0x02de, PTP_CAP|PTP_CAP_PREVIEW},
+	/* Bruno Filho at SUSE (currently not working with cpature, but shows variables) */
+	/* so far looks like the low end X-T30 does not support tethering, https://www.dpreview.com/forums/thread/4451199 */
+	{"Fuji:Fujifilm X-T30",			0x04cb, 0x02e3, PTP_CAP_PREVIEW},
+	/* via email to gphoto-devel on Apr 2 2021 */
+	{"Fuji:Fujifilm X-Pro3",		0x04cb, 0x02e4, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Fuji:Fujifilm X100V",			0x04cb, 0x02e5, PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/505 */
+	{"Fuji:Fujifilm X-T4",			0x04cb, 0x02e6, PTP_CAP|PTP_CAP_PREVIEW},
+	/* via email */
+	{"Fuji:Fujifilm X-E4",			0x04cb, 0x02e8, 0},
+	/* via https://sourceforge.net/p/gphoto/feature-requests/491/ */
+	{"Fuji:Fujifilm GFX 100S (2nd)",	0x04cb, 0x02e9, PTP_CAP|PTP_CAP_PREVIEW},
+	/* via timelapse-view */
+	{"Fuji:Fujifilm GFX 100S",		0x04cb, 0x02ea, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/603 */
+	{"Fuji:Fujifilm X-S10",			0x04cb, 0x02ea, PTP_CAP_PREVIEW},	/* only webcam mode apparently */
+	{"Fuji:Fujifilm X-H2",			0x04cb, 0x02f2, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/888 */
+	{"Fuji:Fujifilm X-T5",			0x04cb, 0x02fc, PTP_CAP|PTP_CAP_PREVIEW},
 
 	{"Ricoh:Caplio R5 (PTP mode)",          0x05ca, 0x0110, 0},
 	{"Ricoh:Caplio GX (PTP mode)",          0x05ca, 0x0325, 0},
 	{"Sea & Sea:5000G (PTP mode)",		0x05ca, 0x0327, 0},
 	/* Michael Steinhauser <mistr@online.de> */
-	{"Ricoh Caplio:R1v (PTP mode)",		0x05ca, 0x032b, 0},
+	{"Ricoh:Caplio R1v (PTP mode)",		0x05ca, 0x032b, 0},
 	{"Ricoh:Caplio R3 (PTP mode)",          0x05ca, 0x032f, 0},
 	/* Arthur Butler <arthurbutler@otters.ndo.co.uk> */
 	{"Ricoh:Caplio RR750 (PTP mode)",	0x05ca, 0x033d, 0},
@@ -2120,12 +2698,21 @@
 	{"Ricoh:Theta S (PTP mode)",		0x05ca, 0x0366, 0},
 	{"Ricoh:Theta SC (PTP mode)",		0x05ca, 0x0367, 0},
 
+	/* https://github.com/libmtp/libmtp/pull/68  */
+	{"Ricoh:Theta V (PTP mode)",		0x05ca, 0x0368, 0},
+	{"Ricoh:Theta Z1 (PTP mode)",		0x05ca, 0x036d, 0},
+
 	/* Rollei dr5  */
 	{"Rollei:dr5 (PTP mode)",               0x05ca, 0x220f, 0},
 
 	/* Ricoh Caplio GX 8 */
 	{"Ricoh:Caplio GX 8 (PTP mode)",        0x05ca, 0x032d, 0},
 
+	/* Arda Kaan <ardakaan@gmail.com> */
+	{"Ricoh:WG-M2 (PTP mode)",        	0x25fb, 0x210b, 0},
+	/* https://github.com/libmtp/libmtp/issues/148 */
+	{"Ricoh:GR IIIx (PTP mode)",        	0x25fb, 0x25fb, 0},
+
 	/* Pentax cameras */
 	{"Pentax:Optio 43WR",                   0x0a17, 0x000d, 0},
 	/* Stephan Barth at SUSE */
@@ -2133,10 +2720,19 @@
 
 	/* gphoto:feature-requests 452. yes, weird vendor. */
 	{"Pentax:K3 (PTP Mode)",		0x25fb, 0x0165, 0},
+	/* https://github.com/gphoto/gphoto2/issues/469 */
+	{"Pentax:K1 (PTP Mode)",		0x25fb, 0x0179, 0},
+	/* https://github.com/gphoto/gphoto2/issues/459 */
+	{"Pentax:K3 II (PTP Mode)",		0x25fb, 0x017b, 0},
 	/* Keld Henningsen <drawsacircle@hotmail.com */
 	{"Pentax:K70 (PTP Mode)",		0x25fb, 0x017d, 0},
 
+	/* via email to gphoto-devel */
+	{"Pentax:KP (PTP Mode)",		0x25fb, 0x017f, 0},
+
 	{"Sanyo:VPC-C5 (PTP mode)",             0x0474, 0x0230, 0},
+	/* https://github.com/gphoto/libgphoto2/issues/497 */
+	{"Sanyo:VPC-FH1 (PTP mode)",            0x0474, 0x02e5, 0},
 
 	/* from Mike Meyer <mwm@mired.org>. Does not support MTP. */
 	{"Apple:iPhone (PTP mode)",		0x05ac, 0x1290, 0},
@@ -2181,13 +2777,21 @@
 	/* This is a camera ... reported by TAN JIAN QI <JQTAN1@e.ntu.edu.sg */
 	{"Samsung:EK-GC100",			0x04e8,	0x6866, 0},
 
+	/* 522903503@qq.com */
+	{"Sigma:fp",				0x1003,	0xc432, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/882 */
+	{"Sigma:fp L",				0x1003,	0xc442, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* Bernhard Wagner <me@bernhardwagner.net> */
 	{"Leica:M9",				0x1a98,	0x0002, PTP_CAP},
 
+	/* Christopher Kao <christopherkao@icloud.com> */
+	{"Leica:SL (Typ 601)",			0x1a98,	0x2041, PTP_CAP|PTP_CAP_PREVIEW},
+
 	/* https://github.com/gphoto/libgphoto2/issues/105 */
 	{"Parrot:Sequoia",			0x19cf,	0x5039, PTP_CAP},
 
-	{"GoPro:HERO" ,				0x2672, 0x000c, 0},  
+	{"GoPro:HERO" ,				0x2672, 0x000c, 0},
 	{"GoPro:HERO4 Silver" , 		0x2672, 0x000d, 0 },
 
 	/* https://sourceforge.net/p/gphoto/support-requests/130/ */
@@ -2202,6 +2806,21 @@
 
 	/* https://sourceforge.net/p/libmtp/feature-requests/239/ */
 	{"GoPro:HERO6 Black",			0x2672, 0x0037, 0},
+	/* Rasmus Larsson <larsson.rasmus@gmail.com> */
+	{"GoPro:HERO7 White",			0x2672, 0x0042, 0},
+	/* Marcus Meissner */
+	{"GoPro:HERO7 Silver",			0x2672, 0x0043, 0},
+	/* https://sourceforge.net/p/libmtp/feature-requests/284/ */
+	{"GoPro:HERO7 Black",			0x2672, 0x0047, 0},
+	/* https://sourceforge.net/p/libmtp/bugs/1858/ */
+	{"GoPro:HERO8 Black",			0x2672, 0x0049, 0},
+	{"GoPro:HERO9 Black",			0x2672, 0x004D, 0},
+	/* https://github.com/libmtp/libmtp/issues/103 */
+	{"GoPro:HERO10 Black",			0x2672, 0x0056, 0},
+	/* https://github.com/libmtp/libmtp/issues/136 */
+	{"GoPro:HERO11 Black",			0x2672, 0x0059, 0},
+	/* https://github.com/libmtp/libmtp/issues/162 */
+	{"GoPro:HERO11 Black mini",		0x2672, 0x005a, 0},
 #endif
 };
 
@@ -2214,6 +2833,7 @@
 	{"Nikon DSLR (WLAN)"	, PTP_CAP|PTP_CAP_PREVIEW},
 	{"Nikon 1 (WLAN)"	, PTP_CAP|PTP_CAP_PREVIEW},
 	{"Canon EOS (WLAN)"	, PTP_CAP|PTP_CAP_PREVIEW},
+	{"Fuji X (WLAN)"	, PTP_CAP|PTP_CAP_PREVIEW},
 };
 
 #include "device-flags.h"
@@ -2287,6 +2907,7 @@
 	{PTP_OFC_MTP_vCalendar2,	PTP_VENDOR_MICROSOFT, "text/calendar"},
 	{PTP_OFC_CANON_CRW,		PTP_VENDOR_CANON, "image/x-canon-cr2"},
 	{PTP_OFC_CANON_CRW3,		PTP_VENDOR_CANON, "image/x-canon-cr2"},
+	{PTP_OFC_CANON_CR3,		PTP_VENDOR_CANON, "image/x-canon-cr3"},
 	{PTP_OFC_CANON_MOV,		PTP_VENDOR_CANON, "video/quicktime"},
 	{PTP_OFC_CANON_CHDK_CRW,	PTP_VENDOR_CANON, "image/x-canon-cr2"},
 	{PTP_OFC_SONY_RAW,		PTP_VENDOR_SONY, "image/x-sony-arw"},
@@ -2372,6 +2993,9 @@
 	PTPParams *params = &camera->pl->params;
 	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_MICROSOFT)
 		return 1;
+	/* these are also lowercase. */
+	if (params->deviceinfo.Manufacturer && !strcmp(params->deviceinfo.Manufacturer,"motorola"))
+		return 1;
 	/*
 	if (camera->pl->bugs & PTP_MTP)
 		return 1;
@@ -2403,9 +3027,9 @@
 		if (modelsi.device_flags & PTP_CAP) {
 			a.operations |= GP_OPERATION_CAPTURE_IMAGE | GP_OPERATION_CONFIG;
 
-			/* Only Nikon *D* cameras for now -Marcus */
+			/* Only Nikon *D* and *Z* cameras for now -Marcus */
 			if (	(modelsi.usb_vendor == 0x4b0) &&
-				strchr(modelsi.model,'D')
+				(strchr(modelsi.model,'D') || strchr(modelsi.model,'Z'))
 			)
 				a.operations |= GP_OPERATION_TRIGGER_CAPTURE;
 			/* Also enable trigger capture for EOS capture */
@@ -2413,9 +3037,18 @@
 				(strstr(modelsi.model,"EOS") || strstr(modelsi.model,"Rebel"))
 			)
 				a.operations |= GP_OPERATION_TRIGGER_CAPTURE;
+
+			/* Enable for Panasonic */
+			if (modelsi.usb_vendor == 0x04da)
+				a.operations |= GP_OPERATION_TRIGGER_CAPTURE;
+
 			/* Sony Alpha are also trigger capture capable */
 			if (	modelsi.usb_vendor == 0x54c)
 				a.operations |= GP_OPERATION_TRIGGER_CAPTURE;
+
+			/* Olympus test  trigger capture capable */
+			if (	modelsi.usb_vendor == 0x7b4)
+				a.operations |= GP_OPERATION_TRIGGER_CAPTURE;
 #if 0
 			/* SX 100 IS ... works in sdram, not in card mode */
 			if (	(modelsi.usb_vendor == 0x4a9) &&
@@ -2431,6 +3064,10 @@
 		a.folder_operations	= GP_FOLDER_OPERATION_PUT_FILE |
 					GP_FOLDER_OPERATION_MAKE_DIR |
 					GP_FOLDER_OPERATION_REMOVE_DIR;
+		if (modelsi.usb_vendor == 0x4b0) {
+			/* make it clear nikons cannot upload */
+			a.folder_operations	&= ~GP_FOLDER_OPERATION_PUT_FILE;
+		}
 		CR (gp_abilities_list_append (list, a));
 	}
 	for (i = 0; i < sizeof(mtp_models)/sizeof(mtp_models0); i++) {
@@ -2488,6 +3125,8 @@
 		memset(&a, 0, sizeof(a));
 		strcpy(a.model, ptpip_modelsi.model);
 		a.status 		= GP_DRIVER_STATUS_TESTING;
+		if (strstr(ptpip_modelsi.model,"Fuji"))
+			a.status 		= GP_DRIVER_STATUS_EXPERIMENTAL;
 		a.port   		= GP_PORT_PTPIP;
 		a.operations 		= GP_OPERATION_CONFIG;
 		if (ptpip_modelsi.device_flags & PTP_CAP)
@@ -2517,6 +3156,8 @@
 static int
 camera_exit (Camera *camera, GPContext *context)
 {
+	int exit_result = PTP_RC_OK;
+	int exit_gp_result = GP_OK;
 	if (camera->pl!=NULL) {
 		PTPParams *params = &camera->pl->params;
 		PTPContainer event;
@@ -2529,7 +3170,8 @@
 				if (camera->pl->checkevents) {
 					PTPCanon_changes_entry entry;
 
-					ptp_check_eos_events (params);
+					if ((exit_result = ptp_check_eos_events (params)) != PTP_RC_OK)
+						goto exitfailed;
 					while (ptp_get_one_eos_event (params, &entry)) {
 						GP_LOG_D ("missed EOS ptp type %d", entry.type);
 						if (entry.type == PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN)
@@ -2537,30 +3179,54 @@
 					}
 					camera->pl->checkevents = 0;
 				}
-				if (params->inliveview)
-					ptp_canon_eos_end_viewfinder (params);
-				camera_unprepare_capture (camera, context);
+				if (params->inliveview && ptp_operation_issupported(params, PTP_OC_CANON_EOS_TerminateViewfinder))
+					if ((exit_result = ptp_canon_eos_end_viewfinder (params)) != PTP_RC_OK)
+						goto exitfailed;
+
+				if ((exit_gp_result = camera_unprepare_capture (camera, context)) < GP_OK)	/* note: gets gphoto resultcodes, not ptp retcodes */
+					goto exitfailed;
+			}
+			/* this switches the display back on ... */
+			if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_SetRemoteMode)) {
+				C_PTP (ptp_canon_eos_setremotemode(params, 1));
 			}
 			break;
 		case PTP_VENDOR_NIKON:
 			if (ptp_operation_issupported(params, PTP_OC_NIKON_EndLiveView))
-				C_PTP (ptp_nikon_end_liveview (params));
+				if ((exit_result = ptp_nikon_end_liveview (params)) != PTP_RC_OK)
+					goto exitfailed;
 			params->inliveview = 0;
 
 			/* get the Nikon out of control mode again */
-			if (params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_SetControlMode)) {
-				ptp_nikon_setcontrolmode (params, 0);
+			if (params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_ChangeCameraMode)) {
+				ptp_nikon_changecameramode (params, 0);
 				params->controlmode = 0;
 			}
 			break;
 		case PTP_VENDOR_SONY:
+#if 0
+			/* if we call this, the camera shuts down on close in MTP mode */
 			if (ptp_operation_issupported(params, 0x9280)) {
 				C_PTP (ptp_sony_9280(params, 0x4,0,5,0,0,0,0));
 			}
+#endif
 			break;
 		case PTP_VENDOR_FUJI:
 			CR (camera_unprepare_capture (camera, context));
 			break;
+		case PTP_VENDOR_GP_OLYMPUS_OMD: {
+			PTPPropertyValue propval;
+
+			propval.u16 = 0;
+			CR (ptp_setdevicepropvalue (params, 0xD052, &propval, PTP_DTC_UINT16));
+			break;
+		}
+		case PTP_VENDOR_GP_LEICA:
+			if (ptp_operation_issupported(params, PTP_OC_LEICA_LECloseSession)) {
+				if ((exit_result = ptp_leica_leclosesession (params)) != PTP_RC_OK)
+					goto exitfailed;
+			}
+			break;
 		}
 
 		if (camera->pl->checkevents)
@@ -2573,6 +3239,7 @@
 			/* close ptp session */
 			ptp_closesession (params);
 		}
+exitfailed:
 		ptp_free_params(params);
 
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
@@ -2581,6 +3248,10 @@
 		if (params->cd_locale_to_ucs2 != (iconv_t)-1) iconv_close(params->cd_locale_to_ucs2);
 #endif
 
+		if (camera->port->type == GP_PORT_PTPIP) {
+			ptp_ptpip_disconnect (params);
+		}
+
 		free (params->data);
 		free (camera->pl); /* also frees params */
 		params = NULL;
@@ -2597,7 +3268,14 @@
 		gp_port_usb_clear_halt
 				(camera->port, GP_PORT_USB_ENDPOINT_INT);
 	}
-	return (GP_OK);
+#if defined(HAVE_LIBWS232) && defined(WIN32)
+	else if ((camera->port!=NULL) && (camera->port->type == GP_PORT_PTPIP)) {
+		WSACleanup();
+	}
+#endif
+	if (exit_gp_result != GP_OK)
+		return exit_gp_result;
+	return translate_ptp_result(exit_result);
 }
 
 static int
@@ -2613,7 +3291,7 @@
 	   "This driver supports cameras that support PTP or PictBridge(tm), and\n"
 	   "Media Players that support the Media Transfer Protocol (MTP).\n"
 	   "\n"
-	   "Enjoy!"), 2018);
+	   "Enjoy!"), 2023);
 	return (GP_OK);
 }
 
@@ -2622,6 +3300,7 @@
 /* Add new object to internal driver structures. issued when creating
  * folder, uploading objects, or captured images.
  */
+static int get_folder_from_handle (Camera *camera, uint32_t storage, uint32_t handle, char *folder);
 static int
 add_object (Camera *camera, uint32_t handle, GPContext *context)
 {
@@ -2633,9 +3312,164 @@
 }
 
 static int
+add_object_to_fs_and_path (Camera *camera, uint32_t handle, CameraFilePath *path, GPContext *context)
+{
+	PTPObject	*ob;
+	PTPParams	*params = &camera->pl->params;
+	CameraFileInfo	info;
+
+	C_PTP (ptp_object_want (params, handle, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+
+	strcpy  (path->name,  ob->oi.Filename);
+	sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
+
+	get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
+	/* might invalidate ob, so refetch */
+	C_PTP (ptp_object_want (params, handle, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+	/* delete last / or we get confused later. */
+	path->folder strlen(path->folder)-1  = '\0';
+
+	if (ob->oi.ObjectFormat == PTP_OFC_Association)
+		/* FIXME: gp_filesystem_reset */
+		return GP_OK;
+	/* The gp_filesystem_append function only appends files */
+	CR ( gp_filesystem_append (camera->fs, path->folder, path->name, context));
+
+	/* fetch ob pointer again, as gp_filesystem_append can change the object list */
+	C_PTP (ptp_object_want (params, handle, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+
+	memset (&info, 0, sizeof (info));
+	/* we also get the fs info for free, so just set it */
+	info.file.fields = GP_FILE_INFO_TYPE |
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+			GP_FILE_INFO_SIZE | GP_FILE_INFO_MTIME;
+	strcpy_mime (info.file.type, params->deviceinfo.VendorExtensionID, ob->oi.ObjectFormat);
+	info.file.width		= ob->oi.ImagePixWidth;
+	info.file.height	= ob->oi.ImagePixHeight;
+	info.file.size		= ob->oi.ObjectCompressedSize;
+	info.file.mtime		= time(NULL);
+
+	info.preview.fields = GP_FILE_INFO_TYPE |
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+			GP_FILE_INFO_SIZE;
+	strcpy_mime (info.preview.type, params->deviceinfo.VendorExtensionID, ob->oi.ThumbFormat);
+	info.preview.width	= ob->oi.ThumbPixWidth;
+	info.preview.height	= ob->oi.ThumbPixHeight;
+	info.preview.size	= ob->oi.ThumbCompressedSize;
+	GP_LOG_D ("setting fileinfo in fs");
+	return gp_filesystem_set_info_noop(camera->fs, path->folder, path->name, info, context);
+}
+
+/* find JPEGs in data blobs helper ... as most preview data is encapsulated */
+static int
+save_jpeg_in_data_to_preview(const unsigned char *data, unsigned long size, CameraFile *file)
+{
+	unsigned char *startptr = NULL;
+	unsigned char *endptr = NULL;
+
+	/* look for the JPEG SOI marker (0xFFD8) in data */
+	startptr = (unsigned char*)memchr(data, 0xff, size);
+	while(startptr && ((startptr+1) < (data + size))) {
+		if(*(startptr + 1) == 0xd8) { /* SOI found */
+			break;
+		} else { /* go on looking (starting at next byte) */
+			startptr++;
+			startptr = (unsigned char*)memchr(startptr, 0xff, size - (startptr - data));
+		}
+	}
+	if(!startptr)	/* no SOI -> no JPEG */
+		return GP_ERROR;
+
+	endptr = (unsigned char*)memchr(startptr+1, 0xff, size-(startptr-data)-1);
+	while(endptr && ((endptr+1) < (data + size))) {
+		if(*(endptr + 1) == 0xd9) { /* EOI found */
+			endptr += 2;
+			break;
+		} else { /* go on looking (starting at next byte) */
+			endptr++;
+			endptr = (unsigned char*)memchr(endptr, 0xff, size - (endptr-data));
+		}
+	}
+	if(!endptr) /* no SOI -> no JPEG */
+		return GP_ERROR;
+
+	gp_file_append (file, (char*)startptr, endptr - startptr);
+	gp_file_set_mime_type (file, GP_MIME_JPEG);
+	gp_file_set_name (file, "preview.jpg");
+	gp_file_set_mtime (file, time(NULL));
+	return GP_OK;
+}
+
+
+static int
+camera_capture_stream_preview (Camera *camera, CameraFile *file, GPContext *context) {
+	PTPParams		*params = &camera->pl->params;
+	PTPPropertyValue	propval;
+	PTPStreamInfo		sinfo;
+	unsigned char		*data;
+	unsigned int		size;
+
+	C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_EnabledStreams, &propval, PTP_DTC_UINT32));
+	if (!(propval.u32 & 1)) {	/* video enabled already ? */
+		propval.u32 = 1;
+		C_PTP (ptp_setdevicepropvalue (params, PTP_DPC_EnabledStreams, &propval, PTP_DTC_UINT32));
+	}
+	C_PTP (ptp_getstreaminfo (params, 1, &sinfo));
+
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_LEICA) &&
+		(ptp_operation_issupported(params, PTP_OC_LEICA_LEGetStreamData))
+	) {
+		/* ptp header + header before ff d8
+		0000  58 1c 00 00 02 00 25 90-0b 00 00 00 02 01 00 00  X.....%.........
+		0010  46 1c 00 00 00 00 3e 1c-00 00 00 00 b4 00 00 00  F.....>.........
+		0020  01 00 00 00 04 00 00 00-d4 30 00 00 02 00 00 00  .........0......
+		0030  04 00 00 00 d4 30 00 00-03 00 00 00 04 00 00 00  .....0..........
+		0040  53 06 00 00 04 00 00 00-40 00 00 00 00 00 00 00  S.......@.......
+		0050  00 00 00 00 00 00 00 00-00 00 00 00 70 17 00 00  ............p...
+		0060  a0 0f 00 00 00 00 00 00-00 00 00 00 70 17 00 00  ............p...
+		0070  a0 0f 00 00 00 00 00 00-00 00 00 00 70 17 00 00  ............p...
+		0080  a0 0f 00 00 fe ff ff ff-fe ff ff ff 05 00 00 00  ................
+		0090  04 00 00 00 00 00 00 00-06 00 00 00 10 00 00 00  ................
+		00a0  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00  ................
+		00b0  07 00 00 00 04 00 00 00-00 00 00 00 00 00 00 00  ................
+		00c0  ff d8
+		*/
+
+		C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_VideoFormat, &propval, PTP_DTC_UINT32));
+
+		C_PTP (ptp_leica_getstreamdata (params, &data, &size));
+		if (propval.u32 == 0x47504a4d) { /* MJPG */
+			int		ret;
+
+			ret = save_jpeg_in_data_to_preview (data, size, file);
+			if(ret < GP_OK) { /* no SOI -> no JPEG */
+				free (data);
+				gp_context_error (context, _("Sorry, your Nikon camera does not seem to return a JPEG image in LiveView mode"));
+				return GP_ERROR;
+			}
+		} else {
+			gp_file_append (file, (char*)data, size);
+		}
+		gp_file_set_mtime (file, time(NULL));
+		free (data);
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
+	if (ptp_operation_issupported(params, PTP_OC_GetStream)) {
+		C_PTP (ptp_getstream (params, &data, &size));
+		gp_file_append (file, (char*)data, size);
+		free (data);
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
+	SET_CONTEXT_P(params, NULL);
+	return GP_ERROR_NOT_SUPPORTED;
+}
+
+static int
 camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 {
-	unsigned char	*data = NULL, *jpgStartPtr = NULL, *jpgEndPtr = NULL;
+	unsigned char	*data = NULL, *jpgStartPtr = NULL;
 	uint32_t	size = 0;
 	uint16_t	ret;
 	PTPParams *params = &camera->pl->params;
@@ -2672,7 +3506,7 @@
 			 * enough (would be 0.2 seconds, too short for the mirror up operation.). */
 			/* The EOS 100D takes 1.2 seconds */
 			PTPDevicePropDesc       dpd;
-			int			back_off_wait = 0;
+			int			try = 0;
 			struct timeval		event_start;
 
 			SET_CONTEXT_P(params, context);
@@ -2683,7 +3517,7 @@
 
 			/* do not set it everytime, it will cause delays */
 			ret = ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_EVFMode, &dpd);
-			if ((ret != PTP_RC_OK) || (dpd.CurrentValue.u16 != 1)) {
+			if ((ret == PTP_RC_OK) && (dpd.CurrentValue.u16 != 1)) {
 				/* 0 means off, 1 means on */
 				val.u16 = 1;
 				ret = ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFMode, &val, PTP_DTC_UINT16);
@@ -2694,7 +3528,9 @@
 			ptp_free_devicepropdesc (&dpd);
 			/* do not set it everytime, it will cause delays */
 			ret = ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &dpd);
-			if ((ret != PTP_RC_OK) || (dpd.CurrentValue.u32 != 2)) {
+			/* see config.c what kind of values we have ... it seems to be a mask. bit 0 is TFT, bit 1 PC, bit 2 MOBILE, bit 3 MOBILE2? */
+			/* so lets see it only if it does not have any bit set (discounted bit 0) */
+			if ((ret == PTP_RC_OK) && ((dpd.CurrentValue.u32 & ~1) == 0)) {
 				/* 2 means PC, 1 means TFT */
 				val.u32 = 2;
 				C_PTP_MSG (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &val, PTP_DTC_UINT32),
@@ -2715,9 +3551,14 @@
 
 				ret = ptp_canon_eos_get_viewfinder_image (params , &data, &size);
 				if ((ret == 0xa102) || (ret == PTP_RC_DeviceBusy)) { /* means "not there yet" ... so wait */
-					/* wait 3 seconds at most */
+					/* wait 3 seconds at most ... use a bit of backoff logic for cameras where we should not drain compute. */
+					usleep((++try)*5*1000);
+					if (time_since (event_start) < 3*1000)
+						continue;
+/*
 					if (waiting_for_timeout (&back_off_wait, event_start, 3*1000))
 						continue;
+*/
 				}
 				C_PTP_MSG (ret, "get_viewfinder_image failed");
 
@@ -2775,6 +3616,7 @@
 								GP_LOG_E ("len=%d larger than rest size %ld", len, (size-(xdata-data)));
 								break;
 							}
+							GP_LOG_D ("get_viewfinder_image header: len=%d type=%d", len, type);
 							GP_LOG_DATA ((char*)xdata, len, "get_viewfinder_image header:");
 							xdata = xdata+len;
 						}
@@ -2803,8 +3645,8 @@
 		SET_CONTEXT_P(params, context);
 
 		/* Nilon V and J seem to like that */
-		if (!params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_SetControlMode)) {
-			ret = ptp_nikon_setcontrolmode (params, 1);
+		if (!params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_ChangeCameraMode)) {
+			ret = ptp_nikon_changecameramode (params, 1);
 			/* FIXME: PTP_RC_NIKON_ChangeCameraModeFailed does not seem to be problematic */
 			if (ret != PTP_RC_NIKON_ChangeCameraModeFailed)
 				C_PTP_REP (ret);
@@ -2821,16 +3663,43 @@
 			if (have_prop(camera, params->deviceinfo.VendorExtensionID, PTP_DPC_NIKON_RecordingMedia))
 				LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_NIKON_RecordingMedia, &value, PTP_DTC_UINT8));
 
+			if (have_prop(camera, params->deviceinfo.VendorExtensionID, PTP_DPC_NIKON_LiveViewProhibitCondition)) {
+				PTPPropertyValue	cond;
+
+				C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewProhibitCondition, &cond, PTP_DTC_UINT32));
+
+				if (cond.u32) {
+					/* we could have multiple reasons, but just report the first one. by decreasing order of possibility */
+					if (cond.u32 & (1<<8)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Battery exhausted")); return GP_ERROR; }
+					if (cond.u32 & (1<<17)){ gp_context_error (context, _("Liveview cannot start: %s"),_("Temperature too high")); return GP_ERROR; }
+					if (cond.u32 & (1<<9)) { gp_context_error (context, _("Liveview cannot start: %s"),_("TTL error")); return GP_ERROR; }
+					if (cond.u32 & (1<<22)){ gp_context_error (context, _("Liveview cannot start: %s"),_("In Mirror-up operation")); return GP_ERROR; }
+					if (cond.u32 & (1<<5)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Minimum aperture warning")); return GP_ERROR; }
+					if (cond.u32 & (1<<15)){ gp_context_error (context, _("Liveview cannot start: %s"),_("Processing of shooting operation")); return GP_ERROR; }
+					if (cond.u32 & (1<<2)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Sequence error")); return GP_ERROR; }
+					if (cond.u32 & (1<<31)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Exposure Program Mode is not P/A/S/M")); return GP_ERROR; }
+					if (cond.u32 & (1<<21)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Bulb warning")); return GP_ERROR; }
+					if (cond.u32 & (1<<20)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Card unformatted")); return GP_ERROR; }
+					if (cond.u32 & (1<<19)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Card error")); return GP_ERROR; }
+					if (cond.u32 & (1<<18)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Card protected")); return GP_ERROR; }
+					if (cond.u32 & (1<<14)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Recording destination card, but no card or card protected")); return GP_ERROR; }
+					if (cond.u32 & (1<<12)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Pending unretrieved SDRAM image")); return GP_ERROR; }
+					if (cond.u32 & (1<<12)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Pending unretrieved SDRAM image")); return GP_ERROR; }
+					if (cond.u32 & (1<<4)) { gp_context_error (context, _("Liveview cannot start: %s"),_("Fully pressed button")); return GP_ERROR; }
+
+					if (cond.u32 & (1<<24)){ gp_context_error (context, _("Liveview cannot start: %s"),_("Lens is retracting")); goto ignoreerror; }
+					gp_context_error (context, _("Liveview cannot start: code 0x%08x"), cond.u32);
+					return GP_ERROR;
+				}
+			}
+
+ignoreerror:
 			ret = ptp_nikon_start_liveview (params);
 			if ((ret != PTP_RC_OK) && (ret != PTP_RC_DeviceBusy))
 				C_PTP_REP_MSG (ret, _("Nikon enable liveview failed"));
 
-			do {
-				ret = ptp_nikon_device_ready(params);
-				usleep(20*1000);
-			} while (ret == PTP_RC_DeviceBusy);
-
-			C_PTP_REP_MSG (ret, _("Nikon enable liveview failed"));
+			/* wait up to 1 second */
+			C_PTP_REP_MSG (nikon_wait_busy(params,20,2000), _("Nikon enable liveview failed"));
 			params->inliveview = 1;
 			firstimage = 1;
 		}
@@ -2840,12 +3709,7 @@
 			if ((ret != PTP_RC_OK) && (ret != PTP_RC_DeviceBusy))
 				C_PTP_REP_MSG (ret, _("Nikon enable liveview failed"));
 
-			do {
-				ret = ptp_nikon_device_ready(params);
-				usleep(20*1000);
-			} while (ret == PTP_RC_DeviceBusy);
-
-			C_PTP_REP_MSG (ret, _("Nikon enable liveview failed"));
+			C_PTP_REP_MSG (nikon_wait_busy(params,20,2000), _("Nikon enable liveview failed"));
 			params->inliveview = 1;
 		}
 		tries = 20;
@@ -2858,6 +3722,8 @@
 				goto enable_liveview;
 			}
 			if (ret == PTP_RC_OK) {
+				int res;
+
 				if (firstimage) {
 					/* the first image on the S9700 is corrupted. so just skip the first image */
 					firstimage = 0;
@@ -2865,41 +3731,12 @@
 					continue;
 				}
 				/* look for the JPEG SOI marker (0xFFD8) in data */
-				jpgStartPtr = (unsigned char*)memchr(data, 0xff, size);
-				while(jpgStartPtr && ((jpgStartPtr+1) < (data + size))) {
-					if(*(jpgStartPtr + 1) == 0xd8) { /* SOI found */
-						break;
-					} else { /* go on looking (starting at next byte) */
-						jpgStartPtr++;
-						jpgStartPtr = (unsigned char*)memchr(jpgStartPtr, 0xff, data + size - jpgStartPtr);
-					}
-				}
-				if(!jpgStartPtr) { /* no SOI -> no JPEG */
-					gp_context_error (context, _("Sorry, your Nikon camera does not seem to return a JPEG image in LiveView mode"));
-					return GP_ERROR;
-				}
-				/* if SOI found, start looking for EOI marker (0xFFD9) one byte after SOI
-				   (just to be sure we will not go beyond the end of the data array) */
-				jpgEndPtr = (unsigned char*)memchr(jpgStartPtr+1, 0xff, data+size-jpgStartPtr-1);
-				while(jpgEndPtr && ((jpgEndPtr+1) < (data + size))) {
-					if(*(jpgEndPtr + 1) == 0xd9) { /* EOI found */
-						jpgEndPtr += 2;
-						break;
-					} else { /* go on looking (starting at next byte) */
-						jpgEndPtr++;
-						jpgEndPtr = (unsigned char*)memchr(jpgEndPtr, 0xff, data + size - jpgEndPtr);
-					}
-				}
-				if(!jpgEndPtr) { /* no EOI -> no JPEG */
+				res = save_jpeg_in_data_to_preview (data, size, file);
+				free (data); /* FIXME: perhaps handle the 128 byte header data too. */
+				if(res < GP_OK) { /* no SOI -> no JPEG */
 					gp_context_error (context, _("Sorry, your Nikon camera does not seem to return a JPEG image in LiveView mode"));
 					return GP_ERROR;
 				}
-				gp_file_append (file, (char*)jpgStartPtr, jpgEndPtr-jpgStartPtr);
-				free (data); /* FIXME: perhaps handle the 128 byte header data too. */
-				gp_file_set_mime_type (file, GP_MIME_JPEG);     /* always */
-				/* Add an arbitrary file name so caller won't crash */
-				gp_file_set_name (file, "preview.jpg");
-				gp_file_set_mtime (file, time(NULL));
 				break;
 			}
 			if (ret == PTP_RC_DeviceBusy) {
@@ -2918,62 +3755,241 @@
 		return GP_OK;
 	}
 	case PTP_VENDOR_SONY: {
+		/* same for Alpha series and QX */
 		uint32_t	preview_object = 0xffffc002; /* this is where the liveview image is accessed */
 		unsigned char	*ximage = NULL;
-		int		tries = 20;
+		int		tries = 50;
+		int		res, oldtimeout;
 
-		ptp_check_event (params);	/* will stall for some reason */
+#if 0
+		/* this times out, with 0.3 seconds wait ... bad */
+		ptp_check_event (params); 	/* will stall for some reason */
+#endif
+		CR (gp_port_get_timeout (camera->port, &oldtimeout));
+		CR (gp_port_set_timeout (camera->port, 1*1000));
 		do {
+			PTPObjectInfo oi;
+
+			/* This state can persist for up to 1 second on the ZV-1 */
+			ret = ptp_getobjectinfo(params, preview_object, &oi);
+			if (ret == PTP_RC_InvalidObjectHandle) {
+				usleep(50*1000);
+				continue;
+			}
+			if (ret == PTP_RC_OK)
+				ptp_free_objectinfo(&oi);
+
 			ret = ptp_getobject_with_size(params, preview_object, &ximage, &size);
 			if (ret == PTP_RC_OK)
 				break;
 			if (ret != PTP_RC_AccessDenied) /* we get those when we are too fast */
 				C_PTP (ret);
+			usleep(20*1000);
 		} while (tries--);
+		CR (gp_port_set_timeout (camera->port, oldtimeout));
 
-		/* look for the JPEG SOI marker (0xFFD8) in data */
-		jpgStartPtr = (unsigned char*)memchr(ximage, 0xff, size);
-		while(jpgStartPtr && ((jpgStartPtr+1) < (ximage + size))) {
-			if(*(jpgStartPtr + 1) == 0xd8) { /* SOI found */
-				break;
-			} else { /* go on looking (starting at next byte) */
-				jpgStartPtr++;
-				jpgStartPtr = (unsigned char*)memchr(jpgStartPtr, 0xff, ximage + size - jpgStartPtr);
-			}
+		jpgStartPtr = ximage;
+		/* There is an initial blob, and we had a case where 0xff 0xd8 was in the initial blob
+		 * https://github.com/gphoto/gphoto2/issues/389
+		 * as the data starts with an apparent offset into the data to the JPEG, try to use that
+		 */
+		if (size > 4) {
+			unsigned int offset = ximage0 | (ximage1 << 8) | (ximage2 << 16) | (ximage3 << 24);
+			if ((offset+1 < size) && (ximageoffset == 0xff) && (ximageoffset+1 == 0xd8))
+				jpgStartPtr = ximage + offset;
 		}
-		if(!jpgStartPtr) { /* no SOI -> no JPEG */
+
+		res = save_jpeg_in_data_to_preview(jpgStartPtr, size - (jpgStartPtr-ximage), file);
+		free (ximage); /* FIXME: perhaps handle the 128 byte header data too. */
+
+		if(res < GP_OK) { /* no SOI -> no JPEG */
 			gp_context_error (context, _("Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"));
 			return GP_ERROR;
 		}
-		/* if SOI found, start looking for EOI marker (0xFFD9) one byte after SOI
-		   (just to be sure we will not go beyond the end of the data array) */
-		jpgEndPtr = (unsigned char*)memchr(jpgStartPtr+1, 0xff, ximage+size-jpgStartPtr-1);
-		while(jpgEndPtr && ((jpgEndPtr+1) < (ximage + size))) {
-			if(*(jpgEndPtr + 1) == 0xd9) { /* EOI found */
-				jpgEndPtr += 2;
-				break;
-			} else { /* go on looking (starting at next byte) */
-				jpgEndPtr++;
-				jpgEndPtr = (unsigned char*)memchr(jpgEndPtr, 0xff, ximage + size - jpgEndPtr);
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
+	case PTP_VENDOR_FUJI: {
+		PTPObjectInfo	oi;
+		uint32_t	preview_object = 0x80000001; /* this is where the liveview image is accessed */
+		unsigned char	*ximage = NULL;
+		int		tries = 10;
+
+		if (params->jpgfd) {
+			int res;
+
+			C_PTP (ptp_fujiptpip_jpeg (params, &ximage, &size));
+
+			/* there is a bit of header in front ... skip it */
+			res = save_jpeg_in_data_to_preview(ximage, size, file);
+			free (ximage);
+
+			SET_CONTEXT_P(params, NULL);
+			return res;
+		}
+
+		while (tries--) {
+			ret = ptp_getobjectinfo (params, preview_object, &oi);
+			if (ret == PTP_RC_OK) {
+				ptp_free_objectinfo(&oi);
+				break;
 			}
+			if (ret == PTP_RC_InvalidObjectHandle) {
+				/* 1000 x 10 tries was not enough for the S10 ... make the wait a bit longer
+				 * see https://github.com/gphoto/libgphoto2/issues/603 */
+				usleep(5*1000);
+				continue;
+			}
+			C_PTP_REP (ret);
 		}
-		if(!jpgEndPtr) { /* no EOI -> no JPEG */
-			gp_context_error (context, _("Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"));
-			return GP_ERROR;
+
+		if(ret != PTP_RC_OK) {
+			tries = 5;
+			while (tries--) {
+				ret = ptp_initiateopencapture(params, 0x00000000, 0x00000000);
+				if (ret == PTP_RC_OK) {
+					params->opencapture_transid = params->transaction_id-1;
+					params->inliveview = 1;
+					usleep(100*1000); /* this basically waits until the first object is there. */
+					break;
+				}
+				usleep(200*1000);
+			}
+		}
+
+		tries = 20;
+		do {
+			ret = ptp_getobject_with_size(params, preview_object, &ximage, &size);
+			if (ret == PTP_RC_OK)
+				break;
+			if(ret == PTP_RC_DeviceBusy) {
+				usleep(1000);
+				continue;
+			}
+
+			if (ret != PTP_RC_AccessDenied) /* we get those when we are too fast */ /* priobably pasted from nikon, check? */
+				C_PTP (ret);
+		} while (tries--);
+		C_PTP_REP (ptp_deleteobject(params, preview_object, 0));
+
+		/* Fuji Liveview returns FF D8 ... FF D9 ... so no meta data wrapped around the jpeg data */
+		gp_file_append (file, (char*)ximage, size);
+		free (ximage);
+
+		gp_file_set_mime_type (file, GP_MIME_JPEG);
+		gp_file_set_name (file, "preview.jpg");
+		gp_file_set_mtime (file, time(NULL));
+
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
+	case PTP_VENDOR_PANASONIC: {
+		unsigned char	*ximage = NULL;
+		int		tries = 25;
+		int		res;
+
+		if(!params->inliveview) {
+			C_PTP_REP(ptp_panasonic_liveview(params, 1));
+			params->inliveview = 1;
+			usleep(100000);
+		}
+
+		for (;;) {
+			tries--;
+			if(tries <= 0)
+				return translate_ptp_result (ret);
+			ret = ptp_panasonic_liveview_image (params, &ximage, &size);
+			if(ret == PTP_RC_DeviceBusy) {
+				usleep(40000);
+				continue;
+			} else {
+				break;
+			}
 		}
-		gp_file_append (file, (char*)jpgStartPtr, jpgEndPtr-jpgStartPtr);
+		/* look for the JPEG SOI marker (0xFFD8) in data */
+		res = save_jpeg_in_data_to_preview (ximage, size, file);
 		free (ximage); /* FIXME: perhaps handle the 128 byte header data too. */
+		if(res < GP_OK) { /* no SOI -> no JPEG */
+			gp_context_error (context, _("Sorry, your Panasonic camera does not seem to return a JPEG image in LiveView mode"));
+			return GP_ERROR;
+		}
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
+	case PTP_VENDOR_GP_OLYMPUS_OMD: {
+		unsigned char		*ximage = NULL;
+		PTPPropertyValue	value;
+		int			tries = 25;
+
+		ret = ptp_getdevicepropvalue (params, PTP_DPC_OLYMPUS_LiveViewModeOM, &value, PTP_DTC_UINT32);
+		if (ret != PTP_RC_OK)
+			value.u32 = 0;
+
+		if (value.u32 != 67109632) {	/* 0x04000300 */
+			value.u32 = 67109632;
+			LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_OLYMPUS_LiveViewModeOM, &value, PTP_DTC_UINT32));
+
+			params->inliveview = 1;
+		}
+
+		for(;;) {
+			tries--;
+			if(tries <= 0) {
+				return ret;
+			}
+			ret = ptp_olympus_liveview_image (params, &ximage, &size);
+			if(ret == PTP_RC_DeviceBusy || size < 1024) {
+				usleep(40000);
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		gp_file_append (file, (char*)ximage, size);
+		free (ximage);
 
 		gp_file_set_mime_type (file, GP_MIME_JPEG);
-		gp_file_set_name (file, "sony_preview.jpg");
+		gp_file_set_name (file, "preview.jpg");
 		gp_file_set_mtime (file, time(NULL));
 
 		SET_CONTEXT_P(params, NULL);
 		return GP_OK;
 	}
+
+	case PTP_VENDOR_GP_SIGMAFP: {
+		unsigned char	*ximage = NULL;
+		int		res;
+
+		size = 0;
+
+		C_PTP (ptp_sigma_fp_liveview_image (params, &ximage, &size));
+		if (size < 4) return GP_ERROR;
+
+		/* look for the JPEG SOI marker (0xFFD8) in data */
+		res = save_jpeg_in_data_to_preview (ximage, size, file);
+		free (ximage);
+		if(res < GP_OK) { /* no SOI -> no JPEG */
+			gp_context_error (context, _("Sorry, your Panasonic camera does not seem to return a JPEG image in LiveView mode"));
+			return GP_ERROR;
+		}
+		SET_CONTEXT_P(params, NULL);
+		return GP_OK;
+	}
 	default:
 		break;
 	}
+	/* Check if we can do PTP 1.1 stream method */
+	if (	ptp_operation_issupported(params,PTP_OC_GetStreamInfo) &&
+		ptp_property_issupported(params, PTP_DPC_SupportedStreams)
+	)  {
+		PTPPropertyValue propval;
+
+		C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_SupportedStreams, &propval, PTP_DTC_UINT32));
+		if (propval.u32 & 1) /* camera does Video streams */
+			return camera_capture_stream_preview (camera, file, context);
+		/* fallthrough */
+	}
 	return GP_ERROR_NOT_SUPPORTED;
 }
 
@@ -3032,6 +4048,7 @@
 	/* We have now handed over the file, disclaim responsibility by unref. */
 	gp_file_unref (file);
 
+	memset (&info, 0, sizeof (info));
 	/* we also get the fs info for free, so just set it */
 	info.file.fields = GP_FILE_INFO_TYPE |
 			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
@@ -3074,7 +4091,6 @@
 camera_nikon_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
 		uint32_t af, int sdram, GPContext *context)
 {
-	static int capcnt = 0;
 	PTPObjectInfo		oi;
 	PTPParams		*params = &camera->pl->params;
 	PTPDevicePropDesc	propdesc;
@@ -3083,6 +4099,10 @@
 	uint32_t		newobject;
 	int			back_off_wait = 0;
 	struct timeval          capture_start;
+	int			loops;
+	PTPContainer		*storedevents = NULL;
+	unsigned int		nrstoredevents = 0;
+	PTPContainer		event;
 
 
 	if (type != GP_CAPTURE_IMAGE)
@@ -3092,15 +4112,15 @@
 		return GP_ERROR_NOT_SUPPORTED;
 
 	/* Nilon V and J seem to like that */
-	if (!params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_SetControlMode)) {
-		ret = ptp_nikon_setcontrolmode (params, 1);
+	if (!params->controlmode && ptp_operation_issupported(params,PTP_OC_NIKON_ChangeCameraMode)) {
+		ret = ptp_nikon_changecameramode (params, 1);
 		/* FIXME: PTP_RC_NIKON_ChangeCameraModeFailed does not seem to be problematic */
 		if (ret != PTP_RC_NIKON_ChangeCameraModeFailed)
 			C_PTP_REP (ret);
 		params->controlmode = 1;
 	}
 
-	if (	!ptp_operation_issupported(params,PTP_OC_NIKON_Capture) &&
+	if (	!ptp_operation_issupported(params,PTP_OC_NIKON_InitiateCaptureRecInSdram) &&
 		!ptp_operation_issupported(params,PTP_OC_NIKON_AfCaptureSDRAM) &&
 		!ptp_operation_issupported(params,PTP_OC_NIKON_InitiateCaptureRecInMedia)
 	) {
@@ -3108,6 +4128,7 @@
                	_("Sorry, your camera does not support Nikon capture"));
 		return GP_ERROR_NOT_SUPPORTED;
 	}
+
 	if (	ptp_property_issupported(params, PTP_DPC_StillCaptureMode)	&&
 		(PTP_RC_OK == ptp_getdevicepropdesc (params, PTP_DPC_StillCaptureMode, &propdesc))) {
 		PTPDevicePropDesc       burstdesc;
@@ -3127,26 +4148,34 @@
 
 	/* if in liveview mode, we have to run non-af capture */
 	params->inliveview = 0;
-	if (ptp_property_issupported (params, PTP_DPC_NIKON_LiveViewStatus)) {
+	if (ptp_property_issupported (params, PTP_DPC_NIKON_LiveViewStatus) && ptp_operation_issupported(params,PTP_OC_NIKON_StartLiveView)) {
 		ret = ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewStatus, &propval, PTP_DTC_UINT8);
 		if (ret == PTP_RC_OK)
 			params->inliveview = propval.u8;
 		if (params->inliveview) af = 0;
 	}
 
-	if (NIKON_1(params)) {
+	if (NIKON_1(params) && ptp_operation_issupported(params,PTP_OC_NIKON_StartLiveView)) { /* V1 does not have startliveview */
 		ret = ptp_nikon_start_liveview (params);
 		if ((ret != PTP_RC_OK) && (ret != PTP_RC_DeviceBusy))
 			C_PTP_REP_MSG(ret, _("Failed to enable liveview on a Nikon 1, but it is required for capture"));
 		/* OK or busy, try to proceed ... */
-		do {
-			ret = ptp_nikon_device_ready(params);
-			usleep(20*1000);
-		} while (ret == PTP_RC_DeviceBusy);
+		C_PTP_REP_MSG (nikon_wait_busy(params,20,2000), _("Nikon enable liveview failed"));
 	}
 
+	/* before we start real capture, move the current hw event queue to our local queue */
+	while (ptp_get_one_event(params, &event)) {
+		GP_LOG_D ("saving event queue before capture: event.Code is %x / param %lx", event.Code, (unsigned long)event.Param1);
+		ptp_add_event_queue (&storedevents, &nrstoredevents, &event);
+	}
+	free(storedevents); storedevents = NULL;
+
+
 	if (ptp_operation_issupported(params, PTP_OC_NIKON_InitiateCaptureRecInMedia)) {
-		int loops = 100;
+		/* we assume for modern cameras this event method works to avoid longer waits */
+		params->event90c7works = 1;
+
+		loops = 100;
 		do {
 			ret = ptp_nikon_capture2 (params, af, sdram);
 			/* Nikon 1 ... if af is 0, it reports PTP_RC_NIKON_InvalidStatus */
@@ -3158,48 +4187,45 @@
 
 			if (	(ret == PTP_RC_DeviceBusy) ||
 				/* this is seen on Nikon V3 */
-				(ret == PTP_RC_NIKON_InvalidStatus)
+				(ret == PTP_RC_NIKON_InvalidStatus) ||
+				(ret == 0xa207)	/* on Nikon D850 */
 			)  usleep(2000);
 		} while (((ret == PTP_RC_DeviceBusy) || (ret ==  PTP_RC_NIKON_InvalidStatus)) && loops--);
 		goto capturetriggered;
 	}
 
-	if (!params->inliveview && ptp_operation_issupported(params,PTP_OC_NIKON_AfCaptureSDRAM)) {
-		int loops = 100;
+	if (!params->inliveview && af && ptp_operation_issupported(params,PTP_OC_NIKON_AfCaptureSDRAM)) {
+		loops = 100;
 		do {
 			ret = ptp_nikon_capture_sdram(params);
 		} while ((ret == PTP_RC_DeviceBusy) && (loops--));
 	} else {
-		int loops = 100;
+		loops = 100;
 		do {
 			ret = ptp_nikon_capture(params, 0xffffffff);
 		} while ((ret == PTP_RC_DeviceBusy) && (loops--));
 	}
 
 capturetriggered:
-	C_PTP_REP (ret);
+	if (ret != PTP_RC_OK) {
+		/* store back all the queued events back to the hw event queue before returning. */
+		/* we do not do this in all error edge cases currently, only the ones that can trigger often */
+		ptp_add_events (params, storedevents, nrstoredevents);
+		free(storedevents); storedevents = NULL;
+		C_PTP_REP (ret);
+	}
 
 	CR (gp_port_set_timeout (camera->port, capture_timeout));
 
-	while ((ret = ptp_nikon_device_ready(params)) == PTP_RC_DeviceBusy) {
-		gp_context_idle (context);
-		/* do not drain all of the DSLRs compute time */
-		usleep(100*1000); /* 0.1 seconds */
-	}
-
-	C_PTP_REP (ret); /* e.g. out of focus gets reported here. */
+	C_PTP_REP (nikon_wait_busy (params, 100, 1000*1000)); /* lets wait 1000 seconds (D780 can do 900seconds exposures) */
 
 	newobject = 0xffff0001;
 	done = 0; tries = 100;
 	capture_start = time_now();
 	do {
-		PTPContainer	event;
-		int 		checkevt;
-
 		/* Just busy loop until the camera is ready again. */
 		/* and wait for the 0xc101 event */
 		C_PTP_REP (ptp_check_event (params));
-		checkevt = 0;
 		while (ptp_get_one_event(params, &event)) {
 			GP_LOG_D ("event.Code is %x / param %lx", event.Code, (unsigned long)event.Param1);
 			switch (event.Code) {
@@ -3218,8 +4244,7 @@
 				/* if we got one object already, put it into the queue */
 				/* e.g. for NEF+RAW capture */
 				if (newobject != 0xffff0001) {
-					ptp_add_event (params, &event);
-					checkevt = 1; /* avoid endless loop */
+					ptp_add_event_queue (&storedevents, &nrstoredevents, &event);
 					done = 3;
 					break;
 				}
@@ -3250,12 +4275,9 @@
 				break;
 			default:
 				GP_LOG_D ("UNHANDLED event.Code is %x / param %lx, DEFER", event.Code, (unsigned long)event.Param1);
-				ptp_add_event (params, &event);
-				checkevt = 1; /* avoid endless loop */
+				ptp_add_event_queue (&storedevents, &nrstoredevents, &event);
 				break;
 			}
-			if (checkevt)
-				break;
 		}
 		/* we got both capturecomplete and objectadded ... leave */
 		if (done == 3)
@@ -3268,14 +4290,19 @@
 		gp_context_idle (context);
 		/* do not drain all of the DSLRs compute time */
 	} while ((done != 3) && waiting_for_timeout (&back_off_wait, capture_start, 70*1000)); /* 70 seconds */
-	/* Maximum image time is 30 seconds, but NR processing might take 25 seconds ... so wait longer. 
+
+	/* add all the queued events back to the event queue */
+	ptp_add_events (params, storedevents, nrstoredevents);
+	free(storedevents); storedevents = NULL;
+
+	/* Maximum image time is 30 seconds, but NR processing might take 25 seconds ... so wait longer.
 	 * see https://github.com/gphoto/libgphoto2/issues/94 */
 
 	if (!newobject) newobject = 0xffff0001;
 
 	CR (gp_port_set_timeout (camera->port, normal_timeout));
 
-	/* This loop handles single and burst capture. 
+	/* This loop handles single and burst capture.
 	 * It also handles SDRAM and also CARD capture.
 	 * In Burst/SDRAM we need to download everything at once
 	 * In all SDRAM modes we download and store it in the virtual fs.
@@ -3308,11 +4335,12 @@
 
 			if (oi.ObjectFormat != PTP_OFC_EXIF_JPEG) {
 				GP_LOG_D ("raw? ofc is 0x%04x, name is %s", oi.ObjectFormat,oi.Filename);
-				sprintf (path->name, "capt%04d.nef", capcnt++);
+				sprintf (path->name, "capt%04d.nef", params->capcnt++);
 			} else {
-				sprintf (path->name, "capt%04d.jpg", capcnt++);
+				sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 			}
 			ret = add_objectid_and_upload (camera, path, context, newobject, &oi);
+			ptp_free_objectinfo(&oi);
 			if (ret != GP_OK) {
 				GP_LOG_E ("failed to add object\n");
 				return ret;
@@ -3324,7 +4352,7 @@
 				ret = ptp_deleteobject (params, newobject, 0);
 				if (ret != PTP_RC_OK) {
 					GP_LOG_E ("deleteobject(%x) failed: %x", newobject, ret);
-					if (ret == PTP_RC_InvalidObjectHandle)
+					if ((ret == PTP_RC_InvalidObjectHandle)  || (ret == PTP_RC_StoreNotAvailable))
 						params->deletesdramfails = 1;
 					else
 						ret = ptp_nikon_delete_sdram_image (params, newobject);
@@ -3335,25 +4363,21 @@
 				}
 			}
 		} else { /* capture to card branch */
-			CR (add_object (camera, newobject, context));
-			strcpy  (path->name,  oi.Filename);
-			sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)oi.StorageID);
-			get_folder_from_handle (camera, oi.StorageID, oi.ParentObject, path->folder);
-			/* delete last / or we get confused later. */
-			path->folder strlen(path->folder)-1  = '\0';
-
+			ret = add_object_to_fs_and_path (camera, newobject, path, context);
+			/* this has handled adding an association earlier */
 			ptp_free_objectinfo(&oi);
-
-			/* not doing the rest of the burst loop ... */
-			return gp_filesystem_append (camera->fs, path->folder, path->name, context);
+			return ret;
 		}
 	}
 	ptp_check_event (params);
 	return GP_OK;
 }
 
-/* 60 seconds timeout in ms ... (for long cycles) */
-#define EOS_CAPTURE_TIMEOUT (60*1000)
+/* 90 seconds timeout in ms ... (for long cycles)
+ * while the max shutterspeed is 30seconds, there is also postprocessing of 30seconds happening
+ * in e.g. https://github.com/gphoto/libgphoto2/issues/503
+ */
+#define EOS_CAPTURE_TIMEOUT (90*1000)
 
 /* This is currently the capture method used by the EOS 400D
  * ... in development.
@@ -3369,7 +4393,6 @@
 	PTPCanon_changes_entry	entry;
 	CameraFile		*file = NULL;
 	CameraFileInfo		info;
-	static int		capcnt = 0;
 	PTPObjectInfo		oi;
 	int			back_off_wait = 0;
 	struct timeval          capture_start;
@@ -3412,23 +4435,21 @@
 				gp_filesystem_reset (camera->fs);
 				break;
 			case PTP_CANON_EOS_CHANGES_TYPE_OBJECTINFO: {
-				PTPObject	*ob;
+				int res;
 
 				/* just add it to the filesystem, and return in CameraPath */
 				GP_LOG_D ("Found new object! OID 0x%x, name %s", (unsigned int)entry.u.object.oid, entry.u.object.oi.Filename);
+				/* We have some form of objectinfo in entry.u.object.oi already, but we let the
+				 * code refetch it via regular GetObjectInfo */
+
+				res = add_object_to_fs_and_path (camera, entry.u.object.oid, path, context);
+				if (res < GP_OK)
+					break;
 				memcpy (&oi, &entry.u.object.oi, sizeof(oi));
-				ret = ptp_object_want (params, entry.u.object.oid, 0, &ob);
-				if (ret != PTP_RC_OK)
-					continue;
-				strcpy  (path->name,  oi.Filename);
-				sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)oi.StorageID);
-				get_folder_from_handle (camera, oi.StorageID, oi.ParentObject, path->folder);
-				/* delete last / or we get confused later. */
-				path->folder strlen(path->folder)-1  = '\0';
-				gp_filesystem_append (camera->fs, path->folder, path->name, context);
-				/* The camera might have rotated the folder from NNNCANON to NNN+1CANON , image probably comes next ... */
+
 				if  (entry.u.object.oi.ObjectFormat == PTP_OFC_Association)
 					continue;
+				gp_filesystem_append (camera->fs, path->folder, path->name, context);
 				newobject = entry.u.object.oid;
 				break;/* for RAW+JPG mode capture, we just return the first image for now, and
 				       * let wait_for_event get the rest. */
@@ -3456,12 +4477,16 @@
 		return GP_OK;
 
 	strcpy  (path->folder,"/");
-	sprintf (path->name, "capt%04d.", capcnt++);
+	sprintf (path->name, "capt%04d.", params->capcnt++);
 	CR (gp_file_new(&file));
 	if (oi.ObjectFormat == PTP_OFC_CANON_CRW || oi.ObjectFormat == PTP_OFC_CANON_CRW3) {
 		mime = GP_MIME_CRW;
 		strcat(path->name, "cr2");
 		gp_file_set_mime_type (file, GP_MIME_CRW);
+	} else if (oi.ObjectFormat == PTP_OFC_CANON_CR3) {
+		mime = GP_MIME_CR3;
+		strcat(path->name, "cr3");
+		gp_file_set_mime_type (file, GP_MIME_CR3);
 	} else {
 		mime = GP_MIME_JPEG;
 		strcat(path->name, "jpg");
@@ -3471,7 +4496,8 @@
 
 	GP_LOG_D ("trying to get object size=0x%lx", (unsigned long)oi.ObjectCompressedSize);
 
-#define BLOBSIZE 5*1024*1024
+#define BLOBSIZE 1*1024*1024
+	/* the EOS R does not like 5MB, but likes 1MB */
 	/* Trying to read this in 1 block might be the cause of crashes of newer EOS */
 	{
 		uint32_t	offset = 0;
@@ -3482,7 +4508,7 @@
 
 			if (xsize > BLOBSIZE)
 				xsize = BLOBSIZE;
-			ptp_canon_eos_getpartialobject (params, newobject, offset, xsize, &ximage);
+			C_PTP_REP (ptp_getpartialobject (params, newobject, offset, xsize, &ximage, &xsize));
 			gp_file_append (file, (char*)ximage, xsize);
 			free (ximage);
 			offset += xsize;
@@ -3581,13 +4607,13 @@
 				/* remember for later deletion */
 				if (oi.ObjectFormat == PTP_OFC_Association) {
 					assochandle = event.Param1;
+					ptp_free_objectinfo(&oi);
 					continue;
 				}
 
 				if (oi.ObjectFormat == PTP_OFC_EXIF_JPEG) {
-					static int capcnt = 0;
 					sprintf (path->folder,"/");
-					sprintf (path->name, "capt%04d.jpg", capcnt++);
+					sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 					res = add_objectid_and_upload (camera, path, context, event.Param1, &oi);
 
 					ret = ptp_deleteobject (params, event.Param1, PTP_OFC_EXIF_JPEG);
@@ -3596,8 +4622,10 @@
 					ret = ptp_deleteobject (params, assochandle, PTP_OFC_Association);
 					if (ret != PTP_RC_OK)
 						GP_LOG_E ("capture 2: delete folder %08x, ret 0x%04x", assochandle, ret);
+					ptp_free_objectinfo(&oi);
 					return res;
 				}
+				ptp_free_objectinfo(&oi);
 				GP_LOG_E ("capture 2: unknown OFC 0x%04x for 0x%x", oi.ObjectFormat, event.Param1);
 			}
 		}
@@ -3614,7 +4642,6 @@
 camera_canon_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
 		GPContext *context)
 {
-	static int 		capcnt = 0;
 	PTPObjectInfo		oi;
 	int			found, ret, timeout, sawcapturecomplete = 0, viewfinderwason = 0;
 	PTPParams		*params = &camera->pl->params;
@@ -3730,8 +4757,8 @@
 				newobject = event.Param1;
 				/* FALLTHROUGH */
 			}
-			/* FALLTHROUGH */
 		}
+			/* FALLTHROUGH */
 		case PTP_EC_CANON_RequestObjectTransfer: {
 			int j;
 
@@ -3802,24 +4829,24 @@
 		if (xmode != CANON_TRANSFER_CARD) {
 			fprintf (stderr,"parentobject is 0x%x, but not in card mode?\n", oi.ParentObject);
 		}
-		CR (add_object (camera, newobject, context));
-		strcpy  (path->name,  oi.Filename);
-		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)oi.StorageID);
-		get_folder_from_handle (camera, oi.StorageID, oi.ParentObject, path->folder);
-		/* delete last / or we get confused later. */
-		path->folder strlen(path->folder)-1  = '\0';
-		return gp_filesystem_append (camera->fs, path->folder, path->name, context);
+		ret = add_object_to_fs_and_path (camera, newobject, path, context);
+		/* FIXME: consistent handling of association add ... perhaps try another event loop turnaroundloop turnaround  */
+		if (oi.ObjectFormat == PTP_OFC_Association)
+			gp_filesystem_reset (camera->fs);
+		ptp_free_objectinfo(&oi);
+		return ret;
 	} else {
 		if (xmode == CANON_TRANSFER_CARD) {
 			fprintf (stderr,"parentobject is 0, but not in memory mode?\n");
 		}
 		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx",(unsigned long)oi.StorageID);
-		sprintf (path->name, "capt%04d.jpg", capcnt++);
-		return add_objectid_and_upload (camera, path, context, newobject, &oi);
+		sprintf (path->name, "capt%04d.jpg", params->capcnt++);
+		ret = add_objectid_and_upload (camera, path, context, newobject, &oi);
+		ptp_free_objectinfo(&oi);
+		return ret;
 	}
 }
 
-
 static int
 camera_sony_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
 {
@@ -3828,21 +4855,57 @@
 	PTPContainer	event;
 	PTPObjectInfo	oi;
 	uint32_t	newobject = 0;
-	static int	capcnt = 0;
 	PTPDevicePropDesc	dpd;
 	struct timeval	event_start;
+	int		ret;
+
+	if (params->deviceinfo.Model && (
+		!strcmp(params->deviceinfo.Model, "ZV-E10")		||
+		!strcmp(params->deviceinfo.Model, "ZV-1")		||
+		!strcmp(params->deviceinfo.Model, "DSC-RX100M7")	||
+		!strcmp(params->deviceinfo.Model, "ILCE-7RM4")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7RM4A")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7RM5")		||
+		!strcmp(params->deviceinfo.Model, "DSC-RX0M2")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7M3")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7SM3")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7M4")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-9M2")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-1")		||
+		!strcmp(params->deviceinfo.Model, "ILCE-7C")
+	)) {
+		/* For some as yet unknown reason the ZV-1, the RX100M7 and the A7 R4 need around 3 seconds startup time
+		 * to be able to capture. I looked for various trigger events or property changes on the ZV-1
+		 * but nothing worked except waiting.
+		 * This might not be required when having manual focusing according to https://github.com/gphoto/gphoto2/issues/349
+		 * 2.5 seconds were reported not enough, 3.0 seconds worked to some degree for ILCE-7RM4.
+		 */
+
+		while (time_since (params->starttime) < 3000) {
+			/* drain the queue first */
+			if (ptp_get_one_event(params, &event)) {
+				GP_LOG_D ("sony startup wait poll event.code=%04x Param1=%08x", event.Code, event.Param1);
+				continue;
+			}
+			/* wait for events and poll property data */
+			C_PTP (ptp_check_event (params));
+
+			C_PTP (ptp_sony_getalldevicepropdesc (params)); /* avoid caching */
+		}
+	}
+
+	/* regular code */
 
 	C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_CompressionSetting, &dpd));
 
-	GP_LOG_D ("dpd.CurrentValue.u8 = %x", dpd.CurrentValue.u8);
-	GP_LOG_D ("dpd.FactoryDefaultValue.u8 = %x", dpd.FactoryDefaultValue.u8);
+	GP_LOG_D ("PTP_DPC_CompressionSetting dpd.CurrentValue.u8 = %x", dpd.CurrentValue.u8);
+	GP_LOG_D ("PTP_DPC_CompressionSetting dpd.FactoryDefaultValue.u8 = %x", dpd.FactoryDefaultValue.u8);
 
 	if (dpd.CurrentValue.u8 == 0)
 		dpd.CurrentValue.u8 = dpd.FactoryDefaultValue.u8;
 	if (dpd.CurrentValue.u8 == 0x13) {
 		GP_LOG_D ("expecting raw+jpeg capture");
 	}
-
 	/* half-press */
 	propval.u16 = 2;
 	C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_AutoFocus, &propval, PTP_DTC_UINT16));
@@ -3851,37 +4914,47 @@
 	propval.u16 = 2;
 	C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_Capture, &propval, PTP_DTC_UINT16));
 
-	/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
-	 * get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
-	 */
+	/* Check if we are in manual focus to skip the wait for focus */
+	C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_FocusMode, &dpd));
+	if (dpd.CurrentValue.u16 != 1) { /* 1 is Manual .. no need to wait there for focusing */
 
-	GP_LOG_D ("holding down shutterbutton");
-	event_start = time_now();
-	do {
-		/* needed on older cameras like the a58, check for events ... */
-		C_PTP (ptp_check_event (params));
-		if (ptp_get_one_event(params, &event)) {
-			GP_LOG_D ("during event.code=%04x Param1=%08x", event.Code, event.Param1);
-			if (	(event.Code == PTP_EC_Sony_PropertyChanged) &&
-				(event.Param1 == PTP_DPC_SONY_FocusFound)
-			) {
-				GP_LOG_D ("SONY FocusFound change received, 0xd213... ending press");
-				break;
+		/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
+		* get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
+		*/
+
+		GP_LOG_D ("holding down shutterbutton");
+		event_start = time_now();
+		do {
+			/* needed on older cameras like the a58, check for events ... */
+			C_PTP (ptp_check_event (params));
+			if (ptp_get_one_event(params, &event)) {
+				GP_LOG_D ("during shutterbutton press event.code=%04x Param1=%08x", event.Code, event.Param1);
+				if (	(event.Code == PTP_EC_Sony_PropertyChanged) &&
+					(event.Param1 == PTP_DPC_SONY_FocusFound)
+				) {
+					GP_LOG_D ("SONY FocusFound change received, 0xd213... ending press");
+					break;
+				}
+				if (event.Code == PTP_EC_Sony_ObjectAdded) {
+					newobject = event.Param1;
+					GP_LOG_D ("SONY ObjectAdded received, ending wait");
+					break;
+				}
 			}
-		}
 
-		/* Alternative code in case we miss the event */
+			/* Alternative code in case we miss the event */
 
-		C_PTP (ptp_sony_getalldevicepropdesc (params)); /* avoid caching */
-		C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_FocusFound, &dpd));
-		GP_LOG_D ("DEBUG== 0xd213 after shutter press = %d", dpd.CurrentValue.u8);
-		/* if prop 0xd213 = 2, the focus seems to be achieved */
-		if (dpd.CurrentValue.u8 == 2) {
-			GP_LOG_D ("SONY Property change seen, 0xd213... ending press");
-			break;
-		}
+			C_PTP (ptp_sony_getalldevicepropdesc (params)); /* avoid caching */
+			C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_FocusFound, &dpd));
+			GP_LOG_D ("DEBUG== 0xd213 after shutter press = %d", dpd.CurrentValue.u8);
+			/* if prop 0xd213 = 2 or 3 (for rx0), the focus seems to be achieved */
+			if (dpd.CurrentValue.u8 == 2 || dpd.CurrentValue.u8 == 3) {
+				GP_LOG_D ("SONY Property change seen, 0xd213... ending press");
+				break;
+			}
 
-	} while (time_since (event_start) < 1000);
+		} while (time_since (event_start) < 1000);
+	}
 	GP_LOG_D ("releasing shutterbutton");
 
 	/* release full-press */
@@ -3895,15 +4968,17 @@
 	GP_LOG_D ("waiting for image availability");
 	event_start = time_now();
 	do {
-#if 0
+		/* break if we got it from above focus wait already for some reason, seen on A6000 */
+		if (newobject) break;
+#if 1
 		/* needed on older cameras like the a58, check for events ... */
-		C_PTP (ptp_check_event (params));
+		/* This would be unsafe if we get an out-of-order event with no objects present, but
+		 * we drained all events above */
+		C_PTP (ptp_check_event_queue (params));
 		if (ptp_get_one_event(params, &event)) {
-			GP_LOG_D ("during event.code=%04x Param1=%08x", event.Code, event.Param1);
+			GP_LOG_D ("during wait for image event.code=%04x Param1=%08x", event.Code, event.Param1);
 			if (event.Code == PTP_EC_Sony_ObjectAdded) {
 				newobject = event.Param1;
-				if (dual)
-					ptp_add_event (params, &event);
 				GP_LOG_D ("SONY ObjectAdded received, ending wait");
 				break;
 			}
@@ -3915,8 +4990,17 @@
 		GP_LOG_D ("DEBUG== 0xd215 after capture = %d", dpd.CurrentValue.u16);
 
 		/* if prop 0xd215 > 0x8000, the object in RAM is available at location 0xffffc001 */
-		if (dpd.CurrentValue.u16 > 0x8000) {
-			GP_LOG_D ("SONY ObjectInMemory count change seen, ending wait");
+		/* This variable also turns to 1 , but downloading then will crash the firmware
+		 * we seem to need to wait for 0x8000 */
+		if (dpd.CurrentValue.u16 >= 0x8000) {
+			GP_LOG_D ("SONY ObjectInMemory count change to 0x%x seen, ending wait", dpd.CurrentValue.u16);
+			newobject = 0xffffc001;
+			if (dpd.CurrentValue.u16 == 0x8001) {
+				/* Also synthesize a capture complete event, if its just 1 image. */
+				event.Code = PTP_EC_CaptureComplete;
+				event.Nparam = 0;
+				ptp_add_event (params, &event);
+			}
 			break;
 		}
 
@@ -3924,19 +5008,183 @@
 	} while (time_since (event_start) < 35000);
 	GP_LOG_D ("ending image availability");
 
+	/* If the camera does not report object presence, it will crash if we access 0xffffc001 ... */
 	if (!newobject) {
-		GP_LOG_E("no object found during event polling. try the 0xffffc001 object id");
-		newobject = 0xffffc001;
+		GP_LOG_E("no object found during event polling. perhaps no focus...");
+		return GP_ERROR;
 	}
 	/* FIXME: handle multiple images (as in BurstMode) */
 	C_PTP (ptp_getobjectinfo (params, newobject, &oi));
 
 	sprintf (path->folder,"/");
 	if (oi.ObjectFormat == PTP_OFC_SONY_RAW)
-		sprintf (path->name, "capt%04d.arw", capcnt++);
+		sprintf (path->name, "capt%04d.arw", params->capcnt++);
+	else
+		sprintf (path->name, "capt%04d.jpg", params->capcnt++);
+	ret = add_objectid_and_upload (camera, path, context, newobject, &oi);
+	ptp_free_objectinfo (&oi);
+	return ret;
+}
+
+static int
+camera_sony_qx_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
+{
+	PTPParams	*params = &camera->pl->params;
+	PTPPropertyValue propval;
+	PTPObjectInfo	oi;
+	uint32_t	newobject = 0;
+	struct timeval	event_start;
+	PTPDevicePropDesc	dpd;
+	int		res;
+
+	C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_QX_OperatingMode, &dpd));
+
+	while (dpd.CurrentValue.u8 != 2) {
+		propval.u8 = 2; /* 2 is Still Capture */
+		C_PTP (ptp_sony_qx_setdevicecontrolvaluea (params, PTP_DPC_SONY_QX_OperatingMode, &propval, PTP_DTC_UINT8));
+		/* lets try to get the props ... */
+		C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+		C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_QX_OperatingMode, &dpd));
+	}
+
+#if 0
+
+	C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_CompressionSetting, &dpd));
+
+	GP_LOG_D ("dpd.CurrentValue.u8 = %x", dpd.CurrentValue.u8);
+	GP_LOG_D ("dpd.FactoryDefaultValue.u8 = %x", dpd.FactoryDefaultValue.u8);
+
+	if (dpd.CurrentValue.u8 == 0)
+		dpd.CurrentValue.u8 = dpd.FactoryDefaultValue.u8;
+	if (dpd.CurrentValue.u8 == 0x13) {
+		GP_LOG_D ("expecting raw+jpeg capture");
+	}
+#endif
+	/* half-press (S1 press?) */
+	propval.u16 = 2;
+	C_PTP (ptp_sony_qx_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_AutoFocus, &propval, PTP_DTC_UINT16));
+
+	event_start = time_now();
+	do {
+		unsigned char	*object = NULL;
+		uint16_t	ret;
+
+		ret = ptp_getobject (params, 0xffffc002, &object);
+		if (ret == PTP_RC_AccessDenied)
+			break;	/* indicator that image is there */
+		free (object);
+	} while (time_since (event_start) < 500);
+
+	/* full-press (S2 press?) */
+	propval.u16 = 2;
+	C_PTP (ptp_sony_qx_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_Capture, &propval, PTP_DTC_UINT16));
+
+
+	/* C Sharp code now does 300ms wait */
+
+#if 0
+	/* Check if we are in manual focus to skip the wait for focus */
+	C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_FocusMode, &dpd));
+	if (dpd.CurrentValue.u16 != 1) { /* 1 is Manual .. no need to wait there for focusing */
+
+		/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
+		* get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
+		*/
+#endif
+		GP_LOG_D ("holding down shutterbutton for 1 second... ");
+		event_start = time_now();
+		do {
+			unsigned char *object = NULL;
+			uint16_t	ret;
+
+			C_PTP (ptp_generic_getdevicepropdesc (params, 0xd6e0, &dpd));
+
+			if (dpd.CurrentValue.u8 != 0)
+				break;
+
+			ret = ptp_getobject (params, 0xffffc002, &object);
+			if (ret == PTP_RC_AccessDenied)
+				break;	/* indicator that image is there */
+			free (object);
+
+			/* Alternative code in case we miss the event */
+
+			C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+		} while (time_since (event_start) < 500);
+#if 0
+	}
+#endif
+	GP_LOG_D ("releasing shutterbutton");
+
+	/* release full-press */
+	propval.u16 = 1;
+	C_PTP (ptp_sony_qx_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_Capture, &propval, PTP_DTC_UINT16));
+
+	event_start = time_now();
+	do {
+		unsigned char	*object = NULL;
+		uint16_t	ret;
+
+		ret = ptp_getobject (params, 0xffffc002, &object);
+		if (ret == PTP_RC_AccessDenied)
+			break;	/* indicator that image is there */
+		free (object);
+	} while (time_since (event_start) < 500);
+
+
+	/* release half-press */
+	propval.u16 = 1;
+	C_PTP (ptp_sony_qx_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_AutoFocus, &propval, PTP_DTC_UINT16));
+
+
+	/* csharp now waits for 1 second */
+
+	GP_LOG_D ("waiting for image availability");
+	event_start = time_now();
+	do {
+		/* break if we got it from above focus wait already for some reason, seen on A6000 */
+
+		oi.ObjectFormat = 0;
+		C_PTP (ptp_getobjectinfo (params, 0xffffc001, &oi));
+		if (oi.ObjectFormat) {
+			newobject = 0xffffc001;
+			break;
+		}
+		ptp_free_objectinfo (&oi);
+
+		C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+		/* 30 seconds are maximum capture time currently, so use 30 seconds + 5 seconds image saving at most. */
+	} while (time_since (event_start) < 35000);
+	GP_LOG_D ("ending image availability");
+
+	/* If the camera does not report object presence, it will crash if we access 0xffffc001 ... */
+	if (!newobject) {
+		GP_LOG_E("no object found during event polling. try anyway 0xffffc001...");
+		newobject = 0xffffc001;
+		/*return GP_ERROR;*/
+	}
+	/* FIXME: handle multiple images (as in BurstMode) */
+
+	GP_LOG_D ("waiting for ffffc001 objectinfo availability");
+	/* QX software also seems to do it, queries objectinfo and needs several tries */
+	event_start = time_now();
+	do {
+		oi.ObjectFormat = 0;
+		C_PTP (ptp_getobjectinfo (params, newobject, &oi));
+		if (oi.ObjectFormat)
+			break;
+
+		C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+	} while (!oi.ObjectFormat && (time_since (event_start) < 5000));
+
+	sprintf (path->folder,"/");
+	if (oi.ObjectFormat == PTP_OFC_SONY_RAW)
+		sprintf (path->name, "capt%04d.arw", params->capcnt++);
 	else
-		sprintf (path->name, "capt%04d.jpg", capcnt++);
-	return add_objectid_and_upload (camera, path, context, newobject, &oi);
+		sprintf (path->name, "capt%04d.jpg", params->capcnt++);
+	res = add_objectid_and_upload (camera, path, context, newobject, &oi);
+	ptp_free_objectinfo (&oi);
+	return res;
 }
 
 static int
@@ -3945,97 +5193,153 @@
 	PTPParams		*params = &camera->pl->params;
 	PTPPropertyValue	propval;
 	PTPObjectHandles	handles, beforehandles;
-	int			tries;
-	uint32_t		newobject;
-#if 0
-	PTPContainer		event;
+	int			gotone;
+	uint32_t		newobject = 0, newobject2 = 0;
+	PTPContainer		event, newevent;
 	struct timeval		event_start;
 	int			back_off_wait = 0;
-#endif
+	unsigned int		i, waittime = 35*1000;
 
 	GP_LOG_D ("camera_fuji_capture");
 
+	if (params->inliveview) {
+		GP_LOG_D ("terminating running liveview");
+		params->inliveview = 0;
+		C_PTP (ptp_terminateopencapture (params,params->opencapture_transid));
+	}
+
 	C_PTP (ptp_getobjecthandles (params, PTP_HANDLER_SPECIAL, 0x000000, 0x000000, &beforehandles));
 
+	C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_ExposureTime, &propval, PTP_DTC_UINT32));
+	if (propval.u32 >= 10079368) {/* if longer than 10 seconds, switch to 2 hours wait max. (we could also add a translation table here if needed) */
+		switch (propval.u32) {
+		/* 2 times to allow for black picture, + safety time */
+		case 64000180: waittime = 2*60*60*1000 + 1*60*1000;break;
+		case 64000150: waittime = 2*30*60*1000 + 1*60*1000;break;
+		case 64000120: waittime = 2*15*60*1000 + 1*60*1000;break;
+		case 64000090: waittime = 2*8*60*1000 + 1*30*1000;break;
+		case 64000060: waittime = 2*4*60*1000 + 1*30*1000;break;
+		case 64000030: waittime = 2*2*60*1000 + 1*30*1000;break;
+		case 64000000: waittime = 2*1*60*1000 + 1*15*1000;break;
+		case 50796833: waittime = 2*1*50*1000 + 1*15*1000;break; /* 50s */
+		case 40317473: waittime = 2*1*40*1000 + 1*15*1000;break; /* 40s */
+		case 32000000: waittime = 2*1*30*1000 + 1*15*1000;break; /* 30s */
+		case 25398416: waittime = 2*1*25*1000 + 1*15*1000;break; /* 25s */
+		case 20158736: waittime = 2*1*20*1000 + 1*15*1000;break; /* 20s */
+		case 16000000: waittime = 2*1*16*1000 + 1*10*1000;break; /* 15s */
+		case 12699208: waittime = 2*1*16*1000 + 1*10*1000;break; /* 15s */
+		case 10079368: waittime = 2*1*16*1000 + 1*10*1000;break; /* 15s */
+		default:
+			GP_LOG_D("unknown exposure time %d, waiting 2 hours", propval.u32);
+			waittime = 2*61*60*1000;
+			break;
+		}
+	}
+
 	/* focus */
 	propval.u16 = 0x0200;
 	C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &propval, PTP_DTC_UINT16));
-	C_PTP_REP(ptp_initiatecapture(params, 0x00000000, 0x00000000));
 
-	/* debug code currently. not working as-is */
-	if (0) {
-		/* poll camera until it is ready */        
-		propval.u16 = 0x0000;
-		int loops = 0, i;
-		uint16_t *events;
-		uint16_t count, ready = 0;  
-		while (loops < 3300) { // loop for about 33 seconds max
-			ptp_fuji_getevents (params, &events, &count);
-			if(count > 0) {
-				for(i = 0; i < count; i++) {
-					if(eventsi == 0xd20d) {
-						ready = 1;
-						break;        
-					}
-				}                   
-				free(events);
-				if(ready) break;
-			}
-			C_PTP_REP (ptp_check_event (params));
-			usleep(10000);       
-			i++;              
-		}
-	}
+	C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
 
 	/* poll camera until it is ready */
 	propval.u16 = 0x0001;
 	while (propval.u16 == 0x0001) {
-		ptp_getdevicepropvalue (params, 0xd209, &propval, PTP_DTC_UINT16);
+		C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &propval, PTP_DTC_UINT16));
 		GP_LOG_D ("XXX Ready to shoot? %X", propval.u16);
 	}
 
+	/* 2 - means OK apparently, 3 - means failed and initiatecapture will get busy. */
+	if (propval.u16 == 3) { /* reported on out of focus */
+		gp_context_error (context, _("Fuji Capture failed: Perhaps no auto-focus?"));
+		return GP_ERROR;
+	}
+
 	/* shoot */
 	propval.u16 = 0x0304;
 	C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &propval, PTP_DTC_UINT16));
-	C_PTP_REP(ptp_initiatecapture(params, 0x00000000, 0x00000000));
 
-	/* poll camera until it is ready */
-	propval.u16 = 0x0000;
-	while (propval.u16 == 0x0000) {
-		C_PTP_REP (ptp_getdevicepropvalue (params, 0xd212, &propval, PTP_DTC_UINT64));
-		GP_LOG_D ("XXX Ready after shooting? %lx", propval.u64);
-		C_PTP_REP (ptp_check_event (params));
-	}
 
-#if 0
-	/* FIXME: Marcus ... I need to review this when I get hands on a camera ... the objecthandles loop needs to go */
-	/* Reporter in https://github.com/gphoto/libgphoto2/issues/133 says only 1 event ever is sent, so this does not work */
-	/* there is a ObjectAdded event being sent */
+	C_PTP_REP(ptp_initiatecapture(params, 0x00000000, 0x00000000));
+
+	event_start = time_now();
 	do {
+		uint16_t ret, count = 0;
+		uint16_t *events = NULL;
+
+		C_PTP (ptp_fuji_getevents (params, &events, &count));
+		/* FIXME: should do something with those if needed */
+		free (events);
+
+		/* FIXME: Marcus ... I need to review this when I get hands on a camera ... the objecthandles loop needs to go */
+		/* Reporter in https://github.com/gphoto/libgphoto2/issues/133 says only 1 event ever is sent, so this does not work */
+		/* there is a ObjectAdded event being sent */
+
+		/* Marcus: X-Pro2 in current setup also sends just 1 event for the first capture, then none.
+		C_PTP_REP (ptp_setdevicepropvalue (params, 0xd208, &propval, PTP_DTC_UINT16));
+		 * We might be missing something after capture.
+		 * But we need to drain the event queue, otherwise wait_event will see this ObjectAdded event again. */
+
 		C_PTP_REP (ptp_check_event (params));
 
+		gotone = 0;
 		while (ptp_get_one_event(params, &event)) {
+			PTPObject	*ob;
+
 			switch (event.Code) {
-			case PTP_EC_ObjectAdded:
-				newobject = event.Param1;
-				goto downloadfile;
-			default:
-				GP_LOG_D ("unexpected unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1);
-				break;
+				case PTP_EC_ObjectAdded:
+				case PTP_EC_FUJI_ObjectAdded:
+					GP_LOG_D ("Event Code %04x, Param 1 %08x", event.Code, event.Param1);
+					ret = ptp_object_want (params, event.Param1, PTPOBJECT_OBJECTINFO_LOADED, &ob);
+					if (ret != PTP_RC_OK) {
+						GP_LOG_E ("object added, but not found?");
+						continue;
+					}
+					/* A directory was added, like initial DCIM/100NIKON or so. */
+					if (ob->oi.ObjectFormat == PTP_OFC_Association) {
+						GP_LOG_D ("new object 0x%08x is a directory, continuing", event.Param1);
+						break;
+					}
+					if (newobject) {
+						/* we already got one image ... means a secondary image in RAW+JPG. Push this to the event queue. */
+						newevent.Code = PTP_EC_ObjectAdded;
+						newevent.Param1 = newobject;
+						ptp_add_event (params, &newevent);
+					}
+					newobject = event.Param1;
+					GP_LOG_D ("newobject 0x%08x", newobject);
+					/* we found a new file */
+					strcpy  (path->name,  ob->oi.Filename);
+					sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
+					get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
+					/* above might invalidate "ob" pointer, so refetch it */
+					ptp_object_want (params, event.Param1, PTPOBJECT_OBJECTINFO_LOADED, &ob);
+
+					/* delete last / or we get confused later. */
+					path->folder strlen(path->folder)-1  = '\0';
+					add_objectid_and_upload (camera, path, context, newobject, &ob->oi);
+					/* we need to proceed to download all images, in cases of RAW+JPG capture */
+					gotone = 1;
+					break;
+				default:
+					GP_LOG_D ("unexpected unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1);
+					break;
 			}
 		}
-	}  while (waiting_for_timeout (&back_off_wait, event_start, 500)); /* wait for 0.5 seconds after busy is no longer signaled */
+		if (gotone)  {
+			free (beforehandles.Handler);
+			return GP_OK;
+		}
 
-	/* If we got no event seconds duplicate the nikon broken capture, as we do not know how to get events yet */
-#endif
+		/* If we got no event seconds duplicate the nikon broken capture, as we do not know how to get events yet */
 
-	tries = 5;
-	GP_LOG_D ("XXXX missing fuji objectadded events workaround");
-	while (tries--) {
-		unsigned int i;
-		uint16_t ret = ptp_getobjecthandles (params, PTP_HANDLER_SPECIAL, 0x000000, 0x000000, &handles);
-		if (ret != PTP_RC_OK)
-			break;
+		GP_LOG_D ("XXXX missing fuji objectadded events workaround");
+
+		/* clear path, so we get defined results even without object info */
+		path->name0   = '\0';
+		path->folder0 = '\0';
+
+		C_PTP (ptp_getobjecthandles (params, PTP_HANDLER_SPECIAL, 0x000000, 0x000000, &handles));
 
 		/* if (handles.n == params->handles.n)
 		 *	continue;
@@ -4052,6 +5356,8 @@
 					break;
 			if (j != beforehandles.n)
 				continue;
+			GP_LOG_D ("new object 0x%08x found", handles.Handleri);
+			gotone = 1;
 
 			ret = ptp_object_want (params, handles.Handleri, PTPOBJECT_OBJECTINFO_LOADED, &ob);
 			if (ret != PTP_RC_OK) {
@@ -4059,52 +5365,292 @@
 				continue;
 			}
 			/* A directory was added, like initial DCIM/100NIKON or so. */
-			if (ob->oi.ObjectFormat == PTP_OFC_Association)
+			if (ob->oi.ObjectFormat == PTP_OFC_Association) {
+				GP_LOG_D ("new object 0x%08x is a directory, continuing", handles.Handleri);
 				continue;
+			}
+			if (newobject) {
+				/* we already got one image ... means a secondary image in RAW+JPG. Push this to the event queue. */
+				event.Code = PTP_EC_ObjectAdded;
+				event.Param1 = newobject;
+				ptp_add_event (params, &event);
+			}
 			newobject = handles.Handleri;
+			GP_LOG_D ("newobject 0x%08x, newobject2 0x%08x", newobject, newobject2);
 			/* we found a new file */
-			break;
+			strcpy  (path->name,  ob->oi.Filename);
+			sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
+			get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
+			/* above might invalidate "ob" pointer, so refetch it */
+			ptp_object_want (params, newobject, PTPOBJECT_OBJECTINFO_LOADED, &ob);
+			/* delete last / or we get confused later. */
+			path->folder strlen(path->folder)-1  = '\0';
+			add_objectid_and_upload (camera, path, context, newobject, &ob->oi);
+			/* we need to proceed to download all images, in cases of RAW+JPG capture */
 		}
 		free (handles.Handler);
-		if (newobject)
-			break;
-		C_PTP_REP (ptp_check_event (params));
-		sleep(1);
-	}
+
+		if (gotone)  {
+			free (beforehandles.Handler);
+			return GP_OK;
+		}
+	}  while (waiting_for_timeout (&back_off_wait, event_start, waittime));
 	free (beforehandles.Handler);
-	if (!newobject)
-		GP_LOG_D ("fuji object added no new file found after 5 seconds?!?");
+	return GP_ERROR;
+}
+
+static int
+camera_panasonic_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
+{
+	PTPParams	*params = &camera->pl->params;
+	PTPContainer	event;
+	uint32_t	newobject = 0;
+	struct timeval	event_start;
+	int		back_off_wait = 0;
+	PTPObject	*ob = NULL;
+
+	//C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_CompressionSetting, &dpd));
+
+	//GP_LOG_D ("dpd.CurrentValue.u8 = %x", dpd.CurrentValue.u8);
+	//GP_LOG_D ("dpd.FactoryDefaultValue.u8 = %x", dpd.FactoryDefaultValue.u8);
+
+	//if (dpd.CurrentValue.u8 == 0)
+	//	dpd.CurrentValue.u8 = dpd.FactoryDefaultValue.u8;
+	//if (dpd.CurrentValue.u8 == 0x13) {
+	//	GP_LOG_D ("expecting raw+jpeg capture");
+	//}
+
+	uint32_t currentVal;
+	uint16_t valuesize;
+	uint32_t waitMS = 1000;
+
+	ptp_panasonic_getdeviceproperty(params, PTP_DPC_PANASONIC_ShutterSpeed, &valuesize, &currentVal);
+
+	float f;
+	if(currentVal == 0xFFFFFFFF) {
+		waitMS = 1000;
+	} else if(currentVal & 0x80000000) {
+		currentVal &= ~0x80000000;
+		f = (float) currentVal;
+		waitMS = (uint32_t)f + 1000;
+	} else {
+		waitMS = 1000;
+	}
+
+
+	// clear out old events
+	GP_LOG_D ("**** GH5: checking old events...");
+	C_PTP_REP (ptp_check_event (params));
+	GP_LOG_D ("**** GH5: draining old events...");
+	while (ptp_get_one_event(params, &event));
+
+	GP_LOG_D ("**** GH5: trigger capture...");
+	C_PTP_REP (ptp_panasonic_capture(params));
+
+	usleep(waitMS * 1000);
+
+	event_start = time_now();
+
+	do {
+		GP_LOG_D ("**** GH5: checking for new object...");
+		C_PTP_REP (ptp_check_event (params));
+
+		while (ptp_get_one_event(params, &event)) {
+			switch (event.Code) {
+			case 0xC101:
+				ptp_panasonic_9401(params, event.Param1); // not sure if this is needed or what this does (following LUMIXTether)
+			case 0xC107:
+				//event_start = time_now(); // still working...
+				break;
+			case PTP_EC_PANASONIC_ObjectAdded:
+			case PTP_EC_PANASONIC_ObjectAddedSDRAM: /* marcus: check if this works */
+				newobject = event.Param1;
+				C_PTP_REP (ptp_object_want (params, newobject, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+
+				if (ob->oi.ObjectFormat != PTP_OFC_Association)
+					goto downloadfile;
+				newobject = 0;
+				/* new folder ... wait a bit longer */
+				break;
+			default:
+				GP_LOG_D ("unexpected unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1);
+				break;
+			}
+		}
+	}  while (waiting_for_timeout (&back_off_wait, event_start, 65000)); /* wait for 66 seconds after busy is no longer signaled */
 
-#if 0
 downloadfile:
-#endif
-	/* clear path, so we get defined results even without object info */
+
+	usleep(50000); // it seems there can be an error if the object is accessed too soon
+
 	path->name0='\0';
 	path->folder0='\0';
 
-	if (newobject != 0) {
-		PTPObject	*ob;
+	/* Synthesize a capture complete event to avoid waits. */
+	event.Code = PTP_EC_CaptureComplete;
+	event.Nparam = 0;
+	ptp_add_event (params, &event);
 
-		C_PTP_REP (ptp_object_want (params, newobject, PTPOBJECT_OBJECTINFO_LOADED, &ob));
-		strcpy  (path->name,  ob->oi.Filename);
-		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
-		get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
-		/* delete last / or we get confused later. */
-		path->folder strlen(path->folder)-1  = '\0';
-		return gp_filesystem_append (camera->fs, path->folder, path->name, context);
-	}
+	if (newobject != 0) /* NOTE: association add handled */
+		return add_object_to_fs_and_path (camera, newobject, path, context);
+	return GP_ERROR;
+}
+
+static int
+camera_olympus_omd_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
+{
+	PTPParams	*params = &camera->pl->params;
+	PTPContainer	event;
+	uint32_t	newobject = 0;
+	struct timeval	event_start;
+	int	     	back_off_wait = 0;
+	PTPPropertyValue propval;
+
+	// clear out old events
+	//C_PTP_REP (ptp_check_event (params));
+	//while (ptp_get_one_event(params, &event));
+
+	C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_OLYMPUS_CaptureTarget, &propval, PTP_DTC_UINT16));
+	C_PTP_REP (ptp_olympus_omd_capture(params));
+
+	usleep(100);
+
+	event_start = time_now();
+	do {
+		C_PTP_REP (ptp_check_event (params));
+
+		while (ptp_get_one_event(params, &event)) {
+			switch (event.Code) {
+			case PTP_EC_Olympus_ObjectAdded:
+			case PTP_EC_Olympus_ObjectAdded_New:	/* seen in newer traces, https://github.com/gphoto/gphoto2/issues/310 */
+			case PTP_EC_ObjectAdded:
+				newobject = event.Param1;
+				goto downloadfile;
+			default:
+				GP_LOG_D ("unexpected unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1);
+				break;
+			}
+		}
+	}  while (waiting_for_timeout (&back_off_wait, event_start, 65000)); /* wait for 0.5 seconds after busy is no longer signaled */
+
+downloadfile:
+
+	path->name0='\0';
+	path->folder0='\0';
+
+	if (newobject != 0) /* FIXME: does not handle assocation adds I think */
+		return add_object_to_fs_and_path (camera, newobject, path, context);
 	return GP_ERROR;
 }
 
 static int
+camera_sigma_fp_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context)
+{
+	PTPParams		*params = &camera->pl->params;
+	unsigned char		*data = NULL;
+	unsigned int		size = 0;
+	CameraFile		*file;
+	int			ret, tries;
+	SIGMAFP_PictFileInfo2Ex	pictfileinfoex2;
+	SIGMAFP_CaptureStatus	captstatus;
+
+	C_PTP_REP (ptp_sigma_fp_getcapturestatus(params, 0, &captstatus));
+	GP_LOG_D("status before snap 0x%04x", captstatus.status);
+
+	C_PTP_REP (ptp_sigma_fp_snap(params, 1, 1));
+
+	tries = 50;
+	while (tries--) {
+		C_PTP_REP (ptp_sigma_fp_getcapturestatus(params, 0, &captstatus));
+		GP_LOG_D("trying ... status 0x%04x", captstatus.status);
+		if ((captstatus.status & 0xf000) == 0x6000) {	/* failure */
+			if (captstatus.status == 0x6001) {
+				gp_context_error (context, _("Capture failed: No focus."));
+				return GP_ERROR;
+			}
+			return GP_ERROR;
+		}
+#if 0
+		/* the 0x80 flag seems to happen only if the camera starts doing stuff */
+		if ((captstatus.status & 0xf000) == 0x8000) {	/* success */
+			break;
+		}
+#endif
+		if (captstatus.status == 0x0002) break;	/* success ? */
+		/* 4 means processing */
+		if (captstatus.status == 0x0005) break;	/* 5 means complete image created */
+
+		usleep(200*1000);
+
+	}
+	C_PTP_REP (ptp_sigma_fp_getpictfileinfo2(params, &pictfileinfoex2));
+
+	C_PTP_REP (ptp_sigma_fp_getbigpartialpictfile(params, pictfileinfoex2.fileaddress, 0, pictfileinfoex2.filesize, &data, &size));
+
+	C_PTP_REP (ptp_sigma_fp_clearimagedbsingle(params, captstatus.imageid));
+
+	sprintf (path->name, "%s%s", pictfileinfoex2.name, pictfileinfoex2.fileext);
+	strcpy (path->folder,"/");
+
+	ret = gp_file_new (&file);
+	if (ret != GP_OK) {
+		free (data);
+		return ret;
+	}
+
+	ret = gp_file_append (file, (char*)data+4, size-4);
+	free (data);
+	if (ret != GP_OK) {
+		gp_file_free (file);
+		return ret;
+	}
+
+	ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
+	if (ret != GP_OK) {
+		gp_file_free (file);
+		return ret;
+	}
+	ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
+	if (ret != GP_OK) {
+		gp_file_free (file);
+		return ret;
+	}
+	return GP_OK;
+
+#if 0
+	CameraFileInfo info;
+	info.file.fields = GP_FILE_INFO_TYPE |
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+			GP_FILE_INFO_SIZE | GP_FILE_INFO_MTIME;
+	strcpy_mime (info.file.type, params->deviceinfo.VendorExtensionID, ob->oi.ObjectFormat);
+	info.file.width		= ob->oi.ImagePixWidth;
+	info.file.height	= ob->oi.ImagePixHeight;
+	info.file.size		= size;
+	info.file.mtime		= time(NULL);
+
+	info.preview.fields = GP_FILE_INFO_TYPE |
+			GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+			GP_FILE_INFO_SIZE;
+	strcpy_mime (info.preview.type, params->deviceinfo.VendorExtensionID, ob->oi.ThumbFormat);
+	info.preview.width	= ob->oi.ThumbPixWidth;
+	info.preview.height	= ob->oi.ThumbPixHeight;
+	info.preview.size	= ob->oi.ThumbCompressedSize;
+	GP_LOG_D ("setting fileinfo in fs");
+	return gp_filesystem_set_info_noop(camera->fs, path->folder, path->name, info, context);
+#endif
+}
+
+
+static int
 camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
 		GPContext *context)
 {
-	PTPContainer event;
-	PTPParams *params = &camera->pl->params;
-	uint32_t newobject = 0x0;
-	int done,tries;
+	PTPContainer		event;
+	PTPParams		*params = &camera->pl->params;
+	uint32_t		newobject = 0x0;
+	int			done,tries;
 	PTPObjectHandles	beforehandles;
+	uint16_t		ptpres;
 
 	/* adjust if we ever do sound or movie capture */
 	if (type != GP_CAPTURE_IMAGE)
@@ -4140,7 +5686,7 @@
 
 	/* 1st gen, 2nd gen nikon capture only go to SDRAM */
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
-		(ptp_operation_issupported(params, PTP_OC_NIKON_Capture) ||
+		(ptp_operation_issupported(params, PTP_OC_NIKON_InitiateCaptureRecInSdram) ||
 		 ptp_operation_issupported(params, PTP_OC_NIKON_AfCaptureSDRAM)
 	)) {
 		int ret = GP_ERROR_NOT_SUPPORTED;
@@ -4156,6 +5702,9 @@
 		/* for CARD capture and unsupported combinations, fall through */
 	}
 
+	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_OLYMPUS_OMD)
+		return camera_olympus_omd_capture (camera, type, path, context);
+
 	if (params->device_flags & DEVICE_FLAG_OLYMPUS_XML_WRAPPED)
 		return camera_olympus_xml_capture (camera, type, path, context);
 
@@ -4179,12 +5728,29 @@
 		return camera_sony_capture (camera, type, path, context);
 	}
 
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) &&
+		ptp_operation_issupported(params, PTP_OC_SONY_QX_SetControlDeviceB)
+	) {
+		return camera_sony_qx_capture (camera, type, path, context);
+	}
+
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_FUJI) &&
 		ptp_operation_issupported(params, PTP_OC_InitiateCapture)
 	) {
 		return camera_fuji_capture (camera, type, path, context);
 	}
 
+	if (    (params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) &&
+		ptp_operation_issupported(params, PTP_OC_PANASONIC_InitiateCapture)
+	) {
+		return camera_panasonic_capture (camera, type, path, context);
+	}
+
+	if (    (params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_SIGMAFP) &&
+		ptp_operation_issupported(params, PTP_OC_SIGMA_FP_Snap)
+	) {
+		return camera_sigma_fp_capture (camera, type, path, context);
+	}
 
 	if (!ptp_operation_issupported(params,PTP_OC_InitiateCapture)) {
 		gp_context_error(context,
@@ -4206,8 +5772,13 @@
 	 * indicating that the capure has been completed may occur after
 	 * few seconds. moving down the code. (kil3r)
 	 */
-	C_PTP_REP (ptp_initiatecapture(params, 0x00000000, 0x00000000));
 	CR (gp_port_set_timeout (camera->port, capture_timeout));
+	ptpres = LOG_ON_PTP_E (ptp_initiatecapture(params, 0x00000000, 0x00000000));
+	/* the V1 reports general error to us, but has actually captured ... so just ignore GeneralError. */
+	if ((ptpres != PTP_RC_OK) && (ptpres != PTP_RC_GeneralError)) {
+		CR (gp_port_set_timeout (camera->port, normal_timeout));
+		C_PTP (ptpres);
+	}
 	/* A word of comments is worth here.
 	 * After InitiateCapture camera should report with ObjectAdded event
 	 * all newly created objects. However there might be more than one
@@ -4282,7 +5853,7 @@
 	CR (gp_port_set_timeout (camera->port, normal_timeout));
 
 	/* The standard defined way ... wait for some capture related events. */
-	/* The Nikon 1 series emits ObjectAdded occasionaly after
+	/* The Nikon 1 series emits ObjectAdded occasionally after
 	 * the CaptureComplete event, while others do it the other way
 	 * round. Handle that case with some bitmask. */
 	done = 0; tries = 20;
@@ -4342,17 +5913,8 @@
 	path->name0='\0';
 	path->folder0='\0';
 
-	if (newobject != 0) {
-		PTPObject	*ob;
-
-		C_PTP_REP (ptp_object_want (params, newobject, PTPOBJECT_OBJECTINFO_LOADED, &ob));
-		strcpy  (path->name,  ob->oi.Filename);
-		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
-		get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
-		/* delete last / or we get confused later. */
-		path->folder strlen(path->folder)-1  = '\0';
-		return gp_filesystem_append (camera->fs, path->folder, path->name, context);
-	}
+	if (newobject != 0) /* FIXME: check association handling */
+		return add_object_to_fs_and_path (camera, newobject, path, context);
 	return GP_ERROR;
 }
 
@@ -4365,7 +5927,7 @@
 	int			back_off_wait = 0;
 	uint32_t		result;
 	struct timeval		focus_start;
-
+	PTPDevicePropDesc	dpd;
 
 	GP_LOG_D ("camera_trigger_canon_eos_capture");
 
@@ -4383,15 +5945,34 @@
 	if (params->eos_camerastatus == 1)
 		return GP_ERROR_CAMERA_BUSY;
 
+	if (have_eos_prop(params, PTP_VENDOR_CANON, PTP_DPC_CANON_EOS_CaptureDestination)) {
+                C_PTP (ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_CaptureDestination, &dpd));
+                if (dpd.CurrentValue.u32 == PTP_CANON_EOS_CAPTUREDEST_HD) {
+			C_PTP (ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_AvailableShots, &dpd));
+			if (dpd.CurrentValue.u32 < 100) {
+				/* Tell the camera we have enough free space on the PC */
+#if 0
+				if (!params->uilocked)
+					ptp_canon_eos_setuilock(params);
+#endif
+				LOG_ON_PTP_E (ptp_canon_eos_pchddcapacity(params, 0x0fffffff, 0x00001000, 0x00000001));
+#if 0
+				if (!params->uilocked)
+					ptp_canon_eos_resetuilock(params);
+#endif
+			}
+		}
+	}
+
 	if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn)) {
 		if (!is_canon_eos_m (params)) {
 			/* Regular EOS */
-			int 			manualfocus = 0, foundfocusinfo = 0;
-			PTPDevicePropDesc	dpd;
+			uint16_t	res;
+			int 		manualfocus = 0, foundfocusinfo = 0;
 
 			/* are we in manual focus mode ... value would be 3 */
 			if (PTP_RC_OK == ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_FocusMode, &dpd)) {
-				if ((dpd.DataType == PTP_DTC_UINT16) && (dpd.CurrentValue.u16 == 3)) {
+				if ((dpd.DataType == PTP_DTC_UINT32) && (dpd.CurrentValue.u32 == 3)) {
 					manualfocus = 1;
 					/* will do 1 pass through the focusing loop for good measure */
 					GP_LOG_D("detected manual focus. skipping focus detection logic");
@@ -4422,8 +6003,9 @@
 					) {
 						if (PTP_RC_OK == ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_FocusInfoEx, &dpd)) {
 							GP_LOG_D("focusinfo prop content: %s", dpd.CurrentValue.str);
-							foundfocusinfo = 1;
-							/* FIXME: detect no focus? */
+							if (!strstr(dpd.CurrentValue.str,"select={}")) /* select={} means "no focus yet" */
+								foundfocusinfo = 1;
+							ptp_free_devicepropdesc (&dpd);
 						}
 					}
 				}
@@ -4433,6 +6015,9 @@
 				/* for manual focus, at least wait until we get events */
 				if (manualfocus && foundevents)
 					break;
+				/* when doing manual focus, wait at most 0.1 seconds */
+				if (manualfocus && (time_since (focus_start) >= 100))
+					break;
 			} while (waiting_for_timeout (&back_off_wait, focus_start, 2*1000)); /* wait 2 seconds for focus */
 
 			if (!foundfocusinfo && !manualfocus) {
@@ -4444,7 +6029,16 @@
 			}
 			/* full press now */
 
-			C_PTP_REP_MSG (ptp_canon_eos_remotereleaseon (params, 2, 0), _("Canon EOS Full-Press failed"));
+			res = LOG_ON_PTP_E (ptp_canon_eos_remotereleaseon (params, 2, 0));
+			if (res != PTP_RC_OK) {
+				/* if the Full Press failed, try to roll back the release and do not exit Half-Pressed. */
+				ptp_check_eos_events (params);
+				C_PTP_REP_MSG (ptp_canon_eos_remotereleaseoff (params, 1), _("Canon EOS Half-Release failed"));
+				ptp_check_eos_events (params);
+				C_PTP_REP_MSG (res, _("Canon EOS Full-Press failed"));
+				/* safety, should not arrive here */
+				return GP_ERROR;
+			}
 			/* no event check between */
 			/* full release now */
 			C_PTP_REP_MSG (ptp_canon_eos_remotereleaseoff (params, 2), _("Canon EOS Full-Release failed"));
@@ -4552,17 +6146,17 @@
 	/* Nilon V and J seem to like that */
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
 		!params->controlmode &&
-		ptp_operation_issupported(params,PTP_OC_NIKON_SetControlMode)
+		ptp_operation_issupported(params,PTP_OC_NIKON_ChangeCameraMode)
 	) {
-		ret = ptp_nikon_setcontrolmode (params, 1);
+		ret = ptp_nikon_changecameramode (params, 1);
 		/* FIXME: PTP_RC_NIKON_ChangeCameraModeFailed does not seem to be problematic */
 		if (ret != PTP_RC_NIKON_ChangeCameraModeFailed)
 			C_PTP_REP (ret);
 		params->controlmode = 1;
 	}
 
-	/* On Nikon 1 series, the liveview must be enabled before capture works */
-	if (NIKON_1(params)) {
+	/* On Nikon 1 series, the liveview must be enabled before capture works ... not on V1 which does not have it. */
+	if (NIKON_1(params) && ptp_operation_issupported(params,PTP_OC_NIKON_StartLiveView)) {
 		ret = ptp_nikon_start_liveview (params);
 		if ((ret != PTP_RC_OK) && (ret != PTP_RC_DeviceBusy))
 			C_PTP_REP_MSG(ret, _("Failed to enable liveview on a Nikon 1, but it is required for capture"));
@@ -4575,11 +6169,11 @@
 	) {
 		/* If in liveview mode, we have to run non-af capture */
 		int inliveview = 0;
-		int tries = 200;
+		int tries;
 		PTPPropertyValue propval;
 
 		C_PTP_REP (ptp_check_event (params));
-		while (PTP_RC_DeviceBusy == ptp_nikon_device_ready (params));
+		C_PTP_REP (nikon_wait_busy (params, 100, 2000)); /* lets wait 2 seconds */
 		C_PTP_REP (ptp_check_event (params));
 
 		if (ptp_property_issupported (params, PTP_DPC_NIKON_LiveViewStatus)) {
@@ -4590,6 +6184,7 @@
 			if (inliveview) af = 0;
 		}
 
+		tries = 200;
 		do {
 			ret = ptp_nikon_capture2 (params, af, sdram);
 			if (ret == PTP_RC_OK)
@@ -4603,25 +6198,22 @@
 			}
 
 			/* busy means wait and the invalid status might go away */
-			if ((ret != PTP_RC_DeviceBusy) && (ret != PTP_RC_NIKON_InvalidStatus))
+			if ((ret != PTP_RC_DeviceBusy) && (ret != PTP_RC_NIKON_InvalidStatus) && (ret != 0xa207)) /* a207 on Nikon D850 */
 				return translate_ptp_result (ret);
 
 			usleep(2000);
 			/* sleep a bit perhaps ? or check events? */
 		} while (tries--);
 
-		while (PTP_RC_DeviceBusy == ptp_nikon_device_ready (params)) {
-			gp_context_idle (context);
-			/* do not drain all of the DSLRs compute time */
-			usleep(100*1000); /* 0.1 seconds */
-		}
+		/* busyness will be reported during the whole of the exposure time. */
+		C_PTP_REP (nikon_wait_busy (params, 100, 1000*1000)); /* lets wait 1000 seconds (D780 can do 900 second exposures) */
 		return GP_OK;
 	}
 
 	/* Nikon */
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
-		(ptp_operation_issupported(params, PTP_OC_NIKON_Capture) ||
-		 ptp_operation_issupported(params, PTP_OC_NIKON_AfCaptureSDRAM) 
+		(ptp_operation_issupported(params, PTP_OC_NIKON_InitiateCaptureRecInSdram) ||
+		 ptp_operation_issupported(params, PTP_OC_NIKON_AfCaptureSDRAM)
 		)
 		&& sdram
 	) {
@@ -4630,7 +6222,7 @@
 		PTPPropertyValue propval;
 
 		C_PTP_REP (ptp_check_event (params));
-		C_PTP_REP (nikon_wait_busy (params, 20, 1000));
+		C_PTP_REP (nikon_wait_busy (params, 20, 2000));
 		C_PTP_REP (ptp_check_event (params));
 
 		if (ptp_property_issupported (params, PTP_DPC_NIKON_LiveViewStatus)) {
@@ -4640,7 +6232,7 @@
 		}
 
 		do {
-			if (!inliveview && ptp_operation_issupported (params,PTP_OC_NIKON_AfCaptureSDRAM))
+			if (!inliveview && af && ptp_operation_issupported (params,PTP_OC_NIKON_AfCaptureSDRAM))
 				ret = ptp_nikon_capture_sdram (params);
 			else
 				ret = ptp_nikon_capture (params, 0xffffffff);
@@ -4648,12 +6240,7 @@
 				return translate_ptp_result (ret);
 		} while (ret == PTP_RC_DeviceBusy);
 
-		while (PTP_RC_DeviceBusy == ptp_nikon_device_ready (params)) {
-			gp_context_idle (context);
-			/* do not drain all of the DSLRs compute time */
-			usleep(100*1000); /* 0.1 seconds */
-		}
-
+		C_PTP_REP (nikon_wait_busy (params, 100, 1000*1000)); /* lets wait 1000 seconds (D780 can do 900 second exposures) */
 		return GP_OK;
 	}
 
@@ -4756,37 +6343,41 @@
 		propval.u16 = 2;
 		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_Capture, &propval, PTP_DTC_UINT16));
 
-		/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
-		 * get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
-		 */
+		/* Wait for focus only in automatic focus mode */
+		C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_FocusMode, &dpd));
+		if (dpd.CurrentValue.u16 != 1) { /* 1 is Manual .. no need to wait there for focusing */
+			/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
+			* get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
+			*/
 
-		GP_LOG_D ("holding down shutterbutton");
-		event_start = time_now();
-		do {
-			/* needed on older cameras like the a58, check for events ... */
-			C_PTP (ptp_check_event (params));
-			if (ptp_get_one_event(params, &event)) {
-				GP_LOG_D ("during event.code=%04x Param1=%08x", event.Code, event.Param1);
-				if (	(event.Code == PTP_EC_Sony_PropertyChanged) &&
-					(event.Param1 == PTP_DPC_SONY_FocusFound)
-				) {
-					GP_LOG_D ("SONY FocusFound change received, 0xd213... ending press");
-					break;
+			GP_LOG_D ("holding down shutterbutton");
+			event_start = time_now();
+			do {
+				/* needed on older cameras like the a58, check for events ... */
+				C_PTP (ptp_check_event (params));
+				if (ptp_get_one_event(params, &event)) {
+					GP_LOG_D ("during event.code=%04x Param1=%08x", event.Code, event.Param1);
+					if (	(event.Code == PTP_EC_Sony_PropertyChanged) &&
+						(event.Param1 == PTP_DPC_SONY_FocusFound)
+					) {
+						GP_LOG_D ("SONY FocusFound change received, 0xd213... ending press");
+						break;
+					}
 				}
-			}
-
-			/* Alternative code in case we miss the event */
 
-			C_PTP (ptp_sony_getalldevicepropdesc (params)); /* avoid caching */
-			C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_FocusFound, &dpd));
-			GP_LOG_D ("DEBUG== 0xd213 after shutter press = %d", dpd.CurrentValue.u8);
-			/* if prop 0xd213 = 2, the focus seems to be achieved */
-			if (dpd.CurrentValue.u8 == 2) {
-				GP_LOG_D ("SONY Property change seen, 0xd213... ending press");
-				break;
-			}
+				/* Alternative code in case we miss the event */
 
-		} while (time_since (event_start) < 1000);
+				C_PTP (ptp_sony_getalldevicepropdesc (params)); /* avoid caching */
+				C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_FocusFound, &dpd));
+				GP_LOG_D ("DEBUG== 0xd213 after shutter press = %d", dpd.CurrentValue.u8);
+				/* if prop 0xd213 = 2 or 3 (for rx0), the focus seems to be achieved */
+				if (dpd.CurrentValue.u8 == 2 || dpd.CurrentValue.u8 == 3) {
+					GP_LOG_D ("SONY Property change seen, 0xd213... ending press");
+					break;
+				}
+			} while (time_since (event_start) < 1000);
+		}
+		ptp_free_devicepropdesc(&dpd);
 		GP_LOG_D ("releasing shutterbutton");
 
 		/* release full-press */
@@ -4799,6 +6390,52 @@
 
 		return GP_OK;
 	}
+
+	/* Sony QX */
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) &&
+		ptp_operation_issupported(params, PTP_OC_SONY_QX_SetControlDeviceB)
+	) {
+		PTPPropertyValue	propval;
+		struct timeval		event_start;
+		PTPContainer		event;
+		PTPDevicePropDesc	dpd;
+
+		/* half-press */
+		propval.u16 = 2;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_AutoFocus, &propval, PTP_DTC_UINT16));
+
+		/* full-press */
+		propval.u16 = 2;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_Capture, &propval, PTP_DTC_UINT16));
+
+			GP_LOG_D ("holding down shutterbutton for 2 seconds");
+			event_start = time_now();
+			do {
+				/* needed on older cameras like the a58, check for events ... */
+				C_PTP (ptp_check_event (params));
+				if (ptp_get_one_event(params, &event)) {
+					GP_LOG_D ("during event.code=%04x Param1=%08x", event.Code, event.Param1);
+				}
+
+				/* Alternative code in case we miss the event */
+
+				C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+				C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_FocusFound, &dpd));
+			} while (time_since (event_start) < 2000);
+
+		GP_LOG_D ("releasing shutterbutton");
+
+		/* release full-press */
+		propval.u16 = 1;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_Capture, &propval, PTP_DTC_UINT16));
+
+		/* release half-press */
+		propval.u16 = 1;
+		C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_QX_AutoFocus, &propval, PTP_DTC_UINT16));
+
+		return GP_OK;
+	}
+
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_FUJI) &&
 		ptp_operation_issupported(params, PTP_OC_InitiateCapture)
 	) {
@@ -4812,7 +6449,7 @@
 		/* poll camera until it is ready */
 		propval.u16 = 0x0001;
 		while (propval.u16 == 0x0001) {
-			C_PTP_REP (ptp_getdevicepropvalue (params, 0xd209, &propval, PTP_DTC_UINT16));
+			C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &propval, PTP_DTC_UINT16));
 		}
 
 		/* shoot */
@@ -4823,8 +6460,10 @@
 		/* poll camera until it is ready */
 		propval.u16 = 0x0000;
 		while (propval.u16 == 0x0000) {
-			C_PTP_REP (ptp_getdevicepropvalue (params, 0xd212, &propval, PTP_DTC_UINT64));
+			usleep(1000);
+			C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_CurrentState, &propval, PTP_DTC_UINT16));
 		}
+		return GP_OK;
 	}
 
 #if 0
@@ -4834,6 +6473,21 @@
 		return camera_canon_eos_capture (camera, type, path, context);
 	}
 #endif
+
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) &&
+		ptp_operation_issupported(params, PTP_OC_PANASONIC_InitiateCapture)
+	) {
+		PTPContainer	event;
+
+		// Fetch and discard any pending events.
+		C_PTP_REP (ptp_check_event (params));
+		while (ptp_get_one_event(params, &event))
+			; // Do nothing with the events
+
+		// Trigger the actual capture.
+		return translate_ptp_result(ptp_panasonic_capture(params));
+	}
+
 	if (!ptp_operation_issupported(params,PTP_OC_InitiateCapture)) {
 		gp_context_error(context,
                	_("Sorry, your camera does not support generic capture"));
@@ -4851,7 +6505,6 @@
 	PTPParams	*params = &camera->pl->params;
 	uint32_t	newobject = 0x0;
 	CameraFilePath	*path;
-	static int 	capcnt = 0;
 	uint16_t	ret;
 	struct timeval	event_start;
 	CameraFile	*file;
@@ -4902,11 +6555,15 @@
 					strcpy (path->folder,"/");
 					ret = gp_file_new(&file);
 					if (ret!=GP_OK) return ret;
-					sprintf (path->name, "capt%04d.", capcnt++);
+					sprintf (path->name, "capt%04d.", params->capcnt++);
 					if ((entry.u.object.oi.ObjectFormat == PTP_OFC_CANON_CRW) || (entry.u.object.oi.ObjectFormat == PTP_OFC_CANON_CRW3)) {
 						strcat(path->name, "cr2");
 						gp_file_set_mime_type (file, GP_MIME_CRW);
 						mime = GP_MIME_CRW;
+					} else if (entry.u.object.oi.ObjectFormat == PTP_OFC_CANON_CR3) {
+						strcat(path->name, "cr3");
+						gp_file_set_mime_type (file, GP_MIME_CR3);
+						mime = GP_MIME_CR3;
 					} else {
 						strcat(path->name, "jpg");
 						gp_file_set_mime_type (file, GP_MIME_JPEG);
@@ -4916,7 +6573,7 @@
 
 					GP_LOG_D ("trying to get object size=0x%lx", (unsigned long)entry.u.object.oi.ObjectCompressedSize);
 
-#define BLOBSIZE 5*1024*1024
+#define BLOBSIZE 1*1024*1024
 					/* Trying to read this in 1 block might be the cause of crashes of newer EOS */
 					{
 						uint32_t	offset = 0;
@@ -4927,7 +6584,7 @@
 
 							if (xsize > BLOBSIZE)
 								xsize = BLOBSIZE;
-							ptp_canon_eos_getpartialobject (params, newobject, offset, xsize, &yimage);
+							C_PTP_REP (ptp_getpartialobject (params, newobject, offset, xsize, &yimage, &xsize));
 							gp_file_append (file, (char*)yimage, xsize);
 							free (yimage);
 							offset += xsize;
@@ -4985,9 +6642,10 @@
 
 					sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
 					get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
+					/* ob might now be invalid! */
 					/* delete last / or we get confused later. */
 					path->folder strlen(path->folder)-1  = '\0';
-					
+
 					*eventtype = GP_EVENT_FILE_CHANGED;
 					*eventdata = path;
 					return GP_OK;
@@ -5005,28 +6663,57 @@
 						break;
 					}
 					newobject = entry.u.object.oid;
-					add_object (camera, newobject, context);
 					C_MEM (path = malloc(sizeof(CameraFilePath)));
-					path->namesizeof(path->name)-1 = '\0';
-					strncpy  (path->name,  entry.u.object.oi.Filename, sizeof (path->name)-1);
+					ret = add_object_to_fs_and_path (camera, newobject, path, context);
 					free (entry.u.object.oi.Filename);
-					sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)entry.u.object.oi.StorageID);
-					get_folder_from_handle (camera, entry.u.object.oi.StorageID, entry.u.object.oi.ParentObject, path->folder);
-					/* delete last / or we get confused later. */
-					path->folder strlen(path->folder)-1  = '\0';
-					gp_filesystem_append (camera->fs, path->folder, path->name, context);
-					if (entry.u.object.oi.ObjectFormat == PTP_OFC_Association)	/* not sure if we would get folder changed */
+					if (ret != GP_OK) {
+						free (path);
+						return ret;
+					}
+					if (entry.u.object.oi.ObjectFormat == PTP_OFC_Association) {	/* not sure if we would get folder changed */
 						*eventtype = GP_EVENT_FOLDER_ADDED;
-					else
+						gp_filesystem_reset (camera->fs);
+					} else {
 						*eventtype = (entry.type == PTP_CANON_EOS_CHANGES_TYPE_OBJECTINFO) ? GP_EVENT_FILE_ADDED : GP_EVENT_FILE_CHANGED;
+						if (*eventtype == GP_EVENT_FILE_CHANGED) {
+							ob->flags &= ~PTPOBJECT_OBJECTINFO_LOADED;
+							C_PTP_REP (ptp_object_want (params, newobject, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+							gp_filesystem_set_info_dirty (camera->fs, path->folder, path->name, context);
+						}
+					}
 					*eventdata = path;
 					return GP_OK;
 				}
-				case PTP_CANON_EOS_CHANGES_TYPE_PROPERTY:
+				case PTP_CANON_EOS_CHANGES_TYPE_PROPERTY: {
+					char			*name, *content;
+					PTPDevicePropDesc	dpd;
+
 					*eventtype = GP_EVENT_UNKNOWN;
-					C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
-					sprintf (*eventdata, "PTP Property %04x changed", entry.u.propid);
+					if (PTP_DPC_CANON_EOS_FocusInfoEx == entry.u.propid) {
+						if (PTP_RC_OK == ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_FocusInfoEx, &dpd)) {
+							C_MEM (*eventdata = malloc(strlen("FocusInfo ")+strlen(dpd.CurrentValue.str)+1));
+							sprintf (*eventdata, "FocusInfo %s", dpd.CurrentValue.str);
+							ptp_free_devicepropdesc (&dpd);
+							return GP_OK;
+						}
+					}
+					/* cached devprop should have been flushed I think... */
+					C_PTP_REP (ptp_canon_eos_getdevicepropdesc (params, entry.u.propid, &dpd));
+
+					dpd.DevicePropertyCode = entry.u.propid;
+					ret = camera_lookup_by_property(camera, &dpd, &name, &content, context);
+					if (ret == GP_OK) {
+						C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed, \"\" to \"\"")+strlen(name)+1+strlen(content?content:"")));
+						sprintf (*eventdata, "PTP Property %04x changed, \"%s\" to \"%s\"", entry.u.propid, name, content?content:"");
+						free (name);
+						free (content);
+					} else {
+						C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
+						sprintf (*eventdata, "PTP Property %04x changed", entry.u.propid);
+					}
+					ptp_free_devicepropdesc (&dpd);
 					return GP_OK;
+				}
 				case PTP_CANON_EOS_CHANGES_TYPE_CAMERASTATUS:
 					/* if we do capture stuff, camerastatus will turn to 0 when done */
 					if (entry.u.status == 0) {
@@ -5042,12 +6729,12 @@
 					*eventtype = GP_EVENT_UNKNOWN;
 					C_MEM (*eventdata = malloc(strlen("Focus Info 12345678901234567890123456789")+1));
 					sprintf (*eventdata, "Focus Info %s", entry.u.info);
-					break;
+					return GP_OK;
 				case PTP_CANON_EOS_CHANGES_TYPE_FOCUSMASK:
 					*eventtype = GP_EVENT_UNKNOWN;
 					C_MEM (*eventdata = malloc(strlen("Focus Mask 12345678901234567890123456789")+1));
 					sprintf (*eventdata, "Focus Mask %s", entry.u.info);
-					break;
+					return GP_OK;
 				case PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN:
 					/* only return if interesting stuff happened */
 					if (entry.u.info) {
@@ -5093,27 +6780,26 @@
 					C_PTP (ptp_getobjectinfo (params, newobject, &oi));
 
 					if (oi.ParentObject != 0) {
-						CR (add_object (camera, newobject, context));
 						C_MEM (path = malloc (sizeof(CameraFilePath)));
-						strcpy  (path->name,  oi.Filename);
-						sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)oi.StorageID);
-						get_folder_from_handle (camera, oi.StorageID, oi.ParentObject, path->folder);
-						/* delete last / or we get confused later. */
-						path->folder strlen(path->folder)-1  = '\0';
-						gp_filesystem_append (camera->fs, path->folder, path->name, context);
-
+						ret = add_object_to_fs_and_path (camera, newobject, path, context);
+						if (ret != GP_OK) {
+							ptp_free_objectinfo (&oi);
+							free (path);
+							return ret;
+						}
 					} else {
 						C_MEM (path = malloc (sizeof(CameraFilePath)));
 						sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx",(unsigned long)oi.StorageID);
-						sprintf (path->name, "capt%04d.jpg", capcnt++);
+						sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 						add_objectid_and_upload (camera, path, context, newobject, &oi);
 					}
+					ptp_free_objectinfo (&oi);
 					*eventdata = path;
 					*eventtype = GP_EVENT_FILE_ADDED;
 					return GP_OK;
 				}
 				case PTP_EC_CANON_ShutterButtonPressed0:
-				case PTP_EC_CANON_ShutterButtonPressed1:
+				/*case PTP_EC_CANON_ShutterButtonPressed1: This seems to be sent without a press on S3 IS, likely some other event reason */
 				{
 					C_MEM (path = malloc(sizeof(CameraFilePath)));
 					ret = camera_canon_capture (camera, GP_CAPTURE_IMAGE, path, context);
@@ -5139,7 +6825,7 @@
 	}
 
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
-		ptp_operation_issupported(params, PTP_OC_NIKON_CheckEvent)
+		ptp_operation_issupported(params, PTP_OC_NIKON_GetEvent)
 	) {
 		do {
 			C_PTP_REP (ptp_check_event (params));
@@ -5175,27 +6861,22 @@
 					path->folder0='\0';
 
 					ofc = ob->oi.ObjectFormat;
-					/* ob might be invalidated by get_folder_from_handle */
 
 					if (ob->oi.StorageID == 0) {
 						/* We would always get the same filename,
-					 * which will confuse the frontends */
+						 * which will confuse the frontends */
 						if (strstr(ob->oi.Filename,".NEF"))
-							sprintf (path->name, "capt%04d.nef", capcnt++);
+							sprintf (path->name, "capt%04d.nef", params->capcnt++);
 						else
-							sprintf (path->name, "capt%04d.jpg", capcnt++);
+							sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 						free (ob->oi.Filename);
 						C_MEM (ob->oi.Filename = strdup (path->name));
 						strcpy (path->folder,"/");
 						goto downloadnow;
-					} else {
-						strcpy  (path->name,  ob->oi.Filename);
-						sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
-						get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
-						path->folder strlen(path->folder)-1  = '\0';
 					}
-					/* ob pointer can be invalid now! */
-					/* delete last / or we get confused later. */
+
+					CR (add_object_to_fs_and_path (camera, event.Param1, path, context));
+
 					if (ofc == PTP_OFC_Association) { /* new folder! */
 						*eventtype = GP_EVENT_FOLDER_ADDED;
 						*eventdata = path;
@@ -5203,8 +6884,6 @@
 						/* if this was the last current event ... stop and return the folder add */
 						return GP_OK;
 					} else {
-						CR (gp_filesystem_append (camera->fs, path->folder,
-						path->name, context));
 						*eventtype = GP_EVENT_FILE_ADDED;
 						*eventdata = path;
 						return GP_OK;
@@ -5227,10 +6906,10 @@
 					if (ret!=GP_OK) return ret;
 					if (oi.ObjectFormat != PTP_OFC_EXIF_JPEG) {
 						GP_LOG_D ("raw? ofc is 0x%04x, name is %s", oi.ObjectFormat,oi.Filename);
-						sprintf (path->name, "capt%04d.nef", capcnt++);
+						sprintf (path->name, "capt%04d.nef", params->capcnt++);
 						gp_file_set_mime_type (file, "image/x-nikon-nef"); /* FIXME */
 					} else {
-						sprintf (path->name, "capt%04d.jpg", capcnt++);
+						sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 						gp_file_set_mime_type (file, GP_MIME_JPEG);
 					}
 					gp_file_set_mtime (file, time(NULL));
@@ -5239,9 +6918,11 @@
 					C_PTP_REP (ptp_getobject (params, newobject, (unsigned char**)&ximage));
 					ret = gp_file_set_data_and_size(file, (char*)ximage, oi.ObjectCompressedSize);
 					if (ret != GP_OK) {
+						ptp_free_objectinfo (&oi);
 						gp_file_free (file);
 						return ret;
 					}
+					ptp_free_objectinfo (&oi);
 					ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
 					if (ret != GP_OK) {
 						gp_file_free (file);
@@ -5293,7 +6974,7 @@
 			C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_SONY_ObjectInMemory, &dpd));
 			GP_LOG_D ("DEBUG== 0xd215 after capture = %d", dpd.CurrentValue.u16);
 
-			/* if prop 0xd215 > 0x8000, the object in RAM is available at location 0xffffc001 */
+			/* if prop 0xd215 is above 0x8000, the object in RAM is available at location 0xffffc001 */
 			if (dpd.CurrentValue.u16 > 0x8000) {
 				GP_LOG_D ("SONY ObjectInMemory count change seen, retrieving file");
 
@@ -5306,14 +6987,17 @@
 				path->name0='\0';
 				strcpy (path->folder,"/");
 				ret = gp_file_new(&file);
-				if (ret!=GP_OK)
+				if (ret != GP_OK) {
+					ptp_free_devicepropdesc (&dpd);
+					ptp_free_objectinfo (&oi);
 					return ret;
+				}
 				if (oi.ObjectFormat != PTP_OFC_EXIF_JPEG) {
 					GP_LOG_D ("raw? ofc is 0x%04x, name is %s", oi.ObjectFormat,oi.Filename);
-					sprintf (path->name, "capt%04d.arw", capcnt++);
+					sprintf (path->name, "capt%04d.arw", params->capcnt++);
 					gp_file_set_mime_type (file, "image/x-sony-arw"); /* FIXME */
 				} else {
-					sprintf (path->name, "capt%04d.jpg", capcnt++);
+					sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 					gp_file_set_mime_type (file, GP_MIME_JPEG);
 				}
 				gp_file_set_mtime (file, time(NULL));
@@ -5323,30 +7007,185 @@
 				ret = gp_file_set_data_and_size(file, (char*)ximage, oi.ObjectCompressedSize);
 				if (ret != GP_OK) {
 					gp_file_free (file);
+					ptp_free_devicepropdesc (&dpd);
+					ptp_free_objectinfo (&oi);
 					return ret;
 				}
 				ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
 				if (ret != GP_OK) {
 					gp_file_free (file);
+					ptp_free_devicepropdesc (&dpd);
+					ptp_free_objectinfo (&oi);
 					return ret;
 				}
 				ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
 				if (ret != GP_OK) {
 					gp_file_free (file);
+					ptp_free_devicepropdesc (&dpd);
+					ptp_free_objectinfo (&oi);
 					return ret;
 				}
+
+				memset (&info, 0, sizeof (info));
+				/* we also get the fs info for free, so just set it */
+				info.file.fields = GP_FILE_INFO_TYPE |
+						GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+						GP_FILE_INFO_SIZE | GP_FILE_INFO_MTIME;
+				strcpy_mime (info.file.type, params->deviceinfo.VendorExtensionID, oi.ObjectFormat);
+				info.file.width		= oi.ImagePixWidth;
+				info.file.height	= oi.ImagePixHeight;
+				info.file.size		= oi.ObjectCompressedSize;
+				info.file.mtime		= time(NULL);
+
+				info.preview.fields = GP_FILE_INFO_TYPE |
+						GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
+						GP_FILE_INFO_SIZE;
+				strcpy_mime (info.preview.type, params->deviceinfo.VendorExtensionID, oi.ThumbFormat);
+				info.preview.width	= oi.ThumbPixWidth;
+				info.preview.height	= oi.ThumbPixHeight;
+				info.preview.size	= oi.ThumbCompressedSize;
+				GP_LOG_D ("setting fileinfo in fs");
+				gp_filesystem_set_info_noop(camera->fs, path->folder, path->name, info, context);
+
 				*eventtype = GP_EVENT_FILE_ADDED;
 				*eventdata = path;
 				/* We have now handed over the file, disclaim responsibility by unref. */
 				gp_file_unref (file);
+
+				/* Synthesize a capture complete event, if this was the last image. */
+				if (dpd.CurrentValue.u16 == 0x8001) {
+					event.Code = PTP_EC_CaptureComplete;
+					event.Nparam = 0;
+					ptp_add_event (params, &event);
+				}
+				ptp_free_devicepropdesc (&dpd);
+				ptp_free_objectinfo (&oi);
 				return GP_OK;
 			}
-
 sonyout:
+			ptp_free_devicepropdesc (&dpd);
 			/* If not, check for events and handle them */
+			if (time_since(event_start) > timeout-100) {
+				/* if there is less than 0.1 seconds, just check the
+				 * queue. with libusb1 this can still make progress,
+				 * as above bulk calls will check and queue new ptp events
+				 * async */
+				C_PTP_REP (ptp_check_event_queue(params));
+			} else {
+				C_PTP_REP (ptp_check_event(params));
+			}
+			if (ptp_get_one_event (params, &event))
+				goto handleregular;
+			gp_context_idle (context);
+		} while (waiting_for_timeout (&back_off_wait, event_start, timeout));
+
+		*eventtype = GP_EVENT_TIMEOUT;
+		return GP_OK;
+	}
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_FUJI) &&
+		ptp_property_issupported(params, PTP_DPC_FUJI_CurrentState)
+	) {
+		/* current strategy ... as the camera (currently) does not send us ObjectAdded events for some reason...
+		 * we just synthesize them for the generic PTP event handler code */
+		do {
+			PTPObjectHandles	handles;
+			unsigned int		i;
+
+			if (ptp_get_one_event (params, &event))
+				goto handleregular;
+			C_PTP (ptp_getobjecthandles (params, PTP_HANDLER_SPECIAL, 0x000000, 0x000000, &handles));
+			for (i=handles.n;i--;) {
+				PTPObject	*ob;
+				PTPObjectInfo	oi;
+
+				if (params->inliveview == 1 && handles.Handleri == 0x80000001) /* Ignore preview image object handle while liveview is active */
+					continue;
+				if (PTP_RC_OK == ptp_object_find (params, handles.Handleri, &ob)) /* already have it */
+					continue;
+				/* might be a just deleted entry , seen in https://github.com/gphoto/gphoto2/issues/456 */
+				memset (&oi,0,sizeof(oi));
+				if (PTP_RC_DeviceBusy == ptp_getobjectinfo (params, handles.Handleri, &oi))
+					continue;
+				ptp_free_objectinfo (&oi);
+				event.Code = PTP_EC_ObjectAdded;
+				event.Param1 = handles.Handleri;
+				free (handles.Handler);
+				goto handleregular;
+			}
+			free (handles.Handler);
 			C_PTP_REP (ptp_check_event(params));
+		} while (waiting_for_timeout (&back_off_wait, event_start, timeout));
+		*eventtype = GP_EVENT_TIMEOUT;
+		return GP_OK;
+	}
+
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) &&
+		ptp_operation_issupported(params, PTP_OC_SONY_QX_GetAllDevicePropData)
+	) {
+		do {
+			PTPObjectInfo		oi;
+
+			C_PTP (ptp_sony_qx_getalldevicepropdesc (params)); /* avoid caching */
+
+			/* FIXME: here the code for image addition */
+
+			/* If not, check for events and handle them */
+			if (time_since(event_start) > timeout-100) {
+				/* if there is less than 0.1 seconds, just check the
+				 * queue. with libusb1 this can still make progress,
+				 * as above bulk calls will check and queue new ptp events
+				 * async */
+				C_PTP_REP (ptp_check_event_queue(params));
+			} else {
+				C_PTP_REP (ptp_check_event(params));
+			}
 			if (ptp_get_one_event (params, &event))
 				goto handleregular;
+			oi.ObjectFormat = 0;
+			C_PTP (ptp_getobjectinfo (params, 0xffffc001, &oi));
+			if (oi.ObjectFormat) {
+				debug_objectinfo(params, newobject, &oi);
+				C_MEM (path = malloc(sizeof(CameraFilePath)));
+				path->name0='\0';
+				strcpy (path->folder,"/");
+				ret = gp_file_new(&file);
+				if (ret!=GP_OK)
+					return ret;
+				if (oi.ObjectFormat != PTP_OFC_EXIF_JPEG) {
+					GP_LOG_D ("raw? ofc is 0x%04x, name is %s", oi.ObjectFormat,oi.Filename);
+					sprintf (path->name, "capt%04d.arw", params->capcnt++);
+					gp_file_set_mime_type (file, "image/x-sony-arw"); /* FIXME */
+				} else {
+					sprintf (path->name, "capt%04d.jpg", params->capcnt++);
+					gp_file_set_mime_type (file, GP_MIME_JPEG);
+				}
+				gp_file_set_mtime (file, time(NULL));
+
+				GP_LOG_D ("trying to get object size=0x%lx", (unsigned long)oi.ObjectCompressedSize);
+				C_PTP_REP (ptp_getobject (params, newobject, (unsigned char**)&ximage));
+				ret = gp_file_set_data_and_size(file, (char*)ximage, oi.ObjectCompressedSize);
+				if (ret != GP_OK) {
+					ptp_free_objectinfo (&oi);
+					gp_file_free (file);
+					return ret;
+				}
+				ptp_free_objectinfo (&oi);
+				ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
+				if (ret != GP_OK) {
+					gp_file_free (file);
+					return ret;
+				}
+				ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
+				if (ret != GP_OK) {
+					gp_file_free (file);
+					return ret;
+				}
+				*eventtype = GP_EVENT_FILE_ADDED;
+				*eventdata = path;
+				/* We have now handed over the file, disclaim responsibility by unref. */
+				gp_file_unref (file);
+				break;
+			}
 
 			gp_context_idle (context);
 		} while (waiting_for_timeout (&back_off_wait, event_start, timeout));
@@ -5354,6 +7193,66 @@
 		*eventtype = GP_EVENT_TIMEOUT;
 		return GP_OK;
 	}
+	if 	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_OLYMPUS_OMD)
+	{
+
+		do {
+			C_PTP_REP (ptp_check_event (params));
+
+			while (ptp_get_one_event(params, &event)) {
+				GP_LOG_D ("received event Code %04x, Param 1 %08x", event.Code, event.Param1);
+				switch (event.Code) {
+				case PTP_EC_Olympus_ObjectAdded:
+				case PTP_EC_Olympus_ObjectAdded_New:
+				case PTP_EC_ObjectAdded:
+					newobject = event.Param1;
+					goto downloadomdfile;
+				case PTP_EC_Olympus_DevicePropChanged:
+				case PTP_EC_Olympus_DevicePropChanged_New: {
+					char			*name, *content;
+					PTPDevicePropDesc	dpd;
+
+					*eventtype = GP_EVENT_UNKNOWN;
+					/* cached devprop should have been flushed I think... */
+					C_PTP_REP (ptp_generic_getdevicepropdesc (params, event.Param1&0xffff, &dpd));
+
+					ret = camera_lookup_by_property(camera, &dpd, &name, &content, context);
+					if (ret == GP_OK) {
+						C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed, \"\" to \"\"")+strlen(name)+1+strlen(content?content:"")));
+						sprintf (*eventdata, "PTP Property %04x changed, \"%s\" to \"%s\"", event.Param1 & 0xffff, name, content?content:"");
+						free (name);
+						free (content);
+					} else {
+						C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
+						sprintf (*eventdata, "PTP Property %04x changed", event.Param1 & 0xffff);
+					}
+					ptp_free_devicepropdesc (&dpd);
+					return GP_OK;
+				}
+				default:
+					*eventtype = GP_EVENT_UNKNOWN;
+					C_MEM (*eventdata = malloc(strlen("PTP Event 0123, Param1 01234567")+1));
+					sprintf (*eventdata, "PTP Event %04x, Param1 %08x", event.Code, event.Param1);
+					return GP_OK;
+				}
+			}
+		}  while (waiting_for_timeout (&back_off_wait, event_start, timeout));
+
+downloadomdfile:
+		C_MEM (path = malloc(sizeof(CameraFilePath)));
+		path->name0='\0';
+		path->folder0='\0';
+
+		if (newobject != 0) {
+			CR (add_object_to_fs_and_path (camera, newobject, path, context));
+
+			*eventtype = GP_EVENT_FILE_ADDED;
+			*eventdata = path;
+			return GP_OK;
+		}
+		*eventtype = GP_EVENT_TIMEOUT;
+		return GP_OK;
+	}
 
 	/* Wait for the whole timeout period */
 	CR (gp_port_get_timeout (camera->port, &oldtimeout));
@@ -5370,10 +7269,19 @@
 	return GP_OK;
 
 handleregular:
+	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) {
+		switch (event.Code) {
+		case PTP_EC_PANASONIC_ObjectAdded:
+			GP_LOG_D ("PANASONIC_ObjectAdded -> PTP_EC_ObjectAdded");
+			event.Code = PTP_EC_ObjectAdded;
+			break;
+		}
+	}
 	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) {
 		switch (event.Code) {
-		/* We are handling this in the above sony case. events might
-		 * come to early and retrieving the image might reboot the camera. */
+		/* We are handling this in the above Sony case. events might
+		 * come to early (or too late, as we handled it above)
+		 * and retrieving the image will crash the camera. */
 		case PTP_EC_Sony_ObjectAdded: {
 #if 0
 			PTPObjectInfo	oi;
@@ -5383,11 +7291,13 @@
 
 			sprintf (path->folder,"/");
 			if (oi.ObjectFormat == PTP_OFC_SONY_RAW)
-				sprintf (path->name, "capt%04d.arw", capcnt++);
+				sprintf (path->name, "capt%04d.arw", params->capcnt++);
 			else
-				sprintf (path->name, "capt%04d.jpg", capcnt++);
+				sprintf (path->name, "capt%04d.jpg", params->capcnt++);
 
 			CR (add_objectid_and_upload (camera, path, context, event.Param1, &oi));
+
+			ptp_free_objectinfo (&oi);
 			*eventtype = GP_EVENT_FILE_ADDED;
 			*eventdata = path;
 			return GP_OK;
@@ -5407,37 +7317,105 @@
 		break;
 	case PTP_EC_ObjectAdded: {
 		PTPObject	*ob;
-		uint16_t	ofc;
 
 		C_MEM (path = malloc(sizeof(CameraFilePath)));
 		path->name0='\0';
 		path->folder0='\0';
 
+		CR (add_object_to_fs_and_path (camera, event.Param1, path, context));
+
 		C_PTP_REP (ptp_object_want (params, event.Param1, PTPOBJECT_OBJECTINFO_LOADED, &ob));
-		strcpy  (path->name,  ob->oi.Filename);
-		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)ob->oi.StorageID);
-		ofc = ob->oi.ObjectFormat;
-		get_folder_from_handle (camera, ob->oi.StorageID, ob->oi.ParentObject, path->folder);
-		/* ob could be invalid now, reload it or dont use it... */
-		/* delete last / or we get confused later. */
-		path->folder strlen(path->folder)-1  = '\0';
-		if (ofc == PTP_OFC_Association) { /* new folder! */
+
+		if (ob->oi.ObjectFormat == PTP_OFC_Association) { /* new folder! */
 			*eventtype = GP_EVENT_FOLDER_ADDED;
 			*eventdata = path;
 			gp_filesystem_reset (camera->fs); /* FIXME: implement more lightweight folder add */
 		} else {
-			CR (gp_filesystem_append (camera->fs, path->folder,
-						  path->name, context));
 			*eventtype = GP_EVENT_FILE_ADDED;
 			*eventdata = path;
 		}
 		break;
 	}
-	case PTP_EC_DevicePropChanged:
+	case PTP_EC_DeviceInfoChanged:
 		*eventtype = GP_EVENT_UNKNOWN;
-		C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
-		sprintf (*eventdata, "PTP Property %04x changed", event.Param1 & 0xffff);
+		C_MEM (*eventdata = malloc(strlen("PTP Deviceinfo changed")+1));
+		sprintf (*eventdata, "PTP Deviceinfo changed");
+		C_PTP_REP (ptp_getdeviceinfo (params, &params->deviceinfo));
+		CR (fixup_cached_deviceinfo (camera, &params->deviceinfo));
+		print_debug_deviceinfo(params, &params->deviceinfo);
 		break;
+	case PTP_EC_DevicePropChanged: {
+		char			*name, *content;
+		PTPDevicePropDesc	dpd;
+
+		*eventtype = GP_EVENT_UNKNOWN;
+		/* cached devprop should have been flushed I think... */
+		ret = ptp_generic_getdevicepropdesc (params, event.Param1&0xffff, &dpd);
+
+		/* Nikon Z6 II reports a prop changed event 501c, but getdevicepropdesc fails with devicepropnot supported
+		 * (reported via email)
+		 */
+		if (ret == PTP_RC_DevicePropNotSupported) {
+			C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
+			sprintf (*eventdata, "PTP Property %04x changed", event.Param1 & 0xffff);
+			break;
+		}
+		if (ret != PTP_RC_OK)
+			C_PTP_REP (ret);
+
+		ret = camera_lookup_by_property(camera, &dpd, &name, &content, context);
+		if (ret == GP_OK) {
+			C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed, \"\" to \"\"")+strlen(name)+1+strlen(content?content:"")));
+			sprintf (*eventdata, "PTP Property %04x changed, \"%s\" to \"%s\"", event.Param1 & 0xffff, name, content?content:"");
+			free (name);
+			free (content);
+		} else {
+			C_MEM (*eventdata = malloc(strlen("PTP Property 0123 changed")+1));
+			sprintf (*eventdata, "PTP Property %04x changed", event.Param1 & 0xffff);
+		}
+		ptp_free_devicepropdesc (&dpd);
+		break;
+	}
+	case PTP_EC_ObjectInfoChanged: {
+		PTPObject	*ob;
+		uint32_t	oldstorage, oldparent;
+		char		*oldfn;
+
+		C_PTP_REP (ptp_object_want (params, event.Param1, 0, &ob));
+		/* objectinfo might not even be loaded yet, but this could be 0 / NULL ... but the compare will trigger */
+		oldparent = ob->oi.ParentObject;
+		oldstorage = ob->oi.StorageID;
+		oldfn = strdup(ob->oi.Filename?ob->oi.Filename:"<null>");
+
+		ob->flags &= ~PTPOBJECT_OBJECTINFO_LOADED;
+
+
+		C_MEM (path = malloc(sizeof(CameraFilePath)));
+		path->name0='\0';
+		path->folder0='\0';
+
+		CR (add_object_to_fs_and_path (camera, event.Param1, path, context));
+
+		C_PTP_REP (ptp_object_want (params, event.Param1, PTPOBJECT_OBJECTINFO_LOADED, &ob));
+
+		/* did the location or name of the file changed in the filesystem? Then we can only reset the fs and refetch the layout */
+		if (	(oldparent != ob->oi.ParentObject) &&
+			(oldstorage != ob->oi.StorageID) &&
+			(strcmp(oldfn,ob->oi.Filename) != 0)
+		)
+			gp_filesystem_reset (camera->fs);
+		free (oldfn);
+
+		if (ob->oi.ObjectFormat == PTP_OFC_Association) { /* new folder? would be weird here? */
+			*eventtype = GP_EVENT_FOLDER_ADDED;
+			*eventdata = path;
+		} else {
+			*eventtype = GP_EVENT_FILE_CHANGED;
+			*eventdata = path;
+			gp_filesystem_set_info_dirty (camera->fs, path->folder, path->name, context);
+		}
+		break;
+	}
 	case PTP_EC_ObjectRemoved:
 		ptp_remove_object_from_cache(params, event.Param1);
 		gp_filesystem_reset (camera->fs);
@@ -5466,6 +7444,11 @@
 	return GP_OK;
 }
 
+static int ptp_max(int a, int b) {
+	if (a > b) return a;
+	return b;
+}
+
 static int
 snprintf_ptp_property (char *txt, int spaceleft, PTPPropertyValue *data, uint16_t dt)
 {
@@ -5474,14 +7457,19 @@
 	if (dt & PTP_DTC_ARRAY_MASK) {
 		unsigned int i;
 		const char *origtxt = txt;
-#define SPACE_LEFT (origtxt + spaceleft - txt)
+#define SPACE_LEFT ptp_max(0, (origtxt + spaceleft - txt))
 
 		txt += snprintf (txt, SPACE_LEFT, "a%d ", data->a.count);
-		for ( i=0; i<data->a.count; i++) {
+		unsigned int n_to_print = data->a.count;
+		if (n_to_print > 64)
+			n_to_print = 64;
+		for ( i=0; i<n_to_print; i++) {
 			txt += snprintf_ptp_property (txt, SPACE_LEFT, &data->a.vi, dt & ~PTP_DTC_ARRAY_MASK);
-			if (i!=data->a.count-1)
+			if (i!=n_to_print-1)
 				txt += snprintf (txt, SPACE_LEFT, ",");
 		}
+		if (n_to_print < data->a.count)
+			txt += snprintf (txt, SPACE_LEFT, ", ...");
 		return txt - origtxt;
 #undef SPACE_LEFT
 	} else {
@@ -5621,11 +7609,6 @@
 	return (GP_OK);
 }
 
-static int ptp_max(int a, int b) {
-	if (a > b) return a;
-	return b;
-}
-
 static int
 camera_summary (Camera* camera, CameraText* summary, GPContext *context)
 {
@@ -5682,6 +7665,47 @@
 	}
 	APPEND_TXT ("\n");
 
+	/* PTP 1.1 streams */
+	if (	ptp_operation_issupported(params,PTP_OC_GetStreamInfo) &&
+		ptp_property_issupported(params, PTP_DPC_SupportedStreams)
+	)  {
+		PTPPropertyValue propval;
+
+		ret = ptp_getdevicepropvalue (params, PTP_DPC_SupportedStreams, &propval, PTP_DTC_UINT32);
+		if (ret == PTP_RC_OK) {
+			APPEND_TXT (_("\nStreams:"));
+			APPEND_TXT ("%08x", propval.u32);
+			APPEND_TXT ("\n");
+			for (i=0;i<31;i++) {
+				PTPStreamInfo streaminfo;
+
+				if ((1<<i) & propval.u32) {
+					APPEND_TXT ("\t");
+					switch (i) {
+					case 0: APPEND_TXT (_("Video"));
+						break;
+					case 1: APPEND_TXT (_("Audio"));
+						break;
+					default: APPEND_TXT ("%d", i);
+						break;
+					}
+					ret = ptp_getstreaminfo (params, i, &streaminfo);
+					if (ret == PTP_RC_OK) {
+						APPEND_TXT( ": dss: %lud, timeres: %lud, fhsize: %d, fmxsize: %d, phsize: %d, pmsize: %d, palign: %d\n",
+							streaminfo.DatasetSize,
+							streaminfo.TimeResolution,
+							streaminfo.FrameHeaderSize,
+							streaminfo.FrameMaxSize,
+							streaminfo.PacketHeaderSize,
+							streaminfo.PacketMaxSize,
+							streaminfo.PacketAlignment
+						);
+					} else APPEND_TXT (": error 0x%04x on getstreaminfo\n", ret);
+				}
+			}
+		}
+	}
+
 	if (is_mtp_capable (camera) &&
 	    ptp_operation_issupported(params,PTP_OC_MTP_GetObjectPropsSupported)
 	) {
@@ -5744,7 +7768,7 @@
 				APPEND_TXT (_("Canon EOS Capture 2, "));
 			break;
 		case PTP_VENDOR_NIKON:
-			if (ptp_operation_issupported(params, PTP_OC_NIKON_Capture))
+			if (ptp_operation_issupported(params, PTP_OC_NIKON_InitiateCaptureRecInSdram))
 				APPEND_TXT (_("Nikon Capture 1, "));
 			if (ptp_operation_issupported(params, PTP_OC_NIKON_AfCaptureSDRAM))
 				APPEND_TXT (_("Nikon Capture 2, "));
@@ -5915,7 +7939,7 @@
 					APPEND_TXT ("\n\t");
 				for (j = 0; j<dpd.FORM.Enum.NumberOfValues; j++) {
 					txt += snprintf_ptp_property (txt, SPACE_LEFT, dpd.FORM.Enum.SupportedValue+j, dpd.DataType);
-					if (j != dpd.FORM.Enum.NumberOfValues-1) {
+					if (j+1 != dpd.FORM.Enum.NumberOfValues) {
 						APPEND_TXT (",");
 						if ((dpd.DataType & PTP_DTC_ARRAY_MASK) == PTP_DTC_ARRAY_MASK)
 							APPEND_TXT ("\n\t");
@@ -5967,14 +7991,14 @@
 		if (ret != PTP_RC_OK) {
 			/* NOTE: the "i" array entry might now be invalid, as object_want can remove objects from the list */
 			GP_LOG_D("failed getting info of oid 0x%08x?", oid);
-			/* could happen if file gets removed inbetween */
+			/* could happen if file gets removed between */
 			continue;
 		}
 		if ((ob->oi.StorageID==storage) && (ob->oi.ParentObject==handle)) {
 			ret = ptp_object_want (params, oid, PTPOBJECT_OBJECTINFO_LOADED, &ob);
 			if (ret != PTP_RC_OK) {
 				GP_LOG_D("failed getting info of oid 0x%08x?", oid);
-				/* could happen if file gets removed inbetween */
+				/* could happen if file gets removed between */
 				/* FIXME: should remove, but then we irritate our list */
 				continue;
 			}
@@ -6009,7 +8033,7 @@
 	if (c != NULL) {
 		*c = 0;
 		parent = find_child (params, folder, storage, parent, retob);
-		if (parent == PTP_HANDLER_SPECIAL) 
+		if (parent == PTP_HANDLER_SPECIAL)
 			GP_LOG_D("not found???");
 		return folder_to_handle(params, c+1, storage, parent, retob);
 	} else  {
@@ -6026,7 +8050,7 @@
     uint32_t parent, storage=0x0000000;
     unsigned int i, hasgetstorageids;
     SET_CONTEXT_P(params, context);
-    int	lastnrofobjects = params->nrofobjects, redoneonce = 0;
+    unsigned int	lastnrofobjects = params->nrofobjects, redoneonce = 0;
 
     GP_LOG_D ("file_list_func(%s)", folder);
 
@@ -6043,7 +8067,7 @@
     /* compute storage ID value from folder patch */
     folder_to_storage(folder,storage);
 
-    /* Get (parent) folder handle omiting storage pseudofolder */
+    /* Get (parent) folder handle omitting storage pseudofolder */
     find_folder_handle(params,folder,storage,parent);
 
     C_PTP_REP (ptp_list_folder (params, storage, parent));
@@ -6055,6 +8079,7 @@
     for (i = 0; i < params->nrofobjects; i++) {
 	PTPObject	*ob;
 	uint16_t	ret;
+	uint32_t	oid;
 
 	/* not our parent -> next */
 	C_PTP_REP (ptp_object_want (params, params->objectsi.oid, PTPOBJECT_PARENTOBJECT_LOADED|PTPOBJECT_STORAGEID_LOADED, &ob));
@@ -6068,13 +8093,14 @@
 	if ((hasgetstorageids && (ob->oi.StorageID != storage)))
 		continue;
 
-	ret = ptp_object_want (params, ob->oid, PTPOBJECT_OBJECTINFO_LOADED, &ob);
+	oid = ob->oid; /* ob might change or even become invalid in the function below */
+	ret = ptp_object_want (params, oid, PTPOBJECT_OBJECTINFO_LOADED, &ob);
 	if (ret != PTP_RC_OK) {
 		/* we might raced another delete or ongoing addition, seen on a D810 */
 		if (ret == PTP_RC_InvalidObjectHandle) {
-			GP_LOG_D ("Handle %08x was in list, but not/no longer found via getobjectinfo.\n", ob->oid);
+			GP_LOG_D ("Handle %08x was in list, but not/no longer found via getobjectinfo.\n", oid);
 			/* remove it for now, we will readd it later if we see it again. */
-			ptp_remove_object_from_cache(params, ob->oid);
+			ptp_remove_object_from_cache(params, oid);
 			continue;
 		}
 		C_PTP_REP (ret);
@@ -6123,7 +8149,7 @@
 	PTPParams *params = &((Camera *)data)->pl->params;
 	unsigned int i, hasgetstorageids;
 	uint32_t handler,storage;
-	int redoneonce = 0, lastnrofobjects = params->nrofobjects;
+	unsigned int redoneonce = 0, lastnrofobjects = params->nrofobjects;
 
 	SET_CONTEXT_P(params, context);
 	GP_LOG_D ("folder_list_func(%s)", folder);
@@ -6167,7 +8193,7 @@
 	/* compute storage ID value from folder path */
 	folder_to_storage (folder,storage);
 
-	/* Get folder handle omiting storage pseudofolder */
+	/* Get folder handle omitting storage pseudofolder */
 	find_folder_handle (params,folder,storage,handler);
 
 	/* list this directory */
@@ -6429,7 +8455,7 @@
 	C_PTP (ptp_mtp_getobjectpropssupported (params, ofc, &propcnt, &props));
 
 	for (j=0;j<propcnt;j++) {
-		char			propname256,propname2256;
+		char			propname256,propname2256+4;
 		char			*begin, *end, *content;
 		PTPObjectPropDesc	opd;
 		int 			i;
@@ -6465,7 +8491,7 @@
 			GP_LOG_D ("Tag %s is read only, sorry.", propname);
 			free (content); content = NULL;
 			continue;
-		}	
+		}
 		switch (opd.DataType) {
 		default:GP_LOG_E ("mtp parser: Unknown datatype %d, content %s", opd.DataType, content);
 			free (content); content = NULL;
@@ -6510,7 +8536,7 @@
 	char		*content = NULL;
 
 	C_PTP (ptp_mtp_getobjectreferences (params, object_id, &objects, &numobjects));
-	
+
 	for (i=0;i<numobjects;i++) {
 		char		buf4096;
 		int		len;
@@ -6581,7 +8607,7 @@
 
 		/* compute storage ID value from folder patch */
 		folder_to_storage(fn,storage);
-		/* Get file number omiting storage pseudofolder */
+		/* Get file number omitting storage pseudofolder */
 		find_folder_handle(params, fn, storage, objectid);
 		objectid = find_child(params, filename, storage, objectid, NULL);
 		if (objectid != PTP_HANDLER_SPECIAL) {
@@ -6646,7 +8672,7 @@
 ) {
 	PTPCFHandlerPrivate* priv= (PTPCFHandlerPrivate*)xpriv;
 	int ret;
-	
+
 	ret = gp_file_append (priv->file, (char*)bytes, sendlen);
 	if (ret != GP_OK)
 		return PTP_ERROR_IO;
@@ -6714,7 +8740,7 @@
 
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, oid);
 	oid = find_child(params, filename, storage, oid, &ob);
 	if (oid == PTP_HANDLER_SPECIAL) {
@@ -6814,7 +8840,7 @@
 	 * (TODO for Marcus and 2.2 ;)
 	 */
 	uint32_t oid;
-	uint32_t size;
+	uint64_t size;
 	uint32_t storage;
 	PTPObject *ob;
 	PTPParams *params = &camera->pl->params;
@@ -6840,7 +8866,7 @@
 
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, oid);
 	oid = find_child(params, filename, storage, oid, &ob);
 	if (oid == PTP_HANDLER_SPECIAL) {
@@ -6896,8 +8922,9 @@
 		break;
 	}
 	case	GP_FILE_TYPE_PREVIEW: {
-		unsigned char *ximage = NULL;
-		unsigned int xlen;
+		unsigned char	*ximage = NULL;
+		unsigned int	xlen;
+		char		buf200;
 
 		/* If thumb size is 0, and the ofc is not an image type (0x38xx or 0xb8xx)
 		 * then there is no thumbnail at all... */
@@ -6907,10 +8934,21 @@
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW)) &&
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_MOV)) &&
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_MOV2)) &&
-			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW3))
+			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW3)) &&
+			((ob->oi.ObjectFormat != PTP_OFC_CANON_CR3))
 		))
 			return GP_ERROR_NOT_SUPPORTED;
-		C_PTP_REP (ptp_getthumb(params, oid, &ximage, &xlen));
+
+		if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON)	&&
+			ptp_operation_issupported(params,PTP_OC_NIKON_GetLargeThumb)	&&
+			(GP_OK == gp_setting_get("ptp2","thumbsize",buf))		&&
+			!strcmp(buf,"large")
+		) {
+			C_PTP_REP (ptp_nikon_getlargethumb(params, oid, &ximage, &xlen));
+		} else {
+			C_PTP_REP (ptp_getthumb(params, oid, &ximage, &xlen));
+		}
+
 		set_mimetype (file, params->deviceinfo.VendorExtensionID, ob->oi.ThumbFormat);
 		CR (gp_file_set_data_and_size (file, (char*)ximage, xlen));
 		break;
@@ -6944,8 +8982,62 @@
 			return mtp_get_playlist (camera, file, oid, context);
 
 		size=ob->oi.ObjectCompressedSize;
-/* EOS software uses 1MB blobs */
-#define BLOBSIZE 5*1024*1024
+#define BLOBSIZE 1*1024*1024
+		if (size > 0xffffffffUL) {	/* larger than 4GB */
+			if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
+				(ptp_operation_issupported(params,PTP_OC_NIKON_GetPartialObjectEx))
+			) {
+#define NIKONBLOBSIZE 10*1024*1024
+				unsigned char	*ximage = NULL;
+				uint64_t 	offset = 0;
+
+				while (offset < size) {
+					uint64_t	xsize = size - offset;
+					uint32_t	xlen;
+
+					if (xsize > NIKONBLOBSIZE)
+						xsize = NIKONBLOBSIZE;
+					C_PTP_REP (ptp_nikon_getpartialobjectex (params, oid, offset, xsize, &ximage, &xlen));
+					gp_file_append (file, (char*)ximage, xlen);
+					free (ximage);
+					ximage = NULL;
+					offset += xlen;
+					if (!xlen) {
+						GP_LOG_E ("nikon_getpartialobject loop: offset=%ld, size is %ld, xlen returned is 0?", offset, size);
+						break;
+					}
+				}
+				goto done;
+			}
+			/* fallthrough to the ptp_getobject method */
+		}
+		/* We also need this for Nikon D850 and very big RAWs (>40 MB) */
+		/* Try the generic method first, EOS R does not like the second for some reason */
+		if (	(ptp_operation_issupported(params,PTP_OC_GetPartialObject)) &&
+			(size > BLOBSIZE) && (size <= 0xffffffffUL)
+		) {
+				unsigned char	*ximage = NULL;
+				uint32_t 	offset = 0;
+
+				while (offset < size) {
+					uint32_t	xsize = size - offset;
+					uint32_t	xlen;
+
+					if (xsize > BLOBSIZE)
+						xsize = BLOBSIZE;
+					C_PTP_REP (ptp_getpartialobject (params, oid, offset, xsize, &ximage, &xlen));
+					gp_file_append (file, (char*)ximage, xlen);
+					free (ximage);
+					ximage = NULL;
+					offset += xlen;
+					if (!xlen) {
+						GP_LOG_E ("getpartialobject loop: offset=%d, size is %ld, xlen returned is 0?", offset, size);
+						break;
+					}
+				}
+				goto done;
+		}
+		/* EOS software uses 1MB blobs, use that too... EOS R does not like 5MB blobs */
 		if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
 			(ptp_operation_issupported(params,PTP_OC_CANON_EOS_GetPartialObject)) &&
 			(size > BLOBSIZE)
@@ -6958,11 +9050,15 @@
 
 					if (xsize > BLOBSIZE)
 						xsize = BLOBSIZE;
-					ptp_canon_eos_getpartialobject (params, oid, offset, xsize, &ximage);
+					C_PTP_REP (ptp_getpartialobject (params, oid, offset, xsize, &ximage, &xsize));
 					gp_file_append (file, (char*)ximage, xsize);
 					free (ximage);
 					ximage = NULL;
 					offset += xsize;
+					if (!xsize) {
+						GP_LOG_E ("getpartialobject loop: offset=%d, size is %ld, xlen returned is 0?", offset, size);
+						break;
+					}
 				}
 				goto done;
 		}
@@ -7053,7 +9149,7 @@
 			/* compute storage ID value from folder patch */
 			folder_to_storage(folder,storage);
 
-			/* Get file number omiting storage pseudofolder */
+			/* Get file number omitting storage pseudofolder */
 			find_folder_handle(params, folder, storage, object_id);
 			object_id = find_child(params, filename, storage, object_id, &ob);
 			if (object_id ==PTP_HANDLER_SPECIAL) {
@@ -7069,7 +9165,7 @@
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
 
-	/* get parent folder id omiting storage pseudofolder */
+	/* get parent folder id omitting storage pseudofolder */
 	find_folder_handle(params,folder,storage,parent);
 
 	/* if you desire to put file to root folder, you have to use
@@ -7147,11 +9243,18 @@
 	/* virtual file created by Nikon special capture */
 	if (	((params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) ||
 		 (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) ||
+		 (params->deviceinfo.VendorExtensionID == PTP_VENDOR_FUJI) ||
+		 (params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_OLYMPUS_OMD) ||
+		 (params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_SIGMAFP) ||
 		 (params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) ||
 		 (params->device_flags & DEVICE_FLAG_OLYMPUS_XML_WRAPPED)) &&
 		!strncmp (filename, "capt", 4)
 	)
 		return GP_OK;
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_SIGMAFP) &&
+		!strncmp (filename,  "SDIM", 4)
+	)
+		return GP_OK;
 
 	if (!ptp_operation_issupported(params, PTP_OC_DeleteObject))
 		return GP_ERROR_NOT_SUPPORTED;
@@ -7160,11 +9263,12 @@
 	C_PTP_REP (ptp_check_event (params));
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, oid);
 	oid = find_child(params, filename, storage, oid, NULL);
 
-	C_PTP_REP (ptp_deleteobject(params, oid, 0));
+	/* in some cases we return errors ... just ignore them for now */
+	LOG_ON_PTP_E (ptp_deleteobject(params, oid, 0));
 
 	/* On some Canon firmwares, a DeleteObject causes a ObjectRemoved event
 	 * to be sent. At least on Digital IXUS II and PowerShot A85. But
@@ -7206,7 +9310,7 @@
 	C_PTP_REP (ptp_check_event (params));
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, oid);
 	oid = find_child(params, foldername, storage, oid, NULL);
 	if (oid == PTP_HANDLER_SPECIAL)
@@ -7232,7 +9336,7 @@
 	camera->pl->checkevents = TRUE;
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, object_id);
 	object_id = find_child(params, filename, storage, object_id, &ob);
 	if (object_id == PTP_HANDLER_SPECIAL)
@@ -7276,7 +9380,7 @@
 
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* Get file number omiting storage pseudofolder */
+	/* Get file number omitting storage pseudofolder */
 	find_folder_handle(params, folder, storage, oid);
 	oid = find_child(params, filename, storage, oid, &ob);
 	if (oid == PTP_HANDLER_SPECIAL)
@@ -7349,7 +9453,7 @@
 			info->file.height  = ob->oi.ImagePixHeight;
 			info->file.fields |= GP_FILE_INFO_HEIGHT;
 		}
-	}	
+	}
 	return (GP_OK);
 }
 
@@ -7373,7 +9477,7 @@
 	memset(&oi, 0, sizeof (PTPObjectInfo));
 	/* compute storage ID value from folder patch */
 	folder_to_storage(folder,storage);
-	/* get parent folder id omiting storage pseudofolder */
+	/* get parent folder id omitting storage pseudofolder */
 	find_folder_handle(params,folder,storage,parent);
 
 	/* if you desire to make dir in 'root' folder, you have to use
@@ -7438,7 +9542,7 @@
 		C_PTP (ptp_getstorageinfo (params, sids.Storagei, &si));
 		sif->fields |= GP_STORAGEINFO_BASE;
 		sprintf (sif->basedir, "/"STORAGE_FOLDER_PREFIX"%08x", sids.Storagei);
-		
+
 		if (si.VolumeLabel && strlen(si.VolumeLabel)) {
 			sif->fields |= GP_STORAGEINFO_LABEL;
 			strcpy (sif->label, si.VolumeLabel);
@@ -7501,11 +9605,15 @@
 			sif->fstype = GP_STORAGEINFO_FST_DCF;
 			break;
 		}
-		sif->fields |= GP_STORAGEINFO_MAXCAPACITY;
-		sif->capacitykbytes = si.MaxCapability / 1024;
-		sif->fields |= GP_STORAGEINFO_FREESPACEKBYTES;
-		sif->freekbytes = si.FreeSpaceInBytes / 1024;
-		if (si.FreeSpaceInImages != -1) {
+		if (si.MaxCapability != 0xffffffff) {
+			sif->fields |= GP_STORAGEINFO_MAXCAPACITY;
+			sif->capacitykbytes = si.MaxCapability / 1024;
+		}
+		if (si.FreeSpaceInBytes != 0xffffffff) {
+			sif->fields |= GP_STORAGEINFO_FREESPACEKBYTES;
+			sif->freekbytes = si.FreeSpaceInBytes / 1024;
+		}
+		if (si.FreeSpaceInImages != 0xffffffff) {
 			sif->fields |= GP_STORAGEINFO_FREESPACEIMAGES;
 			sif->freeimages = si.FreeSpaceInImages;
 		}
@@ -7538,8 +9646,8 @@
 	GP_LOG_D ("  AssociationType: 0x%04x", oi->AssociationType);
 	GP_LOG_D ("  AssociationDesc: 0x%08x", oi->AssociationDesc);
 	GP_LOG_D ("  SequenceNumber: 0x%08x", oi->SequenceNumber);
-	GP_LOG_D ("  ModificationDate: 0x%08x", (unsigned int)oi->ModificationDate);
-	GP_LOG_D ("  CaptureDate: 0x%08x", (unsigned int)oi->CaptureDate);
+	GP_LOG_D ("  ModificationDate: 0x%08lx", (unsigned long)oi->ModificationDate);
+	GP_LOG_D ("  CaptureDate: 0x%08lx", (unsigned long)oi->CaptureDate);
 }
 
 static CameraFilesystemFuncs fsfuncs = {
@@ -7668,24 +9776,49 @@
 		GPPortInfo	info;
 		char 		*xpath;
 
+#if defined(HAVE_LIBWS232) && defined(WIN32)
+		WORD wsaVersionWanted = MAKEWORD(1, 1);
+		WSADATA wsaData;
+		if (WSAStartup(wsaVersionWanted, &wsaData)) {
+			GP_LOG_E("WSAStartup failed.");
+			return GP_ERROR;
+		}
+#endif
+
 		ret = gp_port_get_info (camera->port, &info);
 		if (ret != GP_OK) {
 			GP_LOG_E ("Failed to get port info?");
 			return ret;
 		}
 		gp_port_info_get_path (info, &xpath);
-		ret = ptp_ptpip_connect (params, xpath);
-		if (ret != GP_OK) {
-			GP_LOG_E ("Failed to connect.");
-			return ret;
+
+		if (strstr(a.model,"Fuji")) {
+			ret = ptp_fujiptpip_connect (params, xpath);
+			if (ret != GP_OK) {
+				GP_LOG_E ("Failed to connect.");
+				return ret;
+			}
+			params->sendreq_func	= ptp_fujiptpip_sendreq;
+			params->senddata_func	= ptp_fujiptpip_senddata;
+			params->getresp_func	= ptp_fujiptpip_getresp;
+			params->getdata_func	= ptp_fujiptpip_getdata;
+			params->event_wait	= ptp_fujiptpip_event_wait;
+			params->event_check	= ptp_fujiptpip_event_check;
+			params->event_check_queue	= ptp_fujiptpip_event_check_queue;
+		} else {
+			ret = ptp_ptpip_connect (params, xpath);
+			if (ret != GP_OK) {
+				GP_LOG_E ("Failed to connect.");
+				return ret;
+			}
+			params->sendreq_func	= ptp_ptpip_sendreq;
+			params->senddata_func	= ptp_ptpip_senddata;
+			params->getresp_func	= ptp_ptpip_getresp;
+			params->getdata_func	= ptp_ptpip_getdata;
+			params->event_wait	= ptp_ptpip_event_wait;
+			params->event_check	= ptp_ptpip_event_check;
+			params->event_check_queue	= ptp_ptpip_event_check_queue;
 		}
-		params->sendreq_func	= ptp_ptpip_sendreq;
-		params->senddata_func	= ptp_ptpip_senddata;
-		params->getresp_func	= ptp_ptpip_getresp;
-		params->getdata_func	= ptp_ptpip_getdata;
-		params->event_wait	= ptp_ptpip_event_wait;
-		params->event_check	= ptp_ptpip_event_check;
-		params->event_check_queue	= ptp_ptpip_event_check_queue;
 		break;
 	}
 	default:
@@ -7702,12 +9835,12 @@
 	XT(normal_timeout,USB_NORMAL_TIMEOUT);
 	XT(capture_timeout,USB_TIMEOUT_CAPTURE);
 
-	/* Choose a shorter timeout on inital setup to avoid
+	/* Choose a shorter timeout on initial setup to avoid
 	 * having the user wait too long.
 	 */
 	if (a.usb_vendor == 0x4a9) { /* CANON */
 		/* our special canon friends get a shorter timeout, sinc ethey
-		 * occasionaly need 2 retries. */
+		 * occasionally need 2 retries. */
 		XT(canon_start_timeout,USB_CANON_START_TIMEOUT);
 		CR (gp_port_set_timeout (camera->port, canon_start_timeout));
 	} else {
@@ -7791,11 +9924,41 @@
 		C_PTP_REP (ptp_olympus_opensession (params, &data, &len));
 	}
 
+#if 1
+	/* Special fuji wlan init code */
+	if ((camera->port->type == GP_PORT_PTPIP)  && strstr(a.model,"Fuji")) {
+		PTPPropertyValue        propval;
+		GPPortInfo		info;
+		char 			*xpath;
+
+		ret = gp_port_get_info (camera->port, &info);
+		if (ret != GP_OK) {
+			GP_LOG_E ("Failed to get port info?");
+			return ret;
+		}
+		gp_port_info_get_path (info, &xpath);
+
+		params->byteorder = PTP_DL_LE;
+
+		propval.u16 = 5;
+		C_PTP_REP (ptp_setdevicepropvalue(params, PTP_DPC_FUJI_InitSequence, &propval, PTP_DTC_UINT16));
+
+		/* We send back the version we get from the camera */
+		C_PTP_REP (ptp_getdevicepropvalue(params, PTP_DPC_FUJI_AppVersion, &propval, PTP_DTC_UINT32));
+		GP_LOG_D("FUJI AppVersion is %d", propval.u32);
+		C_PTP_REP (ptp_setdevicepropvalue(params, PTP_DPC_FUJI_AppVersion, &propval, PTP_DTC_UINT32));
+
+		C_PTP_REP (ptp_initiateopencapture(params, 0x00000000, 0x00000000)); /* this will get the event queue started */
+		ptp_fujiptpip_init_event(params, xpath);
+	}
+#endif
 	/* Seems HP does not like getdevinfo outside of session
 	   although it's legal to do so */
 	/* get device info */
 	C_PTP_REP (ptp_getdeviceinfo(params, &params->deviceinfo));
 
+	print_debug_deviceinfo(params, &params->deviceinfo);
+
 	CR (fixup_cached_deviceinfo (camera,&params->deviceinfo));
 
 	print_debug_deviceinfo(params, &params->deviceinfo);
@@ -7821,11 +9984,20 @@
 
 		if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_SetRemoteMode)) {
 			if (is_canon_eos_m(params)) {
-				C_PTP (ptp_canon_eos_setremotemode(params, 0x15));
+				int mode = 0x15;	/* default for EOS M and newer Powershot SX */
 
+				if (!strcmp(params->deviceinfo.Model,"Canon EOS M6 Mark II")) mode = 0x1;
+				if (!strcmp(params->deviceinfo.Model,"Canon PowerShot SX720 HS")) mode = 0x11;
+				if (!strcmp(params->deviceinfo.Model,"Canon PowerShot SX600 HS")) mode = 0x11;
+
+				/* according to reporter only needed in config.c part
+				if (!strcmp(params->deviceinfo.Model,"Canon PowerShot G5 X")) mode = 0x11;
+				*/
+				C_PTP (ptp_canon_eos_setremotemode(params, mode));
 				/* Setting remote mode changes device info on EOS M2,
 				   so have to reget it */
 				C_PTP (ptp_getdeviceinfo(&camera->pl->params, &camera->pl->params.deviceinfo));
+				print_debug_deviceinfo(params, &params->deviceinfo);
 				CR (fixup_cached_deviceinfo (camera, &camera->pl->params.deviceinfo));
 				print_debug_deviceinfo(params, &params->deviceinfo);
 			} else {
@@ -7838,7 +10010,17 @@
 			add_special_file("curve.ntc", nikon_curve_get, nikon_curve_put);
 		break;
 	case PTP_VENDOR_SONY:
-		if (ptp_operation_issupported(params, 0x9280)) {
+		/* this seems to crash the HX100V and HX9V and NEX
+		 * https://github.com/gphoto/libgphoto2/issues/85
+		 * And locks up the ILCE-7M4
+		 * https://github.com/gphoto/libgphoto2/pull/782
+		 */
+		if (	ptp_operation_issupported(params, 0x9280)	&&
+			!strstr(params->deviceinfo.Model,"HX")		&&
+			!strstr(params->deviceinfo.Model,"NEX")		&&
+			!strstr(params->deviceinfo.Model,"QX")		&&
+			!strstr(params->deviceinfo.Model,"ILCE-7M4")
+		) {
 #if 0
 			C_PTP (ptp_sony_9280(params, 0x1,0,1,0,0));
 			C_PTP (ptp_sony_9281(params, 0x1));	/* no data sent back */
@@ -7848,8 +10030,8 @@
 
 			C_PTP (ptp_sony_9280(params, 0x4,0,1,0,0));
 			C_PTP (ptp_sony_9281(params, 0x4));	/* gets big data blob? */
-			/* also tries this multiple times , but gets back 2006 error 
-			ptp_sony_9280(params, 0x5,0,1,0,0); 
+			/* also tries this multiple times , but gets back 2006 error
+			ptp_sony_9280(params, 0x5,0,1,0,0);
 			*/
 #endif
 			/* This combination seems to reportedly work */
@@ -7860,6 +10042,61 @@
 	case PTP_VENDOR_FUJI:
 		CR (camera_prepare_capture (camera, context));
 		break;
+	case PTP_VENDOR_GP_SIGMAFP:
+		if (ptp_operation_issupported(params, 0x9035)) {
+			unsigned char *xdata = NULL;
+			unsigned int xsize = 0;
+			C_PTP (ptp_sigma_fp_9035 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "9035 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getcamcansetinfo5 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getcamcansetinfo5 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup1 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup1 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup2 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup2 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup3 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup3 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup4 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup4 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup5 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup5 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getdatagroup6 (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroup6 output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getcamdatagroupfocus (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroupfocus output");
+			free (xdata);
+
+			C_PTP (ptp_sigma_fp_getcamdatagroupmovie (params, &xdata, &xsize));
+			GP_LOG_DATA ((char*)xdata, xsize, "getdatagroupmovie output");
+			free (xdata);
+		}
+		break;
+	case PTP_VENDOR_GP_LEICA:
+		if (ptp_operation_issupported(params, PTP_OC_LEICA_LEOpenSession)) {
+			PTPDeviceInfo	pdi;
+
+			C_PTP (ptp_leica_leopensession (params, 0));	/* arguments might not be complete */
+			C_PTP_REP (ptp_getdeviceinfo (params, &pdi));
+			CR (fixup_cached_deviceinfo (camera, &pdi));
+			print_debug_deviceinfo(params, &params->deviceinfo);
+		}
+		break;
 	default:
 		break;
 	}
@@ -7920,7 +10157,6 @@
 	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_SONY)
 		ptp_list_folder (params, PTP_HANDLER_SPECIAL, PTP_HANDLER_SPECIAL);
 
-
 	{
 		unsigned int k;
 
@@ -7930,7 +10166,52 @@
 			ptp_list_folder (params, params->storageids.Storagek, PTP_HANDLER_SPECIAL);
 		}
 	}
+	/* moved down here in case the filesystem needs to first be initialized as the Olympus app does */
+	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_GP_OLYMPUS_OMD) {
+		unsigned int k;
+
+		GP_LOG_D ("Initializing Olympus ... ");
+		ptp_olympus_init_pc_mode(params);
+
+		/* try to refetch the storage ids, set before only has 0x00000001 */
+		if (params->storageids.n) {
+			free (params->storageids.Storage);
+			params->storageids.Storage = NULL;
+			params->storageids.n = 0;
+		}
+
+		C_PTP (ptp_getstorageids(params, &params->storageids));
+
+		/* refetch root */
+		for (k=0;k<params->storageids.n;k++) {
+			if (!(params->storageids.Storagek & 0xffff)) continue;
+			if (params->storageids.Storagek == 0x80000001) continue;
+			ptp_list_folder (params, params->storageids.Storagek, PTP_HANDLER_SPECIAL);
+		}
+
+		/*
+		if(params->storageids.n > 0) { // Olympus app gets storage info for first item, so emulating here
+			PTPStorageInfo storageinfo;
+			ptp_getstorageinfo(params, params->storageids.Storage0, &storageinfo);
+		}
 
+		PTPPropertyValue        propval;
+		if (!strncmp(params->deviceinfo.Model,"E-M5",4)) {
+			ptp_olympus_init_pc_mode(params);
+		}
+		ptp_olympus_omd_init(params);
+		propval.u16 = 2;
+		ptp_setdevicepropvalue(params, 0xD078, &propval, PTP_DTC_UINT16);
+		if (!strncmp(params->deviceinfo.Model,"E-M1",4)) {
+			propval.u16 = 2; // save to camera's card
+			ptp_setdevicepropvalue(params, 0xD0DC, &propval, PTP_DTC_UINT16);
+			//propval.u16 = 1;
+			//ptp_setdevicepropvalue(params, 0xD052, &propval, PTP_DTC_UINT16);
+			ptp_check_event_handle (params, 0);
+			ptp_olympus_init_pc_mode(params);
+		}
+		*/
+	}
 	SET_CONTEXT(camera, NULL);
 	return GP_OK;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/music-players.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/music-players.h Changed

@@ -46,6 +46,9 @@
    * some of the folders will start to disappear when getting all objects
    * and properties.
    */
+  /* https://sourceforge.net/p/libmtp/bugs/1898/ */
+  { "Creative", 0x041e, "ZEN Micro", 0x411e,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "ZEN Vision", 0x411f,
       DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   { "Creative", 0x041e, "Portable Media Center", 0x4123,
@@ -371,6 +374,10 @@
    *   that time it will not respond. Thus GUI programs work fine.
    * - Seems also to be used with Galaxy Nexus debug mode and on
    *   US markets for some weird reason.
+   * - has a weird USB bug if it reads exactly 512byte (usb 2 packetsize) 
+   *   the device will hang. this is one of the reasons we need to disable
+   *   DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST as it can hit this size :/
+   *   Post scriptum: This did not help, so we added it again. -Marcus
    *
    * From: Ignacio Martínez <ignacio.martinezrivera@yahoo.es> and others
    * From Harrison Metzger <harrisonmetz@gmail.com>
@@ -382,15 +389,17 @@
       DEVICE_FLAG_UNLOAD_DRIVER |
       DEVICE_FLAG_LONG_TIMEOUT |
       DEVICE_FLAG_PROPLIST_OVERRIDES_OI	|
+      DEVICE_FLAG_SAMSUNG_OFFSET_BUG |
       DEVICE_FLAG_OGG_IS_UNKNOWN |
       DEVICE_FLAG_FLAC_IS_UNKNOWN },
   { "Samsung", 0x04e8,
       "Galaxy models (MTP)", 0x6860,
-      /*DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
-      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |*/
+      /* DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | */
       DEVICE_FLAG_UNLOAD_DRIVER |
       DEVICE_FLAG_LONG_TIMEOUT |
       DEVICE_FLAG_PROPLIST_OVERRIDES_OI |
+      DEVICE_FLAG_SAMSUNG_OFFSET_BUG |
       DEVICE_FLAG_OGG_IS_UNKNOWN |
       DEVICE_FLAG_FLAC_IS_UNKNOWN },
   // From: Erik Berglund <erikjber@users.sourceforge.net>
@@ -404,6 +413,7 @@
       DEVICE_FLAG_UNLOAD_DRIVER |
       DEVICE_FLAG_LONG_TIMEOUT |
       DEVICE_FLAG_PROPLIST_OVERRIDES_OI	|
+      DEVICE_FLAG_SAMSUNG_OFFSET_BUG |
       DEVICE_FLAG_OGG_IS_UNKNOWN |
       DEVICE_FLAG_FLAC_IS_UNKNOWN },
   // From: John Gorkos <ab0oo@users.sourceforge.net> and
@@ -628,6 +638,15 @@
   /* Reported by Jocelyn Mayer <l_indien@magic.fr> */
   { "Acer", 0x0502, "Iconia One 10", 0x3841,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/279/ */
+  { "Acer", 0x0502, "B3-A20", 0x3841,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/298/ */
+  { "Acer", 0x0502, "A3-A40", 0x387a,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/298/ */
+  { "Acer", 0x0502, "Zest T06", 0x3886,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1733/ */
   { "Acer", 0x0502, "Liquid Zest 4G", 0x38a5,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -637,6 +656,9 @@
   /* Richard Waterbeek <richard@fotobakje.nl> on libmtp-discuss */
   { "Acer", 0x0502, "Liquid Liquid Z6E", 0x3938,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1838/ */
+  { "Acer", 0x0502, "Iconia One 10 B3-A40 ", 0x394b,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * SanDisk
@@ -858,6 +880,14 @@
   { "iRiver", 0x4102, "AK70", 0x1200,
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS |
     DEVICE_FLAG_OGG_IS_UNKNOWN },
+  /* https://bugzilla.suse.com/show_bug.cgi?id=1176588  ... */
+  { "A&K", 0x4102, "SR15", 0x1213,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS |
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
+  /* https://github.com/libmtp/libmtp/issues/85  ... */
+  { "A&K", 0x4102, "SE180", 0x1230,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS |
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
   // Reported by Scott Call
   // Assume this actually supports OGG though it reports it doesn't.
   { "iRiver", 0x4102, "H10 20GB", 0x2101,
@@ -1015,6 +1045,8 @@
   { "Archos", 0x0e79, "70 Cobalt", 0x15ba, DEVICE_FLAGS_ANDROID_BUGS },
   { "Archos", 0x0e79, "50c", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
   { "Archos", 0x0e79, "C40", 0x31ab, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1824/ */
+  { "Archos", 0x0e79, "50b", 0x31bd, DEVICE_FLAGS_ANDROID_BUGS },
   /* via libmtp-discuss Tonton <to.tonton@gmail.com> */
   { "Archos", 0x0e79, "Helium 45B", 0x31d8, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1393/ */
@@ -1023,9 +1055,13 @@
   { "Archos", 0x0e79, "45 Neon", 0x31f3, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1352/ */
   { "Archos", 0x0e79, "50 Diamond", 0x3229, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/241 */
+  { "Archos", 0x0e79, "50 Diamond (2nd ID)", 0x322a, DEVICE_FLAGS_ANDROID_BUGS },
   { "Archos", 0x0e79, "101 G4", 0x4002, DEVICE_FLAGS_ANDROID_BUGS },
   { "Archos (for Tesco)", 0x0e79, "Hudl (ID1)", 0x5008, DEVICE_FLAGS_ANDROID_BUGS },
   { "Archos (for Tesco)", 0x0e79, "Hudl (ID2)", 0x5009, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1919/ */
+  { "Archos", 0x0e79, "101d Neon", 0x51c6, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1404/ */
   { "Archos", 0x0e79, "AC40DTI", 0x5217, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/221/ */
@@ -1045,13 +1081,19 @@
   { "Archos", 0x0e79, "50d neon", 0x5371, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1660/ */
   { "Archos", 0x0e79, "70b neon", 0x5395, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/290/ */
+  { "Archos", 0x0e79, "50 power", 0x53a7, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1637/ */
   { "Archos", 0x0e79, "101b Oxygen", 0x542f, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/support-requests/245/ */
   { "Archos", 0x0e79, "55B Platinum", 0x544a, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1799/ */
+  { "Archos", 0x0e79, "50F Helium", 0x545c, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/209/ */
   { "Archos", 0x0e79, "55 diamond Selfie", 0x5465, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/262/ */
+  { "Archos", 0x0e79, "Core 50P", 0x5603, DEVICE_FLAGS_ANDROID_BUGS },
 
 
   /*
@@ -1221,6 +1263,8 @@
   { "Nokia", 0x0421, "N9", 0x051a, DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1308/ */
   { "Nokia", 0x0421, "N300", 0x0524, DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1885/ */
+  { "Nokia", 0x0421, "701", 0x0530, DEVICE_FLAG_NONE },
   { "Nokia", 0x0421, "C5-00", 0x0592, DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1457/ */
   { "Nokia", 0x0421, "C5-00 (ID2)", 0x0595, DEVICE_FLAG_NONE },
@@ -1243,7 +1287,11 @@
   { "Nokia", 0x0421, "X2 Dual Sim", 0x0708, DEVICE_FLAG_NONE },
 
   /* https://sourceforge.net/p/libmtp/bugs/1711/ */
-  { "Nokia", 0x2e04, "6", 0xc025, DEVICE_FLAG_NONE },
+  { "Nokia", 0x2e04, "6", 0xc025, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1783/ */
+  { "Nokia", 0x2e04, "6.1", 0xc026, DEVICE_FLAGS_ANDROID_BUGS },
+  /* ndim from gphoto */
+  { "Nokia", 0x2e04, "6.2", 0xc02a, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Qualcomm
@@ -1267,17 +1315,19 @@
       0x6765, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/1377/ */
-  { "Qualcomm (for Xolo)", 0x901b, "Xolo Black (MTP)",
-      0x9039, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/44 */
+  { "Qualcomm (for Xolo)", 0x05c6, "Xolo Black (MTP)",
+      0x901b, DEVICE_FLAGS_ANDROID_BUGS },
 
   { "Qualcomm (for PhiComm)", 0x05c6, "C230w (MTP)",
       0x9039, DEVICE_FLAGS_ANDROID_BUGS },
 
+  /* https://github.com/libmtp/libmtp/issues/78 */
+  { "OnePlus", 0x05c6, "OnePlus 7 Pro (MTP)",
+      0xf000, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1513/ */
-  { "Qualcomm (for OnePlus)", 0x05c6, "One Plus 2 (A2003) (MTP)",
-      0xf003, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1284/ */
-  { "Qualcomm (for Highscreen)", 0x05c6, "Omega Prime S",
+  { "Qualcomm (for OnePlus)", 0x05c6, "OnePlus 2 (A2003) (MTP)",
       0xf003, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
@@ -1319,6 +1369,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1495/ */
   { "Fujitsu, Ltd", 0x04c5, "Arrows 202F", 0x13dd,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/154 */
+  { "Fujitsu, Ltd", 0x04c5, "TONE-m17", 0x158c,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Palm device userland program named Pocket Tunes
@@ -1372,7 +1425,7 @@
   // DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Anonymous SourceForge user
   {"TrekStor", 0x1e68, "i.Beat Organix 2.0", 0x0002,
-    DEVICE_FLAG_UNLOAD_DRIVER },
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
 
   /* Also Thalia Toline. https://sourceforge.net/p/libmtp/bugs/1156/ */
   {"iRiver", 0x1e68, "Tolino Tab 7", 0x1002,
@@ -1506,9 +1559,11 @@
   { "LG Electronics Inc.", 0x1004, "Android phone (ID2)", 0x61f9,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1007/ */
-  { "LG Electronics Inc.", 0x1004, "LG VS980", 0x621c,
+  /* https://sourceforge.net/p/libmtp/bugs/1924/ */
+  { "LG Electronics Inc.", 0x1004, "G2 (VS980)", 0x621c,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "LG Electronics Inc.", 0x1004, "LG2 Optimus", 0x6225,
+  /* https://sourceforge.net/p/libmtp/bugs/1924/ */
+  { "LG Electronics Inc.", 0x1004, "G2", 0x6225,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1386/ */
   { "LG Electronics Inc.", 0x1004, "LG VS950", 0x622a,
@@ -1534,6 +1589,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1701/ */
   { "LG Electronics Inc.", 0x1004, "Transpyre", 0x628a,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/290/ */
+  { "LG Electronics Inc.", 0x1004, "LG G6 Phone", 0x62c9,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/222/ */
   { "LG Electronics Inc.", 0x1004, "LG G5 Phone", 0x62ce,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -1552,6 +1610,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1294/ */
   { "LG Electronics Inc.", 0x1004, "LG G Flex 2", 0x633e,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/280/ */
+  { "LG Electronics Inc.", 0x1004, "LG G3 f460s", 0x633f,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Sony
@@ -1646,9 +1707,23 @@
   /* https://sourceforge.net/p/libmtp/bugs/1540/ */
   { "Sony", 0x054c, "NWZ-E474", 0x06a9,
       DEVICE_FLAGS_SONY_NWZ_BUGS },
+  { "Sony", 0x054c, "Xperia Tablet S - SGPT12", 0x06ac,
+      DEVICE_FLAGS_SONY_NWZ_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1688/ */
   { "Sony", 0x054c, "NWZ-E384", 0x0882,
       DEVICE_FLAGS_SONY_NWZ_BUGS },
+  /* hartmut001@users.sourceforge.net */
+  { "Sony", 0x054c, "NW-A45 Walkman", 0x0c71,
+      DEVICE_FLAGS_SONY_NWZ_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/130 */
+  { "Sony", 0x054c, "NW-A105", 0x0d00,
+      DEVICE_FLAGS_SONY_NWZ_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/81 */
+  { "Sony", 0x054c, "NW-ZX500", 0x0d01,
+      DEVICE_FLAGS_SONY_NWZ_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/170 */
+  { "Sony", 0x054c, "NW-A306", 0x0e6e,
+      DEVICE_FLAGS_SONY_NWZ_BUGS },
   { "Sony", 0x054c, "DCR-SR75", 0x1294,
       DEVICE_FLAGS_SONY_NWZ_BUGS },
 
@@ -1769,7 +1844,7 @@
    * Ah Hong <hongster@users.sourceforge.net>
    * Eowyn Carter
    */
-  { "SonyEricsson", 0x0fce,  "c1605 Xperia Dual E MTP", 0x0146,
+  { "SonyEricsson", 0x0fce,  "Xperia Dual E MTP", 0x0146,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "LT15i Xperia arc S MTP", 0x014f,
       DEVICE_FLAG_NONE },
@@ -1877,53 +1952,93 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z3 Tablet MTP", 0x01c0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP", 0x01c4,
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP", 0x01c4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP", 0x01c5,
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP", 0x01c5,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP", 0x01c9,
+  { "SONY", 0x0fce, "Xperia Z3+ MTP", 0x01c9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria E4g MTP", 0x01cb,
+  { "SONY", 0x0fce, "Xperia E4g MTP", 0x01cb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP", 0x01d2,
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP", 0x01d2,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP", 0x01d6,
+  { "SONY", 0x0fce, "Xperia M5 MTP", 0x01d6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP", 0x01d9,
+  { "SONY", 0x0fce, "Xperia Z5 MTP", 0x01d9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP", 0x01da,
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP", 0x01da,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/236/ */
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP", 0x01db,
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP", 0x01db,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1649/ */
-  { "SONY", 0x0fce, "XPeria XA MTP", 0x01de,
+  { "SONY", 0x0fce, "Xperia XA MTP", 0x01de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP", 0x01e0,
+  { "SONY", 0x0fce, "Xperia X MTP", 0x01e0,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/251/ */
-  { "SONY", 0x0fce, "XPeria SOV33", 0x01e1,
+  { "SONY", 0x0fce, "Xperia SOV33", 0x01e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP", 0x01e7,
+  { "SONY", 0x0fce, "Xperia XZ MTP", 0x01e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP", 0x01e8,
+  { "SONY", 0x0fce, "Xperia X Compact MTP", 0x01e8,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/252/ */
-  { "SONY", 0x0fce, "XPeria G3123", 0x01eb,
+  { "SONY", 0x0fce, "Xperia XA1", 0x01eb,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/247/ */
-  { "SONY", 0x0fce, "XPeria XZ", 0x01ed,
+  { "SONY", 0x0fce, "Xperia XZ", 0x01ed,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1812/ */
+  { "SONY", 0x0fce, "Xperia XA1 Ultra", 0x01ef,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/251/ */
-  { "SONY", 0x0fce, "XPeria XZ Premium", 0x01f1,
+  { "SONY", 0x0fce, "Xperia XZ Premium", 0x01f1,
       DEVICE_FLAG_NONE },
   /* Nicholas O'Connor <lavacano@lavacano.net> on libmtp-discuss */
-  { "SONY", 0x0fce, "XPeria XZ1", 0x01f3,
+  { "SONY", 0x0fce, "Xperia XZ1", 0x01f3,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/252/ */
-  { "SONY", 0x0fce, "XPeria XZ1 Compact", 0x01f4,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact", 0x01f4,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/feature-requests/281/ */
+  { "SONY", 0x0fce, "Xperia L2", 0x01f6,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia XA2 Compact", 0x01f7,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/support-requests/285/ */
+  { "SONY", 0x0fce, "Xperia XA2 Ultra", 0x01f8,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1804/ */
+  { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim", 0x01f9,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1775/ */
+  { "SONY", 0x0fce, "Xperia XZ2 (H8266)", 0x01fa,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1854/ */
+  { "SONY", 0x0fce, "Xperia XZ2 Premium", 0x01fb,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia XZ3 Dual Sim (H9436)", 0x01ff,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1853/ */
+  { "SONY", 0x0fce, "Xperia 10 (I4113)", 0x0201,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1859/ */
+  { "SONY", 0x0fce, "Xperia 1 (J9110)", 0x0205,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/bugs/1849/ */
+  { "SONY", 0x0fce, "Xperia L3", 0x0207,
+      DEVICE_FLAG_NONE },
+  /* https://github.com/libmtp/libmtp/issues/113 */
+  { "SONY", 0x0fce, "Xperia 5", 0x020a,
+      DEVICE_FLAG_NONE },
+  /* https://sourceforge.net/p/libmtp/feature-requests/303/ */
+  { "SONY", 0x0fce, "Xperia 5 II Phone", 0x020d,
       DEVICE_FLAG_NONE },
 
+  /* https://bugs.kde.org/show_bug.cgi?id=387454 ... probably not in the ADB/CDROM method? */
+  { "SONY", 0x0fce, "Xperia XA2 (Jolla Sailfish)", 0x0a07,
+      DEVICE_FLAG_NONE },
 
   /*
    * MTP+UMS personalities of MTP devices (see above)
@@ -2012,49 +2127,75 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+CDROM", 0x41c0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+CDROM", 0x41c4,
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP+CDROM", 0x41c4,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP+CDROM", 0x41c5,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z3+ MTP+CDROM", 0x41c9,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia E4g MTP+CDROM", 0x41cb,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP+CDROM", 0x41d2,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia M5 MTP+CDROM", 0x41d6,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z5 MTP+CDROM", 0x41d9,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP+CDROM", 0x41da,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP+CDROM", 0x41db,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia XA MTP+CDROM", 0x41de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP+CDROM", 0x41c5,
+  { "SONY", 0x0fce, "Xperia X MTP+CDROM", 0x41e0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP+CDROM", 0x41c9,
+  { "SONY", 0x0fce, "Xperia SOV33 MTP+CDROM", 0x41e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria E4g MTP+CDROM", 0x41cb,
+  { "SONY", 0x0fce, "Xperia XZ MTP+CDROM", 0x41e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP+CDROM", 0x41d2,
+  { "SONY", 0x0fce, "Xperia X Compact MTP+CDROM", 0x41e8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP+CDROM", 0x41d6,
+  { "SONY", 0x0fce, "Xperia XA1 MTP+CDROM", 0x41eb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP+CDROM", 0x41d9,
+  { "SONY", 0x0fce, "Xperia XZ CDROM", 0x41ed,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP+CDROM", 0x41da,
+  { "SONY", 0x0fce, "Xperia XA1 Ultra MTP+CDROM", 0x41ef,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP+CDROM", 0x41db,
+  { "SONY", 0x0fce, "Xperia XZ Premium MTP+CDROM", 0x41f1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA MTP+CDROM", 0x41de,
+  { "SONY", 0x0fce, "Xperia XZ1 MTP+CDROM", 0x41f3,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP+CDROM", 0x41e0,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact MTP+CDROM", 0x41f4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria SOV33 MTP+CDROM", 0x41e1,
+  { "SONY", 0x0fce, "Xperia L2 MTP+CDROM", 0x41f6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP+CDROM", 0x41e7,
+  { "SONY", 0x0fce, "Xperia XA2 Compact MTP+CDROM", 0x41f7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP+CDROM", 0x41e8,
+  { "SONY", 0x0fce, "Xperia XA2 Ultra MTP+CDROM", 0x41f8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria G3123 MTP+CDROM", 0x41eb,
+  { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim MTP+CDROM", 0x41f9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ CDROM", 0x41ed,
+  { "SONY", 0x0fce, "Xperia XZ2 (H8266) MTP+CDROM", 0x41fa,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ Premium MTP+CDROM", 0x41f1,
+  { "SONY", 0x0fce, "Xperia XZ2 Premium MTP+CDROM", 0x41fb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 MTP+CDROM", 0x41f3,
+  { "SONY", 0x0fce, "Xperia XZ3 Dual Sim (H9436) MTP+CDROM", 0x41ff,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 Compact MTP+CDROM", 0x41f4,
+  { "SONY", 0x0fce, "Xperia 10 (I4113) MTP+CDROM", 0x4201,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 1 (J9110) MTP+CDROM", 0x4205,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia L3 MTP+CDROM", 0x4207,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 5 MTP+CDROM", 0x420a,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 5 II Phone MTP+CDROM", 0x420d,
       DEVICE_FLAG_NONE },
 
   /*
    * MTP+ADB personalities of MTP devices (see above)
    */
-  { "SonyEricsson", 0x0fce,  "c1605 Xperia Dual E MTP+ADB", 0x5146,
+  { "SonyEricsson", 0x0fce,  "Xperia Dual E MTP+ADB", 0x5146,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "LT15i Xperia Arc MTP+ADB", 0x514f,
       DEVICE_FLAG_NONE },
@@ -2160,45 +2301,71 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia E3 MTP+ADB", 0x51bc,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+ADB", 0x41c0,
+  { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+ADB", 0x51c0,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP+ADB", 0x51c4,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP+ADB", 0x51c5,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z3+ MTP+ADB", 0x51c9,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia E4g MTP+ADB", 0x51cb,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP+ADB", 0x51d2,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia M5 MTP+ADB", 0x51d6,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia Z5 MTP+ADB", 0x51d9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+ADB", 0x51c4,
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP+ADB", 0x51da,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP+ADB", 0x51c5,
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP+ADB", 0x51db,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP+ADB", 0x51c9,
+  { "SONY", 0x0fce, "Xperia XA MTP+ADB", 0x51de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce,  "XPeria E4g MTP+ADB", 0x51cb,
+  { "SONY", 0x0fce, "Xperia X MTP+ADB", 0x51e0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP+ADB", 0x51d2,
+  { "SONY", 0x0fce, "Xperia SOV33 MTP+ADB", 0x51e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP+ADB", 0x51d6,
+  { "SONY", 0x0fce, "Xperia XZ MTP+ADB", 0x51e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP+ADB", 0x51d9,
+  { "SONY", 0x0fce, "Xperia X Compact MTP+ADB", 0x51e8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP+ADB", 0x51da,
+  { "SONY", 0x0fce, "Xperia XA1 MTP+ADB", 0x51eb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP+ADB", 0x51db,
+  { "SONY", 0x0fce, "Xperia XZ ADB", 0x51ed,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA MTP+ADB", 0x51de,
+  { "SONY", 0x0fce, "Xperia XA1 Ultra MTP+ADB", 0x51ef,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP+ADB", 0x51e0,
+  { "SONY", 0x0fce, "Xperia XZ Premium MTP+ADB", 0x51f1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria SOV33 MTP+ADB", 0x51e1,
+  { "SONY", 0x0fce, "Xperia XZ1 ADB", 0x51f3,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP+ADB", 0x51e7,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact MTP+ADB", 0x51f4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP+ADB", 0x51e8,
+  { "SONY", 0x0fce, "Xperia L2 MTP+ADB", 0x51f6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria G3123 MTP+ADB", 0x51eb,
+  { "SONY", 0x0fce, "Xperia XA2 Compact MTP+ADB", 0x51f7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ ADB", 0x51ed,
+  { "SONY", 0x0fce, "Xperia XA2 Ultra MTP+ADB", 0x51f8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ Premium MTP+ADB", 0x51f1,
+  { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim MTP+ADB", 0x51f9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 ADB", 0x51f3,
+  { "SONY", 0x0fce, "Xperia XZ2 (H8266) MTP+ADB", 0x51fa,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 Compact MTP+ADB", 0x51f4,
+  { "SONY", 0x0fce, "Xperia XZ2 Premium MTP+ADB", 0x51fb,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia XZ3 Dual Sim (H9436) MTP+ADB", 0x51ff,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 10 (I4113) MTP+ADB", 0x5201,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 1 (J9110) MTP+ADB", 0x5205,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia L3 MTP+ADB", 0x5207,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 5 MTP+ADB", 0x520a,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "Xperia 5 II Phone MTP+ADB", 0x520d,
       DEVICE_FLAG_NONE },
 
   /*
@@ -2272,14 +2439,25 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Motorola", 0x22b8, "Moto G (ID1)", 0x2e76,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1841/ */
+  { "Motorola", 0x22b8, "Moto Z2 (XT1789)", 0x2e81,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Motorola", 0x22b8, "Moto G (ID2)", 0x2e82,
       DEVICE_FLAGS_ANDROID_BUGS & ~(DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL|DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST)},
+  /* https://github.com/gphoto/gphoto2/issues/463 */
+  { "Motorola", 0x22b8, "XT1032", 0x2e83,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1030/, PTP Id */
   { "Motorola", 0x22b8, "Moto G (XT1032)", 0x2e84,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1477/ */
   { "Motorola", 0x22b8, "Moto Maxx (XT1225)", 0x2ea4,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1183/ */
+  { "Motorola", 0x22b8, "Droid Turbo (XT1254)", 0x2ea5,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Motorola", 0x22b8, "Droid Turbo Verizon", 0x2ea8,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/189/ */
   { "Motorola", 0x22b8, "MB632", 0x2dff,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2365,11 +2543,6 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Motorola", 0x22b8, "XT890/907/Razr (MTP+ADB)", 0x710e,
       DEVICE_FLAGS_ANDROID_BUGS },
-  /* https://sourceforge.net/p/libmtp/bugs/1183/ */
-  { "Motorola", 0x22b8, "Droid Turbo (XT1254)", 0x2ea5,
-      DEVICE_FLAGS_ANDROID_BUGS },
-  { "Motorola", 0x22b8, "Droid Turbo Verizon", 0x2ea8,
-      DEVICE_FLAGS_ANDROID_BUGS },
   /*
    * XT890/907/Razr
    * 710f is USB mass storage
@@ -2399,11 +2572,8 @@
   // Reported by anonymous Sourceforge user
   { "Google Inc (for Asus)", 0x18d1, "TF101 Transformer", 0x4e0f,
       DEVICE_FLAGS_ANDROID_BUGS },
-  // 0x4e21 (Nexus S) is a USB Mass Storage device.
-  { "Google Inc (for Samsung)", 0x18d1, "Nexus S (MTP)", 0x4e25,
-      DEVICE_FLAGS_ANDROID_BUGS },
-  // 0x4e26 is also used by "Ramos W30HD Pro Quad Core"
-  { "Google Inc (for Samsung)", 0x18d1, "Nexus S (MTP+ADB)", 0x4e26,
+  /* https://sourceforge.net/p/libmtp/bugs/1837/ */
+  { "Google Inc (for Samsung)", 0x18d1, "Nexus One (MTP)", 0x4e12,
       DEVICE_FLAGS_ANDROID_BUGS },
   // Reported by Chris Smith <tcgsmythe@users.sourceforge.net>
   { "Google Inc (for Asus)", 0x18d1, "Nexus 7 (MTP)", 0x4e41,
@@ -2425,17 +2595,24 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Google", 0x18d1, "Pixel C (MTP+ADB)", 0x5203,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1892/ */
+  { "Nook", 0x18d1, "Tablet", 0x685c,
+      DEVICE_FLAGS_ANDROID_BUGS },
   // WiFi-only version of Xoom
   // See: http://bugzilla.gnome.org/show_bug.cgi?id=647506
   { "Google Inc (for Motorola)", 0x18d1, "Xoom (MZ604)", 0x70a8,
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Google Inc (for Toshiba)", 0x18d1, "Thrive 7/AT105", 0x7102,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/88 */
+  { "Google Inc (for OnePlus)", 0x18d1, "OnePlus 6T (A6013)", 0x7169,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Google Inc (for Lenovo)", 0x18d1, "Ideapad K1", 0x740a,
       DEVICE_FLAGS_ANDROID_BUGS },
   // Another OEM for Medion
   { "Google Inc (for Medion)", 0x18d1, "MD99000 (P9514)", 0xb00a,
       DEVICE_FLAGS_ANDROID_BUGS },
+
   /* https://sourceforge.net/p/libmtp/bugs/1563/ */
   { "Meizu", 0x18d1, "Pro 5 Ubuntu Phone", 0xd001, DEVICE_FLAGS_ANDROID_BUGS },
   // Reported by Frederik Himpe <fhimpe@telenet.be>
@@ -2517,11 +2694,17 @@
       DEVICE_FLAG_SWITCH_MODE_BLACKBERRY | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
 
   /* https://sourceforge.net/p/libmtp/bugs/1551/ */
-  { "RIM", 0x0fca, "BlackBerry Priv", 0x8031, DEVICE_FLAG_UNLOAD_DRIVER |
+  /* https://sourceforge.net/p/libmtp/bugs/1925/ */
+  { "BlackBerry", 0x0fca, "Priv", 0x8031, DEVICE_FLAG_UNLOAD_DRIVER |
       DEVICE_FLAG_SWITCH_MODE_BLACKBERRY | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
 
   /* https://sourceforge.net/p/libmtp/bugs/1658/ */
-  { "RIM", 0x0fca, "BlackBerry Dtek 60", 0x8041, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1925/ */
+  { "BlackBerry", 0x0fca, "DTEK60", 0x8041, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/feature-requests/264/ */
+  /* https://sourceforge.net/p/libmtp/bugs/1925/ */
+  { "BlackBerry", 0x0fca, "KEYone", 0x8042, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Nextar
@@ -2713,6 +2896,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1364/ */
   { "Asus", 0x0b05, "Zenfone 2 ZE551ML (MTP)", 0x5f03,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/75 */
+  { "Asus", 0x0b05, "Zenpad 10", 0x600f,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/255/ */
   { "Asus", 0x0b05, "Zenfone V (MTP)", 0x610f,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2806,6 +2992,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1122/ */
   { "Lenovo", 0x17ef, "S930", 0x7718,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/discussion/535190/ */
+  { "Lenovo", 0x17ef, "A5500-H", 0x772a,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1250/ */
   { "Lenovo", 0x17ef, "A5500-F", 0x772b,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2829,6 +3018,9 @@
   /* https://sourceforge.net/p/libmtp/support-requests/186/ */
   { "Lenovo", 0x17ef, "Yoga Tablet 2 - 1050F", 0x77a4,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1828/ */
+  { "Lenovo", 0x17ef, "Yoga Tablet 2", 0x77a5,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/168/ */
   { "Lenovo", 0x17ef, "Yoga Tablet 2 Pro", 0x77b1,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2838,6 +3030,15 @@
   /* https://sourceforge.net/p/libmtp/feature-requests/125/ */
   { "Lenovo", 0x17ef, "Vibe Z2", 0x77ea,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1793/ */
+  { "Lenovo", 0x17ef, "S60-a", 0x7802,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/272/ */
+  { "Lenovo", 0x17ef, "A7-30HC", 0x7852,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1861/ */
+  { "Lenovo", 0x17ef, "A7-30GC", 0x7853,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/253/ */
   { "Lenovo", 0x17ef, "A7000-A Smartphone", 0x7882,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2850,6 +3051,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1497/ */
   { "Lenovo", 0x17ef, "A10-70L", 0x789b,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/264/ */
+  { "Lenovo", 0x17ef, "Vibe Shot Z90a40", 0x78a7,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1480/ */
   { "Medion", 0x17ef, "P8312 Tablet", 0x78ae,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2859,6 +3063,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1572/ */
   { "Lenovo", 0x17ef, "PHAB Plus", 0x78d1,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/310/ */
+  { "Lenovo", 0x17ef, "TAB 2 A8-50F", 0x78da,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1562/ */
   { "Lenovo", 0x17ef, "Vibe K4 Note", 0x78f6,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2868,6 +3075,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1531/ */
   { "Lenovo", 0x17ef, "Vibe X", 0x7902,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1784/ */
+  { "Lenovo", 0x17ef, "P1ma40 (2nd ID)", 0x7920,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/235/ */
   { "Lenovo", 0x17ef, "P1ma40", 0x7921,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2890,6 +3100,12 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Lenovo", 0x17ef, "Vibe K5 Note", 0x7999,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/293/ */
+  { "Lenovo", 0x17ef, "TB3-710F", 0x79a2,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1820/ */
+  { "Lenovo", 0x17ef, "YB1-X90F", 0x79af,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1664/ */
   { "Lenovo", 0x17ef, "Vibe K4", 0x79b7,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2914,9 +3130,56 @@
   /* Marcus parents */
   { "Lenovo", 0x17ef, "Tab 10", 0x7a50,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1903/ */
+  { "Lenovo", 0x17ef, "TB-8703F", 0x7a6b,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/33 */
+  { "Lenovo", 0x17ef, "Tab4 10 Plus", 0x7ad0,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/262/ */
+  { "Lenovo", 0x17ef, "Tab4 10", 0x7ac5,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/297/ */
+  { "Lenovo", 0x17ef, "Tab TB-X704A", 0x7b25,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/296/ */
+  { "Lenovo", 0x17ef, "TB-7304I", 0x7b3c,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1912/ */
+  { "Lenovo", 0x17ef, "TB-8304F1", 0x7b84,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1831/ */
+  { "Lenovo", 0x17ef, "Tab4 10 (2nd ID)", 0x7bc7,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1873/ */
+  { "Lenovo", 0x17ef, "Tab P10", 0x7bd3,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/102 */
+  { "Lenovo", 0x17ef, "Tab M10", 0x7bdf,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Lenovo", 0x17ef, "TB-X606F", 0x7c45,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/74 */
+  { "Lenovo", 0x17ef, "TB-X606F (Lenovo Tab M10 FHD Plus)", 0x7c46,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/127 */
+  { "Lenovo", 0x17ef, "Lenovo Tab P11", 0x7c6f,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/116 */
+  { "Lenovo", 0x17ef, "TB-X306F (3rd id)", 0x7c97,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/111  */
+  { "Lenovo", 0x17ef, "TAB M7 Gen 3", 0x7cb3,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/173 */
+  { "Lenovo", 0x17ef, "TAB P11 Plus", 0x7d4b,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1736/ */
   { "Lenovo", 0x17ef, "P1060X", 0x9039,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/259/ */
+  { "Medion", 0x17ef, "P10606", 0xf003,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Huawei
@@ -2947,6 +3210,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1361/ */
   { "Huawei", 0x12d1, "Ascend P8", 0x1082,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/276/ */
+  { "Huawei", 0x12d1, "Y600", 0x2008,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1418/ */
   { "Huawei", 0x12d1, "Honor 3C", 0x2012,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -2962,6 +3228,9 @@
   /* https://sourceforge.net/p/libmtp/feature-requests/205/ */
   { "Huawei", 0x12d1, "Y360-U03", 0x256b,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1774/ */
+  { "Huawei", 0x12d1, "Y541-U02", 0x257c,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/227/ */
   { "Huawei", 0x12d1, "Y560-L01", 0x259c,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3012,8 +3281,11 @@
   /* https://sourceforge.net/p/libmtp/bugs/1398/ */
   { "HTC", 0x0bb4, "Spreadtrum SH57MYZ03342 (MTP)", 0x05e3,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1840/ */
+  { "HTC", 0x0bb4, "Desire 626G (MTP)", 0x05f0,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* reported by Mikkel Oscar Lyderik <mikkeloscar@gmail.com> */
-  { "HTC", 0x0bb4, "HTC Desire 510 (MTP+ADB)", 0x05fd,
+  { "HTC", 0x0bb4, "Desire 510 (MTP+ADB)", 0x05fd,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1221/ */
   { "HTC", 0x0bb4, "One M8 Google Play Edition (MTP+ADB)", 0x060b,
@@ -3215,6 +3487,9 @@
   /* https://sourceforge.net/p/libmtp/bugs/1447/ */
   { "nVidia", 0x0955, "Shield (MTP)", 0xb401,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/297/ */
+  { "nVidia", 0x0955, "Shield Android TV pro (MTP)", 0xb42a,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1087/ */
   { "nVidia", 0x0955, "Tegra Note", 0xcf02,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3230,19 +3505,19 @@
    * Michael Gurski <gurski@users.sourceforge.net>
    */
   /* https://sourceforge.net/p/libmtp/support-requests/221/ */
-  { "Nokia", 0x0489, "N1", 0x1ab0,
+  { "Foxconn (for Nokia)", 0x0489, "N1", 0x1ab0,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1567/ */
-  { "InFocus", 0x0489, "M808", 0xc00b,
+  { "Foxconn (for InFocus)", 0x0489, "M808", 0xc00b,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/138/ */
-  { "InFocus", 0x0489, "M810", 0xc025,
+  { "Foxconn (for InFocus)", 0x0489, "M810", 0xc025,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "Vizio", 0x0489, "Unknown 1", 0xc026,
+  { "Foxconn (for Vizio)", 0x0489, "Unknown 1", 0xc026,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "Vizio", 0x0489, "VTAB1008", 0xe040,
+  { "Foxconn (for Vizio)", 0x0489, "VTAB1008", 0xe040,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "Vizio (for Lenovo)", 0x0489, "LIFETAB S9714", 0xe111,
+  { "Foxconn (for Lenovo)", 0x0489, "IdeaTab A2109/A2110/Medion LIFETAB S9714", 0xe111,
       DEVICE_FLAGS_ANDROID_BUGS },
 
 
@@ -3270,6 +3545,10 @@
   /* https://sourceforge.net/p/libmtp/bugs/1353/ */
   { "Amazon", 0x1949, "Kindle Fire HD6", 0x00f2,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* R Billing tested one unit rbilling@tanglewood.online
+   * https://github.com/gphoto/libgphoto2/issues/473 */
+  { "Amazon", 0x1949, "Kindle Fire 7 (3rd ID)", 0x0121,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1460/ */
   { "Amazon", 0x1949, "Kindle Fire 8", 0x0211,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3285,8 +3564,38 @@
   /* https://sourceforge.net/p/libmtp/bugs/1718/ */
   { "Amazon", 0x1949, "Kindle Fire 8 (2nd ID)", 0x0261,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1776/ */
+  { "Amazon", 0x1949, "Kindle Fire 7 (2nd ID)", 0x0271,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1845/ */
+  { "Amazon", 0x1949, "Kindle Fire Kids", 0x0272,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/279/ */
+  { "Amazon", 0x1949, "Kindle Fire Tablet 10 HD", 0x0281,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/21 */
+  { "Amazon", 0x1949, "Kindle Fire 8 HD (2nd ID)", 0x0331,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/300/ */
+  { "Amazon", 0x1949, "Kindle Fire 8 HD (3rd ID)", 0x0332,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/293/ */
+  { "Amazon", 0x1949, "Kindle Fire Tablet 10 HD (2nd ID)", 0x03f1,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
+  { "Amazon", 0x1949, "Kindle Fire HD8 Plus", 0x0581,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1913/ */
+  { "Amazon", 0x1949, "Kindle Fire 10 Plus", 0x05e1,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Amazon", 0x1949, "Fire Phone", 0x0800,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1876/ */
+  { "Amazon", 0x1949, "Kindle Fire (ID 8)", 0x0c31,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
+  { "Amazon", 0x1949, "Kindle Fire 8 HD (7th Gen)", 0x0262,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Barnes&Noble
@@ -3307,9 +3616,30 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "YiFang", 0x2207, "BQ Tesla", 0x0006,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://bugs.debian.org/917259 */
+  { "Various", 0x2207, "Onyx Boox Max 2", 0x000b,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1833/ */
+  { "Onyx", 0x2207, "Boox Max 2 Pro", 0x000c,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1834/ */
+  { "Onyx", 0x2207, "Boox Note", 0x000d,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1354/ */
   { "Various", 0x2207, "Viewpia DR/bq Kepler Debugging", 0x0011,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/291/ */
+  { "Onyx", 0x2207, "Boox Nova", 0x0014,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1900/ */
+  { "Onyx", 0x2207, "Boox Nova Pro", 0x0015,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/125 */
+  { "iBasso", 0x2207, "DX170 DAP", 0x0017,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/82 */
+  { "Supernote", 0x2207, "A5X", 0x0031,
+      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Kobo
@@ -3389,6 +3719,10 @@
   /* https://sourceforge.net/p/libmtp/bugs/1397/ */
   { "Xiaomi", 0x2717, "Mi-2s (id2) (MTP)", 0xff40,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1905/ */
+  /* https://github.com/libmtp/libmtp/issues/90 */
+  { "Xiaomi", 0x0a9d, "MI 9 M1902F1G or POCO X3 Pro (MTP)", 0xff40,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1339/ */
   { "Xiaomi", 0x2717, "Mi-2s (MTP)", 0xff48,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3418,7 +3752,13 @@
   { "SHARP Corporation", 0x04dd, "SH-06E", 0x96ca,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/192/ */
-  { "SHARP Corporation", 0x04dd, "SHV35 AQUOS U ", 0x99d2,
+  { "SHARP Corporation", 0x04dd, "SHV35 AQUOS U", 0x99d2,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1883/ */
+  { "SHARP Corporation", 0x04dd, "AndroidOne S5", 0x9c90,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1914/ */
+  { "SHARP Corporation", 0x04dd, "S7-SH", 0x9d6e,
       DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
@@ -3432,11 +3772,17 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Alcatel", 0x1bbb, "6030a", 0x0168,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/276/ */
+  { "Alcatel", 0x1bbb, "A405DL", 0x901b,
+      DEVICE_FLAGS_ANDROID_BUGS },
   { "Alcatel/Bouygues", 0x1bbb, "BS472", 0x904d,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1304/ */
   { "Alcatel", 0x1bbb, "OneTouch 5042D (MTP)", 0xa00e,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1776/ */
+  { "Alcatel", 0x1bbb, "Popo4 (MTP)", 0xa00f,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1605/ */
   { "Alcatel", 0x1bbb, "OneTouch Idol 3 ID2 (MTP)", 0xaf00,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3457,11 +3803,13 @@
   /* https://sourceforge.net/p/libmtp/bugs/1492/ */
   { "Kyocera", 0x0482, "Event", 0x0591, DEVICE_FLAGS_ANDROID_BUGS  & ~DEVICE_FLAG_FORCE_RESET_ON_CLOSE },
   /* https://sourceforge.net/p/libmtp/feature-requests/134/ */
-  { "Kyocera", 0x0482, "Torque Model E6715", 0x0059a, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Kyocera", 0x0482, "Torque Model E6715", 0x059a, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/164/ */
   { "Kyocera", 0x0482, "Hydro Elite C6750", 0x073c, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/discussion/535190/thread/6270f5ce/ */
   { "Kyocera", 0x0482, "KYL22", 0x0810, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/270/ */
+  { "Kyocera", 0x0482, "Hydro Icon", 0x085e, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1518/ */
   { "Kyocera", 0x0482, "302KC", 0x09fc, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1345/ */
@@ -3493,20 +3841,27 @@
   { "Bravis", 0x0e8d, "A401 Neo", 0x0c03,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1422/ */
-  { "MediaTek Inc", 0x0e8d, "MT65xx", 0x2008,
-      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1467/ */
-  { "elephone", 0x0e8d, "p6000", 0x2008,
+  /* https://sourceforge.net/p/libmtp/bugs/1922/ */
+  { "MediaTek Inc", 0x0e8d, "MT65xx/67xx (MTP mode)", 0x2008,
       DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/234/ */
-  { "DOODGE", 0x0e8d, "X6pro", 0x200a,
+  /* https://sourceforge.net/p/libmtp/bugs/1923/ */
+  { "MediaTek Inc", 0x0e8d, "MT65xx/67xx (MTP + CDC + ADB mode)", 0x200a,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/289/ */
+  { "MediaTek Inc", 0x0e8d, "MT65xx/67xx (MTP + CDC mode)", 0x2012, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/79/ */
-  { "MediaTek Inc", 0x0e8d, "Elephone P8000", 0x201d,
-      DEVICE_FLAGS_ANDROID_BUGS },
+  { "MediaTek Inc", 0x0e8d, "MT65xx/67xx (MTP + ADB mode)", 0x201d, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* likely also a mediatek rebrand: https://github.com/libmtp/libmtp/issues/155 */
+  { "qin", 0x0e8d, "phone f21 pro", 0x2026, DEVICE_FLAGS_ANDROID_BUGS },
+
   /* https://sourceforge.net/p/libmtp/bugs/1717/ */
   { "MediaTek Inc", 0x0e8d, "Wiko Sunny", 0x4001,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1855/ */
+  { "Vivo", 0x0e8d, "Y21", 0xff00, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Jolla
@@ -3533,8 +3888,64 @@
   /*
    * Garmin
    */
-  { "Garmin", 0x091e, "Monterra", 0x2585,
-      DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Monterra", 0x2585, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "D2 Air", 0x488b, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1779/ */
+  { "Garmin", 0x091e, "Forerunner 645 Music", 0x4b48, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/15 */
+  { "Garmin", 0x091e, "Fenix 5/5S/5X Plus", 0x4b54, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/271/ */
+  { "Garmin", 0x091e, "Vivoactive 3", 0x4bac, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Vivoactive 3 Music LTE", 0x4bfa, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1884/ */
+  { "Garmin", 0x091e, "Forerunner 245 Music ", 0x4c05, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Forerunner 945", 0x4c29, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "D2 Delta/Delta S/Delta PX", 0x4c7c, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Vivoactive 4S", 0x4c98, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/51 */
+  { "Garmin", 0x091e, "Vivoactive 4", 0x4c99, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1864/ */
+  { "Garmin", 0x091e, "Venu", 0x4c9a, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "MARQ", 0x4cae, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "MARQ Aviator", 0x4caf, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Descent Mk2/Mk2i", 0x4cba, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Fenix 6S Pro/Sapphire", 0x4cd8, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1852/ */
+  { "Garmin", 0x091e, "Fenix 6 Pro/Sapphire", 0x4cda, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Fenix 6X Pro/Sapphire", 0x4cdb, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1887/ */
+  { "Garmin", 0x091e, "Zumo XT", 0x4d9c, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Rey", 0x4daa, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Darth Vader", 0x4dab, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Captain Marvel", 0x4dac, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "First Avenger", 0x4dad, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Forerunner 745", 0x4e05, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Venu Sq Music", 0x4e0c, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Descent Mk2/Mk2i (APAC)", 0x4e76, DEVICE_FLAGS_ANDROID_BUGS }, /* APAC version */
+  /* https://github.com/libmtp/libmtp/issues/156 */
+  { "Garmin", 0x091e, "Venu 2", 0x4e77, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Venu 2s", 0x4e78, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Venu Mercedes-Benz Collection", 0x4e9C, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/161 */
+  { "Garmin", 0x091e, "Venu 2 Plus", 0x4f0b, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/95 */
+  { "Garmin", 0x091e, "Fenix 7 Sapphire Solar", 0x4f42, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/164 */
+  { "Garmin", 0x091e, "Fenix 7", 0x4f43, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/299/ */
+  { "Garmin", 0x091e, "EPIX 2", 0x4f67, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/150 */
+  { "Garmin", 0x091e, "Garmin Forerunner 255M", 0x4f96, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/146 */
+  { "Garmin", 0x091e, "Forerunner 255S Music", 0x4f97, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Forerunner 955 Solar", 0x4fb8, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1920/ */
+  { "Garmin", 0x091e, "Tactix 7", 0x5027, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Garmin", 0x091e, "Forerunner 265", 0x50a1, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/152 */
+  { "Garmin", 0x091e, "Forerunner 965", 0x50db, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1934/ */
+  { "Garmin", 0x091e, "Fenix 7s pro sapphire solar", 0x5116, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * Wacom
@@ -3571,6 +3982,9 @@
   /* https://sourceforge.net/p/libmtp/support-requests/224/ */
   { "bq", 0x2a47, "Aquaris X5 (MTP)", 0x3003,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/284/ */
+  { "bq", 0x2a47, "Aquaris X2 (MTP)", 0x4ee1,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1311/ */
   { "bq", 0x2a47, "Aquarius E5-4G", 0x7f10,
       DEVICE_FLAGS_ANDROID_BUGS },
@@ -3580,6 +3994,12 @@
   /* https://sourceforge.net/p/libmtp/bugs/1541/ */
   { "bq", 0x2a47, "Aquarius M5.5", 0x901b,
       DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/269/ */
+  { "bq", 0x2a47, "Aquarius U", 0x9039,
+      DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1874/ */
+  { "bq", 0x2a47, "Aquarius U (2nd id)", 0x903a,
+      DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/231/ */
   { "bq", 0x2a47, "U Plus", 0xf003, DEVICE_FLAGS_ANDROID_BUGS },
 
@@ -3591,6 +4011,8 @@
   { "Prestigio", 0x29e4, "5504 DUO ", 0x1203, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/141/ */
   { "Prestigio", 0x29e4, "3405 DUO ", 0x3201, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/287/ */
+  { "Prestigio", 0x29e4, "Multipad Color 8", 0xb001, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/148/ */
   { "Prestigio", 0x29e4, "Multipad Color 7.0", 0xb003, DEVICE_FLAGS_ANDROID_BUGS },
 
@@ -3602,6 +4024,8 @@
   /* https://sourceforge.net/p/libmtp/bugs/1287/ */
   { "Gensis", 0x040d, "GT-7305 ", 0x885c, DEVICE_FLAGS_ANDROID_BUGS },
 
+  /* https://sourceforge.net/p/libmtp/support-requests/300/ */
+  { "realme", 0x22d9, "Phone", 0x202a, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/182/ */
   { "Oppo", 0x22d9, "Find 5", 0x2764, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1207/ */
@@ -3630,8 +4054,16 @@
   { "Caterpillar", 0x04b7, "Cat S30", 0x88b9, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/176/ */
   { "Caterpillar", 0x04b7, "Cat S60", 0x88c0, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1850/ */
+  { "Caterpillar", 0x04b7, "Cat S60 (2nd ID)", 0x88c1, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1757/ */
   { "Caterpillar", 0x04b7, "Cat S41", 0x88c6, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/260/ */
+  { "Caterpillar", 0x04b7, "Cat S31", 0x88d0, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1814/ */
+  { "Caterpillar", 0x04b7, "Cat S61", 0x88d6, DEVICE_FLAGS_ANDROID_BUGS },
+  /* owned by Marcus */
+  { "Caterpillar", 0x04b7, "Cat S62 Pro", 0x88f1, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/682/ */
   { "Pegatron", 0x1d4d, "Chagall (ADB)", 0x5035, DEVICE_FLAGS_ANDROID_BUGS },
@@ -3649,16 +4081,18 @@
   { "Yota", 0x2916, "Phone 2 (ID2)", 0xf003, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/1212/ */
-  { "Fly", 0x2970, "Evo Tech 4", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
-
   /* https://sourceforge.net/p/libmtp/bugs/1720/ */
-  { "Wileyfox", 0x2970, "Spark Plus", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
-
+  { "Fly", 0x2970, "Evo Tech 4", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/289/ */
+  { "Wileyfox", 0x2970, "Spark/Spark Plus", 0x201d, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/146/ */
   { "Wileyfox", 0x2970, "Swift", 0x2281, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/159/ */
   { "Wileyfox", 0x2970, "Swift 2", 0x2282, DEVICE_FLAGS_ANDROID_BUGS },
-
+  /* https://sourceforge.net/p/libmtp/feature-requests/311/ */
+  { "Fly", 0x2970, "Nimbus 3 ", 0x4001, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1865/ */
+  { "Fly", 0x2970, "5S ", 0x4002, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1554/ */
   { "Kazam", 0x2970, "Trooper 650 4G", 0x9039, DEVICE_FLAGS_ANDROID_BUGS },
 
@@ -3668,7 +4102,12 @@
   /* https://sourceforge.net/p/libmtp/bugs/1127/ */
   { "Fly", 0x2970, "iq4415 era style 3", 0x0c02, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1082/ */
-  { "Fly", 0x1782, "iq449", 0x4001, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1932/ */
+  { "Spreadtrum (Unisoc)", 0x1782, "Various devices (MTP)", 0x4001, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/240/ */
+  { "Spreadtrum (Unisoc)", 0x1782, "Various devices (MTP+ADB, ID 1)", 0x4002, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/109 */
+  { "Spreadtrum (Unisoc)", 0x1782, "Various devices (MTP+ADB, ID 2)", 0x4003, DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
   * YU Yureka.
@@ -3687,21 +4126,18 @@
   /* https://sourceforge.net/p/libmtp/feature-requests/135/. guessed android. */
   { "OUYA", 0x2836, "Videogame Console", 0x0010, DEVICE_FLAGS_ANDROID_BUGS },
 
-  /* https://sourceforge.net/p/libmtp/bugs/1383/ */
-  { "BLU", 0x0e8d, "Studio HD", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
-
-  /* https://sourceforge.net/p/libmtp/feature-requests/161/ */
-  { "Cubot", 0x0e8d, "X17", 0x201d, DEVICE_FLAGS_ANDROID_BUGS },
-
   /* https://sourceforge.net/p/libmtp/bugs/1423/ */
   { "OnePlus", 0x2a70, "ONE A2001", 0x9011, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1910/ */
+  { "OnePlus", 0x2a70, "OnePlus 9 5G", 0x9012, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/bugs/1450/ */
   { "OnePlus", 0x2a70, "OnePlus 2 A2005", 0xf003, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/1436/ */
   { "Parrot", 0x19cf, "Bebop Drone", 0x5038, DEVICE_FLAGS_ANDROID_BUGS },
 
-#if 0
+#ifndef _GPHOTO2_INTERNAL_CODE
+  /* gphoto lists them in its library.c */
   /*
    * GoPro Action Cams.
    */
@@ -3713,9 +4149,26 @@
   { "GoPro" , 0x2672, "HERO+", 0x0021, DEVICE_FLAG_NONE },
   { "GoPro" , 0x2672, "HERO5 Black", 0x0027, DEVICE_FLAG_NONE },
   { "GoPro" , 0x2672, "HERO5 Session", 0x0029, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO 2018", 0x002d, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "FUSION (back)", 0x0032, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "FUSION (front)", 0x0035, DEVICE_FLAG_NONE },
   { "GoPro" , 0x2672, "HERO6 Black", 0x0037, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO7 Silver", 0x0043, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO7 Black", 0x0047, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO8 Black", 0x0049, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO9 Black", 0x004d, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO10 Black", 0x0056, DEVICE_FLAG_NONE },
+  { "GoPro" , 0x2672, "HERO11 Black", 0x0059, DEVICE_FLAG_NONE },
+  /* https://github.com/libmtp/libmtp/issues/162 */
+  { "GoPro" , 0x2672, "HERO11 Black mini", 0x005a, DEVICE_FLAG_NONE },
 #endif
 
+  /* These Ricoh Theta cameras run Android but seem to work
+   * without DEVICE_FLAGS_ANDROID_BUGS.
+   */
+  { "Ricoh", 0x05ca, "Theta V (MTP)", 0x0368, DEVICE_FLAG_NONE },
+  { "Ricoh", 0x05ca, "Theta Z1 (MTP)", 0x036d, DEVICE_FLAG_NONE },
+
   /* https://sourceforge.net/p/libmtp/bugs/1490/ */
   { "Marshall" , 0x2ad9, "London", 0x000b, DEVICE_FLAG_NONE },
 
@@ -3743,11 +4196,17 @@
 
   /* https://sourceforge.net/p/libmtp/support-requests/250/ */
   { "Zuk" , 0x2b4c, "Z2 Pro", 0x1013, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1782/ */
+  { "Zuk" , 0x2b4c, "Z2", 0x101a, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/1574/ */
   { "Letv" , 0x2b0e, "X5001s", 0x1700, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/210/ */
   { "Letv" , 0x2b0e, "1s", 0x1704, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1805/ */
+  { "LeMobile" , 0x2b0e, "Le 2", 0x1714, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/support-requests/274/ */
+  { "LeMobile" , 0x2b0e, "Le 2 (ID2)", 0x171b, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/241/ */
   { "Letv" , 0x2b0e, "Leeco Le 1s", 0x1768, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/241/ */
@@ -3771,6 +4230,8 @@
   { "TP-Link" , 0x2357, "Neffos Y5 (MTP)", 0x0328, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/support-requests/240/ */
   { "TP-Link" , 0x2357, "Neffos X1 (MTP)", 0x033c, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1844/ */
+  { "TP-Link" , 0x2357, "Neffos Y5s (MTP)", 0x038c, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://sourceforge.net/p/libmtp/bugs/1570/ */
   { "Recon Instruments" , 0x2523, "Jet", 0xd209, DEVICE_FLAGS_ANDROID_BUGS },
@@ -3780,9 +4241,6 @@
   /* https://sourceforge.net/p/libmtp/bugs/1663/ */
   { "Nextbit" , 0x2c3f, "Robin", 0x0001, DEVICE_FLAGS_ANDROID_BUGS },
 
-  /* https://sourceforge.net/p/libmtp/feature-requests/240/ */
-  { "Spreadtrum" , 0x1782, "STK Storm 2e Pluz", 0x4002, DEVICE_FLAGS_ANDROID_BUGS },
-
   /* https://sourceforge.net/p/libmtp/support-requests/258/ */
   { "Essential Phone" , 0x2e17, "PH-1a", 0xc030, DEVICE_FLAGS_ANDROID_BUGS },
   /* https://sourceforge.net/p/libmtp/feature-requests/242/ */
@@ -3793,7 +4251,65 @@
 
   /* https://sourceforge.net/p/libmtp/bugs/1764/ */
   { "O&P Innovations" , 0x0746, "XDP-100R", 0xa003, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/feature-requests/278/ */
+  { "Pioneer" , 0x0746, "XDP-300R", 0xa023, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1786/ */
+  { "Niteto" , 0x16c0, "ADF-Drive", 0x0489, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/support-requests/277/ */
+  { "Vivo" , 0x2d95, "V11", 0x6002, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://github.com/libmtp/libmtp/issues/143 */
+  { "Vivo" , 0x2d95, "V19", 0x6003, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1786/ */
+  { "Longcheer" , 0x1c9e, "D", 0xf003, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1822/ */
+  { "vtevch" , 0x0f88, "Storio Max XL 2.0", 0x0684, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1889/ */
+  { "Tolino" , 0x1f85, "Vision 4 HD", 0x6056 , DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1846/ */
+  { "Netronix" , 0x1f85, "E60QH2", 0x6a12 , DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1871/ */
+  { "Doro" , 0x2b43, "Phone 8030 DSB-0010", 0x0006 , DEVICE_FLAGS_ANDROID_BUGS },
+
   /*
    * Other strange stuff.
    */
-  { "Isabella", 0x0b20, "Her Prototype", 0xddee, DEVICE_FLAG_NONE }
+  { "Isabella", 0x0b20, "Her Prototype", 0xddee, DEVICE_FLAG_NONE },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1817/ */
+  { "Nox", 0x1e0a, "A1", 0x1001, DEVICE_FLAG_NONE },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1893/ */
+  { "Nintendo", 0x057e, "Switch Lite", 0x201d, DEVICE_FLAG_NONE },
+
+  /* https://github.com/libmtp/libmtp/issues/72 https://sourceforge.net/p/libmtp/bugs/1895/ */
+  { "Mudita", 0x3310, "Pure Phone", 0x0100, DEVICE_FLAG_NONE },
+
+  /* https://github.com/libmtp/libmtp/issues/153 */
+  { "Oculus", 0x2833, "Quest 2", 0x0182, DEVICE_FLAGS_ANDROID_BUGS },
+  /* https://sourceforge.net/p/libmtp/bugs/1911/ */
+  { "Oculus", 0x2833, "Quest", 0x0183, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/bugs/1921/ */
+  { "Tolino", 0x4173, "Tolino Vision 6", 0x8000, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://github.com/libmtp/libmtp/issues/122 */
+  { "FLIR", 0x09cb, "C5", 0x100b, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://github.com/libmtp/libmtp/issues/135 */
+  { "Honor", 0x339b, "X8/X9 5G", 0x107d, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://sourceforge.net/p/libmtp/feature-requests/305/ */
+  { "SHIFT", 0x3360, "SHIFT6m", 0x2008, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* https://github.com/libmtp/libmtp/issues/160 */
+  { "Teenage engineering", 0x2367, "OP-1 field", 0x0102, DEVICE_FLAGS_ANDROID_BUGS },
+
+  /* qemu 3.0.0 hw/usb/dev-mtp.c */
+  { "QEMU", 0x46f4, "Virtual MTP", 0x0004, DEVICE_FLAG_NONE }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/olympus-wrap.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/olympus-wrap.c Changed

@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <_stdint.h>
+#include <stdint.h>
 
 #include <libxml/parser.h>
 
@@ -95,7 +95,7 @@
       unsigned char flags;	/* in / out flag mostly */
       unsigned char lun;	/* 0 here */
       unsigned char length;	/* of the CDB... but 0x0c is used here in the traces */
-      unsigned char cdb16;	
+      unsigned char cdb16;
 } uw_header_t;
 
 /*
@@ -418,11 +418,13 @@
 				goto skip;
 			}
 			newhandle = ptp2.Param1;
+#if 0
 			if ((newhandle & 0xff000000) != 0x1e000000) {
 				GP_LOG_D ("event 0x%04x, handle 0x%08x received, no XML event, just passing on", ptp2.Code, ptp2.Param1);
 				ptp_add_event (params, &ptp2);
 				continue;
 			}
+#endif
 
 			ret = ptp_getobjectinfo (outerparams, newhandle, &oi);
 			if (ret != PTP_RC_OK)
@@ -455,7 +457,7 @@
 			oi.Filename 		= "HRSPONSE.X3C";
 			oi.ObjectCompressedSize	= strlen(evxml);
 			size = ptp_pack_OI(params, &oi, &oidata);
-			res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL); 
+			res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL);
 			if (res != PTP_RC_OK)
 				return res;
 			free(oidata);
@@ -482,13 +484,13 @@
 		oi.Filename 		= "HREQUEST.X3C";
 		oi.ObjectCompressedSize	= strlen(cmdxml);
 
-/* 
-"HRSPONSE.X3C" ... sent back to camera after receiving an event. 
+/*
+"HRSPONSE.X3C" ... sent back to camera after receiving an event.
 <output><result>2001</result><ec102/></output
  */
 
 		size = ptp_pack_OI(params, &oi, &oidata);
-		res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL); 
+		res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL);
 		if (res != PTP_RC_OK)
 			return res;
 		free(oidata);
@@ -726,7 +728,7 @@
 		if (!sscanf(str,"%02x", &x)) {
 			ptp_debug( params, "could not parse int8 %s", str);
 			return PTP_RC_GeneralError;
-		} 
+		}
 		ptp_debug( params, "\t%d", x);
 		propval->i8 = x;
 		break;
@@ -820,7 +822,7 @@
 				n++;
 			} while (s);
 			dpd->FORM.Enum.NumberOfValues = n;
-			dpd->FORM.Enum.SupportedValue = malloc (n * sizeof(PTPPropertyValue));
+			dpd->FORM.Enum.SupportedValue = calloc (n , sizeof(PTPPropertyValue));
 			s = (char*)xmlNodeGetContent (next);
 			i = 0;
 			do {
@@ -886,7 +888,7 @@
 			GP_LOG_E ("failed scanning result from %s", xchar);
 		resp->Code = result;
 		GP_LOG_D ("ptp result is 0x%04x", result);
-	
+
 	}
 	next = xmlNextElementSibling (next);
 	if (!sscanf ((char*)next->name, "c%04x", &cmd)) {
@@ -984,11 +986,11 @@
 	}
 	resp->Nparam = curpar;
 	switch (curpar) {
-	case 5: resp->Param5 = pars4;
-	case 4: resp->Param4 = pars3;
-	case 3: resp->Param3 = pars2;
-	case 2: resp->Param2 = pars1;
-	case 1: resp->Param1 = pars0;
+	case 5: resp->Param5 = pars4; /* fallthrough */
+	case 4: resp->Param4 = pars3; /* fallthrough */
+	case 3: resp->Param3 = pars2; /* fallthrough */
+	case 2: resp->Param2 = pars1; /* fallthrough */
+	case 1: resp->Param1 = pars0; /* fallthrough */
 	case 0: break;
 	}
 	/* FIXME: decode content and inject into PTP event queue. */
@@ -1128,8 +1130,8 @@
 	xmlNodePtr	x3cnode, inputnode;
 	char		buf10;
 
-	/* 
-	"HRSPONSE.X3C" ... sent back to camera after receiving an event. 
+	/*
+	"HRSPONSE.X3C" ... sent back to camera after receiving an event.
 	<output><result>2001</result><ec102/></output
 	 */
 
@@ -1276,7 +1278,7 @@
 		oi.Filename 		= "HRSPONSE.X3C";
 		oi.ObjectCompressedSize	= strlen(evxml);
 		size = ptp_pack_OI(params, &oi, &oidata);
-		res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL); 
+		res = ptp_transaction (outerparams, &ptp2, PTP_DP_SENDDATA, size, &oidata, NULL);
 		if (res != PTP_RC_OK)
 			return res;
 		free(oidata);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/olympus-wrap.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/olympus-wrap.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptp-bugs.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptp-bugs.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptp-pack.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptp-pack.c Changed

@@ -1,7 +1,7 @@
 /* ptp-pack.c
  *
  * Copyright (C) 2001-2004 Mariusz Woloszyn <emsi@ipartners.pl>
- * Copyright (C) 2003-2017 Marcus Meissner <marcus@jet.franken.de>
+ * Copyright (C) 2003-2019 Marcus Meissner <marcus@jet.franken.de>
  * Copyright (C) 2006-2008 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2007 Tero Saarni <tero.saarni@gmail.com>
  * Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
@@ -126,8 +126,16 @@
 #define dtoh64(x)	dtoh64p(params,x)
 
 
-static inline char*
-ptp_unpack_string(PTPParams *params, unsigned char* data, uint16_t offset, uint32_t total, uint8_t *len)
+/*
+ * PTP strings ... if the size field is:
+ * size 0  : "empty string" ... we interpret that as string with just \0 terminator, return 1
+ *  (the whole PTP standard is not that clear, it occasionaly refers to strings as optional in such cases, but no clear guidance).
+ * size > 0: all other strings have a terminating \0, included in the length (not sure how conforming everyone is here)
+ *
+ * len - in ptp string characters currently
+ */
+static inline int
+ptp_unpack_string(PTPParams *params, unsigned char* data, uint32_t offset, uint32_t total, uint8_t *len, char **retstr)
 {
 	uint8_t length;
 	uint16_t stringPTP_MAXSTRLEN+1;
@@ -137,18 +145,20 @@
 	char *src, *dest;
 
 	*len = 0;
+	*retstr = NULL;
 
-	if (offset + 1 >= total)
-		return NULL;
+	if (offset + 1 > total)
+		return 0;
 
 	length = dtoh8a(&dataoffset);	/* PTP_MAXSTRLEN == 255, 8 bit len */
 	if (length == 0) {		/* nothing to do? */
 		*len = 0;
-		return NULL;
+		*retstr = strdup("");	/* return an empty string, not NULL */
+		return 1;
 	}
 
 	if (offset + 1 + length*sizeof(string0) > total)
-		return NULL;
+		return 0;
 
 	*len = length;
 
@@ -180,14 +190,15 @@
 	}
 	*dest = '\0';
 	loclstrsizeof(loclstr)-1 = '\0';   /* be safe? */
-	return(strdup(loclstr));
+	*retstr = strdup(loclstr);
+	return 1;
 }
 
 static inline int
 ucs2strlen(uint16_t const * const unicstr)
 {
 	int length = 0;
-	
+
 	/* Unicode strings are terminated with 2 * 0x00 */
 	for(length = 0; unicstrlength != 0x0000U; length ++);
 	return length;
@@ -233,7 +244,7 @@
 		*len=0;
 		return;
 	}
-	
+
 	/* number of characters including terminating 0 (PTP standard confirmed) */
 	htod8a(&dataoffset,packedlen+1);
 	memcpy(&dataoffset+1, &ucs2str0, packedlen * sizeof(ucs2str0));
@@ -249,15 +260,15 @@
 	uint8_t packedPTP_MAXSTRLEN*2+3, len;
 	size_t plen;
 	unsigned char *retcopy = NULL;
-  
+
 	if (string == NULL)
 	  ptp_pack_string(params, "", (unsigned char*) packed, 0, &len);
 	else
 	  ptp_pack_string(params, string, (unsigned char*) packed, 0, &len);
-  
+
 	/* returned length is in characters, then one byte for string length */
 	plen = len*2 + 1;
-	
+
 	retcopy = malloc(plen);
 	if (!retcopy) {
 		*packed_size = 0;
@@ -290,11 +301,11 @@
 		return 0;
 
 	if (offset + sizeof(uint32_t)*(n+1) > datalen) {
-		ptp_debug (params ,"array runs over datalen bufferend (%d vs %d)", offset + sizeof(uint32_t)*(n+1) , datalen);
+		ptp_debug (params ,"array runs over datalen bufferend (%ld vs %d)", offset + sizeof(uint32_t)*(n+1) , datalen);
 		return 0;
 	}
 
-	*array = malloc (n*sizeof(uint32_t));
+	*array = calloc (n,sizeof(uint32_t));
 	if (!*array)
 		return 0;
 	for (i=0;i<n;i++)
@@ -307,7 +318,7 @@
 {
 	uint32_t i=0;
 
-	*data = malloc ((arraylen+1)*sizeof(uint32_t));
+	*data = calloc ((arraylen+1),sizeof(uint32_t));
 	if (!*data)
 		return 0;
 	htod32a(&(*data)0,arraylen);
@@ -329,17 +340,17 @@
 		return 0;
 	n=dtoh32a(&dataoffset);
 
-	if (n >= UINT_MAX/sizeof(uint16_t))
+	if (n >= (UINT_MAX - offset - sizeof(uint32_t))/sizeof(uint16_t))
 		return 0;
 	if (!n)
 		return 0;
 	if (offset + sizeof(uint32_t) > datalen)
 		return 0;
 	if (offset + sizeof(uint32_t)+sizeof(uint16_t)*n > datalen) {
-		ptp_debug (params ,"array runs over datalen bufferend (%d vs %d)", offset + sizeof(uint32_t)+n*sizeof(uint16_t) , datalen);
+		ptp_debug (params ,"array runs over datalen bufferend (%ld vs %d)", offset + sizeof(uint32_t)+n*sizeof(uint16_t) , datalen);
 		return 0;
 	}
-	*array = malloc (n*sizeof(uint16_t));
+	*array = calloc (n,sizeof(uint16_t));
 	if (!*array)
 		return 0;
 	for (i=0;i<n;i++)
@@ -370,11 +381,13 @@
 		dtoh32a(&dataPTP_di_VendorExtensionID);
 	di->VendorExtensionVersion =
 		dtoh16a(&dataPTP_di_VendorExtensionVersion);
-	di->VendorExtensionDesc =
-		ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_di_VendorExtensionDesc,
 		datalen,
-		&len);
+		&len,
+		&di->VendorExtensionDesc)
+	)
+		return 0;
 	totallen=len*2+1;
 	if (datalen <= totallen + PTP_di_FunctionalMode + sizeof(uint16_t)) {
 		ptp_debug (params, "datalen %d <= totallen + PTP_di_FunctionalMode + sizeof(uint16_t) %d", datalen, totallen + PTP_di_FunctionalMode + sizeof(uint16_t));
@@ -388,7 +401,7 @@
 		&di->OperationsSupported);
 	totallen=totallen+di->OperationsSupported_len*sizeof(uint16_t)+sizeof(uint32_t);
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 1", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 1", datalen, totallen+PTP_di_OperationsSupported);
 		return 0;
 	}
 	di->EventsSupported_len = ptp_unpack_uint16_t_array(params, data,
@@ -397,7 +410,7 @@
 		&di->EventsSupported);
 	totallen=totallen+di->EventsSupported_len*sizeof(uint16_t)+sizeof(uint32_t);
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 2", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 2", datalen, totallen+PTP_di_OperationsSupported);
 		return 0;
 	}
 	di->DevicePropertiesSupported_len =
@@ -407,7 +420,7 @@
 		&di->DevicePropertiesSupported);
 	totallen=totallen+di->DevicePropertiesSupported_len*sizeof(uint16_t)+sizeof(uint32_t);
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 3", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 3", datalen, totallen+PTP_di_OperationsSupported);
 		return 0;
 	}
 	di->CaptureFormats_len = ptp_unpack_uint16_t_array(params, data,
@@ -416,7 +429,7 @@
 		&di->CaptureFormats);
 	totallen=totallen+di->CaptureFormats_len*sizeof(uint16_t)+sizeof(uint32_t);
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 4", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 4", datalen, totallen+PTP_di_OperationsSupported);
 		return 0;
 	}
 	di->ImageFormats_len = ptp_unpack_uint16_t_array(params, data,
@@ -425,43 +438,55 @@
 		&di->ImageFormats);
 	totallen=totallen+di->ImageFormats_len*sizeof(uint16_t)+sizeof(uint32_t);
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 5", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 5", datalen, totallen+PTP_di_OperationsSupported);
 		return 0;
 	}
-	di->Manufacturer = ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_di_OperationsSupported+totallen,
 		datalen,
-		&len);
+		&len,
+		&di->Manufacturer)
+	)
+		return 0;
 	totallen+=len*2+1;
 	/* be more relaxed ... as these are optional its ok if they are not here */
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 6", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 6", datalen, totallen+PTP_di_OperationsSupported);
 		return 1;
 	}
-	di->Model = ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_di_OperationsSupported+totallen,
 		datalen,
-		&len);
+		&len,
+		&di->Model)
+	)
+		return 1;
 	totallen+=len*2+1;
 	/* be more relaxed ... as these are optional its ok if they are not here */
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 7", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 7", datalen, totallen+PTP_di_OperationsSupported);
 		return 1;
 	}
-	di->DeviceVersion = ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_di_OperationsSupported+totallen,
 		datalen,
-		&len);
+		&len,
+		&di->DeviceVersion)
+	)
+		return 1;
 	totallen+=len*2+1;
 	/* be more relaxed ... as these are optional its ok if they are not here */
 	if (datalen <= totallen+PTP_di_OperationsSupported) {
-		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 8", datalen, totallen+PTP_di_OperationsSupported); 
+		ptp_debug (params, "datalen %d <= totallen+PTP_di_OperationsSupported %d 8", datalen, totallen+PTP_di_OperationsSupported);
 		return 1;
 	}
-	di->SerialNumber = ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_di_OperationsSupported+totallen,
 		datalen,
-		&len);
+		&len,
+		&di->SerialNumber)
+	)
+		return 1;
 	return 1;
 }
 
@@ -516,7 +541,7 @@
 	free (di->DevicePropertiesSupported);
 	free (di->unk);
 }
-	
+
 /* ObjectHandles array pack/unpack */
 
 #define PTP_oh				 0
@@ -529,7 +554,7 @@
 	} else {
 		oh->n = 0;
 		oh->Handler = NULL;
-	} 
+	}
 }
 
 /* StoreIDs array pack/unpack */
@@ -572,14 +597,22 @@
 	si->FreeSpaceInImages=dtoh32a(&dataPTP_si_FreeSpaceInImages);
 
 	/* FIXME: check more lengths here */
-	si->StorageDescription=ptp_unpack_string(params, data,
+	if (!ptp_unpack_string(params, data,
 		PTP_si_StorageDescription,
 		len,
-		&storagedescriptionlen);
-	si->VolumeLabel=ptp_unpack_string(params, data,
+		&storagedescriptionlen,
+		&si->StorageDescription)
+	)
+		return 0;
+
+	if (!ptp_unpack_string(params, data,
 		PTP_si_StorageDescription+storagedescriptionlen*2+1,
 		len,
-		&storagedescriptionlen);
+		&storagedescriptionlen,
+		&si->VolumeLabel)) {
+		ptp_debug(params, "could not unpack storage description");
+		return 0;
+	}
 	return 1;
 }
 
@@ -638,7 +671,7 @@
 	htod16a(&oidataPTP_oi_AssociationType,oi->AssociationType);
 	htod32a(&oidataPTP_oi_AssociationDesc,oi->AssociationDesc);
 	htod32a(&oidataPTP_oi_SequenceNumber,oi->SequenceNumber);
-	
+
 	ptp_pack_string(params, oi->Filename, oidata, PTP_oi_filenamelen, &filenamelen);
 /*
 	filenamelen=(uint8_t)strlen(oi->Filename);
@@ -751,20 +784,19 @@
 	oi->AssociationDesc=dtoh32a(&dataPTP_oi_AssociationDesc);
 	oi->SequenceNumber=dtoh32a(&dataPTP_oi_SequenceNumber);
 
-	oi->Filename= ptp_unpack_string(params, data, PTP_oi_filenamelen, len, &filenamelen);
-
-	capture_date = ptp_unpack_string(params, data,
-		PTP_oi_filenamelen+filenamelen*2+1, len, &capturedatelen);
-	/* subset of ISO 8601, without '.s' tenths of second and 
+	ptp_unpack_string(params, data, PTP_oi_filenamelen, len, &filenamelen, &oi->Filename);
+	ptp_unpack_string(params, data, PTP_oi_filenamelen+filenamelen*2+1, len, &capturedatelen, &capture_date);
+	/* subset of ISO 8601, without '.s' tenths of second and
 	 * time zone
 	 */
 	oi->CaptureDate = ptp_unpack_PTPTIME(capture_date);
 	free(capture_date);
 
 	/* now the modification date ... */
-	capture_date = ptp_unpack_string(params, data,
+	ptp_unpack_string(params, data,
 		PTP_oi_filenamelen+filenamelen*2
-		+capturedatelen*2+2, len, &capturedatelen);
+		+capturedatelen*2+2, len, &capturedatelen, &capture_date
+	);
 	oi->ModificationDate = ptp_unpack_PTPTIME(capture_date);
 	free(capture_date);
 }
@@ -786,10 +818,10 @@
 							\
 	if (n >= UINT_MAX/sizeof(val->a.v0))		\
 		return 0;				\
-	if (n > (total - (*offset))/sizeof(val->a.v0))\
+	if (n > (total - (*offset))/sizeof(val->a.v0.member))\
 		return 0;				\
 	val->a.count = n;				\
-	val->a.v = malloc(sizeof(val->a.v0)*n);	\
+	val->a.v = calloc(sizeof(val->a.v0),n);	\
 	if (!val->a.v) return 0;			\
 	for (j=0;j<n;j++)				\
 		CTVAL(val->a.vj.member, func);	\
@@ -873,8 +905,7 @@
 		if (*offset >= total+1)
 			return 0;
 
-		value->str = ptp_unpack_string(params,data,*offset,total,&len);
-		if (!value->str)
+		if (!ptp_unpack_string(params,data,*offset,total,&len,&value->str))
 			return 0;
 		*offset += len*2+1;
 		break;
@@ -892,10 +923,12 @@
 #define PTP_dpd_FactoryDefaultValue	5
 
 static inline int
-ptp_unpack_DPD (PTPParams *params, unsigned char* data, PTPDevicePropDesc *dpd, unsigned int dpdlen)
+ptp_unpack_DPD (PTPParams *params, unsigned char* data, PTPDevicePropDesc *dpd, unsigned int dpdlen, unsigned int *newoffset)
 {
 	unsigned int offset = 0, ret;
 
+	*newoffset = 0;
+
 	memset (dpd, 0, sizeof(*dpd));
 	if (dpdlen <= 5)
 		return 0;
@@ -907,8 +940,10 @@
 	offset = PTP_dpd_FactoryDefaultValue;
 	ret = ptp_unpack_DPV (params, data, &offset, dpdlen, &dpd->FactoryDefaultValue, dpd->DataType);
 	if (!ret) goto outofmemory;
-	if ((dpd->DataType == PTP_DTC_STR) && (offset == dpdlen))
+	if ((dpd->DataType == PTP_DTC_STR) && (offset == dpdlen)) {
+		*newoffset = offset;
 		return 1;
+	}
 	ret = ptp_unpack_DPV (params, data, &offset, dpdlen, &dpd->CurrentValue, dpd->DataType);
 	if (!ret) goto outofmemory;
 
@@ -917,8 +952,10 @@
 	   values). In both cases Form Flag should be set to 0x00 and FORM is
 	   not present. */
 
-	if (offset + sizeof(uint8_t) > dpdlen)
+	if (offset + sizeof(uint8_t) > dpdlen) {
+		*newoffset = offset;
 		return 1;
+	}
 
 	dpd->FormFlag=dtoh8a(&dataoffset);
 	offset+=sizeof(uint8_t);
@@ -940,11 +977,10 @@
 
 		N = dtoh16a(&dataoffset);
 		offset+=sizeof(uint16_t);
-		dpd->FORM.Enum.SupportedValue = malloc(N*sizeof(dpd->FORM.Enum.SupportedValue0));
+		dpd->FORM.Enum.SupportedValue = calloc(N,sizeof(dpd->FORM.Enum.SupportedValue0));
 		if (!dpd->FORM.Enum.SupportedValue)
 			goto outofmemory;
 
-		memset (dpd->FORM.Enum.SupportedValue,0 , N*sizeof(dpd->FORM.Enum.SupportedValue0));
 		for (i=0;i<N;i++) {
 			ret = ptp_unpack_DPV (params, data, &offset, dpdlen, &dpd->FORM.Enum.SupportedValuei, dpd->DataType);
 
@@ -963,6 +999,7 @@
 		}
 	}
 #undef N
+	*newoffset = offset;
 	return 1;
 outofmemory:
 	ptp_free_devicepropdesc(dpd);
@@ -970,32 +1007,40 @@
 }
 
 /* Device Property pack/unpack */
-#define PTP_dpd_Sony_DevicePropertyCode	0
-#define PTP_dpd_Sony_DataType		2
-#define PTP_dpd_Sony_GetSet		4
-#define PTP_dpd_Sony_Unknown		5
+#define PTP_dpd_Sony_DevicePropertyCode		0
+#define PTP_dpd_Sony_DataType			2
+#define PTP_dpd_Sony_ChangeMethod		4
+#define PTP_dpd_Sony_GetSet			5
 #define PTP_dpd_Sony_FactoryDefaultValue	6
 
 static inline int
 ptp_unpack_Sony_DPD (PTPParams *params, unsigned char* data, PTPDevicePropDesc *dpd, unsigned int dpdlen, unsigned int *poffset)
 {
 	unsigned int ret;
-#if 0
-	unsigned int unk1, unk2;
-#endif
+	unsigned int changemethod, getset;
 
 	memset (dpd, 0, sizeof(*dpd));
 	dpd->DevicePropertyCode=dtoh16a(&dataPTP_dpd_Sony_DevicePropertyCode);
 	dpd->DataType=dtoh16a(&dataPTP_dpd_Sony_DataType);
 
-#if 0
-	/* get set ? */
-	unk1 = dtoh8a(&dataPTP_dpd_Sony_GetSet);
-	unk2 = dtoh8a(&dataPTP_dpd_Sony_Unknown);
-	ptp_debug (params, "prop 0x%04x, datatype 0x%04x, unk1 %d unk2 %d", dpd->DevicePropertyCode, dpd->DataType, unk1, unk2);
-#endif
-	dpd->GetSet=1;
+	changemethod = dtoh8a(&dataPTP_dpd_Sony_ChangeMethod);
+	getset = dtoh8a(&dataPTP_dpd_Sony_GetSet);
 
+	ptp_debug (params, "prop 0x%04x, datatype 0x%04x, changemethod %d getset %d", dpd->DevicePropertyCode, dpd->DataType, changemethod, getset);
+	/* our investigations seem not correct ... some with 2/0 are settable */
+	switch (getset) {
+	case 0:	/* read only */
+	case 2: /* camera side only */
+		/* FIXME: dpd->GetSet=0; seems not right ... some values still can be set */
+		dpd->GetSet=1;
+		break;
+	case 1: /* writeable */
+		dpd->GetSet=1;
+		break;
+	default: /* values over 128 ... likely action triggers */
+		dpd->GetSet=1;
+		break;
+	}
 	dpd->FormFlag=PTP_DPFF_None;
 
 	*poffset = PTP_dpd_Sony_FactoryDefaultValue;
@@ -1031,11 +1076,10 @@
 #define N	dpd->FORM.Enum.NumberOfValues
 		N = dtoh16a(&data*poffset);
 		*poffset+=sizeof(uint16_t);
-		dpd->FORM.Enum.SupportedValue = malloc(N*sizeof(dpd->FORM.Enum.SupportedValue0));
+		dpd->FORM.Enum.SupportedValue = calloc(N,sizeof(dpd->FORM.Enum.SupportedValue0));
 		if (!dpd->FORM.Enum.SupportedValue)
 			goto outofmemory;
 
-		memset (dpd->FORM.Enum.SupportedValue,0 , N*sizeof(dpd->FORM.Enum.SupportedValue0));
 		for (i=0;i<N;i++) {
 			ret = ptp_unpack_DPV (params, data, poffset, dpdlen, &dpd->FORM.Enum.SupportedValuei, dpd->DataType);
 
@@ -1074,7 +1118,7 @@
 		unsigned int i;
 
 		dst->a.count = src->a.count;
-		dst->a.v = malloc (sizeof(src->a.v0)*src->a.count);
+		dst->a.v = calloc (sizeof(src->a.v0),src->a.count);
 		for (i=0;i<src->a.count;i++)
 			duplicate_PropertyValue (&src->a.vi, &dst->a.vi, type & ~PTP_DTC_ARRAY_MASK);
 		return;
@@ -1104,7 +1148,7 @@
 	dst->DevicePropertyCode	= src->DevicePropertyCode;
 	dst->DataType		= src->DataType;
 	dst->GetSet		= src->GetSet;
-	
+
 	duplicate_PropertyValue (&src->FactoryDefaultValue, &dst->FactoryDefaultValue, src->DataType);
 	duplicate_PropertyValue (&src->CurrentValue, &dst->CurrentValue, src->DataType);
 
@@ -1117,7 +1161,7 @@
 		break;
 	case PTP_DPFF_Enumeration:
 		dst->FORM.Enum.NumberOfValues = src->FORM.Enum.NumberOfValues;
-		dst->FORM.Enum.SupportedValue = malloc (sizeof(dst->FORM.Enum.SupportedValue0)*src->FORM.Enum.NumberOfValues);
+		dst->FORM.Enum.SupportedValue = calloc (sizeof(dst->FORM.Enum.SupportedValue0),src->FORM.Enum.NumberOfValues);
 		for (i = 0; i<src->FORM.Enum.NumberOfValues ; i++)
 			duplicate_PropertyValue (&src->FORM.Enum.SupportedValuei, &dst->FORM.Enum.SupportedValuei, src->DataType);
 		break;
@@ -1135,6 +1179,7 @@
 ptp_unpack_OPD (PTPParams *params, unsigned char* data, PTPObjectPropDesc *opd, unsigned int opdlen)
 {
 	unsigned int offset=0, ret;
+	uint8_t	len;
 
 	memset (opd, 0, sizeof(*opd));
 
@@ -1174,11 +1219,10 @@
 		N = dtoh16a(&dataoffset);
 		offset+=sizeof(uint16_t);
 
-		opd->FORM.Enum.SupportedValue = malloc(N*sizeof(opd->FORM.Enum.SupportedValue0));
+		opd->FORM.Enum.SupportedValue = calloc(N,sizeof(opd->FORM.Enum.SupportedValue0));
 		if (!opd->FORM.Enum.SupportedValue)
 			goto outofmemory;
 
-		memset (opd->FORM.Enum.SupportedValue,0 , N*sizeof(opd->FORM.Enum.SupportedValue0));
 		for (i=0;i<N;i++) {
 			ret = ptp_unpack_DPV (params, data, &offset, opdlen, &opd->FORM.Enum.SupportedValuei, opd->DataType);
 
@@ -1196,6 +1240,29 @@
 		}
 #undef N
 		}
+		break;
+	case PTP_OPFF_DateTime:
+		if (!ptp_unpack_string(params, data, offset, opdlen, &len, &opd->FORM.DateTime.String))
+			opd->FORM.DateTime.String = NULL;
+		offset += 2*len+1; /* offset not used afterwards anymore */
+		break;
+	case PTP_OPFF_RegularExpression:
+		if (!ptp_unpack_string(params, data, offset, opdlen, &len, &opd->FORM.RegularExpression.String))
+			opd->FORM.RegularExpression.String = NULL;
+		offset += 2*len+1; /* offset not used afterwards anymore */
+		break;
+	case PTP_OPFF_FixedLengthArray:
+		if (offset + sizeof(uint16_t) > opdlen) goto outofmemory;
+		opd->FORM.FixedLengthArray.NumberOfValues = dtoh16a(&dataoffset);
+		offset += sizeof(uint16_t); /* offset not used afterwards anymore */
+		break;
+	case PTP_OPFF_ByteArray:
+		if (offset + sizeof(uint16_t) > opdlen) goto outofmemory;
+		opd->FORM.ByteArray.NumberOfValues = dtoh16a(&dataoffset);
+		offset += sizeof(uint16_t); /* offset not used afterwards anymore */
+		break;
+	case PTP_OPFF_LongString:
+		break;
 	}
 	return 1;
 outofmemory:
@@ -1203,7 +1270,6 @@
 	return 0;
 }
 
-
 static inline uint32_t
 ptp_pack_DPV (PTPParams *params, PTPPropertyValue* value, unsigned char** dpvptr, uint16_t datatype)
 {
@@ -1387,7 +1453,7 @@
 
 static inline int
 ptp_unpack_OPL (PTPParams *params, unsigned char* data, MTPProperties **pprops, unsigned int len)
-{ 
+{
 	uint32_t prop_count;
 	MTPProperties *props = NULL;
 	unsigned int offset = 0, i;
@@ -1410,13 +1476,13 @@
 
 	data += sizeof(uint32_t);
 	len -= sizeof(uint32_t);
-	props = malloc(prop_count * sizeof(MTPProperties));
+	props = calloc(prop_count , sizeof(MTPProperties));
 	if (!props) return 0;
 	for (i = 0; i < prop_count; i++) {
 		if (len <= (sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t))) {
 			ptp_debug (params ,"short MTP Object Property List at property %d (of %d)", i, prop_count);
 			ptp_debug (params ,"device probably needs DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL");
-			ptp_debug (params ,"or even DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST", i);
+			ptp_debug (params ,"or even DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST");
 			qsort (props, i, sizeof(MTPProperties),_compare_func);
 			*pprops = props;
 			return i;
@@ -1626,8 +1692,12 @@
 
 	  The idea is to simply 'condense' these values to just one uint16 to be able to conveniently
 	  use the available enumeration facilities (look-up table). The image size and compression
-	  values fully describe the image format. Hence we generate a uint16 with the four nibles set
-	  as follows: entry 1 size | entry 1 compression | entry 2 size | entry 2 compression.
+	  values used to fully describe the image format, but at least since EOS M50 (with cRAW)
+	  it is no longer true - we need to store RAW flag (8).
+	  Hence we generate a uint16 with the four nibles set as follows:
+
+	  entry 1 size | entry 1 compression & RAW flag | entry 2 size | entry 2 compression & RAW flag.
+
 	  The above example would result in the value 0x1400.
 
 	  The EOS 5D Mark III (and possibly other high-end EOS as well) added the extra fancy S1, S2
@@ -1636,7 +1706,7 @@
 
 	const unsigned char* d = *data;
 	uint32_t n = dtoh32a( d );
-	uint32_t l, s1, c1, s2 = 0, c2 = 0;
+	uint32_t l, t1, s1, c1, t2 = 0, s2 = 0, c2 = 0;
 
 	if (n != 1 && n !=2) {
 		ptp_debug (params, "parsing EOS ImageFormat property failed (n != 1 && n != 2: %d)", n);
@@ -1649,7 +1719,7 @@
 		return 0;
 	}
 
-	d+=4; /* skip type */
+	t1 = dtoh32a( d+=4 );
 	s1 = dtoh32a( d+=4 );
 	c1 = dtoh32a( d+=4 );
 
@@ -1659,7 +1729,7 @@
 			ptp_debug (params, "parsing EOS ImageFormat property failed (l != 0x10: 0x%x)", l);
 			return 0;
 		}
-		d+=4; /* skip type */
+		t2 = dtoh32a( d+=4 );
 		s2 = dtoh32a( d+=4 );
 		c2 = dtoh32a( d+=4 );
 	}
@@ -1672,6 +1742,10 @@
 	if( s2 >= 0xe )
 		s2--;
 
+	/* encode RAW flag */
+	c1 |= (t1 == 6) ? 8 : 0;
+	c2 |= (t2 == 6) ? 8 : 0;
+
 	return ((s1 & 0xF) << 12) | ((c1 & 0xF) << 8) | ((s2 & 0xF) << 4) | ((c2 & 0xF) << 0);
 }
 
@@ -1688,15 +1762,15 @@
 
 	htod32a(data+=0, n);
 	htod32a(data+=4, 0x10);
-	htod32a(data+=4, ((value >> 8) & 0xF) == 4 ? 6 : 1);
+	htod32a(data+=4, (((value >> 8) & 0xF) >> 3) ? 6 : 1);
 	htod32a(data+=4, PACK_5DM3_SMALL_JPEG_SIZE((value >> 12) & 0xF));
-	htod32a(data+=4, (value >> 8) & 0xF);
+	htod32a(data+=4, ((value >> 8) & 0xF) & ~8);
 
 	if (n==2) {
 		htod32a(data+=4, 0x10);
-		htod32a(data+=4, ((value >> 0) & 0xF) == 4 ? 6 : 1);
+		htod32a(data+=4, (((value >> 0) & 0xF) >> 3) ? 6 : 1);
 		htod32a(data+=4, PACK_5DM3_SMALL_JPEG_SIZE((value >> 4) & 0xF));
-		htod32a(data+=4, (value >> 0) & 0xF);
+		htod32a(data+=4, ((value >> 0) & 0xF) & ~8);
 	}
 
 #undef PACK_5DM3_SMALL_JPEG_SIZE
@@ -1748,7 +1822,7 @@
 	}
 
 	/* every focuspoint gets 4 (16 bit number possible "-" sign and a x) and a ,*/
-	/* inital things around lets say 100 chars at most. 
+	/* initial things around lets say 100 chars at most.
 	 * FIXME: check selected when we decode it
 	 */
 	if (size < focus_points_in_struct*8) {
@@ -1783,7 +1857,7 @@
 		return NULL;
 	p = str;
 
-	p += sprintf(p,"eosversion=%d,size=%dx%d,size2=%dx%d,points={", version, sizeX, sizeY, size2X, size2Y);
+	p += sprintf(p,"eosversion=%u,size=%ux%u,size2=%ux%u,points={", version, sizeX, sizeY, size2X, size2Y);
 	for (i=0;i<focus_points_in_use;i++) {
 		int16_t x = dtoh16a((*data) + focus_points_in_struct*4 + 20 + 2*i);
 		int16_t y = dtoh16a((*data) + focus_points_in_struct*6 + 20 + 2*i);
@@ -1798,7 +1872,7 @@
 	p += sprintf(p,"},select={");
 	for (i=0;i<focus_points_in_use;i++) {
 		if ((1<<(i%8)) & ((*data)focus_points_in_struct*8+20+i/8))
-			p+=sprintf(p,"%d,", i);
+			p+=sprintf(p,"%u,", i);
 	}
 
 	p += sprintf(p,"},unknown={");
@@ -1909,6 +1983,7 @@
 	params->canon_propsj.size = 0;
 	params->canon_propsj.data = NULL;
 	memset (&params->canon_propsj.dpd,0,sizeof(params->canon_propsj.dpd));
+	params->canon_propsj.dpd.DevicePropertyCode = proptype;
 	params->canon_propsj.dpd.GetSet = 1;
 	params->canon_propsj.dpd.FormFlag = PTP_DPFF_None;
 	params->nrofcanon_props = j+1;
@@ -1917,7 +1992,7 @@
 
 
 static inline int
-ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, PTPCanon_changes_entry **pce)
+ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int datasize, PTPCanon_changes_entry **pce)
 {
 	int	i = 0, entries = 0;
 	unsigned char	*curdata = data;
@@ -1956,7 +2031,7 @@
 		curdata += size;
 		entries++;
 	}
-	ce = malloc (sizeof(PTPCanon_changes_entry)*(entries+1));
+	ce = calloc (sizeof(PTPCanon_changes_entry),(entries+1));
 	if (!ce) return 0;
 
 	curdata = data;
@@ -1992,7 +2067,7 @@
 			cei.type = PTP_CANON_EOS_CHANGES_TYPE_OBJECTCONTENT_CHANGE;
 			cei.u.object.oid    		= dtoh32a(&curdataPTP_ece_OA_ObjectID);
 			break;
-		case PTP_EC_CANON_EOS_ObjectInfoChangedEx:	
+		case PTP_EC_CANON_EOS_ObjectInfoChangedEx:
 		case PTP_EC_CANON_EOS_ObjectAddedEx:
 			if (size < PTP_ece_OA_Name+1) {
 				ptp_debug (params, "size %d is smaller than %d", size, PTP_ece_OA_Name+1);
@@ -2006,9 +2081,9 @@
 			cei.u.object.oi.ObjectCompressedSize= dtoh32a(&curdataPTP_ece_OA_Size);
 			cei.u.object.oi.Filename 	= strdup(((char*)&curdataPTP_ece_OA_Name));
 			if (type == PTP_EC_CANON_EOS_ObjectAddedEx) {
-				ptp_debug (params, "event %d: objectinfo added oid %08lx, parent %08lx, ofc %04x, size %d, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
+				ptp_debug (params, "event %d: objectinfo added oid %08x, parent %08x, ofc %04x, size %ld, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
 			} else {
-				ptp_debug (params, "event %d: objectinfo changed oid %08lx, parent %08lx, ofc %04x, size %d, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
+				ptp_debug (params, "event %d: objectinfo changed oid %08x, parent %08x, ofc %04x, size %ld, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
 			}
 			break;
 		case PTP_EC_CANON_EOS_ObjectAddedEx64:	/* FIXME: review if the data used is correct */
@@ -2023,7 +2098,7 @@
 			cei.u.object.oi.ObjectFormat 	= dtoh16a(&curdataPTP_ece2_OA_OFC);
 			cei.u.object.oi.ObjectCompressedSize= dtoh32a(&curdataPTP_ece2_OA_Size);	/* FIXME: might be 64bit now */
 			cei.u.object.oi.Filename 	= strdup(((char*)&curdataPTP_ece2_OA_Name));
-			ptp_debug (params, "event %d: objectinfo added oid %08lx, parent %08lx, ofc %04x, size %d, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
+			ptp_debug (params, "event %d: objectinfo added oid %08x, parent %08x, ofc %04x, size %ld, filename %s", i, cei.u.object.oid, cei.u.object.oi.ParentObject, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
 			break;
 		case PTP_EC_CANON_EOS_RequestObjectTransfer:
 		case PTP_EC_CANON_EOS_RequestObjectTransfer64:
@@ -2039,7 +2114,7 @@
 			cei.u.object.oi.ObjectCompressedSize = dtoh32a(&curdataPTP_ece_OI_Size);
 			cei.u.object.oi.Filename 	= strdup(((char*)&curdataPTP_ece_OI_Name));
 
-			ptp_debug (params, "event %d: request object transfer oid %08lx, ofc %04x, size %d, filename %p", i, cei.u.object.oid, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
+			ptp_debug (params, "event %d: request object transfer oid %08x, ofc %04x, size %ld, filename %p", i, cei.u.object.oid, cei.u.object.oi.ObjectFormat, cei.u.object.oi.ObjectCompressedSize, cei.u.object.oi.Filename);
 			break;
 		case PTP_EC_CANON_EOS_AvailListChanged: {	/* property desc */
 			uint32_t	proptype = dtoh32a(&curdataPTP_ece_Prop_Subtype);
@@ -2054,7 +2129,7 @@
 				break;
 			}
 
-			ptp_debug (params, "event %d: EOS prop %04x desc record, datasize %d, propxtype %d", i, proptype, size-PTP_ece_Prop_Desc_Data, propxtype);
+			ptp_debug (params, "event %d: EOS prop %04x (%s) desc record, datasize %d, propxtype %d", i, proptype, ptp_get_property_description (params, proptype), size-PTP_ece_Prop_Desc_Data, propxtype);
 			for (j=0;j<params->nrofcanon_props;j++)
 				if (params->canon_propsj.proptype == proptype)
 					break;
@@ -2063,7 +2138,7 @@
 				break;
 			}
 			dpd = &params->canon_propsj.dpd;
-			/* 1 - uint16 ? 
+			/* 1 - uint16 ?
 			 * 3 - uint16
 			 * 7 - string?
 			 */
@@ -2083,7 +2158,7 @@
 			dpd->FormFlag = PTP_DPFF_Enumeration;
 			dpd->FORM.Enum.NumberOfValues = propxcnt;
 			free (dpd->FORM.Enum.SupportedValue);
-			dpd->FORM.Enum.SupportedValue = malloc (sizeof (PTPPropertyValue)*propxcnt);
+			dpd->FORM.Enum.SupportedValue = calloc (sizeof (PTPPropertyValue),propxcnt);
 
 			switch (proptype) {
 			case PTP_DPC_CANON_EOS_ImageFormat:
@@ -2102,12 +2177,12 @@
 				switch (dpd->DataType) {
 #define XX( TYPE, CONV )\
 					if (sizeof(dpd->FORM.Enum.SupportedValuej.TYPE)*propxcnt + PTP_ece_Prop_Desc_Data > size) {	\
-						ptp_debug (params, "size %d does not match needed %d", sizeof(dpd->FORM.Enum.SupportedValuej.TYPE)*propxcnt + PTP_ece_Prop_Desc_Data, size);	\
+						ptp_debug (params, "size %lu does not match needed %u", sizeof(dpd->FORM.Enum.SupportedValuej.TYPE)*propxcnt + PTP_ece_Prop_Desc_Data, size);	\
 						break;							\
 					}								\
 					for (j=0;j<propxcnt;j++) { 					\
 						dpd->FORM.Enum.SupportedValuej.TYPE = CONV(xdata); 	\
-						ptp_debug (params, "event %d: suppval%d of %x is 0x%x.", i, j, proptype, CONV(xdata)); \
+						ptp_debug (params, "event %u: suppval%u of %x is 0x%x.", i, j, proptype, CONV(xdata)); \
 						xdata += 4; /* might only be for propxtype 3 */ \
 					} \
 					break;
@@ -2123,7 +2198,7 @@
 					free (dpd->FORM.Enum.SupportedValue);
 					dpd->FORM.Enum.SupportedValue = NULL;
 					dpd->FORM.Enum.NumberOfValues = 0;
-					ptp_debug (params ,"event %d: data type 0x%04x of %x unhandled, size %d, raw values:", i, dpd->DataType, proptype, dtoh32a(xdata), size);
+					ptp_debug (params ,"event %d: data type 0x%04x of %x unhandled, size %d, raw values:", i, dpd->DataType, proptype, size);
 					for (j=0;j<(size-PTP_ece_Prop_Desc_Data)/4;j++, xdata+=4) /* 4 is good for propxtype 3 */
 						ptp_debug (params, "    %3d: 0x%8x", j, dtoh32a(xdata));
 					break;
@@ -2142,7 +2217,7 @@
 					ptp_debug (params, "size %d is smaller than %d", size, PTP_ece_Prop_Val_Data);
 					break;
 				}
-				ptp_debug (params, "event %d: EOS prop %04x info record, datasize is %d", i, proptype, size-PTP_ece_Prop_Val_Data);
+				ptp_debug (params, "event %d: EOS prop %04x (%s) info record, datasize is %d", i, proptype, ptp_get_property_description(params,proptype), size-PTP_ece_Prop_Val_Data);
 				for (j=0;j<params->nrofcanon_props;j++)
 					if (params->canon_propsj.proptype == proptype)
 						break;
@@ -2203,6 +2278,7 @@
 					XX(EOS_EFComp)
 					XX(EOS_LensName)
 					XX(EOS_LensID)
+					XX(EOS_FixedMovie)
 #undef XX
 						dpd->GetSet = PTP_DPGS_Get;
 						break;
@@ -2223,12 +2299,50 @@
 				case PTP_DPC_CANON_EOS_ModelID:
 				case PTP_DPC_CANON_EOS_LensID:
 				case PTP_DPC_CANON_EOS_StroboFiring:
+				case PTP_DPC_CANON_EOS_StroboDispState:
+				case PTP_DPC_CANON_EOS_LvCFilterKind:
+				case PTP_DPC_CANON_EOS_CADarkBright:
+				case PTP_DPC_CANON_EOS_ErrorForDisplay:
+				case PTP_DPC_CANON_EOS_ExposureSimMode:
+				case PTP_DPC_CANON_EOS_WindCut:
+				case PTP_DPC_CANON_EOS_MovieRecordVolume:
+				case PTP_DPC_CANON_EOS_ExtenderType:
+				case PTP_DPC_CANON_EOS_AEModeMovie:
 				case PTP_DPC_CANON_EOS_AFSelectFocusArea:
 				case PTP_DPC_CANON_EOS_ContinousAFMode:
 				case PTP_DPC_CANON_EOS_MirrorUpSetting:
+				case PTP_DPC_CANON_EOS_MirrorDownStatus:
+				case PTP_DPC_CANON_EOS_OLCInfoVersion:
+				case PTP_DPC_CANON_EOS_PowerZoomPosition:
+				case PTP_DPC_CANON_EOS_PowerZoomSpeed:
+				case PTP_DPC_CANON_EOS_BuiltinStroboMode:
+				case PTP_DPC_CANON_EOS_StroboETTL2Metering:
+				case PTP_DPC_CANON_EOS_ColorTemperature:
+				case PTP_DPC_CANON_EOS_FixedMovie:
+				case PTP_DPC_CANON_EOS_AutoPowerOff:
+				case PTP_DPC_CANON_EOS_AloMode:
+				case PTP_DPC_CANON_EOS_LvViewTypeSelect:
+				case PTP_DPC_CANON_EOS_EVFColorTemp:
+				case PTP_DPC_CANON_EOS_LvAfSystem:
+				case PTP_DPC_CANON_EOS_OneShotRawOn:
+				case PTP_DPC_CANON_EOS_FlashChargingState:
+				case PTP_DPC_CANON_EOS_MovieServoAF:
+				case PTP_DPC_CANON_EOS_MultiAspect:
+				case PTP_DPC_CANON_EOS_EVFOutputDevice:
+				case PTP_DPC_CANON_EOS_FocusMode:
+				case PTP_DPC_CANON_EOS_MirrorLockupState:
+				case PTP_DPC_CANON_EOS_LensStatus:
+				case PTP_DPC_CANON_EOS_TempStatus:
+				case PTP_DPC_CANON_EOS_DepthOfFieldPreview:
+				case PTP_DPC_CANON_EOS_EVFSharpness:
+				case PTP_DPC_CANON_EOS_EVFWBMode:
+				case PTP_DPC_CANON_EOS_MovieSoundRecord:
+				case PTP_DPC_CANON_EOS_NetworkCommunicationMode:
+				case PTP_DPC_CANON_EOS_NetworkServerRegion:
 					dpd->DataType = PTP_DTC_UINT32;
 					break;
 				/* enumeration for AEM is never provided, but is available to set */
+				case PTP_DPC_CANON_EOS_AEModeDial:
 				case PTP_DPC_CANON_EOS_AutoExposureMode:
 					dpd->DataType = PTP_DTC_UINT16;
 					dpd->FormFlag = PTP_DPFF_Enumeration;
@@ -2237,7 +2351,6 @@
 				case PTP_DPC_CANON_EOS_Aperture:
 				case PTP_DPC_CANON_EOS_ShutterSpeed:
 				case PTP_DPC_CANON_EOS_ISOSpeed:
-				case PTP_DPC_CANON_EOS_FocusMode:
 				case PTP_DPC_CANON_EOS_ColorSpace:
 				case PTP_DPC_CANON_EOS_BatteryPower:
 				case PTP_DPC_CANON_EOS_BatterySelect:
@@ -2247,11 +2360,8 @@
 				case PTP_DPC_CANON_EOS_BracketMode:
 				case PTP_DPC_CANON_EOS_QuickReviewTime:
 				case PTP_DPC_CANON_EOS_EVFMode:
-				case PTP_DPC_CANON_EOS_EVFOutputDevice:
-				case PTP_DPC_CANON_EOS_AutoPowerOff:
 				case PTP_DPC_CANON_EOS_EVFRecordStatus:
 				case PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction:
-				case PTP_DPC_CANON_EOS_MultiAspect: /* actually a 32bit value, but lets try it for easyness */
 					dpd->DataType = PTP_DTC_UINT16;
 					break;
 				case PTP_DPC_CANON_EOS_PictureStyle:
@@ -2265,6 +2375,7 @@
 				case PTP_DPC_CANON_EOS_Copyright:
 				case PTP_DPC_CANON_EOS_SerialNumber:
 				case PTP_DPC_CANON_EOS_LensName:
+				case PTP_DPC_CANON_EOS_CameraNickname:
 					dpd->DataType = PTP_DTC_STR;
 					break;
 				case PTP_DPC_CANON_EOS_WhiteBalanceAdjustA:
@@ -2297,24 +2408,15 @@
 					xdata += 4;
 					break;
 				/* yet unknown 32bit props */
-				case PTP_DPC_CANON_EOS_ColorTemperature:
 				case PTP_DPC_CANON_EOS_WftStatus:
-				case PTP_DPC_CANON_EOS_LensStatus:
 				case PTP_DPC_CANON_EOS_CardExtension:
-				case PTP_DPC_CANON_EOS_TempStatus:
 				case PTP_DPC_CANON_EOS_PhotoStudioMode:
-				case PTP_DPC_CANON_EOS_DepthOfFieldPreview:
-				case PTP_DPC_CANON_EOS_EVFSharpness:
-				case PTP_DPC_CANON_EOS_EVFWBMode:
 				case PTP_DPC_CANON_EOS_EVFClickWBCoeffs:
-				case PTP_DPC_CANON_EOS_EVFColorTemp:
-				case PTP_DPC_CANON_EOS_ExposureSimMode:
-				case PTP_DPC_CANON_EOS_LvAfSystem:
 				case PTP_DPC_CANON_EOS_MovSize:
 				case PTP_DPC_CANON_EOS_DepthOfField:
-				case PTP_DPC_CANON_EOS_LvViewTypeSelect:
-				case PTP_DPC_CANON_EOS_AloMode:
 				case PTP_DPC_CANON_EOS_Brightness:
+				case PTP_DPC_CANON_EOS_GPSLogCtrl:
+				case PTP_DPC_CANON_EOS_GPSDeviceActive:
 					dpd->DataType = PTP_DTC_UINT32;
 					ptp_debug (params, "event %d: Unknown EOS property %04x, datasize is %d, using uint32", i ,proptype, size-PTP_ece_Prop_Val_Data);
 					if ((size-PTP_ece_Prop_Val_Data) % sizeof(uint32_t) != 0)
@@ -2337,6 +2439,11 @@
 					break;
 				}
 				switch (dpd->DataType) {
+				case PTP_DTC_INT32:
+					dpd->FactoryDefaultValue.i32	= dtoh32a(xdata);
+					dpd->CurrentValue.i32		= dtoh32a(xdata);
+					ptp_debug (params ,"event %d: currentvalue of %x is %x", i, proptype, dpd->CurrentValue.i32);
+					break;
 				case PTP_DTC_UINT32:
 					dpd->FactoryDefaultValue.u32	= dtoh32a(xdata);
 					dpd->CurrentValue.u32		= dtoh32a(xdata);
@@ -2410,22 +2517,86 @@
 					ptp_debug (params,"event %d: decoded focus info, currentvalue of %x is %s", i, proptype, dpd->CurrentValue.str);
 					break;
 				}
+			}
+			break;
 
-				break;
-		}
+/* largely input from users, CONFIRMED is really confirmed from debug
+ * traces via "testolc", rest is guessed */
+static unsigned int olcsizes0x1513 = {
+	/* 1,2,4,8,0x10,  0x20,0x40,0x80,0x100,0x200, 0x400,0x800,0x1000*/
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x0 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x1 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x2 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x3 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x4 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x5 */
+	{0,0,0,0,0, 0,0,0,0,0, 0,0,0 },	/* 0x6 */
+	{2,6,5,4,4, 6,7,4,6,5, 5,8,1 },	/* 0x7 */	/* CONFIRMED: EOS 100D, 5D Mark 3 */
+	{2,6,5,4,4, 6,7,4,6,7, 7,8,1 },	/* 0x8 */	/* CONFIRMED: EOS M10, PowerShot SX720HS: only report 0x1, 0x2, 0x4 and 0x8 masks, seperately */
+	{2,6,5,4,4, 6,7,4,6,7, 7,8,1 },	/* 0x9 */	/* guessed */
+	{2,6,5,4,4, 6,7,4,6,7, 7,8,1 },	/* 0xa */	/* guessed */
+	{2,6,5,4,4, 6,8,4,6,5, 5,9,8 }, /* 0xb */	/* CONFIRMED */
+							/* full block 81: The EOS 750D was 0x1000 field length 1 (first byte content 0x00),
+							 * The EOS 5ds has field length 8 (first byte content 0x07),
+							 * the first byte could be considered block length?
+							 * https://github.com/gphoto/gphoto2/issues/81
+							 */
+	{2,6,5,4,4, 6,8,4,6,5, 5,9,1 },	/* 0xc */	/* guessed */
+	{2,6,5,4,4, 6,8,4,6,5, 5,9,1 },	/* 0xd */	/* guessed */
+	{2,6,5,4,4, 6,8,4,6,5, 5,9,1 },	/* 0xe */	/* guessed */
+	{2,7,6,4,4, 6,8,4,6,5, 5,9,1 },	/* 0xf */	/* guessed */
+	{2,7,6,4,4, 6,8,4,6,5, 5,9,1 },	/* 0x10 */	/* guessed */
+	{2,7,6,6,4, 6,8,4,6,5, 5,9,8 },	/* 0x11 */	/* CONFIRMED: EOS R */
+	{2,7,9,6,4, 6,8,5,7,5, 5,9,8 },	/* 0x12 */	/* CONFIRMED: EOS M6 Mark II */
+	{2,7,9,7,4, 6,8,5,7,5, 5,9,8 },	/* 0x13 */	/* CONFIRMED: EOS R5 C info from user Ingmar */
+	{2,9,9,7,4, 6,8,5,7,5, 5,9,8 },	/* 0x14 */	/* CONFIRMED: EOS R10. confirmed by trace from Marc Wetli */
+};
 		/* one more information record handed to us */
+		/* Versions seen: (d199)
+		 * 100D, 5d Mark 3, 650D, 6D: 	7 (original reference)
+		 * M10, 70D:		8
+		 * 5Dsr, 750D:		b
+		 * 200D: 		f
+		 * EOS R:		0x11
+		 * EOS M6 Mark2 	0x12
+		 * EOS R5, R5 C, M50m2:	0x13
+		 * EOS R10:		0x14
+		 */
+		/* still unclear what OLC stands for */
 		case PTP_EC_CANON_EOS_OLCInfoChanged: {
 			uint32_t		len, curoff;
 			uint16_t		mask,proptype;
 			PTPDevicePropDesc	*dpd;
+			unsigned int		olcver = 0, j;
+
+			dpd = _lookup_or_allocate_canon_prop(params, PTP_DPC_CANON_EOS_OLCInfoVersion);
+			if (dpd) {
+				ptp_debug (params, "olcinfoversion is %d", dpd->CurrentValue.u32);
+				olcver = dpd->CurrentValue.u32;
+			}
+			if (olcver == 0) {
+				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+				cei.u.info = strdup("OLC version is unknown");
+				ptp_debug (params, "event %d: OLC version is 0, skipping (might get set later)", i);
+				break;
+			}
+			if (olcver >= sizeof(olcsizes)/sizeof(olcsizes0)) {
+				ptp_debug (params, "event %d: OLC version is %d, assuming latest known", i, olcver);
+				olcver = sizeof(olcsizes)/sizeof(olcsizes0)-1;
+			}
 
-			/* unclear what OLC stands for */
 			ptp_debug (params, "event %d: EOS event OLCInfoChanged (size %d)", i, size);
 			if (size >= 0x8) {	/* event info */
 				unsigned int k;
 				for (k=8;k<size;k++)
 					ptp_debug (params, "    %d: %02x", k-8, curdatak);
 			}
+			if (size < 14) {
+				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+				cei.u.info = strdup("OLC size too small");
+				ptp_debug (params, "event %d: OLC unexpected size %d", i, size);
+				break;
+			}
 			len = dtoh32a(curdata+8);
 			if ((len != size-8) && (len != size-4)) {
 				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
@@ -2434,193 +2605,230 @@
 				break;
 			}
 			mask = dtoh16a(curdata+8+4);
-			if (size < 14) {
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = strdup("OLC size too small");
-				ptp_debug (params, "event %d: OLC unexpected size %d", i, size);
-				break;
-			}
+			ptp_debug (params, "event %d: OLC mask 0x%04x length %d / data length %d", i, mask, len, len - 8);
 			curoff = 8+4+4;
-			if (mask & CANON_EOS_OLC_BUTTON) {
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("Button 1234567"));
-				sprintf(cei.u.info, "Button %d",  dtoh16a(curdata+curoff));
-				i++;
-				curoff += 2;
-			}
-			
-			if (mask & CANON_EOS_OLC_SHUTTERSPEED) {
-				/* 6 bytes: 01 01 98 10 00 60 */
-				/* this seesm to be the shutter speed record */
-				proptype = PTP_DPC_CANON_EOS_ShutterSpeed;
-				dpd = _lookup_or_allocate_canon_prop(params, proptype);
-				dpd->CurrentValue.u16 = curdatacuroff+5; /* just use last byte */
 
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
-				cei.u.propid = proptype;
-				curoff += 6;
-				i++;
-			}
-			if (mask & CANON_EOS_OLC_APERTURE) {
-				/* 5 bytes: 01 01 5b 30 30 */
-				/* this seesm to be the aperture record */
-				proptype = PTP_DPC_CANON_EOS_Aperture;
-				dpd = _lookup_or_allocate_canon_prop(params, proptype);
-				dpd->CurrentValue.u16 = curdatacuroff+4; /* just use last byte */
+			for (j = 0; j <= 12 ; j++) {
+				unsigned int k;
+				unsigned int curmask = 1 << j;
+				if (curoff > size)
+					break;
+				if (!(mask & curmask))
+					continue;
+				if (curoff+olcsizesolcverj > size) {
+					ptp_debug (params, "event %d: mask 0x%x size of olc entry %d exceeds total size %d", i, mask, curoff+olcsizesolcverj, size);
+					break;
+				}
+				ptp_debug (params, "event %d: olcmask 0x%04x", i, curmask);
+				for (k=0;k<olcsizesolcverj;k++) {
+					ptp_debug (params, "    %d: %02x", k, curdatacuroff+k);
+				}
+				switch (curmask) {
+				case CANON_EOS_OLC_BUTTON: {
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("Button 1234567"));
+					sprintf(cei.u.info, "Button %d",  dtoh16a(curdata+curoff));
+					i++;
+					break;
+				}
+				case CANON_EOS_OLC_SHUTTERSPEED: {
+					/* 6 bytes: 01 01 98 10 00 60 */
+					/* this seem to be the shutter speed record */
+					/* EOS 200D seems to have 7 bytes here, sample:
+					 * 7 bytes: 01 03 98 10 00 70 00
+					 * EOS R also 7 bytes
+					 * 7 bytes: 01 01 a0 0c 00 0c 00
+					 */
+					proptype = PTP_DPC_CANON_EOS_ShutterSpeed;
+					dpd = _lookup_or_allocate_canon_prop(params, proptype);
+					if (olcver >= 0x14) {	/* taken from northofyou branch */
+						dpd->CurrentValue.u16 = curdatacuroff+7;
+					} else {
+						dpd->CurrentValue.u16 = curdatacuroff+5;
+					}
 
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
-				cei.u.propid = proptype;
-				curoff += 5;
-				i++;
-			}
-			if (mask & CANON_EOS_OLC_ISO) {
-				/* 5 bytes: 01 01 00 78 */
-				/* this seesm to be the aperture record */
-				proptype = PTP_DPC_CANON_EOS_ISOSpeed;
-				dpd = _lookup_or_allocate_canon_prop(params, proptype);
-				dpd->CurrentValue.u16 = curdatacuroff+3; /* just use last byte */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
+					cei.u.propid = proptype;
+					i++;
+					break;
+				}
+				case CANON_EOS_OLC_APERTURE: {
+					/* 5 bytes: 01 01 5b 30 30 */
+					/* this seem to be the aperture record */
+					/* EOS 200D seems to have 6 bytes here?
+					 * 6 bytes: 01 01 50 20 20 00 *
+					 * EOS M6 Mark 2:
+					 * 9 bytes: 01 03 00 58 00 2d 00 30 00
+					 */
+					proptype = PTP_DPC_CANON_EOS_Aperture;
+					dpd = _lookup_or_allocate_canon_prop(params, proptype);
+					if (olcver >= 0x12) {
+						dpd->CurrentValue.u16 = curdatacuroff+7; /* RP, R5, etc */
+					} else {
+						dpd->CurrentValue.u16 = curdatacuroff+4; /* just use last byte */
+					}
 
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
-				cei.u.propid = proptype;
-				curoff += 4;
-				i++;
-			}
-			if (mask & 0x0010) {
-				/* mask 0x0010: 4 bytes, 04 00 00 00 observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x0010 content 01234567")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x0010 content %02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3
-				);
-				curoff += 4;
-				i++;
-			}
-			if (mask & 0x0020) {
-				/* mask 0x0020: 6 bytes, 00 00 00 00 00 00 observed.
-				 * This seems to be the self-timer record: when active,
-				 * has the form of 00 00 01 00 XX XX, where the last two bytes
-				 * stand for the number of seconds remaining until the shot */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x0020 content 0123456789ab")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x0020 content %02x%02x%02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5
-				);
-				curoff += 6;
-				i++;
-			}
-			if (mask & 0x0040) {
-				int	value = (signed char)curdatacuroff+2;
-				/* mask 0x0040: 7 bytes, 01 01 00 00 00 00 00 observed */
-				/* exposure indicator */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo exposure indicator 012345678901234567890123456789abcd")+1); 
-				sprintf(cei.u.info,"OLCInfo exposure indicator %d,%d,%d.%d (%02x%02x%02x%02x)",
-					curdatacuroff,
-					curdatacuroff+1,
-					value/10,abs(value)%10,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5,
-					curdatacuroff+6
-				);
-				curoff += 7;
-				i++;
-			}
-			if (mask & 0x0080) {
-				/* mask 0x0080: 4 bytes, 00 00 00 00 observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x0080 content 01234567")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x0080 content %02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3
-				);
-				curoff += 4;
-				i++;
-			}
-			if (mask & 0x0100) {
-				/* mask 0x0100: 6 bytes, 00 00 00 00 00 00 (before focus) and 00 00 00 00 01 00 (on focus) observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_FOCUSINFO;
-				cei.u.info = malloc(strlen("0123456789ab")+1); 
-				sprintf(cei.u.info,"%02x%02x%02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5
-				);
-				curoff += 6;
-				i++;
-			}
-			if (mask & 0x0200) {
-				/* mask 0x0200: 7 bytes, 00 00 00 00 00 00 00 observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_FOCUSMASK;
-				cei.u.info = malloc(strlen("0123456789abcd0123456789abcdef")+1); 
-				sprintf(cei.u.info,"%02x%02x%02x%02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5,
-					curdatacuroff+6
-				);
-				curoff += 7;
-				i++;
-			}
-			if (mask & 0x0400) {
-				/* mask 0x0400: 7 bytes, 00 00 00 00 00 00 00 observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x0400 content 0123456789abcd")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x0400 content %02x%02x%02x%02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5,
-					curdatacuroff+6
-				);
-				curoff += 7;
-				i++;
-			}
-			if (mask & 0x0800) {
-				/* mask 0x0800: 8 bytes, 00 00 00 00 00 00 00 00 and 19 01 00 00 00 00 00 00 and others observed */
-				/*   might be mask of focus points selected */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x0800 content 0123456789abcdef")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x0800 content %02x%02x%02x%02x%02x%02x%02x%02x",
-					curdatacuroff,
-					curdatacuroff+1,
-					curdatacuroff+2,
-					curdatacuroff+3,
-					curdatacuroff+4,
-					curdatacuroff+5,
-					curdatacuroff+6,
-					curdatacuroff+7
-				);
-				curoff += 8;
-				i++;
-			}
-			if (mask & 0x1000) {
-				/* mask 0x1000: 1 byte, 00 observed */
-				cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
-				cei.u.info = malloc(strlen("OLCInfo event 0x1000 content 01")+1); 
-				sprintf(cei.u.info,"OLCInfo event 0x1000 content %02x",
-					curdatacuroff
-				);
-				curoff += 1;
-				i++;
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
+					cei.u.propid = proptype;
+					i++;
+					break;
+				}
+				case CANON_EOS_OLC_ISO: {
+					/* 4 bytes: 01 01 00 78 */
+					/* EOS M6 Mark2: 01 01 00 6b 68 28 */
+					/* this seem to be the ISO record */
+					proptype = PTP_DPC_CANON_EOS_ISOSpeed;
+					dpd = _lookup_or_allocate_canon_prop(params, proptype);
+					dpd->CurrentValue.u16 = curdatacuroff+3; /* just use last byte */
+
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
+					cei.u.propid = proptype;
+					i++;
+					break;
+				}
+				case 0x0010: {
+					/* mask 0x0010: 4 bytes, 04 00 00 00 observed */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x0010 content 01234567")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x0010 content %02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3
+					);
+					i++;
+					break;
+				}
+				case 0x0020: {
+					/* mask 0x0020: 6 bytes, 00 00 00 00 00 00 observed.
+					 * This seems to be the self-timer record: when active,
+					 * has the form of 00 00 01 00 XX XX, where the last two bytes
+					 * stand for the number of seconds remaining until the shot */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x0020 content 0123456789ab")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x0020 content %02x%02x%02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5
+					);
+					i++;
+					break;
+				}
+				case 0x0040: {
+					int	value = (signed char)curdatacuroff+2;
+					/* mask 0x0040: 7 bytes, 01 01 00 00 00 00 00 observed */
+					/* exposure indicator */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo exposure indicator 012345678901234567890123456789abcd")+1);
+					sprintf(cei.u.info,"OLCInfo exposure indicator %d,%d,%d.%d (%02x%02x%02x%02x)",
+						curdatacuroff,
+						curdatacuroff+1,
+						value/10,abs(value)%10,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5,
+						curdatacuroff+6
+					);
+					i++;
+					break;
+				}
+				case 0x0080: {
+					/* mask 0x0080: 4 bytes, 00 00 00 00 observed */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x0080 content 01234567")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x0080 content %02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3
+					);
+					i++;
+					break;
+				}
+				case 0x0100: {
+					/* mask 0x0100: 6 bytes, 00 00 00 00 00 00 (before focus) and 00 00 00 00 01 00 (on focus) observed */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_FOCUSINFO;
+					cei.u.info = malloc(strlen("0123456789ab")+1);
+					sprintf(cei.u.info,"%02x%02x%02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5
+					);
+					i++;
+					break;
+				}
+				case 0x0200: {
+					/* mask 0x0200: 7 bytes, 00 00 00 00 00 00 00 observed */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_FOCUSMASK;
+					cei.u.info = malloc(strlen("0123456789abcd0123456789abcdef")+1);
+					sprintf(cei.u.info,"%02x%02x%02x%02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5,
+						curdatacuroff+6
+					);
+					i++;
+					break;
+				}
+				case 0x0400: {
+					/* mask 0x0400: 7 bytes, 00 00 00 00 00 00 00 observed */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x0400 content 0123456789abcd")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x0400 content %02x%02x%02x%02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5,
+						curdatacuroff+6
+					);
+					i++;
+					break;
+				}
+				case 0x0800: {
+					/* mask 0x0800: 8 bytes, 00 00 00 00 00 00 00 00 and 19 01 00 00 00 00 00 00 and others observed */
+					/*   might be mask of focus points selected */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x0800 content 0123456789abcdef")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x0800 content %02x%02x%02x%02x%02x%02x%02x%02x",
+						curdatacuroff,
+						curdatacuroff+1,
+						curdatacuroff+2,
+						curdatacuroff+3,
+						curdatacuroff+4,
+						curdatacuroff+5,
+						curdatacuroff+6,
+						curdatacuroff+7
+					);
+					i++;
+					break;
+				}
+				case 0x1000: {
+					/* mask 0x1000: 1 byte, 00 observed */
+					/* mask 0x1000: 8 byte too on 5ds, type 11 (has shuttercount inside) */
+					cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+					cei.u.info = malloc(strlen("OLCInfo event 0x1000 content 01")+1);
+					sprintf(cei.u.info,"OLCInfo event 0x1000 content %02x",
+						curdatacuroff
+					);
+					i++;
+					break;
+				}
+				default: {
+					break;
+				}
+				}
+				curoff += olcsizesolcverj;
 			}
 			/* handle more masks */
 			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
@@ -2642,7 +2850,32 @@
 		case PTP_EC_CANON_EOS_BulbExposureTime:
 			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
 			cei.u.info = malloc(strlen("BulbExposureTime 123456789012345678"));
-			sprintf (cei.u.info, "BulbExposureTime %d",  dtoh32a(curdata+8));
+			sprintf (cei.u.info, "BulbExposureTime %u",  dtoh32a(curdata+8));
+			break;
+		case PTP_EC_CANON_EOS_CTGInfoCheckComplete: /* some form of storage catalog ? */
+			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+			cei.u.info = malloc(strlen("CTGInfoCheckComplete 0x012345678"));
+			sprintf (cei.u.info, "CTGInfoCheckComplete 0x%08x",  dtoh32a(curdata+8));
+			break;
+		case PTP_EC_CANON_EOS_StorageStatusChanged:
+			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+			cei.u.info = malloc(strlen("StorageStatusChanged 0x012345678"));
+			sprintf (cei.u.info, "StorageStatusChanged 0x%08x",  dtoh32a(curdata+8));
+			break;
+		case PTP_EC_CANON_EOS_StorageInfoChanged:
+			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+			cei.u.info = malloc(strlen("StorageInfoChanged 0x012345678"));
+			sprintf (cei.u.info, "StorageInfoChanged 0x%08x",  dtoh32a(curdata+8));
+			break;
+		case PTP_EC_CANON_EOS_StoreAdded:
+			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+			cei.u.info = malloc(strlen("StoreAdded 0x012345678"));
+			sprintf (cei.u.info, "StoreAdded 0x%08x",  dtoh32a(curdata+8));
+			break;
+		case PTP_EC_CANON_EOS_StoreRemoved:
+			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
+			cei.u.info = malloc(strlen("StoreRemoved 0x012345678"));
+			sprintf (cei.u.info, "StoreRemoved 0x%08x",  dtoh32a(curdata+8));
 			break;
 		case PTP_EC_CANON_EOS_ObjectRemoved:
 			cei.type = PTP_CANON_EOS_CHANGES_TYPE_OBJECTREMOVED;
@@ -2651,14 +2884,12 @@
 		default:
 			switch (type) {
 #define XX(x)		case PTP_EC_CANON_EOS_##x: 								\
-				ptp_debug (params, "event %d: unhandled EOS event "#x" (size %d)", i, size); 	\
-				cei.u.info = malloc(strlen("unhandled EOS event "#x" (size 123456789)"));	\
-				sprintf (cei.u.info, "unhandled EOS event "#x" (size %d)",  size);		\
+				ptp_debug (params, "event %u: unhandled EOS event "#x" (size %u)", i, size); 	\
+				cei.u.info = malloc(strlen("unhandled EOS event "#x" (size 12345678901)")+1);	\
+				sprintf (cei.u.info, "unhandled EOS event "#x" (size %u)",  size);		\
 				break;
 			XX(RequestGetEvent)
 			XX(RequestGetObjectInfoEx)
-			XX(StorageStatusChanged)
-			XX(StorageInfoChanged)
 			XX(ObjectInfoChangedEx)
 			XX(ObjectContentChanged)
 			XX(WillSoonShutdown)
@@ -2666,22 +2897,21 @@
 			XX(RequestCancelTransfer)
 			XX(RequestObjectTransferDT)
 			XX(RequestCancelTransferDT)
-			XX(StoreAdded)
-			XX(StoreRemoved)
 			XX(BulbExposureTime)
 			XX(RecordingTime)
 			XX(RequestObjectTransferTS)
 			XX(AfResult)
+			XX(PowerZoomInfoChanged)
 #undef XX
 			default:
 				ptp_debug (params, "event %d: unknown EOS event %04x", i, type);
 				break;
 			}
 			if (size >= 0x8) {	/* event info */
-				unsigned int j;
+				unsigned int k;
 				/*ptp_debug (params, "data=%p, curdata=%p, datsize=%d, size=%d", data, curdata, datasize, size);*/
-				for (j=8;j<size;j++)
-					ptp_debug (params, "    %d: %02x", j, curdataj);
+				for (k=8;k<size;k++)
+					ptp_debug (params, "    %d: %02x", k, curdatak);
 			}
 			cei.type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
 			break;
@@ -2725,8 +2955,8 @@
 	if (!*cnt)
 		return;
 
-	*ec = malloc(sizeof(PTPContainer)*(*cnt));
-	
+	*ec = calloc(sizeof(PTPContainer),(*cnt));
+
 	for (i=0;i<*cnt;i++) {
 		memset(&(*ec)i,0,sizeof(PTPContainer));
 		(*ec)i.Code	= dtoh16a(&dataPTP_nikon_ec_Code+PTP_nikon_ec_Size*i);
@@ -2735,6 +2965,65 @@
 	}
 }
 
+/*
+ *  PTP USB Event container unpack for Nikon events, 2nd generation.
+ */
+#define PTP_nikon_ec_ex_Length		0
+#define PTP_nikon_ec_ex_Code		2
+
+static inline int
+ptp_unpack_Nikon_EC_EX (PTPParams *params, unsigned char* data, unsigned int len, PTPContainer **ec, unsigned int *cnt)
+{
+	unsigned int i, offset;
+
+	*ec = NULL;
+	if (data == NULL)
+		return 0;
+	if (len < PTP_nikon_ec_ex_Code)
+		return 0;
+	*cnt = dtoh16a(&dataPTP_nikon_ec_ex_Length);
+	if (*cnt > (len-PTP_nikon_ec_ex_Code)/4) { /* broken cnt? simple first check ... due to dynamic size, we need to do more later */
+		*cnt = 0;
+		return 0;
+	}
+	if (!*cnt)
+		return 1;
+
+	*ec = calloc(sizeof(PTPContainer),(*cnt));
+	offset = PTP_nikon_ec_ex_Code+sizeof(uint16_t);
+
+	for (i=0;i<*cnt;i++) {
+		memset(&(*ec)i,0,sizeof(PTPContainer));
+		if (len - offset < 4) {
+			free (*ec);
+			*ec = NULL;
+			*cnt = 0;
+			return 0;
+		}
+		(*ec)i.Code	= dtoh16a(&dataoffset);
+		(*ec)i.Nparam	= dtoh16a(&dataoffset+2);
+		ptp_debug (params, "nikon eventex %d: code 0x%04x, params %d", i, (*ec)i.Code, (*ec)i.Nparam);
+		if (	((*ec)i.Nparam > 5) 					||
+			(len < ((*ec)i.Nparam*sizeof(uint32_t)) + 4 + offset)
+		) {
+			free (*ec);
+			*ec = NULL;
+			*cnt = 0;
+			return 0;
+		}
+		switch ((*ec)i.Nparam) {
+		case 5:	(*ec)i.Param5	= dtoh32a(&dataoffset+4+sizeof(uint32_t)*4);/* fallthrough */
+		case 4:	(*ec)i.Param4	= dtoh32a(&dataoffset+4+sizeof(uint32_t)*3);/* fallthrough */
+		case 3:	(*ec)i.Param3	= dtoh32a(&dataoffset+4+sizeof(uint32_t)*2);/* fallthrough */
+		case 2:	(*ec)i.Param2	= dtoh32a(&dataoffset+4+sizeof(uint32_t)*1);/* fallthrough */
+		case 1:	(*ec)i.Param1	= dtoh32a(&dataoffset+4);
+			/* fallthrough */
+		case 0:	break;
+		}
+		offset += (*ec)i.Nparam*sizeof(uint32_t) + 4;
+	}
+	return 1;
+}
 
 static inline uint32_t
 ptp_pack_EK_text(PTPParams *params, PTPEKTextParams *text, unsigned char **data) {
@@ -2766,7 +3055,7 @@
 
 	ptp_pack_string(params, text->title, curdata, 0, &retlen); curdata+=2*retlen+1;htod16a(curdata,0);curdata+=2;
 	htod16a(curdata,0x10);curdata+=2;
-	
+
 	for (i=0;i<5;i++) {
 		ptp_pack_string(params, text->linei, curdata, 0, &retlen); curdata+=2*retlen+1;htod16a(curdata,0);curdata+=2;
 		htod16a(curdata,0x10);curdata+=2;
@@ -2950,10 +3239,14 @@
 		oif->AssociationType 		= dtoh16ap(params,data+curoffset+24);
 		oif->AssociationDesc 		= dtoh32ap(params,data+curoffset+26);
 		oif->SequenceNumber 		= dtoh32ap(params,data+curoffset+30);
-		oif->Filename 			= ptp_unpack_string(params, data, curoffset+34, datalen, &len);
+		if (!ptp_unpack_string(params, data, curoffset+34, datalen, &len, &oif->Filename))
+			goto tooshort;
 		if (curoffset+34+len*2+1 > datalen)
 			goto tooshort;
-		modify_date			= ptp_unpack_string(params, data, curoffset+len*2+1+34, datalen, &dlen);
+
+		if (!ptp_unpack_string(params, data, curoffset+len*2+1+34, datalen, &dlen, &modify_date))
+			goto tooshort;
+
 		oif->ModificationDate 		= ptp_unpack_PTPTIME(modify_date);
 		free(modify_date);
 		curoffset += 34+len*2+dlen*2+2;
@@ -3001,3 +3294,18 @@
 	fd->margin_right = dtoh32a(&dataoff+=4);
 	fd->margin_bot = dtoh32a(&dataoff+=4);
 }
+
+static inline int
+ptp_unpack_StreamInfo (PTPParams *params, unsigned char *data, PTPStreamInfo *si, unsigned int size) {
+	if (!data) return PTP_RC_GeneralError;
+	if (size < 36) return PTP_RC_GeneralError;
+
+	si->DatasetSize		= dtoh64ap(params,data+0);
+	si->TimeResolution	= dtoh64ap(params,data+8);
+	si->FrameHeaderSize	= dtoh32ap(params,data+16);
+	si->FrameMaxSize	= dtoh32ap(params,data+20);
+	si->PacketHeaderSize	= dtoh32ap(params,data+24);
+	si->PacketMaxSize	= dtoh32ap(params,data+28);
+	si->PacketAlignment	= dtoh32ap(params,data+32);
+	return PTP_RC_OK;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptp-private.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptp-private.h Changed

@@ -18,6 +18,9 @@
  * Boston, MA  02110-1301  USA
  */
 
+#ifndef CAMLIBS_PTP2_PTP_PRIVATE_H
+#define CAMLIBS_PTP2_PTP_PRIVATE_H
+
 /* ptp2 camlib private functions */
 #include <gphoto2/gphoto2-library.h>
 
@@ -34,7 +37,7 @@
 int camera_unprepare_capture (Camera *camera, GPContext *context);
 int camera_canon_eos_update_capture_target(Camera *camera, GPContext *context, int value);
 int have_prop(Camera *camera, uint16_t vendor, uint16_t prop);
-
+int camera_lookup_by_property(Camera *camera, PTPDevicePropDesc *dpd, char **name, char **content, GPContext *context);
 
 /* library.c */
 int translate_ptp_result (uint16_t result);
@@ -84,7 +87,7 @@
 	if (c_ptp_rep_ret != PTP_RC_OK) {\
 		const char* ptp_err_str = ptp_strerror(c_ptp_rep_ret, params->deviceinfo.VendorExtensionID);\
 		GP_LOG_E ("'%s' failed: '%s' (0x%04x)", #RESULT, ptp_err_str, c_ptp_rep_ret);\
-		gp_context_error (context, "%s", dgettext(GETTEXT_PACKAGE, ptp_err_str));\
+		gp_context_error (context, "%s", dgettext(GETTEXT_PACKAGE_LIBGPHOTO2, ptp_err_str));\
 		return translate_ptp_result (c_ptp_rep_ret);\
 	}\
 } while(0)
@@ -97,7 +100,7 @@
 		snprintf(fmt_str, sizeof(fmt_str), "%s%s%s", "'%s' failed: ", MSG, " (0x%04x: %s)");\
 		GP_LOG_E (fmt_str, #RESULT, ##__VA_ARGS__, c_ptp_rep_msg_ret, ptp_err_str);\
 		snprintf(fmt_str, sizeof(fmt_str), "%s%s", MSG, " (0x%04x: %s)");\
-		gp_context_error (context, fmt_str, ##__VA_ARGS__, c_ptp_rep_msg_ret, dgettext(GETTEXT_PACKAGE, ptp_err_str));\
+		gp_context_error (context, fmt_str, ##__VA_ARGS__, c_ptp_rep_msg_ret, dgettext(GETTEXT_PACKAGE_LIBGPHOTO2, ptp_err_str));\
 		return translate_ptp_result (c_ptp_rep_msg_ret);\
 	}\
 } while(0)
@@ -115,9 +118,42 @@
 	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_CANON) return 0;
 	if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_SetRemoteMode)) return 0;
 	if (!params->deviceinfo.Model) return 0;
-	return !strncmp(params->deviceinfo.Model, "Canon EOS M", strlen("Canon EOS M"));
+
+	/* classic EOS M */
+	if (!strncmp(params->deviceinfo.Model, "Canon EOS M", strlen("Canon EOS M")))
+		return 1;
+
+	/* We encountered newer Powershot SX models that seem to have EOS M like firmware, see https://github.com/gphoto/libgphoto2/issues/316 */
+	if (	!strncmp(params->deviceinfo.Model, "Canon PowerShot SX", strlen("Canon PowerShot SX"))	||
+		!strncmp(params->deviceinfo.Model, "Canon PowerShot G",  strlen("Canon PowerShot G"))	||
+		!strncmp(params->deviceinfo.Model, "Canon Digital IXUS", strlen("Canon Digital IXUS"))
+	)
+		return ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn);
+	return 0;
 }
 
+static inline int
+have_eos_prop(PTPParams *params, uint16_t vendor, uint16_t prop) {
+	unsigned int i;
+
+	/* The special Canon EOS property set gets special treatment. */
+	if ((params->deviceinfo.VendorExtensionID != PTP_VENDOR_CANON) || (vendor != PTP_VENDOR_CANON))
+		return 0;
+	for (i=0;i<params->nrofcanon_props;i++)
+		if (params->canon_propsi.proptype == prop)
+			return 1;
+	return 0;
+}
+
+static inline int
+have_sigma_prop(PTPParams *params, uint16_t vendor, uint16_t prop) {
+	/* The special Canon EOS property set gets special treatment. */
+	if ((params->deviceinfo.VendorExtensionID != PTP_VENDOR_GP_SIGMAFP) || (vendor != PTP_VENDOR_GP_SIGMAFP))
+		return 0;
+	if ((prop & 0xf000) == 0xd000)	/* we map it to vendor config space */
+		return 1;
+	return 0;
+}
 
 struct _CameraPrivateLibrary {
 	PTPParams params;
@@ -129,3 +165,5 @@
 	GPContext *context;
 };
 typedef struct _PTPData PTPData;
+
+#endif /* !defined(CAMLIBS_PTP2_PTP_PRIVATE_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptp.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptp.c Changed

@@ -1,7 +1,7 @@
 /* ptp.c
  *
  * Copyright (C) 2001-2004 Mariusz Woloszyn <emsi@ipartners.pl>
- * Copyright (C) 2003-2018 Marcus Meissner <marcus@jet.franken.de>
+ * Copyright (C) 2003-2019 Marcus Meissner <marcus@jet.franken.de>
  * Copyright (C) 2006-2008 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2007 Tero Saarni <tero.saarni@gmail.com>
  * Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
@@ -30,14 +30,19 @@
 # include <libxml/parser.h>
 #endif
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
+#include "libgphoto2_port/compiletime-assert.h"
+
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
@@ -59,27 +64,74 @@
 
 #define CHECK_PTP_RC(RESULT) do { uint16_t r = (RESULT); if (r != PTP_RC_OK) return r; } while(0)
 
-static inline void
-ptp_init_container(PTPContainer* ptp, uint16_t code, int n_param, ...)
+
+/* Initialize a PTPContainer struct. For the usage, see the PTP_CNT_INIT() macro below. */
+static inline
+void ptp_init_container(PTPContainer* ptp, int n_param, ...)
 {
 	va_list	args;
 	int	i;
 
 	memset(ptp, 0, sizeof(*ptp));
-	ptp->Code = code;
+	va_start(args, n_param);
+	/* verify the int value cannot have cut off the uint16_t value */
+	COMPILETIME_ASSERT(INT_MAX >= UINT16_MAX);
+	/* note that uint16_t can be promoted to an int, so va_arg
+	 * needs to be called with the int type */
+	ptp->Code   = (uint16_t)(va_arg(args, int));
 	ptp->Nparam = n_param;
 
-	va_start(args, n_param);
-	for (i=0; i<n_param; ++i)
+	/* Make certain the memory layout of PTPContainer matches what
+	 * the for loop code below expects.
+	 */
+	COMPILETIME_ASSERT((offsetof(PTPContainer, Param1) + sizeof(uint32_t))
+			   == offsetof(PTPContainer, Param2));
+	COMPILETIME_ASSERT((offsetof(PTPContainer, Param2) + sizeof(uint32_t))
+			   == offsetof(PTPContainer, Param3));
+	COMPILETIME_ASSERT((offsetof(PTPContainer, Param3) + sizeof(uint32_t))
+			   == offsetof(PTPContainer, Param4));
+	COMPILETIME_ASSERT((offsetof(PTPContainer, Param4) + sizeof(uint32_t))
+			   == offsetof(PTPContainer, Param5));
+
+	COMPILETIME_ASSERT((offsetof(PTPContainer, Param1) + 5*sizeof(uint32_t))
+			   == offsetof(PTPContainer, Nparam));
+
+	/* Silently ignore parameters past Param5 */
+	for (i=0; (i<n_param) && (i<5); ++i) {
 		(&ptp->Param1)i = va_arg(args, uint32_t);
+	}
 	va_end(args);
 }
 
-#define NARGS_SEQ(_1,_2,_3,_4,_5,_6,_7,_8,N,...) N
-#define NARGS(...) NARGS_SEQ(-1, ##__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1, 0)
 
-#define PTP_CNT_INIT(PTP, CODE, ...) \
-	ptp_init_container(&PTP, CODE, NARGS(__VA_ARGS__), ##__VA_ARGS__)
+#define N_PARAM_SEQ(DUMMY,				\
+		    Pa, Pb, Pc, Pd, Pe,			\
+		    P0, P1, P2, P3, P4, P5,		\
+		    N, ...)				\
+	N
+
+
+#define N_PARAM(...)				\
+	N_PARAM_SEQ(__VA_ARGS__,		\
+		    "a", "b", "c", "d", "e",	\
+		    5U, 4U, 3U, 2U, 1U, 0U, NULL)
+
+
+/* Usage: PTP_CNT_INIT(PTP, CODE, PARAM...)
+ *
+ * Together with ptp_init_container(), this basically is a shortcut to
+ * initializing a PTPContainer struct, but automatically counts the
+ * number of PTPContainer parameters (members Param1 through Param5)
+ * set.
+ *
+ * The valid number of parameters is 0 through 5.
+ */
+#define PTP_CNT_INIT(PTP, ...)						\
+	do {								\
+		const int n_param = N_PARAM(-666, __VA_ARGS__);		\
+		ptp_init_container(&PTP, n_param, __VA_ARGS__);		\
+	} while (0)
+
 
 static uint16_t ptp_exit_recv_memory_handler (PTPDataHandler*,unsigned char**,unsigned long*);
 static uint16_t ptp_init_recv_memory_handler(PTPDataHandler*);
@@ -88,7 +140,7 @@
 
 void
 ptp_debug (PTPParams *params, const char *format, ...)
-{  
+{
         va_list args;
 
         va_start (args, format);
@@ -101,11 +153,11 @@
 		fflush (stderr);
 	}
         va_end (args);
-}  
+}
 
 void
 ptp_error (PTPParams *params, const char *format, ...)
-{  
+{
         va_list args;
 
         va_start (args, format);
@@ -139,15 +191,15 @@
  * filled in (i.e. operation code and parameters). It's up to caller to do
  * so.
  * The flags decide thether the transaction has a data phase and what is its
- * direction (send or receive). 
+ * direction (send or receive).
  * If transaction is sending data the sendlen should contain its length in
  * bytes, otherwise it's ignored.
  * The data should contain an address of a pointer to data going to be sent
  * or is filled with such a pointer address if data are received depending
- * od dataphase direction (send or received) or is beeing ignored (no
+ * od dataphase direction (send or received) or is being ignored (no
  * dataphase).
  * The memory for a pointer should be preserved by the caller, if data are
- * beeing retreived the appropriate amount of memory is beeing allocated
+ * being retreived the appropriate amount of memory is being allocated
  * (the caller should handle that!).
  *
  * Return values: Some PTP_RC_* code.
@@ -155,14 +207,14 @@
  * all fields filled in.
  **/
 uint16_t
-ptp_transaction_new (PTPParams* params, PTPContainer* ptp, 
+ptp_transaction_new (PTPParams* params, PTPContainer* ptp,
 		     uint16_t flags, uint64_t sendlen,
 		     PTPDataHandler *handler
 ) {
 	int 		tries;
 	uint16_t	cmd;
 
-	if ((params==NULL) || (ptp==NULL)) 
+	if ((params==NULL) || (ptp==NULL))
 		return PTP_ERROR_BADPARAM;
 
 	cmd = ptp->Code;
@@ -356,7 +408,7 @@
 fd_putfunc(PTPParams* params, void* private,
 	       unsigned long sendlen, unsigned char *data
 ) {
-	ssize_t		written;
+	ssize_t	written;
 	PTPFDHandlerPrivate* priv = (PTPFDHandlerPrivate*)private;
 
 	written = write (priv->fd, data, sendlen);
@@ -397,7 +449,7 @@
  * i.e. it is not necessary to initialize *data or *recvlen beforehand.
  */
 uint16_t
-ptp_transaction (PTPParams* params, PTPContainer* ptp, 
+ptp_transaction (PTPParams* params, PTPContainer* ptp,
 		uint16_t flags, uint64_t sendlen,
 		unsigned char **data, unsigned int *recvlen
 ) {
@@ -495,6 +547,57 @@
 		return PTP_ERROR_IO;
 }
 
+uint16_t
+ptp_getstreaminfo (PTPParams *params, uint32_t streamid, PTPStreamInfo *si)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int	size;
+	int		ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_GetStreamInfo, streamid);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	ret = ptp_unpack_StreamInfo(params, data, si, size);
+	free (data);
+	if (ret)
+		return PTP_RC_OK;
+	else
+		return PTP_ERROR_IO;
+}
+
+uint16_t
+ptp_getstream (PTPParams *params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer	ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_GetStream);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size));
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_leica_getstreamdata (PTPParams *params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer	ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_LEICA_LEGetStreamData);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size));
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_canon_eos_905f (PTPParams* params, uint32_t x)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int	size;
+
+	PTP_CNT_INIT(ptp, 0x905f, x);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	free (data);
+	return PTP_RC_OK;
+}
+
 #ifdef HAVE_LIBXML2
 static int
 traverse_tree (PTPParams *params, int depth, xmlNodePtr node)
@@ -537,7 +640,7 @@
 		next = xmlNextElementSibling (next);
 	}
 	di->OperationsSupported_len = cnt;
-	di->OperationsSupported = malloc (cnt*sizeof(di->OperationsSupported0));
+	di->OperationsSupported = calloc (cnt,sizeof(di->OperationsSupported0));
 	cnt = 0;
 	next = xmlFirstElementChild (node);
 	while (next) {
@@ -610,7 +713,7 @@
 		if (!sscanf(str,"%02x", &x)) {
 			ptp_debug( params, "could not parse int8 %s", str);
 			return PTP_RC_GeneralError;
-		} 
+		}
 		ptp_debug( params, "\t%d", x);
 		propval->i8 = x;
 		break;
@@ -630,8 +733,8 @@
 					cx = ((xc>>8) & 0xff) | ((xc & 0xff) << 8);
 					xstri = cx;
 				}
-				xstrlen = 0;
 			}
+			xstrlen = '\0';
 			ptp_debug( params, "\t%s", xstr);
 			propval->str = xstr;
 			break;
@@ -706,7 +809,7 @@
 				n++;
 			} while (s);
 			dpd->FORM.Enum.NumberOfValues = n;
-			dpd->FORM.Enum.SupportedValue = malloc (n * sizeof(PTPPropertyValue));
+			dpd->FORM.Enum.SupportedValue = calloc (n , sizeof(PTPPropertyValue));
 			s = (char*)xmlNodeGetContent (next);
 			i = 0;
 			do {
@@ -754,7 +857,7 @@
 	}
 
 	di->DevicePropertiesSupported_len = cnt;
-	di->DevicePropertiesSupported = malloc (cnt*sizeof(di->DevicePropertiesSupported0));
+	di->DevicePropertiesSupported = calloc (cnt,sizeof(di->DevicePropertiesSupported0));
 	cnt = 0;
 	next = xmlFirstElementChild (node);
 	while (next) {
@@ -801,7 +904,7 @@
 		next = xmlNextElementSibling (next);
 	}
 	di->EventsSupported_len = cnt;
-	di->EventsSupported = malloc (cnt*sizeof(di->EventsSupported0));
+	di->EventsSupported = calloc (cnt,sizeof(di->EventsSupported0));
 	cnt = 0;
 	next = xmlFirstElementChild (node);
 	while (next) {
@@ -843,7 +946,865 @@
 	/*traverse_tree (0, node);*/
 	return PTP_RC_OK;
 }
+#endif
+
+uint16_t
+ptp_olympus_omd_capture (PTPParams* params)
+{
+	PTPContainer	ptp;
+	uint16_t	ret;
+	unsigned int	size = 0;
+	unsigned char	*buffer = NULL;
+
+/* these two trigger the capture ... one might be "shutter down", the other "shutter up"? */
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_OMD_Capture, 0x3); // initiate capture
+	ret = ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_OMD_Capture, 0x6); // initiate capture
+	ret = ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
+
+	usleep(500);
+
+/* this only fetches changed props */
+	PTP_CNT_INIT(ptp, 0x9486); /* query changed properties */
+	ret =  ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &buffer, &size);
+	free (buffer);
+	return ret;
+}
+/**
+ * ptp_olympus_bulbstart:
+ * params:	PTPParams*
+ *
+ * Starts Olympus Bulb capture.
+ *
+ * Return values: Some PTP_RC_* code.
+ **/
+uint16_t
+ptp_olympus_omd_bulbstart (PTPParams* params)
+{
+	PTPContainer	ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_OMD_Capture, 0x3); // initiate capture
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL));
+	if ((ptp.Nparam >= 1) && ((ptp.Param1 & 0x7000) == 0x2000))
+		return ptp.Param1;
+	return PTP_RC_OK;
+}
+
+
+/**
+ * ptp_olympus_bulbend:
+ * params:	PTPParams*
+ *
+ * Stops Olympus Bulb capture.
+ *
+ * Return values: Some PTP_RC_* code.
+ **/
+uint16_t
+ptp_olympus_omd_bulbend (PTPParams* params)
+{
+	PTPContainer	ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_OMD_Capture, 0x6); // initiate capture
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL));
+	if ((ptp.Nparam >= 1) && ((ptp.Param1 & 0x7000) == 0x2000))
+		return ptp.Param1;
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_panasonic_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_LiveviewImage);
+        return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCamViewFrame);
+        return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+static uint16_t
+ptp_sigma_fp_parse_ifdlist (PTPParams* params, unsigned char *data, unsigned int size)
+{
+	uint32_t	datalen, entrycount, offset;
+	unsigned int	i;
+
+	if (size < 5) {
+		ptp_debug (params, "size %d is less than 5", size);
+		return PTP_RC_GeneralError;
+	}
+	datalen = dtoh32a(data);
+	if (datalen != size-4-1) {
+		ptp_debug (params, "size %d is not specified size %d", size-4-1, datalen);
+		return PTP_RC_GeneralError;
+	}
+
+	entrycount = dtoh32a(data+4);
+	offset = 8;
+	if (8 + 12*entrycount > size) {
+		ptp_debug (params, "count %d entries do not fit size %d", entrycount, size);
+		return PTP_RC_GeneralError;
+	}
+	for (i = 0; i<entrycount; i++) {
+		uint16_t tag = dtoh16a(data+offset+i*12), type = dtoh16a(data+offset+i*12+2);
+		uint32_t count = dtoh32a(data+offset+i*12+4), value = dtoh32a(data+offset+i*12+8);
+		/* word tag, word type, dword elements, value */
+		ptp_debug (params, "entry %d: tag=0x%04x, type=0x%04x, elements=%d, value=0x%08x", i, tag, type, count, value);
+		switch (dtoh16a(data+offset+i*12+2)) {
+		case 0x2: /* ASCII */
+			if (count > 4) {
+				ptp_debug (params, "ascii: %s", &datadtoh32a(data+offset+i*12+8));
+			} else {
+				ptp_debug (params, "ascii: %s", data+offset+i*12+8);
+			}
+			break;
+		case 0xb: /* 32bit ieee float */
+			ptp_debug (params, "float: %f", *(float*)(data+offset+i*12+8));
+			break;
+		}
+	}
+	return PTP_RC_OK;
+#if 0
+0000  5b 00 00 00 02 00 35 90-02 00 00 00
+
+4a 00 00 00  .....5.....J...
+0010  04 00 00 00 01 00 02 00-09 00 00 00 3c 00 00 00  ............<...
+0020  02 00 02 00 09 00 00 00-45 00 00 00 03 00 02 00  ........E.......
+0030  04 00 00 00 56 38 34 00-05 00 0b 00 01 00 00 00  ....V84.........
+0040  52 b8 9e 3f 00 00 00 00-53 49 47 4d 41 20 66 70  R..?....SIGMA fp
+0050  00 39 31 34 30 33 37 32-37 00 b3                 .91403727..
+
+#endif
+}
+
+uint16_t
+ptp_sigma_fp_9035 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCameraInfo);
+	ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+	if (ret != PTP_RC_OK) return ret;
+	ptp_sigma_fp_parse_ifdlist (params, *data, *size);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sigma_fp_getcamcansetinfo5 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCamCanSetInfo5);
+	ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+	if (ret != PTP_RC_OK) return ret;
+	ptp_sigma_fp_parse_ifdlist (params, *data, *size);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sigma_fp_getcamdatagroupfocus (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCamDataGroupFocus);
+	ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+	if (ret != PTP_RC_OK) return ret;
+	ptp_sigma_fp_parse_ifdlist (params, *data, *size);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sigma_fp_getcamdatagroupmovie (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCamDataGroupMovie);
+	ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+	if (ret != PTP_RC_OK) return ret;
+	ptp_sigma_fp_parse_ifdlist (params, *data, *size);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup1 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup1);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup2 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup2);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup3 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup3);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup4 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup4);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup5 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup5);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getdatagroup6 (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetDataGroup6);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_setdatagroup1 (PTPParams* params, unsigned char *data, unsigned int size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_SetDataGroup1);
+	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, 0);
+}
+
+
+uint16_t
+ptp_sigma_fp_getcapturestatus (PTPParams* params, unsigned int p1, SIGMAFP_CaptureStatus*status)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+	unsigned char	*data = NULL;
+	unsigned int	size = 0;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCaptureStatus, p1);
+        ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size);
+	if (ret != PTP_RC_OK) return ret;
+
+	if (size < 7) {
+		ptp_debug (params, "size %d is smaller than expected 7", size);
+		return PTP_RC_GeneralError;
+	}
+	if (data0 != 6) {
+		ptp_debug (params, "byte size %d is smaller than expected 6", data0);
+		return PTP_RC_GeneralError;
+	}
+	status->imageid		= data1;
+	status->imagedbhead	= data2;
+	status->imagedbtail	= data3;
+	status->status		= dtoh16a(&data4);
+	status->destination	= data5;
+	/* data6 is the checksum (sum of bytes 0->5 */
+	ptp_debug (params, "ptp_sigma_fp_getcapturestatus: imageid 0x%02x, imagedbhead 0x%02x, imagedbtail 0x%02x, status 0x%04x, dest 0x%02x", 
+		status->imageid, status->imagedbhead, status->imagedbtail, status->status, status->destination
+	);
+	return ret;
+}
+
+uint16_t
+ptp_sigma_fp_getcamstatus2 (PTPParams* params, uint32_t canset, uint32_t datagroup, uint32_t other, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetCamStatus2, canset, datagroup, other);
+        return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_getpictfileinfo2 (PTPParams* params, SIGMAFP_PictFileInfo2Ex *pictinfo)
+{
+	PTPContainer    ptp;
+	uint16_t	ret;
+	unsigned int	off;
+	char		*data = NULL;
+	unsigned int	size = 0;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetPictFileInfo2);
+        ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, (unsigned char**)&data, &size);
+	if (ret != PTP_RC_OK) return ret;
+
+	if (size < 60) {
+		ptp_debug (params, "size %d is smaller than expected 60", size);
+		return PTP_RC_GeneralError;
+	}
+	if (dtoh32a((unsigned char*)data) != 56) {
+		ptp_debug (params, "dword size %d is smaller than expected 56", dtoh32a((unsigned char*)data));
+		return PTP_RC_GeneralError;
+	}
+	memset(pictinfo, 0, sizeof(*pictinfo));
+	pictinfo->fileaddress = dtoh32a((unsigned char*)(&data12));	/* perhaps ? */
+	pictinfo->filesize = dtoh32a((unsigned char*)(&data16));
+	strncpy(pictinfo->fileext, data+28, 4);
+	pictinfo->width = dtoh16a((unsigned char*)(&data32));
+	pictinfo->height = dtoh16a((unsigned char*)(&data34));
+	off = dtoh32a((unsigned char*)(&data20));
+	if (off > size) {
+		ptp_debug (params, "off %d is larger than size %d", off, size);
+		return PTP_RC_GeneralError;
+	}
+	strncpy(pictinfo->path, data+off, 9);
+	off = dtoh32a((unsigned char*)(&data24));
+	if (off > size) {
+		ptp_debug (params, "off %d is larger than size %d", off, size);
+		return PTP_RC_GeneralError;
+	}
+	strncpy(pictinfo->name, data+off, 9);
+
+#if 0
+uint16_t        pictureformat;	/* ? */
+char            fileext4;	/* 28,29,30,31 */
+uint16_t        width;		/* 32, 33 */
+uint16_t        height;		/* 34, 35 */
+char            path128;	/* offset 20,21,22,23 => 36 */
+char            name128;	/* offset 24,25,26,27 => 45 */
+uint32_t        filesize;	/* 16,17,18,19 */
+uint32_t        fileaddress;	/* 12,13,14,15 */
+
+
+38 00 00 00
+
+01 00 00 00 0c 00 00 00 80 05 00 57 49 24 63 00  ...........WI$c.
+24 00 00 00 2d 00 00 00 4a 50 47 00 70 17 a0 0f  $...-...JPG.p...
+31 30 30 53 49 47 4d 41 00 53 44 49 4d 30 30 30  100SIGMA.SDIM000
+31 2e 4a 50 47 00 00 00                          1.JPG...
+#endif
+	free (data);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sigma_fp_getbigpartialpictfile (PTPParams* params, unsigned int p1, unsigned int off, unsigned int insize, unsigned char **data, unsigned int *size)
+{
+	PTPContainer    ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_GetBigPartialPictFile, p1, off, insize);
+        return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_sigma_fp_snap (PTPParams* params, unsigned int mode, unsigned int amount)
+{
+	PTPContainer    ptp;
+	unsigned char	*data = malloc(4);
+	uint16_t	ret;
+
+	data0 = 0x02;			/* num data bytes */
+	data1 = mode;
+	data2 = amount;
+	data3 = 0x02+mode+amount;	/* checksum, just add everything */
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_Snap);
+        ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, 4, (unsigned char**)&data, 0);
+	free (data);
+	return ret;
+}
+
+uint16_t
+ptp_sigma_fp_clearimagedbsingle (PTPParams* params, uint32_t id)
+{
+	PTPContainer    ptp;
+	unsigned char	*data = calloc(8,1);
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SIGMA_FP_ClearImageDBSingle, id);
+        ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, 8, (unsigned char**)&data, 0);
+	free (data);
+	return ret;
+}
+
+uint16_t
+ptp_olympus_init_pc_mode (PTPParams* params)
+{
+	uint16_t		ret;
+	PTPPropertyValue	propval;
+	PTPContainer    	event;
+	int			i;
+
+	ptp_debug (params,"PTP: (Olympus Init) switching to PC mode...");
+
+	propval.u16 = 1;
+	ret = ptp_setdevicepropvalue (params, 0xD052, &propval, PTP_DTC_UINT16);
+	usleep(100000);
+
+	for(i = 0; i < 2; i++) {
+		ptp_debug (params,"PTP: (Olympus Init) checking events...");
+		/* Just busy loop until the camera is ready again. */
+		ptp_check_event (params);
+		if (ptp_get_one_event(params, &event)) break;
+		usleep(100000);
+	}
+
+/*
+ * 9489 code: sends a list of PTP device properties supported apparently? on E-M1.
+ * F4 00 00 00	count
+02 D0 03 D0 04 D0 05 D0 06 D0 07 D0 08 D0 09 D0 0C D0 0D D0 0E D0 0F D0 10 D0 11 D0 13 D0 14 D0 18 D0 1A D0 1B D0 1C D0 1D D0 1E D0 1F D0 20 D0 21 D0 22 D0 23 D0 24 D0 25 D0 26 D0 27 D0 28 D0 29 D0 2A D0 2B D0 2C D0 2D D0 2E D0 2F D0 30 D0 31 D0 32 D0 33 D0 34 D0 35 D0 36 D0 37 D0 38 D0 39 D0 3A D0 3B D0 3C D0 3D D0 3E D0 3F D0 40 D0 41 D0 42 D0 43 D0 44 D0 45 D0 46 D0 47 D0 48 D0 49 D0 4A D0 4B D0 4C D0 4D D0 4E D0 4F D0 50 D0 51 D0 52 D0 58 D0 59 D0 5F D0 60 D0 61 D0 62 D0 64 D0 65 D0 66 D0 68 D0 69 D0 70 D0 73 D0 67 D0 5A D0 5B D0 63 D0 6A D0 6B D0 6C D0 71 D0 72 D0 7A D0 7B D0 7C D0 7D D0 7F D0 80 D0 81 D0 82 D0 86 D0 87 D0 8B D0 8C D0 8E D0 8F D0 97 D0 9F D0 C4 D0 C5 D0 A2 D0 A3 D0 A4 D0 A6 D0 A7 D0 A8 D0 A9 D0 AA D0 AB D0 AC D0 AD D0 AE D0 B2 D0 B3 D0 B4 D0 B5 D0 B6 D0 B7 D0 B8 D0 B9 D0 BA D0 BC D0 BD D0 BE D0 BF D0 C0 D0 C6 D0 C7 D0 C8 D0 C9 D0 CB D0 CC D0 CD D0 CE D0 CF D0 D0 D0 D1 D0 D2 D0 D3 D0 D4 D0 D5 D0 D6 D0 D7 D0 D8 D0 D9 D0 DA D0 DB D0 DC D0 DD D0 DE D0 E2 D0 E3 D0 E4 D0 E5 D0 E6 D0 E7 D0 E8 D0 E9 D0 EA D0 EC D0 EF D0 F0 D0 F1 D0 F2 D0 F3 D0 F4 D0 F5 D0 F6 D0 F7 D0 F8 D0 F9 D0 FA D0 FB D0 FC D0 FD D0 FE D0 FF D0 00 D1 01 D1 02 D1 03 D1 04 D1 05 D1 06 D1 07 D1 08 D1 09 D1 0A D1 0B D1 0C D1 0D D1 0E D1 0F D1 10 D1 11 D1 12 D1 13 D1 14 D1 15 D1 16 D1 17 D1 18 D1 19 D1 1A D1 1B D1 1C D1 1D D1 1E D1 1F D1 20 D1 51 D1 52 D1 5A D1 24 D1 25 D1 26 D1 27 D1 28 D1 2D D1 2E D1 2F D1 30 D1 31 D1 34 D1 35 D1 36 D1 37 D1 38 D1 39 D1 3A D1
+ *
+ * 9486: queries something. gets 00 00 00 00 ... or list of devicepropdesc in standard ptp propdesc format.
+ * could be some form of "properties changed" query perhaps? (32bit count in front)
+ * might only monitor/return properties set by 9489?
+ *
+ * 948a: seems also be some kind of polling function, returns 32bit 0 if nothing is there. similar to above?
+ *       returns properties sent by 94b8.
+ *
+ * 948b: also sends a list of ptp devprops:
+ * 11 00 00 00 53 D0 54 D0 55 D0 56 D0 57 D0 6D D0 5C D0 5D D0 5E D0 74 D0 75 D0 83 D0 84 D0 85 D0 ED D0 79 D0 E1 D0
+ * Events: c008: 21 D1 00 00 0F 00 00 00 01 00 00 00
+ */
+	//ptp_debug (params,"PTP: (Olympus Init) getting response...");
+	//gp_port_set_timeout (camera->port, timeout);
+	//ret=ptp_transaction(params, &ptp, PTP_DP_RESPONSEONLY, size, &data, NULL);
+	//if(data) free(data);
+	return ret;
+}
+
+uint16_t
+ptp_olympus_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer	ptp;
+	uint32_t 	param1 = 1;
+
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_GetLiveViewImage, param1);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_olympus_sdram_image (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+	PTPContainer	ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_OLYMPUS_OMD_GetImage);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
+uint16_t
+ptp_panasonic_9401 (PTPParams* params, uint32_t param1)
+{
+        PTPContainer    ptp;
+	uint16_t	ret;
+	unsigned int	*size = 0;
+	unsigned char   *data = NULL;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_9401, param1);
+	ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, size);
+	free(data);
+	return ret;
+}
+
+/* liveview format query
+ * 0d800012 - get imageformats
+ * 0d800011 - get current imageformat ?
+ */
+uint16_t
+ptp_panasonic_9414_0d800012 (PTPParams* params, PanasonicLiveViewSize **liveviewsizes, unsigned int *nrofliveviewsizes)
+{
+        PTPContainer    ptp;
+	unsigned int	i;
+	unsigned int	size = 0;
+	unsigned char   *data = NULL;
+	uint32_t	blobsize;
+	uint16_t	count;
+	uint16_t	structsize;
+
+	*nrofliveviewsizes = 0;
+	*liveviewsizes = NULL;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_GetLiveViewParameters, 0x0d800012);
+	CHECK_PTP_RC (ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+/* return data with the GC9 is:
+
+12 00 80 0d
+1c 00 00 00
+03 00           count
+08 00           structsize
+e0 01 80 02 20 00 1e 00
+d0 02 c0 03 5e 01 1e 00
+c0 03 00 05 bc 02 1e 00
+
+ */
+	if (size < 8) return PTP_RC_GeneralError;
+
+	blobsize = dtoh32a(data+4);
+	if (size - 8 < blobsize) {
+		ptp_debug (params, "blobsize expected %d, but size is only %d", blobsize, size - 8);
+		return PTP_RC_GeneralError;
+	}
+	if (blobsize < 4) {
+		ptp_debug (params, "blobsize expected at least 4, but is only %d", blobsize);
+		return PTP_RC_GeneralError;
+	}
+	count		= dtoh16a (data+8);
+	structsize	= dtoh16a (data+10);
+	if (structsize != 8) {
+		ptp_debug (params, "structsize expected 8, but is %d", structsize);
+		return PTP_RC_GeneralError;
+	}
+	if (count * structsize > blobsize) {
+		ptp_debug (params, "%d * %d = %d is larger than %d", count, structsize, count * structsize, blobsize);
+		return PTP_RC_GeneralError;
+	}
+
+	*liveviewsizes = calloc (sizeof(PanasonicLiveViewSize),count);
+	for (i = 0;i < count; i++) {
+		(*liveviewsizes)i.height	= dtoh16a (data + 12 + i*structsize);
+		(*liveviewsizes)i.width	= dtoh16a (data + 12 + 2 + i*structsize);
+		(*liveviewsizes)i.x		= dtoh16a (data + 12 + 4 + i*structsize);
+		(*liveviewsizes)i.freq	= dtoh16a (data + 12 + 6 + i*structsize);
+	}
+	*nrofliveviewsizes = count;
+	free(data);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_panasonic_9414_0d800011 (PTPParams* params, PanasonicLiveViewSize *liveviewsize)
+{
+        PTPContainer    ptp;
+	unsigned int	size = 0;
+	unsigned char   *data = NULL;
+	uint32_t	blobsize;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_GetLiveViewParameters, 0x0d800011);
+	CHECK_PTP_RC (ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+/* data is:
+
+11 00 80 0d
+08 00 00 00
+
+e0 01 80 02
+00 00
+1e 00
+
+ */
+	if (size < 8) return PTP_RC_GeneralError;
+
+	blobsize = dtoh32a(data+4);
+	if (size - 8 < blobsize) {
+		ptp_debug (params, "blobsize expected %d, but size is only %d", blobsize, size - 8);
+		return PTP_RC_GeneralError;
+	}
+	if (blobsize < 8) {
+		ptp_debug (params, "blobsize expected at least 8, but is only %d", blobsize);
+		return PTP_RC_GeneralError;
+	}
+	liveviewsize->height	= dtoh16a (data + 8 + 0);
+	liveviewsize->width	= dtoh16a (data + 8 + 2);
+	liveviewsize->x		= dtoh16a (data + 8 + 4);
+	liveviewsize->freq	= dtoh16a (data + 8 + 6);
+	free(data);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_panasonic_9415 (PTPParams* params, PanasonicLiveViewSize *liveviewsize)
+{
+        PTPContainer    ptp;
+	unsigned char   *data;
+	uint16_t	ret;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_SetLiveViewParameters, 0x0d800011);
+
+	data = malloc(16);
+	htod32a(data+0 , 0x0d800011);
+	htod32a(data+4 , 8);
+	htod16a(data+8 , liveviewsize->height);
+	htod16a(data+10, liveviewsize->width);
+	htod16a(data+12, liveviewsize->x);
+	htod16a(data+14, liveviewsize->freq);
+
+	ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, 16, (unsigned char**)&data, 0);
+	free (data);
+	return ret;
+}
+
+uint16_t
+ptp_panasonic_setdeviceproperty (PTPParams* params, uint32_t propcode,
+			unsigned char *value, uint16_t valuesize)
+{
+	PTPContainer	ptp;
+	uint16_t	ret;
+	unsigned char	*data;
+	uint32_t 	size = 4 + 4 + valuesize;
+
+	data = calloc(size, sizeof(unsigned char));
+
+	htod32a(data, propcode); /* memcpy(data, &propcode, 4); */
+	htod16a(&data4, valuesize); /* memcpy(&data4, &valuesize, 2); */
+
+	memcpy(&data8, value, valuesize);	/* perhaps check if one of the DPV packagers work? */
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_SetProperty, propcode);
+	ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
+	free(data);
+	return ret;
+}
+
+uint16_t
+ptp_panasonic_getdevicepropertysize (PTPParams *params, uint32_t propcode)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int	size = 0;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_9107, propcode, 0, 0);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	if (!data) return PTP_RC_GeneralError;
+
+	if (size < 4) return PTP_RC_GeneralError;
+	uint32_t headerLength 		= dtoh32a( (data) + 4 );
+	if (size < 4 + 6 * 4) return PTP_RC_GeneralError;
+	uint32_t propertyCode 		= dtoh32a( (data) + 4 + 6 * 4 );
+	if (size < headerLength * 4 + 2 * 4) return PTP_RC_GeneralError;
+
+	ptp_debug(params, "header: %u, code: %u\n", headerLength, propertyCode);
+
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_panasonic_manualfocusdrive (PTPParams* params, uint16_t mode)
+{
+	PTPContainer   	ptp;
+	unsigned char  	data10;
+	unsigned char	*xdata = data;
+	uint32_t 	propcode = 0x03010011;
+	uint32_t 	type = 2;
+
+	htod32a(data, propcode);	/* memcpy(data, &propcode, 4); */
+	htod32a(&data4, type);	/* memcpy(&data4, &type, 4); */
+	htod16a(&data8, mode);	/* memcpy(&data8, &mode, 2); */
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_ManualFocusDrive, propcode);
+	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, sizeof(data), &xdata, NULL);
+}
+
+uint16_t
+ptp_panasonic_recordmode (PTPParams* params, uint16_t mode)
+{
+    PTPContainer   	ptp;
+    unsigned char  	data10;
+    unsigned char	*xdata = data;
+    uint32_t 	propcode = 0x06000011;
+    uint32_t 	type = 2;
+
+    htod32a(data, propcode);	/* memcpy(data, &propcode, 4); */
+    htod32a(&data4, type);	/* memcpy(&data4, &type, 4); */
+    htod16a(&data8, mode);	/* memcpy(&data8, &mode, 2); */
+
+    PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_9409, propcode);
+    return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, sizeof(data), &xdata, NULL);
+}
+
+uint16_t
+ptp_panasonic_startrecording (PTPParams* params)
+{
+    PTPContainer   	ptp;
+    uint32_t 	propcode = 0x07000011;
+
+    PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_MovieRecControl, propcode);
+    return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
+}
+
+uint16_t
+ptp_panasonic_stoprecording (PTPParams* params)
+{
+    PTPContainer   	ptp;
+    uint32_t 	propcode = 0x07000012;
+
+    PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_MovieRecControl, propcode);
+    return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
+}
+
+uint16_t
+ptp_panasonic_getcapturetarget (PTPParams* params, uint16_t *target)
+{
+	PTPContainer    ptp;
+	unsigned char	*data;
+	unsigned int	size;
+
+	*target = 0;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_GetCaptureTarget, 0x08000090);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	if (!data) return PTP_RC_GeneralError;
+	if (size < 10) return PTP_RC_GeneralError;
+	if (dtoh32a(data) != 0x08000091) return PTP_RC_GeneralError;
+	if (dtoh32a(data+4) != 2) return PTP_RC_GeneralError;
+	*target = dtoh16a(data+8);
+	free (data);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_panasonic_setcapturetarget (PTPParams* params, uint16_t mode) // mode == 1 == RAM, mode == 0 == SD, 2 = BOTH
+{
+	PTPContainer    ptp;
+	unsigned char	data10;
+	unsigned char	*xdata = (unsigned char*)data;
+
+	htod32a(data, 	  0x08000091);	/* capturetarget */
+	htod32a(&data4, 2); 		/* size */
+	htod16a(&data8, mode);
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_SetCaptureTarget, 0);
+	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, sizeof(data), &xdata, NULL);
+}
+
+uint16_t
+ptp_panasonic_getdevicepropertydesc (PTPParams *params, uint32_t propcode, uint16_t valuesize, uint32_t *currentValue, uint32_t **propertyValueList, uint32_t *propertyValueListLength)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int 	size = 0;
+	uint16_t	ret = PTP_RC_OK;
+	uint32_t	headerLength;
+	uint32_t	propertyCode;
+	unsigned int	off = 0;
+	unsigned int	i;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_ListProperty, propcode, 0, 0);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	if (!data) return PTP_RC_GeneralError;
+	if (size < 8)
+		return PTP_RC_GeneralError;
+
+	ptp_debug (params, "ptp_panasonic_getdevicepropertydesc 0x%08x", propcode);
+	while (off < size) {
+		if (off >= size-8) break;
+		ptp_debug (params, "propcode 0x%08lx, size %d", dtoh32a(data+off), dtoh32a(data+off+4));
+		off += dtoh32a(data+off+4)+8;
+	}
+
+	headerLength = dtoh32a( (data) + 4 );
+	if (size < 4 + 6 * 4)
+		return PTP_RC_GeneralError;
+
+	propertyCode = dtoh32a( (data) + 4 + 6 * 4 );
+	if (size < headerLength * 4 + 2 * 4)
+		return PTP_RC_GeneralError;
+
+	if(valuesize == 2) {
+		*currentValue 		= (uint32_t) dtoh16a( (data) + headerLength * 4 + 2 * 4 );
+	} else if(valuesize == 4) {
+		*currentValue 		= dtoh32a( (data) + headerLength * 4 + 2 * 4 );
+	} else {
+		ptp_debug (params, "unexpected valuesize %d", valuesize);
+		return PTP_RC_GeneralError;
+	}
+	/* Marcus: where is 4*headerLenght coming from ? */
+	if (size < headerLength * 4 + 2 * 4 + valuesize) return PTP_RC_GeneralError;
+	*propertyValueListLength 		= dtoh32a( (data) + headerLength * 4 + 2 * 4 + valuesize);
+
+	ptp_debug(params, "header: %u, code: 0x%x, value: %u, count: %u", headerLength, propertyCode, *currentValue, *propertyValueListLength);
+
+	if (size < headerLength * 4 + 3 * 4 + valuesize + (*propertyValueListLength) * valuesize) {
+		ptp_debug (params, "size %d vs expected size %d", size, headerLength * 4 + 3 * 4 + valuesize + (*propertyValueListLength) * valuesize);
+		return PTP_RC_GeneralError;
+	}
+
+	*propertyValueList = calloc(*propertyValueListLength, sizeof(uint32_t));
+
+	for(i = 0; i < *propertyValueListLength; i++) {
+		if(valuesize == 2) {
+			(*propertyValueList)i = (uint32_t) dtoh16a( (data) + headerLength * 4 + 3 * 4 + valuesize + i * valuesize);
+		} else if(valuesize == 4) {
+			(*propertyValueList)i = dtoh32a( (data) + headerLength * 4 + 3 * 4 + valuesize + i * valuesize);
+		}
+		//printf("Property: %lu\n", (*propertyValueList)i);
+	}
+
+	free (data);
+	return ret;
+}
+
+    uint16_t
+ptp_panasonic_getrecordingstatus (PTPParams *params, uint32_t propcode, uint16_t *valuesize, uint32_t *currentValue)
+{
+    PTPContainer	ptp;
+    unsigned char	*data = NULL;
+    unsigned int 	size = 0;
+    uint16_t	ret = PTP_RC_OK;
+
+    PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_PollEvents, propcode);
+    CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+    if (!data) return PTP_RC_GeneralError;
+
+    if(size < 8) return PTP_RC_GeneralError;
+    *valuesize = dtoh32a( (data + 4) );
+
+    if(size < 8u + (*valuesize)) return PTP_RC_GeneralError;
+    if(*valuesize == 4) {
+        *currentValue = dtoh32a( (data + 8) );
+    } else if(*valuesize == 2) {
+        *currentValue = (uint32_t) dtoh16a( (data + 8) );
+    } else {
+        return PTP_RC_GeneralError;
+    }
+    //printf("ptp_panasonic_getdeviceproperty: size: %lu, valuesize: %d, currentValue: %lu\n", size, *valuesize, *currentValue);
+
+    free (data);
+    return ret;
+}
+
+uint16_t
+ptp_panasonic_getdeviceproperty (PTPParams *params, uint32_t propcode, uint16_t *valuesize, uint32_t *currentValue)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int 	size = 0;
+	uint16_t	ret = PTP_RC_OK;
+
+	PTP_CNT_INIT(ptp, PTP_OC_PANASONIC_GetProperty, propcode);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	if (!data) return PTP_RC_GeneralError;
+
+	if(size < 8) return PTP_RC_GeneralError;
+	*valuesize = dtoh32a( (data + 4) );
+
+	if(size < 8u + (*valuesize)) return PTP_RC_GeneralError;
+	if(*valuesize == 4) {
+		*currentValue = dtoh32a( (data + 8) );
+	} else if(*valuesize == 2) {
+		*currentValue = (uint32_t) dtoh16a( (data + 8) );
+	} else {
+		return PTP_RC_GeneralError;
+	}
+	//printf("ptp_panasonic_getdeviceproperty: size: %lu, valuesize: %d, currentValue: %lu\n", size, *valuesize, *currentValue);
+
+	free (data);
+	return ret;
+}
 
+#ifdef HAVE_LIBXML2
 static uint16_t
 ptp_olympus_parse_output_xml(PTPParams* params, char*data, int len, xmlNodePtr *code)
 {
@@ -993,7 +1954,7 @@
 /**
  * ptp_opensession:
  * params:	PTPParams*
- * 		session			- session number 
+ * 		session			- session number
  *
  * Establishes a new session.
  *
@@ -1097,9 +2058,13 @@
 		}
 		break;
 	case PTP_OPFF_DateTime:
-	case PTP_OPFF_FixedLengthArray:
+		free(opd->FORM.DateTime.String);
+		break;
 	case PTP_OPFF_RegularExpression:
-	case PTP_OPFF_ByteArray:
+		free(opd->FORM.RegularExpression.String);
+		break;
+	case PTP_OPFF_FixedLengthArray:	/* nothing to free */ /* fallthrough */
+	case PTP_OPFF_ByteArray:	/* nothing to free */ /* fallthrough */
 	case PTP_OPFF_LongString:
 		/* Ignore these presently, we cannot unpack them, so there is nothing to be freed. */
 		break;
@@ -1203,7 +2168,7 @@
  *		storage			- StorageID
  *		objectformatcode	- ObjectFormatCode (optional)
  *		associationOH		- ObjectHandle of Association for
- *					  wich a list of children is desired
+ *					  which a list of children is desired
  *					  (optional)
  *		objecthandles		- pointer to structute
  *
@@ -1268,7 +2233,7 @@
  *		storage			- StorageID
  *		objectformatcode	- ObjectFormatCode (optional)
  *		associationOH		- ObjectHandle of Association for
- *					  wich a list of children is desired
+ *					  which a list of children is desired
  *					  (optional)
  *		numobs			- pointer to uint32_t that takes number of objects
  *
@@ -1448,7 +2413,7 @@
  *		handle			- Object handle
  *		fd                      - File descriptor to write() to
  *
- * Get object 'handle' from device and write the data to the 
+ * Get object 'handle' from device and write the data to the
  * given file descriptor.
  *
  * Return values: Some PTP_RC_* code.
@@ -1516,6 +2481,32 @@
 }
 
 /**
+ * ptp_nikon_getpartialobjectex:
+ * params:	PTPParams*
+ *		handle			- Object handle
+ *		offset			- 64bit offset into object
+ *		maxbytes		- 64bit maximum of bytes to read
+ *		handler			- a ptp pata handler
+ *
+ * Get object 'handle' from device and send the data to the
+ * data handler. Start from offset and read at most maxbytes.
+ *
+ * Return values: Some PTP_RC_* code.
+ **/
+uint16_t
+ptp_nikon_getpartialobjectex (PTPParams* params, uint32_t handle, uint64_t offset,
+				uint64_t maxbytes, unsigned char** object,
+				uint32_t *len)
+{
+	PTPContainer ptp;
+
+	/* casts due to varargs otherwise pushing 64bit values on the stack */
+	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetPartialObjectEx, handle, ((uint32_t)offset & 0xFFFFFFFF), (uint32_t)(offset >> 32), ((uint32_t)maxbytes & 0xFFFFFFFF), (uint32_t)(maxbytes >> 32));
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, object, len);
+}
+
+
+/**
  * ptp_getthumb:
  * params:	PTPParams*
  *		handle			- Object handle
@@ -1536,11 +2527,64 @@
 }
 
 /**
+ * ptp_nikon_getlargethumb:
+ * params:	PTPParams*
+ *		handle			- Object handle
+ *		object			- pointer to data area
+ *
+ * Get a large thumb for object 'handle' from device and store the data in newly
+ * allocated 'object'. This function is Nikon specific.
+ *
+ * Return values: Some PTP_RC_* code.
+ **/
+uint16_t
+ptp_nikon_getlargethumb (PTPParams* params, uint32_t handle, unsigned char** object, unsigned int *len)
+{
+	PTPContainer ptp;
+
+	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetLargeThumb, handle);
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, object, len);
+}
+
+/**
+ * ptp_nikon_getobjectsize:
+ * params:	PTPParams*
+ *		handle			- Object handle
+ *		objectsize		- size of object
+ *
+ * Get the 64bit objectsize for object 'handle' from device and store the size in objectsize
+ * allocated 'object'. This function is Nikon specific.
+ *
+ * Return values: Some PTP_RC_* code.
+ **/
+uint16_t
+ptp_nikon_getobjectsize (PTPParams* params, uint32_t handle, uint64_t *objectsize)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int	size = 0;
+
+	*objectsize = 0;
+
+	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetObjectSize, handle);
+	CHECK_PTP_RC (ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+
+	if (size < 8) {
+		free (data);
+		return PTP_RC_GeneralError;
+	}
+
+	*objectsize = dtoh64ap(params, data);
+	free (data);
+	return PTP_RC_OK;
+}
+
+/**
  * ptp_deleteobject:
  * params:	PTPParams*
  *		handle			- object handle
  *		ofc			- object format code (optional)
- * 
+ *
  * Deletes desired objects.
  *
  * Return values: Some PTP_RC_* code.
@@ -1611,7 +2655,7 @@
  *		uint32_t* parenthandle 	- Parent ObjectHandle on responder
  * 		uint32_t* handle	- see Return values
  *		PTPObjectInfo* objectinfo- ObjectInfo that is to be sent
- * 
+ *
  * Sends ObjectInfo of file that is to be sent via SendFileObject.
  *
  * Return values: Some PTP_RC_* code.
@@ -1623,7 +2667,7 @@
  *					  for the incoming object
  **/
 uint16_t
-ptp_sendobjectinfo (PTPParams* params, uint32_t* store, 
+ptp_sendobjectinfo (PTPParams* params, uint32_t* store,
 			uint32_t* parenthandle, uint32_t* handle,
 			PTPObjectInfo* objectinfo)
 {
@@ -1638,7 +2682,7 @@
 	free(data);
 	*store=ptp.Param1;
 	*parenthandle=ptp.Param2;
-	*handle=ptp.Param3; 
+	*handle=ptp.Param3;
 	return ret;
 }
 
@@ -1647,7 +2691,7 @@
  * params:	PTPParams*
  *		char*	object		- contains the object that is to be sent
  *		uint64_t size		- object size
- *		
+ *
  * Sends object to Responder.
  *
  * Return values: Some PTP_RC_* code.
@@ -1711,13 +2755,13 @@
 #define PROPCACHE_TIMEOUT 5	/* seconds */
 
 uint16_t
-ptp_getdevicepropdesc (PTPParams* params, uint16_t propcode, 
+ptp_getdevicepropdesc (PTPParams* params, uint16_t propcode,
 			PTPDevicePropDesc* devicepropertydesc)
 {
 	PTPContainer	ptp;
 	uint16_t	ret = PTP_RC_OK;
 	unsigned char	*data = NULL;
-	unsigned int	size;
+	unsigned int	size, newoffset;
 
 	PTP_CNT_INIT(ptp, PTP_OC_GetDevicePropDesc, propcode);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
@@ -1752,7 +2796,11 @@
 		}
 #endif
 	} else {
-		ptp_unpack_DPD(params, data, devicepropertydesc, size);
+		if (!ptp_unpack_DPD(params, data, devicepropertydesc, size, &newoffset)) {
+			ptp_debug(params,"failed to unpack DPD of propcode 0x%04x, likely corrupted?", propcode);
+			free (data);
+			return PTP_RC_InvalidDevicePropFormat;
+		}
 	}
 	free(data);
 	return ret;
@@ -1800,7 +2848,7 @@
  *		uint32_t* parenthandle 	- Parent ObjectHandle on responder
  * 		uint32_t* handle	- see Return values
  *		PTPObjectInfo* objectinfo- ObjectInfo that is to be sent
- * 
+ *
  * Sends ObjectInfo of file that is to be sent via SendFileObject.
  *
  * Return values: Some PTP_RC_* code.
@@ -1812,7 +2860,7 @@
  *					  for the incoming object
  **/
 uint16_t
-ptp_ek_sendfileobjectinfo (PTPParams* params, uint32_t* store, 
+ptp_ek_sendfileobjectinfo (PTPParams* params, uint32_t* store,
 			uint32_t* parenthandle, uint32_t* handle,
 			PTPObjectInfo* objectinfo)
 {
@@ -1827,7 +2875,7 @@
 	free(data);
 	*store=ptp.Param1;
 	*parenthandle=ptp.Param2;
-	*handle=ptp.Param3; 
+	*handle=ptp.Param3;
 	return ret;
 }
 
@@ -1836,7 +2884,7 @@
  * params:	PTPParams*
  *		char**	serial		- contains the serial number of the camera
  *		uint32_t* size		- contains the string length
- *		
+ *
  * Gets the serial number from the device. (ptp serial)
  *
  * Return values: Some PTP_RC_* code.
@@ -1848,7 +2896,7 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, PTP_OC_EK_GetSerial);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
 /**
@@ -1856,7 +2904,7 @@
  * params:	PTPParams*
  *		char*	serial		- contains the new serial number
  *		uint32_t size		- string length
- *		
+ *
  * Sets the serial number of the device. (ptp serial)
  *
  * Return values: Some PTP_RC_* code.
@@ -1868,7 +2916,7 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, PTP_OC_EK_SetSerial);
-	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL); 
+	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
 }
 
 /* unclear what it does yet */
@@ -1878,7 +2926,7 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, 0x9007);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
 /* unclear what it does yet */
@@ -1902,7 +2950,7 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, 0x900c);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 	/* returned data is 16bit,16bit,32bit,32bit */
 }
 
@@ -1910,7 +2958,7 @@
  * ptp_ek_settext:
  * params:	PTPParams*
  *		PTPEKTextParams*	- contains the texts to display.
- *		
+ *
  * Displays the specified texts on the TFT of the camera.
  *
  * Return values: Some PTP_RC_* code.
@@ -1937,7 +2985,7 @@
  * params:	PTPParams*
  *		char*	object		- contains the object that is to be sent
  *		uint32_t size		- object size
- *		
+ *
  * Sends object to Responder.
  *
  * Return values: Some PTP_RC_* code.
@@ -1957,7 +3005,7 @@
  * params:	PTPParams*
  *		PTPDataHandler*	handler	- contains the handler of the object that is to be sent
  *		uint32_t size		- object size
- *		
+ *
  * Sends object to Responder.
  *
  * Return values: Some PTP_RC_* code.
@@ -1988,7 +3036,7 @@
  *		uint32_t p2 		- Not fully understood parameter
  *					  0 - returns full size
  *					  1 - returns thumbnail size (or EXIF?)
- * 
+ *
  * Gets form the responder the size of the specified object.
  *
  * Return values: Some PTP_RC_* code.
@@ -1999,11 +3047,11 @@
  *
  **/
 uint16_t
-ptp_canon_getpartialobjectinfo (PTPParams* params, uint32_t handle, uint32_t p2, 
-			uint32_t* size, uint32_t* rp2) 
+ptp_canon_getpartialobjectinfo (PTPParams* params, uint32_t handle, uint32_t p2,
+			uint32_t* size, uint32_t* rp2)
 {
 	PTPContainer	ptp;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetPartialObjectInfo, handle, p2);
 	*size = *rp2 = 0;
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL));
@@ -2064,9 +3112,9 @@
  * ptp_canon_gettreeinfo:
  * params:	PTPParams*
  *              uint32_t *out
- * 
+ *
  * Switches the camera display to on and lets the user
- * select what to transfer. Sends a 0xc011 event when started 
+ * select what to transfer. Sends a 0xc011 event when started
  * and 0xc013 if direct transfer aborted.
  *
  * Return values: Some PTP_RC_* code.
@@ -2088,7 +3136,7 @@
  * ptp_canon_getpairinginfo:
  * params:	PTPParams*
  *              int nr
- * 
+ *
  * Get the pairing information.
  *
  * Return values: Some PTP_RC_* code.
@@ -2098,7 +3146,7 @@
 ptp_canon_getpairinginfo (PTPParams* params, uint32_t nr, unsigned char **data, unsigned int *size)
 {
 	PTPContainer ptp;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetPairingInfo, nr);
 	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
@@ -2108,7 +3156,7 @@
  * params:	PTPParams*
  *              PTPCanon_directtransfer_entry **out
  *              unsigned int *outsize
- * 
+ *
  * Retrieves direct transfer entries specifying the images to transfer
  * from the camera (to be retrieved after 0xc011 event).
  *
@@ -2127,7 +3175,7 @@
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetTreeSize);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
 	*cnt = dtoh32a(data);
-	*entries = malloc(sizeof(PTPCanon_directtransfer_entry)*(*cnt));
+	*entries = calloc(sizeof(PTPCanon_directtransfer_entry),(*cnt));
 	if (!*entries) {
 		ret = PTP_RC_GeneralError;
 		goto exit;
@@ -2136,7 +3184,8 @@
 	for (i=0;i<*cnt;i++) {
 		unsigned char len;
 		(*entries)i.oid = dtoh32a(cur);
-		(*entries)i.str = ptp_unpack_string(params, cur, 4, size-(cur-data-4), &len);
+		if (!ptp_unpack_string(params, cur, 4, size-(cur-data-4), &len, &(*entries)i.str))
+			break;
 		cur += 4+(cur4*2+1);
 	}
 exit:
@@ -2147,7 +3196,7 @@
 /**
  * ptp_canon_checkevent:
  * params:	PTPParams*
- * 
+ *
  * The camera has a FIFO stack, in which it accumulates events.
  * Partially these events are communicated also via the USB interrupt pipe
  * according to the PTP USB specification, partially not.
@@ -2155,7 +3204,7 @@
  * if the event stack is empty, or filled with an event's data otherwise.
  * The event is removed from the stack in the latter case.
  * The Remote Capture app sends this command to the camera all the time
- * of connection, filling with it the gaps between other operations. 
+ * of connection, filling with it the gaps between other operations.
  *
  * Return values: Some PTP_RC_* code.
  * Upon success : PTPUSBEventContainer* event	- is filled with the event data
@@ -2169,11 +3218,11 @@
 	PTPContainer	ptp;
 	unsigned char	*data = NULL;
 	unsigned int	size;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_CheckEvent);
 	*isevent=0;
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
-	if (data && size) { /* check if we had a successfull call with data */
+	if (data && size) { /* check if we had a successful call with data */
 		ptp_unpack_EC(params, data, event, size);
 		*isevent=1;
 		free(data);
@@ -2182,11 +3231,39 @@
 }
 
 uint16_t
+ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer *evt)
+{
+	PTPContainer *levents;
+
+	levents = realloc(*events, sizeof(PTPContainer)*((*nrevents)+1));
+	if (!levents)
+		return PTP_RC_GeneralError;
+	*events = levents;
+	memcpy (&levents*nrevents,evt,1*sizeof(PTPContainer));
+	(*nrevents)++;
+	return PTP_RC_OK;
+}
+uint16_t
 ptp_add_event (PTPParams *params, PTPContainer *evt)
 {
+	return ptp_add_event_queue (&params->events, &params->nrofevents, evt);
+/*
 	params->events = realloc(params->events, sizeof(PTPContainer)*(params->nrofevents+1));
 	memcpy (&params->eventsparams->nrofevents,evt,1*sizeof(PTPContainer));
 	params->nrofevents += 1;
+
+	return PTP_RC_OK;
+*/
+}
+
+uint16_t
+ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents)
+{
+	unsigned int i;
+
+	for (i=0;i<nrevents;i++) {
+		CHECK_PTP_RC (ptp_add_event_queue (&params->events, &params->nrofevents, &evti));
+	}
 	return PTP_RC_OK;
 }
 
@@ -2250,6 +3327,7 @@
 				newobs = realloc (params->objects,sizeof(PTPObject)*(params->nrofobjects+1));
 				if (!newobs) {
 					free (tmp);
+					free (storageids.Storage);
 					return PTP_RC_GeneralError;
 				}
 				params->objects = newobs;
@@ -2349,6 +3427,7 @@
 		/*debug_objectinfo(params, handle, &ob->oi);*/
 	}
 
+#if 0 /* apple devices report it, but the conrtent they have does not match the standard somehow. Neesd further debugging */
 	if (ptp_operation_issupported(params, PTP_OC_GetFilesystemManifest)) {
 		uint64_t		numoifs = 0;
 		PTPObjectFilesystemInfo	*oifs = NULL;
@@ -2416,6 +3495,8 @@
 		return PTP_RC_OK;
 	}
 fallback:
+#endif
+
 	ptp_debug (params, "Listing ... ");
 	if (handle == 0) xhandle = PTP_HANDLER_SPECIAL; /* 0 would mean all */
 	ret = ptp_getobjecthandles (params, storage, 0, xhandle, &handles);
@@ -2506,7 +3587,7 @@
 	}
 	case PTP_EC_StoreAdded:
 	case PTP_EC_StoreRemoved: {
-		int i;
+		unsigned int i;
 
 		/* FIXME: if we just remove 1 out of many storages, we do not need to invalidate/reload the entire tree? */
 
@@ -2573,31 +3654,53 @@
 	PTPContainer	event;
 	uint16_t	ret;
 
-	/* Method offered by Nikon DSLR, Nikon 1, and some older Nikon Coolpix P*
-	 * The Nikon Coolpix P2 however does not return anything. So if we never get
-	 * events from here, use the ptp "interrupt" method */
-	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
-		ptp_operation_issupported(params, PTP_OC_NIKON_CheckEvent)
-	) {
-		unsigned int evtcnt = 0, i;
-		PTPContainer *xevent = NULL;
-
-		ret = ptp_nikon_check_event(params, &xevent, &evtcnt);
-		if (ret != PTP_RC_OperationNotSupported)
-			CHECK_PTP_RC(ret);
-
-		if (evtcnt) {
-			for (i = 0; i < evtcnt; i++)
-				handle_event_internal (params, &xeventi);
-			params->events = realloc(params->events, sizeof(PTPContainer)*(evtcnt+params->nrofevents));
-			memcpy (&params->eventsparams->nrofevents,xevent,evtcnt*sizeof(PTPContainer));
-			params->nrofevents += evtcnt;
-			params->event90c7works = 1;
+	if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) {
+		if (ptp_operation_issupported(params, PTP_OC_NIKON_GetEventEx)) {
+			unsigned int evtcnt = 0, i;
+			PTPContainer *xevent = NULL;
+
+			ret = ptp_nikon_check_eventex(params, &xevent, &evtcnt);
+			if (ret != PTP_RC_OperationNotSupported)
+				CHECK_PTP_RC(ret);
+
+			if (evtcnt) {
+				for (i = 0; i < evtcnt; i++)
+					handle_event_internal (params, &xeventi);
+				params->events = realloc(params->events, sizeof(PTPContainer)*(evtcnt+params->nrofevents));
+				memcpy (&params->eventsparams->nrofevents,xevent,evtcnt*sizeof(PTPContainer));
+				params->nrofevents += evtcnt;
+				params->event90c7works = 1;
+			}
+			free (xevent);
+			if (params->event90c7works)
+				return PTP_RC_OK;
+			/* fall through to generic event handling */
+		} else {
+			/* Method offered by Nikon DSLR, Nikon 1, and some older Nikon Coolpix P*
+			 * The Nikon Coolpix P2 however does not return anything. So if we never get
+			 * events from here, use the ptp "interrupt" method */
+			if (ptp_operation_issupported(params, PTP_OC_NIKON_GetEvent)) {
+				unsigned int evtcnt = 0, i;
+				PTPContainer *xevent = NULL;
+
+				ret = ptp_nikon_check_event(params, &xevent, &evtcnt);
+				if (ret != PTP_RC_OperationNotSupported)
+					CHECK_PTP_RC(ret);
+
+				if (evtcnt) {
+					for (i = 0; i < evtcnt; i++)
+						handle_event_internal (params, &xeventi);
+					params->events = realloc(params->events, sizeof(PTPContainer)*(evtcnt+params->nrofevents));
+					memcpy (&params->eventsparams->nrofevents,xevent,evtcnt*sizeof(PTPContainer));
+					params->nrofevents += evtcnt;
+					params->event90c7works = 1;
+				}
+				free (xevent);
+				if (params->event90c7works)
+					return PTP_RC_OK;
+				/* fall through to generic event handling */
+			}
 		}
-		free (xevent);
-		if (params->event90c7works)
-			return PTP_RC_OK;
-		/* fall through to generic event handling */
 	}
 	/* should not get here ... EOS has no normal PTP events and another queue handling. */
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
@@ -2639,7 +3742,7 @@
 
 		handle_event_internal (params, &event);
 
-	
+
 	}
 	if (ret == PTP_ERROR_TIMEOUT) /* ok, just new events */
 		ret = PTP_RC_OK;
@@ -2664,7 +3767,6 @@
 	return ret;
 }
 
-
 int
 ptp_get_one_event(PTPParams *params, PTPContainer *event)
 {
@@ -2682,8 +3784,65 @@
 }
 
 /**
+ * ptp_get_one_event_by_type:
+ *
+ * Check if one specific event has appeared in the queue, and return it back to us, and remove it from the queue.
+
+ * params:	PTPParams*	in: params
+ * 		code		in: event code
+ * 		event		out: event container
+ *
+ * Return values: 1 if removed, 0 if not.
+ */
+int
+ptp_get_one_event_by_type(PTPParams *params, uint16_t code, PTPContainer *event)
+{
+	unsigned int i;
+
+	if (!params->nrofevents)
+		return 0;
+	for (i=0;i<params->nrofevents;i++) {
+		if (params->eventsi.Code == code) {
+			memcpy (event, params->events+i, sizeof(PTPContainer));
+			memmove (params->events+i, params->events+i+1, sizeof(PTPContainer)*(params->nrofevents-i-1));
+			/* do not realloc on shrink. */
+			params->nrofevents--;
+			if (!params->nrofevents) {
+				free (params->events);
+				params->events = NULL;
+			}
+			return 1;
+		}
+	}
+	return 0;
+}
+
+/**
+ * ptp_have_event:
+ *
+ * Check if one specific event has appeared in the queue, without draining it.
+ *
+ * params:	PTPParams*	in: params
+ * 		code		in: event code
+ *
+ * Return values: 1 if removed, 0 if not.
+ */
+int
+ptp_have_event(PTPParams *params, uint16_t code)
+{
+	unsigned int i;
+
+	if (!params->nrofevents)
+		return 0;
+	for (i=0;i<params->nrofevents;i++)
+		if (params->eventsi.Code == code)
+			return 1;
+	return 0;
+}
+
+/**
  * ptp_canon_eos_getevent:
- * 
+ *
  * This retrieves configuration status/updates/changes
  * on EOS cameras. It reads a datablock which has a list of variable
  * sized structures.
@@ -2768,7 +3927,7 @@
 	memcpy (dpd, &params->canon_propsi.dpd, sizeof (*dpd));
 	if (dpd->FormFlag == PTP_DPFF_Enumeration) {
 		/* need to duplicate the Enumeration alloc */
-		dpd->FORM.Enum.SupportedValue = malloc (sizeof (PTPPropertyValue)*dpd->FORM.Enum.NumberOfValues);
+		dpd->FORM.Enum.SupportedValue = calloc (sizeof (PTPPropertyValue),dpd->FORM.Enum.NumberOfValues);
 		memcpy (dpd->FORM.Enum.SupportedValue,
 			params->canon_propsi.dpd.FORM.Enum.SupportedValue,
 			sizeof (PTPPropertyValue)*dpd->FORM.Enum.NumberOfValues
@@ -2801,7 +3960,7 @@
 ptp_canon_eos_getstorageinfo (PTPParams* params, uint32_t p1, unsigned char **data, unsigned int *size)
 {
 	PTPContainer	ptp;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetStorageInfo, p1);
 	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 	/* FIXME: do stuff with data */
@@ -2835,7 +3994,7 @@
 	}
 
 	*nrofentries = dtoh32a(data);
-	*entries = malloc(*nrofentries * sizeof(PTPCANONFolderEntry));
+	*entries = calloc(*nrofentries , sizeof(PTPCANONFolderEntry));
 	if (!*entries) {
 		ret = PTP_RC_GeneralError;
 		goto exit;
@@ -2880,14 +4039,14 @@
 
 /**
  * ptp_canon_eos_getpartialobject:
- * 
+ *
  * This retrieves a part of an PTP object which you specify as object id.
  * The id originates from 0x9116 call.
  * After finishing it, we seem to need to call ptp_canon_eos_enddirecttransfer.
  *
  * params:	PTPParams*
  * 		oid		Object ID
- * 		offset		The offset where to start the data transfer 
+ * 		offset		The offset where to start the data transfer
  *		xsize		Size in bytes of the transfer to do
  *		data		Pointer that receives the malloc()ed memory of the transfer.
  *
@@ -2905,14 +4064,14 @@
 
 /**
  * ptp_canon_eos_getpartialobjectex:
- * 
+ *
  * This retrieves a part of an PTP object which you specify as object id.
  * The id originates from 0x9116 call.
  * After finishing it, we seem to need to call ptp_canon_eos_enddirecttransfer.
  *
  * params:	PTPParams*
  * 		oid		Object ID
- * 		offset		The offset where to start the data transfer 
+ * 		offset		The offset where to start the data transfer
  *		xsize		Size in bytes of the transfer to do
  *		data		Pointer that receives the malloc()ed memory of the transfer.
  *
@@ -2965,7 +4124,6 @@
 		size = 8 + ptp_pack_EOS_ImageFormat( params, NULL, value->u16 );
 		data = malloc( size );
 		if (!data) return PTP_RC_GeneralError;
-		params->canon_propsi.dpd.CurrentValue.u16 = value->u16;
 		ptp_pack_EOS_ImageFormat( params, data + 8, value->u16 );
 		break;
 	case PTP_DPC_CANON_EOS_CustomFuncEx:
@@ -2974,7 +4132,6 @@
 		size = 8 + ptp_pack_EOS_CustomFuncEx( params, NULL, value->str );
 		data = malloc( size );
 		if (!data) return PTP_RC_GeneralError;
-		params->canon_propsi.dpd.CurrentValue.str = strdup( value->str );
 		ptp_pack_EOS_CustomFuncEx( params, data + 8, value->str );
 		break;
 	default:
@@ -2992,24 +4149,19 @@
 		case PTP_DTC_UINT8:
 			/*fprintf (stderr, "%x -> %d\n", propcode, value->u8);*/
 			htod8a(&data8, value->u8);
-			params->canon_propsi.dpd.CurrentValue.u8 = value->u8;
 			break;
 		case PTP_DTC_UINT16:
 		case PTP_DTC_INT16:
 			/*fprintf (stderr, "%x -> %d\n", propcode, value->u16);*/
 			htod16a(&data8, value->u16);
-			params->canon_propsi.dpd.CurrentValue.u16 = value->u16;
 			break;
 		case PTP_DTC_INT32:
 		case PTP_DTC_UINT32:
 			/*fprintf (stderr, "%x -> %d\n", propcode, value->u32);*/
 			htod32a(&data8, value->u32);
-			params->canon_propsi.dpd.CurrentValue.u32 = value->u32;
 			break;
 		case PTP_DTC_STR:
 			strcpy((char*)data + 8, value->str);
-			free (params->canon_propsi.dpd.CurrentValue.str);
-			params->canon_propsi.dpd.CurrentValue.str = strdup(value->str);
 			break;
 		}
 	}
@@ -3019,13 +4171,48 @@
 
 	ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
 	free (data);
+	if (ret == PTP_RC_OK) {
+		/* commit to cache only after successful setting */
+		switch (propcode) {
+		case PTP_DPC_CANON_EOS_ImageFormat:
+		case PTP_DPC_CANON_EOS_ImageFormatCF:
+		case PTP_DPC_CANON_EOS_ImageFormatSD:
+		case PTP_DPC_CANON_EOS_ImageFormatExtHD:
+			/* special handling of ImageFormat properties */
+			params->canon_propsi.dpd.CurrentValue.u16 = value->u16;
+			break;
+		case PTP_DPC_CANON_EOS_CustomFuncEx:
+			/* special handling of CustomFuncEx properties */
+			params->canon_propsi.dpd.CurrentValue.str = strdup( value->str );
+			break;
+		default:
+			switch (datatype) {
+			case PTP_DTC_INT8:
+			case PTP_DTC_UINT8:
+				params->canon_propsi.dpd.CurrentValue.u8 = value->u8;
+				break;
+			case PTP_DTC_UINT16:
+			case PTP_DTC_INT16:
+				params->canon_propsi.dpd.CurrentValue.u16 = value->u16;
+				break;
+			case PTP_DTC_INT32:
+			case PTP_DTC_UINT32:
+				params->canon_propsi.dpd.CurrentValue.u32 = value->u32;
+				break;
+			case PTP_DTC_STR:
+				free (params->canon_propsi.dpd.CurrentValue.str);
+				params->canon_propsi.dpd.CurrentValue.str = strdup(value->str);
+				break;
+			}
+		}
+	}
 	return ret;
 }
 
 /**
  * ptp_canon_getpartialobject:
  *
- * This operation is used to read from the device a data 
+ * This operation is used to read from the device a data
  * block of an object from a specified offset.
  *
  * params:	PTPParams*
@@ -3041,15 +4228,15 @@
  *
  **/
 uint16_t
-ptp_canon_getpartialobject (PTPParams* params, uint32_t handle, 
+ptp_canon_getpartialobject (PTPParams* params, uint32_t handle,
 				uint32_t offset, uint32_t size,
-				uint32_t pos, unsigned char** block, 
+				uint32_t pos, unsigned char** block,
 				uint32_t* readnum)
 {
 	PTPContainer	ptp;
 	uint16_t	ret;
 	unsigned char	*data = NULL;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetPartialObjectEx, handle, offset, size, pos);
 	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, NULL);
 	if (ret==PTP_RC_OK) {
@@ -3068,9 +4255,9 @@
  * Of course, prior to calling this operation, one must turn the viewfinder
  * on with the CANON_ViewfinderOn command.
  * Invoking this operation many times, one can get live video from the camera!
- * 
+ *
  * params:	PTPParams*
- * 
+ *
  * Return values: Some PTP_RC_* code.
  *      char **image - the pointer to the read image
  *      unit32_t *size - the size of the image in bytes
@@ -3081,7 +4268,7 @@
 {
 	PTPContainer	ptp;
 	uint16_t	ret;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetViewfinderImage);
 	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, image, NULL);
 	if (ret==PTP_RC_OK)
@@ -3093,14 +4280,14 @@
  * ptp_canon_getchanges:
  *
  * This is an interesting operation, about the effect of which I am not sure.
- * This command is called every time when a device property has been changed 
+ * This command is called every time when a device property has been changed
  * with the SetDevicePropValue operation, and after some other operations.
  * This operation reads the array of Device Properties which have been changed
  * by the previous operation.
  * Probably, this operation is even required to make those changes work.
  *
  * params:	PTPParams*
- * 
+ *
  * Return values: Some PTP_RC_* code.
  *      uint16_t** props - the pointer to the array of changed properties
  *      uint32_t* propnum - the number of elements in the *props array
@@ -3112,7 +4299,7 @@
 	PTPContainer	ptp;
 	unsigned char	*data = NULL;
 	unsigned int	size;
-	
+
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetChanges);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
 	*propnum=ptp_unpack_uint16_t_array(params,data,0,size,props);
@@ -3125,17 +4312,17 @@
  *
  * This command reads a specified object's record in a device's filesystem,
  * or the records of all objects belonging to a specified folder (association).
- *  
+ *
  * params:	PTPParams*
  *      uint32_t store - StorageID,
  *      uint32_t p2 - Yet unknown (0 value works OK)
  *      uint32_t parent - Parent Object Handle
- *                      # If Parent Object Handle is 0xffffffff, 
+ *                      # If Parent Object Handle is 0xffffffff,
  *                      # the Parent Object is the top level folder.
  *      uint32_t handle - Object Handle
- *                      # If Object Handle is 0, the records of all objects 
+ *                      # If Object Handle is 0, the records of all objects
  *                      # belonging to the Parent Object are read.
- *                      # If Object Handle is not 0, only the record of this 
+ *                      # If Object Handle is not 0, only the record of this
  *                      # Object is read.
  *
  * Return values: Some PTP_RC_* code.
@@ -3144,21 +4331,21 @@
  *
  **/
 uint16_t
-ptp_canon_getobjectinfo (PTPParams* params, uint32_t store, uint32_t p2, 
-			    uint32_t parent, uint32_t handle, 
+ptp_canon_getobjectinfo (PTPParams* params, uint32_t store, uint32_t p2,
+			    uint32_t parent, uint32_t handle,
 			    PTPCANONFolderEntry** entries, uint32_t* entnum)
 {
 	PTPContainer	ptp;
 	uint16_t	ret;
 	unsigned char	*data = NULL;
 	unsigned int	i, size;
-	
+
 	*entnum = 0;
 	*entries = NULL;
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetObjectInfoEx, store, p2, parent, handle);
 	data = NULL;
 	size = 0;
-	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, NULL);
+	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size);
 	if (ret != PTP_RC_OK)
 		goto exit;
 	if (!data)
@@ -3196,7 +4383,7 @@
  *
  * The 'A' is the VolumeLabel from GetStorageInfo,
  * my IXUS has "A" for the card and "V" for internal memory.
- *  
+ *
  * params:	PTPParams*
  *      char* name - path name
  *
@@ -3213,9 +4400,8 @@
 	uint8_t		len = 0;
 
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetObjectHandleByName);
-	data = malloc (2*(strlen(name)+1)+2);
+	data = calloc (2,(strlen(name)+2));
 	if (!data) return PTP_RC_GeneralError;
-	memset (data, 0, 2*(strlen(name)+1)+2);
 	ptp_pack_string (params, name, data, 0, &len);
 	ret=ptp_transaction (params, &ptp, PTP_DP_SENDDATA, (len+1)*2+1, &data, NULL);
 	free (data);
@@ -3228,7 +4414,7 @@
  *
  * This command downloads the specified theme slot, including jpegs
  * and wav files.
- *  
+ *
  * params:	PTPParams*
  *      uint32_t themenr - nr of theme
  *
@@ -3244,7 +4430,7 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, PTP_OC_CANON_GetCustomizeData, themenr);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
 
@@ -3254,14 +4440,14 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, PTP_OC_NIKON_CurveDownload);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
 /**
  * ptp_sony_sdioconnect:
  *
  * This changes modes of the camera
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3278,11 +4464,34 @@
 	free (data);
 	return PTP_RC_OK;
 }
+
+/**
+ * ptp_sony_qx_connect:
+ *
+ * This changes modes of the camera
+ *
+ * params:	PTPParams*
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+uint16_t
+ptp_sony_qx_connect (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SONY_QX_Connect, p1, p2, p3);
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, NULL));
+	free (data);
+	return PTP_RC_OK;
+}
+
 /**
  * ptp_sony_get_vendorpropcodes:
  *
  * This command downloads the vendor specific property codes.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3300,7 +4509,50 @@
 
 	*props = NULL;
 	*size = 0;
-	PTP_CNT_INIT(ptp, PTP_OC_SONY_GetSDIOGetExtDeviceInfo, 0xc8 /* unclear */);
+	if(has_sony_mode_300(params)) {
+		PTP_CNT_INIT(ptp, PTP_OC_SONY_GetSDIOGetExtDeviceInfo, 0x12c /* newer mode (300) */);
+	} else {
+		PTP_CNT_INIT(ptp, PTP_OC_SONY_GetSDIOGetExtDeviceInfo, 0x0c8 /* older mode (200) */);
+	}
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &xdata, &xsize));
+	if (xsize == 0) {
+		ptp_debug (params, "No special operations sent?");
+		return PTP_RC_OK;
+	}
+
+	psize1 = ptp_unpack_uint16_t_array (params, xdata+2, 0, xsize, &props1);
+	ptp_debug (params, "xsize %d, got size %d\n", xsize, psize1*2 + 2 + 4);
+	if (psize1*2 + 2 + 4 < xsize) {
+		psize2 = ptp_unpack_uint16_t_array(params,xdata+2+psize1*2+4, 0, xsize, &props2);
+	}
+	*props = calloc(psize1+psize2, sizeof(uint16_t));
+	if (!*props) {
+		ptp_debug (params, "oom during malloc?");
+		free (props1);
+		free (props2);
+		free (xdata);
+		return PTP_RC_OK;
+	}
+	*size = psize1+psize2;
+	memcpy (*props, props1, psize1*sizeof(uint16_t));
+	memcpy ((*props)+psize1, props2, psize2*sizeof(uint16_t));
+	free (props1);
+	free (props2);
+	free (xdata);
+	return PTP_RC_OK;
+}
+
+uint16_t
+ptp_sony_qx_get_vendorpropcodes (PTPParams* params, uint16_t **props, unsigned int *size)
+{
+	PTPContainer	ptp;
+	unsigned char	*xdata = NULL;
+	unsigned int 	xsize, psize1 = 0, psize2 = 0;
+	uint16_t	*props1 = NULL,*props2 = NULL;
+
+	*props = NULL;
+	*size = 0;
+	PTP_CNT_INIT(ptp, PTP_OC_SONY_QX_GetSDIOGetExtDeviceInfo, 0xc8 /* unclear */);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &xdata, &xsize));
 	if (xsize == 0) {
 		ptp_debug (params, "No special operations sent?");
@@ -3329,6 +4581,7 @@
 	return PTP_RC_OK;
 }
 
+
 uint16_t
 ptp_sony_getdevicepropdesc (PTPParams* params, uint16_t propcode, PTPDevicePropDesc *dpd)
 {
@@ -3346,15 +4599,21 @@
 	return ret;
 }
 
-uint16_t
-ptp_sony_getalldevicepropdesc (PTPParams* params)
+static uint16_t
+_ptp_sony_getalldevicepropdesc (PTPParams* params, uint16_t opcode)
 {
 	PTPContainer		ptp;
 	unsigned char		*data = NULL, *dpddata;
 	unsigned int		size, readlen;
 	PTPDevicePropDesc	dpd;
+	time_t			now;
+
+	ptp_debug (params, "_ptp_sony_getalldevicepropdesc: opcode %04x", opcode);
+	/* for old A900 / A700 who does not have this, but has capture */
+	if (!ptp_operation_issupported(params, opcode))
+		return PTP_RC_OK;
 
-	PTP_CNT_INIT(ptp, PTP_OC_SONY_GetAllDevicePropData);
+	PTP_CNT_INIT(ptp, opcode);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
 	if (!data)
 		return PTP_RC_GeneralError;
@@ -3364,6 +4623,7 @@
 	}
 	dpddata = data+8; /* nr of entries 32bit, 0 32bit */
 	size -= 8;
+	time(&now);
 	while (size>0) {
 		unsigned int	i;
 		uint16_t	propcode;
@@ -3383,7 +4643,7 @@
 			case PTP_DTC_INT8:
 #define CHECK_CHANGED(type) \
 				if (params->devicepropertiesi.desc.CurrentValue.type != dpd.CurrentValue.type) \
-					ptp_debug (params, "ptp_sony_getalldevicepropdesc: %04x: value %d -> %d", propcode, params->devicepropertiesi.desc.CurrentValue.type, dpd.CurrentValue.type);
+					ptp_debug (params, "ptp_sony_getalldevicepropdesc: %s(%04x): value %d -> %d", ptp_get_property_description (params, propcode), propcode, params->devicepropertiesi.desc.CurrentValue.type, dpd.CurrentValue.type);
 				CHECK_CHANGED(i8);
 				break;
 			case PTP_DTC_UINT8:
@@ -3414,6 +4674,7 @@
 			ptp_free_devicepropdesc (&params->devicepropertiesi.desc);
 		}
 		params->devicepropertiesi.desc = dpd;
+		params->devicepropertiesi.timestamp = now;
 #if 0
 		ptp_debug (params, "dpd.DevicePropertyCode %04x, readlen %d, getset %d", dpd.DevicePropertyCode, readlen, dpd.GetSet);
 		switch (dpd.DataType) {
@@ -3448,6 +4709,16 @@
 }
 
 uint16_t
+ptp_sony_getalldevicepropdesc (PTPParams* params) {
+	return _ptp_sony_getalldevicepropdesc (params, PTP_OC_SONY_GetAllDevicePropData);
+}
+
+uint16_t
+ptp_sony_qx_getalldevicepropdesc (PTPParams* params) {
+	return _ptp_sony_getalldevicepropdesc (params, PTP_OC_SONY_QX_GetAllDevicePropData);
+}
+
+uint16_t
 ptp_sony_setdevicecontrolvaluea (PTPParams* params, uint16_t propcode,
 			PTPPropertyValue *value, uint16_t datatype)
 {
@@ -3464,6 +4735,22 @@
 }
 
 uint16_t
+ptp_sony_qx_setdevicecontrolvaluea (PTPParams* params, uint16_t propcode,
+			PTPPropertyValue *value, uint16_t datatype)
+{
+	PTPContainer	ptp;
+	uint16_t	ret;
+	unsigned char	*data;
+	uint32_t	size;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SONY_QX_SetControlDeviceA, propcode);
+	size = ptp_pack_DPV(params, value, &data, datatype);
+	ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
+	free(data);
+	return ret;
+}
+
+uint16_t
 ptp_sony_setdevicecontrolvalueb (PTPParams* params, uint16_t propcode,
 			PTPPropertyValue *value, uint16_t datatype)
 {
@@ -3480,6 +4767,23 @@
 }
 
 uint16_t
+ptp_sony_qx_setdevicecontrolvalueb (PTPParams* params, uint16_t propcode,
+			PTPPropertyValue *value, uint16_t datatype)
+{
+	PTPContainer	ptp;
+	uint16_t	ret;
+	unsigned char	*data;
+	uint32_t	size;
+
+	PTP_CNT_INIT(ptp, PTP_OC_SONY_QX_SetControlDeviceB, propcode);
+	size = ptp_pack_DPV(params, value, &data , datatype);
+	ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
+	free(data);
+	return ret;
+}
+
+
+uint16_t
 ptp_sony_9280 (PTPParams* params, uint32_t param1,
 	uint32_t additional, uint32_t data2, uint32_t data3, uint32_t data4, uint8_t x, uint8_t y)
 {
@@ -3523,9 +4827,9 @@
  * This command gets a propertydesc.
  * If a vendor specific property desc query is available, it uses that.
  * If not, it falls back to the generic PTP getdevicepropdesc.
- *  
+ *
  * params:	PTPParams*
- *      uint16_t propcode 
+ *      uint16_t propcode
  *      PTPDevicePropDesc *dpd
  *
  * Return values: Some PTP_RC_* code.
@@ -3567,7 +4871,24 @@
 			if (params->devicepropertiesi.desc.DevicePropertyCode == propcode)
 				break;
 		if (i == params->nrofdeviceproperties) {
-			ptp_debug (params, "property 0x%04x not found?\n", propcode);
+			ptp_debug (params, "alpha property 0x%04x not found?\n", propcode);
+			return PTP_RC_GeneralError;
+		}
+		time(&now);
+		params->devicepropertiesi.timestamp = now;
+		duplicate_DevicePropDesc(&params->devicepropertiesi.desc, dpd);
+		return PTP_RC_OK;
+	}
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) &&
+		ptp_operation_issupported(params, PTP_OC_SONY_QX_GetAllDevicePropData)
+	) {
+		CHECK_PTP_RC(ptp_sony_qx_getalldevicepropdesc (params));
+
+		for (i=0;i<params->nrofdeviceproperties;i++)
+			if (params->devicepropertiesi.desc.DevicePropertyCode == propcode)
+				break;
+		if (i == params->nrofdeviceproperties) {
+			ptp_debug (params, "qx property 0x%04x not found?\n", propcode);
 			return PTP_RC_GeneralError;
 		}
 		time(&now);
@@ -3596,16 +4917,16 @@
 		return PTP_RC_OK;
 	}
 
-	return PTP_RC_OK;
+	return PTP_RC_OperationNotSupported;
 }
 
 /**
  * ptp_generic_setdevicepropvalue:
  *
  * This command sets a property value, device specific.
- *  
+ *
  * params:	PTPParams*
- *      uint16_t propcode 
+ *      uint16_t propcode
  *      PTPDevicePropertyValue *value
  *      uint16_t datatype
  *
@@ -3631,6 +4952,11 @@
 		ptp_operation_issupported(params, PTP_OC_SONY_SetControlDeviceA)
 	)
 		return ptp_sony_setdevicecontrolvaluea (params, propcode, value, datatype);
+	/* Sony QX method */
+	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) &&
+		ptp_operation_issupported(params, PTP_OC_SONY_QX_SetControlDeviceA)
+	)
+		return ptp_sony_qx_setdevicecontrolvaluea (params, propcode, value, datatype);
 	return ptp_setdevicepropvalue (params, propcode, value, datatype);
 }
 
@@ -3638,7 +4964,7 @@
  * ptp_nikon_get_vendorpropcodes:
  *
  * This command downloads the vendor specific property codes.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3670,14 +4996,14 @@
 	PTPContainer ptp;
 
 	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetFileInfoInBlock, p1, p2, p3);
-	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size); 
+	return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
 /**
  * ptp_nikon_get_liveview_image:
  *
  * This command gets a LiveView image from newer Nikons DSLRs.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3687,7 +5013,7 @@
 ptp_nikon_get_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size)
 {
         PTPContainer ptp;
-        
+
         PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetLiveViewImg);
         return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
@@ -3696,7 +5022,7 @@
  * ptp_nikon_get_preview_image:
  *
  * This command gets a Preview image from newer Nikons DSLRs.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3721,10 +5047,34 @@
 }
 
 /**
+ * ptp_canon_eos_get_remotemode:
+ *
+ * This command gets the EOS remote mode.
+ *
+ * params:	PTPParams*
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+uint16_t
+ptp_canon_eos_getremotemode (PTPParams* params, uint32_t *mode)
+{
+	PTPContainer	ptp;
+
+        PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetRemoteMode);
+
+	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL));
+	*mode = 0;
+	if (ptp.Nparam > 0)
+		*mode = ptp.Param1;
+	return PTP_RC_OK;
+}
+
+/**
  * ptp_canon_eos_get_viewfinder_image:
  *
  * This command gets a Viewfinder image from newer Nikons DSLRs.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3734,8 +5084,9 @@
 ptp_canon_eos_get_viewfinder_image (PTPParams* params, unsigned char **data, unsigned int *size)
 {
         PTPContainer ptp;
-        
-        PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetViewFinderData, 0x00100000 /* from trace */);
+
+	/* Saw 3 arguments ... 0x00200000 for EOS1000D, also used 0x00100000 */
+        PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetViewFinderData, 0x00200000 /* from trace */, 0, 0);
         return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
 
@@ -3743,8 +5094,9 @@
 ptp_canon_eos_get_viewfinder_image_handler (PTPParams* params, PTPDataHandler*handler)
 {
         PTPContainer ptp;
-        
-        PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetViewFinderData, 0x00100000 /* from trace */);
+
+	/* Saw 3 arguments ... 0x00200000 for EOS1000D, also used 0x00100000 */
+        PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_GetViewFinderData, 0x00200000 /* from trace */, 0, 0);
         return ptp_transaction_new(params, &ptp, PTP_DP_GETDATA, 0, handler);
 }
 
@@ -3752,7 +5104,7 @@
  * ptp_nikon_check_event:
  *
  * This command checks the event queue on the Nikon.
- *  
+ *
  * params:	PTPParams*
  *      PTPUSBEventContainer **event - list of usb events.
  *	int *evtcnt - number of usb events in event structure.
@@ -3767,7 +5119,7 @@
 	unsigned char	*data = NULL;
 	unsigned int	size;
 
-	PTP_CNT_INIT(ptp, PTP_OC_NIKON_CheckEvent);
+	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetEvent);
 	*evtcnt = 0;
 	CHECK_PTP_RC(ptp_transaction (params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
 	ptp_unpack_Nikon_EC (params, data, size, event, evtcnt);
@@ -3776,10 +5128,37 @@
 }
 
 /**
+ * ptp_nikon_check_eventex:
+ *
+ * This command checks the event queue on the Nikon.
+ *
+ * params:	PTPParams*
+ *      PTPUSBEventContainer **event - list of usb events.
+ *	int *evtcnt - number of usb events in event structure.
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+uint16_t
+ptp_nikon_check_eventex (PTPParams* params, PTPContainer** event, unsigned int* evtcnt)
+{
+	PTPContainer	ptp;
+	unsigned char	*data = NULL;
+	unsigned int	size;
+
+	PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetEventEx);
+	*evtcnt = 0;
+	CHECK_PTP_RC(ptp_transaction (params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
+	ptp_unpack_Nikon_EC_EX (params, data, size, event, evtcnt);
+	free (data);
+	return PTP_RC_OK;
+}
+
+/**
  * ptp_nikon_getptpipinfo:
  *
  * This command gets the ptpip info data.
- *  
+ *
  * params:	PTPParams*
  *	unsigned char *data	- data
  *	unsigned int size	- size of returned data
@@ -3791,7 +5170,7 @@
 ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size)
 {
         PTPContainer ptp;
-        
+
         PTP_CNT_INIT(ptp, PTP_OC_NIKON_GetDevicePTPIPInfo);
         return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
 }
@@ -3800,7 +5179,7 @@
  * ptp_nikon_getwifiprofilelist:
  *
  * This command gets the wifi profile list.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3827,9 +5206,8 @@
 	params->wifi_profiles_version = data0;
 	params->wifi_profiles_number = data1;
 	free(params->wifi_profiles);
-	
-	params->wifi_profiles = malloc(params->wifi_profiles_number*sizeof(PTPNIKONWifiProfile));
-	memset(params->wifi_profiles, 0, params->wifi_profiles_number*sizeof(PTPNIKONWifiProfile));
+
+	params->wifi_profiles = calloc(params->wifi_profiles_number,sizeof(PTPNIKONWifiProfile));
 
 	pos = 2;
 	profn = 0;
@@ -3851,20 +5229,22 @@
 		params->wifi_profilesprofn.device_type = datapos++;
 		params->wifi_profilesprofn.icon_type = datapos++;
 
-		buffer = ptp_unpack_string(params, data, pos, size, &len);
+		if (!ptp_unpack_string(params, data, pos, size, &len, &buffer))
+			goto exit;
 		strncpy(params->wifi_profilesprofn.creation_date, buffer, sizeof(params->wifi_profilesprofn.creation_date));
 		free (buffer);
 		pos += (len*2+1);
 		if (pos+1 >= size)
 			goto exit;
 		/* FIXME: check if it is really last usage date */
-		buffer = ptp_unpack_string(params, data, pos, size, &len);
+		if (!ptp_unpack_string(params, data, pos, size, &len, &buffer))
+			goto exit;
 		strncpy(params->wifi_profilesprofn.lastusage_date, buffer, sizeof(params->wifi_profilesprofn.lastusage_date));
 		free (buffer);
 		pos += (len*2+1);
 		if (pos+5 >= size)
 			goto exit;
-		
+
 		n = dtoh32a(&datapos);
 		pos += 4;
 		if (pos+n >= size)
@@ -3901,7 +5281,7 @@
  * ptp_nikon_writewifiprofile:
  *
  * This command gets the ptpip info data.
- *  
+ *
  * params:	PTPParams*
  *	unsigned int profilenr	- profile number
  *	unsigned char *data	- data
@@ -3926,35 +5306,35 @@
 
 	if (!params->wifi_profiles)
 		CHECK_PTP_RC(ptp_nikon_getwifiprofilelist(params));
-	
+
 	for (i = 0; i < params->wifi_profiles_number; i++) {
 		if (!params->wifi_profilesi.valid) {
 			profilenr = params->wifi_profilesi.id;
 			break;
 		}
 	}
-	
+
 	if (profilenr == -1) {
 		/* No free profile! */
 		return PTP_RC_StoreFull;
 	}
-	
+
 	memset(buffer, 0, 1024);
-	
+
 	buffer0x00 = 0x64; /* Version */
-	
+
 	/* Profile name */
 	htod32a(&buffer0x01, 17);
 	/* 16 as third parameter, so there will always be a null-byte in the end */
 	strncpy((char*)&buffer0x05, profile->profile_name, 16);
-	
+
 	buffer0x16 = 0x00; /* Display order */
 	buffer0x17 = profile->device_type;
 	buffer0x18 = profile->icon_type;
-	
+
 	/* FIXME: Creation date: put a real date here */
 	ptp_pack_string(params, "19990909T090909", data, 0x19, &len);
-	
+
 	/* IP parameters */
 	memcpy(&buffer0x3A,&profile->ip_address,sizeof(profile->ip_address));
 	/**((unsigned int*)&buffer0x3A) = profile->ip_address; *//* Do not reverse bytes */
@@ -3962,15 +5342,15 @@
 	memcpy(&buffer0x3F,&profile->gateway_address,sizeof(profile->gateway_address));
 	/**((unsigned int*)&buffer0x3F) = profile->gateway_address; */ /* Do not reverse bytes */
 	buffer0x43 = profile->address_mode;
-	
+
 	/* Wifi parameters */
 	buffer0x44 = profile->access_mode;
 	buffer0x45 = profile->wifi_channel;
-	
+
 	htod32a(&buffer0x46, 33); /* essid */
 	 /* 32 as third parameter, so there will always be a null-byte in the end */
 	strncpy((char*)&buffer0x4A, profile->essid, 32);
-	
+
 	buffer0x6B = profile->authentification;
 	buffer0x6C = profile->encryption;
 	htod32a(&buffer0x6D, 64);
@@ -3979,7 +5359,7 @@
 	}
 	buffer0xB1 = profile->key_nr;
 	memcpy(&buffer0xB2, guid, 16);
-	
+
 	switch(profile->encryption) {
 	case 1: /* WEP 64bit */
 		htod16a(&buffer0xC2, 5); /* (64-24)/8 = 5 */
@@ -3991,7 +5371,7 @@
 		htod16a(&buffer0xC2, 0);
 	}
 	size = 0xC4;
-	       
+
 	PTP_CNT_INIT(ptp, PTP_OC_NIKON_SendProfileData, profilenr);
 	return ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL);
 }
@@ -4000,7 +5380,7 @@
  * ptp_mtp_getobjectpropssupported:
  *
  * This command gets the object properties possible from the device.
- *  
+ *
  * params:	PTPParams*
  *	uint ofc		- object format code
  *	unsigned int *propnum	- number of elements in returned array
@@ -4029,7 +5409,7 @@
  * ptp_mtp_getobjectpropdesc:
  *
  * This command gets the object property description.
- *  
+ *
  * params:	PTPParams*
  *	uint16_t opc	- object property code
  *	uint16_t ofc	- object format code
@@ -4056,7 +5436,7 @@
  * ptp_mtp_getobjectpropvalue:
  *
  * This command gets the object properties of an object handle.
- *  
+ *
  * params:	PTPParams*
  *	uint32_t objectid	- object format code
  *	uint16_t opc		- object prop code
@@ -4073,7 +5453,7 @@
 	uint16_t	ret = PTP_RC_OK;
 	unsigned char	*data = NULL;
 	unsigned int	size, offset = 0;
-        
+
         PTP_CNT_INIT(ptp, PTP_OC_MTP_GetObjectPropValue, oid, opc);
         CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
         if (!ptp_unpack_DPV(params, data, &offset, size, value, datatype)) {
@@ -4088,7 +5468,7 @@
  * ptp_mtp_setobjectpropvalue:
  *
  * This command gets the object properties of an object handle.
- *  
+ *
  * params:	PTPParams*
  *	uint32_t objectid	- object format code
  *	uint16_t opc		- object prop code
@@ -4150,18 +5530,13 @@
 }
 
 uint16_t
-ptp_mtp_getobjectproplist (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops)
+ptp_mtp_getobjectproplist_generic (PTPParams* params, uint32_t handle, uint32_t formats, uint32_t properties, uint32_t propertygroups, uint32_t level, MTPProperties **props, int *nrofprops)
 {
 	PTPContainer	ptp;
 	unsigned char	*data = NULL;
 	unsigned int	size;
 
-	PTP_CNT_INIT(ptp, PTP_OC_MTP_GetObjPropList, handle,
-		     0x00000000U,  /* 0x00000000U should be "all formats" */
-		     0xFFFFFFFFU,  /* 0xFFFFFFFFU should be "all properties" */
-		     0x00000000U,
-		     0xFFFFFFFFU  /* means - return full tree below the Param1 handle */
-	);
+	PTP_CNT_INIT(ptp, PTP_OC_MTP_GetObjPropList, handle, formats, properties, propertygroups, level);
 	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
 	*nrofprops = ptp_unpack_OPL(params, data, props, size);
 	free(data);
@@ -4169,22 +5544,29 @@
 }
 
 uint16_t
-ptp_mtp_getobjectproplist_single (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops)
+ptp_mtp_getobjectproplist_level (PTPParams* params, uint32_t handle, uint32_t level, MTPProperties **props, int *nrofprops)
 {
-	PTPContainer	ptp;
-	unsigned char	*data = NULL;
-	unsigned int	size;
-
-	PTP_CNT_INIT(ptp, PTP_OC_MTP_GetObjPropList, handle,
+	return ptp_mtp_getobjectproplist_generic (params, handle,
 		     0x00000000U,  /* 0x00000000U should be "all formats" */
 		     0xFFFFFFFFU,  /* 0xFFFFFFFFU should be "all properties" */
-		     0x00000000U,
-		     0x00000000U  /* means - return single tree below the Param1 handle */
+		     0,
+		     level,
+		     props,
+		     nrofprops
 	);
-	CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
-	*nrofprops = ptp_unpack_OPL(params, data, props, size);
-	free(data);
-	return PTP_RC_OK;
+}
+
+
+uint16_t
+ptp_mtp_getobjectproplist (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops)
+{
+	return ptp_mtp_getobjectproplist_level(params, handle, 0xFFFFFFFFU, props, nrofprops);
+}
+
+uint16_t
+ptp_mtp_getobjectproplist_single (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops)
+{
+	return ptp_mtp_getobjectproplist_level(params, handle, 0, props, nrofprops);
 }
 
 uint16_t
@@ -4206,7 +5588,7 @@
 	free(data);
 	*store = ptp.Param1;
 	*parenthandle = ptp.Param2;
-	*handle = ptp.Param3; 
+	*handle = ptp.Param3;
 
 	return ret;
 }
@@ -4484,7 +5866,7 @@
 			  lv_data_header *header,
 			  lv_framebuffer_desc *vpd, lv_framebuffer_desc *bmd
 ) {
-	int byte_w;
+	unsigned int byte_w;
 
 	if (data_size < sizeof (*header))
 		return PTP_ERROR_IO;
@@ -4558,6 +5940,45 @@
 }
 
 uint16_t
+ptp_fuji_getdeviceinfo (PTPParams* params, uint16_t **props, unsigned int *numprops)
+{
+        PTPContainer	ptp;
+	uint16_t	ret;
+	unsigned char	*xdata;
+	unsigned char	*data = NULL;
+	unsigned int	nums, i, newoffset, xsize, size  = 0;
+
+        PTP_CNT_INIT(ptp, PTP_OC_FUJI_GetDeviceInfo);
+        ret = ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size);
+
+	if (ret != PTP_RC_OK) return ret;
+
+	if (size < 8) {
+		free (data);
+		return PTP_RC_GeneralError;
+	}
+
+	nums = dtoh32a(data);
+	xdata = data + 4;
+	xsize = size - 4;
+
+	*props = calloc(sizeof(uint16_t),nums);
+	*numprops = nums;
+	for (i=0;i<nums;i++) {
+		PTPDevicePropDesc	dpd;
+		unsigned int		dsize = dtoh32a(xdata);
+
+		if (!ptp_unpack_DPD(params, xdata+4, &dpd, dsize, &newoffset))
+			break;
+		(*props)i = dpd.DevicePropertyCode;
+		xdata	+= 4+newoffset;
+		xsize	-= 4+newoffset;
+	}
+	free (data);
+	return ret;
+}
+
+uint16_t
 ptp_fuji_getevents (PTPParams* params, uint16_t** events, uint16_t* count)
 {
 	PTPContainer	ptp;
@@ -4573,7 +5994,7 @@
                 *count = dtoh16a(data);
                 ptp_debug(params, "event count: %d", *count);
                 *events = calloc(*count, sizeof(uint16_t));
-                if(size >= 2 + *count * 6)
+                if(size >= 2u + *count * 6)
                 {
 			uint16_t	param;
 			uint32_t	value;
@@ -4581,15 +6002,25 @@
 
 			for(i = 0; i < *count; i++)
 			{
+				unsigned int j;
+
 				param = dtoh16a(&data2 + 6 * i);
 				value = dtoh32a(&data2 + 6 * i + 2);
-				*eventsi = param;
+				(*events)i = param;
 				ptp_debug(params, "param: %02x, value: %d ", param, value);
+
+				/* reset the property cache entry for refetch ... */
+				for (j=0;j<params->nrofdeviceproperties;j++)
+					if (params->devicepropertiesj.desc.DevicePropertyCode == param)
+						break;
+				if (j != params->nrofdeviceproperties) {
+					params->devicepropertiesj.timestamp = 0;
+				}
 			}
 		}
 	}
 	free(data);
-	return PTP_RC_OK;        
+	return PTP_RC_OK;
 }
 
 
@@ -4679,31 +6110,67 @@
 	{PTP_RC_SessionAlreadyOpened,	0, N_("PTP Session Already Opened")},
 	{PTP_RC_TransactionCanceled,	0, N_("PTP Transaction Canceled")},
 	{PTP_RC_SpecificationOfDestinationUnsupported, 0, N_("PTP Specification Of Destination Unsupported")},
+	{PTP_RC_InvalidEnumHandle,	0, N_("Invalid Enum Handle")},
+	{PTP_RC_NoStreamEnabled,	0, N_("No Stream Enabled")},
+	{PTP_RC_InvalidDataSet,		0, N_("Invalid Data Set")},
 
 	{PTP_RC_EK_FilenameRequired,	PTP_VENDOR_EASTMAN_KODAK, N_("Filename Required")},
 	{PTP_RC_EK_FilenameConflicts,	PTP_VENDOR_EASTMAN_KODAK, N_("Filename Conflicts")},
 	{PTP_RC_EK_FilenameInvalid,	PTP_VENDOR_EASTMAN_KODAK, N_("Filename Invalid")},
 
-	{PTP_RC_NIKON_HardwareError,		PTP_VENDOR_NIKON, N_("Hardware Error")},
-	{PTP_RC_NIKON_OutOfFocus,		PTP_VENDOR_NIKON, N_("Out of Focus")},
-	{PTP_RC_NIKON_ChangeCameraModeFailed,	PTP_VENDOR_NIKON, N_("Change Camera Mode Failed")},
-	{PTP_RC_NIKON_InvalidStatus,		PTP_VENDOR_NIKON, N_("Invalid Status")},
-	{PTP_RC_NIKON_SetPropertyNotSupported,	PTP_VENDOR_NIKON, N_("Set Property Not Supported")},
-	{PTP_RC_NIKON_WbResetError,		PTP_VENDOR_NIKON, N_("Whitebalance Reset Error")},
-	{PTP_RC_NIKON_DustReferenceError,	PTP_VENDOR_NIKON, N_("Dust Reference Error")},
-	{PTP_RC_NIKON_ShutterSpeedBulb,		PTP_VENDOR_NIKON, N_("Shutter Speed Bulb")},
-	{PTP_RC_NIKON_MirrorUpSequence,		PTP_VENDOR_NIKON, N_("Mirror Up Sequence")},
-	{PTP_RC_NIKON_CameraModeNotAdjustFNumber, PTP_VENDOR_NIKON, N_("Camera Mode Not Adjust FNumber")},
-	{PTP_RC_NIKON_NotLiveView,		PTP_VENDOR_NIKON, N_("Not in Liveview")},
-	{PTP_RC_NIKON_MfDriveStepEnd,		PTP_VENDOR_NIKON, N_("Mf Drive Step End")},
-	{PTP_RC_NIKON_MfDriveStepInsufficiency,	PTP_VENDOR_NIKON, N_("Mf Drive Step Insufficiency")},
-	{PTP_RC_NIKON_AdvancedTransferCancel,	PTP_VENDOR_NIKON, N_("Advanced Transfer Cancel")},
-
-	{PTP_RC_CANON_UNKNOWN_COMMAND,	PTP_VENDOR_CANON, N_("Unknown Command")},
-	{PTP_RC_CANON_OPERATION_REFUSED,PTP_VENDOR_CANON, N_("Operation Refused")},
-	{PTP_RC_CANON_LENS_COVER,	PTP_VENDOR_CANON, N_("Lens Cover Present")},
-	{PTP_RC_CANON_BATTERY_LOW,	PTP_VENDOR_CANON, N_("Battery Low")},
-	{PTP_RC_CANON_NOT_READY,	PTP_VENDOR_CANON, N_("Camera Not Ready")},
+	{PTP_RC_NIKON_HardwareError,			PTP_VENDOR_NIKON, N_("Hardware Error")},
+	{PTP_RC_NIKON_OutOfFocus,			PTP_VENDOR_NIKON, N_("Out of Focus")},
+	{PTP_RC_NIKON_ChangeCameraModeFailed,		PTP_VENDOR_NIKON, N_("Change Camera Mode Failed")},
+	{PTP_RC_NIKON_InvalidStatus,			PTP_VENDOR_NIKON, N_("Invalid Status")},
+	{PTP_RC_NIKON_SetPropertyNotSupported,		PTP_VENDOR_NIKON, N_("Set Property Not Supported")},
+	{PTP_RC_NIKON_WbResetError,			PTP_VENDOR_NIKON, N_("Whitebalance Reset Error")},
+	{PTP_RC_NIKON_DustReferenceError,		PTP_VENDOR_NIKON, N_("Dust Reference Error")},
+	{PTP_RC_NIKON_ShutterSpeedBulb,			PTP_VENDOR_NIKON, N_("Shutter Speed Bulb")},
+	{PTP_RC_NIKON_MirrorUpSequence,			PTP_VENDOR_NIKON, N_("Mirror Up Sequence")},
+	{PTP_RC_NIKON_CameraModeNotAdjustFNumber,	PTP_VENDOR_NIKON, N_("Camera Mode Not Adjust FNumber")},
+	{PTP_RC_NIKON_NotLiveView,			PTP_VENDOR_NIKON, N_("Not in Liveview")},
+	{PTP_RC_NIKON_MfDriveStepEnd,			PTP_VENDOR_NIKON, N_("Mf Drive Step End")},
+	{PTP_RC_NIKON_MfDriveStepInsufficiency,		PTP_VENDOR_NIKON, N_("Mf Drive Step Insufficiency")},
+	{PTP_RC_NIKON_AdvancedTransferCancel,		PTP_VENDOR_NIKON, N_("Advanced Transfer Cancel")},
+	{PTP_RC_NIKON_NoFullHDPresent,			PTP_VENDOR_NIKON, N_("No Full HD Present")},
+	{PTP_RC_NIKON_StoreError,			PTP_VENDOR_NIKON, N_("Store Error")},
+	{PTP_RC_NIKON_StoreUnformatted,			PTP_VENDOR_NIKON, N_("Store Unformatted")},
+	{PTP_RC_NIKON_Bulb_Release_Busy,		PTP_VENDOR_NIKON, N_("Bulb Release Busy")},
+	{PTP_RC_NIKON_Silent_Release_Busy,		PTP_VENDOR_NIKON, N_("Silent Release Busy")},
+	{PTP_RC_NIKON_MovieFrame_Release_Busy,		PTP_VENDOR_NIKON, N_("MovieFrame Release Busy")},
+	{PTP_RC_NIKON_Shutter_Speed_Time,		PTP_VENDOR_NIKON, N_("Shutter Speed Time")},
+	{PTP_RC_NIKON_Waiting_2ndRelease,		PTP_VENDOR_NIKON, N_("Waiting for 2nd Release")},
+	{PTP_RC_NIKON_MirrorUpCapture_Already_Start,	PTP_VENDOR_NIKON, N_("MirrorUpCapture Already Started")},
+	{PTP_RC_NIKON_Invalid_SBAttribute_Value,	PTP_VENDOR_NIKON, N_("Invalid SBAttribute Value")},
+
+	{PTP_RC_CANON_UNKNOWN_COMMAND,			PTP_VENDOR_CANON, N_("Unknown Command")},
+	{PTP_RC_CANON_OPERATION_REFUSED,		PTP_VENDOR_CANON, N_("Operation Refused")},
+	{PTP_RC_CANON_LENS_COVER,			PTP_VENDOR_CANON, N_("Lens Cover Present")},
+	{PTP_RC_CANON_BATTERY_LOW,			PTP_VENDOR_CANON, N_("Battery Low")},
+	{PTP_RC_CANON_NOT_READY,			PTP_VENDOR_CANON, N_("Camera Not Ready")},
+	{PTP_RC_CANON_EOS_UnknownCommand,		PTP_VENDOR_CANON, N_("Unknown Command")},
+	{PTP_RC_CANON_EOS_OperationRefused,		PTP_VENDOR_CANON, N_("Operation Refused")},
+	{PTP_RC_CANON_EOS_LensCoverClosed,		PTP_VENDOR_CANON, N_("Lens Cover Closed")},
+	{PTP_RC_CANON_EOS_LowBattery,			PTP_VENDOR_CANON, N_("Low Battery")},
+	{PTP_RC_CANON_EOS_ObjectNotReady,		PTP_VENDOR_CANON, N_("Object Not Ready")},
+	{PTP_RC_CANON_EOS_CannotMakeObject, 		PTP_VENDOR_CANON, N_("Cannot Make Object")},
+	{PTP_RC_CANON_EOS_MemoryStatusNotReady, 	PTP_VENDOR_CANON, N_("Memory Status Not Ready")},
+
+	{PTP_RC_MTP_Undefined,				0,	N_("Undefined")},
+	{PTP_RC_MTP_Invalid_ObjectPropCode,		0,	N_("Invalid ObjectPropCode")},
+	{PTP_RC_MTP_Invalid_ObjectProp_Format,		0, 	N_("Invalid ObjectProp Format")},
+	{PTP_RC_MTP_Invalid_ObjectProp_Value,		0,	N_("Invalid ObjectProp Value")},
+	{PTP_RC_MTP_Invalid_ObjectReference,		0,	N_("Invalid ObjectReference")},
+	{PTP_RC_MTP_Invalid_Dataset,			0, 	N_("Invalid Dataset")},
+	{PTP_RC_MTP_Specification_By_Group_Unsupported,	0,	N_("Specification By Group Unsupported")},
+	{PTP_RC_MTP_Specification_By_Depth_Unsupported,	0,	N_("Specification By Depth Unsupported")},
+	{PTP_RC_MTP_Object_Too_Large,			0,	N_("Object Too Large")},
+	{PTP_RC_MTP_ObjectProp_Not_Supported,		0,	N_("ObjectProp Not Supported")},
+	{PTP_RC_MTP_Invalid_Media_Session_ID,		0,	N_("Invalid Media Session ID")},
+	{PTP_RC_MTP_Media_Session_Limit_Reached,	0,	N_("Media Session Limit Reached")},
+	{PTP_RC_MTP_No_More_Data,			0,	N_("No More Data")},
+	{PTP_RC_MTP_Invalid_WFC_Syntax,			0,	N_("Invalid WFC Syntax")},
+	{PTP_RC_MTP_WFC_Version_Not_Supported,		0,	N_("WFC Version Not Supported")},
 
 	{PTP_ERROR_NODEVICE,		0, N_("PTP No Device")},
 	{PTP_ERROR_TIMEOUT,		0, N_("PTP Timeout")},
@@ -4874,6 +6341,239 @@
 		{PTP_DPC_CANON_TypeOfSupportedSlideShow,	N_("Type of Slideshow")},
 		{PTP_DPC_CANON_AverageFilesizes,N_("Average Filesizes")},
 		{PTP_DPC_CANON_ModelID,		N_("Model ID")},
+		{PTP_DPC_CANON_EOS_FixedMovie,	N_("EOS Fixed Movie Switch")},
+
+		{PTP_DPC_CANON_EOS_PowerZoomPosition,"EOS_PowerZoomPosition"},
+		{PTP_DPC_CANON_EOS_StrobeSettingSimple,"EOS_StrobeSettingSimple"},
+		{PTP_DPC_CANON_EOS_ConnectTrigger,"EOS_ConnectTrigger"},
+		{PTP_DPC_CANON_EOS_ChangeCameraMode,"EOS_ChangeCameraMode"},
+		{PTP_DPC_CANON_EOS_Aperture,"EOS_Aperture"},
+		{PTP_DPC_CANON_EOS_ShutterSpeed,"EOS_ShutterSpeed"},
+		{PTP_DPC_CANON_EOS_ISOSpeed,"EOS_ISOSpeed"},
+		{PTP_DPC_CANON_EOS_ExpCompensation,"EOS_ExpCompensation"},
+		{PTP_DPC_CANON_EOS_AutoExposureMode,"EOS_AutoExposureMode"},
+		{PTP_DPC_CANON_EOS_DriveMode,"EOS_DriveMode"},
+		{PTP_DPC_CANON_EOS_MeteringMode,"EOS_MeteringMode"},
+		{PTP_DPC_CANON_EOS_FocusMode,"EOS_FocusMode"},
+		{PTP_DPC_CANON_EOS_WhiteBalance,"EOS_WhiteBalance"},
+		{PTP_DPC_CANON_EOS_ColorTemperature,"EOS_ColorTemperature"},
+		{PTP_DPC_CANON_EOS_WhiteBalanceAdjustA,"EOS_WhiteBalanceAdjustA"},
+		{PTP_DPC_CANON_EOS_WhiteBalanceAdjustB,"EOS_WhiteBalanceAdjustB"},
+		{PTP_DPC_CANON_EOS_WhiteBalanceXA,"EOS_WhiteBalanceXA"},
+		{PTP_DPC_CANON_EOS_WhiteBalanceXB,"EOS_WhiteBalanceXB"},
+		{PTP_DPC_CANON_EOS_ColorSpace,"EOS_ColorSpace"},
+		{PTP_DPC_CANON_EOS_PictureStyle,"EOS_PictureStyle"},
+		{PTP_DPC_CANON_EOS_BatteryPower,"EOS_BatteryPower"},
+		{PTP_DPC_CANON_EOS_BatterySelect,"EOS_BatterySelect"},
+		{PTP_DPC_CANON_EOS_CameraTime,"EOS_CameraTime"},
+		{PTP_DPC_CANON_EOS_AutoPowerOff,"EOS_AutoPowerOff"},
+		{PTP_DPC_CANON_EOS_Owner,"EOS_Owner"},
+		{PTP_DPC_CANON_EOS_ModelID,"EOS_ModelID"},
+		{PTP_DPC_CANON_EOS_PTPExtensionVersion,"EOS_PTPExtensionVersion"},
+		{PTP_DPC_CANON_EOS_DPOFVersion,"EOS_DPOFVersion"},
+		{PTP_DPC_CANON_EOS_AvailableShots,"EOS_AvailableShots"},
+		{PTP_DPC_CANON_EOS_CaptureDestination,"EOS_CaptureDestination"},
+		{PTP_DPC_CANON_EOS_BracketMode,"EOS_BracketMode"},
+		{PTP_DPC_CANON_EOS_CurrentStorage,"EOS_CurrentStorage"},
+		{PTP_DPC_CANON_EOS_CurrentFolder,"EOS_CurrentFolder"},
+		{PTP_DPC_CANON_EOS_ImageFormat,"EOS_ImageFormat"},
+		{PTP_DPC_CANON_EOS_ImageFormatCF,"EOS_ImageFormatCF"},
+		{PTP_DPC_CANON_EOS_ImageFormatSD,"EOS_ImageFormatSD"},
+		{PTP_DPC_CANON_EOS_ImageFormatExtHD,"EOS_ImageFormatExtHD"},
+		{PTP_DPC_CANON_EOS_RefocusState,"EOS_RefocusState"},
+		{PTP_DPC_CANON_EOS_CameraNickname,"EOS_CameraNickname"},
+		{PTP_DPC_CANON_EOS_StroboSettingExpCompositionControl,"EOS_StroboSettingExpCompositionControl"},
+		{PTP_DPC_CANON_EOS_ConnectStatus,"EOS_ConnectStatus"},
+		{PTP_DPC_CANON_EOS_LensBarrelStatus,"EOS_LensBarrelStatus"},
+		{PTP_DPC_CANON_EOS_SilentShutterSetting,"EOS_SilentShutterSetting"},
+		{PTP_DPC_CANON_EOS_LV_AF_EyeDetect,"EOS_LV_AF_EyeDetect"},
+		{PTP_DPC_CANON_EOS_AutoTransMobile,"EOS_AutoTransMobile"},
+		{PTP_DPC_CANON_EOS_URLSupportFormat,"EOS_URLSupportFormat"},
+		{PTP_DPC_CANON_EOS_SpecialAcc,"EOS_SpecialAcc"},
+		{PTP_DPC_CANON_EOS_CompressionS,"EOS_CompressionS"},
+		{PTP_DPC_CANON_EOS_CompressionM1,"EOS_CompressionM1"},
+		{PTP_DPC_CANON_EOS_CompressionM2,"EOS_CompressionM2"},
+		{PTP_DPC_CANON_EOS_CompressionL,"EOS_CompressionL"},
+		{PTP_DPC_CANON_EOS_IntervalShootSetting,"EOS_IntervalShootSetting"},
+		{PTP_DPC_CANON_EOS_IntervalShootState,"EOS_IntervalShootState"},
+		{PTP_DPC_CANON_EOS_PushMode,"EOS_PushMode"},
+		{PTP_DPC_CANON_EOS_LvCFilterKind,"EOS_LvCFilterKind"},
+		{PTP_DPC_CANON_EOS_AEModeDial,"EOS_AEModeDial"},
+		{PTP_DPC_CANON_EOS_AEModeCustom,"EOS_AEModeCustom"},
+		{PTP_DPC_CANON_EOS_MirrorUpSetting,"EOS_MirrorUpSetting"},
+		{PTP_DPC_CANON_EOS_HighlightTonePriority,"EOS_HighlightTonePriority"},
+		{PTP_DPC_CANON_EOS_AFSelectFocusArea,"EOS_AFSelectFocusArea"},
+		{PTP_DPC_CANON_EOS_HDRSetting,"EOS_HDRSetting"},
+		{PTP_DPC_CANON_EOS_TimeShootSetting,"EOS_TimeShootSetting"},
+		{PTP_DPC_CANON_EOS_NFCApplicationInfo,"EOS_NFCApplicationInfo"},
+		{PTP_DPC_CANON_EOS_PCWhiteBalance1,"EOS_PCWhiteBalance1"},
+		{PTP_DPC_CANON_EOS_PCWhiteBalance2,"EOS_PCWhiteBalance2"},
+		{PTP_DPC_CANON_EOS_PCWhiteBalance3,"EOS_PCWhiteBalance3"},
+		{PTP_DPC_CANON_EOS_PCWhiteBalance4,"EOS_PCWhiteBalance4"},
+		{PTP_DPC_CANON_EOS_PCWhiteBalance5,"EOS_PCWhiteBalance5"},
+		{PTP_DPC_CANON_EOS_MWhiteBalance,"EOS_MWhiteBalance"},
+		{PTP_DPC_CANON_EOS_MWhiteBalanceEx,"EOS_MWhiteBalanceEx"},
+		{PTP_DPC_CANON_EOS_PowerZoomSpeed,"EOS_PowerZoomSpeed"},
+		{PTP_DPC_CANON_EOS_NetworkServerRegion,"EOS_NetworkServerRegion"},
+		{PTP_DPC_CANON_EOS_GPSLogCtrl,"EOS_GPSLogCtrl"},
+		{PTP_DPC_CANON_EOS_GPSLogListNum,"EOS_GPSLogListNum"},
+		{PTP_DPC_CANON_EOS_UnknownPropD14D,"EOS_UnknownPropD14D"},
+		{PTP_DPC_CANON_EOS_PictureStyleStandard,"EOS_PictureStyleStandard"},
+		{PTP_DPC_CANON_EOS_PictureStylePortrait,"EOS_PictureStylePortrait"},
+		{PTP_DPC_CANON_EOS_PictureStyleLandscape,"EOS_PictureStyleLandscape"},
+		{PTP_DPC_CANON_EOS_PictureStyleNeutral,"EOS_PictureStyleNeutral"},
+		{PTP_DPC_CANON_EOS_PictureStyleFaithful,"EOS_PictureStyleFaithful"},
+		{PTP_DPC_CANON_EOS_PictureStyleBlackWhite,"EOS_PictureStyleBlackWhite"},
+		{PTP_DPC_CANON_EOS_PictureStyleAuto,"EOS_PictureStyleAuto"},
+		{PTP_DPC_CANON_EOS_PictureStyleExStandard,"EOS_PictureStyleExStandard"},
+		{PTP_DPC_CANON_EOS_PictureStyleExPortrait,"EOS_PictureStyleExPortrait"},
+		{PTP_DPC_CANON_EOS_PictureStyleExLandscape,"EOS_PictureStyleExLandscape"},
+		{PTP_DPC_CANON_EOS_PictureStyleExNeutral,"EOS_PictureStyleExNeutral"},
+		{PTP_DPC_CANON_EOS_PictureStyleExFaithful,"EOS_PictureStyleExFaithful"},
+		{PTP_DPC_CANON_EOS_PictureStyleExBlackWhite,"EOS_PictureStyleExBlackWhite"},
+		{PTP_DPC_CANON_EOS_PictureStyleExAuto,"EOS_PictureStyleExAuto"},
+		{PTP_DPC_CANON_EOS_PictureStyleExFineDetail,"EOS_PictureStyleExFineDetail"},
+		{PTP_DPC_CANON_EOS_PictureStyleUserSet1,"EOS_PictureStyleUserSet1"},
+		{PTP_DPC_CANON_EOS_PictureStyleUserSet2,"EOS_PictureStyleUserSet2"},
+		{PTP_DPC_CANON_EOS_PictureStyleUserSet3,"EOS_PictureStyleUserSet3"},
+		{PTP_DPC_CANON_EOS_PictureStyleExUserSet1,"EOS_PictureStyleExUserSet1"},
+		{PTP_DPC_CANON_EOS_PictureStyleExUserSet2,"EOS_PictureStyleExUserSet2"},
+		{PTP_DPC_CANON_EOS_PictureStyleExUserSet3,"EOS_PictureStyleExUserSet3"},
+		{PTP_DPC_CANON_EOS_MovieAVModeFine,"EOS_MovieAVModeFine"},
+		{PTP_DPC_CANON_EOS_ShutterReleaseCounter,"EOS_ShutterReleaseCounter"},
+		{PTP_DPC_CANON_EOS_AvailableImageSize,"EOS_AvailableImageSize"},
+		{PTP_DPC_CANON_EOS_ErrorHistory,"EOS_ErrorHistory"},
+		{PTP_DPC_CANON_EOS_LensExchangeHistory,"EOS_LensExchangeHistory"},
+		{PTP_DPC_CANON_EOS_StroboExchangeHistory,"EOS_StroboExchangeHistory"},
+		{PTP_DPC_CANON_EOS_PictureStyleParam1,"EOS_PictureStyleParam1"},
+		{PTP_DPC_CANON_EOS_PictureStyleParam2,"EOS_PictureStyleParam2"},
+		{PTP_DPC_CANON_EOS_PictureStyleParam3,"EOS_PictureStyleParam3"},
+		{PTP_DPC_CANON_EOS_MovieRecordVolumeLine,"EOS_MovieRecordVolumeLine"},
+		{PTP_DPC_CANON_EOS_NetworkCommunicationMode,"EOS_NetworkCommunicationMode"},
+		{PTP_DPC_CANON_EOS_CanonLogGamma,"EOS_CanonLogGamma"},
+		{PTP_DPC_CANON_EOS_SmartphoneShowImageConfig,"EOS_SmartphoneShowImageConfig"},
+		{PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction,"EOS_HighISOSettingNoiseReduction"},
+		{PTP_DPC_CANON_EOS_MovieServoAF,"EOS_MovieServoAF"},
+		{PTP_DPC_CANON_EOS_ContinuousAFValid,"EOS_ContinuousAFValid"},
+		{PTP_DPC_CANON_EOS_Attenuator,"EOS_Attenuator"},
+		{PTP_DPC_CANON_EOS_UTCTime,"EOS_UTCTime"},
+		{PTP_DPC_CANON_EOS_Timezone,"EOS_Timezone"},
+		{PTP_DPC_CANON_EOS_Summertime,"EOS_Summertime"},
+		{PTP_DPC_CANON_EOS_FlavorLUTParams,"EOS_FlavorLUTParams"},
+		{PTP_DPC_CANON_EOS_CustomFunc1,"EOS_CustomFunc1"},
+		{PTP_DPC_CANON_EOS_CustomFunc2,"EOS_CustomFunc2"},
+		{PTP_DPC_CANON_EOS_CustomFunc3,"EOS_CustomFunc3"},
+		{PTP_DPC_CANON_EOS_CustomFunc4,"EOS_CustomFunc4"},
+		{PTP_DPC_CANON_EOS_CustomFunc5,"EOS_CustomFunc5"},
+		{PTP_DPC_CANON_EOS_CustomFunc6,"EOS_CustomFunc6"},
+		{PTP_DPC_CANON_EOS_CustomFunc7,"EOS_CustomFunc7"},
+		{PTP_DPC_CANON_EOS_CustomFunc8,"EOS_CustomFunc8"},
+		{PTP_DPC_CANON_EOS_CustomFunc9,"EOS_CustomFunc9"},
+		{PTP_DPC_CANON_EOS_CustomFunc10,"EOS_CustomFunc10"},
+		{PTP_DPC_CANON_EOS_CustomFunc11,"EOS_CustomFunc11"},
+		{PTP_DPC_CANON_EOS_CustomFunc12,"EOS_CustomFunc12"},
+		{PTP_DPC_CANON_EOS_CustomFunc13,"EOS_CustomFunc13"},
+		{PTP_DPC_CANON_EOS_CustomFunc14,"EOS_CustomFunc14"},
+		{PTP_DPC_CANON_EOS_CustomFunc15,"EOS_CustomFunc15"},
+		{PTP_DPC_CANON_EOS_CustomFunc16,"EOS_CustomFunc16"},
+		{PTP_DPC_CANON_EOS_CustomFunc17,"EOS_CustomFunc17"},
+		{PTP_DPC_CANON_EOS_CustomFunc18,"EOS_CustomFunc18"},
+		{PTP_DPC_CANON_EOS_CustomFunc19,"EOS_CustomFunc19"},
+		{PTP_DPC_CANON_EOS_CustomFunc19,"EOS_CustomFunc19"},
+		{PTP_DPC_CANON_EOS_InnerDevelop,"EOS_InnerDevelop"},
+		{PTP_DPC_CANON_EOS_MultiAspect,"EOS_MultiAspect"},
+		{PTP_DPC_CANON_EOS_MovieSoundRecord,"EOS_MovieSoundRecord"},
+		{PTP_DPC_CANON_EOS_MovieRecordVolume,"EOS_MovieRecordVolume"},
+		{PTP_DPC_CANON_EOS_WindCut,"EOS_WindCut"},
+		{PTP_DPC_CANON_EOS_ExtenderType,"EOS_ExtenderType"},
+		{PTP_DPC_CANON_EOS_OLCInfoVersion,"EOS_OLCInfoVersion"},
+		{PTP_DPC_CANON_EOS_UnknownPropD19A,"EOS_UnknownPropD19A"},
+		{PTP_DPC_CANON_EOS_UnknownPropD19C,"EOS_UnknownPropD19C"},
+		{PTP_DPC_CANON_EOS_UnknownPropD19D,"EOS_UnknownPropD19D"},
+		{PTP_DPC_CANON_EOS_GPSDeviceActive,"EOS_GPSDeviceActive"},
+		{PTP_DPC_CANON_EOS_CustomFuncEx,"EOS_CustomFuncEx"},
+		{PTP_DPC_CANON_EOS_MyMenu,"EOS_MyMenu"},
+		{PTP_DPC_CANON_EOS_MyMenuList,"EOS_MyMenuList"},
+		{PTP_DPC_CANON_EOS_WftStatus,"EOS_WftStatus"},
+		{PTP_DPC_CANON_EOS_WftInputTransmission,"EOS_WftInputTransmission"},
+		{PTP_DPC_CANON_EOS_HDDirectoryStructure,"EOS_HDDirectoryStructure"},
+		{PTP_DPC_CANON_EOS_BatteryInfo,"EOS_BatteryInfo"},
+		{PTP_DPC_CANON_EOS_AdapterInfo,"EOS_AdapterInfo"},
+		{PTP_DPC_CANON_EOS_LensStatus,"EOS_LensStatus"},
+		{PTP_DPC_CANON_EOS_QuickReviewTime,"EOS_QuickReviewTime"},
+		{PTP_DPC_CANON_EOS_CardExtension,"EOS_CardExtension"},
+		{PTP_DPC_CANON_EOS_TempStatus,"EOS_TempStatus"},
+		{PTP_DPC_CANON_EOS_ShutterCounter,"EOS_ShutterCounter"},
+		{PTP_DPC_CANON_EOS_SpecialOption,"EOS_SpecialOption"},
+		{PTP_DPC_CANON_EOS_PhotoStudioMode,"EOS_PhotoStudioMode"},
+		{PTP_DPC_CANON_EOS_SerialNumber,"EOS_SerialNumber"},
+		{PTP_DPC_CANON_EOS_EVFOutputDevice,"EOS_EVFOutputDevice"},
+		{PTP_DPC_CANON_EOS_EVFMode,"EOS_EVFMode"},
+		{PTP_DPC_CANON_EOS_DepthOfFieldPreview,"EOS_DepthOfFieldPreview"},
+		{PTP_DPC_CANON_EOS_EVFSharpness,"EOS_EVFSharpness"},
+		{PTP_DPC_CANON_EOS_EVFWBMode,"EOS_EVFWBMode"},
+		{PTP_DPC_CANON_EOS_EVFClickWBCoeffs,"EOS_EVFClickWBCoeffs"},
+		{PTP_DPC_CANON_EOS_EVFColorTemp,"EOS_EVFColorTemp"},
+		{PTP_DPC_CANON_EOS_ExposureSimMode,"EOS_ExposureSimMode"},
+		{PTP_DPC_CANON_EOS_EVFRecordStatus,"EOS_EVFRecordStatus"},
+		{PTP_DPC_CANON_EOS_LvAfSystem,"EOS_LvAfSystem"},
+		{PTP_DPC_CANON_EOS_MovSize,"EOS_MovSize"},
+		{PTP_DPC_CANON_EOS_LvViewTypeSelect,"EOS_LvViewTypeSelect"},
+		{PTP_DPC_CANON_EOS_MirrorDownStatus,"EOS_MirrorDownStatus"},
+		{PTP_DPC_CANON_EOS_MovieParam,"EOS_MovieParam"},
+		{PTP_DPC_CANON_EOS_MirrorLockupState,"EOS_MirrorLockupState"},
+		{PTP_DPC_CANON_EOS_FlashChargingState,"EOS_FlashChargingState"},
+		{PTP_DPC_CANON_EOS_AloMode,"EOS_AloMode"},
+		{PTP_DPC_CANON_EOS_OneShotRawOn,"EOS_OneShotRawOn"},
+		{PTP_DPC_CANON_EOS_ErrorForDisplay,"EOS_ErrorForDisplay"},
+		{PTP_DPC_CANON_EOS_AEModeMovie,"EOS_AEModeMovie"},
+		{PTP_DPC_CANON_EOS_BuiltinStroboMode,"EOS_BuiltinStroboMode"},
+		{PTP_DPC_CANON_EOS_StroboDispState,"EOS_StroboDispState"},
+		{PTP_DPC_CANON_EOS_StroboETTL2Metering,"EOS_StroboETTL2Metering"},
+		{PTP_DPC_CANON_EOS_ContinousAFMode,"EOS_ContinousAFMode"},
+		{PTP_DPC_CANON_EOS_MovieParam2,"EOS_MovieParam2"},
+		{PTP_DPC_CANON_EOS_StroboSettingExpComposition,"EOS_StroboSettingExpComposition"},
+		{PTP_DPC_CANON_EOS_MovieParam3,"EOS_MovieParam3"},
+		{PTP_DPC_CANON_EOS_MovieParam4,"EOS_MovieParam4"},
+		{PTP_DPC_CANON_EOS_LVMedicalRotate,"EOS_LVMedicalRotate"},
+		{PTP_DPC_CANON_EOS_Artist,"EOS_Artist"},
+		{PTP_DPC_CANON_EOS_Copyright,"EOS_Copyright"},
+		{PTP_DPC_CANON_EOS_BracketValue,"EOS_BracketValue"},
+		{PTP_DPC_CANON_EOS_FocusInfoEx,"EOS_FocusInfoEx"},
+		{PTP_DPC_CANON_EOS_DepthOfField,"EOS_DepthOfField"},
+		{PTP_DPC_CANON_EOS_Brightness,"EOS_Brightness"},
+		{PTP_DPC_CANON_EOS_LensAdjustParams,"EOS_LensAdjustParams"},
+		{PTP_DPC_CANON_EOS_EFComp,"EOS_EFComp"},
+		{PTP_DPC_CANON_EOS_LensName,"EOS_LensName"},
+		{PTP_DPC_CANON_EOS_AEB,"EOS_AEB"},
+		{PTP_DPC_CANON_EOS_StroboSetting,"EOS_StroboSetting"},
+		{PTP_DPC_CANON_EOS_StroboWirelessSetting,"EOS_StroboWirelessSetting"},
+		{PTP_DPC_CANON_EOS_StroboFiring,"EOS_StroboFiring"},
+		{PTP_DPC_CANON_EOS_LensID,"EOS_LensID"},
+		{PTP_DPC_CANON_EOS_LCDBrightness,"EOS_LCDBrightness"},
+		{PTP_DPC_CANON_EOS_CADarkBright,"EOS_CADarkBright"},
+		{PTP_DPC_CANON_EOS_CAssistPreset,"EOS_CAssistPreset"},
+		{PTP_DPC_CANON_EOS_CAssistBrightness,"EOS_CAssistBrightness"},
+		{PTP_DPC_CANON_EOS_CAssistContrast,"EOS_CAssistContrast"},
+		{PTP_DPC_CANON_EOS_CAssistSaturation,"EOS_CAssistSaturation"},
+		{PTP_DPC_CANON_EOS_CAssistColorBA,"EOS_CAssistColorBA"},
+		{PTP_DPC_CANON_EOS_CAssistColorMG,"EOS_CAssistColorMG"},
+		{PTP_DPC_CANON_EOS_CAssistMonochrome,"EOS_CAssistMonochrome"},
+		{PTP_DPC_CANON_EOS_FocusShiftSetting,"EOS_FocusShiftSetting"},
+		{PTP_DPC_CANON_EOS_MovieSelfTimer,"EOS_MovieSelfTimer"},
+		{PTP_DPC_CANON_EOS_Clarity,"EOS_Clarity"},
+		{PTP_DPC_CANON_EOS_2GHDRSetting,"EOS_2GHDRSetting"},
+		{PTP_DPC_CANON_EOS_MovieParam5,"EOS_MovieParam5"},
+		{PTP_DPC_CANON_EOS_HDRViewAssistModeRec,"EOS_HDRViewAssistModeRec"},
+		{PTP_DPC_CANON_EOS_PropFinderAFFrame,"EOS_PropFinderAFFrame"},
+		{PTP_DPC_CANON_EOS_VariableMovieRecSetting,"EOS_VariableMovieRecSetting"},
+		{PTP_DPC_CANON_EOS_PropAutoRotate,"EOS_PropAutoRotate"},
+		{PTP_DPC_CANON_EOS_MFPeakingSetting,"EOS_MFPeakingSetting"},
+		{PTP_DPC_CANON_EOS_MovieSpatialOversampling,"EOS_MovieSpatialOversampling"},
+		{PTP_DPC_CANON_EOS_MovieCropMode,"EOS_MovieCropMode"},
+		{PTP_DPC_CANON_EOS_ShutterType,"EOS_ShutterType"},
+		{PTP_DPC_CANON_EOS_WFTBatteryPower,"EOS_WFTBatteryPower"},
+		{PTP_DPC_CANON_EOS_BatteryInfoEx,"EOS_BatteryInfoEx"},
 		{0,NULL}
 	};
 
@@ -5248,7 +6948,7 @@
 		{PTP_DPC_NIKON_ActiveDLighting,			/* 0xD14E */
 		 N_("Active D-Lighting")},
 		{PTP_DPC_NIKON_FlourescentType,			/* 0xD14F */
-		 N_("Flourescent Type")},
+		 N_("Fluorescent Type")},
 		{PTP_DPC_NIKON_TuneColourTemperature,		/* 0xD150 */
 		 N_("Tune Colour Temperature")},
 		{PTP_DPC_NIKON_TunePreset0,			/* 0xD151 */
@@ -5372,10 +7072,22 @@
 		/* nikon 1 stuff */
 		{PTP_DPC_NIKON_1_ISO,				/* 0xf002 */
 		 N_("ISO")},
+		{PTP_DPC_NIKON_1_FNumber,				/* 0xf003 */
+		 N_("Aperture")},
+		{PTP_DPC_NIKON_1_FNumber2,				/* 0xf006 */
+		 N_("Aperture")},
+		{PTP_DPC_NIKON_1_ShutterSpeed,				/* 0xf004 */
+		 N_("Shutterspeed")},
+		{PTP_DPC_NIKON_1_ShutterSpeed2,				/* 0xf007 */
+		 N_("Shutterspeed")},
 		{PTP_DPC_NIKON_1_ImageSize,			/* 0xf00a */
 		 N_("Image Size")},
 		{PTP_DPC_NIKON_1_LongExposureNoiseReduction,    /* 0xF00D */
 		 N_("Long Exposure Noise Reduction")},
+		{PTP_DPC_NIKON_1_Language,                      /* 0xF018 */
+		 N_("Camera Language")},
+		{PTP_DPC_NIKON_1_ReleaseWithoutCard,            /* 0xF019 */
+		 N_("Release without SD card")},
 		{PTP_DPC_NIKON_1_MovQuality,                    /* 0xF01C */
 		 N_("Movie Quality")},
 		{PTP_DPC_NIKON_1_HiISONoiseReduction,           /* 0xF00E */
@@ -5386,6 +7098,194 @@
 		 N_("Image Compression")},
 		{PTP_DPC_NIKON_1_ActiveDLighting,           	/* 0xF00F */
 		 N_("Active D-Lighting")},
+		{PTP_DPC_NIKON_FaceDetection,"FaceDetection"},
+		{PTP_DPC_NIKON_MovRecProhibitCondition,"MovRecProhibitCondition"},
+		{PTP_DPC_NIKON_MovRecordMicrophoneLevelValue,"MovRecordMicrophoneLevelValue"},
+		{PTP_DPC_NIKON_MovWindNoiseReduction,"MovWindNoiseReduction"},
+		{PTP_DPC_NIKON_MovRecordingZone,"MovRecordingZone"},
+		{PTP_DPC_NIKON_MovISOAutoControl,"MovISOAutoControl"},
+		{PTP_DPC_NIKON_MovISOAutoHighLimit,"MovISOAutoHighLimit"},
+		{PTP_DPC_NIKON_MovFileType,"MovFileType"},
+		{PTP_DPC_NIKON_LiveViewScreenDisplaySetting,"LiveViewScreenDisplaySetting"},
+		{PTP_DPC_NIKON_ExposureIndexEx,"ExposureIndexEx"},
+		{PTP_DPC_NIKON_ISOControlSensitivity,"ISOControlSensitivity"},
+		{PTP_DPC_NIKON_RawImageSize,"RawImageSize"},
+		{PTP_DPC_NIKON_FlickerReductionSetting,"FlickerReductionSetting"},
+		{PTP_DPC_NIKON_DiffractionCompensatipn,"DiffractionCompensatipn"},
+		{PTP_DPC_NIKON_RemainingExposureTime,"RemainingExposureTime"},
+		{PTP_DPC_NIKON_MovieLogOutput,"MovieLogOutput"},
+		{PTP_DPC_NIKON_MovieAutoDistortion,"MovieAutoDistortion"},
+		{PTP_DPC_NIKON_MovieLogSetting,"MovieLogSetting"},
+		{PTP_DPC_NIKON_ADLBracketingPattern,"ADLBracketingPattern"},
+		{PTP_DPC_NIKON_ADLBracketingStep,"ADLBracketingStep"},
+		{PTP_DPC_NIKON_HDMIOutputDataDepth,"HDMIOutputDataDepth"},
+		{PTP_DPC_NIKON_LensTypeML,"LensTypeML"},
+		{PTP_DPC_NIKON_UserMode,"UserMode"},
+		{PTP_DPC_NIKON_SceneMode2,"SceneMode2"},
+		{PTP_DPC_NIKON_SelfTimerInterval,"SelfTimerInterval"},
+		{PTP_DPC_NIKON_ExposureCompFlashUsed,"ExposureCompFlashUsed"},
+		{PTP_DPC_NIKON_ExternalFlashMultiFlashMode,"ExternalFlashMultiFlashMode"},
+		{PTP_DPC_NIKON_ConnectionPath,"ConnectionPath"},
+		{PTP_DPC_NIKON_HDRSaveIndividualImages,"HDRSaveIndividualImages"},
+		{PTP_DPC_NIKON_VibrationReduction,"VibrationReduction"},
+		{PTP_DPC_NIKON_WBAutoType,"WBAutoType"},
+		{PTP_DPC_NIKON_WBPresetProtect1,"WBPresetProtect1"},
+		{PTP_DPC_NIKON_WBPresetProtect2,"WBPresetProtect2"},
+		{PTP_DPC_NIKON_WBPresetProtect3,"WBPresetProtect3"},
+		{PTP_DPC_NIKON_ActiveFolder,"ActiveFolder"},
+		{PTP_DPC_NIKON_WBPresetProtect4,"WBPresetProtect4"},
+		{PTP_DPC_NIKON_WhiteBalanceReset,"WhiteBalanceReset"},
+		{PTP_DPC_NIKON_WhiteBalanceNaturalLightAutoBias,"WhiteBalanceNaturalLightAutoBias"},
+		{PTP_DPC_NIKON_ISOAutoShutterTime,"ISOAutoShutterTime"},
+		{PTP_DPC_NIKON_DateImprintSetting,"DateImprintSetting"},
+		{PTP_DPC_NIKON_DateCounterSelect,"DateCounterSelect"},
+		{PTP_DPC_NIKON_DateCountData,"DateCountData"},
+		{PTP_DPC_NIKON_DateCountDisplaySetting,"DateCountDisplaySetting"},
+		{PTP_DPC_NIKON_RangeFinderSetting,"RangeFinderSetting"},
+		{PTP_DPC_NIKON_LowLightAF,"LowLightAF"},
+		{PTP_DPC_NIKON_ApplyLiveViewSetting,"ApplyLiveViewSetting"},
+		{PTP_DPC_NIKON_MovieAfSpeed,"MovieAfSpeed"},
+		{PTP_DPC_NIKON_MovieAfSpeedWhenToApply,"MovieAfSpeedWhenToApply"},
+		{PTP_DPC_NIKON_MovieAfTrackingSensitivity,"MovieAfTrackingSensitivity"},
+		{PTP_DPC_NIKON_MovieWbTuneFlourescent,"MovieWbTuneFlourescent"},
+		{PTP_DPC_NIKON_MovieWbTuneSunny,"MovieWbTuneSunny"},
+		{PTP_DPC_NIKON_MovieWbTuneCloudy,"MovieWbTuneCloudy"},
+		{PTP_DPC_NIKON_MovieWbTuneShade,"MovieWbTuneShade"},
+		{PTP_DPC_NIKON_MovieWbColorTemp,"MovieWbColorTemp"},
+		{PTP_DPC_NIKON_MovieWbTuneColorTemp,"MovieWbTuneColorTemp"},
+		{PTP_DPC_NIKON_MovieWbPresetData0,"MovieWbPresetData0"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment1,"MovieWbPresetDataComment1"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment2,"MovieWbPresetDataComment2"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment3,"MovieWbPresetDataComment3"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment4,"MovieWbPresetDataComment4"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment5,"MovieWbPresetDataComment5"},
+		{PTP_DPC_NIKON_MovieWbPresetDataComment6,"MovieWbPresetDataComment6"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue1,"MovieWbPresetDataValue1"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue2,"MovieWbPresetDataValue2"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue3,"MovieWbPresetDataValue3"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue4,"MovieWbPresetDataValue4"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue5,"MovieWbPresetDataValue5"},
+		{PTP_DPC_NIKON_MovieWbPresetDataValue6,"MovieWbPresetDataValue6"},
+		{PTP_DPC_NIKON_MovieWbTunePreset1,"MovieWbTunePreset1"},
+		{PTP_DPC_NIKON_MovieWbTunePreset2,"MovieWbTunePreset2"},
+		{PTP_DPC_NIKON_MovieWbTunePreset3,"MovieWbTunePreset3"},
+		{PTP_DPC_NIKON_MovieWbTunePreset4,"MovieWbTunePreset4"},
+		{PTP_DPC_NIKON_MovieWbTunePreset5,"MovieWbTunePreset5"},
+		{PTP_DPC_NIKON_MovieWbTunePreset6,"MovieWbTunePreset6"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect1,"MovieWbPresetProtect1"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect2,"MovieWbPresetProtect2"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect3,"MovieWbPresetProtect3"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect4,"MovieWbPresetProtect4"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect5,"MovieWbPresetProtect5"},
+		{PTP_DPC_NIKON_MovieWbPresetProtect6,"MovieWbPresetProtect6"},
+		{PTP_DPC_NIKON_MovieWhiteBalanceReset,"MovieWhiteBalanceReset"},
+		{PTP_DPC_NIKON_MovieNrHighISO,"MovieNrHighISO"},
+		{PTP_DPC_NIKON_MovieActivePicCtrlItem,"MovieActivePicCtrlItem"},
+		{PTP_DPC_NIKON_ExposureBaseCompHighlight,"ExposureBaseCompHighlight"},
+		{PTP_DPC_NIKON_MovieWhiteBalance,"MovieWhiteBalance"},
+		{PTP_DPC_NIKON_MovieActiveDLighting,"MovieActiveDLighting"},
+		{PTP_DPC_NIKON_MovieWbTuneNatural,"MovieWbTuneNatural"},
+		{PTP_DPC_NIKON_MovieAttenuator,"MovieAttenuator"},
+		{PTP_DPC_NIKON_MovieVignetteControl,"MovieVignetteControl"},
+		{PTP_DPC_NIKON_MovieDiffractionCompensation,"MovieDiffractionCompensation"},
+		{PTP_DPC_NIKON_UseDeviceStageFlag,"UseDeviceStageFlag"},
+		{PTP_DPC_NIKON_ElectronicVR,"ElectronicVR"},
+		{PTP_DPC_NIKON_MovieISO,"MovieISO"},
+		{PTP_DPC_NIKON_MovieExposureBiasCompensation,"MovieExposureBiasCompensation"},
+		{PTP_DPC_NIKON_LiveViewMovieMode,"LiveViewMovieMode"},
+		{PTP_DPC_NIKON_MovieExposureMeteringMode,"MovieExposureMeteringMode"},
+		{PTP_DPC_NIKON_ContinousShootingCount,"ContinousShootingCount"},
+		{PTP_DPC_NIKON_MovieRecFrameCount,"MovieRecFrameCount"},
+		{PTP_DPC_NIKON_CameraLiveViewStatus,"CameraLiveViewStatus"},
+		{PTP_DPC_NIKON_DetectionPeaking,"DetectionPeaking"},
+		{PTP_DPC_NIKON_LiveViewImageStatus,"LiveViewImageStatus"},
+		{PTP_DPC_NIKON_LiveViewImageCompression,"LiveViewImageCompression"},
+		{PTP_DPC_NIKON_LiveViewZoomArea,"LiveViewZoomArea"},
+		{PTP_DPC_NIKON_ExternalRecordingControl,"ExternalRecordingControl"},
+		{PTP_DPC_NIKON_HighlightBrightness,"HighlightBrightness"},
+		{PTP_DPC_NIKON_SBWirelessMode,"SBWirelessMode"},
+		{PTP_DPC_NIKON_SBWirelessMultipleFlashMode,"SBWirelessMultipleFlashMode"},
+		{PTP_DPC_NIKON_SBUsableGroup,"SBUsableGroup"},
+		{PTP_DPC_NIKON_WirelessCLSEntryMode,"WirelessCLSEntryMode"},
+		{PTP_DPC_NIKON_SBPINCode,"SBPINCode"},
+		{PTP_DPC_NIKON_RadioMultipleFlashChannel,"RadioMultipleFlashChannel"},
+		{PTP_DPC_NIKON_OpticalMultipleFlashChannel,"OpticalMultipleFlashChannel"},
+		{PTP_DPC_NIKON_FlashRangeDisplay,"FlashRangeDisplay"},
+		{PTP_DPC_NIKON_AllTestFiringDisable,"AllTestFiringDisable"},
+		{PTP_DPC_NIKON_SBSettingMemberLock,"SBSettingMemberLock"},
+		{PTP_DPC_NIKON_SBIntegrationFlashReady,"SBIntegrationFlashReady"},
+		{PTP_DPC_NIKON_ApplicationMode,"ApplicationMode"},
+		{PTP_DPC_NIKON_ExposureRemaining,"ExposureRemaining"},
+		{PTP_DPC_NIKON_ActiveSlot,"ActiveSlot"},
+		{PTP_DPC_NIKON_ISOAutoShutterCorrectionTime,"ISOAutoShutterCorrectionTime"},
+		{PTP_DPC_NIKON_MovieAfAreaMode,"MovieAfAreaMode"},
+		{PTP_DPC_NIKON_MovieVibrationReduction,"MovieVibrationReduction"},
+		{PTP_DPC_NIKON_MovieFocusMode,"MovieFocusMode"},
+		{PTP_DPC_NIKON_RecordTimeCodes,"RecordTimeCodes"},
+		{PTP_DPC_NIKON_CountUpMethod,"CountUpMethod"},
+		{PTP_DPC_NIKON_TimeCodeOrigin,"TimeCodeOrigin"},
+		{PTP_DPC_NIKON_DropFrame,"DropFrame"},
+		{PTP_DPC_NIKON_ElectronicFrontCurtainShutter,"ElectronicFrontCurtainShutter"},
+		{PTP_DPC_NIKON_MovieResetShootingMenu,"MovieResetShootingMenu"},
+		{PTP_DPC_NIKON_MovieCaptureAreaCrop,"MovieCaptureAreaCrop"},
+		{PTP_DPC_NIKON_MovieWbAutoType,"MovieWbAutoType"},
+		{PTP_DPC_NIKON_MovieWbTuneAuto,"MovieWbTuneAuto"},
+		{PTP_DPC_NIKON_MovieWbTuneIncandescent,"MovieWbTuneIncandescent"},
+		{PTP_DPC_NIKON_MovieWbFlourescentType,"MovieWbFlourescentType"},
+		{PTP_DPC_NIKON_FmmManualSetting,"FmmManualSetting"},
+		{PTP_DPC_NIKON_F0ManualSetting,"F0ManualSetting"},
+		{PTP_DPC_NIKON_CaptureAreaCrop,"CaptureAreaCrop"},
+		{PTP_DPC_NIKON_1_Mode,"1_Mode"},
+		{PTP_DPC_NIKON_WhiteBalancePresetName5,"WhiteBalancePresetName5"},
+		{PTP_DPC_NIKON_WhiteBalancePresetName6,"WhiteBalancePresetName6"},
+		{PTP_DPC_NIKON_WhiteBalanceTunePreset5,"WhiteBalanceTunePreset5"},
+		{PTP_DPC_NIKON_WhiteBalanceTunePreset6,"WhiteBalanceTunePreset6"},
+		{PTP_DPC_NIKON_WhiteBalancePresetProtect5,"WhiteBalancePresetProtect5"},
+		{PTP_DPC_NIKON_WhiteBalancePresetProtect6,"WhiteBalancePresetProtect6"},
+		{PTP_DPC_NIKON_WhiteBalancePresetValue5,"WhiteBalancePresetValue5"},
+		{PTP_DPC_NIKON_WhiteBalancePresetValue6,"WhiteBalancePresetValue6"},
+		{PTP_DPC_NIKON_AFStillLockOnMove,"AFStillLockOnMove"},
+		{PTP_DPC_NIKON_FocusAreaSelect,"FocusAreaSelect"},
+		{PTP_DPC_NIKON_AngleLevelPitching,"AngleLevelPitching"},
+		{PTP_DPC_NIKON_AngleLevelYawing,"AngleLevelYawing"},
+		{PTP_DPC_NIKON_RetractableLensWarning,"RetractableLensWarning"},
+		{PTP_DPC_NIKON_MovieReleaseButton,"MovieReleaseButton"},
+		{PTP_DPC_NIKON_FlashISOAutoHighLimit,"FlashISOAutoHighLimit"},
+		{PTP_DPC_NIKON_LiveViewSelector,"LiveViewSelector"},
+		{PTP_DPC_NIKON_MovieShutterSpeed,"MovieShutterSpeed"},
+		{PTP_DPC_NIKON_MovieFNumber,"MovieFNumber"},
+		{PTP_DPC_NIKON_MovieCaptureMode,"MovieCaptureMode"},
+		{PTP_DPC_NIKON_SlowMotionMovieRecordScreenSize,"SlowMotionMovieRecordScreenSize"},
+		{PTP_DPC_NIKON_HighSpeedStillCaptureRate,"HighSpeedStillCaptureRate"},
+		{PTP_DPC_NIKON_BestMomentCaptureMode,"BestMomentCaptureMode"},
+		{PTP_DPC_NIKON_ActiveSelectionFrameSavedDefault,"ActiveSelectionFrameSavedDefault"},
+		{PTP_DPC_NIKON_ActiveSelectionCapture40frameOver,"ActiveSelectionCapture40frameOver"},
+		{PTP_DPC_NIKON_ActiveSelectionOnReleaseRecord,"ActiveSelectionOnReleaseRecord"},
+		{PTP_DPC_NIKON_ActiveSelectionSelectedPictures,"ActiveSelectionSelectedPictures"},
+		{PTP_DPC_NIKON_ExposureRemainingInMovie,"ExposureRemainingInMovie"},
+		{PTP_DPC_NIKON_OpticalVR,"OpticalVR"},
+		{PTP_DPC_NIKON_SilentPhotography,"SilentPhotography"},
+		{PTP_DPC_NIKON_FacePriority,"FacePriority"},
+		{PTP_DPC_NIKON_LensTypeNikon1,"LensTypeNikon1"},
+		{PTP_DPC_NIKON_ISONoiseReduction,"ISONoiseReduction"},
+		{PTP_DPC_NIKON_MirrorUpStatus,"MirrorUpStatus"},
+		{PTP_DPC_NIKON_MirrorUpReleaseShootingCount,"MirrorUpReleaseShootingCount"},
+		{PTP_DPC_NIKON_AFStillLockOnAcross,"AFStillLockOnAcross"},
+		{PTP_DPC_NIKON_ExtendShootingMenu,"ExtendShootingMenu"},
+		{PTP_DPC_NIKON_3DTrackingCaptureArea,"3DTrackingCaptureArea"},
+		{PTP_DPC_NIKON_MatrixMetering,"MatrixMetering"},
+		{PTP_DPC_NIKON_MultiBatteryInfo,"MultiBatteryInfo"},
+		{PTP_DPC_NIKON_PrimarySlot,"PrimarySlot"},
+		{PTP_DPC_NIKON_LimitedAFAreaMode,"LimitedAFAreaMode"},
+		{PTP_DPC_NIKON_AFModeRestrictions,"AFModeRestrictions"},
+		{PTP_DPC_NIKON_LiveViewExposurePreview,"LiveViewExposurePreview"},
+		{PTP_DPC_NIKON_LiveViewWhiteBalance,"LiveViewWhiteBalance"},
+		{PTP_DPC_NIKON_LiveViewImageSize,"LiveViewImageSize"},
+		{PTP_DPC_NIKON_LiveViewPhotography,"LiveViewPhotography"},
+		{PTP_DPC_NIKON_LiveViewTFTStatus,"LiveViewTFTStatus"},
+		{PTP_DPC_NIKON_MovieAutoDxCrop,"MovieAutoDxCrop"},
+		{PTP_DPC_NIKON_MovieChangePicCtrlItem,"MovieChangePicCtrlItem"},
+		{PTP_DPC_NIKON_MovieLoopLength,"MovieLoopLength"},
 		{0,NULL}
 	};
         struct {
@@ -5415,6 +7315,7 @@
 		uint16_t dpc;
 		const char *txt;
         } ptp_device_properties_FUJI = {
+		{PTP_DPC_FUJI_FilmSimulation, N_("Film Simulation")},	/* 0xD001 */
 		{PTP_DPC_FUJI_ColorTemperature, N_("Color Temperature")},	/* 0xD017 */
 		{PTP_DPC_FUJI_Quality, N_("Quality")},				/* 0xD018 */
 		{PTP_DPC_FUJI_Quality, N_("Release Mode")},			/* 0xD201 */
@@ -5422,6 +7323,208 @@
 		{PTP_DPC_FUJI_Quality, N_("AE Lock")},				/* 0xD213 */
 		{PTP_DPC_FUJI_Quality, N_("Aperture")},				/* 0xD218 */
 		{PTP_DPC_FUJI_Quality, N_("Shutter Speed")},			/* 0xD219 */
+		{PTP_DPC_FUJI_FocusPoint, N_("Focus Point")},			/* 0xD347 */
+		{PTP_DPC_FUJI_RecMode, "RecMode"},
+		{PTP_DPC_FUJI_CommandDialMode, "CommandDialMode"},
+		{PTP_DPC_FUJI_ExposureIndex, "ExposureIndex"},
+		{PTP_DPC_FUJI_MovieISO, "MovieISO"},
+		{PTP_DPC_FUJI_LiveViewImageSize, "LiveViewImageSize"},
+		{PTP_DPC_FUJI_FocusMeteringMode, "FocusMeteringMode"},
+		{PTP_DPC_FUJI_ReleaseMode, "ReleaseMode"},
+		{PTP_DPC_FUJI_FocusAreas, "FocusAreas"},
+		{PTP_DPC_FUJI_AFStatus, "AFStatus"},
+		{PTP_DPC_FUJI_CurrentState, "CurrentState"},
+		{PTP_DPC_FUJI_AELock, "AELock"},
+		{PTP_DPC_FUJI_Copyright, "Copyright"},
+		{PTP_DPC_FUJI_Aperture, "Aperture"},
+		{PTP_DPC_FUJI_ShutterSpeed, "ShutterSpeed"},
+		{PTP_DPC_FUJI_DeviceError, "DeviceError"},
+		{PTP_DPC_FUJI_CaptureRemaining, "CaptureRemaining"},
+		{PTP_DPC_FUJI_MovieRemainingTime, "MovieRemainingTime"},
+		{PTP_DPC_FUJI_ShutterSpeed2, "ShutterSpeed2"},
+		{PTP_DPC_FUJI_ImageAspectRatio, "ImageAspectRatio"},
+		{PTP_DPC_FUJI_BatteryLevel, "BatteryLevel"},
+		{PTP_DPC_FUJI_InitSequence, "InitSequence"},
+		{PTP_DPC_FUJI_AppVersion, "AppVersion"},
+		{PTP_DPC_FUJI_DRangeMode,"DRangeMode"},
+		{PTP_DPC_FUJI_LiveViewBrightness,"LiveViewBrightness"},
+		{PTP_DPC_FUJI_ThroughImageZoom,"ThroughImageZoom"},
+		{PTP_DPC_FUJI_NoiseReduction,"NoiseReduction"},
+		{PTP_DPC_FUJI_MacroMode,"MacroMode"},
+		{PTP_DPC_FUJI_LiveViewStyle,"LiveViewStyle"},
+		{PTP_DPC_FUJI_FaceDetectionMode,"FaceDetectionMode"},
+		{PTP_DPC_FUJI_RedEyeCorrectionMode,"RedEyeCorrectionMode"},
+		{PTP_DPC_FUJI_RawCompression,"RawCompression"},
+		{PTP_DPC_FUJI_GrainEffect,"GrainEffect"},
+		{PTP_DPC_FUJI_SetEyeAFMode,"SetEyeAFMode"},
+		{PTP_DPC_FUJI_FocusPoints,"FocusPoints"},
+		{PTP_DPC_FUJI_MFAssistMode,"MFAssistMode"},
+		{PTP_DPC_FUJI_InterlockAEAFArea,"InterlockAEAFArea"},
+		{PTP_DPC_FUJI_Shadowing,"Shadowing"},
+		{PTP_DPC_FUJI_WideDynamicRange,"WideDynamicRange"},
+		{PTP_DPC_FUJI_TNumber,"TNumber"},
+		{PTP_DPC_FUJI_SerialMode,"SerialMode"},
+		{PTP_DPC_FUJI_ExposureDelay,"ExposureDelay"},
+		{PTP_DPC_FUJI_PreviewTime,"PreviewTime"},
+		{PTP_DPC_FUJI_BlackImageTone,"BlackImageTone"},
+		{PTP_DPC_FUJI_Illumination,"Illumination"},
+		{PTP_DPC_FUJI_FrameGuideMode,"FrameGuideMode"},
+		{PTP_DPC_FUJI_ViewfinderWarning,"ViewfinderWarning"},
+		{PTP_DPC_FUJI_AutoImageRotation,"AutoImageRotation"},
+		{PTP_DPC_FUJI_DetectImageRotation,"DetectImageRotation"},
+		{PTP_DPC_FUJI_ShutterPriorityMode1,"ShutterPriorityMode1"},
+		{PTP_DPC_FUJI_ShutterPriorityMode2,"ShutterPriorityMode2"},
+		{PTP_DPC_FUJI_AFIlluminator,"AFIlluminator"},
+		{PTP_DPC_FUJI_FlashTuneSpeed,"FlashTuneSpeed"},
+		{PTP_DPC_FUJI_FlashShutterLimit,"FlashShutterLimit"},
+		{PTP_DPC_FUJI_BuiltinFlashMode,"BuiltinFlashMode"},
+		{PTP_DPC_FUJI_FlashManualMode,"FlashManualMode"},
+		{PTP_DPC_FUJI_ModelingFlash,"ModelingFlash"},
+		{PTP_DPC_FUJI_AEAFLockButton,"AEAFLockButton"},
+		{PTP_DPC_FUJI_CenterButton,"CenterButton"},
+		{PTP_DPC_FUJI_MultiSelectorButton,"MultiSelectorButton"},
+		{PTP_DPC_FUJI_FunctionLock,"FunctionLock"},
+		{PTP_DPC_FUJI_ButtonsAndDials,"ButtonsAndDials"},
+		{PTP_DPC_FUJI_MBD200Batteries,"MBD200Batteries"},
+		{PTP_DPC_FUJI_AFOnForMBD200Batteries,"AFOnForMBD200Batteries"},
+		{PTP_DPC_FUJI_ShotCount,"ShotCount"},
+		{PTP_DPC_FUJI_ShutterExchangeCount,"ShutterExchangeCount"},
+		{PTP_DPC_FUJI_WorldClock,"WorldClock"},
+		{PTP_DPC_FUJI_Language,"Language"},
+		{PTP_DPC_FUJI_FrameNumberSequence,"FrameNumberSequence"},
+		{PTP_DPC_FUJI_VideoMode,"VideoMode"},
+		{PTP_DPC_FUJI_SetUSBMode,"SetUSBMode"},
+		{PTP_DPC_FUJI_CommentWriteSetting,"CommentWriteSetting"},
+		{PTP_DPC_FUJI_BCRAppendDelimiter,"BCRAppendDelimiter"},
+		{PTP_DPC_FUJI_VideoOutOnOff,"VideoOutOnOff"},
+		{PTP_DPC_FUJI_CropMode,"CropMode"},
+		{PTP_DPC_FUJI_LensZoomPos,"LensZoomPos"},
+		{PTP_DPC_FUJI_FocusPosition,"FocusPosition"},
+		{PTP_DPC_FUJI_LiveViewImageQuality,"LiveViewImageQuality"},
+		{PTP_DPC_FUJI_LiveViewCondition,"LiveViewCondition"},
+		{PTP_DPC_FUJI_LiveViewWhiteBalanceGain,"LiveViewWhiteBalanceGain"},
+		{PTP_DPC_FUJI_FocusLength,"FocusLength"},
+		{PTP_DPC_FUJI_CropAreaFrameInfo,"CropAreaFrameInfo"},
+		{PTP_DPC_FUJI_ResetSetting,"ResetSetting"},
+		{PTP_DPC_FUJI_IOPCode,"IOPCode"},
+		{PTP_DPC_FUJI_TetherRawConditionCode,"TetherRawConditionCode"},
+		{PTP_DPC_FUJI_TetherRawCompatibilityCode,"TetherRawCompatibilityCode"},
+		{PTP_DPC_FUJI_LightTune,"LightTune"},
+		{PTP_DPC_FUJI_ProgramShift,"ProgramShift"},
+		{PTP_DPC_FUJI_PriorityMode,"PriorityMode"},
+		{PTP_DPC_FUJI_DeviceName,"DeviceName"},
+		{PTP_DPC_FUJI_MediaRecord,"MediaRecord"},
+		{PTP_DPC_FUJI_FreeSDRAMImages,"FreeSDRAMImages"},
+		{PTP_DPC_FUJI_MediaStatus,"MediaStatus"},
+		{PTP_DPC_FUJI_ForceMode,"ForceMode"},
+		{PTP_DPC_FUJI_TotalShotCount,"TotalShotCount"},
+		{PTP_DPC_FUJI_HighLightTone,"HighLightTone"},
+		{PTP_DPC_FUJI_ShadowTone,"ShadowTone"},
+		{PTP_DPC_FUJI_LongExposureNR,"LongExposureNR"},
+		{PTP_DPC_FUJI_FullTimeManualFocus,"FullTimeManualFocus"},
+		{PTP_DPC_FUJI_ISODialHn1,"ISODialHn1"},
+		{PTP_DPC_FUJI_ISODialHn2,"ISODialHn2"},
+		{PTP_DPC_FUJI_ViewMode1,"ViewMode1"},
+		{PTP_DPC_FUJI_ViewMode2,"ViewMode2"},
+		{PTP_DPC_FUJI_DispInfoMode,"DispInfoMode"},
+		{PTP_DPC_FUJI_LensISSwitch,"LensISSwitch"},
+		{PTP_DPC_FUJI_InstantAFMode,"InstantAFMode"},
+		{PTP_DPC_FUJI_PreAFMode,"PreAFMode"},
+		{PTP_DPC_FUJI_CustomSetting,"CustomSetting"},
+		{PTP_DPC_FUJI_LMOMode,"LMOMode"},
+		{PTP_DPC_FUJI_LockButtonMode,"LockButtonMode"},
+		{PTP_DPC_FUJI_AFLockMode,"AFLockMode"},
+		{PTP_DPC_FUJI_MicJackMode,"MicJackMode"},
+		{PTP_DPC_FUJI_ISMode,"ISMode"},
+		{PTP_DPC_FUJI_DateTimeDispFormat,"DateTimeDispFormat"},
+		{PTP_DPC_FUJI_AeAfLockKeyAssign,"AeAfLockKeyAssign"},
+		{PTP_DPC_FUJI_CrossKeyAssign,"CrossKeyAssign"},
+		{PTP_DPC_FUJI_SilentMode,"SilentMode"},
+		{PTP_DPC_FUJI_PBSound,"PBSound"},
+		{PTP_DPC_FUJI_EVFDispAutoRotate,"EVFDispAutoRotate"},
+		{PTP_DPC_FUJI_ExposurePreview,"ExposurePreview"},
+		{PTP_DPC_FUJI_DispBrightness1,"DispBrightness1"},
+		{PTP_DPC_FUJI_DispBrightness2,"DispBrightness2"},
+		{PTP_DPC_FUJI_DispChroma1,"DispChroma1"},
+		{PTP_DPC_FUJI_DispChroma2,"DispChroma2"},
+		{PTP_DPC_FUJI_FocusCheckMode,"FocusCheckMode"},
+		{PTP_DPC_FUJI_FocusScaleUnit,"FocusScaleUnit"},
+		{PTP_DPC_FUJI_SetFunctionButton,"SetFunctionButton"},
+		{PTP_DPC_FUJI_SensorCleanTiming,"SensorCleanTiming"},
+		{PTP_DPC_FUJI_CustomAutoPowerOff,"CustomAutoPowerOff"},
+		{PTP_DPC_FUJI_FileNamePrefix1,"FileNamePrefix1"},
+		{PTP_DPC_FUJI_FileNamePrefix2,"FileNamePrefix2"},
+		{PTP_DPC_FUJI_CustomDispInfo,"CustomDispInfo"},
+		{PTP_DPC_FUJI_CustomPreviewTime,"CustomPreviewTime"},
+		{PTP_DPC_FUJI_FocusArea1,"FocusArea1"},
+		{PTP_DPC_FUJI_FocusArea2,"FocusArea2"},
+		{PTP_DPC_FUJI_FocusArea3,"FocusArea3"},
+		{PTP_DPC_FUJI_FrameGuideGridInfo1,"FrameGuideGridInfo1"},
+		{PTP_DPC_FUJI_FrameGuideGridInfo2,"FrameGuideGridInfo2"},
+		{PTP_DPC_FUJI_FrameGuideGridInfo3,"FrameGuideGridInfo3"},
+		{PTP_DPC_FUJI_FrameGuideGridInfo4,"FrameGuideGridInfo4"},
+		{PTP_DPC_FUJI_LensZoomPosCaps,"LensZoomPosCaps"},
+		{PTP_DPC_FUJI_FocusLimiter,"FocusLimiter"},
+		{PTP_DPC_FUJI_FocusArea4,"FocusArea4"},
+		{PTP_DPC_FUJI_FilmSimulationTune,"FilmSimulationTune"},
+		{PTP_DPC_FUJI_ColorSpace,"ColorSpace"},
+		{PTP_DPC_FUJI_WhitebalanceTune1,"WhitebalanceTune1"},
+		{PTP_DPC_FUJI_WhitebalanceTune2,"WhitebalanceTune2"},
+		{PTP_DPC_FUJI_PhotometryLevel1,"PhotometryLevel1"},
+		{PTP_DPC_FUJI_PhotometryLevel2,"PhotometryLevel2"},
+		{PTP_DPC_FUJI_PhotometryLevel3,"PhotometryLevel3"},
+		{PTP_DPC_FUJI_FlashRepeatingMode1,"FlashRepeatingMode1"},
+		{PTP_DPC_FUJI_FlashRepeatingMode2,"FlashRepeatingMode2"},
+		{PTP_DPC_FUJI_FlashCommanderMode1,"FlashCommanderMode1"},
+		{PTP_DPC_FUJI_FlashCommanderMode2,"FlashCommanderMode2"},
+		{PTP_DPC_FUJI_FlashCommanderMode3,"FlashCommanderMode3"},
+		{PTP_DPC_FUJI_FlashCommanderMode4,"FlashCommanderMode4"},
+		{PTP_DPC_FUJI_FlashCommanderMode5,"FlashCommanderMode5"},
+		{PTP_DPC_FUJI_FlashCommanderMode6,"FlashCommanderMode6"},
+		{PTP_DPC_FUJI_FlashCommanderMode7,"FlashCommanderMode7"},
+		{PTP_DPC_FUJI_BKTSelection,"BKTSelection"},
+		{PTP_DPC_FUJI_Password,"Password"},
+		{PTP_DPC_FUJI_ChangePassword,"ChangePassword"},
+		{PTP_DPC_FUJI_TimeDifference1,"TimeDifference1"},
+		{PTP_DPC_FUJI_TimeDifference2,"TimeDifference2"},
+		{PTP_DPC_FUJI_Comment,"Comment"},
+		{PTP_DPC_FUJI_CommentEx,"CommentEx"},
+		{PTP_DPC_FUJI_StandbyMode,"StandbyMode"},
+		{PTP_DPC_FUJI_LiveViewExposure,"LiveViewExposure"},
+		{PTP_DPC_FUJI_LiveViewTuning,"LiveViewTuning"},
+		{PTP_DPC_FUJI_SensitivityFineTune1,"SensitivityFineTune1"},
+		{PTP_DPC_FUJI_SensitivityFineTune2,"SensitivityFineTune2"},
+		{PTP_DPC_FUJI_LensNameAndSerial,"LensNameAndSerial"},
+		{PTP_DPC_FUJI_LensUnknownData,"LensUnknownData"},
+		{PTP_DPC_FUJI_LensFNumberList,"LensFNumberList"},
+		{PTP_DPC_FUJI_LensFocalLengthList,"LensFocalLengthList"},
+		{PTP_DPC_FUJI_ColorMode,"ColorMode"},
+		{PTP_DPC_FUJI_Beep,"Beep"},
+		{PTP_DPC_FUJI_ISOAutoSetting1,"ISOAutoSetting1"},
+		{PTP_DPC_FUJI_ISOAutoSetting2,"ISOAutoSetting2"},
+		{PTP_DPC_FUJI_ISOAutoSetting3,"ISOAutoSetting3"},
+		{PTP_DPC_FUJI_ExposureStep,"ExposureStep"},
+		{PTP_DPC_FUJI_CompensationStep,"CompensationStep"},
+		{PTP_DPC_FUJI_ExposureSimpleSet,"ExposureSimpleSet"},
+		{PTP_DPC_FUJI_CenterPhotometryRange,"CenterPhotometryRange"},
+		{PTP_DPC_FUJI_FlashRepeatingMode3,"FlashRepeatingMode3"},
+		{PTP_DPC_FUJI_BKTChange,"BKTChange"},
+		{PTP_DPC_FUJI_BKTOrder,"BKTOrder"},
+		{PTP_DPC_FUJI_CommandDialSetting1,"CommandDialSetting1"},
+		{PTP_DPC_FUJI_CommandDialSetting2,"CommandDialSetting2"},
+		{PTP_DPC_FUJI_CommandDialSetting3,"CommandDialSetting3"},
+		{PTP_DPC_FUJI_CommandDialSetting4,"CommandDialSetting4"},
+		{PTP_DPC_FUJI_NonCPULensData,"NonCPULensData"},
+		{PTP_DPC_FUJI_FirmwareVersion,"FirmwareVersion"},
+		{PTP_DPC_FUJI_BKTFrame1,"BKTFrame1"},
+		{PTP_DPC_FUJI_BKTFrame2,"BKTFrame2"},
+		{PTP_DPC_FUJI_BKTStep,"BKTStep"},
+		{PTP_DPC_FUJI_MediaCapacity,"MediaCapacity"},
+		{PTP_DPC_FUJI_Copyright2,"Copyright2"},
+		{PTP_DPC_FUJI_BatteryInfo1,"BatteryInfo1"},
+		{PTP_DPC_FUJI_BatteryInfo2,"BatteryInfo2"},
+		{PTP_DPC_FUJI_FunctionLockCategory1,"FunctionLockCategory1"},
+		{PTP_DPC_FUJI_FunctionLockCategory2,"FunctionLockCategory2"},
 		{0,NULL}
         };
 
@@ -5433,6 +7536,7 @@
 		{PTP_DPC_SONY_DRangeOptimize, ("DRangeOptimize")},	/* 0xD201 */
 		{PTP_DPC_SONY_ImageSize, N_("Image size")},		/* 0xD203 */
 		{PTP_DPC_SONY_ShutterSpeed, N_("Shutter speed")},	/* 0xD20D */
+		{PTP_DPC_SONY_QX_ShutterSpeed, N_("Shutter speed")},
 		{PTP_DPC_SONY_ColorTemp, N_("Color temperature")},	/* 0xD20F */
 		{PTP_DPC_SONY_CCFilter, ("CC Filter")},			/* 0xD210 */
 		{PTP_DPC_SONY_AspectRatio, N_("Aspect Ratio")}, 	/* 0xD211 */
@@ -5443,8 +7547,115 @@
 		{PTP_DPC_SONY_PictureEffect, N_("Picture Effect")},	/* 0xD21B */
 		{PTP_DPC_SONY_ABFilter, N_("AB Filter")},		/* 0xD21C */
 		{PTP_DPC_SONY_ISO, N_("ISO")},				/* 0xD21E */
+		{PTP_DPC_SONY_QX_ISO, N_("ISO")},
+		{PTP_DPC_SONY_QX_Aperture, N_("Aperture")},
+		{PTP_DPC_SONY_ExposureCompensation, N_("Exposure Bias Compensation")},	/* 0xD224 */
+		{PTP_DPC_SONY_QX_ExposureCompensation, N_("Exposure Bias Compensation")},
+		{PTP_DPC_SONY_ISO2, N_("ISO")},				/* 0xD226 */
+		{PTP_DPC_SONY_ShutterSpeed2, N_("Shutter speed")},	/* 0xD229 */
+		{PTP_DPC_SONY_LiveViewSettingEffect, N_("Live View Setting Effect")},
 		{PTP_DPC_SONY_Movie, N_("Movie")},			/* 0xD2C8 */
 		{PTP_DPC_SONY_StillImage, N_("Still Image")},		/* 0xD2C7 */
+		{PTP_DPC_SONY_SensorCrop, N_("Sensor Crop")},
+		{PTP_DPC_SONY_AutoFocus, N_("Autofocus")},
+		{PTP_DPC_SONY_FocusArea, N_("Focus Area")},
+		{PTP_DPC_SONY_Capture, N_("Capture")},
+		{PTP_DPC_WhiteBalance, N_("White Balance")},		/* 0x5005 */
+		{PTP_DPC_SONY_Zoom, N_("Zoom")},
+		{PTP_DPC_SONY_StillImageStoreDestination, N_("Capture Target")},
+		{PTP_DPC_SONY_NearFar, N_("Near Far")},
+		{PTP_DPC_SONY_AF_Area_Position, N_("AF Area Position")},
+		{PTP_DPC_SONY_QX_DateTime, N_("Date Time")},
+		{PTP_DPC_SONY_QX_Zoom_Absolute, "Zoom_Absolute"},
+		{PTP_DPC_SONY_QX_Movie_Rec, "Movie_Rec"},
+		{PTP_DPC_SONY_QX_Request_For_Update, "Request_For_Update"},
+		{PTP_DPC_SONY_QX_Zoom_Wide_For_One_Shot, "Zoom_Wide_For_One_Shot"},
+		{PTP_DPC_SONY_QX_Zoom_Tele_For_One_Shot, "Zoom_Tele_For_One_Shot"},
+		{PTP_DPC_SONY_QX_S2_Button, "S2_Button"},
+		{PTP_DPC_SONY_QX_Media_Format, "Media_Format"},
+		{PTP_DPC_SONY_QX_S1_Button, "S1_Button"},
+		{PTP_DPC_SONY_QX_AE_Lock, "AE_Lock"},
+		{PTP_DPC_SONY_QX_Request_For_Update_For_Lens, "Request_For_Update_For_Lens"},
+		{PTP_DPC_SONY_QX_Power_Off, "Power_Off"},
+		{PTP_DPC_SONY_QX_RequestOneShooting, "RequestOneShooting"},
+		{PTP_DPC_SONY_QX_AF_Lock, "AF_Lock"},
+		{PTP_DPC_SONY_QX_Zoom_Tele, "Zoom_Tele"},
+		{PTP_DPC_SONY_QX_Zoom_Wide, "Zoom_Wide"},
+		{PTP_DPC_SONY_QX_Focus_Magnification, "Focus_Magnification"},
+		{PTP_DPC_SONY_QX_Focus_Near_For_One_Shot, "Focus_Near_For_One_Shot"},
+		{PTP_DPC_SONY_QX_Focus_Far_For_One_Shot, "Focus_Far_For_One_Shot"},
+		{PTP_DPC_SONY_QX_Focus_Near_For_Continuous, "Focus_Near_For_Continuous"},
+		{PTP_DPC_SONY_QX_Focus_Far_For_Continuous, "Focus_Far_For_Continuous"},
+		{PTP_DPC_SONY_QX_Camera_Setting_Reset, "Camera_Setting_Reset"},
+		{PTP_DPC_SONY_QX_Camera_Initialize, "Camera_Initialize"},
+		{PTP_DPC_SONY_QX_Capture, "Capture"},
+		{PTP_DPC_SONY_QX_AutoFocus, "AutoFocus"},
+		{PTP_DPC_SONY_QX_PictureProfileInitialize, "PictureProfileInitialize"},
+		{PTP_DPC_SONY_QX_PictureProfile, "PictureProfile"},
+		{PTP_DPC_SONY_QX_AFSPrioritySetting, "AFSPrioritySetting"},
+		{PTP_DPC_SONY_QX_AFCPrioritySetting, "AFCPrioritySetting"},
+		{PTP_DPC_SONY_QX_LensUpdateState, "LensUpdateState"},
+		{PTP_DPC_SONY_QX_SilentShooting, "SilentShooting"},
+		{PTP_DPC_SONY_QX_HDMIInfoDisplay, "HDMIInfoDisplay"},
+		{PTP_DPC_SONY_QX_TCUBDisp, "TCUBDisp"},
+		{PTP_DPC_SONY_QX_TCPreset, "TCPreset"},
+		{PTP_DPC_SONY_QX_TCMake, "TCMake"},
+		{PTP_DPC_SONY_QX_TCRun, "TCRun"},
+		{PTP_DPC_SONY_QX_UBPreset, "UBPreset"},
+		{PTP_DPC_SONY_QX_TCFormat, "TCFormat"},
+		{PTP_DPC_SONY_QX_LongExposureNR, "LongExposureNR"},
+		{PTP_DPC_SONY_QX_UBTimeRec, "UBTimeRec"},
+		{PTP_DPC_SONY_QX_FocusMagnificationLevel, "FocusMagnificationLevel"},
+		{PTP_DPC_SONY_QX_FocusMagnificationPosition, "FocusMagnificationPosition"},
+		{PTP_DPC_SONY_QX_LensStatus, "LensStatus"},
+		{PTP_DPC_SONY_QX_LiveviewResolution, "LiveviewResolution"},
+		{PTP_DPC_SONY_QX_NotifyFocusPosition, "NotifyFocusPosition"},
+		{PTP_DPC_SONY_QX_DriveMode, "DriveMode"},
+		{PTP_DPC_SONY_QX_AspectRatio, "AspectRatio"},
+		{PTP_DPC_SONY_QX_ImageSize, "ImageSize"},
+		{PTP_DPC_SONY_QX_WhiteBalance, "WhiteBalance"},
+		{PTP_DPC_SONY_QX_CompressionSetting, "CompressionSetting"},
+		{PTP_DPC_SONY_QX_CautionError, "CautionError"},
+		{PTP_DPC_SONY_QX_StorageInformation, "StorageInformation"},
+		{PTP_DPC_SONY_QX_MovieQualitySetting, "MovieQualitySetting"},
+		{PTP_DPC_SONY_QX_MovieFormatSetting, "MovieFormatSetting"},
+		{PTP_DPC_SONY_QX_ZoomSetAbsolute, "ZoomSetAbsolute"},
+		{PTP_DPC_SONY_QX_ZoomInformation, "ZoomInformation"},
+		{PTP_DPC_SONY_QX_FocusSpeedForOneShot, "FocusSpeedForOneShot"},
+		{PTP_DPC_SONY_QX_FlashCompensation, "FlashCompensation"},
+		{PTP_DPC_SONY_QX_ShootingFileInformation, "ShootingFileInformation"},
+		{PTP_DPC_SONY_QX_MediaFormatState, "MediaFormatState"},
+		{PTP_DPC_SONY_QX_ZoomMode, "ZoomMode"},
+		{PTP_DPC_SONY_QX_FlashMode, "FlashMode"},
+		{PTP_DPC_SONY_QX_FocusMode, "FocusMode"},
+		{PTP_DPC_SONY_QX_ExposureMode, "ExposureMode"},
+		{PTP_DPC_SONY_QX_MovieRecordingState, "MovieRecordingState"},
+		{PTP_DPC_SONY_QX_SelectSaveMedia, "SelectSaveMedia"},
+		{PTP_DPC_SONY_QX_StillSteady, "StillSteady"},
+		{PTP_DPC_SONY_QX_MovieSteady, "MovieSteady"},
+		{PTP_DPC_SONY_QX_Housing, "Housing"},
+		{PTP_DPC_SONY_QX_K4OutputSetting, "K4OutputSetting"},
+		{PTP_DPC_SONY_QX_HDMIRECControl, "HDMIRECControl"},
+		{PTP_DPC_SONY_QX_TimeCodeOutputToHDMI, "TimeCodeOutputToHDMI"},
+		{PTP_DPC_SONY_QX_HDMIResolution, "HDMIResolution"},
+		{PTP_DPC_SONY_QX_NTSC_PAL_Selector, "NTSC_PAL_Selector"},
+		{PTP_DPC_SONY_QX_HDMIOutput, "HDMIOutput"},
+		{PTP_DPC_SONY_QX_ISOAutoMinimum, "ISOAutoMinimum"},
+		{PTP_DPC_SONY_QX_ISOAutoMaximum, "ISOAutoMaximum"},
+		{PTP_DPC_SONY_QX_APSCSuper35mm, "APSCSuper35mm"},
+		{PTP_DPC_SONY_QX_LiveviewStatus, "LiveviewStatus"},
+		{PTP_DPC_SONY_QX_WhiteBalanceInitialize, "WhiteBalanceInitialize"},
+		{PTP_DPC_SONY_QX_OperatingMode, "OperatingMode"},
+		{PTP_DPC_SONY_QX_BiaxialFineTuningABDirection, "BiaxialFineTuningABDirection"},
+		{PTP_DPC_SONY_QX_HighISONr, "HighISONr"},
+		{PTP_DPC_SONY_QX_AELockIndication, "AELockIndication"},
+		{PTP_DPC_SONY_QX_ElectronicFrontCurtainShutter, "ElectronicFrontCurtainShutter"},
+		{PTP_DPC_SONY_QX_FocusIndication, "FocusIndication"},
+		{PTP_DPC_SONY_QX_BiaxialFineTuningGMDirection, "BiaxialFineTuningGMDirection"},
+		{PTP_DPC_SONY_QX_ColorTemperature, "ColorTemperature"},
+		{PTP_DPC_SONY_QX_BatteryLevelIndication, "BatteryLevelIndication"},
+		{PTP_DPC_SONY_QX_AutoSlowShutter, "AutoSlowShutter"},
+		{PTP_DPC_SONY_QX_DynamicRangeOptimizer, "DynamicRangeOptimizer"},
 		{0,NULL}
         };
 
@@ -5484,7 +7695,8 @@
 			return (ptp_device_propertiesi.txt);
 
 	if (params->deviceinfo.VendorExtensionID==PTP_VENDOR_MICROSOFT
-	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_MTP)
+	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_MTP
+	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_PANASONIC)
 		for (i=0; ptp_device_properties_MTPi.txt!=NULL; i++)
 			if (ptp_device_properties_MTPi.dpc==dpc)
 				return (ptp_device_properties_MTPi.txt);
@@ -5533,7 +7745,7 @@
 		return 0;
 	} else {
 		switch (dt) {
-		case PTP_DTC_UNDEF: 
+		case PTP_DTC_UNDEF:
 			return 0;
 		case PTP_DTC_INT8:
 			return data->i8;
@@ -5548,10 +7760,10 @@
 		case PTP_DTC_UINT32:
 			return data->u32;
 	/*
-		PTP_DTC_INT64           
-		PTP_DTC_UINT64         
-		PTP_DTC_INT128        
-		PTP_DTC_UINT128      
+		PTP_DTC_INT64
+		PTP_DTC_UINT64
+		PTP_DTC_INT128
+		PTP_DTC_UINT128
 	*/
 		default:
 			return 0;
@@ -5590,6 +7802,10 @@
 		{PTP_DPC_CaptureDelay, 0, 0.001, 0.0, "%.1fs"},		/* 5012 */
 		{PTP_DPC_DigitalZoom, 0, 0.1, 0.0, "%.1f"},		/* 5016 */
 		{PTP_DPC_BurstInterval, 0, 0.001, 0.0, "%.1fs"},	/* 5019 */
+		{PTP_DPC_TimelapseInterval, 0, 0.0001, 0.0, "%.1fs"},	/* 5019 */
+		{PTP_DPC_SupportedStreams, 0, 0, 0, "0x%x"},		/* 5020 */
+		{PTP_DPC_EnabledStreams, 0, 0, 0, "0x%x"},		/* 5021 */
+		{PTP_DPC_VideoFrameRate, 0, 0, 0.0000001, "%.1f s/f"},	/* 5021 */
 
 		/* Nikon device properties */
 		{PTP_DPC_NIKON_LightMeter, PTP_VENDOR_NIKON, 0.08333, 0.0, N_("%.1f stops")},/* D10A */
@@ -5673,6 +7889,8 @@
 		{PTP_DPC_FocusMeteringMode, PTP_VENDOR_NIKON, 32785, N_("Closest Subject")},
 		{PTP_DPC_FocusMeteringMode, PTP_VENDOR_NIKON, 32786, N_("Group Dynamic")},
 
+		{PTP_DPC_VideoFormat, 0, 0x47504a4d, "MJPG"},	/* 5022 */
+
 
 		/* Nikon specific device properties */
 		{PTP_DPC_NIKON_ImageSharpening, PTP_VENDOR_NIKON, 0, N_("Auto")},	/* D02A */
@@ -6178,13 +8396,13 @@
 		{0, 0, 0, NULL}
 	};
 	for (i=0; ptp_value_transi.dpc!=0; i++) {
-		if ((ptp_value_transi.dpc == dpc) && 
+		if ((ptp_value_transi.dpc == dpc) &&
 			(((ptp_value_transi.dpc & 0xf000) == 0x5000) ||
 		         (ptp_value_transi.vendor == params->deviceinfo.VendorExtensionID))
 		) {
 			double value = _value_to_num(&(dpd->CurrentValue), dpd->DataType);
 
-			return snprintf(out, length, 
+			return snprintf(out, length,
 				_(ptp_value_transi.format),
 				value * ptp_value_transi.coef +
 				ptp_value_transi.bias);
@@ -6193,7 +8411,7 @@
 
 	kval = _value_to_num(&(dpd->CurrentValue), dpd->DataType);
 	for (i=0; ptp_value_listi.dpc!=0; i++) {
-		if ((ptp_value_listi.dpc == dpc) && 
+		if ((ptp_value_listi.dpc == dpc) &&
 			(((ptp_value_listi.dpc & 0xf000) == 0x5000) ||
 		          (ptp_value_listi.vendor == params->deviceinfo.VendorExtensionID)) &&
 		    (ptp_value_listi.key==kval)
@@ -6202,7 +8420,8 @@
 		}
 	}
 	if (params->deviceinfo.VendorExtensionID==PTP_VENDOR_MICROSOFT
-	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_MTP) {
+	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_MTP
+	    || params->deviceinfo.VendorExtensionID==PTP_VENDOR_PANASONIC) {
 		switch (dpc) {
 		case PTP_DPC_MTP_SynchronizationPartner:
 		case PTP_DPC_MTP_DeviceFriendlyName:
@@ -6369,7 +8588,7 @@
 			}
 			break;
 		case PTP_VENDOR_MICROSOFT:
-		case PTP_VENDOR_MTP:		  
+		case PTP_VENDOR_MTP:
 			for (i=0;i<sizeof(ptp_ofc_mtp_trans)/sizeof(ptp_ofc_mtp_trans0);i++)
 				if (ofc == ptp_ofc_mtp_transi.ofc)
 					return snprintf(txt, spaceleft, "%s", _(ptp_ofc_mtp_transi.format));
@@ -6492,237 +8711,398 @@
 };
 
 ptp_opcode_trans_t ptp_opcode_nikon_trans = {
-	{PTP_OC_NIKON_GetProfileAllData,"PTP_OC_NIKON_GetProfileAllData"},
-	{PTP_OC_NIKON_SendProfileData,"PTP_OC_NIKON_SendProfileData"},
-	{PTP_OC_NIKON_DeleteProfile,"PTP_OC_NIKON_DeleteProfile"},
-	{PTP_OC_NIKON_SetProfileData,"PTP_OC_NIKON_SetProfileData"},
-	{PTP_OC_NIKON_AdvancedTransfer,"PTP_OC_NIKON_AdvancedTransfer"},
-	{PTP_OC_NIKON_GetFileInfoInBlock,"PTP_OC_NIKON_GetFileInfoInBlock"},
-	{PTP_OC_NIKON_Capture,"PTP_OC_NIKON_Capture"},
-	{PTP_OC_NIKON_AfDrive,"PTP_OC_NIKON_AfDrive"},
-	{PTP_OC_NIKON_SetControlMode,"PTP_OC_NIKON_SetControlMode"},
-	{PTP_OC_NIKON_DelImageSDRAM,"PTP_OC_NIKON_DelImageSDRAM"},
-	{PTP_OC_NIKON_GetLargeThumb,"PTP_OC_NIKON_GetLargeThumb"},
-	{PTP_OC_NIKON_CurveDownload,"PTP_OC_NIKON_CurveDownload"},
-	{PTP_OC_NIKON_CurveUpload,"PTP_OC_NIKON_CurveUpload"},
-	{PTP_OC_NIKON_CheckEvent,"PTP_OC_NIKON_CheckEvent"},
-	{PTP_OC_NIKON_DeviceReady,"PTP_OC_NIKON_DeviceReady"},
-	{PTP_OC_NIKON_SetPreWBData,"PTP_OC_NIKON_SetPreWBData"},
-	{PTP_OC_NIKON_GetVendorPropCodes,"PTP_OC_NIKON_GetVendorPropCodes"},
-	{PTP_OC_NIKON_AfCaptureSDRAM,"PTP_OC_NIKON_AfCaptureSDRAM"},
-	{PTP_OC_NIKON_GetPictCtrlData,"PTP_OC_NIKON_GetPictCtrlData"},
-	{PTP_OC_NIKON_SetPictCtrlData,"PTP_OC_NIKON_SetPictCtrlData"},
-	{PTP_OC_NIKON_DelCstPicCtrl,"PTP_OC_NIKON_DelCstPicCtrl"},
-	{PTP_OC_NIKON_GetPicCtrlCapability,"PTP_OC_NIKON_GetPicCtrlCapability"},
-	{PTP_OC_NIKON_GetPreviewImg,"PTP_OC_NIKON_GetPreviewImg"},
-	{PTP_OC_NIKON_StartLiveView,"PTP_OC_NIKON_StartLiveView"},
-	{PTP_OC_NIKON_EndLiveView,"PTP_OC_NIKON_EndLiveView"},
-	{PTP_OC_NIKON_GetLiveViewImg,"PTP_OC_NIKON_GetLiveViewImg"},
-	{PTP_OC_NIKON_MfDrive,"PTP_OC_NIKON_MfDrive"},
-	{PTP_OC_NIKON_ChangeAfArea,"PTP_OC_NIKON_ChangeAfArea"},
-	{PTP_OC_NIKON_AfDriveCancel,"PTP_OC_NIKON_AfDriveCancel"},
-	{PTP_OC_NIKON_InitiateCaptureRecInMedia,"PTP_OC_NIKON_InitiateCaptureRecInMedia"},
-	{PTP_OC_NIKON_GetVendorStorageIDs,"PTP_OC_NIKON_GetVendorStorageIDs"},
-	{PTP_OC_NIKON_StartMovieRecInCard,"PTP_OC_NIKON_StartMovieRecInCard"},
-	{PTP_OC_NIKON_EndMovieRec,"PTP_OC_NIKON_EndMovieRec"},
-	{PTP_OC_NIKON_TerminateCapture,"PTP_OC_NIKON_TerminateCapture"},
-	{PTP_OC_NIKON_GetDevicePTPIPInfo,"PTP_OC_NIKON_GetDevicePTPIPInfo"},
-	{PTP_OC_NIKON_GetPartialObjectHiSpeed,"PTP_OC_NIKON_GetPartialObjectHiSpeed"},
-	{PTP_OC_NIKON_GetDevicePropEx,"PTP_OC_NIKON_GetDevicePropEx"},
+	{PTP_OC_NIKON_GetProfileAllData,"GetProfileAllData"},
+	{PTP_OC_NIKON_SendProfileData,"SendProfileData"},
+	{PTP_OC_NIKON_DeleteProfile,"DeleteProfile"},
+	{PTP_OC_NIKON_SetProfileData,"SetProfileData"},
+	{PTP_OC_NIKON_AdvancedTransfer,"AdvancedTransfer"},
+	{PTP_OC_NIKON_GetFileInfoInBlock,"GetFileInfoInBlock"},
+	{PTP_OC_NIKON_InitiateCaptureRecInSdram,"InitiateCaptureRecInSdram"},
+	{PTP_OC_NIKON_AfDrive,"AfDrive"},
+	{PTP_OC_NIKON_ChangeCameraMode,"ChangeCameraMode"},
+	{PTP_OC_NIKON_DelImageSDRAM,"DelImageSDRAM"},
+	{PTP_OC_NIKON_GetLargeThumb,"GetLargeThumb"},
+	{PTP_OC_NIKON_CurveDownload,"CurveDownload"},
+	{PTP_OC_NIKON_CurveUpload,"CurveUpload"},
+	{PTP_OC_NIKON_GetEvent,"GetEvent"},
+	{PTP_OC_NIKON_DeviceReady,"DeviceReady"},
+	{PTP_OC_NIKON_SetPreWBData,"SetPreWBData"},
+	{PTP_OC_NIKON_GetVendorPropCodes,"GetVendorPropCodes"},
+	{PTP_OC_NIKON_AfCaptureSDRAM,"AfCaptureSDRAM"},
+	{PTP_OC_NIKON_GetPictCtrlData,"GetPictCtrlData"},
+	{PTP_OC_NIKON_SetPictCtrlData,"SetPictCtrlData"},
+	{PTP_OC_NIKON_DelCstPicCtrl,"DelCstPicCtrl"},
+	{PTP_OC_NIKON_GetPicCtrlCapability,"GetPicCtrlCapability"},
+	{PTP_OC_NIKON_GetPreviewImg,"GetPreviewImg"},
+	{PTP_OC_NIKON_StartLiveView,"StartLiveView"},
+	{PTP_OC_NIKON_EndLiveView,"EndLiveView"},
+	{PTP_OC_NIKON_GetLiveViewImg,"GetLiveViewImg"},
+	{PTP_OC_NIKON_MfDrive,"MfDrive"},
+	{PTP_OC_NIKON_ChangeAfArea,"ChangeAfArea"},
+	{PTP_OC_NIKON_AfDriveCancel,"AfDriveCancel"},
+	{PTP_OC_NIKON_InitiateCaptureRecInMedia,"InitiateCaptureRecInMedia"},
+	{PTP_OC_NIKON_GetVendorStorageIDs,"GetVendorStorageIDs"},
+	{PTP_OC_NIKON_StartMovieRecInCard,"StartMovieRecInCard"},
+	{PTP_OC_NIKON_EndMovieRec,"EndMovieRec"},
+	{PTP_OC_NIKON_TerminateCapture,"TerminateCapture"},
+	{PTP_OC_NIKON_GetDevicePTPIPInfo,"GetDevicePTPIPInfo"},
+	{PTP_OC_NIKON_GetPartialObjectHiSpeed,"GetPartialObjectHiSpeed"},
+	{PTP_OC_NIKON_GetDevicePropEx,"GetDevicePropEx"},
+	{PTP_OC_NIKON_GetFhdPicture,"GetFhdPicture"},
+	{PTP_OC_NIKON_StartSpotWb,"StartSpotWb"},
+	{PTP_OC_NIKON_EndSpotWb,"EndSpotWb"},
+	{PTP_OC_NIKON_ChangeSpotWbArea,"ChangeSpotWbArea"},
+	{PTP_OC_NIKON_MeasureSpotWb,"MeasureSpotWb"},
+	{PTP_OC_NIKON_EndSpotWbResultDisp,"EndSpotWbResultDisp"},
+	{PTP_OC_NIKON_CancelImagesInSDRAM,"CancelImagesInSDRAM"},
+	{PTP_OC_NIKON_GetSBHandles,"GetSBHandles"},
+	{PTP_OC_NIKON_GetSBAttrDesc,"GetSBAttrDesc"},
+	{PTP_OC_NIKON_GetSBAttrValue,"GetSBAttrValue"},
+	{PTP_OC_NIKON_SetSBAttrValue,"SetSBAttrValue"},
+	{PTP_OC_NIKON_GetSBGroupAttrDesc,"GetSBGroupAttrDesc"},
+	{PTP_OC_NIKON_GetSBGroupAttrValue,"GetSBGroupAttrValue"},
+	{PTP_OC_NIKON_SetSBGroupAttrValue,"SetSBGroupAttrValue"},
+	{PTP_OC_NIKON_TestFlash,"TestFlash"},
+	{PTP_OC_NIKON_GetEventEx,"GetEventEx"},
+	{PTP_OC_NIKON_MirrorUpCancel,"MirrorUpCancel"},
+	{PTP_OC_NIKON_SaveCameraSetting,"SaveCameraSetting"},
+	{PTP_OC_NIKON_GetObjectSize,"GetObjectSize"},
+	{PTP_OC_NIKON_GetLiveViewCompressedSize,"GetLiveViewCompressedSize"},
+	{PTP_OC_NIKON_StartTracking,"StartTracking"},
+	{PTP_OC_NIKON_EndTracking,"EndTracking"},
+	{PTP_OC_NIKON_ChangeAELock,"ChangeAELock"},
+	{PTP_OC_NIKON_GetLiveViewImageEx,"GetLiveViewImageEx"},
+	{PTP_OC_NIKON_GetPartialObjectEx,"GetPartialObjectEx"},
+	{PTP_OC_NIKON_GetManualSettingLensData,"GetManualSettingLensData"},
+	{PTP_OC_NIKON_PowerZoomByFocalLength,"PowerZoomByFocalLength"},
+	{PTP_OC_NIKON_ActiveSelectionControl,"ActiveSelectionControl"},
+	{PTP_OC_NIKON_ChangeMonitorOff,"ChangeMonitorOff"},
+	{PTP_OC_NIKON_InitiatePixelMapping,"InitiatePixelMapping"},
+	{PTP_OC_NIKON_GetObjectsMetaData,"GetObjectsMetaData"},
+	{PTP_OC_NIKON_ChangeApplicationMode,"ChangeApplicationMode"},
+	{PTP_OC_NIKON_ResetMenu,"ResetMenu"},
 };
 
 ptp_opcode_trans_t ptp_opcode_canon_trans = {
-	{PTP_OC_CANON_GetPartialObjectInfo,"PTP_OC_CANON_GetPartialObjectInfo"},
-	{PTP_OC_CANON_SetObjectArchive,"PTP_OC_CANON_SetObjectArchive"},
-	{PTP_OC_CANON_KeepDeviceOn,"PTP_OC_CANON_KeepDeviceOn"},
-	{PTP_OC_CANON_LockDeviceUI,"PTP_OC_CANON_LockDeviceUI"},
-	{PTP_OC_CANON_UnlockDeviceUI,"PTP_OC_CANON_UnlockDeviceUI"},
-	{PTP_OC_CANON_GetObjectHandleByName,"PTP_OC_CANON_GetObjectHandleByName"},
-	{PTP_OC_CANON_InitiateReleaseControl,"PTP_OC_CANON_InitiateReleaseControl"},
-	{PTP_OC_CANON_TerminateReleaseControl,"PTP_OC_CANON_TerminateReleaseControl"},
-	{PTP_OC_CANON_TerminatePlaybackMode,"PTP_OC_CANON_TerminatePlaybackMode"},
-	{PTP_OC_CANON_ViewfinderOn,"PTP_OC_CANON_ViewfinderOn"},
-	{PTP_OC_CANON_ViewfinderOff,"PTP_OC_CANON_ViewfinderOff"},
-	{PTP_OC_CANON_DoAeAfAwb,"PTP_OC_CANON_DoAeAfAwb"},
-	{PTP_OC_CANON_GetCustomizeSpec,"PTP_OC_CANON_GetCustomizeSpec"},
-	{PTP_OC_CANON_GetCustomizeItemInfo,"PTP_OC_CANON_GetCustomizeItemInfo"},
-	{PTP_OC_CANON_GetCustomizeData,"PTP_OC_CANON_GetCustomizeData"},
-	{PTP_OC_CANON_SetCustomizeData,"PTP_OC_CANON_SetCustomizeData"},
-	{PTP_OC_CANON_GetCaptureStatus,"PTP_OC_CANON_GetCaptureStatus"},
-	{PTP_OC_CANON_CheckEvent,"PTP_OC_CANON_CheckEvent"},
-	{PTP_OC_CANON_FocusLock,"PTP_OC_CANON_FocusLock"},
-	{PTP_OC_CANON_FocusUnlock,"PTP_OC_CANON_FocusUnlock"},
-	{PTP_OC_CANON_GetLocalReleaseParam,"PTP_OC_CANON_GetLocalReleaseParam"},
-	{PTP_OC_CANON_SetLocalReleaseParam,"PTP_OC_CANON_SetLocalReleaseParam"},
-	{PTP_OC_CANON_AskAboutPcEvf,"PTP_OC_CANON_AskAboutPcEvf"},
-	{PTP_OC_CANON_SendPartialObject,"PTP_OC_CANON_SendPartialObject"},
-	{PTP_OC_CANON_InitiateCaptureInMemory,"PTP_OC_CANON_InitiateCaptureInMemory"},
-	{PTP_OC_CANON_GetPartialObjectEx,"PTP_OC_CANON_GetPartialObjectEx"},
-	{PTP_OC_CANON_SetObjectTime,"PTP_OC_CANON_SetObjectTime"},
-	{PTP_OC_CANON_GetViewfinderImage,"PTP_OC_CANON_GetViewfinderImage"},
-	{PTP_OC_CANON_GetObjectAttributes,"PTP_OC_CANON_GetObjectAttributes"},
-	{PTP_OC_CANON_ChangeUSBProtocol,"PTP_OC_CANON_ChangeUSBProtocol"},
-	{PTP_OC_CANON_GetChanges,"PTP_OC_CANON_GetChanges"},
-	{PTP_OC_CANON_GetObjectInfoEx,"PTP_OC_CANON_GetObjectInfoEx"},
-	{PTP_OC_CANON_InitiateDirectTransfer,"PTP_OC_CANON_InitiateDirectTransfer"},
-	{PTP_OC_CANON_TerminateDirectTransfer ,"PTP_OC_CANON_TerminateDirectTransfer "},
-	{PTP_OC_CANON_SendObjectInfoByPath ,"PTP_OC_CANON_SendObjectInfoByPath "},
-	{PTP_OC_CANON_SendObjectByPath ,"PTP_OC_CANON_SendObjectByPath "},
-	{PTP_OC_CANON_InitiateDirectTansferEx,"PTP_OC_CANON_InitiateDirectTansferEx"},
-	{PTP_OC_CANON_GetAncillaryObjectHandles,"PTP_OC_CANON_GetAncillaryObjectHandles"},
-	{PTP_OC_CANON_GetTreeInfo ,"PTP_OC_CANON_GetTreeInfo "},
-	{PTP_OC_CANON_GetTreeSize ,"PTP_OC_CANON_GetTreeSize "},
-	{PTP_OC_CANON_NotifyProgress ,"PTP_OC_CANON_NotifyProgress "},
-	{PTP_OC_CANON_NotifyCancelAccepted,"PTP_OC_CANON_NotifyCancelAccepted"},
-	{PTP_OC_CANON_902C,"PTP_OC_CANON_902C"},
-	{PTP_OC_CANON_GetDirectory,"PTP_OC_CANON_GetDirectory"},
-	{PTP_OC_CANON_SetPairingInfo,"PTP_OC_CANON_SetPairingInfo"},
-	{PTP_OC_CANON_GetPairingInfo,"PTP_OC_CANON_GetPairingInfo"},
-	{PTP_OC_CANON_DeletePairingInfo,"PTP_OC_CANON_DeletePairingInfo"},
-	{PTP_OC_CANON_GetMACAddress,"PTP_OC_CANON_GetMACAddress"},
-	{PTP_OC_CANON_SetDisplayMonitor,"PTP_OC_CANON_SetDisplayMonitor"},
-	{PTP_OC_CANON_PairingComplete,"PTP_OC_CANON_PairingComplete"},
-	{PTP_OC_CANON_GetWirelessMAXChannel,"PTP_OC_CANON_GetWirelessMAXChannel"},
-	{PTP_OC_CANON_GetWebServiceSpec,"PTP_OC_CANON_GetWebServiceSpec"},
-	{PTP_OC_CANON_GetWebServiceData,"PTP_OC_CANON_GetWebServiceData"},
-	{PTP_OC_CANON_SetWebServiceData,"PTP_OC_CANON_SetWebServiceData"},
-	{PTP_OC_CANON_GetRootCertificateSpec,"PTP_OC_CANON_GetRootCertificateSpec"},
-	{PTP_OC_CANON_GetRootCertificateData,"PTP_OC_CANON_GetRootCertificateData"},
-	{PTP_OC_CANON_SetRootCertificateData,"PTP_OC_CANON_SetRootCertificateData"},
-	{PTP_OC_CANON_EOS_GetStorageIDs,"PTP_OC_CANON_EOS_GetStorageIDs"},
-	{PTP_OC_CANON_EOS_GetStorageInfo,"PTP_OC_CANON_EOS_GetStorageInfo"},
-	{PTP_OC_CANON_EOS_GetObjectInfo,"PTP_OC_CANON_EOS_GetObjectInfo"},
-	{PTP_OC_CANON_EOS_GetObject,"PTP_OC_CANON_EOS_GetObject"},
-	{PTP_OC_CANON_EOS_DeleteObject,"PTP_OC_CANON_EOS_DeleteObject"},
-	{PTP_OC_CANON_EOS_FormatStore,"PTP_OC_CANON_EOS_FormatStore"},
-	{PTP_OC_CANON_EOS_GetPartialObject,"PTP_OC_CANON_EOS_GetPartialObject"},
-	{PTP_OC_CANON_EOS_GetDeviceInfoEx,"PTP_OC_CANON_EOS_GetDeviceInfoEx"},
-	{PTP_OC_CANON_EOS_GetObjectInfoEx,"PTP_OC_CANON_EOS_GetObjectInfoEx"},
-	{PTP_OC_CANON_EOS_GetThumbEx,"PTP_OC_CANON_EOS_GetThumbEx"},
-	{PTP_OC_CANON_EOS_SendPartialObject,"PTP_OC_CANON_EOS_SendPartialObject"},
-	{PTP_OC_CANON_EOS_SetObjectAttributes,"PTP_OC_CANON_EOS_SetObjectAttributes"},
-	{PTP_OC_CANON_EOS_GetObjectTime,"PTP_OC_CANON_EOS_GetObjectTime"},
-	{PTP_OC_CANON_EOS_SetObjectTime,"PTP_OC_CANON_EOS_SetObjectTime"},
-	{PTP_OC_CANON_EOS_RemoteRelease,"PTP_OC_CANON_EOS_RemoteRelease"},
-	{PTP_OC_CANON_EOS_SetDevicePropValueEx,"PTP_OC_CANON_EOS_SetDevicePropValueEx"},
-	{PTP_OC_CANON_EOS_GetRemoteMode,"PTP_OC_CANON_EOS_GetRemoteMode"},
-	{PTP_OC_CANON_EOS_SetRemoteMode,"PTP_OC_CANON_EOS_SetRemoteMode"},
-	{PTP_OC_CANON_EOS_SetEventMode,"PTP_OC_CANON_EOS_SetEventMode"},
-	{PTP_OC_CANON_EOS_GetEvent,"PTP_OC_CANON_EOS_GetEvent"},
-	{PTP_OC_CANON_EOS_TransferComplete,"PTP_OC_CANON_EOS_TransferComplete"},
-	{PTP_OC_CANON_EOS_CancelTransfer,"PTP_OC_CANON_EOS_CancelTransfer"},
-	{PTP_OC_CANON_EOS_ResetTransfer,"PTP_OC_CANON_EOS_ResetTransfer"},
-	{PTP_OC_CANON_EOS_PCHDDCapacity,"PTP_OC_CANON_EOS_PCHDDCapacity"},
-	{PTP_OC_CANON_EOS_SetUILock,"PTP_OC_CANON_EOS_SetUILock"},
-	{PTP_OC_CANON_EOS_ResetUILock,"PTP_OC_CANON_EOS_ResetUILock"},
-	{PTP_OC_CANON_EOS_KeepDeviceOn,"PTP_OC_CANON_EOS_KeepDeviceOn"},
-	{PTP_OC_CANON_EOS_SetNullPacketMode,"PTP_OC_CANON_EOS_SetNullPacketMode"},
-	{PTP_OC_CANON_EOS_UpdateFirmware,"PTP_OC_CANON_EOS_UpdateFirmware"},
-	{PTP_OC_CANON_EOS_TransferCompleteDT,"PTP_OC_CANON_EOS_TransferCompleteDT"},
-	{PTP_OC_CANON_EOS_CancelTransferDT,"PTP_OC_CANON_EOS_CancelTransferDT"},
-	{PTP_OC_CANON_EOS_SetWftProfile,"PTP_OC_CANON_EOS_SetWftProfile"},
-	{PTP_OC_CANON_EOS_GetWftProfile,"PTP_OC_CANON_EOS_GetWftProfile"},
-	{PTP_OC_CANON_EOS_SetProfileToWft,"PTP_OC_CANON_EOS_SetProfileToWft"},
-	{PTP_OC_CANON_EOS_BulbStart,"PTP_OC_CANON_EOS_BulbStart"},
-	{PTP_OC_CANON_EOS_BulbEnd,"PTP_OC_CANON_EOS_BulbEnd"},
-	{PTP_OC_CANON_EOS_RequestDevicePropValue,"PTP_OC_CANON_EOS_RequestDevicePropValue"},
-	{PTP_OC_CANON_EOS_RemoteReleaseOn,"PTP_OC_CANON_EOS_RemoteReleaseOn"},
-	{PTP_OC_CANON_EOS_RemoteReleaseOff,"PTP_OC_CANON_EOS_RemoteReleaseOff"},
-	{PTP_OC_CANON_EOS_RegistBackgroundImage,"PTP_OC_CANON_EOS_RegistBackgroundImage"},
-	{PTP_OC_CANON_EOS_ChangePhotoStudioMode,"PTP_OC_CANON_EOS_ChangePhotoStudioMode"},
-	{PTP_OC_CANON_EOS_GetPartialObjectEx,"PTP_OC_CANON_EOS_GetPartialObjectEx"},
-	{PTP_OC_CANON_EOS_ResetMirrorLockupState,"PTP_OC_CANON_EOS_ResetMirrorLockupState"},
-	{PTP_OC_CANON_EOS_PopupBuiltinFlash,"PTP_OC_CANON_EOS_PopupBuiltinFlash"},
-	{PTP_OC_CANON_EOS_EndGetPartialObjectEx,"PTP_OC_CANON_EOS_EndGetPartialObjectEx"},
-	{PTP_OC_CANON_EOS_MovieSelectSWOn,"PTP_OC_CANON_EOS_MovieSelectSWOn"},
-	{PTP_OC_CANON_EOS_MovieSelectSWOff,"PTP_OC_CANON_EOS_MovieSelectSWOff"},
-	{PTP_OC_CANON_EOS_GetCTGInfo,"PTP_OC_CANON_EOS_GetCTGInfo"},
-	{PTP_OC_CANON_EOS_GetLensAdjust,"PTP_OC_CANON_EOS_GetLensAdjust"},
-	{PTP_OC_CANON_EOS_SetLensAdjust,"PTP_OC_CANON_EOS_SetLensAdjust"},
-	{PTP_OC_CANON_EOS_GetMusicInfo,"PTP_OC_CANON_EOS_GetMusicInfo"},
-	{PTP_OC_CANON_EOS_CreateHandle,"PTP_OC_CANON_EOS_CreateHandle"},
-	{PTP_OC_CANON_EOS_SendPartialObjectEx,"PTP_OC_CANON_EOS_SendPartialObjectEx"},
-	{PTP_OC_CANON_EOS_EndSendPartialObjectEx,"PTP_OC_CANON_EOS_EndSendPartialObjectEx"},
-	{PTP_OC_CANON_EOS_SetCTGInfo,"PTP_OC_CANON_EOS_SetCTGInfo"},
-	{PTP_OC_CANON_EOS_SetRequestOLCInfoGroup,"PTP_OC_CANON_EOS_SetRequestOLCInfoGroup"},
-	{PTP_OC_CANON_EOS_SetRequestRollingPitchingLevel,"PTP_OC_CANON_EOS_SetRequestRollingPitchingLevel"},
-	{PTP_OC_CANON_EOS_GetCameraSupport,"PTP_OC_CANON_EOS_GetCameraSupport"},
-	{PTP_OC_CANON_EOS_SetRating,"PTP_OC_CANON_EOS_SetRating"},
-	{PTP_OC_CANON_EOS_RequestInnerDevelopStart,"PTP_OC_CANON_EOS_RequestInnerDevelopStart"},
-	{PTP_OC_CANON_EOS_RequestInnerDevelopParamChange,"PTP_OC_CANON_EOS_RequestInnerDevelopParamChange"},
-	{PTP_OC_CANON_EOS_RequestInnerDevelopEnd,"PTP_OC_CANON_EOS_RequestInnerDevelopEnd"},
-	{PTP_OC_CANON_EOS_GpsLoggingDataMode,"PTP_OC_CANON_EOS_GpsLoggingDataMode"},
-	{PTP_OC_CANON_EOS_GetGpsLogCurrentHandle,"PTP_OC_CANON_EOS_GetGpsLogCurrentHandle"},
-	{PTP_OC_CANON_EOS_InitiateViewfinder,"PTP_OC_CANON_EOS_InitiateViewfinder"},
-	{PTP_OC_CANON_EOS_TerminateViewfinder,"PTP_OC_CANON_EOS_TerminateViewfinder"},
-	{PTP_OC_CANON_EOS_GetViewFinderData,"PTP_OC_CANON_EOS_GetViewFinderData"},
-	{PTP_OC_CANON_EOS_DoAf,"PTP_OC_CANON_EOS_DoAf"},
-	{PTP_OC_CANON_EOS_DriveLens,"PTP_OC_CANON_EOS_DriveLens"},
-	{PTP_OC_CANON_EOS_DepthOfFieldPreview,"PTP_OC_CANON_EOS_DepthOfFieldPreview"},
-	{PTP_OC_CANON_EOS_ClickWB,"PTP_OC_CANON_EOS_ClickWB"},
-	{PTP_OC_CANON_EOS_Zoom,"PTP_OC_CANON_EOS_Zoom"},
-	{PTP_OC_CANON_EOS_ZoomPosition,"PTP_OC_CANON_EOS_ZoomPosition"},
-	{PTP_OC_CANON_EOS_SetLiveAfFrame,"PTP_OC_CANON_EOS_SetLiveAfFrame"},
-	{PTP_OC_CANON_EOS_TouchAfPosition,"PTP_OC_CANON_EOS_TouchAfPosition"},
-	{PTP_OC_CANON_EOS_SetLvPcFlavoreditMode,"PTP_OC_CANON_EOS_SetLvPcFlavoreditMode"},
-	{PTP_OC_CANON_EOS_SetLvPcFlavoreditParam,"PTP_OC_CANON_EOS_SetLvPcFlavoreditParam"},
-	{PTP_OC_CANON_EOS_AfCancel,"PTP_OC_CANON_EOS_AfCancel"},
-	{PTP_OC_CANON_EOS_SetDefaultCameraSetting,"PTP_OC_CANON_EOS_SetDefaultCameraSetting"},
-	{PTP_OC_CANON_EOS_GetAEData,"PTP_OC_CANON_EOS_GetAEData"},
-	{PTP_OC_CANON_EOS_NotifyNetworkError,"PTP_OC_CANON_EOS_NotifyNetworkError"},
-	{PTP_OC_CANON_EOS_AdapterTransferProgress,"PTP_OC_CANON_EOS_AdapterTransferProgress"},
-	{PTP_OC_CANON_EOS_TransferComplete2,"PTP_OC_CANON_EOS_TransferComplete2"},
-	{PTP_OC_CANON_EOS_CancelTransfer2,"PTP_OC_CANON_EOS_CancelTransfer2"},
-	{PTP_OC_CANON_EOS_FAPIMessageTX,"PTP_OC_CANON_EOS_FAPIMessageTX"},
-	{PTP_OC_CANON_EOS_FAPIMessageRX,"PTP_OC_CANON_EOS_FAPIMessageRX"},
-	{PTP_OC_CANON_EOS_SetImageRecoveryData,"PTP_OC_CANON_EOS_SetImageRecoveryData"},
-	{PTP_OC_CANON_EOS_GetImageRecoveryList,"PTP_OC_CANON_EOS_GetImageRecoveryList"},
-	{PTP_OC_CANON_EOS_FormatImageRecoveryData,"PTP_OC_CANON_EOS_FormatImageRecoveryData"},
-	{PTP_OC_CANON_EOS_GetPresetLensAdjustParam,"PTP_OC_CANON_EOS_GetPresetLensAdjustParam"},
-	{PTP_OC_CANON_EOS_GetRawDispImage,"PTP_OC_CANON_EOS_GetRawDispImage"},
-	{PTP_OC_CANON_EOS_SaveImageRecoveryData,"PTP_OC_CANON_EOS_SaveImageRecoveryData"},
-	{PTP_OC_CANON_EOS_RequestBLE,"PTP_OC_CANON_EOS_RequestBLE"},
-	{PTP_OC_CANON_EOS_DrivePowerZoom,"PTP_OC_CANON_EOS_DrivePowerZoom"},
-	{PTP_OC_CANON_EOS_GetIptcData,"PTP_OC_CANON_EOS_GetIptcData"},
-	{PTP_OC_CANON_EOS_SetIptcData,"PTP_OC_CANON_EOS_SetIptcData"},
-	{PTP_OC_CANON_EOS_GetObjectInfo64,"PTP_OC_CANON_EOS_GetObjectInfo64"},
-	{PTP_OC_CANON_EOS_GetObject64,"PTP_OC_CANON_EOS_GetObject64"},
-	{PTP_OC_CANON_EOS_GetPartialObject64,"PTP_OC_CANON_EOS_GetPartialObject64"},
-	{PTP_OC_CANON_EOS_GetObjectInfoEx64,"PTP_OC_CANON_EOS_GetObjectInfoEx64"},
-	{PTP_OC_CANON_EOS_GetPartialObjectEX64,"PTP_OC_CANON_EOS_GetPartialObjectEX64"},
-	{PTP_OC_CANON_EOS_CreateHandle64,"PTP_OC_CANON_EOS_CreateHandle64"},
-	{PTP_OC_CANON_EOS_NotifyEstimateNumberofImport,"PTP_OC_CANON_EOS_NotifyEstimateNumberofImport"},
-	{PTP_OC_CANON_EOS_NotifyNumberofImported,"PTP_OC_CANON_EOS_NotifyNumberofImported"},
-	{PTP_OC_CANON_EOS_NotifySizeOfPartialDataTransfer,"PTP_OC_CANON_EOS_NotifySizeOfPartialDataTransfer"},
-	{PTP_OC_CANON_EOS_NotifyFinish,"PTP_OC_CANON_EOS_NotifyFinish"},
+	{PTP_OC_CANON_GetPartialObjectInfo,"GetPartialObjectInfo"},
+	{PTP_OC_CANON_SetObjectArchive,"SetObjectArchive"},
+	{PTP_OC_CANON_KeepDeviceOn,"KeepDeviceOn"},
+	{PTP_OC_CANON_LockDeviceUI,"LockDeviceUI"},
+	{PTP_OC_CANON_UnlockDeviceUI,"UnlockDeviceUI"},
+	{PTP_OC_CANON_GetObjectHandleByName,"GetObjectHandleByName"},
+	{PTP_OC_CANON_InitiateReleaseControl,"InitiateReleaseControl"},
+	{PTP_OC_CANON_TerminateReleaseControl,"TerminateReleaseControl"},
+	{PTP_OC_CANON_TerminatePlaybackMode,"TerminatePlaybackMode"},
+	{PTP_OC_CANON_ViewfinderOn,"ViewfinderOn"},
+	{PTP_OC_CANON_ViewfinderOff,"ViewfinderOff"},
+	{PTP_OC_CANON_DoAeAfAwb,"DoAeAfAwb"},
+	{PTP_OC_CANON_GetCustomizeSpec,"GetCustomizeSpec"},
+	{PTP_OC_CANON_GetCustomizeItemInfo,"GetCustomizeItemInfo"},
+	{PTP_OC_CANON_GetCustomizeData,"GetCustomizeData"},
+	{PTP_OC_CANON_SetCustomizeData,"SetCustomizeData"},
+	{PTP_OC_CANON_GetCaptureStatus,"GetCaptureStatus"},
+	{PTP_OC_CANON_CheckEvent,"CheckEvent"},
+	{PTP_OC_CANON_FocusLock,"FocusLock"},
+	{PTP_OC_CANON_FocusUnlock,"FocusUnlock"},
+	{PTP_OC_CANON_GetLocalReleaseParam,"GetLocalReleaseParam"},
+	{PTP_OC_CANON_SetLocalReleaseParam,"SetLocalReleaseParam"},
+	{PTP_OC_CANON_AskAboutPcEvf,"AskAboutPcEvf"},
+	{PTP_OC_CANON_SendPartialObject,"SendPartialObject"},
+	{PTP_OC_CANON_InitiateCaptureInMemory,"InitiateCaptureInMemory"},
+	{PTP_OC_CANON_GetPartialObjectEx,"GetPartialObjectEx"},
+	{PTP_OC_CANON_SetObjectTime,"SetObjectTime"},
+	{PTP_OC_CANON_GetViewfinderImage,"GetViewfinderImage"},
+	{PTP_OC_CANON_GetObjectAttributes,"GetObjectAttributes"},
+	{PTP_OC_CANON_ChangeUSBProtocol,"ChangeUSBProtocol"},
+	{PTP_OC_CANON_GetChanges,"GetChanges"},
+	{PTP_OC_CANON_GetObjectInfoEx,"GetObjectInfoEx"},
+	{PTP_OC_CANON_InitiateDirectTransfer,"InitiateDirectTransfer"},
+	{PTP_OC_CANON_TerminateDirectTransfer ,"TerminateDirectTransfer "},
+	{PTP_OC_CANON_SendObjectInfoByPath ,"SendObjectInfoByPath "},
+	{PTP_OC_CANON_SendObjectByPath ,"SendObjectByPath "},
+	{PTP_OC_CANON_InitiateDirectTansferEx,"InitiateDirectTansferEx"},
+	{PTP_OC_CANON_GetAncillaryObjectHandles,"GetAncillaryObjectHandles"},
+	{PTP_OC_CANON_GetTreeInfo ,"GetTreeInfo "},
+	{PTP_OC_CANON_GetTreeSize ,"GetTreeSize "},
+	{PTP_OC_CANON_NotifyProgress ,"NotifyProgress "},
+	{PTP_OC_CANON_NotifyCancelAccepted,"NotifyCancelAccepted"},
+	{PTP_OC_CANON_GetDirectory,"GetDirectory"},
+	{PTP_OC_CANON_SetPairingInfo,"SetPairingInfo"},
+	{PTP_OC_CANON_GetPairingInfo,"GetPairingInfo"},
+	{PTP_OC_CANON_DeletePairingInfo,"DeletePairingInfo"},
+	{PTP_OC_CANON_GetMACAddress,"GetMACAddress"},
+	{PTP_OC_CANON_SetDisplayMonitor,"SetDisplayMonitor"},
+	{PTP_OC_CANON_PairingComplete,"PairingComplete"},
+	{PTP_OC_CANON_GetWirelessMAXChannel,"GetWirelessMAXChannel"},
+	{PTP_OC_CANON_GetWebServiceSpec,"GetWebServiceSpec"},
+	{PTP_OC_CANON_GetWebServiceData,"GetWebServiceData"},
+	{PTP_OC_CANON_SetWebServiceData,"SetWebServiceData"},
+	{PTP_OC_CANON_GetRootCertificateSpec,"GetRootCertificateSpec"},
+	{PTP_OC_CANON_GetRootCertificateData,"GetRootCertificateData"},
+	{PTP_OC_CANON_SetRootCertificateData,"SetRootCertificateData"},
+	{PTP_OC_CANON_DeleteRootCertificateData,"DeleteRootCertificateData"},
+	{PTP_OC_CANON_EOS_GetStorageIDs,"EOS_GetStorageIDs"},
+	{PTP_OC_CANON_EOS_GetStorageInfo,"EOS_GetStorageInfo"},
+	{PTP_OC_CANON_EOS_GetObjectInfo,"EOS_GetObjectInfo"},
+	{PTP_OC_CANON_EOS_GetObject,"EOS_GetObject"},
+	{PTP_OC_CANON_EOS_DeleteObject,"EOS_DeleteObject"},
+	{PTP_OC_CANON_EOS_FormatStore,"EOS_FormatStore"},
+	{PTP_OC_CANON_EOS_GetPartialObject,"EOS_GetPartialObject"},
+	{PTP_OC_CANON_EOS_GetDeviceInfoEx,"EOS_GetDeviceInfoEx"},
+	{PTP_OC_CANON_EOS_GetObjectInfoEx,"EOS_GetObjectInfoEx"},
+	{PTP_OC_CANON_EOS_GetThumbEx,"EOS_GetThumbEx"},
+	{PTP_OC_CANON_EOS_SendPartialObject,"EOS_SendPartialObject"},
+	{PTP_OC_CANON_EOS_SetObjectAttributes,"EOS_SetObjectAttributes"},
+	{PTP_OC_CANON_EOS_GetObjectTime,"EOS_GetObjectTime"},
+	{PTP_OC_CANON_EOS_SetObjectTime,"EOS_SetObjectTime"},
+	{PTP_OC_CANON_EOS_RemoteRelease,"EOS_RemoteRelease"},
+	{PTP_OC_CANON_EOS_SetDevicePropValueEx,"EOS_SetDevicePropValueEx"},
+	{PTP_OC_CANON_EOS_GetRemoteMode,"EOS_GetRemoteMode"},
+	{PTP_OC_CANON_EOS_SetRemoteMode,"EOS_SetRemoteMode"},
+	{PTP_OC_CANON_EOS_SetEventMode,"EOS_SetEventMode"},
+	{PTP_OC_CANON_EOS_GetEvent,"EOS_GetEvent"},
+	{PTP_OC_CANON_EOS_TransferComplete,"EOS_TransferComplete"},
+	{PTP_OC_CANON_EOS_CancelTransfer,"EOS_CancelTransfer"},
+	{PTP_OC_CANON_EOS_ResetTransfer,"EOS_ResetTransfer"},
+	{PTP_OC_CANON_EOS_PCHDDCapacity,"EOS_PCHDDCapacity"},
+	{PTP_OC_CANON_EOS_SetUILock,"EOS_SetUILock"},
+	{PTP_OC_CANON_EOS_ResetUILock,"EOS_ResetUILock"},
+	{PTP_OC_CANON_EOS_KeepDeviceOn,"EOS_KeepDeviceOn"},
+	{PTP_OC_CANON_EOS_SetNullPacketMode,"EOS_SetNullPacketMode"},
+	{PTP_OC_CANON_EOS_UpdateFirmware,"EOS_UpdateFirmware"},
+	{PTP_OC_CANON_EOS_TransferCompleteDT,"EOS_TransferCompleteDT"},
+	{PTP_OC_CANON_EOS_CancelTransferDT,"EOS_CancelTransferDT"},
+	{PTP_OC_CANON_EOS_SetWftProfile,"EOS_SetWftProfile"},
+	{PTP_OC_CANON_EOS_GetWftProfile,"EOS_GetWftProfile"},
+	{PTP_OC_CANON_EOS_SetProfileToWft,"EOS_SetProfileToWft"},
+	{PTP_OC_CANON_EOS_BulbStart,"EOS_BulbStart"},
+	{PTP_OC_CANON_EOS_BulbEnd,"EOS_BulbEnd"},
+	{PTP_OC_CANON_EOS_RequestDevicePropValue,"EOS_RequestDevicePropValue"},
+	{PTP_OC_CANON_EOS_RemoteReleaseOn,"EOS_RemoteReleaseOn"},
+	{PTP_OC_CANON_EOS_RemoteReleaseOff,"EOS_RemoteReleaseOff"},
+	{PTP_OC_CANON_EOS_RegistBackgroundImage,"EOS_RegistBackgroundImage"},
+	{PTP_OC_CANON_EOS_ChangePhotoStudioMode,"EOS_ChangePhotoStudioMode"},
+	{PTP_OC_CANON_EOS_GetPartialObjectEx,"EOS_GetPartialObjectEx"},
+	{PTP_OC_CANON_EOS_ResetMirrorLockupState,"EOS_ResetMirrorLockupState"},
+	{PTP_OC_CANON_EOS_PopupBuiltinFlash,"EOS_PopupBuiltinFlash"},
+	{PTP_OC_CANON_EOS_EndGetPartialObjectEx,"EOS_EndGetPartialObjectEx"},
+	{PTP_OC_CANON_EOS_MovieSelectSWOn,"EOS_MovieSelectSWOn"},
+	{PTP_OC_CANON_EOS_MovieSelectSWOff,"EOS_MovieSelectSWOff"},
+	{PTP_OC_CANON_EOS_GetCTGInfo,"EOS_GetCTGInfo"},
+	{PTP_OC_CANON_EOS_GetLensAdjust,"EOS_GetLensAdjust"},
+	{PTP_OC_CANON_EOS_SetLensAdjust,"EOS_SetLensAdjust"},
+	{PTP_OC_CANON_EOS_ReadyToSendMusic,"EOS_ReadyToSendMusic"},
+	{PTP_OC_CANON_EOS_CreateHandle,"EOS_CreateHandle"},
+	{PTP_OC_CANON_EOS_SendPartialObjectEx,"EOS_SendPartialObjectEx"},
+	{PTP_OC_CANON_EOS_EndSendPartialObjectEx,"EOS_EndSendPartialObjectEx"},
+	{PTP_OC_CANON_EOS_SetCTGInfo,"EOS_SetCTGInfo"},
+	{PTP_OC_CANON_EOS_SetRequestOLCInfoGroup,"EOS_SetRequestOLCInfoGroup"},
+	{PTP_OC_CANON_EOS_SetRequestRollingPitchingLevel,"EOS_SetRequestRollingPitchingLevel"},
+	{PTP_OC_CANON_EOS_GetCameraSupport,"EOS_GetCameraSupport"},
+	{PTP_OC_CANON_EOS_SetRating,"EOS_SetRating"},
+	{PTP_OC_CANON_EOS_RequestInnerDevelopStart,"EOS_RequestInnerDevelopStart"},
+	{PTP_OC_CANON_EOS_RequestInnerDevelopParamChange,"EOS_RequestInnerDevelopParamChange"},
+	{PTP_OC_CANON_EOS_RequestInnerDevelopEnd,"EOS_RequestInnerDevelopEnd"},
+	{PTP_OC_CANON_EOS_GpsLoggingDataMode,"EOS_GpsLoggingDataMode"},
+	{PTP_OC_CANON_EOS_GetGpsLogCurrentHandle,"EOS_GetGpsLogCurrentHandle"},
+	{PTP_OC_CANON_EOS_InitiateViewfinder,"EOS_InitiateViewfinder"},
+	{PTP_OC_CANON_EOS_TerminateViewfinder,"EOS_TerminateViewfinder"},
+	{PTP_OC_CANON_EOS_GetViewFinderData,"EOS_GetViewFinderData"},
+	{PTP_OC_CANON_EOS_DoAf,"EOS_DoAf"},
+	{PTP_OC_CANON_EOS_DriveLens,"EOS_DriveLens"},
+	{PTP_OC_CANON_EOS_DepthOfFieldPreview,"EOS_DepthOfFieldPreview"},
+	{PTP_OC_CANON_EOS_ClickWB,"EOS_ClickWB"},
+	{PTP_OC_CANON_EOS_Zoom,"EOS_Zoom"},
+	{PTP_OC_CANON_EOS_ZoomPosition,"EOS_ZoomPosition"},
+	{PTP_OC_CANON_EOS_SetLiveAfFrame,"EOS_SetLiveAfFrame"},
+	{PTP_OC_CANON_EOS_TouchAfPosition,"EOS_TouchAfPosition"},
+	{PTP_OC_CANON_EOS_SetLvPcFlavoreditMode,"EOS_SetLvPcFlavoreditMode"},
+	{PTP_OC_CANON_EOS_SetLvPcFlavoreditParam,"EOS_SetLvPcFlavoreditParam"},
+	{PTP_OC_CANON_EOS_RequestSensorCleaning,"EOS_RequestSensorCleaning"},
+	{PTP_OC_CANON_EOS_AfCancel,"EOS_AfCancel"},
+	{PTP_OC_CANON_EOS_SetDefaultCameraSetting,"EOS_SetDefaultCameraSetting"},
+	{PTP_OC_CANON_EOS_GetAEData,"EOS_GetAEData"},
+	{PTP_OC_CANON_EOS_NotifyNetworkError,"EOS_NotifyNetworkError"},
+	{PTP_OC_CANON_EOS_AdapterTransferProgress,"EOS_AdapterTransferProgress"},
+	{PTP_OC_CANON_EOS_TransferCompleteFTP,"EOS_TransferCompleteFTP"},
+	{PTP_OC_CANON_EOS_CancelTransferFTP,"EOS_CancelTransferFTP"},
+	{PTP_OC_CANON_EOS_FAPIMessageTX,"EOS_FAPIMessageTX"},
+	{PTP_OC_CANON_EOS_FAPIMessageRX,"EOS_FAPIMessageRX"},
+	{PTP_OC_CANON_EOS_SetImageRecoveryData,"EOS_SetImageRecoveryData"},
+	{PTP_OC_CANON_EOS_GetImageRecoveryList,"EOS_GetImageRecoveryList"},
+	{PTP_OC_CANON_EOS_FormatImageRecoveryData,"EOS_FormatImageRecoveryData"},
+	{PTP_OC_CANON_EOS_GetPresetLensAdjustParam,"EOS_GetPresetLensAdjustParam"},
+	{PTP_OC_CANON_EOS_GetRawDispImage,"EOS_GetRawDispImage"},
+	{PTP_OC_CANON_EOS_SaveImageRecoveryData,"EOS_SaveImageRecoveryData"},
+	{PTP_OC_CANON_EOS_RequestBLE,"EOS_RequestBLE"},
+	{PTP_OC_CANON_EOS_DrivePowerZoom,"EOS_DrivePowerZoom"},
+	{PTP_OC_CANON_EOS_GetIptcData,"EOS_GetIptcData"},
+	{PTP_OC_CANON_EOS_SetIptcData,"EOS_SetIptcData"},
+	{PTP_OC_CANON_EOS_GetObjectInfo64,"EOS_GetObjectInfo64"},
+	{PTP_OC_CANON_EOS_GetObject64,"EOS_GetObject64"},
+	{PTP_OC_CANON_EOS_GetPartialObject64,"EOS_GetPartialObject64"},
+	{PTP_OC_CANON_EOS_GetObjectInfoEx64,"EOS_GetObjectInfoEx64"},
+	{PTP_OC_CANON_EOS_GetPartialObjectEX64,"EOS_GetPartialObjectEX64"},
+	{PTP_OC_CANON_EOS_CreateHandle64,"EOS_CreateHandle64"},
+	{PTP_OC_CANON_EOS_NotifyEstimateNumberofImport,"EOS_NotifyEstimateNumberofImport"},
+	{PTP_OC_CANON_EOS_NotifyNumberofImported,"EOS_NotifyNumberofImported"},
+	{PTP_OC_CANON_EOS_NotifySizeOfPartialDataTransfer,"EOS_NotifySizeOfPartialDataTransfer"},
+	{PTP_OC_CANON_EOS_NotifyFinish,"EOS_NotifyFinish"},
+	{PTP_OC_CANON_EOS_SetImageRecoveryDataEx,"EOS_SetImageRecoveryDataEx"},
+	{PTP_OC_CANON_EOS_GetImageRecoveryListEx,"EOS_GetImageRecoveryListEx"},
+	{PTP_OC_CANON_EOS_NotifyAutoTransferStatus,"EOS_NotifyAutoTransferStatus"},
+	{PTP_OC_CANON_EOS_GetReducedObject,"EOS_GetReducedObject"},
+	{PTP_OC_CANON_EOS_NotifySaveComplete,"EOS_NotifySaveComplete"},
+	{PTP_OC_CANON_EOS_GetObjectURL,"EOS_GetObjectURL"},
+	{PTP_OC_CANON_SetRemoteShootingMode,"SetRemoteShootingMode"},
+	{PTP_OC_CANON_EOS_SetFELock,"EOS_SetFELock"},
+	{PTP_OC_CANON_DeleteWebServiceData,"DeleteWebServiceData"},
+	{PTP_OC_CANON_GetGpsMobilelinkObjectInfo,"GetGpsMobilelinkObjectInfo"},
+	{PTP_OC_CANON_SendGpsTagInfo,"SendGpsTagInfo"},
+	{PTP_OC_CANON_GetTranscodeApproxSize,"GetTranscodeApproxSize"},
+	{PTP_OC_CANON_RequestTranscodeStart,"RequestTranscodeStart"},
+	{PTP_OC_CANON_RequestTranscodeCancel,"RequestTranscodeCancel"},
+	{PTP_OC_CANON_EOS_SendHostInfo,"EOS_SendHostInfo"},
+	{PTP_OC_CANON_EOS_NotifyBtStatus,"EOS_NotifyBtStatus"},
+	{PTP_OC_CANON_EOS_SetAdapterBatteryReport,"EOS_SetAdapterBatteryReport"},
+	{PTP_OC_CANON_EOS_CompleteAutoSendImages,"EOS_CompleteAutoSendImages"},
+	{PTP_OC_CANON_EOS_GetTranscodedBlock,"EOS_GetTranscodedBlock"},
+	{PTP_OC_CANON_EOS_TransferCompleteTranscodedBlock,"EOS_TransferCompleteTranscodedBlock"},
+	{PTP_OC_CANON_EOS_GetWFTData,"EOS_GetWFTData"},
+	{PTP_OC_CANON_EOS_SetWFTData,"EOS_SetWFTData"},
+	{PTP_OC_CANON_EOS_ChangeWFTSettingNumber,"EOS_ChangeWFTSettingNumber"},
+	{PTP_OC_CANON_EOS_GetPictureStylePCFlavorParam,"EOS_GetPictureStylePCFlavorParam"},
+	{PTP_OC_CANON_EOS_SetPictureStylePCFlavorParam,"EOS_SetPictureStylePCFlavorParam"},
+	{PTP_OC_CANON_EOS_SetCAssistMode,"EOS_SetCAssistMode"},
+	{PTP_OC_CANON_EOS_GetCAssistPresetThumb,"EOS_GetCAssistPresetThumb"},
+	{PTP_OC_CANON_EOS_DeleteWFTSettingNumber,"EOS_DeleteWFTSettingNumber"},
 };
 
 ptp_opcode_trans_t ptp_opcode_sony_trans = {
-	{PTP_OC_SONY_SDIOConnect,"PTP_OC_SONY_SDIOConnect"},
-	{PTP_OC_SONY_GetSDIOGetExtDeviceInfo,"PTP_OC_SONY_GetSDIOGetExtDeviceInfo"},
-	{PTP_OC_SONY_GetDevicePropdesc,"PTP_OC_SONY_GetDevicePropdesc"},
-	{PTP_OC_SONY_GetDevicePropertyValue,"PTP_OC_SONY_GetDevicePropertyValue"},
-	{PTP_OC_SONY_SetControlDeviceA,"PTP_OC_SONY_SetControlDeviceA"},
-	{PTP_OC_SONY_GetControlDeviceDesc,"PTP_OC_SONY_GetControlDeviceDesc"},
-	{PTP_OC_SONY_SetControlDeviceB,"PTP_OC_SONY_SetControlDeviceB"},
-	{PTP_OC_SONY_GetAllDevicePropData,"PTP_OC_SONY_GetAllDevicePropData"},
+	{PTP_OC_SONY_SDIOConnect,"SDIOConnect"},
+	{PTP_OC_SONY_GetSDIOGetExtDeviceInfo,"GetSDIOGetExtDeviceInfo"},
+	{PTP_OC_SONY_GetDevicePropdesc,"GetDevicePropdesc"},
+	{PTP_OC_SONY_GetDevicePropertyValue,"GetDevicePropertyValue"},
+	{PTP_OC_SONY_SetControlDeviceA,"SetControlDeviceA"},
+	{PTP_OC_SONY_GetControlDeviceDesc,"GetControlDeviceDesc"},
+	{PTP_OC_SONY_SetControlDeviceB,"SetControlDeviceB"},
+	{PTP_OC_SONY_GetAllDevicePropData,"GetAllDevicePropData"},
+	{PTP_OC_SONY_QX_GetAllDevicePropData,"QX_GetAllDevicePropData"},
+	{PTP_OC_SONY_QX_SetControlDeviceB,"QX_SetControlDeviceB"},
+	{PTP_OC_SONY_QX_SetControlDeviceA,"QX_SetControlDeviceA"},
+	{PTP_OC_SONY_QX_GetSDIOGetExtDeviceInfo,"QX_GetSDIOGetExtDeviceInfo"},
+	{PTP_OC_SONY_QX_Connect,"QX_Connect"},
+	{PTP_OC_SONY_QX_SetExtPictureProfile, "QX_SetExtPictureProfile"},
+	{PTP_OC_SONY_QX_GetExtPictureProfile, "QX_GetExtPictureProfile"},
+	{PTP_OC_SONY_QX_GetExtLensInfo, "QX_GetExtLensInfo"},
+	{PTP_OC_SONY_QX_SendUpdateFile, "QX_SendUpdateFile"},
 };
 
 ptp_opcode_trans_t ptp_opcode_parrot_trans = {
-	{PTP_OC_PARROT_GetSunshineValues,"PTP_OC_PARROT_GetSunshineValues"},
-	{PTP_OC_PARROT_GetTemperatureValues,"PTP_OC_PARROT_GetTemperatureValues"},
-	{PTP_OC_PARROT_GetAngleValues,"PTP_OC_PARROT_GetAngleValues"},
-	{PTP_OC_PARROT_GetGpsValues,"PTP_OC_PARROT_GetGpsValues"},
-	{PTP_OC_PARROT_GetGyroscopeValues,"PTP_OC_PARROT_GetGyroscopeValues"},
-	{PTP_OC_PARROT_GetAccelerometerValues,"PTP_OC_PARROT_GetAccelerometerValues"},
-	{PTP_OC_PARROT_GetMagnetometerValues,"PTP_OC_PARROT_GetMagnetometerValues"},
-	{PTP_OC_PARROT_GetImuValues,"PTP_OC_PARROT_GetImuValues"},
-	{PTP_OC_PARROT_GetStatusMask,"PTP_OC_PARROT_GetStatusMask"},
-	{PTP_OC_PARROT_EjectStorage,"PTP_OC_PARROT_EjectStorage"},
-	{PTP_OC_PARROT_StartMagnetoCalib,"PTP_OC_PARROT_StartMagnetoCalib"},
-	{PTP_OC_PARROT_StopMagnetoCalib,"PTP_OC_PARROT_StopMagnetoCalib"},
-	{PTP_OC_PARROT_MagnetoCalibStatus,"PTP_OC_PARROT_MagnetoCalibStatus"},
-	{PTP_OC_PARROT_SendFirmwareUpdate,"PTP_OC_PARROT_SendFirmwareUpdate"},
+	{PTP_OC_PARROT_GetSunshineValues,"GetSunshineValues"},
+	{PTP_OC_PARROT_GetTemperatureValues,"GetTemperatureValues"},
+	{PTP_OC_PARROT_GetAngleValues,"GetAngleValues"},
+	{PTP_OC_PARROT_GetGpsValues,"GetGpsValues"},
+	{PTP_OC_PARROT_GetGyroscopeValues,"GetGyroscopeValues"},
+	{PTP_OC_PARROT_GetAccelerometerValues,"GetAccelerometerValues"},
+	{PTP_OC_PARROT_GetMagnetometerValues,"GetMagnetometerValues"},
+	{PTP_OC_PARROT_GetImuValues,"GetImuValues"},
+	{PTP_OC_PARROT_GetStatusMask,"GetStatusMask"},
+	{PTP_OC_PARROT_EjectStorage,"EjectStorage"},
+	{PTP_OC_PARROT_StartMagnetoCalib,"StartMagnetoCalib"},
+	{PTP_OC_PARROT_StopMagnetoCalib,"StopMagnetoCalib"},
+	{PTP_OC_PARROT_MagnetoCalibStatus,"MagnetoCalibStatus"},
+	{PTP_OC_PARROT_SendFirmwareUpdate,"SendFirmwareUpdate"},
+};
+
+ptp_opcode_trans_t ptp_opcode_leica_trans = {
+	{PTP_OC_LEICA_SetCameraSettings,"SetCameraSettings"},
+	{PTP_OC_LEICA_GetCameraSettings,"GetCameraSettings"},
+	{PTP_OC_LEICA_GetLensParameter,"GetLensParameter"},
+	{PTP_OC_LEICA_LEReleaseStages,"LEReleaseStages"},
+	{PTP_OC_LEICA_LEOpenSession,"LEOpenSession"},
+	{PTP_OC_LEICA_LECloseSession,"LECloseSession"},
+	{PTP_OC_LEICA_RequestObjectTransferReady,"RequestObjectTransferReady"},
+	{PTP_OC_LEICA_GetGeoTrackingData,"GetGeoTrackingData"},
+	{PTP_OC_LEICA_OpenDebugSession,"OpenDebugSession"},
+	{PTP_OC_LEICA_CloseDebugSession,"CloseDebugSession"},
+	{PTP_OC_LEICA_GetDebugBuffer,"GetDebugBuffer"},
+	{PTP_OC_LEICA_DebugCommandString,"DebugCommandString"},
+	{PTP_OC_LEICA_GetDebugRoute,"GetDebugRoute"},
+	{PTP_OC_LEICA_SetIPTCData,"SetIPTCData"},
+	{PTP_OC_LEICA_GetIPTCData,"GetIPTCData"},
+	{PTP_OC_LEICA_LEControlAutoFocus,"LEControlAutoFocus"},
+	{PTP_OC_LEICA_LEControlBulbExposure,"LEControlBulbExposure"},
+	{PTP_OC_LEICA_LEControlContinuousExposure,"LEControlContinuousExposure"},
+	{PTP_OC_LEICA_901b,"901b"},
+	{PTP_OC_LEICA_LEControlPhotoLiveView,"LEControlPhotoLiveView"},
+	{PTP_OC_LEICA_LEKeepSessionActive,"LEKeepSessionActive"},
+	{PTP_OC_LEICA_LEMoveLens,"LEMoveLens"},
+	{PTP_OC_LEICA_Get3DAxisData,"Get3DAxisData"},
+	{PTP_OC_LEICA_LESetZoomMode,"LESetZoomMode"},
+	{PTP_OC_LEICA_LESetFocusCrossPosition,"LESetFocusCrossPosition"},
+	{PTP_OC_LEICA_LESetDisplayWindowPosition,"LESetDisplayWindowPosition"},
+	{PTP_OC_LEICA_LEGetStreamData,"LEGetStreamData"},
+	{PTP_OC_LEICA_OpenLiveViewSession,"OpenLiveViewSession"},
+	{PTP_OC_LEICA_CloseLiveViewSession,"CloseLiveViewSession"},
+	{PTP_OC_LEICA_LESetDateTime,"LESetDateTime"},
+	{PTP_OC_LEICA_GetObjectPropListPaginated,"GetObjectPropListPaginated"},
+	{PTP_OC_LEICA_OpenProductionSession,"OpenProductionSession"},
+	{PTP_OC_LEICA_CloseProductionSession,"CloseProductionSession"},
+	{PTP_OC_LEICA_UpdateFirmware,"UpdateFirmware"},
+	{PTP_OC_LEICA_OpenOSDSession,"OpenOSDSession"},
+	{PTP_OC_LEICA_CloseOSDSession,"CloseOSDSession"},
+	{PTP_OC_LEICA_GetOSDData,"GetOSDData"},
+	{PTP_OC_LEICA_GetFirmwareStruct,"GetFirmwareStruct"},
+	{PTP_OC_LEICA_GetDebugMenu,"GetDebugMenu"},
+	{PTP_OC_LEICA_SetDebugMenu,"SetDebugMenu"},
+	{PTP_OC_LEICA_OdinMessage,"OdinMessage"},
+	{PTP_OC_LEICA_GetDebugObjectHandles,"GetDebugObjectHandles"},
+	{PTP_OC_LEICA_GetDebugObject,"GetDebugObject"},
+	{PTP_OC_LEICA_DeleteDebugObject,"DeleteDebugObject"},
+	{PTP_OC_LEICA_GetDebugObjectInfo,"GetDebugObjectInfo"},
+	{PTP_OC_LEICA_WriteDebugObject,"WriteDebugObject"},
+	{PTP_OC_LEICA_CreateDebugObject,"CreateDebugObject"},
+	{PTP_OC_LEICA_Calibrate3DAxis,"Calibrate3DAxis"},
+	{PTP_OC_LEICA_MagneticCalibration,"MagneticCalibration"},
+	{PTP_OC_LEICA_GetViewFinderData,"GetViewFinderData"},
+};
+
+ptp_opcode_trans_t ptp_opcode_sigmafp_trans = {
+	{PTP_OC_SIGMA_FP_GetCamConfig,"GetCamConfig"},
+	{PTP_OC_SIGMA_FP_GetCamStatus,"GetCamStatus"},
+	{PTP_OC_SIGMA_FP_GetDataGroup1,"GetDataGroup1"},
+	{PTP_OC_SIGMA_FP_GetDataGroup2,"GetDataGroup2"},
+	{PTP_OC_SIGMA_FP_GetDataGroup3,"GetDataGroup3"},
+	{PTP_OC_SIGMA_FP_GetCaptureStatus,"GetCaptureStatus"},
+	{PTP_OC_SIGMA_FP_SetDataGroup1,"SetDataGroup1"},
+	{PTP_OC_SIGMA_FP_SetDataGroup2,"SetDataGroup2"},
+	{PTP_OC_SIGMA_FP_SetDataGroup3,"SetDataGroup3"},
+	{PTP_OC_SIGMA_FP_ClockAdjust,"ClockAdjust"},
+	{PTP_OC_SIGMA_FP_Snap,"Snap"},
+	{PTP_OC_SIGMA_FP_ClearImageDBSingle,"ClearImageDBSingle"},
+	{PTP_OC_SIGMA_FP_ClearImageDBAll,"ClearImageDBAll"},
+	{PTP_OC_SIGMA_FP_GetPictFileInfo,"GetPictFileInfo"},
+	{PTP_OC_SIGMA_FP_GetPartialPictFile,"GetPartialPictFile"},
+	{PTP_OC_SIGMA_FP_GetBigPartialPictFile,"GetBigPartialPictFile"},
+	{PTP_OC_SIGMA_FP_GetDataGroup4,"GetDataGroup4"},
+	{PTP_OC_SIGMA_FP_SetDataGroup4,"SetDataGroup4"},
+	{PTP_OC_SIGMA_FP_GetCamSentInfo2,"GetCamSentInfo2"},
+	{PTP_OC_SIGMA_FP_GetCamSentInfo3,"GetCamSentInfo3"},
+	{PTP_OC_SIGMA_FP_GetDataGroup5,"GetDataGroup5"},
+	{PTP_OC_SIGMA_FP_SetDataGroup5,"SetDataGroup5"},
+	{PTP_OC_SIGMA_FP_GetDataGroup6,"GetDataGroup6"},
+	{PTP_OC_SIGMA_FP_SetDataGroup6,"SetDataGroup6"},
+	{PTP_OC_SIGMA_FP_GetCamViewFrame,"GetCamViewFrame"},
+	{PTP_OC_SIGMA_FP_GetPictFileInfo2,"GetPictFileInfo2"},
+	{PTP_OC_SIGMA_FP_GetCamCanSetInfo5,"GetCamCanSetInfo5"},
+	{PTP_OC_SIGMA_FP_GetCamDataGroupFocus,"GetCamDataGroupFocus"},
+	{PTP_OC_SIGMA_FP_SetCamDataGroupFocus,"SetCamDataGroupFocus"},
+	{PTP_OC_SIGMA_FP_GetCamDataGroupMovie,"GetCamDataGroupMovie"},
+	{PTP_OC_SIGMA_FP_SetCamDataGroupMovie,"SetCamDataGroupMovie"},
+	{PTP_OC_SIGMA_FP_GetCameraInfo,"GetCameraInfo"},
+	{PTP_OC_SIGMA_FP_GetMovieFileInfo,"GetMovieFileInfo"},
+	{PTP_OC_SIGMA_FP_GetPartialMovieFile,"GetPartialMovieFile"},
 };
 
 const char*
@@ -6742,11 +9122,14 @@
 
 	switch (params->deviceinfo.VendorExtensionID) {
 	case PTP_VENDOR_MICROSOFT:
+	case PTP_VENDOR_PANASONIC:
 	case PTP_VENDOR_MTP:	RETURN_NAME_FROM_TABLE(ptp_opcode_mtp_trans, opcode);
 	case PTP_VENDOR_NIKON:	RETURN_NAME_FROM_TABLE(ptp_opcode_nikon_trans, opcode);
 	case PTP_VENDOR_CANON:	RETURN_NAME_FROM_TABLE(ptp_opcode_canon_trans, opcode);
 	case PTP_VENDOR_SONY:	RETURN_NAME_FROM_TABLE(ptp_opcode_sony_trans, opcode);
 	case PTP_VENDOR_PARROT:	RETURN_NAME_FROM_TABLE(ptp_opcode_parrot_trans, opcode);
+	case PTP_VENDOR_GP_LEICA:	RETURN_NAME_FROM_TABLE(ptp_opcode_leica_trans, opcode);
+	case PTP_VENDOR_GP_SIGMAFP:	RETURN_NAME_FROM_TABLE(ptp_opcode_sigmafp_trans, opcode);
 	default:
 		break;
 	}
@@ -6758,38 +9141,94 @@
 
 struct {
 	uint16_t code;
+	uint16_t vendor;
 	const char *name;
 } ptp_event_codes = {
-	{PTP_EC_Undefined, "Undefined"},
-	{PTP_EC_CancelTransaction, "CancelTransaction"},
-	{PTP_EC_ObjectAdded, "ObjectAdded"},
-	{PTP_EC_ObjectRemoved, "ObjectRemoved"},
-	{PTP_EC_StoreAdded, "StoreAdded"},
-	{PTP_EC_StoreRemoved, "StoreRemoved"},
-	{PTP_EC_DevicePropChanged, "DevicePropChanged"},
-	{PTP_EC_ObjectInfoChanged, "ObjectInfoChanged"},
-	{PTP_EC_DeviceInfoChanged, "DeviceInfoChanged"},
-	{PTP_EC_RequestObjectTransfer, "RequestObjectTransfer"},
-	{PTP_EC_StoreFull, "StoreFull"},
-	{PTP_EC_DeviceReset, "DeviceReset"},
-	{PTP_EC_StorageInfoChanged, "StorageInfoChanged"},
-	{PTP_EC_CaptureComplete, "CaptureComplete"},
-	{PTP_EC_UnreportedStatus, "UnreportedStatus"},
-
-	{PTP_EC_MTP_ObjectPropChanged, "ObjectPropChanged"},
-	{PTP_EC_MTP_ObjectPropDescChanged, "ObjectPropDescChanged"},
-	{PTP_EC_MTP_ObjectReferencesChanged, "ObjectReferencesChanged"},
-};
+	{PTP_EC_Undefined, 		0, "Undefined"},
+	{PTP_EC_CancelTransaction,	0, "CancelTransaction"},
+	{PTP_EC_ObjectAdded,		0, "ObjectAdded"},
+	{PTP_EC_ObjectRemoved,		0, "ObjectRemoved"},
+	{PTP_EC_StoreAdded,		0, "StoreAdded"},
+	{PTP_EC_StoreRemoved,		0, "StoreRemoved"},
+	{PTP_EC_DevicePropChanged,	0, "DevicePropChanged"},
+	{PTP_EC_ObjectInfoChanged,	0, "ObjectInfoChanged"},
+	{PTP_EC_DeviceInfoChanged,	0, "DeviceInfoChanged"},
+	{PTP_EC_RequestObjectTransfer,	0, "RequestObjectTransfer"},
+	{PTP_EC_StoreFull,		0, "StoreFull"},
+	{PTP_EC_DeviceReset,		0, "DeviceReset"},
+	{PTP_EC_StorageInfoChanged,	0, "StorageInfoChanged"},
+	{PTP_EC_CaptureComplete,	0, "CaptureComplete"},
+	{PTP_EC_UnreportedStatus,	0, "UnreportedStatus"},
+
+	{PTP_EC_MTP_ObjectPropChanged,		0, "ObjectPropChanged"},
+	{PTP_EC_MTP_ObjectPropDescChanged,	0, "ObjectPropDescChanged"},
+	{PTP_EC_MTP_ObjectReferencesChanged,	0, "ObjectReferencesChanged"},
+
+	{PTP_EC_Nikon_ObjectAddedInSDRAM, 		PTP_VENDOR_NIKON, "Nikon_ObjectAddedInSDRAM"},
+	{PTP_EC_Nikon_CaptureCompleteRecInSdram,	PTP_VENDOR_NIKON, "Nikon_CaptureCompleteRecInSdram"},
+	{PTP_EC_Nikon_AdvancedTransfer, 		PTP_VENDOR_NIKON, "Nikon_AdvancedTransfer"},
+	{PTP_EC_Nikon_PreviewImageAdded, 		PTP_VENDOR_NIKON, "Nikon_PreviewImageAdded"},
+	{PTP_EC_Nikon_MovieRecordInterrupted,		PTP_VENDOR_NIKON, "Nikon_MovieRecordInterrupted"},
+	{PTP_EC_Nikon_MovieRecordComplete,		PTP_VENDOR_NIKON, "Nikon_MovieRecordComplete"},
+	{PTP_EC_Nikon_MovieRecordStarted,		PTP_VENDOR_NIKON, "Nikon_MovieRecordStarted"},
+	{PTP_EC_Nikon_PictureControlAdjustChanged,	PTP_VENDOR_NIKON, "Nikon_PictureControlAdjustChanged"},
+	{PTP_EC_Nikon_LiveViewStateChanged,		PTP_VENDOR_NIKON, "Nikon_LiveViewStateChanged"},
+	{PTP_EC_Nikon_ManualSettingsLensDataChanged,	PTP_VENDOR_NIKON, "Nikon_ManualSettingsLensDataChanged"},
+	{PTP_EC_Nikon_ActiveSelectionInterrupted,	PTP_VENDOR_NIKON, "Nikon_ActiveSelectionInterrupted"},
+	{PTP_EC_Nikon_SBAdded,				PTP_VENDOR_NIKON, "Nikon_SBAdded"},
+	{PTP_EC_Nikon_SBRemoved,			PTP_VENDOR_NIKON, "Nikon_SBRemoved"},
+	{PTP_EC_Nikon_SBAttrChanged,			PTP_VENDOR_NIKON, "Nikon_SBAttrChanged"},
+	{PTP_EC_Nikon_SBGroupAttrChanged,		PTP_VENDOR_NIKON, "Nikon_SBGroupAttrChanged"},
+	{PTP_EC_Nikon_1stCaptureComplete,		PTP_VENDOR_NIKON, "Nikon_1stCaptureComplete"},
+	{PTP_EC_Nikon_MirrorUpCancelComplete,		PTP_VENDOR_NIKON, "Nikon_MirrorUpCancelComplete"},
+
+	{PTP_EC_Sony_ObjectAdded,			PTP_VENDOR_SONY,  "Sony_ObjectAdded"},
+	{PTP_EC_Sony_ObjectRemoved,			PTP_VENDOR_SONY,  "Sony_ObjectRemoved"},
+	{PTP_EC_Sony_PropertyChanged,			PTP_VENDOR_SONY,  "Sony_PropertyChanged"},
+
+	{PTP_EC_Olympus_CreateRecView,			PTP_VENDOR_GP_OLYMPUS, "Olympus_CreateRecView"},
+	{PTP_EC_Olympus_CreateRecView_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_CreateRecView_New"},
+	{PTP_EC_Olympus_ObjectAdded,			PTP_VENDOR_GP_OLYMPUS, "Olympus_ObjectAdded"},
+	{PTP_EC_Olympus_ObjectAdded_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_ObjectAdded_New"},
+	{PTP_EC_Olympus_AF_Frame,			PTP_VENDOR_GP_OLYMPUS, "Olympus_AF_Frame"},
+	{PTP_EC_Olympus_AF_Frame_New,			PTP_VENDOR_GP_OLYMPUS, "Olympus_AF_Frame_New"},
+	{PTP_EC_Olympus_DirectStoreImage,		PTP_VENDOR_GP_OLYMPUS, "Olympus_DirectStoreImage"},
+	{PTP_EC_Olympus_DirectStoreImage_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_DirectStoreImage_New"},
+	{PTP_EC_Olympus_ComplateCameraControlOff,	PTP_VENDOR_GP_OLYMPUS, "Olympus_ComplateCameraControlOff"},
+	{PTP_EC_Olympus_ComplateCameraControlOff_New,	PTP_VENDOR_GP_OLYMPUS, "Olympus_ComplateCameraControlOff_New"},
+	{PTP_EC_Olympus_AF_Frame_Over_Info,		PTP_VENDOR_GP_OLYMPUS, "Olympus_AF_Frame_Over_Info"},
+	{PTP_EC_Olympus_AF_Frame_Over_Info_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_AF_Frame_Over_Info_New"},
+	{PTP_EC_Olympus_DevicePropChanged,		PTP_VENDOR_GP_OLYMPUS, "Olympus_DevicePropChanged"},
+	{PTP_EC_Olympus_DevicePropChanged_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_DevicePropChanged_New"},
+	{PTP_EC_Olympus_ImageTransferModeFinish,	PTP_VENDOR_GP_OLYMPUS, "Olympus_ImageTransferModeFinish"},
+	{PTP_EC_Olympus_ImageTransferModeFinish_New,	PTP_VENDOR_GP_OLYMPUS, "Olympus_ImageTransferModeFinish_New"},
+	{PTP_EC_Olympus_ImageRecordFinish,		PTP_VENDOR_GP_OLYMPUS, "Olympus_ImageRecordFinish"},
+	{PTP_EC_Olympus_ImageRecordFinish_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_ImageRecordFinish_New"},
+	{PTP_EC_Olympus_SlotStatusChange,		PTP_VENDOR_GP_OLYMPUS, "Olympus_SlotStatusChange"},
+	{PTP_EC_Olympus_SlotStatusChange_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_SlotStatusChange_New"},
+	{PTP_EC_Olympus_PrioritizeRecord,		PTP_VENDOR_GP_OLYMPUS, "Olympus_PrioritizeRecord"},
+	{PTP_EC_Olympus_PrioritizeRecord_New,		PTP_VENDOR_GP_OLYMPUS, "Olympus_PrioritizeRecord_New"},
+	{PTP_EC_Olympus_FailCombiningAfterShooting,	PTP_VENDOR_GP_OLYMPUS, "Olympus_FailCombiningAfterShooting"},
+	{PTP_EC_Olympus_FailCombiningAfterShooting_New,	PTP_VENDOR_GP_OLYMPUS, "Olympus_FailCombiningAfterShooting_New"},
+	{PTP_EC_Olympus_NotifyAFTargetFrame,		PTP_VENDOR_GP_OLYMPUS, "Olympus_NotifyAFTargetFrame"},
+	{PTP_EC_Olympus_NotifyAFTargetFrame_New,	PTP_VENDOR_GP_OLYMPUS, "Olympus_NotifyAFTargetFrame_New"},
+	{PTP_EC_Olympus_RawEditParamChanged,		PTP_VENDOR_GP_OLYMPUS, "Olympus_RawEditParamChanged"},
+	{PTP_EC_Olympus_OlyNotifyCreateDrawEdit,	PTP_VENDOR_GP_OLYMPUS, "Olympus_OlyNotifyCreateDrawEdit"},
+	{PTP_EC_Olympus_PropertyChanged,		PTP_VENDOR_GP_OLYMPUS, "Olympus_PropertyChanged"},
+	{PTP_EC_Olympus_CaptureComplete,		PTP_VENDOR_GP_OLYMPUS, "Olympus_CaptureComplete"},
 
+};
 
 const char*
 ptp_get_event_code_name(PTPParams* params, uint16_t event_code)
 {
-	unsigned int i;
+	unsigned int	i;
+	uint16_t	vendor = params->deviceinfo.VendorExtensionID;
+
 	for (i=0; i<sizeof(ptp_event_codes)/sizeof(ptp_event_codes0); i++)
-		if (event_code == ptp_event_codesi.code)
-			return _(ptp_event_codesi.name);
-	return _("Unknown Event");
+		if ((ptp_event_codesi.code == event_code) && ((ptp_event_codesi.vendor == 0) || (ptp_event_codesi.vendor == vendor)))
+			return ptp_event_codesi.name;
+	return "Unknown Event";
 }
 
 
@@ -6994,18 +9433,18 @@
 	prop->datatype = PTP_DTC_UNDEF;
 	prop->ObjectHandle = 0x00000000U;
 	prop->propval.str = NULL;
-	
+
 	(*props) = newprops;
 	(*nrofprops)++;
 	return prop;
 }
 
-void 
+void
 ptp_destroy_object_prop(MTPProperties *prop)
 {
   if (!prop)
     return;
-  
+
   if (prop->datatype == PTP_DTC_STR && prop->propval.str != NULL)
     free(prop->propval.str);
   else if ((prop->datatype == PTP_DTC_AINT8 || prop->datatype == PTP_DTC_AINT16 ||
@@ -7016,7 +9455,7 @@
     free(prop->propval.a.v);
 }
 
-void 
+void
 ptp_destroy_object_prop_list(MTPProperties *props, int nrofprops)
 {
   int i;
@@ -7082,7 +9521,7 @@
 	if (oa->oid < ob->oid) return -1;
 	return 0;
 }
-	
+
 void
 ptp_objects_sort (PTPParams *params)
 {
@@ -7190,7 +9629,7 @@
 #define X (PTPOBJECT_OBJECTINFO_LOADED|PTPOBJECT_STORAGEID_LOADED|PTPOBJECT_PARENTOBJECT_LOADED)
 	if ((want & X) && ((ob->flags & X) != X)) {
 		uint32_t	saveparent = 0;
-		
+
 		/* One EOS issue, where getobjecthandles(root) returns obs without root flag. */
 		if (ob->flags & PTPOBJECT_PARENTOBJECT_LOADED)
 			saveparent = ob->oi.ParentObject;
@@ -7212,10 +9651,32 @@
 		if (ob->oi.ParentObject == handle)
 			ob->oi.ParentObject = 0;
 
+		/* Detect if the file is larger than 4GB ... indicator is size 0xffffffff ...
+		 * In that case explicitly request the MTP object proplist to get the right size */
+		if (ob->oi.ObjectCompressedSize == 0xffffffffUL) {
+			uint64_t	newsize;
+			if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON)	&&
+				ptp_operation_issupported(params,PTP_OC_NIKON_GetObjectSize)	&&
+				(PTP_RC_OK == ptp_nikon_getobjectsize(params, handle, &newsize))
+			) {
+				ob->oi.ObjectCompressedSize = newsize;
+				goto read64bit;
+			}
+			/* more methods like e.g. for Canon */
+			/* if not try MTP method */
+			want |= PTPOBJECT_MTPPROPLIST_LOADED;
+			params->device_flags |= DEVICE_FLAG_PROPLIST_OVERRIDES_OI; /* FIXME: wild hack so below code works, needs review. */
+read64bit:		;
+		}
+
 		/* Apple iOS X does that for the root folder. */
 		if (ob->oi.ParentObject == ob->oi.StorageID) {
-			ptp_debug (params, "parent %08x of %s has same id as storage id. rewriting to 0.", ob->oi.ParentObject, ob->oi.Filename);
-			ob->oi.ParentObject = 0;
+			PTPObject *parentob;
+
+			if (ptp_object_find (params, ob->oi.ParentObject, &parentob) != PTP_RC_OK) {
+				ptp_debug (params, "parent %08x of %s has same id as storage id. and no object found ... rewriting to 0.", ob->oi.ParentObject, ob->oi.Filename);
+				ob->oi.ParentObject = 0;
+			}
 		}
 
 		/* Read out the canon special flags */
@@ -7321,7 +9782,7 @@
 #if 0
 		MTPProperties 	*xpl;
 		int j;
-		PTPObjectInfo	oinfo;	
+		PTPObjectInfo	oinfo;
 
 		memset (&oinfo,0,sizeof(oinfo));
 		/* hmm, not necessary ... only if we would use it */
@@ -7428,3 +9889,11 @@
 	PTPObject *ob;
 	return ptp_object_want (params, handle, PTPOBJECT_OBJECTINFO_LOADED|PTPOBJECT_MTPPROPLIST_LOADED, &ob);
 }
+
+
+/*
+ * Local Variables:
+ * c-file-style:"linux"
+ * indent-tabs-mode:t
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptp.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptp.h Changed

@@ -1,7 +1,7 @@
 /* ptp.h
  *
  * Copyright (C) 2001 Mariusz Woloszyn <emsi@ipartners.pl>
- * Copyright (C) 2003-2017 Marcus Meissner <marcus@jet.franken.de>
+ * Copyright (C) 2003-2020 Marcus Meissner <marcus@jet.franken.de>
  * Copyright (C) 2006-2008 Linus Walleij <triad@df.lth.se>
  *
  * This library is free software; you can redistribute it and/or
@@ -20,15 +20,17 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __PTP_H__
-#define __PTP_H__
+#ifndef CAMLIBS_PTP2_PTP_H
+#define CAMLIBS_PTP2_PTP_H
 
 #include <stdarg.h>
+#include <string.h>
 #include <time.h>
+#include <sys/time.h>
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
 #include <iconv.h>
 #endif
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 #include "device-flags.h"
 
 #ifdef __cplusplus
@@ -99,7 +101,7 @@
 			uint32_t param4;
 			uint32_t param5;
 		} params;
-       /* this must be set to the maximum of PTP_USB_BULK_PAYLOAD_LEN_WRITE 
+       /* this must be set to the maximum of PTP_USB_BULK_PAYLOAD_LEN_WRITE
         * and PTP_USB_BULK_PAYLOAD_LEN_READ */
 		unsigned char dataPTP_USB_BULK_PAYLOAD_LEN_READ;
 	} payload;
@@ -155,29 +157,36 @@
 typedef struct _PTPIPHeader PTPIPHeader;
 
 /* Vendor IDs */
-#define PTP_VENDOR_EASTMAN_KODAK	0x00000001
-#define PTP_VENDOR_SEIKO_EPSON		0x00000002
-#define PTP_VENDOR_AGILENT		0x00000003
-#define PTP_VENDOR_POLAROID		0x00000004
-#define PTP_VENDOR_AGFA_GEVAERT		0x00000005
-#define PTP_VENDOR_MICROSOFT		0x00000006
-#define PTP_VENDOR_EQUINOX		0x00000007
-#define PTP_VENDOR_VIEWQUEST		0x00000008
-#define PTP_VENDOR_STMICROELECTRONICS	0x00000009
-#define PTP_VENDOR_NIKON		0x0000000A
-#define PTP_VENDOR_CANON		0x0000000B
-#define PTP_VENDOR_FOTONATION		0x0000000C
-#define PTP_VENDOR_PENTAX		0x0000000D
-#define PTP_VENDOR_FUJI			0x0000000E
+/* List is linked from here: http://www.imaging.org/site/IST/Standards/PTP_Standards.aspx */
+#define PTP_VENDOR_EASTMAN_KODAK		0x00000001
+#define PTP_VENDOR_SEIKO_EPSON			0x00000002
+#define PTP_VENDOR_AGILENT			0x00000003
+#define PTP_VENDOR_POLAROID			0x00000004
+#define PTP_VENDOR_AGFA_GEVAERT			0x00000005
+#define PTP_VENDOR_MICROSOFT			0x00000006
+#define PTP_VENDOR_EQUINOX			0x00000007
+#define PTP_VENDOR_VIEWQUEST			0x00000008
+#define PTP_VENDOR_STMICROELECTRONICS		0x00000009
+#define PTP_VENDOR_NIKON			0x0000000A
+#define PTP_VENDOR_CANON			0x0000000B
+#define PTP_VENDOR_FOTONATION			0x0000000C
+#define PTP_VENDOR_PENTAX			0x0000000D
+#define PTP_VENDOR_FUJI				0x0000000E
+#define PTP_VENDOR_NDD_MEDICAL_TECHNOLOGIES	0x00000012
+#define PTP_VENDOR_SAMSUNG			0x0000001a
+#define PTP_VENDOR_PARROT			0x0000001b
+#define PTP_VENDOR_PANASONIC			0x0000001c
 /* not from standards papers, but from traces: */
-#define PTP_VENDOR_SONY			0x00000011 /* observed in the A900 */
-#define PTP_VENDOR_SAMSUNG		0x0000001a /* observed in the Samsung NX1000 */
-#define PTP_VENDOR_PARROT		0x0000001b /* observed in the Parrot Sequoia */
-/* Vendor extension ID used for MTP (occasionaly, usualy 6 is used) */
-#define PTP_VENDOR_MTP			0xffffffff  
+#define PTP_VENDOR_SONY				0x00000011 /* observed in the A900 */
+
+/* Vendor extension ID used for MTP (occasionally, usually 6 is used) */
+#define PTP_VENDOR_MTP			0xffffffff
 
 /* gphoto overrides */
-#define PTP_VENDOR_GP_OLYMPUS		0xfffffffe
+#define PTP_VENDOR_GP_OLYMPUS		0x0000fffe
+#define PTP_VENDOR_GP_OLYMPUS_OMD	0x0000fffd
+#define PTP_VENDOR_GP_LEICA		0x0000fffc
+#define PTP_VENDOR_GP_SIGMAFP		0x0000fffb
 
 /* Operation Codes */
 
@@ -288,7 +297,7 @@
 #define PTP_OC_CANON_GetMACAddress		0x9033 /* no args */
 /*
 0000  12 00 00 00 02 00 33 90-1a 00 00 00 2c 9e fc c8  ......3.....,...
-0010  33 e3                  -                         3.              
+0010  33 e3                  -                         3.
  */
 
 /* 9034: 1 param, no parms returned */
@@ -299,24 +308,27 @@
 #define PTP_OC_CANON_GetWebServiceSpec		0x9068 /* no args */
 /* data returned:
 0000  1e 00 00 00 02 00 68 90-1a 00 00 00 00 01 08 00  ......h.........
-0010  14 00 bc ce 00 00 78 00-78 00 00 14 00 00        ......x.x.....  
+0010  14 00 bc ce 00 00 78 00-78 00 00 14 00 00        ......x.x.....
 */
 
 #define PTP_OC_CANON_GetWebServiceData		0x9069 /* no args */
-#define PTP_OC_CANON_SetWebServiceData		0x906B
+#define PTP_OC_CANON_SetWebServiceData		0x906A
+#define PTP_OC_CANON_DeleteWebServiceData	0x906B
 #define PTP_OC_CANON_GetRootCertificateSpec	0x906C /* no args */
 /*
 0000  12 00 00 00 02 00 6c 90-1a 00 00 00 00 01 6c 30  ......l.......l0
 0010  00 00                  -                         ..
 */
 #define PTP_OC_CANON_GetRootCertificateData	0x906D /* no args */
-/* empty data on test */
-#define PTP_OC_CANON_SetRootCertificateData	0x906F
+#define PTP_OC_CANON_SetRootCertificateData	0x906E
+#define PTP_OC_CANON_DeleteRootCertificateData	0x906F
 #define PTP_OC_CANON_GetGpsMobilelinkObjectInfo	0x9075 /* 2 args: utcstart, utcend */
 #define PTP_OC_CANON_SendGpsTagInfo		0x9076 /* 1 arg: oid */
-#define PTP_OC_CANON_GetTrancecodeApproxSize	0x9077 /* 1 arg: oid? */
-#define PTP_OC_CANON_RequestTrancecodeStart	0x9078 /* 1 arg: oid? */
-#define PTP_OC_CANON_RequestTrancecodeCancel	0x9079 /* 1 arg: oid? */
+#define PTP_OC_CANON_GetTranscodeApproxSize	0x9077 /* 1 arg: oid? */
+#define PTP_OC_CANON_RequestTranscodeStart	0x9078 /* 1 arg: oid? */
+#define PTP_OC_CANON_RequestTranscodeCancel	0x9079 /* 1 arg: oid? */
+
+#define PTP_OC_CANON_SetRemoteShootingMode	0x9086
 
 /* 9101: no args, 8 byte data (01 00 00 00 00 00 00 00), no resp data. */
 #define PTP_OC_CANON_EOS_GetStorageIDs		0x9101
@@ -345,7 +357,7 @@
     00000030: 00 00 00 30 44 43 49 4d 00 00 00 00 00 00 00 00	DCIM
     00000040: 00 00 00 00 cc c3 01 46
  * 2 respargs: 0x0, 0x3c
- * 
+ *
  * sample2:
  *
     00000000: 18 00 00 00 01 00 09 91 15 00 00 00 01 00 00 00
@@ -367,11 +379,11 @@
 
 /* 910f: no args, no data, 1 response arg (0). */
 #define PTP_OC_CANON_EOS_RemoteRelease		0x910F
-/* Marcus: looks more like "Set DeviceProperty" in the trace. 
+/* Marcus: looks more like "Set DeviceProperty" in the trace.
  *
  * no cmd args
  * data phase (0xc, 0xd11c, 0x1)
- * no resp args 
+ * no resp args
  */
 #define PTP_OC_CANON_EOS_SetDevicePropValueEx	0x9110
 #define PTP_OC_CANON_EOS_GetRemoteMode		0x9113
@@ -421,7 +433,7 @@
 #define PTP_OC_CANON_EOS_GetCTGInfo		0x9135
 #define PTP_OC_CANON_EOS_GetLensAdjust		0x9136
 #define PTP_OC_CANON_EOS_SetLensAdjust		0x9137
-#define PTP_OC_CANON_EOS_GetMusicInfo		0x9138
+#define PTP_OC_CANON_EOS_ReadyToSendMusic	0x9138
 /* 3 paramaeters, no data, OFC, size, unknown */
 #define PTP_OC_CANON_EOS_CreateHandle		0x9139
 #define PTP_OC_CANON_EOS_SendPartialObjectEx	0x913A
@@ -430,6 +442,10 @@
 #define PTP_OC_CANON_EOS_SetRequestOLCInfoGroup	0x913D
 #define PTP_OC_CANON_EOS_SetRequestRollingPitchingLevel	0x913E /* 1 arg: onoff? */
 /* 3 args, 0x21201020, 0x110, 0x1000000 (potentially reverse order) */
+
+/* EOS M6 Mark2:	opargs: 0x01000000, 0x000001020, 0 (supportkind, modelid ?),
+			response args: 0x00000811, 0x00000001 */
+
 #define PTP_OC_CANON_EOS_GetCameraSupport	0x913F
 #define PTP_OC_CANON_EOS_SetRating		0x9140 /* 2 args, objectid, rating? */
 #define PTP_OC_CANON_EOS_RequestInnerDevelopStart	0x9141 /* 2 args: 1 type, 1 object? */
@@ -462,23 +478,45 @@
 #define PTP_OC_CANON_EOS_TouchAfPosition	0x915B /* 3 args: type,x,y */
 #define PTP_OC_CANON_EOS_SetLvPcFlavoreditMode	0x915C /* 1 arg */
 #define PTP_OC_CANON_EOS_SetLvPcFlavoreditParam	0x915D /* 1 arg */
+#define PTP_OC_CANON_EOS_RequestSensorCleaning	0x915E /* 1 arg? */
 #define PTP_OC_CANON_EOS_AfCancel		0x9160
+#define PTP_OC_CANON_EOS_SetImageRecoveryDataEx	0x916B
+#define PTP_OC_CANON_EOS_GetImageRecoveryListEx	0x916C
+#define PTP_OC_CANON_EOS_CompleteAutoSendImages	0x916D
+#define PTP_OC_CANON_EOS_NotifyAutoTransferStatus	0x916E
+#define PTP_OC_CANON_EOS_GetReducedObject	0x916F
 #define PTP_OC_CANON_EOS_GetObjectInfo64	0x9170	/* 1 arg: oid */
 #define PTP_OC_CANON_EOS_GetObject64		0x9171	/* 1 arg: oid */
 #define PTP_OC_CANON_EOS_GetPartialObject64	0x9172	/* args: oid, offset, maxbyte */
 #define PTP_OC_CANON_EOS_GetObjectInfoEx64	0x9173	/* 2 args: storageid, oid  ? */
 #define PTP_OC_CANON_EOS_GetPartialObjectEX64	0x9174	/* args: oid, offset 64bit, maxbyte */
 #define PTP_OC_CANON_EOS_CreateHandle64		0x9175
+#define PTP_OC_CANON_EOS_NotifySaveComplete	0x9177
+#define PTP_OC_CANON_EOS_GetTranscodedBlock	0x9178
+#define PTP_OC_CANON_EOS_TransferCompleteTranscodedBlock	0x9179
 #define PTP_OC_CANON_EOS_NotifyEstimateNumberofImport		0x9182 /* 1 arg: importnumber */
 #define PTP_OC_CANON_EOS_NotifyNumberofImported	0x9183 /* 1 arg: importnumber */
 #define PTP_OC_CANON_EOS_NotifySizeOfPartialDataTransfer	0x9184 /* 4 args: filesizelow, filesizehigh, downloadsizelow, downloadsizehigh */
 #define PTP_OC_CANON_EOS_NotifyFinish		0x9185 /* 1 arg: reason */
+#define PTP_OC_CANON_EOS_GetWFTData		0x9186
+#define PTP_OC_CANON_EOS_SetWFTData		0x9187
+#define PTP_OC_CANON_EOS_ChangeWFTSettingNumber	0x9188
+#define PTP_OC_CANON_EOS_GetPictureStylePCFlavorParam	0x9189
+#define PTP_OC_CANON_EOS_SetPictureStylePCFlavorParam	0x918A
+#define PTP_OC_CANON_EOS_GetObjectURL		0x91AB
+#define PTP_OC_CANON_EOS_SetCAssistMode		0x91AC
+#define PTP_OC_CANON_EOS_GetCAssistPresetThumb	0x91AD
+#define PTP_OC_CANON_EOS_SetFELock		0x91B9
+#define PTP_OC_CANON_EOS_DeleteWFTSettingNumber	0x91BA
 #define PTP_OC_CANON_EOS_SetDefaultCameraSetting		0x91BE
 #define PTP_OC_CANON_EOS_GetAEData		0x91BF
+#define PTP_OC_CANON_EOS_SendHostInfo		0x91E4 /* https://research.checkpoint.com/say-cheese-ransomware-ing-a-dslr-camera/ */
 #define PTP_OC_CANON_EOS_NotifyNetworkError	0x91E8 /* 1 arg: errorcode */
 #define PTP_OC_CANON_EOS_AdapterTransferProgress		0x91E9
-#define PTP_OC_CANON_EOS_TransferComplete2	0x91F0
-#define PTP_OC_CANON_EOS_CancelTransfer2	0x91F1
+#define PTP_OC_CANON_EOS_TransferCompleteFTP	0x91F0
+#define PTP_OC_CANON_EOS_CancelTransferFTP	0x91F1
+#define PTP_OC_CANON_EOS_NotifyBtStatus		0x91F9 /* https://research.checkpoint.com/say-cheese-ransomware-ing-a-dslr-camera/ */
+#define PTP_OC_CANON_EOS_SetAdapterBatteryReport		0x91FD /* https://research.checkpoint.com/say-cheese-ransomware-ing-a-dslr-camera/ */
 #define PTP_OC_CANON_EOS_FAPIMessageTX		0x91FE
 #define PTP_OC_CANON_EOS_FAPIMessageRX		0x91FF
 
@@ -491,14 +529,14 @@
 #define PTP_OC_NIKON_SetProfileData	0x9009
 #define PTP_OC_NIKON_AdvancedTransfer	0x9010
 #define PTP_OC_NIKON_GetFileInfoInBlock	0x9011
-#define PTP_OC_NIKON_Capture		0x90C0	/* 1 param,   no data */
+#define PTP_OC_NIKON_InitiateCaptureRecInSdram		0x90C0	/* 1 param,   no data */
 #define PTP_OC_NIKON_AfDrive		0x90C1	/* no params, no data */
-#define PTP_OC_NIKON_SetControlMode	0x90C2	/* 1 param,  no data */
-#define PTP_OC_NIKON_DelImageSDRAM	0x90C3	/* 1 param,  no data */
+#define PTP_OC_NIKON_ChangeCameraMode	0x90C2	/* 1 param,  no data */
+#define PTP_OC_NIKON_DelImageSDRAM	0x90C3	/* 1 param (0x0: all, others: cancel this image) ,  no data */
 #define PTP_OC_NIKON_GetLargeThumb	0x90C4
 #define PTP_OC_NIKON_CurveDownload	0x90C5	/* 1 param,   data in */
 #define PTP_OC_NIKON_CurveUpload	0x90C6	/* 1 param,   data out */
-#define PTP_OC_NIKON_CheckEvent		0x90C7	/* no params, data in */
+#define PTP_OC_NIKON_GetEvent		0x90C7	/* no params, data in */
 #define PTP_OC_NIKON_DeviceReady	0x90C8	/* no params, no data */
 #define PTP_OC_NIKON_SetPreWBData	0x90C9	/* 3 params,  data out */
 #define PTP_OC_NIKON_GetVendorPropCodes	0x90CA	/* 0 params, data in */
@@ -528,13 +566,48 @@
 #define PTP_OC_NIKON_EndMovieRec		0x920b	/* no params, no data */
 
 #define PTP_OC_NIKON_TerminateCapture		0x920c	/* 2 params */
+#define PTP_OC_NIKON_GetFhdPicture		0x920f	/* param: objecthandle. returns (at most) 1920x1028 picture */
 
 #define PTP_OC_NIKON_GetDevicePTPIPInfo	0x90E0
 
-#define PTP_OC_NIKON_GetPartialObjectHiSpeed	0x9400	/* 3 params, data in */
+#define PTP_OC_NIKON_GetPartialObjectHiSpeed	0x9400	/* 3 params, p1: object handle, p2: 32bit transfer size, p3: terminate after transfer. DATA in, Reuslt: r1: 32bit number sent, r2: before offset low 32bit , r3: before offset high 32bit */
+#define PTP_OC_NIKON_StartSpotWb		0x9402
+#define PTP_OC_NIKON_EndSpotWb			0x9403
+#define PTP_OC_NIKON_ChangeSpotWbArea		0x9404
+#define PTP_OC_NIKON_MeasureSpotWb		0x9405
+#define PTP_OC_NIKON_EndSpotWbResultDisp	0x9406
+#define PTP_OC_NIKON_CancelImagesInSDRAM	0x940c
+#define PTP_OC_NIKON_GetSBHandles		0x9414
+#define PTP_OC_NIKON_GetSBAttrDesc		0x9415
+#define PTP_OC_NIKON_GetSBAttrValue		0x9416
+#define PTP_OC_NIKON_SetSBAttrValue		0x9417
+#define PTP_OC_NIKON_GetSBGroupAttrDesc		0x9418
+#define PTP_OC_NIKON_GetSBGroupAttrValue	0x9419
+#define PTP_OC_NIKON_SetSBGroupAttrValue	0x941a
+#define PTP_OC_NIKON_TestFlash			0x941b
+#define PTP_OC_NIKON_GetEventEx			0x941c	/* can do multiparameter events, compared to GetEvent */
+#define PTP_OC_NIKON_MirrorUpCancel		0x941d
+#define PTP_OC_NIKON_PowerZoomByFocalLength	0x941e
+#define PTP_OC_NIKON_ActiveSelectionControl	0x941f
+#define PTP_OC_NIKON_SaveCameraSetting		0x9420
+#define PTP_OC_NIKON_GetObjectSize		0x9421	/* param: objecthandle, returns 64bit objectsize as DATA */
+#define PTP_OC_NIKON_ChangeMonitorOff		0x9422
+#define PTP_OC_NIKON_GetLiveViewCompressedSize	0x9423
+#define PTP_OC_NIKON_StartTracking		0x9424
+#define PTP_OC_NIKON_EndTracking		0x9425
+#define PTP_OC_NIKON_ChangeAELock		0x9426
+#define PTP_OC_NIKON_GetLiveViewImageEx		0x9428
+#define PTP_OC_NIKON_GetPartialObjectEx		0x9431	/* p1: objecthandle, p2: offset lower 32bit, p3: offset higher 32bit, p4: maxsize lower 32bit, p5: maxsize upper 32bit, response is r1: lower 32bit, r2: higher 32bit */
+#define PTP_OC_NIKON_GetManualSettingLensData	0x9432
+#define PTP_OC_NIKON_InitiatePixelMapping	0x9433
+#define PTP_OC_NIKON_GetObjectsMetaData		0x9434
+#define PTP_OC_NIKON_ChangeApplicationMode	0x9435
+#define PTP_OC_NIKON_ResetMenu			0x9436
+
 
 /* From Nikon V1 Trace */
-#define PTP_OC_NIKON_GetDevicePropEx		0x9504	/* gets device prop dataa */
+#define PTP_OC_NIKON_GetDevicePropEx		0x9504	/* gets device prop data */
+
 
 /* Casio EX-F1 (from http://code.google.com/p/exf1ctrl/ ) */
 #define PTP_OC_CASIO_STILL_START	0x9001
@@ -571,12 +644,12 @@
 /* 9201:
  *  3 params: 1,0,0 ; IN: data 8 bytes all 0
  * or:
- *  3 params: 2,0,0 ; IN: data 8 bytes all 0 
+ *  3 params: 2,0,0 ; IN: data 8 bytes all 0
  * or
- *  3 params: 3,0,0,: IN: data 8 butes all 0
+ *  3 params: 3,0,0,: IN: data 8 bytes all 0
  */
 #define PTP_OC_SONY_SDIOConnect			0x9201
-/* 9202: 1 param, 0xc8; IN data: 
+/* 9202: 1 param, 0xc8; IN data:
  * 16 bit: 0xc8
  * ptp array 32 bit: index, 16 bit values of propcodes  */
 #define PTP_OC_SONY_GetSDIOGetExtDeviceInfo	0x9202
@@ -591,6 +664,16 @@
 /* get all device property data at once */
 #define PTP_OC_SONY_GetAllDevicePropData	0x9209	/* gets a 4126 byte blob of device props ?*/
 
+#define PTP_OC_SONY_QX_SetExtPictureProfile	0x96F2
+#define PTP_OC_SONY_QX_GetExtPictureProfile	0x96F3
+#define PTP_OC_SONY_QX_GetExtLensInfo		0x96F4
+#define PTP_OC_SONY_QX_SendUpdateFile		0x96F5
+#define PTP_OC_SONY_QX_GetAllDevicePropData	0x96F6
+#define PTP_OC_SONY_QX_SetControlDeviceB	0x96F8 /* ControlDevice */
+#define PTP_OC_SONY_QX_SetControlDeviceA	0x96FA /* SetExtDevicePropValue */
+#define PTP_OC_SONY_QX_GetSDIOGetExtDeviceInfo	0x96FD
+#define PTP_OC_SONY_QX_Connect			0x96FE
+
 /* Microsoft / MTP extension codes */
 
 #define PTP_OC_MTP_GetObjectPropsSupported	0x9801
@@ -607,7 +690,7 @@
 #define PTP_OC_MTP_Skip				0x9820
 
 /*
- * Windows Media Digital Rights Management for Portable Devices 
+ * Windows Media Digital Rights Management for Portable Devices
  * Extension Codes (microsoft.com/WMDRMPD: 10.1)
  */
 #define PTP_OC_MTP_WMDRMPD_GetSecureTimeChallenge	0x9101
@@ -622,10 +705,10 @@
 #define PTP_OC_MTP_WMDRMPD_SendWMDRMPDCommand	0x910A
 #define PTP_OC_MTP_WMDRMPD_SendWMDRMPDRequest	0x910B
 
-/* 
- * Windows Media Digital Rights Management for Portable Devices 
+/*
+ * Windows Media Digital Rights Management for Portable Devices
  * Extension Codes (microsoft.com/WMDRMPD: 10.1)
- * Below are operations that have no public documented identifier 
+ * Below are operations that have no public documented identifier
  * associated with them "Vendor-defined Command Code"
  */
 #define PTP_OC_MTP_WMDRMPD_SendWMDRMPDAppRequest	0x9212
@@ -636,7 +719,7 @@
 /* ^^^ guess ^^^ */
 
 /*
- * Microsoft Advanced Audio/Video Transfer 
+ * Microsoft Advanced Audio/Video Transfer
  * Extensions (microsoft.com/AAVT: 1.0)
  */
 #define PTP_OC_MTP_AAVT_OpenMediaSession		0x9170
@@ -645,7 +728,7 @@
 #define PTP_OC_MTP_AAVT_SetCurrentTimePosition		0x9173
 
 /*
- * Windows Media Digital Rights Management for Network Devices 
+ * Windows Media Digital Rights Management for Network Devices
  * Extensions (microsoft.com/WMDRMND: 1.0) MTP/IP?
  */
 #define PTP_OC_MTP_WMDRMND_SendRegistrationRequest	0x9180
@@ -655,8 +738,8 @@
 #define PTP_OC_MTP_WMDRMND_SendWMDRMNDLicenseRequest	0x9184
 #define PTP_OC_MTP_WMDRMND_GetWMDRMNDLicenseResponse	0x9185
 
-/* 
- * Windows Media Player Portiable Devices 
+/*
+ * Windows Media Player Portiable Devices
  * Extension Codes (microsoft.com/WMPPD: 11.1)
  */
 #define PTP_OC_MTP_WMPPD_ReportAddedDeletedItems	0x9201
@@ -664,7 +747,7 @@
 #define PTP_OC_MTP_WMPPD_PlaylistObjectPref		0x9203
 
 /*
- * Undocumented Zune Operation Codes 
+ * Undocumented Zune Operation Codes
  * maybe related to WMPPD extension set?
  */
 #define PTP_OC_MTP_ZUNE_GETUNDEFINED001		        0x9204
@@ -672,8 +755,54 @@
 /* WiFi Provisioning MTP Extension Codes (microsoft.com/WPDWCN: 1.0) */
 #define PTP_OC_MTP_WPDWCN_ProcessWFCObject		0x9122
 
+/* Olympus OMD series commands */
+#define PTP_OC_OLYMPUS_OMD_Capture			0x9481
+#define PTP_OC_OLYMPUS_GetLiveViewImage			0x9484	/* liveview */
+#define PTP_OC_OLYMPUS_OMD_GetImage			0x9485	/* gets an JPEG image (from the capture? SDRAM style?) */
+#define PTP_OC_OLYMPUS_OMD_ChangedProperties		0x9486
+#define PTP_OC_OLYMPUS_OMD_MFDrive			0x9487
+#define PTP_OC_OLYMPUS_OMD_SetProperties		0x9489 /* Sends to the device a PTP list of all 16 bit device properties , count 32bit, then 16bit vals */
+/* 948C: Record Video? */
+/* 9482: Set One Touch WB Gain */
+/* 9483: Set / Start Magnifying Live View Point */
+/* 9488: Change Magnifying Live View Area */
+/* 9493: Start Driving Zoom Lens For Direction / Focal Length  / Stop Driving zoom
+ * start direction: 		x1=1,x2=0,x3= STEPS?, x4=1 or 2 (near / far ? )
+ * start to focallength:	x1=1,x2=3,x3= VALUE? ,x4=4 (potentially more)
+ * stop:  			x1=2,x2=0,x3=0,x4=0
+ * unclear:			x1=4,x2=0,x3=0,x4=0
+ */
+/* 9495: Set / Clear Auto Focus Point? */
+/* 94a0: Set / Clear Auto Exposure Point? */
+/* 94b7 or 94bf: Set Focus Adjust Pulse */
+/* 94A1: Detect One Touch WB Gain */
+/* 94A2: AdjustLevelGauge? */
+/* 94A4: Get Direct Item Buffer */
+/* 94A5: Get Direct Item Info */
+/* 94B7: Get Recording Folder List? */
+/* 94BA / 94a1: Pixel Mapping? */
+/* 94ba: TransferModeStartStop */
+/* 94bb: Get Un Transfer List */
+/* 94bc: GetLocalObject info? */
+/* 94bd: GetLocalObject? */
+/* 94be: delete local object? */
+/* 94c0 / 94b9 : Set Comment String */
+/* 94bf: Set Connect Pc Info? */
+/* 94c0: Get Connect Pc Info? */
+/* 94c1: Clear Connect Pc Info? */
+/* 94c4: Get Camera Af Target Frames? */
+/* 94c3: Start Station Mode */
+/* 94c3: End Station Mode */
+/* 911c: Get Firmware Update Mode? */
+/* 9121: Firmware Check? */
+/* 9122: Get Firmware Status? */
+/* 9123: Firmware Update Initiate? */
+/* 9124: Get Firmware Language? */
+/* 9125: Get Firmware Status? */
+/* 9126: Trans Firmware? */
 
 /* Olympus E series commands */
+
 #define PTP_OC_OLYMPUS_Capture				0x9101
 #define PTP_OC_OLYMPUS_SelfCleaning			0x9103
 #define PTP_OC_OLYMPUS_SetRGBGain			0x9106
@@ -689,6 +818,7 @@
 #define PTP_OC_OLYMPUS_SetCameraID			0x9501
 #define PTP_OC_OLYMPUS_GetCameraID			0x9581
 
+
 /* Android Random I/O Extensions Codes */
 #define PTP_OC_ANDROID_GetPartialObject64		0x95C1
 #define PTP_OC_ANDROID_SendPartialObject		0x95C2
@@ -697,9 +827,11 @@
 #define PTP_OC_ANDROID_EndEditObject			0x95C5
 
 /* Leica opcodes, from Lightroom tether plugin */
-#define PTP_OC_LEICA_SetCameraSettings			0x9001
+/* also from:
+ * https://alexhude.github.io/2019/01/24/hacking-leica-m240.html */
+#define PTP_OC_LEICA_SetCameraSettings			0x9001 	/* image shuttle */
 #define PTP_OC_LEICA_GetCameraSettings			0x9002
-#define PTP_OC_LEICA_GetLensParameter			0x9003
+#define PTP_OC_LEICA_GetLensParameter			0x9003	/* lrplugin */
 /* probably 2 arguments.
  * generic: releaseStage, stepSize
  * Release(releasestage) = (releasestage,0)
@@ -709,10 +841,53 @@
  * AutofocusPush() = (1,0) ... same as AEStart?
  * KeepCameraActive() = (0xe,0)
  */
-#define PTP_OC_LEICA_Release				0x9004
-#define PTP_OC_LEICA_OpenLESession			0x9005
-#define PTP_OC_LEICA_CloseLESession			0x9006
+#define PTP_OC_LEICA_LEReleaseStages			0x9004	/* lrplugin seeing 1 (push af control), 2 (release af control), 0x0c (continuous start), 0x0d (continuous end) as potential arguments */
+#define PTP_OC_LEICA_LEOpenSession			0x9005	/* lrplugin one argument, possible 0 is ok? */
+#define PTP_OC_LEICA_LECloseSession			0x9006	/* lrplugin */
 #define PTP_OC_LEICA_RequestObjectTransferReady		0x9007
+#define PTP_OC_LEICA_GetGeoTrackingData			0x9008
+#define PTP_OC_LEICA_OpenDebugSession			0x900a
+#define PTP_OC_LEICA_CloseDebugSession			0x900b
+#define PTP_OC_LEICA_GetDebugBuffer			0x900c
+#define PTP_OC_LEICA_DebugCommandString			0x900d
+#define PTP_OC_LEICA_GetDebugRoute			0x900e
+#define PTP_OC_LEICA_SetIPTCData			0x900f
+#define PTP_OC_LEICA_GetIPTCData			0x9010
+#define PTP_OC_LEICA_LEControlAutoFocus			0x9016	/* lr plugin */
+#define PTP_OC_LEICA_LEControlBulbExposure		0x9019	/* seen in lr plugin ... similar to 9004 and 901a release/press shutter */
+#define PTP_OC_LEICA_LEControlContinuousExposure	0x901a	/* seen in lr plugin ... similar to 9004 and 9019 release/press shutter */
+#define PTP_OC_LEICA_901b				0x901b	/* seen in lr plugin ... related to release not listed in debugprint */
+#define PTP_OC_LEICA_LEControlPhotoLiveView		0x901c	/* seen in lr plugin ... */
+#define PTP_OC_LEICA_LEKeepSessionActive		0x901d	/* seen in lr plugin ... */
+#define PTP_OC_LEICA_LEMoveLens				0x901e	/* seen in image shuttle ... 1? arg */
+#define PTP_OC_LEICA_Get3DAxisData			0x9020
+#define PTP_OC_LEICA_LESetZoomMode			0x9021	/* lr plugin */
+#define PTP_OC_LEICA_LESetFocusCrossPosition		0x9022	/* lr plugin */
+#define PTP_OC_LEICA_LESetDisplayWindowPosition		0x9024	/* lr plugin */
+#define PTP_OC_LEICA_LEGetStreamData			0x9025	/* lr plugin */
+#define PTP_OC_LEICA_OpenLiveViewSession		0x9030
+#define PTP_OC_LEICA_CloseLiveViewSession		0x9031
+#define PTP_OC_LEICA_LESetDateTime			0x9036	/* lr plugin */
+#define PTP_OC_LEICA_GetObjectPropListPaginated		0x9037
+#define PTP_OC_LEICA_OpenProductionSession		0x9100
+#define PTP_OC_LEICA_CloseProductionSession		0x9101
+#define PTP_OC_LEICA_UpdateFirmware			0x9102
+#define PTP_OC_LEICA_OpenOSDSession			0x9103
+#define PTP_OC_LEICA_CloseOSDSession			0x9104
+#define PTP_OC_LEICA_GetOSDData				0x9105
+#define PTP_OC_LEICA_GetFirmwareStruct			0x9106
+#define PTP_OC_LEICA_GetDebugMenu			0x910b
+#define PTP_OC_LEICA_SetDebugMenu			0x910c
+#define PTP_OC_LEICA_OdinMessage			0x910d
+#define PTP_OC_LEICA_GetDebugObjectHandles		0x910e
+#define PTP_OC_LEICA_GetDebugObject			0x910f
+#define PTP_OC_LEICA_DeleteDebugObject			0x9110
+#define PTP_OC_LEICA_GetDebugObjectInfo			0x9111
+#define PTP_OC_LEICA_WriteDebugObject			0x9112
+#define PTP_OC_LEICA_CreateDebugObject			0x9113
+#define PTP_OC_LEICA_Calibrate3DAxis			0x9114
+#define PTP_OC_LEICA_MagneticCalibration		0x9115
+#define PTP_OC_LEICA_GetViewFinderData			0x9116
 
 #define PTP_OC_PARROT_GetSunshineValues		0x9201
 #define PTP_OC_PARROT_GetTemperatureValues	0x9202
@@ -729,11 +904,153 @@
 #define PTP_OC_PARROT_MagnetoCalibStatus	0x9212
 #define PTP_OC_PARROT_SendFirmwareUpdate	0x9213
 
+#define PTP_OC_PANASONIC_9101			0x9101
+#define PTP_OC_PANASONIC_OpenSession		0x9102	/* opensession (1 arg, seems to be storage id 0x00010001)*/
+#define PTP_OC_PANASONIC_CloseSession		0x9103	/* closesession (no arg) */
+#define PTP_OC_PANASONIC_9104			0x9104	/* get ext device id (1 arg?) */
+/* 9104 gets this data:
+0000  24 00 00 00 02 00 04 91-04 00 00 00 01 00 01 00  $...............
+0010  01 00 e1 07 10 00 00 00-00 00 00 00 00 00 00 00  ................
+0020  00 00 00 00            -                         ....
+*/
+
+#define PTP_OC_PANASONIC_9107			0x9107	/* getsize? */
+#define PTP_OC_PANASONIC_ListProperty		0x9108
+#define PTP_OC_PANASONIC_9110			0x9110 	/* Get_Object infos */
+#define PTP_OC_PANASONIC_9112			0x9112 	/* Get Partial Object , 4 args */
+#define PTP_OC_PANASONIC_9113			0x9113 	/* Skip Objects Transfer , 1 arg */
+
+#define PTP_OC_PANASONIC_9401			0x9401
+#define PTP_OC_PANASONIC_GetProperty		0x9402
+#define PTP_OC_PANASONIC_SetProperty		0x9403
+#define PTP_OC_PANASONIC_InitiateCapture	0x9404	/* Rec Ctrl Release */
+#define PTP_OC_PANASONIC_9405			0x9405	/* Rec Ctrl AF AE */
+#define PTP_OC_PANASONIC_9406			0x9406	/* Setup Ctrl various functions: Format, Sensor Cleaning, Menu Save, firmware update? */
+#define PTP_OC_PANASONIC_9408			0x9408
+#define PTP_OC_PANASONIC_9409			0x9409	/* 1 arg */
+#define PTP_OC_PANASONIC_GetCaptureTarget	0x940A	/* 1 arg, e.g. 0x08000010 */
+#define PTP_OC_PANASONIC_SetCaptureTarget	0x940B	/* 1 arg, e.g. 0x08000010 */
+#define PTP_OC_PANASONIC_MovieRecControl	0x940C	/* 07000011 start, 07000012 stop, 0700013 still capture */
+#define PTP_OC_PANASONIC_PowerControl		0x940D	/* 1 arg: 0x0A000011 power off, 0x0a00012 device reset, 0x0a00013 device restart */
+#define PTP_OC_PANASONIC_PlayControl		0x940E	/* 2 arg? 0x05000011 current=0, next=1, prev=0xffffffff */
+#define PTP_OC_PANASONIC_PlayControlPlay	0x940F	/* 0x05000020 */
+#define PTP_OC_PANASONIC_9410			0x9410	/* Rec Ctrl Other */
+#define PTP_OC_PANASONIC_SetGPSDataInfo		0x9411
+#define PTP_OC_PANASONIC_Liveview		0x9412	/* 0d000010 start, 0d000011 stop */
+#define PTP_OC_PANASONIC_PollEvents		0x9414	/* ? 1 arg e.g 12000020 */
+#define PTP_OC_PANASONIC_GetLiveViewParameters	0x9414	/* either all formats 0x0d800012 or current format 0x0d800011 */
+#define PTP_OC_PANASONIC_SetLiveViewParameters	0x9415	/* current format 0x0d800011 */
+#define PTP_OC_PANASONIC_ManualFocusDrive	0x9416	/* Rec Ctrl Mf Assist, Rec Ctrl Backup Req ... 1 arg */
+
+#define PTP_OC_PANASONIC_ChangeEvent		0x9603	/* 2 args ... e.g. 0x4002, new (change object added event) */
+#define PTP_OC_PANASONIC_GetFromEventInfo	0x9605	/* 1 arg, e.g. 0x41000013 , 15c00021: setup exec menu save comp, 15c00022: setup exec pixel refresh comp */
+#define PTP_OC_PANASONIC_SendDataInfo		0x9606	/* no args? used during firmware update */
+#define PTP_OC_PANASONIC_StartSendData		0x9607	/* no args? used during firmware update */
+
+#define PTP_OC_PANASONIC_9703			0x9703	/* Mnt_GetInfo_GetVersion  ... 1 arg? */
+#define PTP_OC_PANASONIC_9704			0x9704	/* Set USB Mode ... 80040001 */
+#define PTP_OC_PANASONIC_9705			0x9705	/* Ctrl Liveview */
+#define PTP_OC_PANASONIC_LiveviewImage		0x9706	/* Get Liveview Data */
+#define PTP_OC_PANASONIC_9707			0x9707	/* 4k6k cutting get stream */
+
+/* Samsung NX:
+ * 9002 send check event
+ * 9003 send get event
+ * 9004 require capture exec
+ * 9005 capture exec
+ * 9006 liveview info
+ * 9007 liveview exec / check get file
+ * 9008 set focus position
+ * 9009 get focus position
+ * 900a reset device
+ * 900b format device
+ * 900d get tick
+ * 900e set tick
+ * 900f set hidden command
+ * 9010 get record status
+ * 9011 file transfer
+ * 9012 set enlarge
+ * 9013 movie complete exec / movie transfer
+ * 9014 set record pause
+ * 9015 set record resume
+ * 9017 set live view
+ * 9018 image transfer
+ * 9019 set imge receive complete
+ * 901a set dev prop value
+ * 901b get dev unique id / get dev mode index / get dev prop desc
+ * 901d get dev unique id
+ * 9020 set live receive complete
+ * 9021 sensor cleaning device
+ * 9022 interval capture stop
+ * 9023 display save mode wakeup
+ * 9024 movie cancel
+ * 9025 get capture count
+ * 9026 control touch af
+ * 9027 get image path
+ * 9028 tracking af stop
+ * 902a connect try ptp/ip
+ * 902b connect confirm ptp/ip
+ * 90fe firmware update
+ */
+
+/* These opcodes are probably FUJI Wifi only (but not USB) */
+#define PTP_OC_FUJI_InitiateMovieCapture		0x9020
+#define PTP_OC_FUJI_TerminateMovieCapture		0x9021
+#define PTP_OC_FUJI_GetCapturePreview			0x9022
+#define PTP_OC_FUJI_SetFocusPoint			0x9026	/* LockS1Lock */
+#define PTP_OC_FUJI_ResetFocusPoint			0x9027	/* UnlockS1Lock */
+#define PTP_OC_FUJI_GetDeviceInfo			0x902B
+#define PTP_OC_FUJI_SetShutterSpeed			0x902C	/* StepShutterSpeed */
+#define PTP_OC_FUJI_SetAperture				0x902D	/* StepFNumber */
+#define PTP_OC_FUJI_SetExposureCompensation		0x902E	/* StepExposureBias */
+#define PTP_OC_FUJI_CancelInitiateCapture		0x9030
+#define PTP_OC_FUJI_FmSendObjectInfo			0x9040
+#define PTP_OC_FUJI_FmSendObject			0x9041
+#define PTP_OC_FUJI_FmSendPartialObject			0x9042
+
+/* SIGMA FP */
+
+#define PTP_OC_SIGMA_FP_GetCamConfig		0x9010
+#define PTP_OC_SIGMA_FP_GetCamStatus		0x9011
+#define PTP_OC_SIGMA_FP_GetDataGroup1		0x9012
+#define PTP_OC_SIGMA_FP_GetDataGroup2		0x9013
+#define PTP_OC_SIGMA_FP_GetDataGroup3		0x9014
+#define PTP_OC_SIGMA_FP_GetCaptureStatus	0x9015
+#define PTP_OC_SIGMA_FP_SetDataGroup1		0x9016
+#define PTP_OC_SIGMA_FP_SetDataGroup2		0x9017
+#define PTP_OC_SIGMA_FP_SetDataGroup3		0x9018
+#define PTP_OC_SIGMA_FP_ClockAdjust		0x9019
+#define PTP_OC_SIGMA_FP_Snap			0x901b
+#define PTP_OC_SIGMA_FP_ClearImageDBSingle	0x901c
+#define PTP_OC_SIGMA_FP_ClearImageDBAll		0x901d	/* ? */
+#define PTP_OC_SIGMA_FP_GetPictFileInfo		0x9020	/* ? */
+#define PTP_OC_SIGMA_FP_GetPartialPictFile	0x9021	/* ? */
+#define PTP_OC_SIGMA_FP_GetBigPartialPictFile	0x9022
+#define PTP_OC_SIGMA_FP_GetDataGroup4		0x9023
+#define PTP_OC_SIGMA_FP_SetDataGroup4		0x9024
+#define PTP_OC_SIGMA_FP_GetCamSentInfo2		0x9025	/* ? */
+#define PTP_OC_SIGMA_FP_GetCamSentInfo3		0x9026	/* ? */
+#define PTP_OC_SIGMA_FP_GetDataGroup5		0x9027
+#define PTP_OC_SIGMA_FP_SetDataGroup5		0x9028
+#define PTP_OC_SIGMA_FP_GetDataGroup6		0x9029
+#define PTP_OC_SIGMA_FP_SetDataGroup6		0x902a
+#define PTP_OC_SIGMA_FP_GetCamViewFrame		0x902b	/* liveview here! */
+#define PTP_OC_SIGMA_FP_GetCamStatus2		0x902c
+#define PTP_OC_SIGMA_FP_GetPictFileInfo2	0x902d
+#define PTP_OC_SIGMA_FP_GetCamCanSetInfo5	0x9030
+#define PTP_OC_SIGMA_FP_GetCamDataGroupFocus	0x9031
+#define PTP_OC_SIGMA_FP_SetCamDataGroupFocus	0x9032
+#define PTP_OC_SIGMA_FP_GetCamDataGroupMovie	0x9033
+#define PTP_OC_SIGMA_FP_SetCamDataGroupMovie	0x9034
+#define PTP_OC_SIGMA_FP_GetCameraInfo		0x9035 /* name guessed */
+#define PTP_OC_SIGMA_FP_GetMovieFileInfo	0x9036
+#define PTP_OC_SIGMA_FP_GetPartialMovieFile	0x9037
 
 /* Proprietary vendor extension operations mask */
 #define PTP_OC_EXTENSION_MASK           0xF000
 #define PTP_OC_EXTENSION                0x9000
 
+
 /* Response Codes */
 
 /* PTP v1.0 response codes */
@@ -794,7 +1111,17 @@
 #define PTP_RC_NIKON_NotLiveView		0xA00B
 #define PTP_RC_NIKON_MfDriveStepEnd		0xA00C
 #define PTP_RC_NIKON_MfDriveStepInsufficiency	0xA00E
-#define PTP_RC_NIKON_AdvancedTransferCancel	0xA022
+#define PTP_RC_NIKON_NoFullHDPresent		0xA00F
+#define PTP_RC_NIKON_StoreError			0xA021
+#define PTP_RC_NIKON_StoreUnformatted		0xA022	/* from z6 sdk */
+#define PTP_RC_NIKON_AdvancedTransferCancel	0xA022	/* dup from me*/
+#define PTP_RC_NIKON_Bulb_Release_Busy		0xA200
+#define PTP_RC_NIKON_Silent_Release_Busy	0xA201
+#define PTP_RC_NIKON_MovieFrame_Release_Busy	0xA202
+#define PTP_RC_NIKON_Shutter_Speed_Time		0xA204
+#define PTP_RC_NIKON_Waiting_2ndRelease		0xA207
+#define PTP_RC_NIKON_MirrorUpCapture_Already_Start		0xA208
+#define PTP_RC_NIKON_Invalid_SBAttribute_Value	0xA209
 
 /* Canon specific response codes */
 #define PTP_RC_CANON_UNKNOWN_COMMAND		0xA001
@@ -826,9 +1153,9 @@
 #define PTP_RC_MTP_Object_Too_Large		0xA809
 #define PTP_RC_MTP_ObjectProp_Not_Supported	0xA80A
 
-/* Microsoft Advanced Audio/Video Transfer response codes 
+/* Microsoft Advanced Audio/Video Transfer response codes
 (microsoft.com/AAVT 1.0) */
-#define PTP_RC_MTP_Invalid_Media_Session_ID	0xA170	
+#define PTP_RC_MTP_Invalid_Media_Session_ID	0xA170
 #define PTP_RC_MTP_Media_Session_Limit_Reached	0xA171
 #define PTP_RC_MTP_No_More_Data			0xA172
 
@@ -878,6 +1205,7 @@
 
 /* Canon EOS events */
 #define PTP_EC_CANON_EOS_RequestGetEvent		0xc101
+#define PTP_EC_CANON_EOS_RequestCancelTransferMA	0xc180
 #define PTP_EC_CANON_EOS_ObjectAddedEx			0xc181
 #define PTP_EC_CANON_EOS_ObjectRemoved			0xc182
 #define PTP_EC_CANON_EOS_RequestGetObjectInfoEx		0xc183
@@ -913,23 +1241,38 @@
 #define PTP_EC_CANON_EOS_ObjectAddedEx64		0xc1a7
 #define PTP_EC_CANON_EOS_ObjectInfoChangedEx64		0xc1a8
 #define PTP_EC_CANON_EOS_RequestObjectTransfer64	0xc1a9
+#define PTP_EC_CANON_EOS_RequestObjectTransferDT64	0xc1aa
 #define PTP_EC_CANON_EOS_RequestObjectTransferFTP64	0xc1ab
+#define PTP_EC_CANON_EOS_RequestObjectTransferInfoEx64	0xc1ac
+#define PTP_EC_CANON_EOS_RequestObjectTransferMA64	0xc1ad
 #define PTP_EC_CANON_EOS_ImportError			0xc1af
 #define PTP_EC_CANON_EOS_BlePairing			0xc1b0
+#define PTP_EC_CANON_EOS_RequestAutoSendImages		0xc1b1
+#define PTP_EC_CANON_EOS_RequestTranscodedBlockTransfer	0xc1b2
+#define PTP_EC_CANON_EOS_RequestCAssistImage		0xc1b4
 #define PTP_EC_CANON_EOS_RequestObjectTransferFTP	0xc1f1
 
 /* Nikon extension Event Codes */
 
 /* Nikon extension Event Codes */
-#define PTP_EC_Nikon_ObjectAddedInSDRAM		0xC101
-#define PTP_EC_Nikon_CaptureCompleteRecInSdram	0xC102
+#define PTP_EC_Nikon_ObjectAddedInSDRAM		0xC101	/* e1: objecthandle */
+#define PTP_EC_Nikon_CaptureCompleteRecInSdram	0xC102	/* no args */
 /* Gets 1 parameter, objectid pointing to DPOF object */
 #define PTP_EC_Nikon_AdvancedTransfer		0xC103
 #define PTP_EC_Nikon_PreviewImageAdded		0xC104
-
-/* Olympus E series */
-#define PTP_EC_Olympus_PropertyChanged		0xC102
-#define PTP_EC_Olympus_CaptureComplete		0xC103
+#define PTP_EC_Nikon_MovieRecordInterrupted	0xC105	/* e1: errocode, e2: recordkind */
+#define PTP_EC_Nikon_1stCaptureComplete		0xC106	/* 1st phase of mirror up is complete */
+#define PTP_EC_Nikon_MirrorUpCancelComplete	0xC107	/* mirror up canceling is complete */
+#define PTP_EC_Nikon_MovieRecordComplete	0xC108	/* e1: recordkind */
+#define PTP_EC_Nikon_MovieRecordStarted		0xC10A	/* e1: recordkind */
+#define PTP_EC_Nikon_PictureControlAdjustChanged	0xC10B	/* e1: picctrlitem e2: shootingmode */
+#define PTP_EC_Nikon_LiveViewStateChanged	0xC10C	/* e1: liveview state */
+#define PTP_EC_Nikon_ManualSettingsLensDataChanged	0xC10E	/* e1: lensnr */
+#define PTP_EC_Nikon_ActiveSelectionInterrupted	0xC112	/* e1: errorcode */
+#define PTP_EC_Nikon_SBAdded			0xC120	/* e1: sbhandle */
+#define PTP_EC_Nikon_SBRemoved			0xC121	/* e1: sbhandle */
+#define PTP_EC_Nikon_SBAttrChanged		0xC122	/* e1: sbhandle, e2: attrid */
+#define PTP_EC_Nikon_SBGroupAttrChanged		0xC123	/* e1: sbgroupid, e2: groupattrid */
 
 /* Sony */
 #define PTP_EC_Sony_ObjectAdded			0xC201
@@ -944,6 +1287,46 @@
 #define PTP_EC_PARROT_Status			0xC201
 #define PTP_EC_PARROT_MagnetoCalibrationStatus	0xC202
 
+#define PTP_EC_PANASONIC_ObjectAdded		0xC108
+#define PTP_EC_PANASONIC_ObjectAddedSDRAM	0xC109
+
+/* Olympus E series, PTP style in the 2018+ range (e1mark2 etc.) */
+/* From olympus capture tool */
+#define PTP_EC_Olympus_CreateRecView		0xC001
+#define PTP_EC_Olympus_CreateRecView_New	0xC101
+#define PTP_EC_Olympus_ObjectAdded		0xC002
+#define PTP_EC_Olympus_ObjectAdded_New		0xC102
+#define PTP_EC_Olympus_AF_Frame			0xC003
+#define PTP_EC_Olympus_AF_Frame_New		0xC103
+#define PTP_EC_Olympus_DirectStoreImage		0xC004
+#define PTP_EC_Olympus_DirectStoreImage_New	0xC104
+#define PTP_EC_Olympus_ComplateCameraControlOff		0xC005
+#define PTP_EC_Olympus_ComplateCameraControlOff_New	0xC105
+#define PTP_EC_Olympus_AF_Frame_Over_Info	0xC006
+#define PTP_EC_Olympus_AF_Frame_Over_Info_New	0xC106
+#define PTP_EC_Olympus_DevicePropChanged	0xC008
+#define PTP_EC_Olympus_DevicePropChanged_New	0xC108
+#define PTP_EC_Olympus_ImageTransferModeFinish	0xC00C
+#define PTP_EC_Olympus_ImageTransferModeFinish_New	0xC10C
+#define PTP_EC_Olympus_ImageRecordFinish	0xC00D
+#define PTP_EC_Olympus_ImageRecordFinish_New	0xC10D
+#define PTP_EC_Olympus_SlotStatusChange		0xC00E
+#define PTP_EC_Olympus_SlotStatusChange_New	0xC10E
+#define PTP_EC_Olympus_PrioritizeRecord		0xC00F
+#define PTP_EC_Olympus_PrioritizeRecord_New	0xC10F
+#define PTP_EC_Olympus_FailCombiningAfterShooting	0xC010
+#define PTP_EC_Olympus_FailCombiningAfterShooting_New	0xC110
+#define PTP_EC_Olympus_NotifyAFTargetFrame	0xC011
+#define PTP_EC_Olympus_NotifyAFTargetFrame_New	0xC111
+#define PTP_EC_Olympus_RawEditParamChanged	0xC112
+#define PTP_EC_Olympus_OlyNotifyCreateDrawEdit	0xC113
+
+/* Used by the XML based E series driver */
+#define PTP_EC_Olympus_PropertyChanged		0xC102
+#define PTP_EC_Olympus_CaptureComplete		0xC103
+
+#define PTP_EC_FUJI_PreviewAvailable		0xC001
+#define PTP_EC_FUJI_ObjectAdded			0xC004
 
 /* constants for GetObjectHandles */
 #define PTP_GOH_ALL_STORAGE 0xffffffff
@@ -997,6 +1380,18 @@
 };
 typedef struct _PTPStorageInfo PTPStorageInfo;
 
+/* PTP Stream Info */
+struct _PTPStreamInfo {
+	uint64_t	DatasetSize;
+	uint64_t	TimeResolution;
+	uint32_t	FrameHeaderSize;
+	uint32_t	FrameMaxSize;
+	uint32_t	PacketHeaderSize;
+	uint32_t	PacketMaxSize;
+	uint32_t	PacketAlignment;
+};
+typedef struct _PTPStreamInfo PTPStreamInfo;
+
 /* PTP objecthandles structure (returned by GetObjectHandles) */
 
 struct _PTPObjectHandles {
@@ -1101,6 +1496,7 @@
 #define PTP_OFC_CANON_CRW3			0xb103
 #define PTP_OFC_CANON_MOV			0xb104
 #define PTP_OFC_CANON_MOV2			0xb105
+#define PTP_OFC_CANON_CR3			0xb108
 /* CHDK specific raw mode */
 #define PTP_OFC_CANON_CHDK_CRW			0xb1ff
 /* Sony */
@@ -1247,6 +1643,16 @@
 };
 typedef struct _PTPPropDescEnumForm PTPPropDescEnumForm;
 
+struct _PTPPropDescArrayLengthForm {
+	uint16_t		NumberOfValues;
+};
+typedef struct _PTPPropDescArrayLengthForm PTPPropDescArrayLengthForm;
+
+struct _PTPPropDescStringForm {
+	char			*String;
+};
+typedef struct _PTPPropDescStringForm PTPPropDescStringForm;
+
 /* Device Property Describing Dataset (DevicePropDesc) */
 
 struct _PTPDevicePropDesc {
@@ -1273,8 +1679,13 @@
 	uint32_t		GroupCode;
 	uint8_t			FormFlag;
 	union	{
-		PTPPropDescEnumForm	Enum;
-		PTPPropDescRangeForm	Range;
+		PTPPropDescEnumForm		Enum;
+		PTPPropDescRangeForm		Range;
+		PTPPropDescStringForm		DateTime;
+		PTPPropDescArrayLengthForm	FixedLengthArray;
+		PTPPropDescStringForm		RegularExpression;
+		PTPPropDescArrayLengthForm	ByteArray;
+		PTPPropDescStringForm		LongString;
 	} FORM;
 };
 typedef struct _PTPObjectPropDesc PTPObjectPropDesc;
@@ -1350,7 +1761,7 @@
 	uint8_t   display_order;
 	char      creation_date16;
 	char      lastusage_date16;
-	
+
 	/* Values only valid when writing */
 	uint32_t  ip_address;
 	uint8_t   subnet_mask; /* first zero bit position, e.g. 24 for 255.255.255.0 */
@@ -1637,6 +2048,13 @@
 #define PTP_DPC_CANON_EOS_ImageFormatExtHD	0xD123	/* file setting exthd */
 #define PTP_DPC_CANON_EOS_RefocusState		0xD124
 #define PTP_DPC_CANON_EOS_CameraNickname	0xD125
+#define PTP_DPC_CANON_EOS_StroboSettingExpCompositionControl	0xD126
+#define PTP_DPC_CANON_EOS_ConnectStatus		0xD127
+#define PTP_DPC_CANON_EOS_LensBarrelStatus	0xD128
+#define PTP_DPC_CANON_EOS_SilentShutterSetting	0xD129
+#define PTP_DPC_CANON_EOS_LV_AF_EyeDetect	0xD12C
+#define PTP_DPC_CANON_EOS_AutoTransMobile	0xD12D
+#define PTP_DPC_CANON_EOS_URLSupportFormat	0xD12E
 #define PTP_DPC_CANON_EOS_SpecialAcc		0xD12F
 #define PTP_DPC_CANON_EOS_CompressionS		0xD130
 #define PTP_DPC_CANON_EOS_CompressionM1		0xD131
@@ -1687,6 +2105,8 @@
 #define PTP_DPC_CANON_EOS_PictureStyleExUserSet1	0xD163
 #define PTP_DPC_CANON_EOS_PictureStyleExUserSet2	0xD164
 #define PTP_DPC_CANON_EOS_PictureStyleExUserSet3	0xD165
+#define PTP_DPC_CANON_EOS_MovieAVModeFine	0xD166
+#define PTP_DPC_CANON_EOS_ShutterReleaseCounter	0xD167	/* perhaps send a requestdeviceprop ex ? */
 #define PTP_DPC_CANON_EOS_AvailableImageSize	0xD168
 #define PTP_DPC_CANON_EOS_ErrorHistory		0xD169
 #define PTP_DPC_CANON_EOS_LensExchangeHistory	0xD16A
@@ -1781,6 +2201,7 @@
 #define PTP_DPC_CANON_EOS_MovieParam2		0xD1CA
 #define PTP_DPC_CANON_EOS_StroboSettingExpComposition		0xD1CB
 #define PTP_DPC_CANON_EOS_MovieParam3		0xD1CC
+#define PTP_DPC_CANON_EOS_MovieParam4		0xD1CD
 #define PTP_DPC_CANON_EOS_LVMedicalRotate	0xD1CF
 #define PTP_DPC_CANON_EOS_Artist		0xD1d0
 #define PTP_DPC_CANON_EOS_Copyright		0xD1d1
@@ -1799,6 +2220,29 @@
 #define PTP_DPC_CANON_EOS_LCDBrightness		0xD1de
 #define PTP_DPC_CANON_EOS_CADarkBright		0xD1df
 
+#define PTP_DPC_CANON_EOS_CAssistPreset		0xD201
+#define PTP_DPC_CANON_EOS_CAssistBrightness	0xD202
+#define PTP_DPC_CANON_EOS_CAssistContrast	0xD203
+#define PTP_DPC_CANON_EOS_CAssistSaturation	0xD204
+#define PTP_DPC_CANON_EOS_CAssistColorBA	0xD205
+#define PTP_DPC_CANON_EOS_CAssistColorMG	0xD206
+#define PTP_DPC_CANON_EOS_CAssistMonochrome	0xD207
+#define PTP_DPC_CANON_EOS_FocusShiftSetting	0xD208
+#define PTP_DPC_CANON_EOS_MovieSelfTimer	0xD209
+#define PTP_DPC_CANON_EOS_Clarity		0xD20B
+#define PTP_DPC_CANON_EOS_2GHDRSetting		0xD20C
+#define PTP_DPC_CANON_EOS_MovieParam5		0xD20D
+#define PTP_DPC_CANON_EOS_HDRViewAssistModeRec	0xD20E
+#define PTP_DPC_CANON_EOS_PropFinderAFFrame	0xD214
+#define PTP_DPC_CANON_EOS_VariableMovieRecSetting	0xD215
+#define PTP_DPC_CANON_EOS_PropAutoRotate	0xD216
+#define PTP_DPC_CANON_EOS_MFPeakingSetting	0xD217
+#define PTP_DPC_CANON_EOS_MovieSpatialOversampling	0xD218
+#define PTP_DPC_CANON_EOS_MovieCropMode		0xD219
+#define PTP_DPC_CANON_EOS_ShutterType		0xD21A
+#define PTP_DPC_CANON_EOS_WFTBatteryPower	0xD21B
+#define PTP_DPC_CANON_EOS_BatteryInfoEx		0xD21C
+
 /* Nikon extension device property codes */
 #define PTP_DPC_NIKON_ShootingBank			0xD010
 #define PTP_DPC_NIKON_ShootingBankNameA 		0xD011
@@ -1830,9 +2274,12 @@
 #define PTP_DPC_NIKON_ToneCompensation			0xD02B
 #define PTP_DPC_NIKON_ColorModel			0xD02C
 #define PTP_DPC_NIKON_HueAdjustment			0xD02D
-#define PTP_DPC_NIKON_NonCPULensDataFocalLength		0xD02E	/* Set FMM Manual */
-#define PTP_DPC_NIKON_NonCPULensDataMaximumAperture	0xD02F	/* Set F0 Manual */
-#define PTP_DPC_NIKON_ShootingMode			0xD030
+#define PTP_DPC_NIKON_NonCPULensDataFocalLength		0xD02E
+#define PTP_DPC_NIKON_FmmManualSetting			0xD02E	/* on z6, same as PTP_DPC_NIKON_NonCPULensDataFocalLength? */
+#define PTP_DPC_NIKON_NonCPULensDataMaximumAperture	0xD02F
+#define PTP_DPC_NIKON_F0ManualSetting			0xD02F	/* on z6, same as PTP_DPC_NIKON_NonCPULensDataMaximumAperture? */
+#define PTP_DPC_NIKON_ShootingMode			0xD030	/* also Capture Area Crop on Z6 */
+#define PTP_DPC_NIKON_CaptureAreaCrop			0xD030	/* on z6, (DX = 1/FX = 0 / 1:1=2, 16:9=3)*/
 #define PTP_DPC_NIKON_JPEG_Compression_Policy		0xD031
 #define PTP_DPC_NIKON_ColorSpace			0xD032
 #define PTP_DPC_NIKON_AutoDXCrop			0xD033
@@ -1841,12 +2288,22 @@
 #define PTP_DPC_NIKON_VideoMode				0xD036
 #define PTP_DPC_NIKON_EffectMode			0xD037
 #define PTP_DPC_NIKON_1_Mode				0xD038
+#define PTP_DPC_NIKON_WhiteBalancePresetName5		0xD038	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalancePresetName6		0xD039	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalanceTunePreset5		0xD03A	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalanceTunePreset6		0xD03B	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalancePresetProtect5	0xD03C	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalancePresetProtect6	0xD03D	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalancePresetValue5		0xD03E	/* z6 */
+#define PTP_DPC_NIKON_WhiteBalancePresetValue6		0xD03F	/* z6 */
 #define PTP_DPC_NIKON_CSMMenuBankSelect			0xD040
 #define PTP_DPC_NIKON_MenuBankNameA			0xD041
 #define PTP_DPC_NIKON_MenuBankNameB			0xD042
 #define PTP_DPC_NIKON_MenuBankNameC			0xD043
 #define PTP_DPC_NIKON_MenuBankNameD			0xD044
 #define PTP_DPC_NIKON_ResetBank				0xD045
+#define PTP_DPC_NIKON_AFStillLockOnAcross		0xD046
+#define PTP_DPC_NIKON_AFStillLockOnMove			0xD047
 #define PTP_DPC_NIKON_A1AFCModePriority			0xD048
 #define PTP_DPC_NIKON_A2AFSModePriority			0xD049
 #define PTP_DPC_NIKON_A3GroupDynamicAF			0xD04A
@@ -1855,6 +2312,7 @@
 #define PTP_DPC_NIKON_FocusAreaIllumContinuous		0xD04D
 #define PTP_DPC_NIKON_FocusAreaIllumWhenSelected 	0xD04E
 #define PTP_DPC_NIKON_FocusAreaWrap			0xD04F /* area sel */
+#define PTP_DPC_NIKON_FocusAreaSelect			0xD04F /* z6 */
 #define PTP_DPC_NIKON_VerticalAFON			0xD050
 #define PTP_DPC_NIKON_AFLockOn				0xD051
 #define PTP_DPC_NIKON_FocusAreaZone			0xD052
@@ -1864,22 +2322,22 @@
 #define PTP_DPC_NIKON_EVStep				0xD056 /* EV Step SS FN */
 #define PTP_DPC_NIKON_EVStepExposureComp		0xD057
 #define PTP_DPC_NIKON_ExposureCompensation		0xD058
-#define PTP_DPC_NIKON_CenterWeightArea			0xD059
+#define PTP_DPC_NIKON_CenterWeightArea			0xD059	/* CenterweightedExRange */
 #define PTP_DPC_NIKON_ExposureBaseMatrix		0xD05A
 #define PTP_DPC_NIKON_ExposureBaseCenter		0xD05B
 #define PTP_DPC_NIKON_ExposureBaseSpot			0xD05C
 #define PTP_DPC_NIKON_LiveViewAFArea			0xD05D /* FIXME: AfAtLiveview? */
 #define PTP_DPC_NIKON_AELockMode			0xD05E
 #define PTP_DPC_NIKON_AELAFLMode			0xD05F
-#define PTP_DPC_NIKON_LiveViewAFFocus			0xD061
+#define PTP_DPC_NIKON_LiveViewAFFocus			0xD061	/* AfModeAtLiveView */
 #define PTP_DPC_NIKON_MeterOff				0xD062
 #define PTP_DPC_NIKON_SelfTimer				0xD063
 #define PTP_DPC_NIKON_MonitorOff			0xD064
 #define PTP_DPC_NIKON_ImgConfTime			0xD065
 #define PTP_DPC_NIKON_AutoOffTimers			0xD066
 #define PTP_DPC_NIKON_AngleLevel			0xD067
-#define PTP_DPC_NIKON_D1ShootingSpeed			0xD068 /* continous speed low */
-#define PTP_DPC_NIKON_D2MaximumShots			0xD069
+#define PTP_DPC_NIKON_D1ShootingSpeed			0xD068 /* continuous speed low */
+#define PTP_DPC_NIKON_D2MaximumShots			0xD069	/* BurstMaxNumer */
 #define PTP_DPC_NIKON_ExposureDelayMode			0xD06A
 #define PTP_DPC_NIKON_LongExposureNoiseReduction	0xD06B
 #define PTP_DPC_NIKON_FileNumberSequence		0xD06C
@@ -1899,6 +2357,9 @@
 #define PTP_DPC_NIKON_BracketOrder			0xD07A
 #define PTP_DPC_NIKON_E8AutoBracketSelection		0xD07B	/* Bracket Method? */
 #define PTP_DPC_NIKON_BracketingSet			0xD07C
+#define PTP_DPC_NIKON_AngleLevelPitching		0xD07D
+#define PTP_DPC_NIKON_AngleLevelYawing			0xD07E
+#define PTP_DPC_NIKON_ExtendShootingMenu		0xD07F
 #define PTP_DPC_NIKON_F1CenterButtonShootingMode	0xD080
 #define PTP_DPC_NIKON_CenterButtonPlaybackMode		0xD081
 #define PTP_DPC_NIKON_F2Multiselector			0xD082
@@ -1919,6 +2380,10 @@
 #define PTP_DPC_NIKON_ImageCommentEnable		0xD091
 #define PTP_DPC_NIKON_ImageRotation			0xD092
 #define PTP_DPC_NIKON_ManualSetLensNo			0xD093
+#define PTP_DPC_NIKON_RetractableLensWarning		0xD09C
+#define PTP_DPC_NIKON_FaceDetection			0xD09D
+#define PTP_DPC_NIKON_3DTrackingCaptureArea		0xD09E
+#define PTP_DPC_NIKON_MatrixMetering			0xD09F
 #define PTP_DPC_NIKON_MovScreenSize			0xD0A0
 #define PTP_DPC_NIKON_MovVoice				0xD0A1
 #define PTP_DPC_NIKON_MovMicrophone			0xD0A2
@@ -1926,14 +2391,33 @@
 #define PTP_DPC_NIKON_MovRecProhibitCondition		0xD0A4
 #define PTP_DPC_NIKON_ManualMovieSetting		0xD0A6
 #define PTP_DPC_NIKON_MovQuality			0xD0A7
+#define PTP_DPC_NIKON_MovRecordMicrophoneLevelValue	0xD0A8
+#define PTP_DPC_NIKON_MovWindNoiseReduction		0xD0AA
+#define PTP_DPC_NIKON_MovRecordingZone			0xD0AC
+#define PTP_DPC_NIKON_MovISOAutoControl			0xD0AD
+#define PTP_DPC_NIKON_MovISOAutoHighLimit		0xD0AE
+#define PTP_DPC_NIKON_MovFileType			0xD0AF /* 0: mov, 1: mp4 */
 #define PTP_DPC_NIKON_LiveViewScreenDisplaySetting	0xD0B2
 #define PTP_DPC_NIKON_MonitorOffDelay			0xD0B3
+#define PTP_DPC_NIKON_ExposureIndexEx			0xD0B4
+#define PTP_DPC_NIKON_ISOControlSensitivity		0xD0B5
+#define PTP_DPC_NIKON_RawImageSize			0xD0B6
+#define PTP_DPC_NIKON_MultiBatteryInfo			0xD0B9
+#define PTP_DPC_NIKON_FlickerReductionSetting		0xD0B7
+#define PTP_DPC_NIKON_DiffractionCompensatipn		0xD0BA
+#define PTP_DPC_NIKON_MovieLogOutput			0xD0BB
+#define PTP_DPC_NIKON_MovieAutoDistortion		0xD0BC
+#define PTP_DPC_NIKON_RemainingExposureTime		0xD0BE
+#define PTP_DPC_NIKON_MovieLogSetting			0xD0BF
 #define PTP_DPC_NIKON_Bracketing			0xD0C0
 #define PTP_DPC_NIKON_AutoExposureBracketStep		0xD0C1
 #define PTP_DPC_NIKON_AutoExposureBracketProgram	0xD0C2
 #define PTP_DPC_NIKON_AutoExposureBracketCount		0xD0C3
 #define PTP_DPC_NIKON_WhiteBalanceBracketStep		0xD0C4
 #define PTP_DPC_NIKON_WhiteBalanceBracketProgram	0xD0C5
+#define PTP_DPC_NIKON_ADLBracketingPattern		0xD0C6
+#define PTP_DPC_NIKON_ADLBracketingStep			0xD0C7
+#define PTP_DPC_NIKON_HDMIOutputDataDepth		0xD0CC
 #define PTP_DPC_NIKON_LensID				0xD0E0
 #define PTP_DPC_NIKON_LensSort				0xD0E1
 #define PTP_DPC_NIKON_LensType				0xD0E2
@@ -1941,6 +2425,7 @@
 #define PTP_DPC_NIKON_FocalLengthMax			0xD0E4
 #define PTP_DPC_NIKON_MaxApAtMinFocalLength		0xD0E5
 #define PTP_DPC_NIKON_MaxApAtMaxFocalLength		0xD0E6
+#define PTP_DPC_NIKON_LensTypeML			0xD0E7
 #define PTP_DPC_NIKON_FinderISODisp			0xD0F0
 #define PTP_DPC_NIKON_AutoOffPhoto			0xD0F2
 #define PTP_DPC_NIKON_AutoOffMenu			0xD0F3
@@ -1949,6 +2434,7 @@
 #define PTP_DPC_NIKON_VignetteCtrl			0xD0F7
 #define PTP_DPC_NIKON_AutoDistortionControl		0xD0F8
 #define PTP_DPC_NIKON_SceneMode				0xD0F9
+#define PTP_DPC_NIKON_UserMode				0xD0FC
 #define PTP_DPC_NIKON_SceneMode2			0xD0FD
 #define PTP_DPC_NIKON_SelfTimerInterval			0xD0FE
 #define PTP_DPC_NIKON_ExposureTime			0xD100	/* Shutter Speed */
@@ -1973,6 +2459,7 @@
 #define PTP_DPC_NIKON_AVLockSetting			0xD113
 #define PTP_DPC_NIKON_IllumSetting			0xD114
 #define PTP_DPC_NIKON_FocusPointBright			0xD115
+#define PTP_DPC_NIKON_ExposureCompFlashUsed		0xD118
 #define PTP_DPC_NIKON_ExternalFlashAttached		0xD120
 #define PTP_DPC_NIKON_ExternalFlashStatus		0xD121
 #define PTP_DPC_NIKON_ExternalFlashSort			0xD122
@@ -1980,10 +2467,15 @@
 #define PTP_DPC_NIKON_ExternalFlashCompensation		0xD124
 #define PTP_DPC_NIKON_NewExternalFlashMode		0xD125
 #define PTP_DPC_NIKON_FlashExposureCompensation		0xD126
+#define PTP_DPC_NIKON_ExternalFlashMultiFlashMode	0xD12D
+#define PTP_DPC_NIKON_ConnectionPath			0xD12E
 #define PTP_DPC_NIKON_HDRMode				0xD130
 #define PTP_DPC_NIKON_HDRHighDynamic			0xD131
 #define PTP_DPC_NIKON_HDRSmoothing			0xD132
+#define PTP_DPC_NIKON_HDRSaveIndividualImages		0xD133
+#define PTP_DPC_NIKON_VibrationReduction		0xD138
 #define PTP_DPC_NIKON_OptimizeImage			0xD140
+#define PTP_DPC_NIKON_WBAutoType			0xD141
 #define PTP_DPC_NIKON_Saturation			0xD142
 #define PTP_DPC_NIKON_BW_FillerEffect			0xD143
 #define PTP_DPC_NIKON_BW_Sharpness			0xD144
@@ -1999,10 +2491,19 @@
 #define PTP_DPC_NIKON_TunePreset2			0xD153
 #define PTP_DPC_NIKON_TunePreset3			0xD154
 #define PTP_DPC_NIKON_TunePreset4			0xD155
+#define PTP_DPC_NIKON_PrimarySlot			0xD156
+#define PTP_DPC_NIKON_WBPresetProtect1			0xD158
+#define PTP_DPC_NIKON_WBPresetProtect2			0xD159
+#define PTP_DPC_NIKON_WBPresetProtect3			0xD15A
+#define PTP_DPC_NIKON_ActiveFolder			0xD15B
+#define PTP_DPC_NIKON_WBPresetProtect4			0xD15C
+#define PTP_DPC_NIKON_WhiteBalanceReset			0xD15D
+#define PTP_DPC_NIKON_WhiteBalanceNaturalLightAutoBias	0xD15E /* Only encountered in D850, z6? */
 #define PTP_DPC_NIKON_BeepOff				0xD160
 #define PTP_DPC_NIKON_AutofocusMode			0xD161
 #define PTP_DPC_NIKON_AFAssist				0xD163
 #define PTP_DPC_NIKON_PADVPMode				0xD164	/* iso auto time */
+#define PTP_DPC_NIKON_ISOAutoShutterTime		0xD164	/* z6 */
 #define PTP_DPC_NIKON_ImageReview			0xD165
 #define PTP_DPC_NIKON_AFAreaIllumination		0xD166
 #define PTP_DPC_NIKON_FlashMode				0xD167
@@ -2019,6 +2520,13 @@
 #define PTP_DPC_NIKON_DateCountData			0xD172
 #define PTP_DPC_NIKON_DateCountDisplaySetting		0xD173
 #define PTP_DPC_NIKON_RangeFinderSetting		0xD174
+#define PTP_DPC_NIKON_LimitedAFAreaMode			0xD176
+#define PTP_DPC_NIKON_AFModeRestrictions		0xD177
+#define PTP_DPC_NIKON_LowLightAF			0xD17A
+#define PTP_DPC_NIKON_ApplyLiveViewSetting		0xD17B
+#define PTP_DPC_NIKON_MovieAfSpeed			0xD17C
+#define PTP_DPC_NIKON_MovieAfSpeedWhenToApply		0xD17D
+#define PTP_DPC_NIKON_MovieAfTrackingSensitivity	0xD17E
 #define PTP_DPC_NIKON_CSMMenu				0xD180
 #define PTP_DPC_NIKON_WarningDisplay			0xD181
 #define PTP_DPC_NIKON_BatteryCellKind			0xD182
@@ -2032,19 +2540,36 @@
 #define PTP_DPC_NIKON_IndicatorDisp			0xD18D
 #define PTP_DPC_NIKON_CellKindPriority			0xD18E
 #define PTP_DPC_NIKON_BracketingFramesAndSteps		0xD190
+#define PTP_DPC_NIKON_MovieReleaseButton		0xD197
+#define PTP_DPC_NIKON_FlashISOAutoHighLimit		0xD199
 #define PTP_DPC_NIKON_LiveViewMode			0xD1A0
 #define PTP_DPC_NIKON_LiveViewDriveMode			0xD1A1
 #define PTP_DPC_NIKON_LiveViewStatus			0xD1A2
 #define PTP_DPC_NIKON_LiveViewImageZoomRatio		0xD1A3
 #define PTP_DPC_NIKON_LiveViewProhibitCondition		0xD1A4
+#define PTP_DPC_NIKON_LiveViewExposurePreview		0xD1A5
+#define PTP_DPC_NIKON_LiveViewSelector			0xD1A6
+#define PTP_DPC_NIKON_LiveViewWhiteBalance		0xD1A7
 #define PTP_DPC_NIKON_MovieShutterSpeed			0xD1A8
 #define PTP_DPC_NIKON_MovieFNumber			0xD1A9
 #define PTP_DPC_NIKON_MovieISO				0xD1AA
+#define PTP_DPC_NIKON_MovieExposureBiasCompensation	0xD1AB
 #define PTP_DPC_NIKON_LiveViewMovieMode			0xD1AC /* ? */
+#define PTP_DPC_NIKON_LiveViewImageSize			0xD1AC /* d850 */
+#define PTP_DPC_NIKON_LiveViewPhotography		0xD1AD
+#define PTP_DPC_NIKON_MovieExposureMeteringMode		0xD1AF
 #define PTP_DPC_NIKON_ExposureDisplayStatus		0xD1B0
 #define PTP_DPC_NIKON_ExposureIndicateStatus		0xD1B1
 #define PTP_DPC_NIKON_InfoDispErrStatus			0xD1B2
 #define PTP_DPC_NIKON_ExposureIndicateLightup		0xD1B3
+#define PTP_DPC_NIKON_ContinousShootingCount		0xD1B4
+#define PTP_DPC_NIKON_MovieRecFrameCount		0xD1B7
+#define PTP_DPC_NIKON_CameraLiveViewStatus		0xD1B8
+#define PTP_DPC_NIKON_DetectionPeaking			0xD1B9
+#define PTP_DPC_NIKON_LiveViewTFTStatus			0xD1BA
+#define PTP_DPC_NIKON_LiveViewImageStatus		0xD1BB
+#define PTP_DPC_NIKON_LiveViewImageCompression		0xD1BC
+#define PTP_DPC_NIKON_LiveViewZoomArea			0xD1BD
 #define PTP_DPC_NIKON_FlashOpen				0xD1C0
 #define PTP_DPC_NIKON_FlashCharged			0xD1C1
 #define PTP_DPC_NIKON_FlashMRepeatValue			0xD1D0
@@ -2060,11 +2585,101 @@
 #define PTP_DPC_NIKON_FlashCommandBMode			0xD1DA
 #define PTP_DPC_NIKON_FlashCommandBCompensation		0xD1DB
 #define PTP_DPC_NIKON_FlashCommandBValue		0xD1DC
+#define PTP_DPC_NIKON_ExternalRecordingControl		0xD1DE
+#define PTP_DPC_NIKON_HighlightBrightness		0xD1DF
+#define PTP_DPC_NIKON_SBWirelessMode			0xD1E2
+#define PTP_DPC_NIKON_SBWirelessMultipleFlashMode	0xD1E3
+#define PTP_DPC_NIKON_SBUsableGroup			0xD1E4
+#define PTP_DPC_NIKON_WirelessCLSEntryMode		0xD1E5
+#define PTP_DPC_NIKON_SBPINCode				0xD1E6
+#define PTP_DPC_NIKON_RadioMultipleFlashChannel		0xD1E7
+#define PTP_DPC_NIKON_OpticalMultipleFlashChannel	0xD1E8
+#define PTP_DPC_NIKON_FlashRangeDisplay			0xD1E9
+#define PTP_DPC_NIKON_AllTestFiringDisable		0xD1EA
+#define PTP_DPC_NIKON_SBSettingMemberLock		0xD1EC
+#define PTP_DPC_NIKON_SBIntegrationFlashReady		0xD1ED
 #define PTP_DPC_NIKON_ApplicationMode			0xD1F0
+#define PTP_DPC_NIKON_ExposureRemaining			0xD1F1
 #define PTP_DPC_NIKON_ActiveSlot			0xD1F2
+#define PTP_DPC_NIKON_ISOAutoShutterCorrectionTime	0xD1F4
+#define PTP_DPC_NIKON_MirrorUpStatus			0xD1F6
+#define PTP_DPC_NIKON_MirrorUpReleaseShootingCount	0xD1F7
+#define PTP_DPC_NIKON_MovieAfAreaMode			0xD1F8
+#define PTP_DPC_NIKON_MovieVibrationReduction		0xD1F9
+#define PTP_DPC_NIKON_MovieFocusMode			0xD1FA
+#define PTP_DPC_NIKON_RecordTimeCodes			0xD1FB
+#define PTP_DPC_NIKON_CountUpMethod			0xD1FC
+#define PTP_DPC_NIKON_TimeCodeOrigin			0xD1FD
+#define PTP_DPC_NIKON_DropFrame				0xD1FE
 #define PTP_DPC_NIKON_ActivePicCtrlItem			0xD200
 #define PTP_DPC_NIKON_ChangePicCtrlItem			0xD201
+#define PTP_DPC_NIKON_ElectronicFrontCurtainShutter	0xD20D
+#define PTP_DPC_NIKON_MovieResetShootingMenu		0xD20E
+#define PTP_DPC_NIKON_MovieCaptureAreaCrop		0xD20F
+#define PTP_DPC_NIKON_MovieAutoDxCrop			0xD210
+#define PTP_DPC_NIKON_MovieWbAutoType			0xD211
+#define PTP_DPC_NIKON_MovieWbTuneAuto			0xD212
+#define PTP_DPC_NIKON_MovieWbTuneIncandescent		0xD213
+#define PTP_DPC_NIKON_MovieWbFlourescentType		0xD214
+#define PTP_DPC_NIKON_MovieWbTuneFlourescent		0xD215
+#define PTP_DPC_NIKON_MovieWbTuneSunny			0xD216
+#define PTP_DPC_NIKON_MovieWbTuneCloudy			0xD218
+#define PTP_DPC_NIKON_MovieWbTuneShade			0xD219
+#define PTP_DPC_NIKON_MovieWbColorTemp			0xD21A
+#define PTP_DPC_NIKON_MovieWbTuneColorTemp		0xD21B
+#define PTP_DPC_NIKON_MovieWbPresetData0		0xD21C
+#define PTP_DPC_NIKON_MovieWbPresetDataComment1		0xD21D
+#define PTP_DPC_NIKON_MovieWbPresetDataComment2		0xD21E
+#define PTP_DPC_NIKON_MovieWbPresetDataComment3		0xD21F
+#define PTP_DPC_NIKON_MovieWbPresetDataComment4		0xD220
+#define PTP_DPC_NIKON_MovieWbPresetDataComment5		0xD221
+#define PTP_DPC_NIKON_MovieWbPresetDataComment6		0xD222
+#define PTP_DPC_NIKON_MovieWbPresetDataValue1		0xD223
+#define PTP_DPC_NIKON_MovieWbPresetDataValue2		0xD224
+#define PTP_DPC_NIKON_MovieWbPresetDataValue3		0xD225
+#define PTP_DPC_NIKON_MovieWbPresetDataValue4		0xD226
+#define PTP_DPC_NIKON_MovieWbPresetDataValue5		0xD227
+#define PTP_DPC_NIKON_MovieWbPresetDataValue6		0xD228
+#define PTP_DPC_NIKON_MovieWbTunePreset1		0xD229
+#define PTP_DPC_NIKON_MovieWbTunePreset2		0xD22A
+#define PTP_DPC_NIKON_MovieWbTunePreset3		0xD22B
+#define PTP_DPC_NIKON_MovieWbTunePreset4		0xD22C
+#define PTP_DPC_NIKON_MovieWbTunePreset5		0xD22D
+#define PTP_DPC_NIKON_MovieWbTunePreset6		0xD22E
+#define PTP_DPC_NIKON_MovieWbPresetProtect1		0xD22F
+#define PTP_DPC_NIKON_MovieWbPresetProtect2		0xD230
+#define PTP_DPC_NIKON_MovieWbPresetProtect3		0xD231
+#define PTP_DPC_NIKON_MovieWbPresetProtect4		0xD232
+#define PTP_DPC_NIKON_MovieWbPresetProtect5		0xD233
+#define PTP_DPC_NIKON_MovieWbPresetProtect6		0xD234
+#define PTP_DPC_NIKON_MovieWhiteBalanceReset		0xD235
 #define PTP_DPC_NIKON_MovieNrHighISO			0xD236
+#define PTP_DPC_NIKON_MovieActivePicCtrlItem		0xD237
+#define PTP_DPC_NIKON_MovieChangePicCtrlItem		0xD238
+#define PTP_DPC_NIKON_ExposureBaseCompHighlight		0xD239
+#define PTP_DPC_NIKON_MovieWhiteBalance			0xD23A
+#define PTP_DPC_NIKON_MovieActiveDLighting		0xD23B
+#define PTP_DPC_NIKON_MovieWbTuneNatural		0xD23C
+#define PTP_DPC_NIKON_MovieAttenuator			0xD23D
+#define PTP_DPC_NIKON_MovieVignetteControl		0xD23E
+#define PTP_DPC_NIKON_MovieDiffractionCompensation	0xD23F
+#define PTP_DPC_NIKON_UseDeviceStageFlag		0xD303
+#define PTP_DPC_NIKON_MovieCaptureMode			0xD304
+#define PTP_DPC_NIKON_SlowMotionMovieRecordScreenSize	0xD305
+#define PTP_DPC_NIKON_HighSpeedStillCaptureRate		0xD306
+#define PTP_DPC_NIKON_BestMomentCaptureMode		0xD307
+#define PTP_DPC_NIKON_ActiveSelectionFrameSavedDefault	0xD308
+#define PTP_DPC_NIKON_ActiveSelectionCapture40frameOver	0xD309
+#define PTP_DPC_NIKON_ActiveSelectionOnReleaseRecord	0xD310
+#define PTP_DPC_NIKON_ActiveSelectionSelectedPictures	0xD311
+#define PTP_DPC_NIKON_ExposureRemainingInMovie		0xD312
+#define PTP_DPC_NIKON_OpticalVR				0xD313
+#define PTP_DPC_NIKON_ElectronicVR			0xD314
+#define PTP_DPC_NIKON_SilentPhotography			0xD315
+#define PTP_DPC_NIKON_FacePriority			0xD316
+#define PTP_DPC_NIKON_LensTypeNikon1			0xD317
+#define PTP_DPC_NIKON_ISONoiseReduction			0xD318
+#define PTP_DPC_NIKON_MovieLoopLength			0xD323
 
 
 /* Nikon V1 (or WU adapter?) Trace */
@@ -2083,22 +2698,254 @@
 
 /* this is irregular, as it should be -0x5000 or 0xD000 based */
 #define PTP_DPC_NIKON_1_ISO				0xF002
+#define PTP_DPC_NIKON_1_FNumber				0xF003
+#define PTP_DPC_NIKON_1_ShutterSpeed			0xF004
+#define PTP_DPC_NIKON_1_FNumber2			0xF006
+#define PTP_DPC_NIKON_1_ShutterSpeed2			0xF007
 #define PTP_DPC_NIKON_1_ImageCompression		0xF009
 #define PTP_DPC_NIKON_1_ImageSize			0xF00A
 #define PTP_DPC_NIKON_1_WhiteBalance			0xF00C
 #define PTP_DPC_NIKON_1_LongExposureNoiseReduction	0xF00D
 #define PTP_DPC_NIKON_1_HiISONoiseReduction		0xF00E
 #define PTP_DPC_NIKON_1_ActiveDLighting			0xF00F
+#define PTP_DPC_NIKON_1_Language			0xF018
+#define PTP_DPC_NIKON_1_ReleaseWithoutCard		0xF019 /* no sd card */
 #define PTP_DPC_NIKON_1_MovQuality			0xF01C
 
 /* Fuji specific */
+
+#define PTP_DPC_FUJI_FilmSimulation			0xD001
+#define PTP_DPC_FUJI_FilmSimulationTune			0xD002
+#define PTP_DPC_FUJI_DRangeMode				0xD007
+#define PTP_DPC_FUJI_ColorMode				0xD008
+#define PTP_DPC_FUJI_ColorSpace				0xD00A
+#define PTP_DPC_FUJI_WhitebalanceTune1			0xD00B
+#define PTP_DPC_FUJI_WhitebalanceTune2			0xD00C
 #define PTP_DPC_FUJI_ColorTemperature			0xD017
 #define PTP_DPC_FUJI_Quality				0xD018
+#define PTP_DPC_FUJI_RecMode				0xD019 /* LiveViewColorMode? */
+#define PTP_DPC_FUJI_LiveViewBrightness			0xD01A
+#define PTP_DPC_FUJI_ThroughImageZoom			0xD01B
+#define PTP_DPC_FUJI_NoiseReduction			0xD01C
+#define PTP_DPC_FUJI_MacroMode				0xD01D
+#define PTP_DPC_FUJI_LiveViewStyle			0xD01E
+#define PTP_DPC_FUJI_FaceDetectionMode			0xD020
+#define PTP_DPC_FUJI_RedEyeCorrectionMode		0xD021
+#define PTP_DPC_FUJI_RawCompression			0xD022
+#define PTP_DPC_FUJI_GrainEffect			0xD023
+#define PTP_DPC_FUJI_SetEyeAFMode			0xD024
+#define PTP_DPC_FUJI_FocusPoints			0xD025
+#define PTP_DPC_FUJI_MFAssistMode			0xD026
+#define PTP_DPC_FUJI_InterlockAEAFArea			0xD027
+#define PTP_DPC_FUJI_CommandDialMode			0xD028
+#define PTP_DPC_FUJI_Shadowing				0xD029
+/* d02a - d02c also appear in setafmode */
+#define PTP_DPC_FUJI_ExposureIndex			0xD02A
+#define PTP_DPC_FUJI_MovieISO				0xD02B
+#define PTP_DPC_FUJI_WideDynamicRange			0xD02E
+#define PTP_DPC_FUJI_TNumber				0xD02F
+#define PTP_DPC_FUJI_Comment				0xD100
+#define PTP_DPC_FUJI_SerialMode				0xD101
+#define PTP_DPC_FUJI_ExposureDelay			0xD102
+#define PTP_DPC_FUJI_PreviewTime			0xD103
+#define PTP_DPC_FUJI_BlackImageTone			0xD104
+#define PTP_DPC_FUJI_Illumination			0xD105
+#define PTP_DPC_FUJI_FrameGuideMode			0xD106
+#define PTP_DPC_FUJI_ViewfinderWarning			0xD107
+#define PTP_DPC_FUJI_AutoImageRotation			0xD108
+#define PTP_DPC_FUJI_DetectImageRotation		0xD109
+#define PTP_DPC_FUJI_ShutterPriorityMode1		0xD10A
+#define PTP_DPC_FUJI_ShutterPriorityMode2		0xD10B
+#define PTP_DPC_FUJI_AFIlluminator			0xD112
+#define PTP_DPC_FUJI_Beep				0xD113
+#define PTP_DPC_FUJI_AELock				0xD114
+#define PTP_DPC_FUJI_ISOAutoSetting1			0xD115
+#define PTP_DPC_FUJI_ISOAutoSetting2			0xD116
+#define PTP_DPC_FUJI_ISOAutoSetting3			0xD117
+#define PTP_DPC_FUJI_ExposureStep			0xD118
+#define PTP_DPC_FUJI_CompensationStep			0xD119
+#define PTP_DPC_FUJI_ExposureSimpleSet			0xD11A
+#define PTP_DPC_FUJI_CenterPhotometryRange		0xD11B
+#define PTP_DPC_FUJI_PhotometryLevel1			0xD11C
+#define PTP_DPC_FUJI_PhotometryLevel2			0xD11D
+#define PTP_DPC_FUJI_PhotometryLevel3			0xD11E
+#define PTP_DPC_FUJI_FlashTuneSpeed			0xD11F
+#define PTP_DPC_FUJI_FlashShutterLimit			0xD120
+#define PTP_DPC_FUJI_BuiltinFlashMode			0xD121
+#define PTP_DPC_FUJI_FlashManualMode			0xD122
+#define PTP_DPC_FUJI_FlashRepeatingMode1		0xD123
+#define PTP_DPC_FUJI_FlashRepeatingMode2		0xD124
+#define PTP_DPC_FUJI_FlashRepeatingMode3		0xD125
+#define PTP_DPC_FUJI_FlashCommanderMode1		0xD126
+#define PTP_DPC_FUJI_FlashCommanderMode2		0xD127
+#define PTP_DPC_FUJI_FlashCommanderMode3		0xD128
+#define PTP_DPC_FUJI_FlashCommanderMode4		0xD129
+#define PTP_DPC_FUJI_FlashCommanderMode5		0xD12A
+#define PTP_DPC_FUJI_FlashCommanderMode6		0xD12B
+#define PTP_DPC_FUJI_FlashCommanderMode7		0xD12C
+#define PTP_DPC_FUJI_ModelingFlash			0xD12D
+#define PTP_DPC_FUJI_BKT				0xD12E
+#define PTP_DPC_FUJI_BKTChange				0xD12F
+#define PTP_DPC_FUJI_BKTOrder				0xD130
+#define PTP_DPC_FUJI_BKTSelection			0xD131
+#define PTP_DPC_FUJI_AEAFLockButton			0xD132
+#define PTP_DPC_FUJI_CenterButton			0xD133
+#define PTP_DPC_FUJI_MultiSelectorButton		0xD134
+#define PTP_DPC_FUJI_FunctionLock			0xD136
+#define PTP_DPC_FUJI_Password				0xD145
+#define PTP_DPC_FUJI_ChangePassword			0xD146	/* ? */
+#define PTP_DPC_FUJI_CommandDialSetting1		0xD147
+#define PTP_DPC_FUJI_CommandDialSetting2		0xD148
+#define PTP_DPC_FUJI_CommandDialSetting3		0xD149
+#define PTP_DPC_FUJI_CommandDialSetting4		0xD14A
+#define PTP_DPC_FUJI_ButtonsAndDials			0xD14B
+#define PTP_DPC_FUJI_NonCPULensData			0xD14C
+#define PTP_DPC_FUJI_MBD200Batteries			0xD14E
+#define PTP_DPC_FUJI_AFOnForMBD200Batteries		0xD14F
+#define PTP_DPC_FUJI_FirmwareVersion			0xD153
+#define PTP_DPC_FUJI_ShotCount				0xD154
+#define PTP_DPC_FUJI_ShutterExchangeCount		0xD155
+#define PTP_DPC_FUJI_WorldClock				0xD157
+#define PTP_DPC_FUJI_TimeDifference1			0xD158
+#define PTP_DPC_FUJI_TimeDifference2			0xD159
+#define PTP_DPC_FUJI_Language				0xD15A
+#define PTP_DPC_FUJI_FrameNumberSequence		0xD15B
+#define PTP_DPC_FUJI_VideoMode				0xD15C
+#define PTP_DPC_FUJI_SetUSBMode				0xD15D
+#define PTP_DPC_FUJI_CommentWriteSetting		0xD161
+#define PTP_DPC_FUJI_BCRAppendDelimiter			0xD162
+#define PTP_DPC_FUJI_CommentEx				0xD167
+#define PTP_DPC_FUJI_VideoOutOnOff			0xD168
+#define PTP_DPC_FUJI_CropMode				0xD16F
+#define PTP_DPC_FUJI_LensZoomPos			0xD170
+#define PTP_DPC_FUJI_FocusPosition			0xD171
+#define PTP_DPC_FUJI_LiveViewImageQuality		0xD173
+#define PTP_DPC_FUJI_LiveViewImageSize			0xD174
+#define PTP_DPC_FUJI_LiveViewCondition			0xD175
+#define PTP_DPC_FUJI_StandbyMode			0xD176
+#define PTP_DPC_FUJI_LiveViewExposure			0xD177
+#define PTP_DPC_FUJI_LiveViewWhiteBalance		0xD178 /* same values as 0x5005 */
+#define PTP_DPC_FUJI_LiveViewWhiteBalanceGain		0xD179
+#define PTP_DPC_FUJI_LiveViewTuning			0xD17A
+#define PTP_DPC_FUJI_FocusMeteringMode			0xD17C
+#define PTP_DPC_FUJI_FocusLength			0xD17D
+#define PTP_DPC_FUJI_CropAreaFrameInfo			0xD17E
+#define PTP_DPC_FUJI_ResetSetting			0xD17F /* also clean sensor? */
+#define PTP_DPC_FUJI_IOPCode				0xD184
+#define PTP_DPC_FUJI_TetherRawConditionCode		0xD186
+#define PTP_DPC_FUJI_TetherRawCompatibilityCode		0xD187
+#define PTP_DPC_FUJI_LightTune				0xD200
 #define PTP_DPC_FUJI_ReleaseMode			0xD201
+#define PTP_DPC_FUJI_BKTFrame1				0xD202
+#define PTP_DPC_FUJI_BKTFrame2				0xD203
+#define PTP_DPC_FUJI_BKTStep				0xD204
+#define PTP_DPC_FUJI_ProgramShift			0xD205
 #define PTP_DPC_FUJI_FocusAreas				0xD206
-#define PTP_DPC_FUJI_AELock				0xD213
+#define PTP_DPC_FUJI_PriorityMode			0xD207 /* from setprioritymode */
+/* D208 is some kind of control, likely bitmasked. reported like an enum.
+ * 0x200 seems to mean focusing?
+ * 0x208 capture?
+ * camera starts with 0x304
+ * xt2:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5
+ * xt3:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9200,0x40,0x9300,5,0x804,0x80
+ * xt30:   0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9200,0x40,0x9300,5
+ * xt4:    0x104,0x200,0x4,0x304,0x500,0xc,0x8000,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe,0x9200,0x40,0x804,0x80
+ * xh1:    0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5
+ * gfx100: 0x104,0x200,0x4,0x304,0x500,0xc,0x8000,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe,0x9200
+ * gfx50r: 0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe
+ * xpro2:  0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1
+ *
+ * 0x304 is for regular capture 	SDK_ShootS2toS0	(default) (SDK_Shoot)
+ * 0x200 seems for autofocus (s1?)	SDK_ShootS1
+ * 0x500 start bulb? 0xc end bulb?	SDK_StartBulb
+ * 0x400 might also be start bulb?	SDK_StartBulb
+ * 0xc					SDK_EndBulb
+ * 0x600 				SDK_1PushAF
+ * 0x4 					SDK_CancelS1
+ * 0x300 				SDK_ShootS2
+ * 0x8000 migh be autowhitebalance
+ */
+#define PTP_DPC_FUJI_AFStatus				0xD209
+#define PTP_DPC_FUJI_DeviceName				0xD20B
+#define PTP_DPC_FUJI_MediaRecord			0xD20C /* from capmediarecord */
+#define PTP_DPC_FUJI_MediaCapacity			0xD20D
+#define PTP_DPC_FUJI_FreeSDRAMImages			0xD20E /* free images in SDRAM */
+#define PTP_DPC_FUJI_MediaStatus			0xD211
+#define PTP_DPC_FUJI_CurrentState			0xD212
+#define PTP_DPC_FUJI_AELock2				0xD213
+#define PTP_DPC_FUJI_Copyright				0xD215
+#define PTP_DPC_FUJI_Copyright2				0xD216
 #define PTP_DPC_FUJI_Aperture				0xD218
 #define PTP_DPC_FUJI_ShutterSpeed			0xD219
+#define PTP_DPC_FUJI_DeviceError			0xD21B
+#define PTP_DPC_FUJI_SensitivityFineTune1		0xD222
+#define PTP_DPC_FUJI_SensitivityFineTune2		0xD223
+#define PTP_DPC_FUJI_CaptureRemaining			0xD229	/* Movie AF Mode? */
+#define PTP_DPC_FUJI_MovieRemainingTime			0xD22A	/* Movie Focus Area? */
+#define PTP_DPC_FUJI_ForceMode				0xD230
+#define PTP_DPC_FUJI_ShutterSpeed2			0xD240 /* Movie Aperture */
+#define PTP_DPC_FUJI_ImageAspectRatio			0xD241
+#define PTP_DPC_FUJI_BatteryLevel			0xD242 /* Movie Sensitivity???? */
+#define PTP_DPC_FUJI_TotalShotCount			0xD310
+#define PTP_DPC_FUJI_HighLightTone			0xD320
+#define PTP_DPC_FUJI_ShadowTone				0xD321
+#define PTP_DPC_FUJI_LongExposureNR			0xD322
+#define PTP_DPC_FUJI_FullTimeManualFocus		0xD323
+#define PTP_DPC_FUJI_ISODialHn1				0xD332
+#define PTP_DPC_FUJI_ISODialHn2				0xD333
+#define PTP_DPC_FUJI_ViewMode1				0xD33F
+#define PTP_DPC_FUJI_ViewMode2				0xD340
+#define PTP_DPC_FUJI_DispInfoMode			0xD343
+#define PTP_DPC_FUJI_LensISSwitch			0xD346
+#define PTP_DPC_FUJI_FocusPoint				0xD347
+#define PTP_DPC_FUJI_InstantAFMode			0xD34A
+#define PTP_DPC_FUJI_PreAFMode				0xD34B
+#define PTP_DPC_FUJI_CustomSetting			0xD34C
+#define PTP_DPC_FUJI_LMOMode				0xD34D
+#define PTP_DPC_FUJI_LockButtonMode			0xD34E
+#define PTP_DPC_FUJI_AFLockMode				0xD34F
+#define PTP_DPC_FUJI_MicJackMode			0xD350
+#define PTP_DPC_FUJI_ISMode				0xD351
+#define PTP_DPC_FUJI_DateTimeDispFormat			0xD352
+#define PTP_DPC_FUJI_AeAfLockKeyAssign			0xD353
+#define PTP_DPC_FUJI_CrossKeyAssign			0xD354
+#define PTP_DPC_FUJI_SilentMode				0xD355
+#define PTP_DPC_FUJI_PBSound				0xD356
+#define PTP_DPC_FUJI_EVFDispAutoRotate			0xD358
+#define PTP_DPC_FUJI_ExposurePreview			0xD359
+#define PTP_DPC_FUJI_DispBrightness1			0xD35A
+#define PTP_DPC_FUJI_DispBrightness2			0xD35B
+#define PTP_DPC_FUJI_DispChroma1			0xD35C
+#define PTP_DPC_FUJI_DispChroma2			0xD35D
+#define PTP_DPC_FUJI_FocusCheckMode			0xD35E
+#define PTP_DPC_FUJI_FocusScaleUnit			0xD35F
+#define PTP_DPC_FUJI_SetFunctionButton			0xD361
+#define PTP_DPC_FUJI_SensorCleanTiming			0xD363
+#define PTP_DPC_FUJI_CustomAutoPowerOff			0xD364
+#define PTP_DPC_FUJI_FileNamePrefix1			0xD365
+#define PTP_DPC_FUJI_FileNamePrefix2			0xD366
+#define PTP_DPC_FUJI_BatteryInfo1			0xD36A
+#define PTP_DPC_FUJI_BatteryInfo2			0xD36B
+#define PTP_DPC_FUJI_LensNameAndSerial			0xD36D
+#define PTP_DPC_FUJI_CustomDispInfo			0xD36E
+#define PTP_DPC_FUJI_FunctionLockCategory1		0xD36F
+#define PTP_DPC_FUJI_FunctionLockCategory2		0xD370
+#define PTP_DPC_FUJI_CustomPreviewTime			0xD371
+#define PTP_DPC_FUJI_FocusArea1				0xD372
+#define PTP_DPC_FUJI_FocusArea2				0xD373
+#define PTP_DPC_FUJI_FocusArea3				0xD374
+#define PTP_DPC_FUJI_FrameGuideGridInfo1		0xD375
+#define PTP_DPC_FUJI_FrameGuideGridInfo2		0xD376
+#define PTP_DPC_FUJI_FrameGuideGridInfo3		0xD377
+#define PTP_DPC_FUJI_FrameGuideGridInfo4		0xD378
+#define PTP_DPC_FUJI_LensUnknownData			0xD38A
+#define PTP_DPC_FUJI_LensZoomPosCaps			0xD38C
+#define PTP_DPC_FUJI_LensFNumberList			0xD38D
+#define PTP_DPC_FUJI_LensFocalLengthList		0xD38E
+#define PTP_DPC_FUJI_FocusLimiter			0xD390
+#define PTP_DPC_FUJI_FocusArea4				0xD395
+#define PTP_DPC_FUJI_InitSequence			0xDF01
+#define PTP_DPC_FUJI_AppVersion				0xDF24
 
 /* Microsoft/MTP specific */
 #define PTP_DPC_MTP_SecureTime				0xD101
@@ -2120,6 +2967,22 @@
 #define PTP_DPC_MTP_Zune_UnknownVersion			0xD181
 
 /* Olympus */
+/* these are from OMD E-M1 Mark 2 */
+#define PTP_DPC_OLYMPUS_Aperture			0xD002
+#define PTP_DPC_OLYMPUS_FocusMode			0xD003
+#define PTP_DPC_OLYMPUS_ExposureMeteringMode		0xD004
+#define PTP_DPC_OLYMPUS_ISO				0xD007
+#define PTP_DPC_OLYMPUS_ExposureCompensation		0xD008
+#define PTP_DPC_OLYMPUS_OMD_DriveMode			0xD009
+#define PTP_DPC_OLYMPUS_ImageFormat			0xD00D
+#define PTP_DPC_OLYMPUS_FaceDetection			0xD01A
+#define PTP_DPC_OLYMPUS_AspectRatio			0xD01B
+#define PTP_DPC_OLYMPUS_Shutterspeed			0xD01C
+#define PTP_DPC_OLYMPUS_WhiteBalance			0xD01E
+#define PTP_DPC_OLYMPUS_LiveViewModeOM			0xD06D
+#define PTP_DPC_OLYMPUS_CaptureTarget			0xD0DC
+
+/* unsure where these were from */
 #define PTP_DPC_OLYMPUS_ResolutionMode			0xD102
 #define PTP_DPC_OLYMPUS_FocusPriority			0xD103
 #define PTP_DPC_OLYMPUS_DriveMode			0xD104
@@ -2203,6 +3066,7 @@
 #define PTP_DPC_OLYMPUS_FlashBracket			0xD15C
 #define PTP_DPC_OLYMPUS_ISOBracket			0xD15D
 #define PTP_DPC_OLYMPUS_MyModeStatus			0xD15E
+#define PTP_DPC_OLYMPUS_DateTimeUTC			0xD176 /* check */
 
 /* Sony A900 */
 #define PTP_DPC_SONY_DPCCompensation			0xD200
@@ -2213,23 +3077,159 @@
 #define PTP_DPC_SONY_CCFilter				0xD210
 #define PTP_DPC_SONY_AspectRatio			0xD211
 #define PTP_DPC_SONY_FocusFound     			0xD213 /* seems to be signaled (1->2) when focus is achieved */
+#define PTP_DPC_SONY_Zoom     				0xD214 /* might be focal length * 1.000.000 */
 #define PTP_DPC_SONY_ObjectInMemory     		0xD215 /* used to signal when to retrieve new object */
 #define PTP_DPC_SONY_ExposeIndex			0xD216
 #define PTP_DPC_SONY_BatteryLevel			0xD218
+#define PTP_DPC_SONY_SensorCrop				0xD219
 #define PTP_DPC_SONY_PictureEffect			0xD21B
 #define PTP_DPC_SONY_ABFilter				0xD21C
-#define PTP_DPC_SONY_ISO				0xD21E /* ? */
+#define PTP_DPC_SONY_ISO				0xD21E	/* ? */
+#define PTP_DPC_SONY_StillImageStoreDestination		0xD222  /* (type=0x4) Enumeration 1,17,16 value: 17 */
+/* guessed DPC_SONY_DateTimeSettings 0xD223  error on query */
+/* guessed DPC_SONY_FileType 0xD235  (enum: 0,1) */
+/* guessed DPC_SONY_JpegQuality 0xD252 */
+/* d255 reserved 5 */
+/* d254 reserved 4 */
+#define PTP_DPC_SONY_ExposureCompensation		0xD224
+#define PTP_DPC_SONY_ISO2				0xD226
+#define PTP_DPC_SONY_ShutterSpeed2			0xD229
+#define PTP_DPC_SONY_FocusArea				0xD22C  /* (type=0x4) Enumeration 1,2,3,257,258,259,260,513,514,515,516,517,518,519,261,520 value: 1 */
+#define PTP_DPC_SONY_LiveViewSettingEffect  0xD231  /* (type=0x2) Enumeration 1,2 value: 1 */
+#define PTP_DPC_SONY_JpegQuality			0xD252
+#define PTP_DPC_SONY_CompressionSetting			0xD253
+#define PTP_DPC_SONY_PriorityMode			0xD25A
+#define PTP_DPC_SONY_PcSaveImageSize			0xD268
+#define PTP_DPC_SONY_PcSaveImageFormat			0xD269
 #define PTP_DPC_SONY_AutoFocus				0xD2C1 /* ? half-press */
 #define PTP_DPC_SONY_Capture				0xD2C2 /* ? full-press */
-/* also seen: D2C3 D2C4 */
+#define PTP_DPC_SONY_FocusMagnify			0xD2CB
+#define PTP_DPC_SONY_FocusMagnifyExit			0xD2CC
+#define PTP_DPC_SONY_FocusMagnifyUp	    		0xD2CD
+#define PTP_DPC_SONY_FocusMagnifyDown			0xD2CE
+#define PTP_DPC_SONY_FocusMagnifyLeft			0xD2CF
+#define PTP_DPC_SONY_FocusMagnifyRight			0xD2D0
+/* D2DB (2) , D2D3 (2) , D2C8 (2) also seen in Camera Remote related to D2C2 */
+/* S1 ?
+ * AEL - d2c3
+ * FEL - d2c9
+ * AFL - d2c4
+ * AWBL - d2d9
+ */
 /* semi control opcodes */
 #define PTP_DPC_SONY_Movie				0xD2C8 /* ? */
 #define PTP_DPC_SONY_StillImage				0xD2C7 /* ? */
 
+#define PTP_DPC_SONY_NearFar				0xD2D1
+/*#define PTP_DPC_SONY_AutoFocus				0xD2D2 something related */
+
+#define PTP_DPC_SONY_AF_Area_Position			0xD2DC
+
+/* Sony QX properties */
+/* all for 96f8 Control Device */
+#define PTP_DPC_SONY_QX_Zoom_Absolute			0xD60E
+#define PTP_DPC_SONY_QX_Movie_Rec			0xD60F
+#define PTP_DPC_SONY_QX_Request_For_Update		0xD612
+#define PTP_DPC_SONY_QX_Zoom_Wide_For_One_Shot		0xD613
+#define PTP_DPC_SONY_QX_Zoom_Tele_For_One_Shot		0xD614
+#define PTP_DPC_SONY_QX_S2_Button 			0xD617
+#define PTP_DPC_SONY_QX_Media_Format 			0xD61C
+#define PTP_DPC_SONY_QX_S1_Button 			0xD61D
+#define PTP_DPC_SONY_QX_AE_Lock 			0xD61E
+#define PTP_DPC_SONY_QX_Request_For_Update_For_Lens 	0xD625
+#define PTP_DPC_SONY_QX_Power_Off			0xD637
+#define PTP_DPC_SONY_QX_RequestOneShooting		0xD638
+#define PTP_DPC_SONY_QX_AF_Lock				0xD63B
+#define PTP_DPC_SONY_QX_Zoom_Tele			0xD63C
+#define PTP_DPC_SONY_QX_Zoom_Wide			0xD63E
+#define PTP_DPC_SONY_QX_Focus_Magnification		0xD641
+#define PTP_DPC_SONY_QX_Focus_Near_For_One_Shot		0xD6A1
+#define PTP_DPC_SONY_QX_Focus_Far_For_One_Shot		0xD6A2
+#define PTP_DPC_SONY_QX_Focus_Near_For_Continuous	0xD6A3
+#define PTP_DPC_SONY_QX_Focus_Far_For_Continuous	0xD6A4
+#define PTP_DPC_SONY_QX_Camera_Setting_Reset		0xD6D9
+#define PTP_DPC_SONY_QX_Camera_Initialize		0xD6DA
+
+/* old */
+#define PTP_DPC_SONY_QX_Capture				0xD617
+#define PTP_DPC_SONY_QX_AutoFocus			0xD61D
+
+/* set via 96fa */
+#define PTP_DPC_SONY_QX_PictureProfileInitialize 	0xD620
+#define PTP_DPC_SONY_QX_PictureProfile 			0xD621
+#define PTP_DPC_SONY_QX_AFSPrioritySetting 		0xD622
+#define PTP_DPC_SONY_QX_AFCPrioritySetting 		0xD623
+#define PTP_DPC_SONY_QX_LensUpdateState 		0xD624
+#define PTP_DPC_SONY_QX_SilentShooting 			0xD626
+#define PTP_DPC_SONY_QX_HDMIInfoDisplay 		0xD627
+#define PTP_DPC_SONY_QX_TCUBDisp 			0xD628
+#define PTP_DPC_SONY_QX_TCPreset 			0xD629
+#define PTP_DPC_SONY_QX_TCMake 				0xD62A
+#define PTP_DPC_SONY_QX_TCRun 				0xD62B
+#define PTP_DPC_SONY_QX_UBPreset 			0xD62C
+#define PTP_DPC_SONY_QX_TCFormat 			0xD62D
+#define PTP_DPC_SONY_QX_LongExposureNR 			0xD62E
+#define PTP_DPC_SONY_QX_UBTimeRec 			0xD62F
+#define PTP_DPC_SONY_QX_FocusMagnificationLevel 	0xD6A7
+#define PTP_DPC_SONY_QX_FocusMagnificationPosition 	0xD6A8
+#define PTP_DPC_SONY_QX_LensStatus 			0xD6A9
+#define PTP_DPC_SONY_QX_LiveviewResolution 		0xD6AA
+#define PTP_DPC_SONY_QX_NotifyFocusPosition 		0xD6AF
+#define PTP_DPC_SONY_QX_DriveMode 			0xD6B0
+#define PTP_DPC_SONY_QX_DateTime 			0xD6B1
+#define PTP_DPC_SONY_QX_AspectRatio 			0xD6B3
+#define PTP_DPC_SONY_QX_ImageSize 			0xD6B7
+#define PTP_DPC_SONY_QX_WhiteBalance 			0xD6B8
+#define PTP_DPC_SONY_QX_CompressionSetting 		0xD6B9
+#define PTP_DPC_SONY_QX_CautionError 			0xD6BA
+#define PTP_DPC_SONY_QX_StorageInformation		0xD6BB
+#define PTP_DPC_SONY_QX_MovieQualitySetting 		0xD6BC
+#define PTP_DPC_SONY_QX_MovieFormatSetting 		0xD6BD
+#define PTP_DPC_SONY_QX_ZoomSetAbsolute 		0xD6BE
+#define PTP_DPC_SONY_QX_ZoomInformation 		0xD6BF
+#define PTP_DPC_SONY_QX_FocusSpeedForOneShot 		0xD6C1
+#define PTP_DPC_SONY_QX_FlashCompensation 		0xD6C2
+#define PTP_DPC_SONY_QX_ExposureCompensation 		0xD6C3
+#define PTP_DPC_SONY_QX_Aperture 			0xD6C5
+#define PTP_DPC_SONY_QX_ShootingFileInformation		0xD6C6
+#define PTP_DPC_SONY_QX_MediaFormatState		0xD6C7
+#define PTP_DPC_SONY_QX_ZoomMode 			0xD6C9
+#define PTP_DPC_SONY_QX_FlashMode 			0xD6CA
+#define PTP_DPC_SONY_QX_FocusMode 			0xD6CB
+#define PTP_DPC_SONY_QX_ExposureMode 			0xD6CC
+#define PTP_DPC_SONY_QX_MovieRecordingState 		0xD6CD
+#define PTP_DPC_SONY_QX_SelectSaveMedia 		0xD6CF
+#define PTP_DPC_SONY_QX_StillSteady 			0xD6D0
+#define PTP_DPC_SONY_QX_MovieSteady 			0xD6D1
+#define PTP_DPC_SONY_QX_Housing 			0xD6D2
+#define PTP_DPC_SONY_QX_K4OutputSetting 		0xD6D3
+#define PTP_DPC_SONY_QX_HDMIRECControl 			0xD6D4
+#define PTP_DPC_SONY_QX_TimeCodeOutputToHDMI 		0xD6D5
+#define PTP_DPC_SONY_QX_HDMIResolution 			0xD6D6
+#define PTP_DPC_SONY_QX_NTSC_PAL_Selector		0xD6D7
+#define PTP_DPC_SONY_QX_HDMIOutput 			0xD6D8
+#define PTP_DPC_SONY_QX_ISOAutoMinimum 			0xD6DB
+#define PTP_DPC_SONY_QX_ISOAutoMaximum 			0xD6DC
+#define PTP_DPC_SONY_QX_APSCSuper35mm 			0xD6DD
+#define PTP_DPC_SONY_QX_LiveviewStatus 			0xD6DE
+#define PTP_DPC_SONY_QX_WhiteBalanceInitialize 		0xD6DF
+#define PTP_DPC_SONY_QX_OperatingMode 			0xD6E2
+#define PTP_DPC_SONY_QX_BiaxialFineTuningABDirection	0xD6E3
+#define PTP_DPC_SONY_QX_HighISONr			0xD6E5
+#define PTP_DPC_SONY_QX_AELockIndication 		0xD6E8
+#define PTP_DPC_SONY_QX_ElectronicFrontCurtainShutter 	0xD6E9
+#define PTP_DPC_SONY_QX_ShutterSpeed 			0xD6EA
+#define PTP_DPC_SONY_QX_FocusIndication 		0xD6EC
+#define PTP_DPC_SONY_QX_BiaxialFineTuningGMDirection	0xD6EF
+#define PTP_DPC_SONY_QX_ColorTemperature		0xD6F0
+#define PTP_DPC_SONY_QX_BatteryLevelIndication		0xD6F1
+#define PTP_DPC_SONY_QX_ISO 				0xD6F2
+#define PTP_DPC_SONY_QX_AutoSlowShutter 		0xD6F3
+#define PTP_DPC_SONY_QX_DynamicRangeOptimizer 		0xD6FE
 
 
 /* Casio EX-F1 */
-#define PTP_DPC_CASIO_MONITOR		0xD001 
+#define PTP_DPC_CASIO_MONITOR		0xD001
 #define PTP_DPC_CASIO_STORAGE		0xD002 //Not reported by DeviceInfo?
 #define PTP_DPC_CASIO_UNKNOWN_1		0xD004
 #define PTP_DPC_CASIO_UNKNOWN_2		0xD005
@@ -2284,6 +3284,155 @@
 #define PTP_DPC_PARROT_MultisensorsIrradianceIntegrationTime	0xD218
 #define PTP_DPC_PARROT_OverlapRate				0xD219
 
+/* Panasonic does not have regular device properties, they use some 32bit values */
+#define PTP_DPC_PANASONIC_PhotoStyle			0x02000010
+#define PTP_DPC_PANASONIC_ISO				0x02000020
+#define PTP_DPC_PANASONIC_ISO_Param				0x02000021
+#define PTP_DPC_PANASONIC_ISO_UpperLimit			0x02000022
+#define PTP_DPC_PANASONIC_ShutterSpeed			0x02000030
+#define PTP_DPC_PANASONIC_ShutterSpeed_Param			0x02000031
+#define PTP_DPC_PANASONIC_ShutterSpeed_RangeLimit		0x02000032
+#define PTP_DPC_PANASONIC_Aperture			0x02000040
+#define PTP_DPC_PANASONIC_Aperture_Param			0x02000041
+#define PTP_DPC_PANASONIC_Aperture_RangeLimit			0x02000042
+#define PTP_DPC_PANASONIC_WhiteBalance			0x02000050
+#define PTP_DPC_PANASONIC_WhiteBalance_Param			0x02000051
+#define PTP_DPC_PANASONIC_WhiteBalance_KSet			0x02000052
+#define PTP_DPC_PANASONIC_WhiteBalance_ADJ_AB			0x02000053
+#define PTP_DPC_PANASONIC_WhiteBalance_ADJ_GM			0x02000054
+#define PTP_DPC_PANASONIC_WhiteBalance_ADJ_AB_Sep		0x02000055
+#define PTP_DPC_PANASONIC_Exposure			0x02000060
+#define PTP_DPC_PANASONIC_Exposure_Param			0x02000061
+#define PTP_DPC_PANASONIC_Exposure_RangeLimit			0x02000062
+#define PTP_DPC_PANASONIC_AFArea			0x02000070 /* AFCONFIG */
+#define PTP_DPC_PANASONIC_AFArea_AFModeParam			0x02000071 /* AFCONFIG */
+#define PTP_DPC_PANASONIC_AFArea_AFAreaParam			0x02000072 /* AFCONFIG */
+#define PTP_DPC_PANASONIC_AFArea_SetQuickAFParam		0x02000073 /* AFCONFIG */
+#define PTP_DPC_PANASONIC_CameraMode			0x02000080
+#define PTP_DPC_PANASONIC_CameraMode_DriveMode			0x02000081
+#define PTP_DPC_PANASONIC_CameraMode_ModePos			0x02000082
+#define PTP_DPC_PANASONIC_CameraMode_CreativeMode		0x02000083
+#define PTP_DPC_PANASONIC_CameraMode_iAMode			0x02000084
+#define PTP_DPC_PANASONIC_ImageFormat			0x020000A2
+#define PTP_DPC_PANASONIC_MeteringInfo			0x020000B0
+#define PTP_DPC_PANASONIC_IntervalInfo			0x020000C0
+#define PTP_DPC_PANASONIC_RecDispConfig			0x020000E0
+#define PTP_DPC_PANASONIC_RecInfoFlash			0x02000110
+#define PTP_DPC_PANASONIC_BurstBracket			0x02000140
+#define PTP_DPC_PANASONIC_RecPreviewConfig		0x02000170
+#define PTP_DPC_PANASONIC_RecInfoSelfTimer		0x020001A0
+#define PTP_DPC_PANASONIC_RecInfoFlash2			0x020001B0
+#define PTP_DPC_PANASONIC_RecCtrlRelease		0x03000010
+
+#define PTP_DPC_PANASONIC_RecCtrlAFAE			0x03000020 /* cmd base for afae */
+#define PTP_DPC_PANASONIC_RecCtrlAFAE_LockAE    		0x03000021
+#define PTP_DPC_PANASONIC_RecCtrlAFAE_LockAF    		0x03000022
+#define PTP_DPC_PANASONIC_RecCtrlAFAE_LockAFAE    		0x03000023
+#define PTP_DPC_PANASONIC_RecCtrlAFAE_AF_OneShot    		0x03000024
+#define PTP_DPC_PANASONIC_RecCtrlAFAE_Lock_Clear    		0x03000025
+
+#define PTP_DPC_PANASONIC_Zoom				0x03000080
+#define PTP_DPC_PANASONIC_RecCtrlLens			0x03010010
+#define PTP_DPC_PANASONIC_MovConfig			0x06000010	/* uses 9408 */
+#define PTP_DPC_PANASONIC_MovConfig_C_Movie_Mode		0x06000011	/* uses 9409 */
+#define PTP_DPC_PANASONIC_MovConfig_HDMI_Mode			0x06000012	/* uses 9409 */
+#define PTP_DPC_PANASONIC_MovConfig_Quality_Mode		0x06000013	/* uses 9409 */
+#define PTP_DPC_PANASONIC_MovConfig_Rec_Mode			0x06000014	/* uses 9409 */
+#define PTP_DPC_PANASONIC_08000010			0x08000010
+/* various modes of the camera, HDMI, GetDateTimeWorldTime Mode/Area, SetupCfgInfo, SetupConfig_DateTime, GetSystemFreq Mode, GetSetupConfig Info */
+/*
+0000  54 00 00 00 02 00 0a 94-04 00 00 00 11 00 00 08  T...............
+0010  0a 00 00 00 e2 07 07 00-10 00 11 00 09 00 12 00  ................
+0020  00 08 02 00 00 00 00 00-13 00 00 08 02 00 00 00  ................
+0030  00 00 14 00 00 08 04 00-00 00 00 00 00 00 15 00  ................
+0040  00 08 04 00 00 00 00 00-00 00 16 00 00 08 02 00  ................
+0050  00 00 01 00            -                         ....
+
+0000  d0 00 00 00 02 00 07 91-04 00 00 00 10 00 00 08  ................
+0010  14 00 00 00 14 00 00 00-01 00 01 00 00 00 00 00  ................
+0020  06 00 00 00 38 03 00 00-11 00 00 08 14 00 00 00  ....8...........
+0030  14 00 00 00 01 00 01 00-00 00 00 00 05 00 00 00  ................
+0040  c8 00 00 00 12 00 00 08-14 00 00 00 14 00 00 00  ................
+0050  01 00 01 00 00 00 00 00-01 00 00 00 36 00 00 00  ............6...
+0060  13 00 00 08 14 00 00 00-14 00 00 00 01 00 01 00  ................
+0070  00 00 00 00 01 00 00 00-2a 00 00 00 14 00 00 08  ........*.......
+0080  14 00 00 00 14 00 00 00-01 00 01 00 00 00 00 00  ................
+0090  02 00 00 00 9e 00 00 00-15 00 00 08 14 00 00 00  ................
+00a0  14 00 00 00 01 00 01 00-00 00 00 00 02 00 00 00  ................
+00b0  9e 00 00 00 16 00 00 08-14 00 00 00 14 00 00 00  ................
+00c0  01 00 01 00 00 00 00 00-01 00 00 00 2c 00 00 00  ............,...
+ */
+#define PTP_DPC_PANASONIC_08000091			0x08000091 /* SetupFilesConfig_Set_Target */
+/*
+0000  16 00 00 00 02 00 0a 94-04 00 00 00 91 00 00 08  ................
+0010  02 00 00 00 00 00      -                         ......
+
+0000  44 00 00 00 02 00 07 91-04 00 00 00 90 00 00 08  D...............
+0010  14 00 00 00 14 00 00 00-01 00 01 00 00 00 00 00  ................
+0020  01 00 00 00 48 00 00 00-91 00 00 08 14 00 00 00  ....H...........
+0030  14 00 00 00 01 00 01 00-00 00 00 00 01 00 00 00  ................
+0040  2c 00 00 00            -                         ,...
+ */
+
+#define PTP_DPC_PANASONIC_GetFreeSpaceInImages		0x12000010
+/*
+11 00 00 12
+04 00 00 00
+4e 00 00 00
+
+12 00 00 12
+04 00 00 00
+00 00 00 00
+
+13 00 00 12
+02 00 00 00
+00 00
+
+14 00 00 12
+04 00 00 00
+00 00 00 00
+
+15 00 00 12
+06 00 00 00
+02 00 01 00 00 00
+
+16 00 00 12
+3a 00 00 00
+02 00 4e 00 00 00 00 00 00 00 4e 00 00 00 ff ff
+ff ff 00 00 00 00 ff ff ff ff 00 00 00 00 00 00
+00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ff ff
+ff ff 00 00 00 00 00 00 00 00
+
+17 00 00 12
+06 00 00 00
+00 00 00 00 00 00
+ */
+#define PTP_DPC_PANASONIC_GetBatteryInfo		0x16000010
+/*
+0000  1c 00 00 00 02 00 14 94-04 00 00 00 11 00 00 16  ................
+0010  08 00 00 00 4b 00 00 00-4b 00 ff ff              ....K...K...
+ */
+#define PTP_DPC_PANASONIC_LensGetMFBar			0x12010040
+/* 15c00010 GetSetupInfo Error */
+/* 18000010 GetUSBSpeed */
+
+/* Leica */
+#define PTP_DPC_LEICA_ExternalShooting			0xD018
+/* d040 */
+/* d60c */
+/* d60e */
+/* d610 */
+
+
+/* Sigma FP */
+/* These are all gphoto2 local defines, so we can use our config framework */
+#define PTP_DPC_GP_SIGMA_FP_ShutterSpeed		0xD001
+#define PTP_DPC_GP_SIGMA_FP_Aperture			0xD002
+#define PTP_DPC_GP_SIGMA_FP_ISOAuto			0xD003
+#define PTP_DPC_GP_SIGMA_FP_ISOSpeed			0xD004
+#define PTP_DPC_GP_SIGMA_FP_ExpCompensation		0xD005
+#define PTP_DPC_GP_SIGMA_FP_BatteryState		0xD006
+
 
 /* MTP specific Object Properties */
 #define PTP_OPC_StorageID				0xDC01
@@ -2507,6 +3656,7 @@
 typedef uint16_t (* PTPIOGetData)	(PTPParams* params, PTPContainer* ptp,
 	                                 PTPDataHandler *putter);
 typedef uint16_t (* PTPIOCancelReq)	(PTPParams* params, uint32_t transaction_id);
+typedef uint16_t (* PTPIODevStatReq) (PTPParams* params);
 
 /* debug functions */
 typedef void (* PTPErrorFunc) (void *data, const char *format, va_list args)
@@ -2545,6 +3695,27 @@
 };
 typedef struct _PTPDeviceProperty PTPDeviceProperty;
 
+struct _MTPPropertyDesc {
+	uint16_t	opc;
+	PTPObjectPropDesc	opd;
+};
+typedef struct _MTPPropertyDesc MTPPropertyDesc;
+
+struct _MTPObjectFormat {
+	uint16_t	ofc;
+	unsigned int	nrofpds;
+	MTPPropertyDesc	*pds;
+};
+typedef struct _MTPObjectFormat MTPObjectFormat;
+
+struct _PanasonicLiveViewSize {
+	uint16_t	width;
+	uint16_t	height;
+	uint16_t	x;
+	uint16_t	freq;
+};
+typedef struct _PanasonicLiveViewSize PanasonicLiveViewSize;
+
 /* Transaction data phase description, internal flags to sendreq / transaction driver. */
 #define PTP_DP_NODATA           0x0000  /* no data phase */
 #define PTP_DP_SENDDATA         0x0001  /* sending data */
@@ -2568,6 +3739,7 @@
 	PTPIOGetResp	event_check_queue;
 	PTPIOGetResp	event_wait;
 	PTPIOCancelReq	cancelreq_func;
+	PTPIODevStatReq	devstatreq_func;
 
 	/* Custom error and debug function */
 	PTPErrorFunc	error_func;
@@ -2588,6 +3760,9 @@
 	int		split_header_data;
 	int		ocs64; /* 64bit objectsize */
 
+	int		nrofobjectformats;
+	MTPObjectFormat	*objectformats;
+
 	/* PTP: internal structures used by ptp driver */
 	PTPObject	*objects;
 	unsigned int	nrofobjects;
@@ -2596,7 +3771,10 @@
 
 	/* PTP: the current event queue */
 	PTPContainer	*events;
-	int		nrofevents;
+	unsigned int	nrofevents;
+
+	/* Capture count for SDRAM capture style images */
+	unsigned int		capcnt;
 
 	/* live view enabled */
 	int			inliveview;
@@ -2617,6 +3795,7 @@
 	unsigned int		nrofcanon_props;
 	int			canon_viewfinder_on;
 	int			canon_event_mode;
+	int			uilocked;
 
 	/* PTP: Canon EOS event queue */
 	PTPCanon_changes_entry	*backlogentries;
@@ -2629,13 +3808,16 @@
 	int			event90c7works;
 	int			deletesdramfails;
 
+	/* PTP: Sony specific */
+	struct timeval		starttime;
+
 	/* PTP: Wifi profiles */
 	uint8_t 	wifi_profiles_version;
 	uint8_t		wifi_profiles_number;
 	PTPNIKONWifiProfile *wifi_profiles;
 
 	/* IO: PTP/IP related data */
-	int		cmdfd, evtfd;
+	int		cmdfd, evtfd, jpgfd;
 	uint8_t		cameraguid16;
 	uint32_t	eventpipeid;
 	char		*cameraname;
@@ -2667,7 +3849,7 @@
 uint16_t ptp_usb_senddata	(PTPParams* params, PTPContainer* ptp,
 				 uint64_t size, PTPDataHandler *handler);
 uint16_t ptp_usb_getresp	(PTPParams* params, PTPContainer* resp);
-uint16_t ptp_usb_getdata	(PTPParams* params, PTPContainer* ptp, 
+uint16_t ptp_usb_getdata	(PTPParams* params, PTPContainer* ptp,
 	                         PTPDataHandler *handler);
 uint16_t ptp_usb_event_async	(PTPParams *params, PTPEventCbFn cb, void *user_data);
 uint16_t ptp_usb_event_wait	(PTPParams* params, PTPContainer* event);
@@ -2678,26 +3860,42 @@
 uint16_t ptp_usb_control_device_reset_request (PTPParams *params);
 uint16_t ptp_usb_control_get_device_status (PTPParams *params, char *buffer, int *size);
 uint16_t ptp_usb_control_cancel_request (PTPParams *params, uint32_t transid);
+uint16_t ptp_usb_control_device_status_request (PTPParams *params);
 
 
 int      ptp_ptpip_connect	(PTPParams* params, const char *port);
+int      ptp_ptpip_disconnect	(PTPParams* params);
 uint16_t ptp_ptpip_sendreq	(PTPParams* params, PTPContainer* req, int dataphase);
 uint16_t ptp_ptpip_senddata	(PTPParams* params, PTPContainer* ptp,
 				uint64_t size, PTPDataHandler *handler);
 uint16_t ptp_ptpip_getresp	(PTPParams* params, PTPContainer* resp);
-uint16_t ptp_ptpip_getdata	(PTPParams* params, PTPContainer* ptp, 
+uint16_t ptp_ptpip_getdata	(PTPParams* params, PTPContainer* ptp,
 	                         PTPDataHandler *handler);
 uint16_t ptp_ptpip_event_wait	(PTPParams* params, PTPContainer* event);
 uint16_t ptp_ptpip_event_check	(PTPParams* params, PTPContainer* event);
 uint16_t ptp_ptpip_event_check_queue	(PTPParams* params, PTPContainer* event);
 
+int      ptp_fujiptpip_connect	(PTPParams* params, const char *port);
+int      ptp_fujiptpip_init_event (PTPParams* params, const char *address);
+uint16_t ptp_fujiptpip_sendreq	(PTPParams* params, PTPContainer* req, int dataphase);
+uint16_t ptp_fujiptpip_senddata	(PTPParams* params, PTPContainer* ptp,
+				uint64_t size, PTPDataHandler *handler);
+uint16_t ptp_fujiptpip_getresp	(PTPParams* params, PTPContainer* resp);
+uint16_t ptp_fujiptpip_getdata	(PTPParams* params, PTPContainer* ptp,
+	                         PTPDataHandler *handler);
+uint16_t ptp_fujiptpip_event_wait	(PTPParams* params, PTPContainer* event);
+uint16_t ptp_fujiptpip_event_check	(PTPParams* params, PTPContainer* event);
+uint16_t ptp_fujiptpip_event_check_queue(PTPParams* params, PTPContainer* event);
+
+uint16_t ptp_fujiptpip_jpeg (PTPParams* params, unsigned char** xdata, unsigned int *xsize);
+
 uint16_t ptp_getdeviceinfo	(PTPParams* params, PTPDeviceInfo* deviceinfo);
 
 uint16_t ptp_generic_no_data	(PTPParams* params, uint16_t opcode, unsigned int cnt, ...);
 
 uint16_t ptp_opensession	(PTPParams *params, uint32_t session);
 
-uint16_t ptp_transaction_new (PTPParams* params, PTPContainer* ptp, 
+uint16_t ptp_transaction_new (PTPParams* params, PTPContainer* ptp,
                 uint16_t flags, uint64_t sendlen,
                 PTPDataHandler *handler
 );
@@ -2728,7 +3926,7 @@
 /**
  * ptp_resetdevice:
  * params:      PTPParams*
- *              
+ *
  * Uses the built-in function to reset the device
  *
  * Return values: Some PTP_RC_* code.
@@ -2795,7 +3993,7 @@
  * ptp_setobjectprotection:
  * params:      PTPParams*
  *              uint16_t newprot        - object protection flag
- *              
+ *
  * Set protection of object.
  *
  * Return values: Some PTP_RC_* code.
@@ -2811,7 +4009,7 @@
  * params:      PTPParams*
  *              storageid               - destination StorageID on Responder
  *              ofc                     - object format code
- * 
+ *
  * Causes device to initiate the capture of one or more new data objects
  * according to its current device properties, storing the data into store
  * indicated by storageid. If storageid is 0x00000000, the object(s) will
@@ -2838,14 +4036,19 @@
 uint16_t ptp_getfilesystemmanifest (PTPParams* params, uint32_t storage,
                         uint32_t objectformatcode, uint32_t associationOH,
         		uint64_t *numoifs, PTPObjectFilesystemInfo **oifs);
-
+uint16_t ptp_getstreaminfo (PTPParams *params, uint32_t streamid, PTPStreamInfo *si);
+uint16_t ptp_getstream (PTPParams* params, unsigned char **data, unsigned int *size);
 
 
 uint16_t ptp_check_event (PTPParams *params);
 uint16_t ptp_check_event_queue (PTPParams *params);
 uint16_t ptp_wait_event (PTPParams *params);
 uint16_t ptp_add_event (PTPParams *params, PTPContainer *evt);
+uint16_t ptp_add_events (PTPParams *params, PTPContainer *evt, unsigned int nrevents);
+uint16_t ptp_add_event_queue (PTPContainer **events, unsigned int *nrevents, PTPContainer *evt);
+int ptp_have_event(PTPParams *params, uint16_t code);
 int ptp_get_one_event (PTPParams *params, PTPContainer *evt);
+int ptp_get_one_event_by_type(PTPParams *params, uint16_t code, PTPContainer *event);
 uint16_t ptp_check_eos_events (PTPParams *params);
 int ptp_get_one_eos_event (PTPParams *params, PTPCanon_changes_entry *entry);
 
@@ -2853,12 +4056,14 @@
 /* Microsoft MTP extensions */
 uint16_t ptp_mtp_getobjectpropdesc (PTPParams* params, uint16_t opc, uint16_t ofc,
 				PTPObjectPropDesc *objectpropertydesc);
-uint16_t ptp_mtp_getobjectpropvalue (PTPParams* params, uint32_t oid, uint16_t opc, 
+uint16_t ptp_mtp_getobjectpropvalue (PTPParams* params, uint32_t oid, uint16_t opc,
 				PTPPropertyValue *value, uint16_t datatype);
 uint16_t ptp_mtp_setobjectpropvalue (PTPParams* params, uint32_t oid, uint16_t opc,
 				PTPPropertyValue *value, uint16_t datatype);
 uint16_t ptp_mtp_getobjectreferences (PTPParams* params, uint32_t handle, uint32_t** ohArray, uint32_t* arraylen);
 uint16_t ptp_mtp_setobjectreferences (PTPParams* params, uint32_t handle, uint32_t* ohArray, uint32_t arraylen);
+uint16_t ptp_mtp_getobjectproplist_generic (PTPParams* params, uint32_t handle, uint32_t formats, uint32_t properties, uint32_t propertygroups, uint32_t level, MTPProperties **props, int *nrofprops);
+uint16_t ptp_mtp_getobjectproplist_level (PTPParams* params, uint32_t handle, uint32_t level, MTPProperties **props, int *nrofprops);
 uint16_t ptp_mtp_getobjectproplist (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops);
 uint16_t ptp_mtp_getobjectproplist_single (PTPParams* params, uint32_t handle, MTPProperties **props, int *nrofprops);
 uint16_t ptp_mtp_sendobjectproplist (PTPParams* params, uint32_t* store, uint32_t* parenthandle, uint32_t* handle,
@@ -2899,7 +4104,7 @@
 /**
  * ptp_canon_startshootingmode:
  * params:      PTPParams*
- * 
+ *
  * Starts shooting session. It emits a StorageInfoChanged
  * event via the interrupt pipe and pushes the StorageInfoChanged
  * and CANON_CameraModeChange events onto the event stack
@@ -2912,9 +4117,9 @@
 /**
  * ptp_canon_endshootingmode:
  * params:      PTPParams*
- * 
- * This operation is observed after pressing the Disconnect 
- * button on the Remote Capture app. It emits a StorageInfoChanged 
+ *
+ * This operation is observed after pressing the Disconnect
+ * button on the Remote Capture app. It emits a StorageInfoChanged
  * event via the interrupt pipe and pushes the StorageInfoChanged
  * and CANON_CameraModeChange events onto the event stack
  * (see operation PTP_OC_CANON_CheckEvent).
@@ -2926,7 +4131,7 @@
 /**
  * ptp_canon_viewfinderon:
  * params:      PTPParams*
- * 
+ *
  * Prior to start reading viewfinder images, one  must call this operation.
  * Supposedly, this operation affects the value of the CANON_ViewfinderMode
  * property.
@@ -2938,7 +4143,7 @@
 /**
  * ptp_canon_viewfinderoff:
  * params:      PTPParams*
- * 
+ *
  * Before changing the shooting mode, or when one doesn't need to read
  * viewfinder images any more, one must call this operation.
  * Supposedly, this operation affects the value of the CANON_ViewfinderMode
@@ -2955,7 +4160,7 @@
  *                      1 - autoexposure
  *                      2 - autofocus
  *                      4 - autowhitebalance
- * 
+ *
  * Called "Reset AeAfAwb" (auto exposure, focus, white balance)
  *
  * Return values: Some PTP_RC_* code.
@@ -2964,14 +4169,14 @@
 #define PTP_CANON_RESET_AF	0x2
 #define PTP_CANON_RESET_AWB	0x4
 #define ptp_canon_reset_aeafawb(params,flags) ptp_generic_no_data(params,PTP_OC_CANON_DoAeAfAwb,1,flags)
-uint16_t ptp_canon_checkevent (PTPParams* params, 
+uint16_t ptp_canon_checkevent (PTPParams* params,
 				PTPContainer* event, int* isevent);
 /**
  * ptp_canon_focuslock:
  *
  * This operation locks the focus. It is followed by the CANON_GetChanges(?)
- * operation in the log. 
- * It affects the CANON_MacroMode property. 
+ * operation in the log.
+ * It affects the CANON_MacroMode property.
  *
  * params:      PTPParams*
  *
@@ -2983,9 +4188,9 @@
  * ptp_canon_focusunlock:
  *
  * This operation unlocks the focus. It is followed by the CANON_GetChanges(?)
- * operation in the log. 
+ * operation in the log.
  * It sets the CANON_MacroMode property value to 1 (where it occurs in the log).
- * 
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -2996,7 +4201,7 @@
  * ptp_canon_keepdeviceon:
  *
  * This operation sends a "ping" style message to the camera.
- * 
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3007,16 +4212,28 @@
  * ptp_canon_eos_keepdeviceon:
  *
  * This operation sends a "ping" style message to the camera.
- * 
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
  *
  **/
 #define ptp_canon_eos_keepdeviceon(params) ptp_generic_no_data(params,PTP_OC_CANON_EOS_KeepDeviceOn,0)
+
+/**
+ * ptp_canon_eos_popupflash:
+ *
+ * This operation pops up the builtin flash of the Canon EOS.
+ *
+ * params:      PTPParams*
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+#define ptp_canon_eos_popupflash(params) ptp_generic_no_data(params,PTP_OC_CANON_EOS_PopupBuiltinFlash,0)
 /**
  * ptp_canon_initiatecaptureinmemory:
- * 
+ *
  * This operation starts the image capture according to the current camera
  * settings. When the capture has happened, the camera emits a CaptureComplete
  * event via the interrupt pipe and pushes the CANON_RequestObjectTransfer,
@@ -3036,7 +4253,7 @@
  * ptp_canon_eos_requestdevicepropvalue:
  *
  * This operation sends a "ping" style message to the camera.
- * 
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3050,19 +4267,20 @@
 #define ptp_canon_eos_setrequestolcinfogroup(params,igmask)	ptp_generic_no_data(params,PTP_OC_CANON_EOS_SetRequestOLCInfoGroup,1,igmask)
 #define ptp_canon_eos_requestdevicepropvalue(params,prop)	ptp_generic_no_data(params,PTP_OC_CANON_EOS_RequestDevicePropValue,1,prop)
 #define ptp_canon_eos_setrequestrollingpitchinglevel(params,onoff)	ptp_generic_no_data(params,PTP_OC_CANON_EOS_SetRequestRollingPitchingLevel,1,onoff)
+uint16_t ptp_canon_eos_getremotemode (PTPParams*, uint32_t *);
 uint16_t ptp_canon_eos_capture (PTPParams* params, uint32_t *result);
 uint16_t ptp_canon_eos_getevent (PTPParams* params, PTPCanon_changes_entry **entries, int *nrofentries);
-uint16_t ptp_canon_getpartialobject (PTPParams* params, uint32_t handle, 
+uint16_t ptp_canon_getpartialobject (PTPParams* params, uint32_t handle,
 				uint32_t offset, uint32_t size,
-				uint32_t pos, unsigned char** block, 
+				uint32_t pos, unsigned char** block,
 				uint32_t* readnum);
 uint16_t ptp_canon_getviewfinderimage (PTPParams* params, unsigned char** image,
 				uint32_t* size);
 uint16_t ptp_canon_getchanges (PTPParams* params, uint16_t** props,
-				uint32_t* propnum); 
+				uint32_t* propnum);
 uint16_t ptp_canon_getobjectinfo (PTPParams* params, uint32_t store,
 				uint32_t p2, uint32_t parenthandle,
-				uint32_t handle, 
+				uint32_t handle,
 				PTPCANONFolderEntry** entries,
 				uint32_t* entnum);
 uint16_t ptp_canon_eos_getdeviceinfo (PTPParams* params, PTPCanonEOSDeviceInfo*di);
@@ -3070,7 +4288,7 @@
  * ptp_canon_eos_setuilock:
  *
  * This command sets UI lock
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3081,7 +4299,7 @@
  * ptp_canon_eos_resetuilock:
  *
  * This command sets UI lock
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3092,7 +4310,7 @@
  * ptp_canon_eos_start_viewfinder:
  *
  * This command starts Viewfinder mode of newer Canon DSLRs.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3103,7 +4321,7 @@
  * ptp_canon_eos_end_viewfinder:
  *
  * This command ends Viewfinder mode of newer Canon DSLRs.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3141,7 +4359,7 @@
 #define ptp_canon_eos_seteventmode(params,p1) ptp_generic_no_data(params,PTP_OC_CANON_EOS_SetEventMode,1,p1)
 /**
  * ptp_canon_eos_transfercomplete:
- * 
+ *
  * This ends a direct object transfer from an EOS camera.
  *
  * params:      PTPParams*
@@ -3155,33 +4373,45 @@
 #define ptp_canon_eos_pchddcapacity(params,p1,p2,p3) ptp_generic_no_data(params,PTP_OC_CANON_EOS_PCHDDCapacity,3,p1,p2,p3)
 uint16_t ptp_canon_eos_bulbstart (PTPParams* params);
 uint16_t ptp_canon_eos_bulbend (PTPParams* params);
+uint16_t ptp_canon_eos_905f (PTPParams* params, uint32_t);
 uint16_t ptp_canon_eos_getdevicepropdesc (PTPParams* params, uint16_t propcode,
 				PTPDevicePropDesc *devicepropertydesc);
 uint16_t ptp_canon_eos_setdevicepropvalue (PTPParams* params, uint16_t propcode,
                         	PTPPropertyValue* value, uint16_t datatype);
 uint16_t ptp_nikon_get_vendorpropcodes (PTPParams* params, uint16_t **props, unsigned int *size);
-uint16_t ptp_nikon_curve_download (PTPParams* params, 
+uint16_t ptp_nikon_curve_download (PTPParams* params,
 				unsigned char **data, unsigned int *size);
+uint16_t ptp_nikon_getlargethumb (PTPParams *params, uint32_t handle,
+				unsigned char** object, unsigned int *len);
+uint16_t ptp_nikon_getobjectsize (PTPParams* params, uint32_t handle, uint64_t *objectsize);
+uint16_t ptp_nikon_getpartialobjectex (PTPParams* params, uint32_t handle, uint64_t offset, uint64_t maxbytes, unsigned char** object, uint32_t *len);
 uint16_t ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size);
 uint16_t ptp_nikon_getwifiprofilelist (PTPParams* params);
 uint16_t ptp_nikon_writewifiprofile (PTPParams* params, PTPNIKONWifiProfile* profile);
 
 uint16_t ptp_sony_sdioconnect (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3);
+uint16_t ptp_sony_qx_connect (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3);
 uint16_t ptp_sony_get_vendorpropcodes (PTPParams* params, uint16_t **props, unsigned int *size);
+uint16_t ptp_sony_qx_get_vendorpropcodes (PTPParams* params, uint16_t **props, unsigned int *size);
 uint16_t ptp_sony_getdevicepropdesc (PTPParams* params, uint16_t propcode,
 				PTPDevicePropDesc *devicepropertydesc);
 uint16_t ptp_sony_getalldevicepropdesc (PTPParams* params);
+uint16_t ptp_sony_qx_getalldevicepropdesc (PTPParams* params);
 uint16_t ptp_sony_setdevicecontrolvaluea (PTPParams* params, uint16_t propcode,
                         	PTPPropertyValue* value, uint16_t datatype);
+uint16_t ptp_sony_qx_setdevicecontrolvaluea (PTPParams* params, uint16_t propcode,
+                        	PTPPropertyValue* value, uint16_t datatype);
 uint16_t ptp_sony_setdevicecontrolvalueb (PTPParams* params, uint16_t propcode,
                         	PTPPropertyValue* value, uint16_t datatype);
+uint16_t ptp_sony_qx_setdevicecontrolvalueb (PTPParams* params, uint16_t propcode,
+                        	PTPPropertyValue* value, uint16_t datatype);
 uint16_t ptp_sony_9280 (PTPParams* params, uint32_t additional, uint32_t data1, uint32_t data2, uint32_t data3, uint32_t data4, uint8_t x, uint8_t y);
 uint16_t ptp_sony_9281 (PTPParams* params, uint32_t param1);
 /**
  * ptp_nikon_deletewifiprofile:
  *
  * This command deletes a wifi profile.
- *  
+ *
  * params:      PTPParams*
  *      unsigned int profilenr  - profile number
  *
@@ -3190,25 +4420,37 @@
  **/
 #define ptp_nikon_deletewifiprofile(params,profilenr) ptp_generic_no_data(params,PTP_OC_NIKON_DeleteProfile,1,profilenr)
 /**
- * ptp_nikon_setcontrolmode:
+ * ptp_nikon_changecameramode:
  *
  * This command can switch the camera to full PC control mode.
- *  
+ *
  * params:      PTPParams*
  *      uint32_t mode - mode
  *
  * Return values: Some PTP_RC_* code.
  *
  **/
-#define ptp_nikon_setcontrolmode(params,mode) ptp_generic_no_data(params,PTP_OC_NIKON_SetControlMode,1,mode)
+#define ptp_nikon_changecameramode(params,mode) ptp_generic_no_data(params,PTP_OC_NIKON_ChangeCameraMode,1,mode)
+/**
+ * ptp_nikon_changeapplicationmeramode:
+ *
+ * This command can switch the camera between PC control and remote mode.
+ *
+ * params:      PTPParams*
+ *      uint32_t mode - mode
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+#define ptp_nikon_changeapplicationmode(params,mode) ptp_generic_no_data(params,PTP_OC_NIKON_ChangeApplicationMode,1,mode)
 /**
  * ptp_nikon_terminatecapture:
  *
  * This command appears to terminate a longer capture
- *  
+ *
  * params:      PTPParams*
- *      uint32_t a 
- *      uint32_t b 
+ *      uint32_t a
+ *      uint32_t b
  *
  * Return values: Some PTP_RC_* code.
  *
@@ -3218,7 +4460,7 @@
  * ptp_nikon_afdrive:
  *
  * This command runs (drives) the lens autofocus.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3229,7 +4471,7 @@
  * ptp_nikon_changeafarea:
  *
  * This command starts movie capture (to card)
- *  
+ *
  * params:      PTPParams*
  * x: x coordinate
  * y: y coordinate
@@ -3242,7 +4484,7 @@
  * ptp_nikon_startmovie:
  *
  * This command starts movie capture (to card)
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3253,7 +4495,7 @@
  * ptp_nikon_stopmovie:
  *
  * This command stops movie capture (to card)
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3264,7 +4506,7 @@
  * ptp_canon_eos_afdrive:
  *
  * This command runs (drives) the lens autofocus.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3275,7 +4517,7 @@
  * ptp_canon_eos_afcancel:
  *
  * This command cancels the lens autofocus.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3286,7 +4528,7 @@
  * ptp_canon_eos_zoom:
  *
  * This command runs (drives) the lens autofocus.
- *  
+ *
  * params:      PTPParams*
  * params:      arg1 unknown
  *
@@ -3302,7 +4544,7 @@
  * ptp_nikon_mfdrive:
  *
  * This command runs (drives) the lens focus manually.
- *  
+ *
  * params:      PTPParams*
  * flag:        0x1 for (no limit - closest), 0x2 for (closest - no limit)
  * amount:      amount of steps
@@ -3316,7 +4558,7 @@
  * ptp_canon_eos_drivelens:
  *
  * This command runs (drives) the lens focus manually.
- *  
+ *
  * params:      PTPParams*
  * amount:      0x1-0x3 for near range, 0x8001-0x8003 for far range.
  *
@@ -3328,20 +4570,20 @@
  * ptp_nikon_capture:
  *
  * This command captures a picture on the Nikon.
- *  
+ *
  * params:      PTPParams*
  *      uint32_t x: unknown parameter. seen to be -1.
  *
  * Return values: Some PTP_RC_* code.
  *
  **/
-#define ptp_nikon_capture(params,x) ptp_generic_no_data(params,PTP_OC_NIKON_Capture,1,x)
+#define ptp_nikon_capture(params,x) ptp_generic_no_data(params,PTP_OC_NIKON_InitiateCaptureRecInSdram,1,x)
 
 /**
  * ptp_nikon_capture2:
  *
  * This command captures a picture on the Nikon.
- *  
+ *
  * params:      PTPParams*
  * af: 		autofocus before capture (1 yes , 0 no)
  * target:	sdram 1, card 0
@@ -3356,7 +4598,7 @@
  * ptp_nikon_capture_sdram:
  *
  * This command captures a picture on the Nikon.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3367,7 +4609,7 @@
  * ptp_nikon_delete_sdram_image:
  *
  * This command deletes the current SDRAM image
- *  
+ *
  * params:      PTPParams*
  * uint32_t	oid
  *
@@ -3379,7 +4621,7 @@
  * ptp_nikon_start_liveview:
  *
  * This command starts LiveView mode of newer Nikons DSLRs.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3392,7 +4634,7 @@
  * ptp_nikon_end_liveview:
  *
  * This command ends LiveView mode of newer Nikons DSLRs.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3400,6 +4642,7 @@
  **/
 #define ptp_nikon_end_liveview(params) ptp_generic_no_data(params,PTP_OC_NIKON_EndLiveView,0)
 uint16_t ptp_nikon_check_event (PTPParams* params, PTPContainer **evt, unsigned int *evtcnt);
+uint16_t ptp_nikon_check_eventex (PTPParams* params, PTPContainer **evt, unsigned int *evtcnt);
 uint16_t ptp_nikon_getfileinfoinblock (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3,
 					unsigned char **data, unsigned int *size);
 /**
@@ -3407,7 +4650,7 @@
  *
  * This command checks if the device is ready. Used after
  * a capture.
- *  
+ *
  * params:      PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -3433,11 +4676,32 @@
 #define ptp_olympus_capture(params,p1) ptp_generic_no_data (params, PTP_OC_OLYMPUS_Capture, 1, p1)
 uint16_t ptp_olympus_getcameraid (PTPParams*, unsigned char**, unsigned int *);
 
+uint16_t ptp_olympus_omd_capture (PTPParams* params);
+uint16_t ptp_olympus_omd_move_focus (PTPParams* params, uint32_t direction, uint32_t step_size);
+
+/* Internal function for SONY */
+static inline int
+has_sony_mode_300(PTPParams *params) {
+	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_SONY) return 0;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7SM3")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7RM4")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7RM4A")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7C")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-9M2")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-1")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7M4")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ILCE-7RM5")) return 1;
+	if (!strcmp(params->deviceinfo.Model, "ZV-E1")) return 1;
+	// TODO add other mode 300 camera models
+	return 0;
+}
+
+
 /* Non PTP protocol functions */
 static inline int
 ptp_operation_issupported(PTPParams* params, uint16_t operation)
 {
-	unsigned int i=0;
+	uint32_t i=0;
 
 	for (;i<params->deviceinfo.OperationsSupported_len;i++) {
 		if (params->deviceinfo.OperationsSupportedi==operation)
@@ -3494,7 +4758,7 @@
 	long bitmap_buffer_width;
 	long bitmap_width;
 	long bitmap_height;
-	unsigned palette16; 
+	unsigned palette16;
 } ptp_chdk_videosettings;
 
 /* Nafraf: Test this!!!*/
@@ -3551,11 +4815,84 @@
 /*uint16_t ptp_chdk_get_video_settings(PTPParams* params, ptp_chdk_videosettings* vsettings);*/
 
 uint16_t ptp_fuji_getevents (PTPParams* params, uint16_t** events, uint16_t* count);
+uint16_t ptp_fuji_getdeviceinfo (PTPParams* params, uint16_t **props, unsigned int *numprops);
 
-
+#define ptp_panasonic_liveview(params,enable) ptp_generic_no_data(params,PTP_OC_PANASONIC_Liveview,1,enable?0xD000010:0xD000011)
+uint16_t ptp_panasonic_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size);
+#define ptp_panasonic_movierec(params,enable) ptp_generic_no_data(params,PTP_OC_PANASONIC_MovieRecControl,1,enable?0x07000011:0x07000012)
+
+uint16_t ptp_panasonic_setdeviceproperty (PTPParams* params, uint32_t propcode, unsigned char *value, uint16_t valuesize);
+uint16_t ptp_panasonic_getdeviceproperty (PTPParams *params, uint32_t propcode, uint16_t *valuesize, uint32_t *currentValue);
+uint16_t ptp_panasonic_getrecordingstatus (PTPParams *params, uint32_t propcode, uint16_t *valuesize, uint32_t *currentValue);
+uint16_t ptp_panasonic_getdevicepropertydesc (PTPParams *params, uint32_t propcode, uint16_t valuesize, uint32_t *currentValue, uint32_t **propertyValueList, uint32_t *propertyValueListLength);
+uint16_t ptp_panasonic_getdevicepropertysize (PTPParams *params, uint32_t propcode);
+uint16_t ptp_panasonic_getcapturetarget (PTPParams *params, uint16_t *target);
+uint16_t ptp_panasonic_setcapturetarget (PTPParams *params, uint16_t target);
+uint16_t ptp_panasonic_manualfocusdrive (PTPParams* params, uint16_t mode);
+uint16_t ptp_panasonic_recordmode (PTPParams* params, uint16_t mode);
+uint16_t ptp_panasonic_startrecording (PTPParams* params);
+uint16_t ptp_panasonic_stoprecording (PTPParams* params);
+uint16_t ptp_panasonic_9401 (PTPParams* params, uint32_t x);
+
+uint16_t ptp_panasonic_9414_0d800012 (PTPParams* params, PanasonicLiveViewSize **liveviewsizes, unsigned int *nrofliveviewsizes);
+uint16_t ptp_panasonic_9414_0d800011 (PTPParams* params, PanasonicLiveViewSize *liveviewsize);
+uint16_t ptp_panasonic_9415 (PTPParams* params, PanasonicLiveViewSize *liveviewsize);
+
+uint16_t ptp_sigma_fp_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_9035 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getcamcansetinfo5 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup1 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup2 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup3 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup4 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup5 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getdatagroup6 (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getcamdatagroupfocus (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_getcamdatagroupmovie (PTPParams* params, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_setdatagroup1 (PTPParams* params, unsigned char *data, unsigned int size);
+uint16_t ptp_sigma_fp_getbigpartialpictfile (PTPParams* params, uint32_t p1, uint32_t offset, uint32_t insize, unsigned char **data, unsigned int *size);
+uint16_t ptp_sigma_fp_snap (PTPParams* params, uint32_t mode, uint32_t amount);
+uint16_t ptp_sigma_fp_clearimagedbsingle (PTPParams* params, uint32_t id);
+typedef struct _SIGMAFP_CaptureStatus {
+	uint8_t		imageid;
+	uint8_t		imagedbhead;
+	uint8_t		imagedbtail;
+	uint16_t	status;
+	uint8_t		destination;
+} SIGMAFP_CaptureStatus;
+uint16_t ptp_sigma_fp_getcapturestatus (PTPParams* params, uint32_t p1, SIGMAFP_CaptureStatus *status);
+uint16_t ptp_sigma_fp_getcamstatus2 (PTPParams* params, uint32_t canset, uint32_t datagroup, uint32_t other, unsigned char **data, unsigned int *size);
+
+typedef struct _SIGMAFP_PictFileInfo2Ex {
+	uint16_t	pictureformat;
+	char		fileext4;
+	uint16_t	width;
+	uint16_t	height;
+	char		path128;
+	char		name128;
+	uint32_t	filesize;
+	uint32_t	fileaddress;
+} SIGMAFP_PictFileInfo2Ex;
+uint16_t ptp_sigma_fp_getpictfileinfo2 (PTPParams* params, SIGMAFP_PictFileInfo2Ex*);
+
+uint16_t ptp_olympus_liveview_image (PTPParams* params, unsigned char **data, unsigned int *size);
+#define ptp_olympus_omd_move_focus(params,direction,step_size) ptp_generic_no_data(params,PTP_OC_OLYMPUS_OMD_MFDrive,2,direction,step_size)
+uint16_t ptp_olympus_omd_capture (PTPParams* params);
+uint16_t ptp_olympus_omd_bulbstart (PTPParams* params);
+uint16_t ptp_olympus_omd_bulbend (PTPParams* params);
+uint16_t ptp_olympus_init_pc_mode (PTPParams* params);
+uint16_t ptp_olympus_sdram_image (PTPParams* params, unsigned char **data, unsigned int *size);
+
+
+
+#define ptp_panasonic_capture(params) ptp_generic_no_data(params,PTP_OC_PANASONIC_InitiateCapture,1,0x3000011)
+
+#define ptp_leica_leopensession(params,session) ptp_generic_no_data(params,PTP_OC_LEICA_LEOpenSession,1,session)
+#define ptp_leica_leclosesession(params) ptp_generic_no_data(params,PTP_OC_LEICA_LECloseSession,0)
+uint16_t ptp_leica_getstreamdata (PTPParams* params, unsigned char **data, unsigned int *size);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PTP_H__ */
+#endif /* !defined(CAMLIBS_PTP2_PTP_H) */

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptpip-private.h Added

@@ -0,0 +1,59 @@
+/* ptpip-private.h
+ *
+ * Copyright (C) 2020 Daniel Schulte <trilader@schroedingers-bit.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef CAMLIBS_PTP2_PTPIP_PRIVATE_H
+#define CAMLIBS_PTP2_PTPIP_PRIVATE_H
+
+/* Definitions for PTP/IP to work with WinSock and regular BSD-style sockets */
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# define PTPSOCK_SOCKTYPE SOCKET
+# define PTPSOCK_INVALID INVALID_SOCKET
+# define PTPSOCK_CLOSE closesocket
+# define PTPSOCK_ERR SOCKET_ERROR
+# define PTPSOCK_READ(fd, buf, size) recv((fd), ((char*)(buf)), (size), 0)
+# define PTPSOCK_WRITE(fd, buf, size) send((fd), ((char*)(buf)), (size), 0)
+# define PTPSOCK_PROTO IPPROTO_TCP
+#else
+# include <sys/socket.h>
+# define PTPSOCK_SOCKTYPE int
+# define PTPSOCK_INVALID -1
+# define PTPSOCK_CLOSE close
+# define PTPSOCK_ERR -1
+# define PTPSOCK_READ(fd, buf, size) read((fd), (buf), (size))
+# define PTPSOCK_WRITE(fd, buf, size) write((fd), (buf), (size))
+# define PTPSOCK_PROTO 0
+#endif
+
+#include <sys/types.h> /* for ssize_t, size_t */
+
+#define PTPIP_DEFAULT_TIMEOUT_S 2
+#define PTPIP_DEFAULT_TIMEOUT_MS 500
+
+int ptpip_connect_with_timeout(int fd, const struct sockaddr *address, socklen_t address_len, int seconds, int milliseconds);
+ssize_t ptpip_read_with_timeout(int fd, void *buf, size_t nbytes, int seconds, int milliseconds);
+ssize_t ptpip_write_with_timeout(int fd, void *buf, size_t nbytes, int seconds, int milliseconds);
+int ptpip_set_nonblock(int fd);
+void ptpip_perror(const char *what);
+int ptpip_get_socket_error(void);
+void ptpip_set_socket_error(int err);
+
+#endif /* !defined(CAMLIBS_PTP2_PTPIP_PRIVATE_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/ptpip.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/ptpip.c Changed

@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -20,7 +20,7 @@
 /*
  * This is working, but unfinished!
  * - Event handling not finished.
- * - Some configure checking magic missing for the special header files 
+ * - Some configure checking magic missing for the special header files
  *   and functions.
  * - Not everything implementation correctly cross checked.
  * - Coolpix P3 does not give transfer status (image 000x/000y), and reports an
@@ -29,6 +29,7 @@
  * Nikon WU-1* adapters might use 0011223344556677 as GUID always...
  */
 #define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
 #include "config.h"
 
 #include <stdlib.h>
@@ -41,42 +42,29 @@
 #include <sys/select.h>
 #endif
 
+#include "ptpip-private.h"
+
 #ifdef WIN32
-# include <winsock.h>
+# include <winsock2.h>
+# include <ws2tcpip.h>
 #else
 # include <sys/socket.h>
 # include <netinet/in.h>
+# include <fcntl.h>
 #endif
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-setting.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "ptp.h"
 #include "ptp-private.h"
 
 #define PTPIP_VERSION_MAJOR 0x0001
 #define PTPIP_VERSION_MINOR 0x0000
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
 #include "ptp.h"
 #include "ptp-bugs.h"
 
@@ -132,20 +120,24 @@
 	htod32a(&requestptpip_cmd_transid,req->Transaction_ID);
 
 	switch (req->Nparam) {
-	case 5: htod32a(&requestptpip_cmd_param5,req->Param5);
-	case 4: htod32a(&requestptpip_cmd_param4,req->Param4);
-	case 3: htod32a(&requestptpip_cmd_param3,req->Param3);
-	case 2: htod32a(&requestptpip_cmd_param2,req->Param2);
-	case 1: htod32a(&requestptpip_cmd_param1,req->Param1);
+	case 5: htod32a(&requestptpip_cmd_param5,req->Param5);/* fallthrough */
+	case 4: htod32a(&requestptpip_cmd_param4,req->Param4);/* fallthrough */
+	case 3: htod32a(&requestptpip_cmd_param3,req->Param3);/* fallthrough */
+	case 2: htod32a(&requestptpip_cmd_param2,req->Param2);/* fallthrough */
+	case 1: htod32a(&requestptpip_cmd_param1,req->Param1);/* fallthrough */
 	case 0:
 	default:
 		break;
 	}
 	GP_LOG_DATA ( (char*)request, len, "ptpip/oprequest data:");
-	ret = write (params->cmdfd, request, len);
+	ret = ptpip_write_with_timeout(params->cmdfd, request, len, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
 	free (request);
-	if (ret == -1)
-		perror ("sendreq/write to cmdfd");
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror ("sendreq/write to cmdfd");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
+	}
 	if (ret != len) {
 		GP_LOG_E ("ptp_ptpip_sendreq() len =%d but ret=%d", len, ret);
 		return PTP_RC_OK;
@@ -160,10 +152,12 @@
 
 	xhdr = (unsigned char*)hdr; curread = 0; len = sizeof (PTPIPHeader);
 	while (curread < len) {
-		ret = read (fd, xhdr + curread, len - curread);
-		if (ret == -1) {
-			perror ("read PTPIPHeader");
-			return PTP_RC_GeneralError;
+		ret = ptpip_read_with_timeout (fd, xhdr + curread, len - curread, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+		if (ret == PTPSOCK_ERR) {
+			ptpip_perror ("read PTPIPHeader");
+			if (ptpip_get_socket_error() == ETIMEDOUT)
+				return PTP_ERROR_TIMEOUT;
+			return PTP_ERROR_IO;
 		}
 		GP_LOG_DATA ((char*)xhdr+curread, ret, "ptpip/generic_read header:");
 		curread += ret;
@@ -184,11 +178,13 @@
 	}
 	curread = 0;
 	while (curread < len) {
-		ret = read (fd, (*data)+curread, len-curread);
-		if (ret == -1) {
-			GP_LOG_E ("error %d in reading PTPIP data", errno);
+		ret = ptpip_read_with_timeout (fd, (*data)+curread, len-curread, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+		if (ret == PTPSOCK_ERR) {
+			GP_LOG_E ("error %d in reading PTPIP data", ptpip_get_socket_error());
 			free (*data);*data = NULL;
-			return PTP_RC_GeneralError;
+			if (ptpip_get_socket_error() == ETIMEDOUT)
+				return PTP_ERROR_TIMEOUT;
+			return PTP_ERROR_IO;
 		} else {
 			GP_LOG_DATA ((char*)((*data)+curread), ret, "ptpip/generic_read data:");
 		}
@@ -252,9 +248,13 @@
 	htod32a(&requestptpip_startdata_totallen + 8,size);
 	htod32a(&requestptpip_startdata_unknown  + 8,0);
 	GP_LOG_DATA ((char*)request, sizeof(request), "ptpip/senddata header:");
-	ret = write (params->cmdfd, request, sizeof(request));
-	if (ret == -1)
-		perror ("sendreq/write to cmdfd");
+	ret = ptpip_write_with_timeout (params->cmdfd, request, sizeof(request), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror ("sendreq/write to cmdfd");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
+	}
 	if (ret != sizeof(request)) {
 		GP_LOG_E ("ptp_ptpip_senddata() len=%d but ret=%d", (int)sizeof(request), ret);
 		return PTP_RC_GeneralError;
@@ -276,7 +276,7 @@
 		}
 		ret = handler->getfunc (params, handler->priv, towrite, &xdataptpip_data_payload+8, &xtowrite);
 		if (ret == -1) {
-			perror ("getfunc in senddata failed");
+			ptpip_perror ("getfunc in senddata failed");
 			free (xdata);
 			return PTP_RC_GeneralError;
 		}
@@ -287,11 +287,13 @@
 		GP_LOG_DATA ((char*)xdata, towrite2, "ptpip/senddata data:");
 		written = 0;
 		while (written < towrite2) {
-			ret = write (params->cmdfd, xdata+written, towrite2-written);
-			if (ret == -1) {
-				perror ("write in senddata failed");
+			ret = ptpip_write_with_timeout (params->cmdfd, xdata+written, towrite2-written, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+			if (ret == PTPSOCK_ERR) {
+				ptpip_perror ("write in senddata failed");
 				free (xdata);
-				return PTP_RC_GeneralError;
+				if (ptpip_get_socket_error() == ETIMEDOUT)
+					return PTP_ERROR_TIMEOUT;
+				return PTP_ERROR_IO;
 			}
 			written += ret;
 		}
@@ -398,22 +400,22 @@
 
 	switch (dtoh32(hdr.type)) {
 	case PTPIP_END_DATA_PACKET:
-		GP_LOG_D("PTPIP_END_DATA_PACKET");
 		resp->Transaction_ID	= dtoh32a(&data0);
+		GP_LOG_D("PTPIP_END_DATA_PACKET (tid = 0x%08x)", resp->Transaction_ID);
 		free (data);
 		data = NULL;
 		goto retry;
 	case PTPIP_CMD_RESPONSE:
-		GP_LOG_D("PTPIP_CMD_RESPONSE");
 		resp->Code		= dtoh16a(&dataptpip_resp_code);
 		resp->Transaction_ID	= dtoh32a(&dataptpip_resp_transid);
+		GP_LOG_D("PTPIP_CMD_RESPONSE (result=0x%04x, tid=0x%08x)", resp->Code, resp->Transaction_ID);
 		n = (dtoh32(hdr.length) - sizeof(hdr) - ptpip_resp_param1)/sizeof(uint32_t);
 		switch (n) {
-		case 5: resp->Param5 = dtoh32a(&dataptpip_resp_param5);
-		case 4: resp->Param4 = dtoh32a(&dataptpip_resp_param4);
-		case 3: resp->Param3 = dtoh32a(&dataptpip_resp_param3);
-		case 2: resp->Param2 = dtoh32a(&dataptpip_resp_param2);
-		case 1: resp->Param1 = dtoh32a(&dataptpip_resp_param1);
+		case 5: resp->Param5 = dtoh32a(&dataptpip_resp_param5);/* fallthrough */
+		case 4: resp->Param4 = dtoh32a(&dataptpip_resp_param4);/* fallthrough */
+		case 3: resp->Param3 = dtoh32a(&dataptpip_resp_param3);/* fallthrough */
+		case 2: resp->Param2 = dtoh32a(&dataptpip_resp_param2);/* fallthrough */
+		case 1: resp->Param1 = dtoh32a(&dataptpip_resp_param1);/* fallthrough */
 		case 0: break;
 		default:
 			GP_LOG_E ("response got %d parameters?", n);
@@ -439,13 +441,15 @@
 	unsigned int	i;
 	int 		len, ret;
 	unsigned char	guid16;
-	
+
 	ptp_nikon_getptpipguid(guid);
 #if !defined (WIN32)
 	if (gethostname (hostname, sizeof(hostname)))
 		return PTP_RC_GeneralError;
 #else
-	strcpy (hostname, "gpwindows");
+	DWORD hostname_size = (DWORD)sizeof(hostname);
+	if (!GetComputerNameA(hostname, &hostname_size))
+		return PTP_RC_GeneralError;
 #endif
 	len = ptpip_initcmd_name + (strlen(hostname)+1)*2 + 4;
 
@@ -463,13 +467,15 @@
 	htod16a(&cmdrequestptpip_initcmd_name+(strlen(hostname)+1)*2+2,PTPIP_VERSION_MAJOR);
 
 	GP_LOG_DATA ((char*)cmdrequest, len, "ptpip/init_cmd data:");
-	ret = write (params->cmdfd, cmdrequest, len);
+	ret = ptpip_write_with_timeout (params->cmdfd, cmdrequest, len, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
 	free (cmdrequest);
-	if (ret == -1) {
-		perror("write init cmd request");
-		return PTP_RC_GeneralError;
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror("write init cmd request");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
 	}
-	GP_LOG_E ("return %d / len %d", ret, len);
+	GP_LOG_D ("return %d / len %d", ret, len);
 	if (ret != len) {
 		GP_LOG_E ("return %d vs len %d", ret, len);
 		return PTP_RC_GeneralError;
@@ -504,7 +510,7 @@
 	memcpy (params->cameraguid, &dataptpip_cmdack_guid, 16);
 	name = (unsigned short*)&dataptpip_cmdack_name;
 	for (i=0;namei;i++) /* EMPTY */;
-	params->cameraname = malloc((i+1)*sizeof(uint16_t));
+	params->cameraname = calloc((i+1),sizeof(uint16_t));
 	for (i=0;namei;i++)
 		params->cameranamei = namei;
 	free (data);
@@ -524,10 +530,12 @@
 	htod32a(&evtrequestptpip_eventinit_idx,params->eventpipeid);
 
 	GP_LOG_DATA ((char*)evtrequest, ptpip_eventinit_size, "ptpip/init_event data:");
-	ret = write (params->evtfd, evtrequest, ptpip_eventinit_size);
-	if (ret == -1) {
-		perror("write init evt request");
-		return PTP_RC_GeneralError;
+	ret = ptpip_write_with_timeout (params->evtfd, evtrequest, ptpip_eventinit_size, PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS);
+	if (ret == PTPSOCK_ERR) {
+		ptpip_perror("write init evt request");
+		if (ptpip_get_socket_error() == ETIMEDOUT)
+			return PTP_ERROR_TIMEOUT;
+		return PTP_ERROR_IO;
 	}
 	if (ret != ptpip_eventinit_size) {
 		GP_LOG_E ("unexpected retsize %d, expected %d", ret, ptpip_eventinit_size);
@@ -568,7 +576,6 @@
 static uint16_t
 ptp_ptpip_event (PTPParams* params, PTPContainer* event, int wait)
 {
-#ifndef WIN32
 	fd_set		infds;
 	struct timeval	timeout;
 	int ret;
@@ -588,7 +595,9 @@
 		ret = select (params->evtfd+1, &infds, NULL, NULL, &timeout);
 		if (1 != ret) {
 			if (-1 == ret) {
-				GP_LOG_D ("select returned error, errno is %d", errno);
+				GP_LOG_D ("select returned error, errno is %d", ptpip_get_socket_error());
+				if (ptpip_get_socket_error() == ETIMEDOUT)
+					return PTP_ERROR_TIMEOUT;
 				return PTP_ERROR_IO;
 			}
 			return PTP_ERROR_TIMEOUT;
@@ -613,9 +622,9 @@
 	event->Transaction_ID	= dtoh32a(&dataptpip_event_transid);
 	n = (dtoh32(hdr.length) - sizeof(hdr) - ptpip_event_param1)/sizeof(uint32_t);
 	switch (n) {
-	case 3: event->Param3 = dtoh32a(&dataptpip_event_param3);
-	case 2: event->Param2 = dtoh32a(&dataptpip_event_param2);
-	case 1: event->Param1 = dtoh32a(&dataptpip_event_param1);
+	case 3: event->Param3 = dtoh32a(&dataptpip_event_param3);/* fallthrough */
+	case 2: event->Param2 = dtoh32a(&dataptpip_event_param2);/* fallthrough */
+	case 1: event->Param1 = dtoh32a(&dataptpip_event_param1);/* fallthrough */
 	case 0: break;
 	default:
 		GP_LOG_E ("response got %d parameters?", n);
@@ -623,10 +632,6 @@
 	}
 	free (data);
 	return PTP_RC_OK;
-#else
-	GP_LOG_E ("not supported currently on Windows");
-	return PTP_RC_OK;
-#endif
 }
 
 uint16_t
@@ -650,7 +655,7 @@
  *
  * This command gets the GUID of this machine. If it does not exists, it creates
  * one.
- *  
+ *
  * params:	PTPParams*
  *
  * Return values: Some PTP_RC_* code.
@@ -664,9 +669,9 @@
 	int valid;
 	char* endptr;
 	char* pos;
-	
+
 	gp_setting_get("ptp2_ip","guid",buffer);
-	
+
 	if (strlen(buffer) == 47) { /* 47 = 16*2 (numbers) + 15 (semi-colons) */
 		pos = buffer;
 		valid = 1;
@@ -687,9 +692,9 @@
 		if (valid)
 			return;
 	}
-	
+
 	/*fprintf(stderr, "Invalid GUID\n");*/
-	
+
 	/* Generate an ID */
 	srand(time(NULL));
 	buffer0 = 0;
@@ -699,9 +704,9 @@
 		pos += sprintf(pos, "%02x:", guidi);
 	}
 	buffer47 = 0;
-	
+
 	/*printf("New GUID: %s\n", buffer);*/
-	
+
 	gp_setting_set("ptp2_ip","guid",buffer);
 }
 
@@ -717,7 +722,6 @@
 	if (NULL == strchr (address,':'))
 		return GP_ERROR_BAD_PARAMETERS;
 
-#ifdef HAVE_INET_ATON
 	addr = strdup (address);
 	if (!addr)
 		return GP_ERROR_NO_MEMORY;
@@ -747,7 +751,11 @@
 			}
 		}
 	}
+#ifdef HAVE_INET_ATON
 	if (!inet_aton (s+1,  &saddr.sin_addr)) {
+#else
+	if (inet_pton(AF_INET, s+1, &saddr.sin_addr) != 1) {
+#endif
 		fprintf(stderr,"failed to scan for addr in %s\n", s+1);
 		free (addr);
 		return GP_ERROR_BAD_PARAMETERS;
@@ -755,49 +763,65 @@
 	saddr.sin_port		= htons(port);
 	saddr.sin_family	= AF_INET;
 	free (addr);
-	params->cmdfd = socket (PF_INET, SOCK_STREAM, 0);
-	if (params->cmdfd == -1) {
-		perror ("socket cmd");
+	PTPSOCK_SOCKTYPE cmdfd = params->cmdfd = socket (PF_INET, SOCK_STREAM, PTPSOCK_PROTO);
+	if (cmdfd == PTPSOCK_INVALID) {
+		ptpip_perror ("socket cmd");
 		return GP_ERROR_BAD_PARAMETERS;
 	}
-	params->evtfd = socket (PF_INET, SOCK_STREAM, 0);
-	if (params->evtfd == -1) {
-		perror ("socket evt");
-		close (params->cmdfd);
+	if (ptpip_set_nonblock(cmdfd) == -1) {
+		ptpip_perror("cmdfd set nonblocking");
+		PTPSOCK_CLOSE (params->cmdfd);
+		return GP_ERROR_IO;
+	}
+	PTPSOCK_SOCKTYPE evtfd = params->evtfd = socket (PF_INET, SOCK_STREAM, PTPSOCK_PROTO);
+	if (evtfd == PTPSOCK_INVALID) {
+		ptpip_perror ("socket evt");
+		PTPSOCK_CLOSE (params->cmdfd);
 		return GP_ERROR_BAD_PARAMETERS;
 	}
-	if (-1 == connect (params->cmdfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in))) {
-		perror ("connect cmd");
-		close (params->cmdfd);
-		close (params->evtfd);
+	if (ptpip_set_nonblock(evtfd) == -1) {
+		ptpip_perror("evtfd set nonblocking");
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
+		return GP_ERROR_IO;
+	}
+	if (ptpip_connect_with_timeout (params->cmdfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS) == -1) {
+		ptpip_perror("connect cmd");
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
 		return GP_ERROR_IO;
 	}
 	ret = ptp_ptpip_init_command_request (params);
 	if (ret != PTP_RC_OK) {
-		close (params->cmdfd);
-		close (params->evtfd);
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
 		return translate_ptp_result (ret);
 	}
 	ret = ptp_ptpip_init_command_ack (params);
 	if (ret != PTP_RC_OK) {
-		close (params->cmdfd);
-		close (params->evtfd);
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
 		return translate_ptp_result (ret);
 	}
 	/* seen on Ricoh Theta, camera is not immediately ready. try again two times. */
 	tries = 2;
 	saddr.sin_port		= htons(eventport);
 	do {
-		if (-1 != connect (params->evtfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in)))
+		if (PTPSOCK_ERR != ptpip_connect_with_timeout (params->evtfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_in), PTPIP_DEFAULT_TIMEOUT_S, PTPIP_DEFAULT_TIMEOUT_MS))
 			break;
-		if ((errno == ECONNREFUSED) && (tries--)) {
+		if ((ptpip_get_socket_error() == ECONNREFUSED) && (tries--)) {
 			GP_LOG_D ("event connect failed, retrying after short wait");
-			usleep(100*1000);
+			int sleep_ms = 100;
+#ifdef WIN32
+			Sleep(sleep_ms);
+#else
+			usleep(sleep_ms*1000);
+#endif
 			continue;
 		}
 		GP_LOG_E ("could not connect event");
-		close (params->cmdfd);
-		close (params->evtfd);
+		PTPSOCK_CLOSE (params->cmdfd);
+		PTPSOCK_CLOSE (params->evtfd);
 		return GP_ERROR_IO;
 	} while (1);
 	ret = ptp_ptpip_init_event_request (params);
@@ -808,8 +832,166 @@
 		return translate_ptp_result (ret);
 	GP_LOG_D ("ptpip connected!");
 	return GP_OK;
+}
+
+int
+ptp_ptpip_disconnect (PTPParams* params) {
+	if (params->cmdfd != PTPSOCK_INVALID) {
+		PTPSOCK_CLOSE (params->cmdfd);
+		params->cmdfd = PTPSOCK_INVALID;
+	}
+	if (params->evtfd != PTPSOCK_INVALID) {
+		PTPSOCK_CLOSE (params->evtfd);
+		params->evtfd = PTPSOCK_INVALID;
+	}
+	if (params->jpgfd != PTPSOCK_INVALID) {
+		PTPSOCK_CLOSE (params->jpgfd);
+		params->jpgfd = PTPSOCK_INVALID;
+	}
+	GP_LOG_D ("ptpip disconnected!");
+	return GP_OK;
+}
+
+int
+ptpip_connect_with_timeout (int fd, const struct sockaddr *address, socklen_t address_len, int seconds, int milliseconds) {
+	int res = 0;
+	struct timeval tv;
+	socklen_t errsz = sizeof(res);
+	fd_set fds;
+
+	if ((res = connect(fd, address, address_len)) == -1) {
+		if (ptpip_get_socket_error() == EINPROGRESS) { // connection is not ready yet
+			tv.tv_sec = seconds;
+			tv.tv_usec = milliseconds * 1000;
+			FD_ZERO(&fds);
+			FD_SET(fd, &fds);
+			res = select(fd+1, NULL, &fds, NULL, &tv);
+			if (res == -1) { // Select failed
+				ptpip_perror ("select");
+				return -1;
+			} else if (res == 0) { // Timeout
+				ptpip_set_socket_error (ETIMEDOUT);
+				return -1;
+			} else { // Socket is marked as writable, connect is okay, query actual error status
+				if(getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&res, &errsz) == -1) {
+					ptpip_perror("getsockopt");
+					return -1;
+				} else if(res != 0) { // Socket has an error
+					ptpip_set_socket_error (res);
+					return -1;
+				} else { // Connect successful
+					return res;
+				}
+			}
+		} else { // connect failed with error.
+			return -1;
+		}
+	}
+	return res;
+}
+
+ssize_t
+ptpip_read_with_timeout (int fd, void *buf, size_t nbytes, int seconds, int milliseconds) {
+	ssize_t res;
+	struct timeval tv;
+	fd_set fds;
+
+	res = PTPSOCK_READ(fd, buf, nbytes);
+	if (res == -1 && (ptpip_get_socket_error() == EAGAIN || ptpip_get_socket_error() == EWOULDBLOCK)) {
+		tv.tv_sec = seconds;
+		tv.tv_usec = milliseconds * 1000;
+		FD_ZERO(&fds);
+		FD_SET(fd, &fds);
+		res = select(fd+1, &fds, NULL, NULL, &tv);
+		if (res == -1) { // Select failed
+			ptpip_perror ("select");
+			return -1;
+		} else if (res == 0) { // Timeout
+			ptpip_set_socket_error (ETIMEDOUT);
+			return -1;
+		} else { // Socket is marked as readable, do the read now
+			return PTPSOCK_READ(fd, buf, nbytes);
+		}
+	} else {
+		return res;
+	}
+}
+
+ssize_t
+ptpip_write_with_timeout (int fd, void *buf, size_t nbytes, int seconds, int milliseconds) {
+	ssize_t res;
+	struct timeval tv;
+	fd_set fds;
+
+	res = PTPSOCK_WRITE(fd, buf, nbytes);
+	if (res == -1 && (ptpip_get_socket_error() == EAGAIN || ptpip_get_socket_error() == EWOULDBLOCK)) {
+		tv.tv_sec = seconds;
+		tv.tv_usec = milliseconds * 1000;
+		FD_ZERO(&fds);
+		FD_SET(fd, &fds);
+		res = select(fd+1, NULL, &fds, NULL, &tv);
+		if (res == -1) { // Select failed
+			ptpip_perror ("select");
+			return -1;
+		} else if (res == 0) { // Timeout
+			ptpip_set_socket_error (ETIMEDOUT);
+			return -1;
+		} else { // Socket is marked as writable, do the write now
+			return PTPSOCK_WRITE(fd, buf, nbytes);
+		}
+	} else {
+		return res;
+	}
+}
+
+int
+ptpip_set_nonblock (int fd) {
+#ifdef WIN32
+	u_long mode = 0;
+	if (ioctlsocket (fd, FIONBIO, &mode) == SOCKET_ERROR) {
+		return -1;
+	}
 #else
-	GP_LOG_E ("Windows currently not supported, neeeds a winsock port.");
-	return GP_ERROR_NOT_SUPPORTED;
+	int flags = fcntl(fd, F_GETFL);
+	if (flags < 0) {
+		return -1;
+	}
+	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+		return -1;
+	}
+#endif
+	return 0;
+}
+
+void
+ptpip_perror (const char *what) {
+#ifdef WIN32
+	wchar_t *s = NULL;
+	FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		NULL, WSAGetLastError(),
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
+		(LPWSTR)&s, 0, NULL);
+	fprintf(stderr, "%s: %S\n", what, s);
+	fflush(stderr);
+	LocalFree(s);
+#else
+	perror(what);
+#endif
+}
+
+int
+ptpip_get_socket_error (void) {
+#ifdef WIN32
+	return WSAGetLastError();
+#else
+	return errno;
+#endif
+}
+
+void
+ptpip_set_socket_error (int err) {
+#ifdef WIN32
+	WSASetLastError(err);
 #endif
+	errno = err;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ptp2/usb.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ptp2/usb.c Changed

@@ -125,7 +125,8 @@
 		  uint64_t size, PTPDataHandler *handler
 ) {
 	uint16_t ret = PTP_RC_OK;
-	int res, wlen, datawlen;
+	int res, wlen;
+	unsigned long datawlen;
 	PTPUSBBulkContainer usbdata;
 	unsigned long bytes_left_to_transfer, written;
 	Camera *camera = ((PTPData *)params->data)->camera;
@@ -238,10 +239,10 @@
 	}
 retry:
 	/* A packet should come in a single read always. */
-	result = gp_port_read (camera->port, (char*)packet, sizeof(*packet));
+	result = gp_port_read (camera->port, (char*)packet, maxsize);
 	/* This might be a left over zero-write of the device at the end of the previous transmission */
 	if (result == 0)
-		result = gp_port_read (camera->port, (char*)packet, sizeof(*packet));
+		result = gp_port_read (camera->port, (char*)packet, maxsize);
 	if (result > 0) {
 		*rlen = result;
 		return PTP_RC_OK;
@@ -318,7 +319,39 @@
 		} else {
 			GP_LOG_E ("Read broken PTP header (Code is %04x vs %04x).",
 				  dtoh16(usbdata.code), ptp->Code );
+
 			ret = PTP_ERROR_IO;
+
+			/* if this is a valid packet that came late, drain it to allow reestablishing */
+
+			if (bytes_read >= dtoh32(usbdata.length))
+				goto exit;
+
+			bytes_to_read = dtoh32(usbdata.length) - bytes_read;
+			bytes_read -= PTP_USB_BULK_HDR_LEN;
+
+			data = malloc(READLEN);
+			if (!data) goto exit;
+			while (bytes_to_read > 0) {
+				unsigned long chunk_to_read = bytes_to_read;
+
+				/* if in read-until-short-packet mode, read one packet at a time */
+				/* else read in large blobs */
+				/* else read all but the last short packet depending on EP packetsize. */
+				if (chunk_to_read > READLEN)
+					chunk_to_read = READLEN;
+				else if (chunk_to_read > params->maxpacketsize)
+					chunk_to_read = chunk_to_read - (chunk_to_read % params->maxpacketsize);
+				res = gp_port_read (camera->port, (char*)data, chunk_to_read);
+				if (res == GP_ERROR_IO_READ)
+					break;
+				if (res <= 0)
+					break;
+				bytes_to_read -= res;
+				bytes_read += res;
+			}
+			free (data);
+			data = NULL;
 			goto exit;
 		}
 	}
@@ -417,7 +450,7 @@
 			ret = translate_gp_result_to_ptp(res);
 			break;
 		} else
-			do_retry = FALSE; /* once we have succesfully read any data, don't try again */
+			do_retry = FALSE; /* once we have successfully read any data, don't try again */
 		ret = handler->putfunc (params, handler->priv, res, data);
 		if (ret != PTP_RC_OK)
 			break;
@@ -431,8 +464,9 @@
 		if (report_progress && ((bytes_read-res)/CONTEXT_BLOCK_SIZE < bytes_read/CONTEXT_BLOCK_SIZE))
 			gp_context_progress_update (context, progress_id, bytes_read/CONTEXT_BLOCK_SIZE);
 		/* Only cancel transfers larger than 1MB. as
-		 * canceling did not work on eos_get_viewfinder of 200kb */
-		if ((bytes_read > 1024*1024) && gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
+		 * canceling did not work on eos_get_viewfinder of 200kb
+		 * NOTE: >= to match the BLOBSIZE read */
+		if ((bytes_read >= 1024*1024) && gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
 			ret = PTP_ERROR_CANCEL;
 			break;
 		}
@@ -614,11 +648,13 @@
 
 uint16_t
 ptp_usb_control_get_extended_event_data (PTPParams *params, char *buffer, int *size) {
-	Camera	*camera = ((PTPData *)params->data)->camera;
-	int	ret;
+	Camera		*camera = ((PTPData *)params->data)->camera;
+	int		ret;
+	GPPortSettings	settings;
 
 	GP_LOG_D ("Getting extended event data.");
-	ret = gp_port_usb_msg_class_read (camera->port, 0x65, 0x0000, 0x0000, buffer, *size);
+	gp_port_get_settings (camera->port, &settings);
+	ret = gp_port_usb_msg_class_read (camera->port, 0x65, 0x0000, settings.usb.interface, buffer, *size);
 	if (ret < GP_OK)
 		return PTP_ERROR_IO;
 	*size = ret;
@@ -627,11 +663,13 @@
 
 uint16_t
 ptp_usb_control_device_reset_request (PTPParams *params) {
-	Camera	*camera = ((PTPData *)params->data)->camera;
-	int	ret;
+	Camera		*camera = ((PTPData *)params->data)->camera;
+	int		ret;
+	GPPortSettings	settings;
 
 	GP_LOG_D ("Sending usb device reset request.");
-	ret = gp_port_usb_msg_class_write (camera->port, 0x66, 0x0000, 0x0000, NULL, 0);
+	gp_port_get_settings (camera->port, &settings);
+	ret = gp_port_usb_msg_class_write (camera->port, 0x66, 0x0000, settings.usb.interface, NULL, 0);
 	if (ret < GP_OK)
 		return PTP_ERROR_IO;
 	return PTP_RC_OK;
@@ -639,10 +677,13 @@
 
 uint16_t
 ptp_usb_control_get_device_status (PTPParams *params, char *buffer, int *size) {
-	Camera	*camera = ((PTPData *)params->data)->camera;
-	int	ret;
+	Camera		*camera = ((PTPData *)params->data)->camera;
+	int		ret;
+	GPPortSettings	settings;
 
-	ret = gp_port_usb_msg_class_read (camera->port, 0x67, 0x0000, 0x0000, buffer, *size);
+	GP_LOG_D ("Getting usb device status.");
+	gp_port_get_settings (camera->port, &settings);
+	ret = gp_port_usb_msg_class_read (camera->port, 0x67, 0x0000, settings.usb.interface, buffer, *size);
 	if (ret < GP_OK)
 		return PTP_ERROR_IO;
 	*size = ret;
@@ -651,13 +692,17 @@
 
 uint16_t
 ptp_usb_control_cancel_request (PTPParams *params, uint32_t transactionid) {
-	Camera	*camera = ((PTPData *)params->data)->camera;
-	int	ret;
+	Camera		*camera = ((PTPData *)params->data)->camera;
+	int		ret;
 	unsigned char	buffer6;
+	GPPortSettings	settings;
+
+	GP_LOG_D ("Sending cancel request.");
+	gp_port_get_settings (camera->port, &settings);
 
 	htod16a(&buffer0,PTP_EC_CancelTransaction);
 	htod32a(&buffer2,transactionid);
-	ret = gp_port_usb_msg_class_write (camera->port, 0x64, 0x0000, 0x0000, (char*)buffer, sizeof (buffer));
+	ret = gp_port_usb_msg_class_write (camera->port, 0x64, 0x0000, settings.usb.interface, (char*)buffer, sizeof (buffer));
 	if (ret < GP_OK)
 		return PTP_ERROR_IO;
 	return PTP_RC_OK;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/ChangeLog Changed

@@ -19,7 +19,7 @@
 2005-07-11  Marcus Meissner  <marcus@jet.franken.de>
 	
 	* g3.c: Added Ricoh R2 as reported.
-		Added some casts to supress warnings.
+		Added some casts to suppress warnings.
 
 2005-03-21  Marcus Meissner  <marcus@jet.franken.de>
 	
@@ -92,91 +92,91 @@
 		put file is possibly working too, but confuses the firmware 
 		and this driver a bit.
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
-2002-07-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c:
 	* ricoh.c,h: Implement upload.
 
-2002-07-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c: Simplify by using macros.
 
-2002-07-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Martin Fischer <martin.fischer@inka.de>:
 
 	* ricoh.c (ricoh_set_date): Fix.
 
-2002-07-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: The camera needs to be in record mode to set settings.
 
-2002-07-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch from Martin Fischer <martin.fischer@inka.de>:
 
 	* ricoh.c: Bug Fixes.
 
-2002-07-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Initialize some variables to NULL.
 
-2002-07-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c: Remove 3 direct calls to ricoh_send and ricoh_recv.
 
-2002-07-10  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-10  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (camera_set_config): Fix bug (again).
 
-2002-07-10  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-10  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (camera_set_config): Fix bug.
 
-2002-07-10  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-10  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Martin Fischer <martin.fischer@inka.de>:
 
 	* ricoh.c (ricoh_get_pic_date): Corrected.
 	* library.c (get_info_func): Implemented.
 
-2002-07-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h:
 	* library.c: More settings.
 
-2002-07-02  LUtz Müller <lutz@users.sourceforge.net>
+2002-07-02  LUtz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h:
 	* library.c: Exposure setting.
 
-2002-07-02  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-02  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Martin Fischer <martin.fischer@inka.de>:
 
 	* ricoh.c:
 	* library.c: Some bug fixes.
 
-2002-06-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h:
 	* library.c: More settings.
 
-2002-06-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h
 	* library.c: First step towards support of settings.
 
-2002-06-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.h:
 	* library.c: Support a couple of other models.
 
-2002-06-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Lots of infos from Martin Fischer <martin.fischer@inka.de>:
 
@@ -185,43 +185,43 @@
 	  ricoh_bye. Fix typo in ricoh_get_pic_name. Remember the model
 	  that we get on ricoh_connect.
 
-2002-06-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c: Flesh out ricoh_get_pic_date.
 
-2002-06-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c: Simplify code by introducing ricoh_transmit. As a side 
 	  effect, this should improve error recovery, too.
 
 2002-06-18  Martin Fischer <martin.fischer@inka.de>
 
-	Patch adapted by Lutz Müller <lutz@users.sourceforge.net>.
+	Patch adapted by Lutz MÃ¼ller <lutz@users.sourceforge.net>.
 
 	* ricoh.c,h
 	* library.c: The driver supports GP_FILE_OPERATION_PREVIEW. 
 	  Support for Philips ESP80 was added. camera_about was added.
 	
-2002-03-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h
 	* library.c: This driver supports GP_FILE_OPERATION_DELETE and
 	  GP_OPERATION_CAPTURE_IMAGE. Support for
 	  configuration is still missing. Awaiting patches...
 
-2002-03-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h
 	* library.c: Remove CameraPrivateLibrary. Sure, that introduces 
 	  some communication overhead, but the code is cleaner this way.
 
-2002-03-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Submitted by <cliff@vixen.snipe444.org>. I fixed indentation.
 
 	* ricoh.c,h
 	* library.c: Make the driver functional.
 
-2002-01-31  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-31  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* ricoh.c,h: More functions ported.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/Makefile-files Changed

@@ -1,19 +1,30 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += ricoh/g3.txt ricoh/ChangeLog
+EXTRA_DIST               += %reldir%/ChangeLog
+EXTRA_DIST               += %reldir%/g3.txt
 
 
-EXTRA_LTLIBRARIES += ricoh.la
+EXTRA_LTLIBRARIES        += ricoh.la
 
-ricoh_la_SOURCES = ricoh/library.c ricoh/ricoh.c ricoh/ricoh.h ricoh/crctab.h
-ricoh_la_LDFLAGS = $(camlib_ldflags)
-ricoh_la_DEPENDENCIES = $(camlib_dependencies)
-ricoh_la_LIBADD = $(camlib_libadd)
+ricoh_la_SOURCES          =
+ricoh_la_SOURCES         += %reldir%/library.c
+ricoh_la_SOURCES         += %reldir%/ricoh.c
+ricoh_la_SOURCES         += %reldir%/ricoh.h
+ricoh_la_SOURCES         += %reldir%/crctab.h
 
+ricoh_la_CFLAGS           = $(camlib_cflags)
+ricoh_la_CPPFLAGS         = $(camlib_cppflags)
+ricoh_la_DEPENDENCIES     = $(camlib_dependencies)
+ricoh_la_LDFLAGS          = $(camlib_ldflags)
+ricoh_la_LIBADD           = $(camlib_libadd)
 
-EXTRA_LTLIBRARIES += ricoh_g3.la
 
-ricoh_g3_la_SOURCES = ricoh/g3.c
-ricoh_g3_la_LDFLAGS = $(camlib_ldflags)
-ricoh_g3_la_DEPENDENCIES = $(camlib_dependencies)
-ricoh_g3_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES        += ricoh_g3.la
+
+ricoh_g3_la_SOURCES       = %reldir%/g3.c
+
+ricoh_g3_la_CFLAGS        = $(camlib_cflags)
+ricoh_g3_la_CPPFLAGS      = $(camlib_cppflags)
+ricoh_g3_la_DEPENDENCIES  = $(camlib_dependencies)
+ricoh_g3_la_LDFLAGS       = $(camlib_ldflags)
+ricoh_g3_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/crctab.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/crctab.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/g3.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/g3.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/ricoh.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/ricoh.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/ricoh/ricoh.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/ricoh/ricoh.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/samsung/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/samsung/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/samsung/samsung.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/samsung/samsung.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/ChangeLog Changed

@@ -222,7 +222,7 @@
 	
 	* *.c: enabled more translations, added some missing _().
 
-2003-01-14  Lutz Müller <lutz@users.sourceforge.net>
+2003-01-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: Split the model string into manufacturer and model.
 
@@ -273,7 +273,7 @@
 	  Move the timeout increase before the capture, and increase the
 	  timeout to 20 seconds.
 
-2002-11-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-11-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: The 2100UZ seems to use oly3040_cam_desc (reported by
 	  C.A. Marby <marby@lhasa.harvard.edu>)
@@ -292,28 +292,28 @@
 	* library.c: rename ifdef around recursive call problem, and 
 	  change ifdef-ed out code to use gp_context_progress_start.
 
-2002-10-20  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-20  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (camera_init): Don't call sierra_init if the camera is
 	  a 'Polaroid PDC 2300Z'. Reported by William Bader
 	  <williambader@hotmail.com>.
 
-2002-10-03  Lutz Müller <lutz@users.sourceforge.net>
+2002-10-03  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: -I$(top_builddir)/libgphoto2
 
-2002-09-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Don't tell the camera to switch to a speed it is 
 	  currently operating at.
 
-2002-09-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c
 	* sierra.c: Make the check for the precence of a memory card
 	  non-fatal.
 
-2002-09-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-09-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_check_connection): Fix.
 
@@ -359,7 +359,7 @@
 	* library.c: Check for memory card before capture or listing.
 	* sierra-desc.c: add extern round() rather than a complete hack.
 
-2002-07-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Thomas Reitelbach <tr@erdfunkstelle.de>:
 
@@ -383,7 +383,7 @@
 
 	* sierra.c: Use SIERRA_MODEL_CAM_DESC for some olympus models.
 
-2002-06-28  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-28  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Selmeczi David <david@esr.elte.hu>:
 
@@ -391,7 +391,7 @@
 	* nikon-desc.c: Prepare for translation.
 	* sierra.c: Use the new configuration dialog for more camera models.
 
-2002-06-28  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-28  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.h:
 	* library.c,h:
@@ -405,11 +405,11 @@
 	* sierra-desc.h: Reference to olympus-desc.c
 	* sierra.c: Use new configuration dialog for the 3040Z.
 
-2002-06-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra-usbwrap.c: I missed one < GP_OK.
 
-2002-06-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Selmeczi David <david@esr.elte.hu> fixed the error checks. I added
 	the CR macro and fixed the headers.
@@ -417,7 +417,7 @@
 	* sierra-usbwrap.h: Fix header.
 	* sierra-usbwrap.c: Check for gp_* < GP_OK instead of != GP_OK.
 
-2002-06-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Selmeczi David <david@esr.elte.hu> is working on supporting
 	his camera. This is a first step to get his camera working:
@@ -430,79 +430,79 @@
 	  Add camera description table for camera configuration settings.
 	  Add support for nikon coolpix 880 using the description table.
 
-2002-05-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Handle the error where the camera sends strange bytes.
 
-2002-05-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_check_connection, sierra_set_speed):
 	  These functions are only applicable for serial connections.
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: If we receive SIERRA_PACKET_SESSION_END, reestablish
 	  the connection and switch to the default speed.
 	  
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (camera_init): It seems the code I '#if 0'ed out is needed
 	  by USB cameras...
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: '#if 0' some code that I don't think is needed at all.
 	* library.c (sierra_init): Logs show that sierra_init does not
 	  start a new session (i.e. no 0x53 instead of 0x43 needed).
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_set_speed): A speed change automatically 
 	  starts a new session.
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: The first packet after initialization (sierra_init)
 	  needs a special flag.
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (camera_init): Check if the computer supports high speeds
 	  (i.e. 115200).
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_check_connection): GP_ERROR_IO_READ is fine, too.
 
-2002-05-24  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-24  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Imitate the behavior of the Windows driver and
 	  check before each sierra_write_packet if the connection is
 	  still open (sierra_check_connection), i.e. if the camera
 	  has sent SIERRA_PACKET_SESSION_END.
 
-2002-05-24  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-24  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c
 	* sierra.c: Move the check if a speed change is really needed into
 	  sierra_set_speed.
 
-2002-05-23  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-23  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_init): Don't use sierra_read_packet_wait, 
 	  use sierra_read_packet and resend the request on GP_ERROR_TIMEOUT.
 
-2002-05-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_init): Portmon logs show that the port
 	  is closed and reopened after SIERRA_PACKET_SESSION_END
 	  has been received and before the initial handshake.
 
-2002-05-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: If the requested speed is 0, we set it to 115200.
 
-2002-05-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c
 	* library.c,h (sierra_set_speed): Introduce SierraSpeed - makes
@@ -511,15 +511,15 @@
 	  must be called after a SIERRA_PACKET_SESSION_END has been received.
 	  Implement that.
 
-2002-05-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Yet another try to handle SIERRA_PACKET_SESSION_END.
 
-2002-05-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Try to handle the strange 0x8c error.
 
-2002-05-13  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-13  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Handle SIERRA_PACKET_SESSION_END,ERROR by reinitializing
 	  the connection if this error occurs.
@@ -529,28 +529,28 @@
 	* sierra.c (camera_start, camera_init): Send the
 	  initialization sequence only on init. Olympus C-860L
 	  stops communications when receiving an initialization
-	  sequence after some communications have already occured.
+	  sequence after some communications have already occurred.
 	
 	* library.h, library.c (sierra_ping -> sierra_init):
 	  This function isn't really a "ping", since it can be used
 	  only on startup.
 
-2002-04-26  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-26  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (camera_start): Forgot a gp_port_get_settings before
 	  checking settings.serial.speed. Shouldn't affect anything though...
 
-2002-04-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-04-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Ilya Konstantinov <gphoto@future.shiny.co.il>:
 
 	* library.c: break on timeout.
 
-2002-03-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_ping): Retry up to 3 times.
 
-2002-03-28  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-28  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Formatting.
 	* sierra.c: Ping the camera before changing the speed.
@@ -561,41 +561,41 @@
 	  Fix getting/setting the shutter speed via conversion to int or
 	  float.
 
-2002-02-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Patrick Mansfield <patman@aracnet.com>:
 
 	* library.c: Stop the progress only if any has been started.
 
-2002-02-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_get_string_register): Retry on timeout (after
 	  sending nak).
 
-2002-02-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: Olympus C-860L has been reported to work with this driver,
 	  too.
 
-2002-02-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_list_files): No need to set the int register,
 	  (sierra_get_string_register) will do that for us.
 
-2002-02-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Per Gilles Grandou's <gilles@grandou.net> request:
 
 	* #undef HAVE_EXIF
 
-2002-02-18  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-18  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Reported by Patrick Mansfield <patman@aracnet.com>:
 
 	* library.c (sierra_read_packet): At least Nikon CoolPix 880 sets 
 	  the checksum always to 0xffff (?!?).
 
-2002-02-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: As long as there is EXIF code in here, add
 	  EXIF_CFLAGS,LIBS. However, there shouldn't be any EXIF code here,
@@ -609,54 +609,54 @@
 
 	* sierra.c: added EXIF support.
 
-2002-02-08  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-08  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_read_packet): Improve debugging output by
 	  reading several bytes at once. Should make transmission faster,
 	  too.
 
-2002-02-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c,h: Lots of additional debugging output.
 
-2002-02-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (sierra_read_packet_wait): {int res=(res);... 
 	  just cannot work. Read the macro definitions...
 
-2002-02-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c (camera_init): Pass NULL as context, because we will
 	  ignore those error messages and are just probing for the level of
 	  support for filenames or folders.
 
-2002-02-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_read_packet): TYPE_COMMAND is a multi-byte
 	  packet, too, according to protocol.htm (see photopc).
 
-2002-02-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_list_files): For cameras that don't support
 	  filenames, it is useless to try to get a filename for each 
 	  file. Just try on the first one. If this fails, come up with 
 	  dummy filenames for each file.
 
-2002-02-05  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-05  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c (sierra_read_packet): Hopefully this fixes problems
 	  with serial cameras: TYPE_DATA_END identifies packets of more
 	  than one byte.
 
-2002-01-29  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-29  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Cleanup.
 
-2002-01-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* sierra.c: %s/== GP_OK/>= 0. Fixes camera_config (for example).
 
-2002-01-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	William Bader <william@nscs.fast.net> reported (partial) success
 	with his Polaroid PDC2300Z.
@@ -664,28 +664,28 @@
 	* sierra.c: New model.
 	* library.c: Clean-up.
 
-2002-01-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	William Bader <william@nscs.fast.net> reported (partial) success
 	with his Polaroid PDC2300Z.
 
 	* sierra.c: New model.
 
-2002-01-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: I messed up the logic: TYPE_DATA and TYPE_DATA_END 
 	  are _not_ single byte packets.
 
-2002-01-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Improved debugging messages. I hope I didn't break
 	  the logic...
 
-2002-01-16  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-16  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* library.c: Additional debugging messages.
 
-2002-01-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* *.c,h: Remove references to gp_camera_set_error.
 
@@ -693,9 +693,9 @@
 
 	* sierra-usbwrap.c: Fixed a pointer arithmetic portability issue.
 
-2001-12-01  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-01  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
-	Suggestion from Stefan Höhne <s_hoehne@informatik.uni-kl.de>:
+	Suggestion from Stefan HÃ¶hne <s_hoehne@informatik.uni-kl.de>:
 
 	* library.c: Check for filename == "        ". It seems his 
 	  camera doesn't support filenames.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/MC-EU1-Protocol.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/MC-EU1-Protocol.txt Changed

@@ -10,7 +10,7 @@
 This protocol use 1 or 4 bytes "packets". 4 bytes packets are used to send command to the coolpix and receive information from it.
 1 byte packet are used as acknowledge (0x86), not acknowledge (0x15), "attention packet" (0xFF). 
 Each byte in these packet is divided in two part, bit 0-6 is the value on 7 bits and bit 7 is the odd parity bit (thanks Mark Roberts !)
-Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least signifiant byte is sent first, for example
+Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least significant byte is sent first, for example
 the number of picture is :
 
 nb picture = ((byte2 & 0x7F) - 0x1C) + 100 * ((byte3 & 0x7F) - 0x1C) 
@@ -35,7 +35,7 @@
 At first connection after Coolpix has been powerup, first 0x00 don't work, coolpix respond 0xFF 0xFF then nothing
 A second 0x00 do the job.
 
-* Initialisations
+* Initializations
 
 Need more informations...
 
@@ -72,7 +72,7 @@
 					0x86
 
 0x9B, 0x01, 0x7F, 0x7F							Release the shutter button,
-									usefull in bulb mode
+									useful in bulb mode
 									
 					0x8F
 					
@@ -164,7 +164,7 @@
 * "Attention" packet 0xFF from coolpix
 
 Coolpix send 0xFF in many cases :
-- After initialisation in response to 0x00.
+- After initialization in response to 0x00.
 - When Coolpix self powerdown (powersave)
 - When Coolpix is powerdown
 - When a picture has been recorded

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/Makefile-files Changed

@@ -1,16 +1,30 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += sierra/PROTOCOL sierra/ChangeLog sierra/MC-EU1-Protocol.txt
+EXTRA_DIST             += %reldir%/ChangeLog
+EXTRA_DIST             += %reldir%/MC-EU1-Protocol.txt
+EXTRA_DIST             += %reldir%/PROTOCOL
 
-EXTRA_LTLIBRARIES += sierra.la
 
-sierra_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
-sierra_la_SOURCES = \
-	sierra/sierra.c sierra/sierra.h \
-	sierra/library.c sierra/library.h \
-	sierra/sierra-usbwrap.c sierra/sierra-usbwrap.h \
-	sierra/sierra-desc.h sierra/sierra-desc.c \
-	sierra/nikon-desc.c sierra/olympus-desc.c sierra/epson-desc.c
-sierra_la_LDFLAGS = $(camlib_ldflags)
-sierra_la_DEPENDENCIES = $(camlib_dependencies)
-sierra_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)
+EXTRA_LTLIBRARIES      += sierra.la
+
+sierra_la_SOURCES       =
+sierra_la_SOURCES      += %reldir%/sierra.c
+sierra_la_SOURCES      += %reldir%/sierra.h
+sierra_la_SOURCES      += %reldir%/library.c
+sierra_la_SOURCES      += %reldir%/library.h
+sierra_la_SOURCES      += %reldir%/sierra-usbwrap.c
+sierra_la_SOURCES      += %reldir%/sierra-usbwrap.h
+sierra_la_SOURCES      += %reldir%/sierra-desc.h
+sierra_la_SOURCES      += %reldir%/sierra-desc.c
+sierra_la_SOURCES      += %reldir%/nikon-desc.c
+sierra_la_SOURCES      += %reldir%/olympus-desc.c
+sierra_la_SOURCES      += %reldir%/epson-desc.c
+
+sierra_la_CFLAGS        = $(camlib_cflags)
+sierra_la_CPPFLAGS      = $(camlib_cppflags)
+sierra_la_DEPENDENCIES  = $(camlib_dependencies)
+sierra_la_LDFLAGS       = $(camlib_ldflags)
+sierra_la_LIBADD        = $(camlib_libadd)
+
+sierra_la_CPPFLAGS     += $(LIBEXIF_CFLAGS)
+sierra_la_LIBADD       += $(LIBEXIF_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/epson-desc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/epson-desc.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/library.c Changed

@@ -7,16 +7,17 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+#define _DARWIN_C_SOURCE
 #include "config.h"
 #include "library.h"
 
@@ -25,33 +26,17 @@
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-port-log.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "sierra.h"
 #include "sierra-usbwrap.h"
 
 #define GP_MODULE "sierra"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
 enum _SierraPacket {
 	NUL				= 0x00,
 	SIERRA_PACKET_DATA		= 0x02,
@@ -60,6 +45,7 @@
 	ACK				= 0x06,
 	SIERRA_PACKET_INVALID		= 0x11,
 	SIERRA_PACKET_NAK		= 0x15,
+	SIERRA_PACKET_CANCEL		= 0x18,
 	SIERRA_PACKET_COMMAND		= 0x1b,
 	SIERRA_PACKET_WRONG_SPEED	= 0x8c,
 	SIERRA_PACKET_SESSION_ERROR	= 0xfc,
@@ -82,7 +68,7 @@
 #define		QUICKSLEEP	5
 
 int sierra_change_folder (Camera *camera, const char *folder, GPContext *context)
-{	
+{
 	int st = 0, i;
 	char target128;
 
@@ -90,7 +76,7 @@
 	GP_DEBUG ("*** folder: %s", folder);
 
 	/*
-	 * Do not issue the command if the camera doesn't support folders 
+	 * Do not issue the command if the camera doesn't support folders
 	 * or if the folder is the current working folder
 	 */
 	if (!camera->pl->folders || !strcmp (camera->pl->folder, folder))
@@ -117,7 +103,7 @@
 			targeti = '\0';
 			if (st == i - 1)
 				break;
-			CHECK (sierra_set_string_register (camera, 84, 
+			CHECK (sierra_set_string_register (camera, 84,
 							   target + st, strlen (target + st), context));
 
 			st = i + 1;
@@ -164,7 +150,7 @@
 
 	/*
 	 * Get the filename of the first picture. Note that some cameras
-	 * that don't support filenames return 8 blanks instead of 
+	 * that don't support filenames return 8 blanks instead of
 	 * reporting an error. If this is indeed the case, just fill
 	 * the list with dummy entries and return.
 	 */
@@ -200,8 +186,8 @@
 int sierra_list_folders (Camera *camera, const char *folder, CameraList *list,
 			 GPContext *context)
 {
-	int j, count;
-	unsigned int i, bsize;
+	int i, j, count;
+	unsigned int bsize;
 	char buf1024;
 
 	/* List the folders only if the camera supports them */
@@ -217,7 +203,7 @@
 		CHECK (sierra_set_int_register (camera, 83, i + 1, context));
 		bsize = 1024;
 		GP_DEBUG ("*** getting name of folder %i", i + 1);
-		CHECK (sierra_get_string_register (camera, 84, 0, 
+		CHECK (sierra_get_string_register (camera, 84, 0,
 						   NULL, (unsigned char *)buf,
 						   &bsize, context));
 
@@ -232,9 +218,9 @@
 
 /**
  * sierra_get_picture_folder:
- * @camera : camera data stucture
+ * @camera : camera data structure
  * @folder : folder name (to be freed by the caller)
- *     
+ *
  * Return the name of the folder that stores pictures. It is assumed that
  * the camera conforms with the JEIDA standard. Thus, look for the picture
  * folder into the /DCIM directory.
@@ -286,8 +272,8 @@
 
 /**
  * sierra_check_battery_capacity:
- * @camera : camera data stucture
- *     
+ * @camera : camera data structure
+ *
  * Check if the battery capacity is high enough.
  *
  * Returns: a gphoto2 error code
@@ -318,10 +304,10 @@
 
 /**
  * sierra_get_memory_left:
- * @camera : camera data stucture
+ * @camera : camera data structure
  * @memory : memory left
- *     
- * Provide the available memory left 
+ *
+ * Provide the available memory left
  *
  * Returns: a gphoto2 error code
  */
@@ -374,7 +360,7 @@
 		default:
 
 			/*
-			 * If any error (except timeout) has occurred, 
+			 * If any error (except timeout) has occurred,
 			 * report it.
 			 */
 			CHECK (ret);
@@ -421,7 +407,7 @@
 	case SIERRA_PACKET_COMMAND:
 		switch (camera->port->type) {
 		case GP_PORT_SERIAL:
-			packet1 = (camera->pl->first_packet ? 
+			packet1 = (camera->pl->first_packet ?
 					SUBSIERRA_PACKET_COMMAND_FIRST :
 					SUBSIERRA_PACKET_COMMAND);
 			camera->pl->first_packet = 0;
@@ -435,7 +421,7 @@
 		break;
 	}
 
-	/* Determing packet length */
+	/* Determining packet length */
 	if ((packet0 == SIERRA_PACKET_COMMAND) ||
 	    (packet0 == SIERRA_PACKET_DATA) ||
 	    (packet0 == SIERRA_PACKET_DATA_END)) {
@@ -451,7 +437,7 @@
 		for (x = 4; x < length - 2; x++)
 			checksum += (unsigned char)packetx;
 		packetlength-2 = checksum & 0xff;
-		packetlength-1 = (checksum >> 8) & 0xff; 
+		packetlength-1 = (checksum >> 8) & 0xff;
 	}
 
 	if (camera->pl->flags & SIERRA_WRAP_USB_MASK) {
@@ -459,7 +445,12 @@
 			(camera->pl->flags & SIERRA_WRAP_USB_MASK),
 			packet, length));
 	} else {
-		CHECK (gp_port_write (camera->port, packet, length));
+		if (camera->pl->flags & SIERRA_NO_BLOCK_WRITE) {
+			for (x = 0; x < length; x++)
+				CHECK (gp_port_write(camera->port, &packetx, 1));
+		} else {
+			CHECK (gp_port_write (camera->port, packet, length));
+		}
 	}
 
 	return GP_OK;
@@ -468,7 +459,7 @@
 static int
 sierra_clear_usb_halt(Camera *camera)
 {
-	
+
 	if ( (camera->port->type == GP_PORT_USB) &&
 	     !(camera->pl->flags & SIERRA_WRAP_USB_MASK) &&
 	     !(camera->pl->flags & SIERRA_NO_USB_CLEAR) )
@@ -492,9 +483,9 @@
 
 /**
  * sierra_read_packet:
- * @camera : camera data stucture
+ * @camera : camera data structure
  * @packet : to return the read packet
- *     
+ *
  * Read a data packet from the camera.
  *
  * Method:
@@ -569,7 +560,7 @@
 			continue;
 		}
 		if (result == 0) {
-			GP_DEBUG ("Read got 0 bytes.."); 
+			GP_DEBUG ("Read got 0 bytes..");
 			if (++r > 2) {
 				sierra_clear_usb_halt(camera);
 				GP_DEBUG ("Giving up...");
@@ -581,7 +572,7 @@
 		br = result;
 
 		/*
-		 * If the first read byte is not known, 
+		 * If the first read byte is not known,
 		 * report an error and exit the processing.
 		 */
 		switch (packet0) {
@@ -590,6 +581,7 @@
 		case ACK:
 		case SIERRA_PACKET_INVALID:
 		case SIERRA_PACKET_NAK:
+		case SIERRA_PACKET_CANCEL:
 		case SIERRA_PACKET_SESSION_ERROR:
 		case SIERRA_PACKET_SESSION_END:
 		case SIERRA_PACKET_WRONG_SPEED:
@@ -644,8 +636,12 @@
 		 * data, and 2 for the checksum.
 		 */
 		length = packet2 + (packet3 * 256) + 6;
+		if (length > SIERRA_PACKET_SIZE) {
+			GP_DEBUG ("Packet too long (%d)!", length);
+			return GP_ERROR_IO;
+		}
 
-		/* 
+		/*
 		 * Read until the end of the packet is reached
 		 * or an error occurred.
 		 */
@@ -676,7 +672,7 @@
 			for (c = 0, i = 4; i < br - 2; i++)
 				c += packeti;
 			c &= 0xffff;
-			if (c == (packetbr - 2 + (packetbr - 1 * 256)))
+			if (c == ((unsigned int)packetbr - 2 + ((unsigned int)packetbr - 1 * 256)))
 				break;
 
 			/*
@@ -694,8 +690,8 @@
 			if ((packetbr - 2 == 0x00) &&
 			    (packetbr - 1 == 0x00))
 				break;
-			
-					
+
+
 			GP_DEBUG ("Checksum wrong (calculated 0x%x, "
 				"found 0x%x)!", c,
 				packetbr - 2 + (packetbr - 1 * 256));
@@ -785,6 +781,7 @@
 			GP_DEBUG ("Transmission successful.");
 			return GP_OK;
 		case SIERRA_PACKET_INVALID:
+		case SIERRA_PACKET_CANCEL:
 			gp_context_error (context, _("Packet was rejected "
 				"by camera. Please contact "
 				"%s."), MAIL_GPHOTO_DEVEL);
@@ -799,7 +796,7 @@
 					"retries."));
 				return GP_ERROR;
 			}
-			
+
 			/*
                          * The camera has ended this session and
                          * reverted the speed back to 19200. Reinitialize
@@ -826,7 +823,7 @@
 
 static int
 sierra_build_packet (Camera *camera, char type, char subtype,
-		     int data_length, char *packet) 
+		     int data_length, char *packet)
 {
 	packet0 = type;
 	switch (type) {
@@ -851,13 +848,13 @@
 }
 
 static int
-sierra_write_ack (Camera *camera, GPContext *context) 
+sierra_write_ack (Camera *camera, GPContext *context)
 {
 	char buf4096;
 	int ret;
 
 	GP_DEBUG ("Writing acknowledgement...");
-	
+
 	buf0 = ACK;
 	ret = sierra_write_packet (camera, buf, context);
 	sierra_clear_usb_halt(camera);
@@ -868,7 +865,7 @@
 }
 
 int
-sierra_init (Camera *camera, GPContext *context) 
+sierra_init (Camera *camera, GPContext *context)
 {
 	unsigned char bufSIERRA_PACKET_SIZE, packet4096;
 	int ret, r = 0;
@@ -913,7 +910,7 @@
 		CHECK (ret);
 
 		switch (buf0) {
-		case SIERRA_PACKET_NAK: 
+		case SIERRA_PACKET_NAK:
 
 			/* Everything is fine. */
 			return GP_OK;
@@ -946,7 +943,7 @@
 };
 
 int
-sierra_set_speed (Camera *camera, SierraSpeed speed, GPContext *context) 
+sierra_set_speed (Camera *camera, SierraSpeed speed, GPContext *context)
 {
 	GPPortSettings settings;
 	unsigned int i, bit_rate;
@@ -957,7 +954,7 @@
 
 	/*
 	 * Check that the requested speed is valid. We don't want to bug
-	 * the user with our coding errors, therefore if the requested 
+	 * the user with our coding errors, therefore if the requested
 	 * speed is invalid, we use 19200.
 	 */
 	for (i = 0; SierraSpeedsi.bit_rate; i++)
@@ -979,7 +976,7 @@
 	 * they are currently operating at that speed.
 	 */
 	CHECK (gp_port_get_settings (camera->port, &settings));
-	if (settings.serial.speed == bit_rate)
+	if ((unsigned int)settings.serial.speed == bit_rate)
 		return GP_OK;
 
 	/*
@@ -1037,7 +1034,7 @@
 
 int
 sierra_set_int_register (Camera *camera, int reg, int value,
-			 GPContext *context) 
+			 GPContext *context)
 {
 	char p4096;
 
@@ -1062,7 +1059,7 @@
 	return GP_OK;
 }
 
-int sierra_get_int_register (Camera *camera, int reg, int *value, GPContext *context) 
+int sierra_get_int_register (Camera *camera, int reg, int *value, GPContext *context)
 {
 	int r = 0;
 	unsigned char p4096, bufSIERRA_PACKET_SIZE;
@@ -1072,7 +1069,7 @@
 	/* Build and send the packet. */
 	CHECK (sierra_build_packet (camera, SIERRA_PACKET_COMMAND, 0, 2, (char *)p));
 	p4 = 0x01;
-	p5 = reg; 
+	p5 = reg;
 	CHECK (sierra_write_packet (camera, (char *)p, context));
 
 	while (1) {
@@ -1140,13 +1137,13 @@
 
 int
 sierra_set_string_register (Camera *camera, int reg, const char *s,
-			    long int length, GPContext *context) 
+			    long int length, GPContext *context)
 {
 
 	char packet4096;
 	char type;
 	long int x=0;
-	int seq=0, size=0; 
+	int seq=0, size=0;
 	int do_percent;
 	unsigned int id = 0;
 
@@ -1206,7 +1203,7 @@
 	return GP_OK;
 }
 
-int sierra_get_string_register (Camera *camera, int reg, int fnumber, 
+int sierra_get_string_register (Camera *camera, int reg, int fnumber,
                                 CameraFile *file, unsigned char *b,
 				unsigned int *b_len, GPContext *context)
 {
@@ -1235,7 +1232,7 @@
 
 	/* Build and send the request */
 	CHECK (sierra_build_packet (camera, SIERRA_PACKET_COMMAND, 0, 2, (char *)p));
-	/* 
+	/*
 	 * If the extended protocol is enabled, use code 0x06 so we can send
 	 * and receive 32k size packages, otherwise code 0x04 is used and
 	 * we have 2k size packages.
@@ -1260,7 +1257,7 @@
 	do {
 
 		/* Read one packet and retry on timeout. */
-		r = sierra_read_packet (camera, p, context); 
+		r = sierra_read_packet (camera, p, context);
 		if (r == GP_ERROR_TIMEOUT) {
 			if (++retries > RETRIES) {
 				in_function = 0;
@@ -1318,7 +1315,7 @@
 }
 
 int
-sierra_delete (Camera *camera, int picture_number, GPContext *context) 
+sierra_delete (Camera *camera, int picture_number, GPContext *context)
 {
 	/* Tell the camera which picture to delete and execute command. */
 	CHECK (sierra_set_int_register (camera, 4, picture_number, context));
@@ -1328,7 +1325,7 @@
 }
 
 int
-sierra_end_session (Camera *camera, GPContext *context) 
+sierra_end_session (Camera *camera, GPContext *context)
 {
 	CHECK (sierra_action (camera, SIERRA_ACTION_END, context));
 
@@ -1394,10 +1391,10 @@
 	CHECK (gp_port_set_timeout (camera->port, timeout));
 
 	if (filepath != NULL) {
-		/* 
+		/*
 		 * After the picture is taken, register 4 is set to the
 		 * current picture.
-		 */ 
+		 */
 		GP_DEBUG ("Getting picture number.");
 		r = sierra_get_int_register (camera, 4, &n, context);
 		if (r == GP_OK) {
@@ -1405,7 +1402,7 @@
 		}
 		/*
 		 * We need to tell the frontend where the new image can be
-		 * found.  Unfortunatelly, we can only figure out the
+		 * found.  Unfortunately, we can only figure out the
 		 * filename. Therefore, reset the CameraFilesystem and let
 		 * it search for the filename.
 		 *
@@ -1414,7 +1411,7 @@
 		 *
 		 * Not that some cameras that don't support filenames will
 		 * return 8 blanks instead of reporting an error.
-		 * 
+		 *
 		 * Some newer cameras (Nikon*) do not return register 4, so
 		 * ignore errors from that.
 		 */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/nikon-desc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/nikon-desc.c Changed

@@ -7,22 +7,27 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+
 #include <stdio.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <gphoto2/gphoto2-library.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "sierra.h"
 #include "library.h"
 #include "sierra-desc.h"
@@ -32,13 +37,13 @@
  */
 
 /*
- * Notes: 
+ * Notes:
  *
  * The variable "value" in a ValueNameType is the first element of
  * the name/value union, and so it is the default value initialized.
  *
  * To init to a range, use:
- *	{ .range = { 100.1, 2000.0, 10 } }, NULL 
+ *	{ .range = { 100.1, 2000.0, 10 } }, NULL
  *
  * Casts are used to avoid warnings about using a const.
  *
@@ -47,30 +52,12 @@
  * other data is stored here.
  */
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /*
  * Register 1: resolution/size.
  */
 static const ValueNameType cp880_reg_01_val_names = {
-	/* 
+	/*
 	 * These values suck. why didn't they make these maskable, or use
 	 * a nibble for each part?  Just use a the combined resolution + size.
 	 * It would be good to try and break these into two selections.
@@ -86,9 +73,9 @@
 	{ { 0x13 }, "Fine-Full" },
 	{ { 0x23 }, "Hi-Full" },
 };
-static const RegisterDescriptorType cp880_reg_01 = { 
+static const RegisterDescriptorType cp880_reg_01 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"resolution", N_("Resolution plus Size"),
 		VAL_NAME_INIT (cp880_reg_01_val_names)
 	}
@@ -98,7 +85,7 @@
  * Register 1: resolution/size.
  */
 static const ValueNameType cp2500_reg_01_val_names = {
-	/* 
+	/*
 	 * These values suck. why didn't they make these maskable, or use
 	 * a nibble for each part?  Just use a the combined resolution + size.
 	 * It would be good to try and break these into two selections.
@@ -120,9 +107,9 @@
 	{ { 0x0c }, "Fine-UXGA" },
 
 };
-static const RegisterDescriptorType cp2500_reg_01 = { 
+static const RegisterDescriptorType cp2500_reg_01 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"resolution", N_("Resolution plus Size"),
 		VAL_NAME_INIT (cp2500_reg_01_val_names)
 	}
@@ -132,15 +119,15 @@
  * Register 2: Date and time.
  */
 static const ValueNameType cp880_reg_02_val_names = {
-	/* 
+	/*
 	 * Dummy value, since we need at least one of these to
 	 * display anything.
 	 */
 	{ { 0x00 }, "Dummy" },
 };
-static const RegisterDescriptorType cp880_reg_02 = { 
+static const RegisterDescriptorType cp880_reg_02 = {
 	{
-		GP_WIDGET_DATE, GP_REG_NO_MASK, 
+		GP_WIDGET_DATE, GP_REG_NO_MASK,
 		"date-time", N_("Date and time (GMT)"),
 		VAL_NAME_INIT (cp880_reg_02_val_names)
 	}
@@ -151,20 +138,20 @@
  * work.
  */
 #ifdef RANGE_FOR_SHUTTER
-static const ValueNameType cp880_reg_03_val_names = { 
+static const ValueNameType cp880_reg_03_val_names = {
 	{
-		{ .range = { 0, 8000000 } }, NULL 
+		{ .range = { 0, 8000000 } }, NULL
 	}
 };
-static const RegisterDescriptorType cp880_reg_03 = { 
+static const RegisterDescriptorType cp880_reg_03 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed microseconds (0 auto)"),
 		VAL_NAME_INIT (cp880_reg_03_val_names)
 	}
 };
 #endif
-static const ValueNameType cp880_reg_03_val_names = { 
+static const ValueNameType cp880_reg_03_val_names = {
 	{ {       0 }, N_("Auto") },
 	{ {    1000 }, "1/1000" },
 	{ {    2000 }, "1/500" },
@@ -187,9 +174,9 @@
 	/* { { -20 }, "bulb?" }, */
 
 };
-static const RegisterDescriptorType cp880_reg_03 = { 
+static const RegisterDescriptorType cp880_reg_03 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed (in seconds)"),
 		VAL_NAME_INIT (cp880_reg_03_val_names)
 	}
@@ -204,9 +191,9 @@
 	{ { 2 }, N_("Medium") },
 	/* { { 4 }, N_("High") }, not on a cp880 */
 };
-static const RegisterDescriptorType cp880_reg_05 = { 
+static const RegisterDescriptorType cp880_reg_05 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"aperture", N_("Aperture Settings"),
 		VAL_NAME_INIT (cp880_reg_05_val_names)
 	}
@@ -219,9 +206,9 @@
 	{ { 1 }, N_("Color") },
 	{ { 2 }, N_("B/W") },
 };
-static const RegisterDescriptorType cp880_reg_06 = { 
+static const RegisterDescriptorType cp880_reg_06 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"color", N_("Color Mode"),
 		VAL_NAME_INIT (cp880_reg_06_val_names)
 	}
@@ -237,10 +224,10 @@
 	{ { 3 }, N_("Anti-redeye") },
 	{ { 4 }, N_("Slow-sync") },
 };
-static const RegisterDescriptorType cp880_reg_07 = { 
+static const RegisterDescriptorType cp880_reg_07 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"flash", N_("Flash Settings"), 
+		"flash", N_("Flash Settings"),
 		VAL_NAME_INIT (cp880_reg_07_val_names)
 	}
 };
@@ -256,7 +243,7 @@
 	{ { 3 }, N_("Brightness+") },	/* cp880 lighten image */
 	{ { 4 }, N_("Brightness-") },	/* cp880 darken image */
 };
-static const RegisterDescriptorType cp880_reg_19 = { 
+static const RegisterDescriptorType cp880_reg_19 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"image-adj", N_("Image Adjustment"), /* brightness/contrast */
@@ -269,7 +256,7 @@
  *
  * Could not determine how the camera does the gradation in settings -
  * such as fine +-1,2,3, and FL1 FL2 FL3. Dumping all registers (1 to 90)
- * shows no changes when going (for example) from fine +3 to -3. 
+ * shows no changes when going (for example) from fine +3 to -3.
  *
  * Setting these via the camera to a +3/2/1 etc, and then changing them
  * via gphoto2 to another value changes the "type" but the value +3/2/1 is
@@ -287,7 +274,7 @@
 	{ { 0x06 }, N_("Preset") },	/* preset automatically by camera, prob range */
 	{ { 0xff }, N_("Cloudy") }, /* cloudy +3 ... -3 */
 };
-static const RegisterDescriptorType cp880_reg_20 = { 
+static const RegisterDescriptorType cp880_reg_20 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"whitebalance", N_("White Balance"),
@@ -305,7 +292,7 @@
 	{ { 0x01 }, N_("On") },
 	{ { 0x02 }, N_("Blink") },
 };
-static const RegisterDescriptorType cp880_reg_30 = { 
+static const RegisterDescriptorType cp880_reg_30 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"led", N_("LED Mode"),
@@ -325,7 +312,7 @@
 	{ { 0x02 }, N_("Normal") },
 	{ { 0x03 }, N_("Infinity") },
 };
-static const RegisterDescriptorType cp880_reg_33 = { 
+static const RegisterDescriptorType cp880_reg_33 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"focus-mode", N_("Focus Mode"),
@@ -335,14 +322,14 @@
 
 /*
  * Register 34: operation mode. This is only readable, an action with
- * subaction is required to change the mode. 
+ * subaction is required to change the mode.
  *
  * Note that on a cp880, sometimes the play mode ends up with a messed up
  * display or an error message, powering the camera off and on seems to
  * fix the problem.
  *
  * The use of next and previous should be part of a separate
- * interface, such that a user can continuosly press next or previous to
+ * interface, such that a user can continuously press next or previous to
  * cycle through the images (while the camera is in play mode).
  *
  * Use command 2 (via sierra_sub_action) with action
@@ -352,7 +339,7 @@
  * secondary action for this. The register 34 values match those needed to
  * change the mode.
  *
- * Using a register get/set method of CAM_DESC_SUBACTION enables the 
+ * Using a register get/set method of CAM_DESC_SUBACTION enables the
  * above kluge.
  */
 static const ValueNameType cp880_reg_34_val_names = {
@@ -372,9 +359,9 @@
 	{ { 0x0c }, "unknown 0x0c" },
 	*/
 };
-static const RegisterDescriptorType cp880_reg_34 = { 
+static const RegisterDescriptorType cp880_reg_34 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"op-mode", N_("Operation Mode"),
 		VAL_NAME_INIT (cp880_reg_34_val_names)
 	}
@@ -386,7 +373,7 @@
 static const ValueNameType cp880_reg_35_val_names = {
 	{ { .range = { 0, 7 } }, NULL },
 };
-static const RegisterDescriptorType cp880_reg_35 = { 
+static const RegisterDescriptorType cp880_reg_35 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"lcd-brightness", N_("LCD Brightness"),
@@ -401,7 +388,7 @@
 static const ValueNameType cp880_reg_38_val_names = {
 	{ { .range = { 0, 255 /* XXX? */ } }, NULL },
 };
-static const RegisterDescriptorType cp880_reg_38 = { 
+static const RegisterDescriptorType cp880_reg_38 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"lcd-auto-shutoff", N_("LCD Auto Shut Off (seconds)"),
@@ -422,13 +409,13 @@
 	/* { { 0x06 }, "Italian" },	not on cp880 */
 	/* { { 0x08 }, "Spanish" },	not on cp880 */
 	/* { { 0x0a }, "Dutch" },	not on cp880 */
-	/* { { 0xnn }, "Japanese" }, 
+	/* { { 0xnn }, "Japanese" },
 	 *
 	 * weird, can set to japanese, but can't see any change in any
 	 * registers; reg 53 is 3 wether it is english or japanese.
 	 */
 };
-static const RegisterDescriptorType cp880_reg_53 = { 
+static const RegisterDescriptorType cp880_reg_53 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"language", N_("Language"),
@@ -453,9 +440,9 @@
 		{ .range = { -2.0, 2.0, .1 } }, NULL,
 	}
 };
-static const RegisterDescriptorType cp880_reg_69 = { 
+static const RegisterDescriptorType cp880_reg_69 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"exp", N_("Exposure Compensation"),
 		VAL_NAME_INIT (cp880_reg_69_val_names)
 	}
@@ -476,9 +463,9 @@
 	{ { +17 }, "+1.7" },
 	{ { +20 }, "+2.0" },
 };
-static const RegisterDescriptorType cp880_reg_69 = { 
+static const RegisterDescriptorType cp880_reg_69 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"exp", N_("Exposure Compensation"),
 		VAL_NAME_INIT (cp880_reg_69_val_names)
 	}
@@ -493,10 +480,10 @@
 	{ { 0x05 }, N_("Matrix") },
 	{ { 0x06 }, N_("Spot-AF") },
 };
-static const RegisterDescriptorType cp880_reg_70 = { 
+static const RegisterDescriptorType cp880_reg_70 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"exp-meter", N_("Exposure Metering"), 
+		"exp-meter", N_("Exposure Metering"),
 		VAL_NAME_INIT (cp880_reg_70_val_names)
 	}
 };
@@ -511,9 +498,9 @@
 		{ .range = { 8.0, 20.0, .1 } }, NULL
 	}
 };
-static const RegisterDescriptorType cp880_reg_71 = { 
+static const RegisterDescriptorType cp880_reg_71 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"zoom", N_("Zoom (in millimeters)"),
 		VAL_NAME_INIT (cp880_reg_71_val_names)
 	}
@@ -547,15 +534,15 @@
 	{ { 0x0002 }, N_("Fisheye") },
 	{ { 0x0004 }, N_("Wide") },
 };
-static const RegisterDescriptorType cp880_reg_72 = { 
-	{ 
-		GP_WIDGET_RADIO, 0xff00, 
+static const RegisterDescriptorType cp880_reg_72 = {
+	{
+		GP_WIDGET_RADIO, 0xff00,
 		"dzoom", N_("Digital Zoom"),
 		VAL_NAME_INIT (cp880_reg_72_mask_hi_val_names)
 	},
-	{ 
-		GP_WIDGET_RADIO, 0x00ff, 
-		"misc-exp-lenses", N_("Misc exposure/lens settings"), 
+	{
+		GP_WIDGET_RADIO, 0x00ff,
+		"misc-exp-lenses", N_("Misc exposure/lens settings"),
 		VAL_NAME_INIT (cp880_reg_72_mask_lo_val_names)
 	},
 };
@@ -570,14 +557,14 @@
 	{ { 0x01 }, N_("on") },
 };
 
-static const RegisterDescriptorType cp880_reg_72 = { 
-	{ 
-		GP_WIDGET_RADIO, 0x08, 
+static const RegisterDescriptorType cp880_reg_72 = {
+	{
+		GP_WIDGET_RADIO, 0x08,
 		"dzoom", N_("Digital Zoom"),
 		VAL_NAME_INIT (cp880_reg_72_mask_hi_val_names)
 	},
-	{ 
-		GP_WIDGET_RADIO, 0x01, 
+	{
+		GP_WIDGET_RADIO, 0x01,
 		"ael", N_("Auto exposure lock"),
 		VAL_NAME_INIT (cp880_reg_72_mask_lo_val_names)
 	},
@@ -612,7 +599,7 @@
  */
 static CameraRegisterType cp880_cam_regs = {
 	CAM_REG_TYPE_INIT (cp880, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (cp880, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (cp880, 38, 4, CAM_DESC_DEFAULT, 0), /* LCD auto shutoff */
@@ -646,7 +633,7 @@
  */
 static CameraRegisterType cp2500_cam_regs = {
 	CAM_REG_TYPE_INIT (cp880, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (cp880, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (cp880, 53, 4, CAM_DESC_DEFAULT, 0), /* language */
@@ -679,7 +666,7 @@
  */
 static CameraRegisterType cp4300_cam_regs = {
 	CAM_REG_TYPE_INIT (cp880, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (cp880, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (cp880, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (cp880, 53, 4, CAM_DESC_DEFAULT, 0), /* language */
@@ -687,39 +674,39 @@
 
 
 static const CameraRegisterSetType cp880_desc = {
-	{ 
-		N_("Picture Settings"), 
+	{
+		N_("Picture Settings"),
 		SIZE_ADDR (CameraRegisterType, cp880_pic_regs)
 	},
-	{ 
-		N_("Camera Settings"), 
+	{
+		N_("Camera Settings"),
 		SIZE_ADDR (CameraRegisterType, cp880_cam_regs)
 	},
 };
 
 static const CameraRegisterSetType cp2500_desc = {
-	{ 
-		N_("Picture Settings"), 
+	{
+		N_("Picture Settings"),
 		SIZE_ADDR (CameraRegisterType, cp2500_pic_regs)
 	},
-	{ 
-		N_("Camera Settings"), 
+	{
+		N_("Camera Settings"),
 		SIZE_ADDR (CameraRegisterType, cp2500_cam_regs)
 	},
 };
 
 static const CameraRegisterSetType cp4300_desc = {
-	{ 
-		N_("Picture Settings"), 
+	{
+		N_("Picture Settings"),
 		SIZE_ADDR (CameraRegisterType, cp4300_pic_regs)
 	},
-	{ 
-		N_("Camera Settings"), 
+	{
+		N_("Camera Settings"),
 		SIZE_ADDR (CameraRegisterType, cp4300_cam_regs)
 	},
 };
 
-static const char cp880_manual = 
+static const char cp880_manual =
 N_(
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n\n"
@@ -738,7 +725,7 @@
  *  possible to control the camera via the USB port since it reportedly
  *  appears as a USB mass storage device.
  */
-static const char cp995_manual = 
+static const char cp995_manual =
 N_(
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/olympus-desc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/olympus-desc.c Changed

@@ -12,38 +12,44 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+
 #include <stdio.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <gphoto2/gphoto2-library.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "sierra.h"
 #include "library.h"
 #include "sierra-desc.h"
 
+
 /*
  * Camera descriptor for Olympus C-3040Z, 3000Z (and somday maybe others).
  */
 
 /*
- * Notes: 
+ * Notes:
  *
  * The variable "value" in a ValueNameType is the first element of
  * the name/value union, and so it is the default value initialized.
  *
  * To init to a range, use:
- *	{ .range = { 100.1, 2000.0, 10 } }, NULL 
+ *	{ .range = { 100.1, 2000.0, 10 } }, NULL
  *
  * Casts are used to avoid warnings about using a const.
  *
@@ -52,24 +58,6 @@
  * other data is stored here.
  */
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /*
  * Register 1: resolution/size.
@@ -100,9 +88,9 @@
 	{ { 0x25 }, "2048x1536-TIFF" },
 	{ { 0x26 }, "1360x1024-TIFF" },
 };
-static const RegisterDescriptorType oly3040_reg_01 = { 
+static const RegisterDescriptorType oly3040_reg_01 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"resolution", N_("Resolution plus Size"),
 		VAL_NAME_INIT (oly3040_reg_01_val_names)
 	}
@@ -130,9 +118,9 @@
 	{ { 0x26 }, "TIFF-2218x1712" },
 	{ { 0x27 }, "3:2-TIFF-2218x1712" },
 };
-static const RegisterDescriptorType oly750uz_reg_01 = { 
+static const RegisterDescriptorType oly750uz_reg_01 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"resolution", N_("Resolution plus Size"),
 		VAL_NAME_INIT (oly750uz_reg_01_val_names)
 	}
@@ -159,9 +147,9 @@
 	{ { 0x10107 }, "HQ?-2816x1880-3:2" },
 	{ { 0x107 }, "HQ?-2816x2112-3:2" },
 };
-static const RegisterDescriptorType olysp500uz_reg_01 = { 
+static const RegisterDescriptorType olysp500uz_reg_01 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"resolution", N_("Resolution plus Size"),
 		VAL_NAME_INIT (olysp500uz_reg_01_val_names)
 	}
@@ -171,15 +159,15 @@
  * Register 2: Date and time.
  */
 static const ValueNameType oly3040_reg_02_val_names = {
-	/* 
+	/*
 	 * Dummy value, since we need at least one of these to
 	 * display anything.
 	 */
 	{ { 0x00 }, "Dummy" },
 };
-static const RegisterDescriptorType oly3040_reg_02 = { 
+static const RegisterDescriptorType oly3040_reg_02 = {
 	{
-		GP_WIDGET_DATE, GP_REG_NO_MASK, 
+		GP_WIDGET_DATE, GP_REG_NO_MASK,
 		"date-time", N_("Date and time (GMT)"),
 		VAL_NAME_INIT (oly3040_reg_02_val_names)
 	}
@@ -192,7 +180,7 @@
  *
  * Possibly could be any other value in the range of 1250 and 16M
  */
-static const ValueNameType oly3040_reg_03_val_names = { 
+static const ValueNameType oly3040_reg_03_val_names = {
 	{ {       0 }, N_("Auto") },
 	{ {    1250 }, "1/800" },
 	{ {    2000 }, "1/500" },
@@ -223,15 +211,15 @@
 	{ {16000000 }, "16" },
 
 };
-static const RegisterDescriptorType oly3040_reg_03 = { 
+static const RegisterDescriptorType oly3040_reg_03 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed (in seconds)"),
 		VAL_NAME_INIT (oly3040_reg_03_val_names)
 	}
 };
 
-static const ValueNameType oly750uz_reg_03_val_names = { 
+static const ValueNameType oly750uz_reg_03_val_names = {
 	{ {       0 }, N_("Auto") },
 	{ {    1000 }, "1/1000" },
 	{ {    1250 }, "1/800" },
@@ -277,21 +265,21 @@
 	{ {13000000 }, "13" },
 	{ {16000000 }, "16" },
 };
-static const RegisterDescriptorType oly750uz_reg_03 = { 
+static const RegisterDescriptorType oly750uz_reg_03 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed (in seconds)"),
 		VAL_NAME_INIT (oly750uz_reg_03_val_names)
 	}
 };
 
-static const ValueNameType olysp500uz_reg_03_val_names = { 
+static const ValueNameType olysp500uz_reg_03_val_names = {
 	{ {       0 }, N_("Auto") },
 	{ {     250 }, "1/4000" },
-	{ {     313 }, "1/3200" },	
+	{ {     313 }, "1/3200" },
 	{ {     400 }, "1/2500" },
 	{ {     500 }, "1/2000" },
-	{ {     625 }, "1/1600" },	
+	{ {     625 }, "1/1600" },
 	{ {     800 }, "1/1250" },
 	{ {    1000 }, "1/1000" },
 	{ {    1250 }, "1/800" },
@@ -337,9 +325,9 @@
 	{ {13000000 }, "13" },
 	{ {16000000 }, "16" },
 };
-static const RegisterDescriptorType olysp500uz_reg_03 = { 
+static const RegisterDescriptorType olysp500uz_reg_03 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed (in seconds)"),
 		VAL_NAME_INIT (olysp500uz_reg_03_val_names)
 	}
@@ -350,18 +338,20 @@
  * does not work well, since only about 30 of some 16 million values are
  * valid.
  */
-static const ValueNameType olyrange_reg_03_val_names = { 
+#if 0
+static const ValueNameType olyrange_reg_03_val_names = {
 	{
-		{ .range = { 0, 16000000, 100 } }, NULL 
+		{ .range = { 0, 16000000, 100 } }, NULL
 	}
 };
-static const RegisterDescriptorType olyrange_reg_03 = { 
+static const RegisterDescriptorType olyrange_reg_03 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"shutter", N_("Shutter Speed microseconds (0 auto)"),
 		VAL_NAME_INIT (olyrange_reg_03_val_names)
 	}
 };
+#endif
 
 /*
  * Olympus 3040 Register 5: aperture settings. Works only in A or M mode
@@ -386,9 +376,9 @@
 	{ { 15 }, "F9" },
 	{ { 16 }, "F10" },
 };
-static const RegisterDescriptorType oly3040_reg_05 = { 
+static const RegisterDescriptorType oly3040_reg_05 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"aperture", N_("Aperture Settings"),
 		VAL_NAME_INIT (oly3040_reg_05_val_names)
 	}
@@ -418,9 +408,9 @@
 	{ { 15 }, "F11.0" },
 	{ { 16 }, "F2.0" }, /* Odd */
 };
-static const RegisterDescriptorType oly3000z_reg_05 = { 
+static const RegisterDescriptorType oly3000z_reg_05 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"aperture", N_("Aperture Settings"),
 		VAL_NAME_INIT (oly3000z_reg_05_val_names)
 	}
@@ -442,9 +432,9 @@
 	{ { 11 }, "F7.0" },
 	{ { 12 }, "F8.0" },
 };
-static const RegisterDescriptorType oly750uz_reg_05 = { 
+static const RegisterDescriptorType oly750uz_reg_05 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"aperture", N_("Aperture Settings"),
 		VAL_NAME_INIT (oly750uz_reg_05_val_names)
 	}
@@ -453,6 +443,7 @@
 /*
  * Olympus SP-500uz Register 5: aperture settings.
  */
+#if 0
 static const ValueNameType olysp500uz_reg_05_val_names = {
 	{ { 0 }, N_("Auto") },
 	{ { 28 }, "F2.8" },
@@ -466,13 +457,15 @@
 	{ { 80 }, "F8.0" },
 	{ { 90 }, "F9.0" },
 };
-static const RegisterDescriptorType olysp500uz_reg_05 = { 
+static const RegisterDescriptorType olysp500uz_reg_05 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"aperture", N_("Aperture Settings"),
 		VAL_NAME_INIT (olysp500uz_reg_05_val_names)
 	}
 };
+#endif
+
 /*
  * Register 6: color mode
  */
@@ -483,9 +476,9 @@
 	{ { 3 }, N_("White board") },
 	{ { 4 }, N_("Black board") },
 };
-static const RegisterDescriptorType oly3040_reg_06 = { 
+static const RegisterDescriptorType oly3040_reg_06 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"color", N_("Color or Function Mode"),
 		VAL_NAME_INIT (oly3040_reg_06_val_names)
 	}
@@ -500,10 +493,10 @@
 	{ { 2 }, N_("Off") },
 	{ { 3 }, N_("Anti-redeye") },
 };
-static const RegisterDescriptorType oly3040_reg_07 = { 
+static const RegisterDescriptorType oly3040_reg_07 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"flash", N_("Flash Settings"), 
+		"flash", N_("Flash Settings"),
 		VAL_NAME_INIT (oly3040_reg_07_val_names)
 	}
 };
@@ -516,13 +509,13 @@
 	{ { 1 }, N_("Force") },
 	{ { 2 }, N_("Off") },
 	{ { 3 }, N_("Anti-redeye") },
-	{ { 4 }, N_("Slow") }, 
+	{ { 4 }, N_("Slow") },
 	/* This is always 4 for slow 1, 2, or slow with redeye */
 };
-static const RegisterDescriptorType oly750uz_reg_07 = { 
+static const RegisterDescriptorType oly750uz_reg_07 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"flash", N_("Flash Settings"), 
+		"flash", N_("Flash Settings"),
 		VAL_NAME_INIT (oly750uz_reg_07_val_names)
 	}
 };
@@ -535,15 +528,15 @@
 	{ { 1 }, N_("Force") },
 	{ { 2 }, N_("Off") },
 	{ { 3 }, N_("Anti-redeye") },
-	{ { 4 }, N_("Slow") }, 
+	{ { 4 }, N_("Slow") },
 	/* This is always 4 for slow 1, 2, or slow with redeye */
-	{ { 6 }, N_("Anti-redeye Fill") }, 
+	{ { 6 }, N_("Anti-redeye Fill") },
 };
 
-static const RegisterDescriptorType olysp500uz_reg_07 = { 
+static const RegisterDescriptorType olysp500uz_reg_07 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"flash", N_("Flash Settings"), 
+		"flash", N_("Flash Settings"),
 		VAL_NAME_INIT (olysp500uz_reg_07_val_names)
 	}
 };
@@ -558,7 +551,7 @@
 	{ { 0x03 }, N_("Tungsten") },
 	{ { 0xff }, N_("Cloudy") },
 };
-static const RegisterDescriptorType oly3040_reg_20 = { 
+static const RegisterDescriptorType oly3040_reg_20 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"whitebalance", N_("White Balance"),
@@ -577,7 +570,7 @@
 	{ { 0x03 }, N_("Tungsten") },
 	{ { 0x04 }, N_("Cloudy") },
 };
-static const RegisterDescriptorType oly3000z_reg_20 = { 
+static const RegisterDescriptorType oly3000z_reg_20 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"whitebalance", N_("White Balance"),
@@ -587,7 +580,7 @@
 
 /*
  * Olympus 750uz: Register 20: white balance. The main difference is that
- * we have the flourescent 1 2 and 3:
+ * we have the fluorescent 1 2 and 3:
  */
 static const ValueNameType oly750uz_reg_20_val_names = {
 	{ { 0x00 }, N_("Auto") },
@@ -598,7 +591,7 @@
 	{ { 0x06 }, N_("Fluorescent-3-office-4200K") },
 	{ { 0xff }, N_("Cloudy") },
 };
-static const RegisterDescriptorType oly750uz_reg_20 = { 
+static const RegisterDescriptorType oly750uz_reg_20 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"whitebalance", N_("White Balance"),
@@ -608,7 +601,7 @@
 
 /*
  * Olympus SP 500uz: Register 20: white balance. The main difference is that
- * we have the flourescent 1 2 and 3:
+ * we have the fluorescent 1 2 and 3:
  */
 static const ValueNameType olysp500uz_reg_20_val_names = {
 	{ { 0x00 }, N_("Auto") },
@@ -622,7 +615,7 @@
 	{ { 0xff }, N_("Cloudy") },
 };
 
-static const RegisterDescriptorType olysp500uz_reg_20 = { 
+static const RegisterDescriptorType olysp500uz_reg_20 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"whitebalance", N_("White Balance"),
@@ -638,7 +631,7 @@
 	{ { 0x02 }, N_("Auto") },
 	{ { 0x03 }, N_("Manual") },
 };
-static const RegisterDescriptorType oly3040_reg_33 = { 
+static const RegisterDescriptorType oly3040_reg_33 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"focus-mode", N_("Focus Mode"),
@@ -659,9 +652,9 @@
 	{ { 0x02 }, N_("Monitor") },
 	{ { 0x03 }, N_("Normal") },
 };
-static const RegisterDescriptorType oly3040_reg_34 = { 
+static const RegisterDescriptorType oly3040_reg_34 = {
 	{
-		GP_WIDGET_RADIO, GP_REG_NO_MASK, 
+		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"lcd-mode", N_("LCD Mode"),
 		VAL_NAME_INIT (oly3040_reg_34_val_names)
 	}
@@ -674,7 +667,7 @@
 static const ValueNameType oly3040_reg_35_val_names = {
 	{ { .range = { 0, 7 } }, NULL },
 };
-static const RegisterDescriptorType oly3040_reg_35 = { 
+static const RegisterDescriptorType oly3040_reg_35 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"lcd-brightness", N_("LCD Brightness"),
@@ -688,7 +681,7 @@
 static const ValueNameType oly3040_reg_24_val_names = {
 	{ { .range = { 30, 600, 30  } }, NULL },
 };
-static const RegisterDescriptorType oly3040_reg_24 = { 
+static const RegisterDescriptorType oly3040_reg_24 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"camera-power-save", N_("Camera power save (seconds)"),
@@ -703,7 +696,7 @@
 static const ValueNameType oly3040_reg_23_val_names = {
 	{ { .range = { 30, 600, 30  } }, NULL },
 };
-static const RegisterDescriptorType oly3040_reg_23 = { 
+static const RegisterDescriptorType oly3040_reg_23 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"host-power-save", N_("Host power save (seconds)"),
@@ -716,7 +709,7 @@
 static const ValueNameType oly3040_reg_38_val_names = {
 	{ { .range = { 30, 600, 30  } }, NULL },
 };
-static const RegisterDescriptorType oly3040_reg_38 = { 
+static const RegisterDescriptorType oly3040_reg_38 = {
 	{
 		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"lcd-auto-shutoff", N_("LCD Auto Shut Off (seconds)"),
@@ -733,7 +726,7 @@
 	{ { 0x04 }, N_("French") },
 	{ { 0x05 }, N_("German") },
 };
-static const RegisterDescriptorType oly3040_reg_53 = { 
+static const RegisterDescriptorType oly3040_reg_53 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
 		"language", N_("Language"),
@@ -760,9 +753,9 @@
 	{ { +17 }, "+1.7" },
 	{ { +20 }, "+2.0" },
 };
-static const RegisterDescriptorType oly3040_reg_69 = { 
+static const RegisterDescriptorType oly3040_reg_69 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"exp", N_("Exposure Compensation"),
 		VAL_NAME_INIT (oly3040_reg_69_val_names)
 	}
@@ -775,10 +768,10 @@
 	{ { 0x03 }, N_("Spot") },
 	{ { 0x05 }, N_("Matrix") },
 };
-static const RegisterDescriptorType oly3040_reg_70 = { 
+static const RegisterDescriptorType oly3040_reg_70 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"exp-meter", N_("Exposure Metering"), 
+		"exp-meter", N_("Exposure Metering"),
 		VAL_NAME_INIT (oly3040_reg_70_val_names)
 	}
 };
@@ -793,10 +786,10 @@
 	{ { 0x05 }, N_("Matrix") },
 };
 
-static const RegisterDescriptorType olysp500uz_reg_70 = { 
+static const RegisterDescriptorType olysp500uz_reg_70 = {
 	{
 		GP_WIDGET_RADIO, GP_REG_NO_MASK,
-		"exp-meter", N_("Exposure Metering"), 
+		"exp-meter", N_("Exposure Metering"),
 		VAL_NAME_INIT (olysp500uz_reg_70_val_names)
 	}
 };
@@ -809,9 +802,9 @@
 		{ .range = { 6.3, 63.0, .1 } }, NULL
 	}
 };
-static const RegisterDescriptorType oly750uz_reg_71 = { 
+static const RegisterDescriptorType oly750uz_reg_71 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"zoom", N_("Zoom (in millimeters)"),
 		VAL_NAME_INIT (oly750uz_reg_71_val_names)
 	}
@@ -820,18 +813,20 @@
 /*
  * Oly SP-500 uz Register 71: optical zoom value.
  */
+#if 0
 static const ValueNameType olysp500uz_reg_71_val_names = {
 	{
 		{ .range = { 6.3, 63.0, .3 } }, NULL
 	}
 };
-static const RegisterDescriptorType olysp500uz_reg_71 = { 
+static const RegisterDescriptorType olysp500uz_reg_71 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"zoom", N_("Zoom (in millimeters)"),
 		VAL_NAME_INIT (olysp500uz_reg_71_val_names)
 	}
 };
+#endif
 
 /*
  * Oly 3040 Register 71: optical zoom value.
@@ -841,9 +836,9 @@
 		{ .range = { 7.3, 21.0, .1 } }, NULL
 	}
 };
-static const RegisterDescriptorType oly3040_reg_71 = { 
+static const RegisterDescriptorType oly3040_reg_71 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"zoom", N_("Zoom (in millimeters)"),
 		VAL_NAME_INIT (oly3040_reg_71_val_names)
 	}
@@ -858,9 +853,9 @@
 	{ { 0x0008 }, "2x" },
 	{ { 0x0408 }, "2.5x" },
 };
-static const RegisterDescriptorType oly3040_reg_72 = { 
+static const RegisterDescriptorType oly3040_reg_72 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"dzoom", N_("Digital zoom"),
 		VAL_NAME_INIT (oly3040_reg_72_val_names)
 	}
@@ -875,9 +870,9 @@
 	{ { 2 }, "200" },
 	{ { 3 }, "400" },
 };
-static const RegisterDescriptorType oly3040_reg_85 = { 
+static const RegisterDescriptorType oly3040_reg_85 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"iso", N_("ISO Speed"),
 		VAL_NAME_INIT (oly3040_reg_85_val_names)
 	}
@@ -893,9 +888,9 @@
 	{ { 3 }, "400" },
 	{ { 4 }, "50" },
 };
-static const RegisterDescriptorType oly750uz_reg_85 = { 
+static const RegisterDescriptorType oly750uz_reg_85 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"iso", N_("ISO Speed"),
 		VAL_NAME_INIT (oly750uz_reg_85_val_names)
 	}
@@ -909,9 +904,9 @@
 static const ValueNameType oly3040_reg_103_val_names = {
 	{ { .range = { 1, 240, 1 } }, NULL },
 };
-static const RegisterDescriptorType oly3040_reg_103 = { 
+static const RegisterDescriptorType oly3040_reg_103 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"focus-pos", N_("Focus position"),
 		VAL_NAME_INIT (oly3040_reg_103_val_names)
 	}
@@ -925,9 +920,9 @@
 static const ValueNameType oly750uz_reg_103_val_names = {
 	{ { .range = { 1, 120, 1 } }, NULL },
 };
-static const RegisterDescriptorType oly750uz_reg_103 = { 
+static const RegisterDescriptorType oly750uz_reg_103 = {
 	{
-		GP_WIDGET_RANGE, GP_REG_NO_MASK, 
+		GP_WIDGET_RANGE, GP_REG_NO_MASK,
 		"focus-pos", N_("Focus position"),
 		VAL_NAME_INIT (oly750uz_reg_103_val_names)
 	}
@@ -942,9 +937,9 @@
 	{ { 2 }, "mmddyy" },
 	{ { 3 }, "ddmmyy" },
 };
-static const RegisterDescriptorType oly3040_reg_41 = { 
+static const RegisterDescriptorType oly3040_reg_41 = {
 	{
-		GP_WIDGET_MENU, GP_REG_NO_MASK, 
+		GP_WIDGET_MENU, GP_REG_NO_MASK,
 		"timefmt", N_("Time format"),
 		VAL_NAME_INIT (oly3040_reg_41_val_names)
 	}
@@ -999,7 +994,7 @@
  */
 static CameraRegisterType oly3040_cam_regs = {
 	CAM_REG_TYPE_INIT (oly3040, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (oly3040, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (oly3040, 38, 4, CAM_DESC_DEFAULT, 0), /* LCD auto shutoff */
@@ -1009,12 +1004,12 @@
 };
 
 static const CameraRegisterSetType oly3040_desc = {
-		{ 
-			N_("Picture Settings"), 
+		{
+			N_("Picture Settings"),
 			SIZE_ADDR (CameraRegisterType, oly3040_pic_regs)
 		},
-		{ 
-			N_("Camera Settings"), 
+		{
+			N_("Camera Settings"),
 			SIZE_ADDR (CameraRegisterType, oly3040_cam_regs)
 		},
 };
@@ -1054,7 +1049,7 @@
  */
 static CameraRegisterType oly750uz_cam_regs = {
 	CAM_REG_TYPE_INIT (oly3040, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (oly3040, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (oly3040, 38, 4, CAM_DESC_DEFAULT, 0), /* LCD auto shutoff */
@@ -1098,7 +1093,7 @@
  */
 static CameraRegisterType olysp500uz_cam_regs = {
 	CAM_REG_TYPE_INIT (oly3040, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */
-	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION, 
+	CAM_REG_TYPE_INIT (oly3040, 34, 4, CAM_DESC_SUBACTION,
 			  SIERRA_ACTION_LCD_MODE), /* lcd mode */
 	CAM_REG_TYPE_INIT (oly3040, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */
 	CAM_REG_TYPE_INIT (oly3040, 38, 4, CAM_DESC_DEFAULT, 0), /* LCD auto shutoff */
@@ -1108,36 +1103,36 @@
 };
 
 static const CameraRegisterSetType olysp500uz_desc = {
-		{ 
-			N_("Picture Settings"), 
+		{
+			N_("Picture Settings"),
 			SIZE_ADDR (CameraRegisterType, olysp500uz_pic_regs)
 		},
-		{ 
-			N_("Camera Settings"), 
+		{
+			N_("Camera Settings"),
 			SIZE_ADDR (CameraRegisterType, olysp500uz_cam_regs)
 		},
 };
 
 static const CameraRegisterSetType oly750uz_desc = {
-		{ 
-			N_("Picture Settings"), 
+		{
+			N_("Picture Settings"),
 			SIZE_ADDR (CameraRegisterType, oly750uz_pic_regs)
 		},
-		{ 
-			N_("Camera Settings"), 
+		{
+			N_("Camera Settings"),
 			SIZE_ADDR (CameraRegisterType, oly750uz_cam_regs)
 		},
 };
 static const CameraRegisterSetType oly3000z_desc = {
-		{ 
-			N_("Picture Settings"), 
+		{
+			N_("Picture Settings"),
 			SIZE_ADDR (CameraRegisterType, oly3000z_pic_regs)
 		},
-		{ 
+		{
 			/*
 			 * Assumed that these are all the same as the 3040
 			 */
-			N_("Camera Settings"), 
+			N_("Camera Settings"),
 			SIZE_ADDR (CameraRegisterType, oly3040_cam_regs)
 		},
 };
@@ -1177,7 +1172,7 @@
 "    PC, then switch LCD to 'Off'."
 );
 
-static const char default_manual = 
+static const char default_manual =
 N_(
 "Default sierra driver:\n\n"
 "    This is the default sierra driver, it\n"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra-desc.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra-desc.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra-desc.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra-desc.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra-usbwrap.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra-usbwrap.c Changed

@@ -8,29 +8,29 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
- * 
+ *
  *
  * Olympus C-3040Z (and possibly also the C-2040Z and others) have
  * a USB PC Control mode in which "Sierra" protocol packets are tunneled
  * inside another protocol.  This file implements the wrapper protocol.
  * The (ab)use of USB clear halt is not needed for this protocol.
- * 
+ *
  * The other protocol is "SCSI via USB Mass Storage", so we can also use
  * the Linux SCSI APIs. Interesting is also that the header looks a bit
  * like a PTP header.
  *
  * IMPORTANT: In order to use this mode, the camera must be switched
  * _out_ of "USB Mass Storage" mode and into "USB PC control mode".
- * The images will not be accessable as a mass-storage/disk device in
+ * The images will not be accessible as a mass-storage/disk device in
  * this mode, but you can control the camera, tell it to take pictures
  * and download images using the protocol implemented in sierra.c.
  *
@@ -50,7 +50,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <_stdint.h>
+#include <stdint.h>
 
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-log.h>
@@ -138,7 +138,7 @@
       unsigned char flags;      /* in / out flag mostly */
       unsigned char lun;        /* 0 here */
       unsigned char length;     /* of the CDB... but 0x0c is used here in the traces */
-      unsigned char cdb16;    
+      unsigned char cdb16;
 } uw_header_t;
 
 /*
@@ -373,7 +373,7 @@
    int ret, msg_len = sizeof(*msg) + sierra_len;
    char sense_buffer32;
    uw_scsicmd_t cmd;
-   
+
    GP_DEBUG( "usb_wrap_CMND" );
 
    memset(&cmd,  0, sizeof(cmd));
@@ -387,7 +387,7 @@
    memcpy((char*)msg + sizeof(*msg), sierra_msg, sierra_len);
 
    GP_DEBUG( "usb_wrap_CMND writing %i", msg_len);
-   
+
    ret = gp_port_send_scsi_cmd (dev, 1, (char*)&cmd, sizeof(cmd),
    	 sense_buffer, sizeof(sense_buffer), (char*)msg, msg_len);
    free(msg);
@@ -408,7 +408,7 @@
    int ret;
    char sense_buffer32;
    uw_scsicmd_t cmd;
-  
+
    GP_DEBUG( "usb_wrap_SIZE" );
 
    memset(&cmd,  0, sizeof(cmd));
@@ -459,7 +459,7 @@
    msg_len = msg_len * 256 + (unsigned int)(size.c2);
    msg_len = msg_len * 256 + (unsigned int)(size.c1);
 
-   if (*sierra_len < msg_len - sizeof(*msg))
+   if ((unsigned int)*sierra_len < msg_len - sizeof(*msg))
    {
       GP_DEBUG( "usb_wrap_read_packet buffer too small! (%i < %i) *** FAILED", *sierra_len, msg_len);
       return GP_ERROR;
@@ -499,7 +499,7 @@
 	CR (usb_wrap_RDY (dev, type));
 	CR (usb_wrap_CMND (dev, type, sierra_msg, sierra_len));
 	CR (usb_wrap_STAT (dev, type));
-	
+
 	return GP_OK;
 }
 
@@ -514,6 +514,6 @@
 	CR (usb_wrap_SIZE (dev, type, &uw_size));
 	CR (usb_wrap_DATA (dev, type, sierra_response, &sierra_len, uw_size));
 	CR (usb_wrap_STAT (dev, type));
-	
+
 	return sierra_len;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra-usbwrap.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra-usbwrap.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra.c Changed

@@ -7,23 +7,23 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 #include "sierra.h"
 
 #include <stdlib.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -31,27 +31,11 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "sierra-desc.h"
 #include "library.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE "sierra"
 
@@ -60,8 +44,8 @@
 /* Useful markers */
 static const char JPEG_SOI_MARKER  = { (char)0xFF, (char)0xD8, '\0' };
 static const char JPEG_SOF_MARKER  = { (char)0xFF, (char)0xD9, '\0' };
-static const char JPEG_APP1_MARKER = { (char)0xFF, (char)0xE1, '\0' };
-static const char TIFF_SOI_MARKER  = { (char)0x49, (char)0x49, (char)0x2A, (char)0x00, (char)0x08, '\0' };
+/*static const char JPEG_APP1_MARKER = { (char)0xFF, (char)0xE1, '\0' };*/
+/*static const char TIFF_SOI_MARKER  = { (char)0x49, (char)0x49, (char)0x2A, (char)0x00, (char)0x08, '\0' };*/
 
 static struct {
 	const char *manuf;
@@ -74,7 +58,7 @@
 } sierra_cameras = {
 	/* Manufacturer, Camera Model, Sierra Model,
 	   USBvendor id, USB product id,
-	   USB wrapper protocol, CameraDesc) */ 
+	   USB wrapper protocol, CameraDesc) */
 	{"Agfa", "ePhoto 307", 	SIERRA_MODEL_DEFAULT, 	0, 0,
 		SIERRA_NO_51, NULL},
 	{"Agfa", "ePhoto 780", 	SIERRA_MODEL_DEFAULT, 	0, 0, 0, NULL },
@@ -121,6 +105,9 @@
 	{"Nikon", "CoolPix 4300 (Sierra Mode)", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x010e,
 						SIERRA_WRAP_USB_NIKON | SIERRA_NO_51,
 							&cp4300_cam_desc},
+	{"Nikon", "CoolPix 4100 (Sierra Mode)", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x012c,
+						SIERRA_WRAP_USB_NIKON | SIERRA_NO_51,
+							&cp4300_cam_desc},
 	{"Nikon", "CoolPix 3500 (Sierra Mode)", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x0110,
 						SIERRA_WRAP_USB_NIKON | SIERRA_NO_51,
 							&cp880_cam_desc},
@@ -166,7 +153,7 @@
 	{"Olympus", "C-900 Zoom", 	SIERRA_MODEL_OLYMPUS,	0, 0, 0, NULL },
 	{"Olympus", "C-900L Zoom", SIERRA_MODEL_OLYMPUS,	0, 0, 0, NULL },
 
-	/* http://sourceforge.net/tracker/index.php?func=detail&aid=1082569&group_id=8874&atid=358874 
+	/* http://sourceforge.net/tracker/index.php?func=detail&aid=1082569&group_id=8874&atid=358874
 	 * strangely only works with low speed
 	 */
 	{"Olympus", "C-990 Zoom", 	SIERRA_MODEL_OLYMPUS,	0, 0, SIERRA_LOW_SPEED, NULL },
@@ -258,14 +245,14 @@
 	{0, 0}
 };
 
-int camera_id (CameraText *id) 
+int camera_id (CameraText *id)
 {
 	strcpy(id->text, "sierra");
 
 	return (GP_OK);
 }
 
-int camera_abilities (CameraAbilitiesList *list) 
+int camera_abilities (CameraAbilitiesList *list)
 {
 	int x;
 	CameraAbilities a;
@@ -292,7 +279,7 @@
 		a.speed2 = 38400;
 		if (sierra_camerasx.flags & SIERRA_LOW_SPEED) {
 			/*
-			 * Camera supports 9600 -> 38400 
+			 * Camera supports 9600 -> 38400
 			 */
 			a.speed3 = 0;
 		} else {
@@ -310,7 +297,7 @@
 		a.operations        = 	GP_OPERATION_CAPTURE_IMAGE |
 					GP_OPERATION_CAPTURE_PREVIEW |
 					GP_OPERATION_CONFIG;
-		a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+		a.file_operations   = 	GP_FILE_OPERATION_DELETE |
 					GP_FILE_OPERATION_PREVIEW |
 					GP_FILE_OPERATION_AUDIO;
 		a.folder_operations = 	GP_FOLDER_OPERATION_DELETE_ALL |
@@ -499,7 +486,7 @@
 }
 
 int
-camera_stop (Camera *camera, GPContext *context) 
+camera_stop (Camera *camera, GPContext *context)
 {
 	GP_DEBUG ("Closing connection");
 
@@ -515,7 +502,7 @@
 }
 
 static int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	GP_DEBUG ("sierra camera_exit");
 
@@ -589,7 +576,7 @@
 	case GP_FILE_TYPE_AUDIO:
 		CHECK_STOP (camera, sierra_get_string_register (camera, 43, n, NULL,
 			(unsigned char *) &audio_info, &transferred, context));
-		if (transferred == 0) 
+		if (transferred == 0)
 			download_size = 0;
 		else
 			download_size = audio_info0;
@@ -618,7 +605,7 @@
 		/* * Thumbnails are always JPEG files (as far as we know...) */
 		CHECK (gp_file_set_mime_type (file, GP_MIME_JPEG));
 
-		/* 
+		/*
 		 * Some camera (e.g. Epson 3000z) send the EXIF application
 		 * data as thumbnail of a picture. The JPEG file need to be
 		 * extracted. Equally for movies, the JPEG thumbnail is
@@ -646,7 +633,7 @@
 		if (!strcmp (mime_type, GP_MIME_RAW))
 			CHECK (gp_file_set_mime_type (file, GP_MIME_QUICKTIME));
 		break;
-	
+
 	case GP_FILE_TYPE_AUDIO:
 		CHECK (gp_file_set_mime_type (file, GP_MIME_WAV));
 		break;
@@ -678,8 +665,8 @@
 	 * Mick Grant <mickgr@drahthaar.clara.net> found out that his
 	 * Nicon CoolPix 880 won't have deleted any picture at this point.
 	 * It seems that those cameras just acknowledge the command but do
-	 * nothing in the end. Therefore, we have to count the number of 
-	 * pictures that are now on the camera. If there indeed are any 
+	 * nothing in the end. Therefore, we have to count the number of
+	 * pictures that are now on the camera. If there indeed are any
 	 * pictures, return an error. libgphoto2 will then try to manually
 	 * delete them one-by-one.
 	 */
@@ -692,7 +679,7 @@
 
 static int
 delete_file_func (CameraFilesystem *fs, const char *folder,
-		  const char *filename, void *data, GPContext *context) 
+		  const char *filename, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int n;
@@ -715,7 +702,7 @@
 	/*
 	 * The following command takes a while, and there is no way to add
 	 * a nice progress bar, since it is a single sierra_action call.
-	 * so multiple gp_context_progress_update () calls can not add 
+	 * so multiple gp_context_progress_update () calls can not add
 	 * anything.
 	 */
 	CHECK_STOP (camera, sierra_delete (camera, n + 1, context));
@@ -726,7 +713,7 @@
 
 static int
 camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
-		GPContext *context) 
+		GPContext *context)
 {
 	CHECK (camera_start (camera, context));
 	CHECK_STOP (camera, sierra_capture (camera, type, path, context));
@@ -762,7 +749,7 @@
 
 	if (type != GP_FILE_TYPE_NORMAL)
 		return GP_ERROR_BAD_PARAMETERS;
-	
+
 	/* Check the size */
 	CHECK (gp_file_get_data_and_size (file, &data_file, &data_size));
 	if ( data_size == 0 ) {
@@ -779,7 +766,7 @@
 
 	/* Check the available memory */
 	CHECK (sierra_get_memory_left(camera, &available_memory, context));
-	if (available_memory < data_size) {
+	if (available_memory < 0 || (unsigned int)available_memory < data_size) {
 		gp_context_error (context,
 				    _("Not enough memory available on the memory card"));
 		return GP_ERROR_NO_MEMORY;
@@ -866,7 +853,7 @@
 		"spot metering mode",		/* 70 */
 		"?",
 		"zoom",
-		"?", "?", "?", "?", "?", "?", 
+		"?", "?", "?", "?", "?", "?",
 		"current filename",
 		"?",				/* 80 */
 		"?", "?",
@@ -883,14 +870,14 @@
 		"?", "?", "?", "?", "?", "?", "?", "?", "?",
 		"?"				/* 130 */
 	};
-		
+
 
 	GP_DEBUG ("*** Register:");
 	for (i = 0; i < 128; i++) {
 		ret = sierra_get_int_register (camera, i, &value, context);
 		if (ret >= 0)
 			GP_DEBUG (
-					 "***  %3i: %12i (%s)", i, value, 
+					 "***  %3i: %12i (%s)", i, value,
 					 description i);
 	}
 }
@@ -924,7 +911,7 @@
 		gp_widget_add_choice (child, _("Standard"));
 		gp_widget_add_choice (child, _("High"));
 		gp_widget_add_choice (child, _("Best"));
-		
+
                 switch (value) {
 		case 0: strcpy (t, _("Auto"));
 			break;
@@ -945,9 +932,9 @@
 	/* Shutter Speed */
         ret = sierra_get_int_register (camera, 3, &value, context);
         if (ret >= 0) {
-		
-		gp_widget_new (GP_WIDGET_RANGE, 
-			       _("Shutter Speed (microseconds, 0 auto)"), 
+
+		gp_widget_new (GP_WIDGET_RANGE,
+			       _("Shutter Speed (microseconds, 0 auto)"),
 			       &child);
 		gp_widget_set_range (child, 0, 2000000, 1);
 		float_value = value;
@@ -1049,7 +1036,7 @@
         ret = sierra_get_int_register (camera, 19, &value, context);
         if (ret >= 0) {
 
-		gp_widget_new (GP_WIDGET_RADIO, _("Brightness/Contrast"), 
+		gp_widget_new (GP_WIDGET_RADIO, _("Brightness/Contrast"),
 			       &child);
 		gp_widget_add_choice (child, _("Normal"));
 		gp_widget_add_choice (child, _("Bright+"));
@@ -1079,7 +1066,7 @@
 	/* White Balance */
         ret = sierra_get_int_register (camera, 20, &value, context);
         if (ret >= 0) {
-		
+
 		gp_widget_new (GP_WIDGET_RADIO, _("White Balance"), &child);
 		gp_widget_add_choice (child, _("Auto"));
 		gp_widget_add_choice (child, _("Skylight"));
@@ -1134,8 +1121,8 @@
 	/* Spot Metering Mode */
 	ret = sierra_get_int_register (camera, 70, &value, context);
 	if (ret >= 0) {
-		
-		gp_widget_new (GP_WIDGET_RADIO, _("Spot Metering Mode"), 
+
+		gp_widget_new (GP_WIDGET_RADIO, _("Spot Metering Mode"),
 			       &child);
 		gp_widget_add_choice (child, _("On"));
 		gp_widget_add_choice (child, _("Off"));
@@ -1188,7 +1175,7 @@
 	/* Auto Off (host) */
 	ret = sierra_get_int_register (camera, 23, &value, context);
 	if (ret >= 0) {
-		
+
 		gp_widget_new (GP_WIDGET_RANGE, _("Auto Off (host) "
 				       "(in seconds)"), &child);
 		gp_widget_set_info (child, _("How long will it take until the "
@@ -1216,7 +1203,7 @@
 	/* LCD Brightness */
 	ret = sierra_get_int_register (camera, 35, &value, context);
 	if (ret >= 0) {
-		
+
 		gp_widget_new (GP_WIDGET_RANGE, _("LCD Brightness"), &child);
 		gp_widget_set_range (child, 1, 7, 1);
 		gp_widget_set_value (child, &value);
@@ -1268,10 +1255,10 @@
 			return (GP_ERROR_NOT_SUPPORTED);
 		CHECK_STOP (camera, sierra_set_int_register (camera, 1, i, context));
 	}
-	
+
 	/* Shutter Speed */
 	GP_DEBUG ("*** setting shutter speed");
-	if ((gp_widget_get_child_by_label (window, 
+	if ((gp_widget_get_child_by_label (window,
 		_("Shutter Speed (microseconds, 0 auto)"), &child) >= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1282,7 +1269,7 @@
 
 	/* Aperture */
 	GP_DEBUG ("*** setting aperture");
-	if ((gp_widget_get_child_by_label (window, _("Aperture"), &child) 
+	if ((gp_widget_get_child_by_label (window, _("Aperture"), &child)
 		>= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1347,7 +1334,7 @@
 	/* Brightness/Contrast */
 	GP_DEBUG (
 			 "*** setting brightness/contrast");
-	if ((gp_widget_get_child_by_label (window, _("Brightness/Contrast"), 
+	if ((gp_widget_get_child_by_label (window, _("Brightness/Contrast"),
 		&child) >= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1410,7 +1397,7 @@
 	/* Spot Metering Mode */
 	GP_DEBUG (
 			 "*** setting spot metering mode");
-	if ((gp_widget_get_child_by_label (window, _("Spot Metering Mode"), 
+	if ((gp_widget_get_child_by_label (window, _("Spot Metering Mode"),
 		&child) >= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1426,7 +1413,7 @@
 
 	/* Zoom */
 	GP_DEBUG ("*** setting zoom");
-	if ((gp_widget_get_child_by_label (window, _("Zoom"), &child) 
+	if ((gp_widget_get_child_by_label (window, _("Zoom"), &child)
 		>= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1439,7 +1426,7 @@
 			i = 520;
 		} else if (strcmp (value, "2.5x") == 0) {
 			i = 1032;
-		} else 
+		} else
 			return (GP_ERROR_NOT_SUPPORTED);
 		CHECK_STOP (camera, sierra_set_int_register (camera, 72, i, context));
 	}
@@ -1467,7 +1454,7 @@
 
         /* LCD Brightness */
 	GP_DEBUG ("*** setting lcd brightness");
-	if ((gp_widget_get_child_by_label (window, 
+	if ((gp_widget_get_child_by_label (window,
 		_("LCD Brightness"), &child) >= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1477,7 +1464,7 @@
 
         /* LCD Auto Off */
 	GP_DEBUG ("*** setting lcd auto off");
-	if ((gp_widget_get_child_by_label (window, 
+	if ((gp_widget_get_child_by_label (window,
 		_("LCD Auto Off (in seconds)"), &child) >= 0) &&
 	    gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
@@ -1524,13 +1511,13 @@
 			break;
                 case 2: strcpy (t, _("F2.8"));
 			break;
-                case 3: strcpy (t, _("F4"));    
+                case 3: strcpy (t, _("F4"));
 			break;
-		case 4: strcpy (t, _("F5.6"));  
+		case 4: strcpy (t, _("F5.6"));
 			break;
-		case 5: strcpy (t, _("F8"));    
+		case 5: strcpy (t, _("F8"));
 			break;
-		case 6: strcpy (t, _("auto"));  
+		case 6: strcpy (t, _("auto"));
 			break;
                 default:
 			sprintf(t, _("%i (unknown)"), value);
@@ -1621,7 +1608,7 @@
 		gp_widget_add_choice (child, _("fine"));
 		gp_widget_add_choice (child, _("superfine"));
 		gp_widget_add_choice (child, _("HyPict"));
-		
+
                 switch (value) {
 		case 1: strcpy (t, _("standard"));
 			break;
@@ -1664,7 +1651,7 @@
 	/* Auto Off (host) */
 	ret = sierra_get_int_register (camera, 23, &value, context);
 	if (ret >= 0) {
-		
+
 		gp_widget_new (GP_WIDGET_RANGE, _("Auto Off (host) "
 				       "(in seconds)"), &child);
 		gp_widget_set_info (child, _("How long will it take until the "
@@ -1750,7 +1737,7 @@
 
 	/* Aperture */
 	GP_DEBUG ("*** setting aperture");
-	if ((gp_widget_get_child_by_label (window, _("Aperture"), &child) 
+	if ((gp_widget_get_child_by_label (window, _("Aperture"), &child)
 	     >= 0) && gp_widget_changed (child)) {
 	        gp_widget_set_changed (child, FALSE);
 		gp_widget_get_value (child, &value);
@@ -1767,7 +1754,7 @@
 		} else if (strcmp (value, _("F8")) == 0) {
 			i = 5;
 		} else if (strcmp (value, _("auto")) == 0) {
-			i = 6;			
+			i = 6;
 		} else
 			return (GP_ERROR_NOT_SUPPORTED);
 		CHECK_STOP (camera, sierra_set_int_register (camera, 5, i, context));
@@ -1845,7 +1832,7 @@
 			return (GP_ERROR_NOT_SUPPORTED);
 		CHECK_STOP (camera, sierra_set_int_register (camera, 1, i, context));
 	}
-	
+
 	/* Color Mode */
 	GP_DEBUG ("*** setting color mode");
 	if ((gp_widget_get_child_by_label (window, _("Color Mode"), &child)
@@ -1938,7 +1925,7 @@
 
 
 static int
-camera_summary (Camera *camera, CameraText *summary, GPContext *c) 
+camera_summary (Camera *camera, CameraText *summary, GPContext *c)
 {
 	char buf1024*32;
 	int v, r;
@@ -2055,7 +2042,7 @@
 }
 
 static int
-camera_manual (Camera *camera, CameraText *manual, GPContext *context) 
+camera_manual (Camera *camera, CameraText *manual, GPContext *context)
 {
 	GP_DEBUG ("*** sierra camera_manual");
 
@@ -2080,7 +2067,7 @@
 		break;
 	case SIERRA_MODEL_OLYMPUS:
 	default:
-		strcpy (manual->text, 
+		strcpy (manual->text,
 		  _("Some notes about Olympus cameras (and others?):\n"
 		    "(1) Camera Configuration:\n"
 		    "    A value of 0 will take the default one (auto).\n"
@@ -2103,11 +2090,11 @@
 }
 
 static int
-camera_about (Camera *camera, CameraText *about, GPContext *context) 
+camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
 	GP_DEBUG ("*** sierra camera_about");
-	
-	strcpy (about->text, 
+
+	strcpy (about->text,
 		_("sierra SPARClite library\n"
 		"Scott Fritzinger <scottf@unr.edu>\n"
 		"Support for sierra-based digital cameras\n"
@@ -2125,7 +2112,7 @@
  * @data: input data table
  * @data_size: table size
  * @jpeg_data: return JPEG data table (NULL if no valid data is found).
- *             To be free by the the caller.
+ *             To be free by the caller.
  * @jpeg_size: return size of the jpeg_data table.
  *
  * Extract JPEG data form the provided input data (looking for the SOI
@@ -2144,7 +2131,7 @@
 		if (memcmp(data+i, JPEG_SOF_MARKER, 2) == 0)
 			sof_marker = data + i;
 	}
-   
+
 	if (soi_marker && sof_marker) {
 		/* Valid JPEG data has been found: build the output table */
 		*jpeg_size = sof_marker - soi_marker + 2;
@@ -2175,7 +2162,7 @@
 };
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
         int x = 0, ret, value;
         int vendor=0;
@@ -2256,7 +2243,7 @@
 			/* Find the speed into abilities.speeds array.
 			 * Highest speeds are last ... so look backwards ...
 			 */
-			for (i=0;i<sizeof(a.speed)/sizeof(a.speed0) && a.speedi;i++)
+			for (i=0;(unsigned int)i<sizeof(a.speed)/sizeof(a.speed0) && a.speedi;i++)
 				/*empty*/;
 			i--;
 			for (; i >= 0 ; i--) {
@@ -2310,7 +2297,27 @@
 	 * contents of this register and directly proceed with checking for
 	 * folder support, the camera doesn't send anything.
 	 */
-	sierra_get_int_register (camera, 1, &value, NULL);
+	if (camera->pl->model == SIERRA_MODEL_EPSON && camera->port->type == GP_PORT_SERIAL) {
+		/*
+		 * At least Epson PhotoPC 500 with firmware v22-75 fails to
+		 * work above 38400bps - all commands time out.
+		 * Windows driver awaits response for up to 500ms, then
+		 * switches to byte-by-byte write mode.
+		 */
+		gp_port_set_timeout (camera->port, 55); /* 55ms, retried 9 times */
+		x = 0;
+		do {
+			ret = sierra_get_int_register (camera, 1, &value, NULL);
+			if (ret != GP_OK && x == 0)
+				GP_DEBUG ("We're probably too fast for the camera: disabling block writes");
+			camera->pl->flags |= SIERRA_NO_BLOCK_WRITE;
+			if (++x > 2) {
+				GP_DEBUG ("No response even without block writes. Giving up...");
+				break;
+			}
+		} while (ret != GP_OK);
+	} else
+		sierra_get_int_register (camera, 1, &value, NULL);
 
 #if 0
         /* FIXME??? What's that for? "Resetting folder system"? */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sierra/sierra.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sierra/sierra.h Changed

@@ -7,16 +7,20 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+
+#ifndef CAMLIBS_SIERRA_SIERRA_H
+#define CAMLIBS_SIERRA_SIERRA_H
+
 typedef enum {
 	SIERRA_MODEL_DEFAULT,
 	SIERRA_MODEL_EPSON,
@@ -39,6 +43,7 @@
 	SIERRA_NO_USB_CLEAR	= 1<<6,
 	SIERRA_NO_REGISTER_40	= 1<<7,
 	SIERRA_MID_SPEED	= 1<<8,	/* serial line 9600 -> 57600 */
+	SIERRA_NO_BLOCK_WRITE	= 1<<9,
 } SierraFlags;
 
 struct _CameraPrivateLibrary {
@@ -63,3 +68,5 @@
 		return (res);				\
 	}						\
 }
+
+#endif /* !defined(CAMLIBS_SIERRA_SIERRA_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/Makefile-files Changed

@@ -1,28 +1,45 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
+
+EXTRA_DIST                   += %reldir%/ChangeLog
+EXTRA_DIST                   += %reldir%/blink.c
+EXTRA_DIST                   += %reldir%/blink.txt
+EXTRA_DIST                   += %reldir%/blink2.txt
+EXTRA_DIST                   += %reldir%/web2.html
+EXTRA_DIST                   += %reldir%/xjpeg.c
 
-EXTRA_DIST += sipix/web2.html sipix/blink.c sipix/blink.txt \
-	sipix/xjpeg.c sipix/blink2.txt sipix/ChangeLog
 
 # Seems to be obsolete
-EXTRA_LTLIBRARIES += sipix_blink.la
+EXTRA_LTLIBRARIES            += sipix_blink.la
+
+sipix_blink_la_SOURCES        = %reldir%/blink.c
+
+sipix_blink_la_CFLAGS         = $(camlib_cflags)
+sipix_blink_la_CPPFLAGS       = $(camlib_cppflags)
+sipix_blink_la_DEPENDENCIES   = $(camlib_dependencies)
+sipix_blink_la_LDFLAGS        = $(camlib_ldflags)
+sipix_blink_la_LIBADD         = $(camlib_libadd)
+
+
+EXTRA_LTLIBRARIES            += sipix_blink2.la
 
-sipix_blink_la_SOURCES	= sipix/blink.c
-sipix_blink_la_LDFLAGS = $(camlib_ldflags)
-sipix_blink_la_DEPENDENCIES = $(camlib_dependencies)
-sipix_blink_la_LIBADD = $(camlib_libadd)
+sipix_blink2_la_SOURCES       = %reldir%/blink2.c
 
+sipix_blink2_la_CFLAGS        = $(camlib_cflags)
+sipix_blink2_la_CPPFLAGS      = $(camlib_cppflags)
+sipix_blink2_la_DEPENDENCIES  = $(camlib_dependencies)
+sipix_blink2_la_LDFLAGS       = $(camlib_ldflags)
+sipix_blink2_la_LIBADD        = $(camlib_libadd)
 
-EXTRA_LTLIBRARIES += sipix_blink2.la
+sipix_blink2_la_CPPFLAGS     += $(LIBJPEG_CFLAGS)
+sipix_blink2_la_LIBADD       += $(LIBJPEG_LIBS)
 
-sipix_blink2_la_SOURCES	= sipix/blink2.c
-sipix_blink2_la_LDFLAGS = $(camlib_ldflags)
-sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies)
-sipix_blink2_la_LIBADD = $(camlib_libadd) @LIBJPEG@
 
+EXTRA_LTLIBRARIES            += sipix_web2.la
 
-EXTRA_LTLIBRARIES += sipix_web2.la
+sipix_web2_la_SOURCES         = %reldir%/web2.c
 
-sipix_web2_la_SOURCES = sipix/web2.c
-sipix_web2_la_LDFLAGS = $(camlib_ldflags)
-sipix_web2_la_DEPENDENCIES = $(camlib_dependencies)
-sipix_web2_la_LIBADD = $(camlib_libadd)
+sipix_web2_la_CFLAGS          = $(camlib_cflags)
+sipix_web2_la_CPPFLAGS        = $(camlib_cppflags)
+sipix_web2_la_DEPENDENCIES    = $(camlib_dependencies)
+sipix_web2_la_LDFLAGS         = $(camlib_ldflags)
+sipix_web2_la_LIBADD          = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/blink.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/blink.c Changed

@@ -30,19 +30,8 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 int
 camera_id (CameraText *id)
@@ -892,6 +881,7 @@
 	/* gp_list_populate (list, "blink%03i.raw", numpics); */
 #if 1
 	for (i=0;i<numpics;i++) {
+		memset (&info, 0, sizeof (info));
 		/* we also get the fs info for free, so just set it */
 		info.file.fields = GP_FILE_INFO_TYPE |
 				GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT |
@@ -940,7 +930,7 @@
 			(reply2 << 8)	|
 			(reply3 << 16)|
 			(reply4 << 24);
-		ret = gp_filesystem_set_info_noop(fs, "/", info, context);
+		ret = gp_filesystem_set_info_noop(fs, "/", fn, info, context);
 		if (ret != GP_OK)
 			return ret;
 	}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/blink.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/blink.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/blink2.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/blink2.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/blink2.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/blink2.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/web2.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/web2.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sipix/xjpeg.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sipix/xjpeg.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/smal/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/smal/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/smal/smal.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/smal/smal.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/smal/smal.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/smal/smal.h Changed

@@ -7,19 +7,19 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef __SMAL_H__
 
-#define __SMAL_H__ 1
+#ifndef CAMLIBS_SMAL_SMAL_H
+#define CAMLIBS_SMAL_SMAL_H
 
 #define USB_VENDOR_ID_SMAL        0x0dca
 #define USB_DEVICE_ID_ULTRAPOCKET 0x0002
@@ -45,5 +45,4 @@
     up_badge_type up_type;
 };
 
-
-#endif
+#endif /* !defined(CAMLIBS_SMAL_SMAL_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/smal/ultrapocket.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/smal/ultrapocket.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <config.h>
 #include <stdio.h>
@@ -29,12 +29,16 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
-#include <bayer.h>
-#include <gamma.h>
+#include <libgphoto2/bayer.h>
+#include <libgphoto2/gamma.h>
 
 #include "ultrapocket.h"
 #include "smal.h"
 
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+# define sleep(x)
+#endif
+
 #define GP_MODULE "Smal Ultrapocket"
 
 #include <locale.h>
@@ -169,7 +173,7 @@
     unsigned char *rawdata;
     int            ptc,pc,id;
 
-    memcpy(command+3, filename, 11); /* the id of the image to transfer */
+    strncpy((char*)(command+3), filename, 11); /* the id of the image to transfer */
 
     CHECK_RESULT(ultrapocket_command(port, 1, command, 0x10));
 
@@ -206,7 +210,7 @@
  * use a different protocol - have to differetiate.
  */
 int
-ultrapocket_getrawpicture(Camera *camera, GPContext *context, 
+ultrapocket_getrawpicture(Camera *camera, GPContext *context,
    unsigned char **pdata, int *size, const char *filename)
 {
     char           ppmheader200;
@@ -261,13 +265,13 @@
 
    /* and chop the spare 4 pixels off the RHS */
    for (pc = 1; pc < height; pc++) {
-      memmove(outdata + pmmhdr_len + ((long)width * pc * 3), 
-              outdata + pmmhdr_len + (((long)width + 4) * pc * 3), 
+      memmove(outdata + pmmhdr_len + ((long)width * pc * 3),
+              outdata + pmmhdr_len + (((long)width + 4) * pc * 3),
               ((long)width) * 3);
    }
    /* modify outsize to reflect trim */
    outsize = ((long)width) * height * 3 + pmmhdr_len;
-   
+
    free(rawdata);
    if (result < 0) {
       free (outdata);
@@ -325,7 +329,7 @@
 	    ", gamma %.2f"
 #endif
 	    "\n%d %d\n"
-	    "255\n", BayerTileNamestile, 
+	    "255\n", BayerTileNamestile,
 #if DO_GAMMA
 	    GAMMA_NUMBER,
 #endif
@@ -350,8 +354,8 @@
 
    /* and chop the spare 4 pixels off the RHS */
    for (pc = 1; pc < height; pc++) {
-      memmove(outdata + pmmhdr_len + ((long)width * pc * 3), 
-              outdata + pmmhdr_len + (((long)width + 4) * pc * 3), 
+      memmove(outdata + pmmhdr_len + ((long)width * pc * 3),
+              outdata + pmmhdr_len + (((long)width + 4) * pc * 3),
               ((long)width) * 3);
    }
    /* modify outsize to reflect trim */
@@ -380,13 +384,20 @@
 static int
 ultrapocket_reset(Camera *camera)
 {
-   GPPortInfo oldpi;
-   GPPort *port = camera->port;
    CameraAbilities cab;
    unsigned char cmdbuf0x10;
+   GPPort *port = camera->port;
+
    gp_camera_get_abilities(camera, &cab);
    GP_DEBUG ("First connect since camera was used - need to reset cam");
 
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+   GPPortType porttype;
+   GPPortInfo oldpi;
+   GPPortInfo newpi;
+   char *val;
+#endif
+
    /*
     * this resets the ultrapocket.  Messy, but it's what the windows
     * software does.   We only reset if it's been plugged in since
@@ -397,15 +408,26 @@
    cmdbuf1 = 0x01;
    CHECK_RESULT(ultrapocket_command(port, 1, cmdbuf, 0x10));
    /* -------------- */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
    sleep(4); /* This should do - _might_ need increasing */
    CHECK_RESULT(gp_port_get_info(port, &oldpi));
+   gp_port_info_new(&newpi);
+   gp_port_info_get_name (oldpi, &val);
+   gp_port_info_set_name (newpi, val);
+   gp_port_info_get_path (oldpi, &val);
+   gp_port_info_set_path (newpi, val);
+   gp_port_info_get_type (oldpi, &porttype);
+   gp_port_info_set_type (newpi, porttype);
+   /*gp_port_info_get_library_filename (oldpi, &val);
+   gp_port_info_set_library_filename (newpi, val);*/
+
    CHECK_RESULT(gp_port_free(port));
    CHECK_RESULT(gp_port_new(&port));
-   CHECK_RESULT(gp_port_set_info(port, oldpi));
-   CHECK_RESULT(gp_port_usb_find_device(port, 
-      cab.usb_vendor, cab.usb_product));
+   CHECK_RESULT(gp_port_set_info(port, newpi));
+   CHECK_RESULT(gp_port_usb_find_device(port, cab.usb_vendor, cab.usb_product));
    CHECK_RESULT(gp_port_open(port));
    camera->port = port;
+#endif
    return GP_OK;
 }
 
@@ -489,7 +511,7 @@
    char fn20;
    int picid;
    int reset_needed;
-   
+
    CHECK_RESULT(ultrapocket_sync(camera));
 
    memset(command, 0, 16);
@@ -563,7 +585,7 @@
  *
  * Fuji Slimshot + Axia etc
  * The camera responds with 8 * 0x1000 bytes
- * 
+ *
  * Creative CardCam
  * The camera responds with 8 * 0x1000 bytes
  *

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/smal/ultrapocket.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/smal/ultrapocket.h Changed

@@ -7,19 +7,19 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef __ULTRAPOCKET_H__
 
-#define __ULTRAPOCKET_H__ 1
+#ifndef CAMLIBS_SMAL_ULTRAPOCKET_H
+#define CAMLIBS_SMAL_ULTRAPOCKET_H
 
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
@@ -47,4 +47,4 @@
 int ultrapocket_deletefile(Camera *camera, const char *filename);
 int ultrapocket_deleteall(Camera *camera);
 
-#endif
+#endif /* !defined(CAMLIBS_SMAL_ULTRAPOCKET_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonix/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonix/Makefile-files Changed

@@ -1,14 +1,21 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += sonix/README.sonix sonix/ChangeLog
-camlibdoc_DATA += sonix/README.sonix
+EXTRA_DIST            += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += sonix.la
+EXTRA_DIST            += %reldir%/README.sonix
+camlibdoc_DATA        += %reldir%/README.sonix
 
-sonix_la_SOURCES = \
-	sonix/library.c \
-	sonix/sonix.c sonix/sonix.h \
-	sonix/sakar-avi-header.h
-sonix_la_LDFLAGS = $(camlib_ldflags)
-sonix_la_DEPENDENCIES = $(camlib_dependencies)
-sonix_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES     += sonix.la
+
+sonix_la_SOURCES       =
+sonix_la_SOURCES      += %reldir%/library.c
+sonix_la_SOURCES      += %reldir%/sonix.c
+sonix_la_SOURCES      += %reldir%/sonix.h
+sonix_la_SOURCES      += %reldir%/sakar-avi-header.h
+
+sonix_la_CFLAGS        = $(camlib_cflags)
+sonix_la_CPPFLAGS      = $(camlib_cppflags)
+sonix_la_DEPENDENCIES  = $(camlib_dependencies)
+sonix_la_LDFLAGS       = $(camlib_ldflags)
+sonix_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonix/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonix/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonix/sakar-avi-header.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonix/sakar-avi-header.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonix/sonix.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonix/sonix.c Changed

@@ -10,10 +10,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -31,37 +31,34 @@
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
-#include <gamma.h>
+#include <libgphoto2/gamma.h>
 
 
 #include "sonix.h"
-#define GP_MODULE "sonix" 
+#define GP_MODULE "sonix"
 
 
 /* Three often-used generic commands */
 
 /* This reads a one-byte "status" response */
 static int
-SONIX_READ (GPPort *port, char *data) 
+SONIX_READ (GPPort *port, char *data)
 {
-	gp_port_usb_msg_interface_read(port, 0, 1, 0, data, 1);
-	return GP_OK;
+	return gp_port_usb_msg_interface_read(port, 0, 1, 0, data, 1);
 }
 
 /* This reads a 4-byte response to a command */
 static int
-SONIX_READ4 (GPPort *port, char *data) 
+SONIX_READ4 (GPPort *port, char *data)
 {
-	gp_port_usb_msg_interface_read(port, 0, 4, 0, data, 4);
-	return GP_OK;
+	return gp_port_usb_msg_interface_read(port, 0, 4, 0, data, 4);
 }
 
 /* A command to the camera is a 6-byte string, and this sends it. */
 static int
-SONIX_COMMAND (GPPort *port, char *command) 
+SONIX_COMMAND (GPPort *port, char *command)
 {
-	gp_port_usb_msg_interface_write(port, 8, 2, 0, command ,6);	
-	return GP_OK;
+	return gp_port_usb_msg_interface_write(port, 8, 2, 0, command ,6);
 }
 
 
@@ -79,32 +76,35 @@
 
 	SONIX_READ(port, &status);
 
-	if (status == 0x02) goto skip_a_step; 
+	if (status == 0x02) goto skip_a_step;
 	/* If status is 2 we can skip several steps. Otherwise, status
-	 * needs to be reset to 0 and massaged until it is 2. 
+	 * needs to be reset to 0 and massaged until it is 2.
 	*/
-	
+
 	if ((unsigned)status) {
 		i = 0;
-		
+
 		while ((unsigned)status > 0)  {
-			SONIX_READ(port, &status);
+			if (SONIX_READ(port, &status) < GP_OK)
+				break;
 			i++;
 			if (i==1000) break;
 		}
 	}
-		
+
 	SONIX_COMMAND ( port, c);
 
 
-	while (status !=2)
-		SONIX_READ(port, &status);	
-		
+	while (status !=2) {
+		if (SONIX_READ(port, &status) < GP_OK)
+			break;
+	}
+
 	/* FIXME(Marcus): was indented at above level, unclear if it is needed this way ... */
 	SONIX_READ(port, &status);
 
 	skip_a_step:
-	
+
 	/*
 	 * We are supposed to get c0=0x8c here; in general the reply
 	 * string ought to start with the command byte c0, plus 0x80
@@ -116,20 +116,22 @@
 	memset (c, 0, 6);
 
 	while (!reading1&&!reading2&&!reading3) {
-		c0=0x16; 
-		SONIX_COMMAND ( port, c );
+		c0=0x16;
+		if (SONIX_COMMAND ( port, c ) < GP_OK)
+			break;
 		/*
 		 * For the Vivicam 3350b this always gives
-		 * 96 0a 76 07. This is apparently the firmware version. 
-		 * The webcam-osx comments that the 0x0a gives the sensor 
-		 * type, which is OV7630. For the Sakar Digital Keychain 
-		 * 11199 the string is 96 03 31 08, instead. For the 
-		 * Mini-Shotz ms350 it is 96 08 26 09. For the Genius 
+		 * 96 0a 76 07. This is apparently the firmware version.
+		 * The webcam-osx comments that the 0x0a gives the sensor
+		 * type, which is OV7630. For the Sakar Digital Keychain
+		 * 11199 the string is 96 03 31 08, instead. For the
+		 * Mini-Shotz ms350 it is 96 08 26 09. For the Genius
 		 * Smart 300 it is 96 00 67 09 and for the Digital
 		 * Spy Camera 70137 it is 96 01 31 09.  Since the cameras
-		 * have different abilities, we ought to distinguish. 
+		 * have different abilities, we ought to distinguish.
 		 */
-		SONIX_READ4 (port, (char *)reading);
+		if (SONIX_READ4 (port, (char *)reading) < GP_OK)
+			break;
 	}
 	GP_DEBUG("%02x %02x %02x %02x\n", reading0, reading1,
 		 reading2, reading3);
@@ -177,21 +179,21 @@
 	}
 
 	/*
-	 * This sequence gives the photos in the camera and sets a flag 
-	 * in reading3 if the camera is full. Alas, clip frames are 
-	 * not counted; the AVI constructor will need to count them 
+	 * This sequence gives the photos in the camera and sets a flag
+	 * in reading3 if the camera is full. Alas, clip frames are
+	 * not counted; the AVI constructor will need to count them
 	 */
 	memset (c,0,6);
 	c0=0x18;
 	SONIX_READ(port, &status);
 	SONIX_COMMAND ( port, c );
 	SONIX_READ(port, &status);
-	SONIX_READ4 (port, (char *)reading);		
+	SONIX_READ4 (port, (char *)reading);
 	if (reading0 != 0x98)
-		return GP_ERROR_CAMERA_ERROR;	
+		return GP_ERROR_CAMERA_ERROR;
 	GP_DEBUG ("number of photos is %d\n", reading1+ 256*reading2);
-	/* 
-	 * If reading3 = 0x01, it means the camera is full of data. 
+	/*
+	 * If reading3 = 0x01, it means the camera is full of data.
 	 * The capture_image() function must then be disabled.
 	 */
 	if (!(reading3)) priv->full = 0;
@@ -218,8 +220,8 @@
 	return GP_OK;
 }
 
-int 
-sonix_read_data_size (GPPort *port, int n) 
+int
+sonix_read_data_size (GPPort *port, int n)
 {
 	char status;
 	unsigned char c6;
@@ -237,14 +239,14 @@
 	return (reading1 + reading2*0x100 + reading3 *0x10000);
 }
 
-int 
-sonix_delete_all_pics      (GPPort *port) 
+int
+sonix_delete_all_pics      (GPPort *port)
 {
 	char status;
 	char c6;
 	unsigned char reading4;
 	memset (c,0,6);
-	c0=0x05; 
+	c0=0x05;
 	SONIX_READ(port, &status);
 	SONIX_COMMAND ( port, c );
 	SONIX_READ(port, &status);
@@ -254,8 +256,8 @@
 	return GP_OK;
 }
 
-int 
-sonix_delete_last      (GPPort *port) 
+int
+sonix_delete_last      (GPPort *port)
 {
 	char status;
 	char c6;
@@ -271,7 +273,7 @@
 	return GP_OK;
 	}
 
-int 
+int
 sonix_capture_image      (GPPort *port)
 {
 	char status;
@@ -279,7 +281,7 @@
 	unsigned char reading4;
 	GP_DEBUG("Running sonix_capture_image\n");
 	memset (c,0,6);
-	c0=0x0e; 
+	c0=0x0e;
 	SONIX_READ(port, &status);
 	SONIX_COMMAND ( port, c );
 	SONIX_READ(port, &status);
@@ -289,8 +291,8 @@
 	return GP_OK;
 }
 
-int 
-sonix_exit      (GPPort *port) 
+int
+sonix_exit      (GPPort *port)
 {
 	char status;
 	char c6;
@@ -303,7 +305,7 @@
 	return GP_OK;
 }
 
-/* 
+/*
  * The decoding algorithm originates with Bertrik Sikken. This version adapted
  * from the webcam-osx (macam) project. See README for details.
  */
@@ -322,19 +324,19 @@
 }
 
 /*
- * PEEK_BITS puts the next <num> bits into the low bits of <to>. 
- * when the buffer is empty, it is completely refilled. 
- * This strategy tries to reduce memory access. Note that the high bits 
+ * PEEK_BITS puts the next <num> bits into the low bits of <to>.
+ * when the buffer is empty, it is completely refilled.
+ * This strategy tries to reduce memory access. Note that the high bits
  * are NOT set to zero!
  */
 
 #define EAT_BITS(num) { bitBufCount-=num; }
 
 /*
- * EAT_BITS consumes <num> bits (PEEK_BITS does not consume anything, 
+ * EAT_BITS consumes <num> bits (PEEK_BITS does not consume anything,
  * it just peeks)
  */
-  
+
 #define PARSE_PIXEL(val) {\
 	PEEK_BITS(10,bits);\
 	if ((bits&0x200)==0) { \
@@ -386,13 +388,13 @@
 /* Now the decode function itself */
 
 
-int 
-sonix_decode(unsigned char * dst, unsigned char * src, int width, int height) 
+int
+sonix_decode(unsigned char * dst, unsigned char * src, int width, int height)
 {
 	long dst_index = 0;
 	int starting_row = 0;
 	unsigned short bits;
-	short c1val, c2val; 
+	short c1val, c2val;
 	int x, y;
 	unsigned long bitBuf = 0;
 	unsigned long bitBufCount = 0;
@@ -414,7 +416,7 @@
 	return GP_OK;
 }
 
-int sonix_byte_reverse (unsigned char *imagedata, int datasize) 
+int sonix_byte_reverse (unsigned char *imagedata, int datasize)
 {
 	int i;
 	unsigned char temp;
@@ -426,28 +428,28 @@
 	return GP_OK;
 }
 
-int sonix_rows_reverse (unsigned char *imagedata, int width, int height) 
+int sonix_rows_reverse (unsigned char *imagedata, int width, int height)
 {
 	int col, row;
 	unsigned char temp;
 	for (col = 0; col < width; col++)
 		for (row=0; row< height /2 ; row++) {
 			temp = imagedatarow*width+col;
-			imagedatarow*width+col = 
+			imagedatarow*width+col =
 			imagedata(height-row-1)*width +col;
-			imagedata(height-row-1)*width + col = temp; 
+			imagedata(height-row-1)*width + col = temp;
 	}
 	return GP_OK;
 }
 
-int sonix_cols_reverse (unsigned char *imagedata, int width, int height) 
+int sonix_cols_reverse (unsigned char *imagedata, int width, int height)
 {
 	int col, row;
 	unsigned char temp;
 	for (row=0; row < height ; row++) {
 		for (col =0; col< width/2 ; col++) {
 			temp = imagedatarow*width + col;
-			imagedatarow*width + col = 
+			imagedatarow*width + col =
 			    imagedatarow*width + width - 1 - col;
 			imagedatarow*width + width - 1 - col = temp;
 		}
@@ -472,15 +474,15 @@
  */
 
 static int
-histogram (unsigned char *data, unsigned int size, int *htable_r, 
+histogram (unsigned char *data, unsigned int size, int *htable_r,
 						int *htable_g, int *htable_b)
 {
-	int x;
+	unsigned int x;
 	/* Initializations */
-	for (x = 0; x < 256; x++) { 
-		htable_rx = 0; 
-		htable_gx = 0; 
-		htable_bx = 0; 
+	for (x = 0; x < 256; x++) {
+		htable_rx = 0;
+		htable_gx = 0;
+		htable_bx = 0;
 	}
 	/* Building the histograms */
 	for (x = 0; x < (size * 3); x += 3)
@@ -496,7 +498,8 @@
 int
 white_balance (unsigned char *data, unsigned int size, float saturation)
 {
-	int x, r, g, b, max, d;
+	unsigned int x, max;
+	int r, g, b, d;
 	double r_factor, g_factor, b_factor, max_factor, MAX_FACTOR=1.6;
 	int htable_r256, htable_g256, htable_b256;
 	unsigned char gtable256;
@@ -508,7 +511,7 @@
 	x = 1;
 	for (r = 64; r < 192; r++)
 	{
-		x += htable_rr; 
+		x += htable_rr;
 		x += htable_gr;
 		x += htable_br;
 	}
@@ -519,7 +522,7 @@
 		new_gamma = .50;
 		MAX_FACTOR=1.2;
 	}
-	else if (gamma < 0.60) 
+	else if (gamma < 0.60)
 		new_gamma = 0.60;
 	else
 		new_gamma = gamma;
@@ -529,14 +532,14 @@
 	gp_gamma_correct_single(gtable,data,size);
 
 	/* ---------------- BRIGHT DOTS ------------------- */
-	max = size / 200; 
+	max = size / 200;
 	histogram(data, size, htable_r, htable_g, htable_b);
 
-	for (r=254, x=0; (r > 64) && (x < max); r--)  
-		x += htable_rr; 
-	for (g=254, x=0; (g > 64) && (x < max); g--) 
+	for (r=254, x=0; (r > 64) && (x < max); r--)
+		x += htable_rr;
+	for (g=254, x=0; (g > 64) && (x < max); g--)
 		x += htable_gg;
-	for (b=254, x=0; (b > 64) && (x < max); b--) 
+	for (b=254, x=0; (b > 64) && (x < max); b--)
 		x += htable_bb;
 
 	r_factor = (double) 254 / r;
@@ -574,11 +577,11 @@
 
 	histogram(data, size, htable_r, htable_g, htable_b);
 
-	for (r=0, x=0; (r < 64) && (x < max); r++)  
-		x += htable_rr; 
-	for (g=0, x=0; (g < 64) && (x < max); g++) 
+	for (r=0, x=0; (r < 64) && (x < max); r++)
+		x += htable_rr;
+	for (g=0, x=0; (g < 64) && (x < max); g++)
 		x += htable_gg;
-	for (b=0, x=0; (b < 64) && (x < max); b++) 
+	for (b=0, x=0; (b < 64) && (x < max); b++)
 		x += htable_bb;
 
 	r_factor = (double) 254 / (255-r);
@@ -609,15 +612,15 @@
 		d = (int) (r + 2*g + b) / 4.;
 		if ( r > d )
 			r = r + (int) ((r - d) * (255-r)/(256-d) * saturation);
-		else 
+		else
 			r = r + (int) ((r - d) * (255-d)/(256-r) * saturation);
 		if (g > d)
 			g = g + (int) ((g - d) * (255-g)/(256-d) * saturation);
-		else 
+		else
 			g = g + (int) ((g - d) * (255-d)/(256-g) * saturation);
 		if (b > d)
 			b = b + (int) ((b - d) * (255-b)/(256-d) * saturation);
-		else 
+		else
 			b = b + (int) ((b - d) * (255-d)/(256-b) * saturation);
 
 		if (r < 0) { r = 0; }
@@ -631,6 +634,6 @@
 		datax+2 = b;
 	}
 
-	
+
 	return 0;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonix/sonix.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonix/sonix.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/Makefile-files Changed

@@ -1,14 +1,21 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += sonydscf1/README.sonydscf1 sonydscf1/ChangeLog
-camlibdoc_DATA += sonydscf1/README.sonydscf1
+EXTRA_DIST                 += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += sony_dscf1.la
+EXTRA_DIST                 += %reldir%/README.sonydscf1
+camlibdoc_DATA             += %reldir%/README.sonydscf1
 
-sony_dscf1_la_SOURCES = \
-	sonydscf1/command.c sonydscf1/command.h \
-	sonydscf1/sonydscf1.c sonydscf1/pmp.h 
-sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
-sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies)
-sony_dscf1_la_LIBADD = $(camlib_libadd)
 
+EXTRA_LTLIBRARIES          += sony_dscf1.la
+
+sony_dscf1_la_SOURCES       =
+sony_dscf1_la_SOURCES      += %reldir%/command.c
+sony_dscf1_la_SOURCES      += %reldir%/command.h
+sony_dscf1_la_SOURCES      += %reldir%/sonydscf1.c
+sony_dscf1_la_SOURCES      += %reldir%/pmp.h
+
+sony_dscf1_la_CFLAGS        = $(camlib_cflags)
+sony_dscf1_la_CPPFLAGS      = $(camlib_cppflags)
+sony_dscf1_la_DEPENDENCIES  = $(camlib_dependencies)
+sony_dscf1_la_LDFLAGS       = $(camlib_ldflags)
+sony_dscf1_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/command.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/command.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/command.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/command.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/pmp.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/pmp.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf1/sonydscf1.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf1/sonydscf1.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf55/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/TODO -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf55/TODO Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/camera.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf55/camera.c Changed

@@ -25,12 +25,15 @@
 #include <gphoto2/gphoto2.h>
 #include <sys/types.h>
 
-#include "sony.h"
-#include "nls.h"
 #include <gphoto2/gphoto2-camera.h>
 
+#include "libgphoto2/i18n.h"
+
+#include "sony.h"
+
 #define GP_MODULE "sonydscf55"
 
+
 struct ModelInfo {
 	SonyModel model_id;
 	const char *model_str;
@@ -53,7 +56,7 @@
 int
 camera_abilities(CameraAbilitiesList * list)
 {
-	int i;
+	unsigned int i;
 	CameraAbilities a;
 
 	for (i = 0; i < sizeof(models) / sizeof(modelsi); i++) {
@@ -72,7 +75,7 @@
 }
 
 /**
- * De-initialises camera
+ * De-initializes camera
  */
 static int
 camera_exit(Camera * camera, GPContext *context)
@@ -283,10 +286,10 @@
 {
 	CameraAbilities a;
 	int rc;
-	
+
 	rc = gp_camera_get_abilities (camera, &a);
 	if (rc == GP_OK) {
-		int i;
+		unsigned int i;
 		rc = GP_ERROR;
 		for (i = 0; i < sizeof(models) / sizeof(modelsi); i++) {
 			if (model_compare(modelsi.model_str,
@@ -308,13 +311,13 @@
 };
 
 /**
- * Initialises camera
+ * Initializes camera
  */
 int
 camera_init(Camera * camera, GPContext *context)
 {
 	int rc;
-	SonyModel model; 
+	SonyModel model;
 
 	rc = get_camera_model(camera, &model);
 	if (rc != GP_OK)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/sony.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf55/sony.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -97,7 +97,7 @@
 
 
 /*
- * This array contains the expected packet sequence code to to be applied/
+ * This array contains the expected packet sequence code to be applied/
  * checked for.
  */
 static const unsigned char sony_sequence =
@@ -478,7 +478,7 @@
 	if (camera->pl->current_baud_rate != baud) {
 		/* FIXME */
 		SetTransferRate3 = sony_baud_to_id(baud);
-	
+
 		rc = sony_converse(camera, &dp, SetTransferRate, 4);
 		if (rc == GP_OK) {
 			sony_baud_port_set(camera, baud);
@@ -497,7 +497,7 @@
 }
 
 /**
- * Port initialisation
+ * Port initialization
  */
 static int
 sony_init_port (Camera *camera)
@@ -559,7 +559,7 @@
 }
 
 /**
- * Initialises camera
+ * Initialize camera
  */
 int
 sony_init (Camera * camera, SonyModel model)
@@ -700,7 +700,7 @@
 	int sc;			/* count of bytes to skip at start of packet */
 	Packet dp;
 	int rc;
-	char buffer128;                                                 
+	char buffer128;
 
 	GP_DEBUG( "sony_file_get()");
 
@@ -708,7 +708,7 @@
 	if (rc != GP_OK) {
 		return rc;
 	}
-	
+
 	if (gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
 		return GP_ERROR_CANCEL;
 	}
@@ -862,7 +862,7 @@
 	if (rc != GP_OK) {
 		return rc;
 	}
-	
+
 	if (gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) {
 		return GP_ERROR_CANCEL;
 	}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sonydscf55/sony.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sonydscf55/sony.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/Makefile-files Changed

@@ -1,15 +1,24 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += soundvision/README.soundvision soundvision/BUGS soundvision/ChangeLog
-camlibdoc_DATA += soundvision/README.soundvision
+EXTRA_DIST                  += %reldir%/BUGS
+EXTRA_DIST                  += %reldir%/ChangeLog
 
-EXTRA_LTLIBRARIES += soundvision.la
+EXTRA_DIST                  += %reldir%/README.soundvision
+camlibdoc_DATA              += %reldir%/README.soundvision
 
-soundvision_la_SOURCES = \
-	soundvision/soundvision.c soundvision/agfa_cl18.c \
-	soundvision/tiger_fastflicks.c \
-	soundvision/commands.c soundvision/commands.h \
-	soundvision/soundvision.h
-soundvision_la_LDFLAGS = $(camlib_ldflags)
-soundvision_la_DEPENDENCIES = $(camlib_dependencies)
-soundvision_la_LIBADD = $(camlib_libadd)
+
+EXTRA_LTLIBRARIES           += soundvision.la
+
+soundvision_la_SOURCES       =
+soundvision_la_SOURCES      += %reldir%/soundvision.c
+soundvision_la_SOURCES      += %reldir%/agfa_cl18.c
+soundvision_la_SOURCES      += %reldir%/tiger_fastflicks.c
+soundvision_la_SOURCES      += %reldir%/commands.c
+soundvision_la_SOURCES      += %reldir%/commands.h
+soundvision_la_SOURCES      += %reldir%/soundvision.h
+
+soundvision_la_CFLAGS        = $(camlib_cflags)
+soundvision_la_CPPFLAGS      = $(camlib_cppflags)
+soundvision_la_DEPENDENCIES  = $(camlib_dependencies)
+soundvision_la_LDFLAGS       = $(camlib_ldflags)
+soundvision_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/agfa_cl18.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/agfa_cl18.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/commands.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/commands.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/commands.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/commands.h Changed

@@ -5,10 +5,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -16,16 +16,16 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef commands_H
-#define commands_H
- 
+#ifndef CAMLIBS_SOUNDVISION_COMMANDS_H
+#define CAMLIBS_SOUNDVISION_COMMANDS_H
+
 
 int32_t soundvision_send_command(uint32_t command, uint32_t argument,
 	                                 CameraPrivateLibrary *dev);
 
 int32_t soundvision_send_file_command(const char *filename,
                                               CameraPrivateLibrary *dev);
-    
+
 int32_t soundvision_read(CameraPrivateLibrary *dev, void *buffer, int len);
 
-#endif
+#endif /* !defined(CAMLIBS_SOUNDVISION_COMMANDS_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/soundvision.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/soundvision.c Changed

@@ -6,10 +6,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -20,10 +20,10 @@
  * For cameras using the Clarity2 chip made by Soundvision Inc.
  * Made entirely w/o Soundvision's help.  They would not give
  * documentation.  Reverse-engineered from usb-traces.
- * 
+ *
  * Copyright 2002-2003 Vince Weaver <vince@deater.net>
- * 
- * Originally based on the digita driver 
+ *
+ * Originally based on the digita driver
  * Copyright 1999-2000 Johannes Erdfelt, VA Linux Systems
  */
 
@@ -34,29 +34,14 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
+#include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "soundvision.h"
 
-#include <gphoto2/gphoto2-port.h>
 
 #define GP_MODULE "soundvision"
 
@@ -67,14 +52,14 @@
    char serial;
 } models = {
         {"Agfa:ePhoto CL18",0x06bd,0x0403,0},
-   
+
         {"Mustek:gSmart 350",0x055f,0xa350,0},
-   
+
         {"RCA:CDS1005",0x0784,0x0100,0},
         {"Ixla:DualCam 640",0x0784,0x0100,0},
 
         {"Pretec:dc530",0x0784,0x5300,0},
-   
+
         {"Generic SoundVision:Clarity2",0x0919,0x100,0},
         {"Argus:DC-2200",0x0919,0x100,0},
         {"CoolCam:CP086",0x0919,0x100,0},
@@ -85,54 +70,54 @@
         {"Oregon Scientific:DShot III",0x0919,0x0100,0},
         {"Scott:APX 30",0x0919,0x0100,0},
         {"StarCam:CP086",0x0919,0x100,0},
-        {"Tiger:Fast Flicks",0x0919,0x0100,0},   
+        {"Tiger:Fast Flicks",0x0919,0x0100,0},
         {NULL,0,0,0}
 };
 
 int camera_id(CameraText *id) {
-        
+
     strcpy(id->text, "soundvision");
-        
+
     return GP_OK;
 }
 
 
 int camera_abilities(CameraAbilitiesList *list) {
-        
+
     int i;
     CameraAbilities a;
 
     for(i=0; modelsi.name; i++) {
        memset(&a, 0, sizeof(a));
        strcpy(a.model, modelsi.name);
-       
+
           /* Agfa and Dshot types owned by author and tested */
           /* Others the testing not quite certain            */
        if ( (modelsi.idVendor==0x06bd) || (modelsi.idVendor==0x0919))
           a.status = GP_DRIVER_STATUS_PRODUCTION;
        else
           a.status = GP_DRIVER_STATUS_EXPERIMENTAL;
-       
+
           /* For now all are USB.  Have the spec for Serial */
           /* If ever one shows up                           */
        a.port       = GP_PORT_USB;
        a.speed0 = 0;
        a.usb_vendor = modelsi.idVendor;
        a.usb_product= modelsi.idProduct;
-       
+
           /* All should support image capture */
        a.operations     = 	GP_OPERATION_CAPTURE_IMAGE;
-       
+
           /* Folders not supported on any */
        a.folder_operations = 	GP_FOLDER_OPERATION_NONE;
-       
-          /* Dshot compat can upload files */
-       if (modelsi.idVendor==0x0919) {
-          a.file_operations|=GP_FOLDER_OPERATION_PUT_FILE;	    
-       }       
-       
-       a.file_operations   = 	GP_FILE_OPERATION_PREVIEW | 
+
+       a.file_operations   = 	GP_FILE_OPERATION_PREVIEW |
 				GP_FILE_OPERATION_DELETE;
+         /* Dshot compat can upload files */
+       if (modelsi.idVendor == 0x0919) {
+          a.file_operations|=GP_FOLDER_OPERATION_PUT_FILE;
+       }
+
 
        gp_abilities_list_append(list, a);
     }
@@ -145,25 +130,25 @@
 	                          camera->pl->reset_times,
 	                          camera->pl->num_pictures,
 	                          camera->pl->odd_command);
-  
+
        /* We _must_ reset an even number of times ?? */
        /* It's more complicated than that.  *sigh*   */
     if (camera->pl->reset_times==1) {
        soundvision_reset (camera->pl,NULL,NULL);
-#if 0       
+#if 0
           /* Odd number of pics */
-       if (camera->pl->num_pictures%2==1) { 
-	  if (!camera->pl->odd_command) 
+       if (camera->pl->num_pictures%2==1) {
+	  if (!camera->pl->odd_command)
 	     soundvision_reset (camera->pl,NULL,NULL);
        }
        else {
-	  if (camera->pl->odd_command) 
+	  if (camera->pl->odd_command)
 	     soundvision_reset (camera->pl,NULL,NULL);
        }
-#endif       
+#endif
     }
-   
-       
+
+
     if (camera->pl) {
 	if (camera->pl->file_list) {
 	    free(camera->pl->file_list);
@@ -176,20 +161,20 @@
     return GP_OK;
 }
 
-static int file_list_func (CameraFilesystem *fs, const char *folder, 
+static int file_list_func (CameraFilesystem *fs, const char *folder,
 			   CameraList *list, void *data, GPContext *context) {
- 
+
     Camera *camera=data;
     int i;
     char temp_file14;
 
     GP_DEBUG ("camera_file_list %s\n", folder);
-   
+
     if (soundvision_get_file_list(camera->pl) < 0) {
        GP_DEBUG ("Could not soundvision_file_list!");
        return GP_ERROR;
     }
-       
+
     for(i=0; i < camera->pl->num_pictures; i++) {
        strncpy(temp_file,camera->pl->file_list+(13*i),12);
        temp_file12=0;
@@ -199,11 +184,11 @@
 }
 
 
-static int soundvision_file_get (Camera *camera, const char *filename, int thumbnail, 
+static int soundvision_file_get (Camera *camera, const char *filename, int thumbnail,
 			    unsigned char **data, int *size) {
 
     int buflen,throwaway,result;
-   
+
     if (thumbnail) GP_DEBUG( "Getting thumbnail '%s'...",filename);
     else GP_DEBUG( "Getting file '%s'...",filename);
 
@@ -214,36 +199,37 @@
        if (buflen < 0) return buflen;
     } else {
        soundvision_reset(camera->pl,NULL,NULL);
-          
+
           /* Always have to check num photos,
 	   * then pic size no matter what.  Otherwise
-	   * the camera will stop responding 
+	   * the camera will stop responding
 	   */
        throwaway=soundvision_photos_taken(camera->pl);
        if (throwaway<0) {
 	  result=throwaway;
 	  goto file_get_error;
        }
-       
-       
+
+
           /* The below two lines might look wrong, but they aren't! */
        buflen = soundvision_get_pic_size(camera->pl,filename);
        if (thumbnail) buflen=soundvision_get_thumb_size(camera->pl,filename);
+       if (buflen < 0) return buflen;
     }
-   
-   
 
-       
+
+
+
        /* Don't try to download if size equals zero! */
     if (buflen) {
-   
+
        *data = malloc(buflen+1);
-        
+
        if (!*data) {
 	  result=GP_ERROR_NO_MEMORY;
 	  goto file_get_error;
        }
-       
+
        memset(*data, 0, buflen);
 
        if (thumbnail) {
@@ -251,20 +237,20 @@
           if (result < 0) {
 	     GP_DEBUG("soundvision_get_thumb_failed!");
 	     goto file_get_error;
-	  }	     
+	  }
        }
-       else {  
+       else {
           result=soundvision_get_pic(camera->pl, filename, *data, buflen);
           if (result < 0) {
 	     GP_DEBUG("soundvision_get_pic_failed!");
              goto file_get_error;
-	  }	     
+	  }
        }
-	         
+
        if (size)
-          *size = buflen;       
+          *size = buflen;
     }
-      
+
     return GP_OK;
 
 file_get_error:
@@ -273,12 +259,12 @@
     return result;
 }
 
-static int get_file_func (CameraFilesystem *fs, const char *folder, 
+static int get_file_func (CameraFilesystem *fs, const char *folder,
 			  const char *filename, CameraFileType type,
 			  CameraFile *file, void *user_data,
 			  GPContext *context) {
     char *pos;
-   
+
     Camera *camera = user_data;
     unsigned char *data = NULL;
     int size,ret;
@@ -295,15 +281,15 @@
        default:
                return GP_ERROR_NOT_SUPPORTED;
     }
-   
+
     if (!data) return GP_ERROR;
 
     gp_file_set_data_and_size (file, (char *)data, size);
        /* Maybe skip below if EXIF data present? */
-   
+
        /* As far as I know we only support JPG and MOV */
        /* Maybe some have MP3???                       */
-    pos=strchr (filename, '.');   
+    pos=strchr (filename, '.');
     if (pos) {
        if ((!strcmp(pos,".JPG")) || ((!strcmp(pos,".jpg"))))
 	  gp_file_set_mime_type (file, GP_MIME_JPEG);
@@ -312,7 +298,7 @@
        else
 	  gp_file_set_mime_type (file, GP_MIME_UNKNOWN);
     }
-   
+
     return GP_OK;
 }
 
@@ -320,16 +306,17 @@
 			  GPContext *context) {
 
     char revision9;
-   
+
+    revision0=0;
     soundvision_reset(camera->pl,revision,NULL);
-   
+
     if (camera->pl->device_type==SOUNDVISION_TIGERFASTFLICKS) {
        int mem_total,mem_free,num_pics, ret;
 
        ret = tiger_get_mem(camera->pl,&num_pics,&mem_total,&mem_free);
        if (ret < GP_OK)
            return ret;
-       
+
        sprintf(summary->text, _("Firmware Revision: %8s\n"
 				"Pictures:     %i\n"
 				"Memory Total: %ikB\n"
@@ -342,7 +329,7 @@
 }
 
 static int camera_about(Camera *camera, CameraText *about, GPContext *context) {
-        
+
     strcpy(about->text, _("Soundvision Driver\nVince Weaver <vince@deater.net>\n"));
 
     return GP_OK;
@@ -352,25 +339,25 @@
     /* Below contributed by Ben Hague <benhague@btinternet.com> */
 static int camera_capture (Camera *camera, CameraCaptureType type,
 			   CameraFilePath *path, GPContext *context) {
-   
+
     int result;
-   
-    if (camera->pl->device_type==SOUNDVISION_AGFACL18)     
+
+    if (camera->pl->device_type==SOUNDVISION_AGFACL18)
        result=agfa_capture(camera->pl,path);
-    else if (camera->pl->device_type==SOUNDVISION_TIGERFASTFLICKS) { 
+    else if (camera->pl->device_type==SOUNDVISION_TIGERFASTFLICKS) {
        result=tiger_capture(camera->pl,path);
     }
     else return GP_ERROR_NOT_SUPPORTED;
 
     if (result < GP_OK)
        return result;
-   
+
     soundvision_get_file_list(camera->pl);
-   
+
        /* For some reason last taken picture is first on tiger? */
        /* Might be last on Agfa.  Who knows.  Craziness.        */
     if (camera->pl->num_pictures<1) return GP_ERROR;
-      
+
     strcpy (path->name,camera->pl->file_list);
     strcpy (path->folder, "/");
 /*    gp_filesystem_append (camera->fs, path->folder,
@@ -382,34 +369,34 @@
 static int delete_file_func (CameraFilesystem *fs, const char *folder,
 			     const char *filename, void *data,
 			     GPContext *context) {
-  
+
     Camera *camera = data;
 
-    GP_DEBUG("Deleting '%s' in '%s'...",filename,folder); 
-   
+    GP_DEBUG("Deleting '%s' in '%s'...",filename,folder);
+
     soundvision_delete_picture(camera->pl,filename);
-   
+
        /* Update our file list */
     if (soundvision_get_file_list(camera->pl)<0) return GP_ERROR;
-   
+
     return GP_OK;
 }
 
 
 static int put_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 			  CameraFileType type, CameraFile *file, void *data, GPContext *context) {
-   
+
     Camera *camera=data;
     const char *data_file;
     long unsigned int data_size;
-   
+
     /*
      * Upload the file to the camera. Use gp_file_get_data_and_size, etc.
     */
     GP_DEBUG ("*** put_file_func");
     GP_DEBUG ("*** folder: %s", folder);
     GP_DEBUG ("*** filename: %s", filename);
-   
+
     gp_file_get_data_and_size (file, &data_file, &data_size);
     if ( data_size == 0) {
        gp_context_error (context,
@@ -418,16 +405,16 @@
     }
 
     /* Should check memory here */
-   
+
    /*        if (available_memory < data_size) {
        gp_context_error (context,
 			 _("Not enough memory available on the memory card"));
        return GP_ERROR_NO_MEMORY;
      }
    */
-   
+
     tiger_upload_file (camera->pl, filename,data_file,data_size);
-   
+
     return GP_OK;
 }
 
@@ -439,7 +426,7 @@
 };
 
 int camera_init(Camera *camera, GPContext *context) {
-   
+
     GPPortSettings settings;
     CameraAbilities a;
     int ret = 0;
@@ -449,56 +436,56 @@
     camera->functions->summary      = camera_summary;
     camera->functions->about        = camera_about;
     camera->functions->capture      = camera_capture;
-   
+
     GP_DEBUG ("Initializing the camera\n");
 
     switch (camera->port->type) {
        case GP_PORT_USB:
             ret=gp_port_get_settings(camera->port,&settings);
             if (ret<0) return ret;
- 
+
             /* Use the defaults the core parsed */
 
             ret=gp_port_set_settings(camera->port,settings);
-            if (ret<0) return ret;       
+            if (ret<0) return ret;
             break;
-       
+
        case GP_PORT_SERIAL:
             return GP_ERROR_IO_SUPPORTED_SERIAL;
-       default: 
+       default:
             return GP_ERROR_NOT_SUPPORTED;
     }
 
-				       
-   
+
+
        /* Set up camera private library */
     camera->pl = malloc (sizeof (CameraPrivateLibrary));
     if (!camera->pl) return (GP_ERROR_NO_MEMORY);
     memset (camera->pl, 0, sizeof (CameraPrivateLibrary));
     camera->pl->gpdev = camera->port;
 
-   
+
        /* Set up the sub-architectures */
        /* Default to Agfa.  Should we default otherwise? */
     camera->pl->device_type=SOUNDVISION_AGFACL18;
     gp_camera_get_abilities (camera, &a);
-   
+
     if ((a.usb_vendor==0x0919) && (a.usb_product==0x0100)) {
-       camera->pl->device_type=SOUNDVISION_TIGERFASTFLICKS;	
+       camera->pl->device_type=SOUNDVISION_TIGERFASTFLICKS;
     }
-   
+
     if ((a.usb_vendor==0x0784) && (a.usb_product==0x0100)) {
        camera->pl->device_type=SOUNDVISION_IXLA;
     }
-   
-	
-	
-   
+
+
+
+
 
        /* Keep track.  We _must_ reset an even number of times */
     camera->pl->reset_times=0;
     camera->pl->odd_command=0;
-   
+
        /* Reset the camera */
     ret = soundvision_reset (camera->pl,NULL,NULL);
     if (ret < 0) {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/soundvision.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/soundvision.h Changed

@@ -4,24 +4,25 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef soundvision_H
-#define soundvision_H
 
-#include <_stdint.h>
+#ifndef CAMLIBS_SOUNDVISION_SOUNDVISION_H
+#define CAMLIBS_SOUNDVISION_SOUNDVISION_H
+
+#include <stdint.h>
 
 #define SOUNDVISION_START_TRANSACTION 0x0001
 
-#define SOUNDVISION_SETPC2            0x0004          
+#define SOUNDVISION_SETPC2            0x0004
 
 #define SOUNDVISION_GET_MEM_TOTAL     0x0065
 
@@ -80,10 +81,10 @@
 int soundvision_delete_picture(CameraPrivateLibrary *dev, const char *filename);
 
 int soundvision_get_thumb_size(CameraPrivateLibrary *dev, const char *filename);
-int soundvision_get_thumb(CameraPrivateLibrary *dev, const char *filename, 
+int soundvision_get_thumb(CameraPrivateLibrary *dev, const char *filename,
 		   unsigned char *data,int size);
 int soundvision_get_pic_size(CameraPrivateLibrary *dev, const char *filename);
-int soundvision_get_pic(CameraPrivateLibrary *dev, const char *filename, 
+int soundvision_get_pic(CameraPrivateLibrary *dev, const char *filename,
 		   unsigned char *data,int size);
 
 /* agfa_cl18.c */
@@ -96,26 +97,27 @@
 int agfa_get_pic_size(CameraPrivateLibrary *dev, const char *filename);
 int agfa_get_thumb(CameraPrivateLibrary *dev, const char *filename,
 		                      unsigned char *data,int size);
-int agfa_get_thumb_size(CameraPrivateLibrary *dev, const char *filename); 
-   
-   
-   
-   
-   
+int agfa_get_thumb_size(CameraPrivateLibrary *dev, const char *filename);
+
+
+
+
+
 
 /* tiger_fastflicks.c */
 int tiger_set_pc_mode(CameraPrivateLibrary *dev);
 int tiger_upload_file(CameraPrivateLibrary *dev, const char *filename,
 		      const char *data, long data_size);
-int tiger_delete_picture(CameraPrivateLibrary *dev, const char *filename);   
-int tiger_capture(CameraPrivateLibrary *dev, CameraFilePath *path);   
-int tiger_get_mem(CameraPrivateLibrary *dev, int *num_pics, int *mem_total, int *mem_free);   
+int tiger_delete_picture(CameraPrivateLibrary *dev, const char *filename);
+int tiger_capture(CameraPrivateLibrary *dev, CameraFilePath *path);
+int tiger_get_mem(CameraPrivateLibrary *dev, int *num_pics, int *mem_total, int *mem_free);
 int tiger_get_file_list(CameraPrivateLibrary *dev);
 int tiger_get_pic(CameraPrivateLibrary *dev, const char *filename,
 		                    unsigned char *data,int size);
 int tiger_get_pic_size(CameraPrivateLibrary *dev, const char *filename);
 int tiger_get_thumb(CameraPrivateLibrary *dev, const char *filename,
-		                      unsigned char *data,int size);   
-int tiger_get_thumb_size(CameraPrivateLibrary *dev, const char *filename); 
-#endif
+		                      unsigned char *data,int size);
+int tiger_get_thumb_size(CameraPrivateLibrary *dev, const char *filename);
+
+#endif /* !defined(CAMLIBS_SOUNDVISION_SOUNDVISION_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/soundvision/tiger_fastflicks.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/soundvision/tiger_fastflicks.c Changed

@@ -6,10 +6,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -19,16 +19,16 @@
  *
  *  Commands specific to soundvision camears with usbid
  *  0x0919:0x0100 and possibly others.
- * 
+ *
  *  Tiger FastFlicks was first camera of this type
  *  to be supported.
- * 
- *  Initial Support added by Dr. William Bland <wjb@abstractnonsense.com> 
+ *
+ *  Initial Support added by Dr. William Bland <wjb@abstractnonsense.com>
  *  Other help from  Adrien Hernot <amh@BSD-DK.dk>
- * 
+ *
  * Vince Weaver got such a camera in Jan 2003 and massively
  * re-wrote things.
- * 
+ *
  * Copyright 2002-2003 Vince Weaver <vince@deater.net>
  */
 
@@ -42,12 +42,9 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 
 #include "soundvision.h"
 #include "commands.h"
@@ -58,42 +55,42 @@
     /* Used at start of most tiger commands.  Also */
     /* Seems to set the camera into "PC" mode      */
 int tiger_set_pc_mode(CameraPrivateLibrary *dev) {
-   
+
     int result;
 
     GP_DEBUG("tiger_set_pc_mode");
-      
+
     result=soundvision_send_command(SOUNDVISION_START_TRANSACTION,0,dev);
     if (result<0) goto set_pc_error;
-   
+
     result=soundvision_get_revision(dev,NULL);
     if (result<0) goto set_pc_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_SETPC1,0,dev);
     if (result<0) goto set_pc_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_SETPC2,0,dev);
     if (result<0) goto set_pc_error;
-   
+
     return GP_OK;
-   
-set_pc_error:   
+
+set_pc_error:
     return result;
 }
 
-   
-   
+
+
 
     /* This is packet-for-packet what windows does */
     /* The camera takes it all in stride.          */
     /* Yet uploaded file never appears.  Why??     */
-int tiger_upload_file(CameraPrivateLibrary *dev, 
+int tiger_upload_file(CameraPrivateLibrary *dev,
 		      const char *filename,
 		      const char *data,
 		      long size) {
     int result=0;
     char return_value4;
-    
+
     uint32_t our_size;
     char *our_data=NULL;
 
@@ -104,95 +101,95 @@
     if (our_data==NULL) {
        goto upload_error;
     }
-   
+
     htole32a(&our_data0,size);
     memcpy(our_data+4,data,size);
-   
-   
+
+
     GP_DEBUG("File: %s Size=%ld\n",filename,size);
 /*  for(result=0;result<our_size;result++) {
        printf("%x ",our_dataresult);
     }
-*/  
+*/
 
     result=tiger_set_pc_mode(dev);
     if (result<0) goto upload_error;
-   
+
     result=soundvision_get_revision(dev,NULL);
     if (result<0) goto upload_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_GET_MEM_FREE,0,dev);
     if (result<0) goto upload_error;
-   
-    result=soundvision_read(dev, &return_value, sizeof(return_value));        
+
+    result=soundvision_read(dev, &return_value, sizeof(return_value));
     if (result<0) goto upload_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_PUT_FILE,size,dev);
     if (result<0) goto upload_error;
-    
-    result=soundvision_read(dev, &return_value, sizeof(return_value));        
+
+    result=soundvision_read(dev, &return_value, sizeof(return_value));
     if (result<0) goto upload_error;
-   
+
     result=gp_port_write(dev->gpdev,our_data,our_size);
     if (result<0) goto upload_error;
-   
+
     free(our_data);
     our_data=NULL;
 
-#if 0 
+#if 0
     /* Some traces show the following, though most likely */
     /* this is just the windows driver updating the file list */
-   
+
     result=soundvision_photos_taken(dev);
     result=soundvision_get_file_list(dev);
-    
+
     result=soundvision_send_command(SOUNDVISION_GET_PIC_SIZE,0,dev);
     if (result<0) goto upload_error;
-    
-    result=soundvision_read(dev, &return_value, sizeof(return_value));        
+
+    result=soundvision_read(dev, &return_value, sizeof(return_value));
     if (result<0) goto upload_error;
-   
+
     result=soundvision_send_file_command("000VINCE.JPG",dev);
-    
-   result=soundvision_read(dev, &return_value, sizeof(return_value));        
+
+   result=soundvision_read(dev, &return_value, sizeof(return_value));
     if (result<0) goto upload_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_DONE_TRANSACTION,0,dev);
     if (result<0) goto upload_error;
-#endif      
+#endif
     return GP_OK;
-   
-upload_error:   
+
+upload_error:
     if (our_data!=NULL) free(our_data);
     GP_DEBUG("Error in tiger_upload_file");
     return result;
 }
 
 int tiger_delete_picture(CameraPrivateLibrary *dev, const char *filename) {
-   
-    int32_t ret,temp; 
-   
+
+    int32_t ret,temp;
+
     ret = tiger_set_pc_mode(dev);
     if (ret<0) goto delete_pic_error;
-   
+
     ret = soundvision_send_command(SOUNDVISION_DELETE,0,dev);
     if (ret<0) goto delete_pic_error;
-   
+
        /* should get fff if all is well */
-    ret = soundvision_read(dev, &temp, sizeof(temp));        
+    ret = soundvision_read(dev, &temp, sizeof(temp));
     if (ret<0) goto delete_pic_error;
 
     ret=soundvision_send_file_command(filename,dev);
     if (ret<0) goto delete_pic_error;
-   
+
     ret = soundvision_send_command(SOUNDVISION_DONE_TRANSACTION,0,dev);
     if (ret<0) goto delete_pic_error;
 
     return GP_OK;
 
-delete_pic_error:   
+delete_pic_error:
     return ret;
-   
+
 }
 
 int tiger_get_mem(CameraPrivateLibrary *dev, int *num_pics, int *mem_total, int *mem_free) {
@@ -202,79 +199,79 @@
 
     *num_pics=soundvision_photos_taken(dev);
     if (*num_pics<0) goto get_mem_error;
-   
+
     result=soundvision_get_revision(dev,NULL);
     if (result<0) goto get_mem_error;
 
     result=soundvision_send_command(SOUNDVISION_GET_MEM_TOTAL,0,dev);
     if (result<0) goto get_mem_error;
-    
-    result=soundvision_read(dev, &temp_result, sizeof(temp_result));        
+
+    result=soundvision_read(dev, &temp_result, sizeof(temp_result));
     if (result<0) goto get_mem_error;
-   
+
     *mem_total=le32toh(temp_result);
-   
+
     result=soundvision_send_command(SOUNDVISION_GET_MEM_FREE,0,dev);
     if (result<0) goto get_mem_error;
-    
-    result=soundvision_read(dev, &temp_result, sizeof(temp_result));        
+
+    result=soundvision_read(dev, &temp_result, sizeof(temp_result));
     if (result<0) goto get_mem_error;
-   
-    *mem_free=le32toh(temp_result);    
-   
+
+    *mem_free=le32toh(temp_result);
+
     return GP_OK;
-   
+
 get_mem_error:
     GP_DEBUG("Error in tiger_get_mem");
     return result;
 
 }
 
-   
+
 int tiger_capture(CameraPrivateLibrary *dev, CameraFilePath *path) {
-   
+
     int result=0,start_pics,num_pics,mem_total,mem_free;
-       
+
     result=soundvision_send_command(SOUNDVISION_START_TRANSACTION,0,dev);
     if (result<0) goto tiger_capture_error;
-   
+
     result=soundvision_get_revision(dev,NULL);
     if (result<0) goto tiger_capture_error;
-   
+
     result=tiger_get_mem(dev,&start_pics,&mem_total,&mem_free);
     if (result<0) goto tiger_capture_error;
-    
+
     result=soundvision_send_command(SOUNDVISION_SETPC2,0,dev);
     if (result<0) goto tiger_capture_error;
-   
+
     result=soundvision_send_command(SOUNDVISION_TAKEPIC3,0,dev);
     if (result<0) goto tiger_capture_error;
 
     result=soundvision_send_command(SOUNDVISION_SETPC1,0,dev);
     if (result<0) goto tiger_capture_error;
-    
+
     result=tiger_get_mem(dev,&num_pics,&mem_total,&mem_free);
     if (result<0) goto tiger_capture_error;
-   
+
     while(num_pics==start_pics) {
        sleep(4);
        result=tiger_get_mem(dev,&num_pics,&mem_total,&mem_free);
        if (result<0) goto tiger_capture_error;
     }
-   
+
     result=tiger_get_mem(dev,&num_pics,&mem_total,&mem_free);
     if (result<0) goto tiger_capture_error;
-     
+
     return GP_OK;
-   
+
 tiger_capture_error:
     GP_DEBUG("ERROR with tiger_capture");
     return result;
-   
+
 }
 
 
-	 
+
 int tiger_get_file_list(CameraPrivateLibrary *dev) {
 
     char *buffer=NULL;
@@ -282,43 +279,48 @@
 
     ret=tiger_set_pc_mode(dev);
     if (ret<0) goto list_files_error;
-   
+
     if ( (taken=soundvision_photos_taken(dev)) < 0) {
        ret=taken;
        goto list_files_error;
     }
-   
+
     dev->num_pictures = taken;
 
     if (taken>0) {
-	
+
        buflen = (taken * 13)+1;  /* 12 char filenames and space for each */
                                  /* plus trailing NULL */
-    
+
        buffer = malloc(buflen);
-        
+
        if (!buffer) {
           GP_DEBUG("Could not allocate %i bytes!",buflen);
 	  ret=GP_ERROR_NO_MEMORY;
 	  goto list_files_error;
        }
-       
+
        ret=soundvision_send_command(SOUNDVISION_GET_NAMES, buflen, dev);
        if (ret < 0) {
           goto list_files_error;
        }
-       
+
 
        ret = soundvision_read(dev, (void *)buffer, buflen);
        if (ret < 0) {
           goto list_files_error;
        }
-       
- 
+       if (ret < buflen) {
+          GP_DEBUG("Read only %i instead of %i!", buflen, ret);
+          ret=GP_ERROR_NO_MEMORY;
+          goto list_files_error;
+       }
+
+
        if (dev->file_list) free(dev->file_list);
 
        dev->file_list = malloc(taken * 13);
-    
+
        if (!dev->file_list) {
           GP_DEBUG("Could not allocate %i bytes!",taken*13);
           ret=GP_ERROR_NO_MEMORY;
@@ -329,143 +331,143 @@
        memcpy(dev->file_list, buffer, taken * 13);
        free(buffer);
        buffer=NULL;
-       
-       
+
+
 
     }
-   
-   
-    ret=soundvision_send_command(SOUNDVISION_DONE_TRANSACTION, 0, dev);   
-    if (ret<0) goto list_files_error;    
+
+
+    ret=soundvision_send_command(SOUNDVISION_DONE_TRANSACTION, 0, dev);
+    if (ret<0) goto list_files_error;
 
           /* If we have >1 pics we should stat a file?*/
           /* Some traces do, some don't...            */
 /*    if (taken>0)
        soundvision_get_pic_size(dev,dev->file_list);
   */
-   
+
     return GP_OK;
-   
+
 list_files_error:
-       
+
     if (buffer!=NULL) free(buffer);
     return ret;
 }
 
 int tiger_get_pic(CameraPrivateLibrary *dev, const char *filename,
 		   unsigned char *data,int size) {
-   
-    int32_t ret,temp; 
+
+    int32_t ret,temp;
 
     GP_DEBUG("tiger_get_pic");
-   
+
     dev->odd_command=1;
-   
+
     ret=soundvision_get_revision(dev,NULL);
-   
+
     ret = soundvision_send_command(SOUNDVISION_GET_PIC,0,dev);
     if (ret<0) goto get_pic_error;
-   
-    ret = soundvision_read(dev, &temp, sizeof(temp));        
+
+    ret = soundvision_read(dev, &temp, sizeof(temp));
     if (ret<0) goto get_pic_error;
-    
+
     ret=soundvision_send_file_command(filename,dev);
     if (ret<0) goto get_pic_error;
-   
-    ret = soundvision_read(dev, data, size);        
+
+    ret = soundvision_read(dev, data, size);
     if (ret<0) goto get_pic_error;
 
     ret=soundvision_send_command(SOUNDVISION_DONE_TRANSACTION,0,dev);
     if (ret<0) goto get_pic_error;
-   
+
     return GP_OK;
 
 get_pic_error:
     return ret;
-   
-   
+
+
 }
 
 int tiger_get_pic_size(CameraPrivateLibrary *dev, const char *filename) {
- 
+
     int32_t ret,temp;
-    uint32_t size; 
+    uint32_t size;
 
     GP_DEBUG("tiger_get_pic_size");
-   
+
     ret=soundvision_send_command(SOUNDVISION_GET_PIC_SIZE,0,dev);
     if (ret<0) goto pic_size_error;
 
        /* should check that we get 0x0fff */
-    ret = soundvision_read(dev, &temp, sizeof(temp));        
+    ret = soundvision_read(dev, &temp, sizeof(temp));
     if (ret<0) goto pic_size_error;
-    
+
     ret=soundvision_send_file_command(filename,dev);
     if (ret<0) goto pic_size_error;
-   
-    ret = soundvision_read(dev, &size, sizeof(size));        
+
+    ret = soundvision_read(dev, &size, sizeof(size));
     if (ret<0) goto pic_size_error;
-    
+
     return le32toh(size);
-   
+
 pic_size_error:
     return ret;
-   
+
 }
 
 
 int tiger_get_thumb_size(CameraPrivateLibrary *dev, const char *filename) {
- 
+
     int32_t ret,temp;
-    uint32_t size; 
+    uint32_t size;
+
 
-   
     GP_DEBUG("tiger_get_thumb_size");
-   
+
     ret=soundvision_send_command(SOUNDVISION_GET_THUMB_SIZE,0,dev);
     if (ret<0) goto thumb_size_error;
 
-    ret = soundvision_read(dev, &temp, sizeof(temp));        
+    ret = soundvision_read(dev, &temp, sizeof(temp));
     if (ret<0) goto thumb_size_error;
-       
+
     ret = soundvision_send_file_command(filename,dev);
     if (ret<0) goto thumb_size_error;
-   
-    ret = soundvision_read(dev, &size, sizeof(size));        
+
+    ret = soundvision_read(dev, &size, sizeof(size));
     if (ret<0) goto thumb_size_error;
-    
+
     return le32toh(size);
 
 thumb_size_error:
-    return ret;   
+    return ret;
 }
 
 int tiger_get_thumb(CameraPrivateLibrary *dev, const char *filename,
 		   unsigned char *data,int size) {
 
-    int32_t ret,temp; 
-   
+    int32_t ret,temp;
+
     ret=soundvision_get_revision(dev,NULL);
-   
+
     ret = soundvision_send_command(SOUNDVISION_GET_THUMB,0,dev);
     if (ret<0) goto get_thumb_error;
-   
-    ret = soundvision_read(dev, &temp, sizeof(temp));        
+
+    ret = soundvision_read(dev, &temp, sizeof(temp));
     if (ret<0) goto get_thumb_error;
-    
+
     ret=soundvision_send_file_command(filename,dev);
     if (ret<0) goto get_thumb_error;
-   
-    ret = soundvision_read(dev, data, size);        
+
+    ret = soundvision_read(dev, data, size);
     if (ret<0) goto get_thumb_error;
 
     ret=soundvision_send_command(SOUNDVISION_DONE_TRANSACTION,0,dev);
     if (ret<0) goto get_thumb_error;
-   
+
     return GP_OK;
-   
+
 get_thumb_error:
 
     return ret;
-   
+
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/ChangeLog.gsmart -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/ChangeLog.gsmart Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/Makefile-files Changed

@@ -1,18 +1,31 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += spca50x/ChangeLog.benq spca50x/ChangeLog.gsmart spca50x/ChangeLog.spca504_flash spca50x/lsusb-v spca50x/README.spca50x spca50x/ChangeLog
+EXTRA_DIST              += %reldir%/ChangeLog
+EXTRA_DIST              += %reldir%/ChangeLog.benq
+EXTRA_DIST              += %reldir%/ChangeLog.gsmart
+EXTRA_DIST              += %reldir%/ChangeLog.spca504_flash
+EXTRA_DIST              += %reldir%/lsusb-v
 
-camlibdoc_DATA += spca50x/README.spca50x
+EXTRA_DIST              += %reldir%/README.spca50x
+camlibdoc_DATA          += %reldir%/README.spca50x
 
-EXTRA_LTLIBRARIES += spca50x.la
 
-spca50x_la_SOURCES = \
-	spca50x/spca50x.c spca50x/spca50x.h \
-	spca50x/spca50x-flash.c spca50x/spca50x-flash.h \
-	spca50x/spca50x-sdram.c spca50x/spca50x-sdram.h \
-	spca50x/library.c \
-	spca50x/spca50x-jpeg-header.h spca50x/spca50x-registers.h \
-	spca50x/spca50x-avi-header.h
-spca50x_la_LDFLAGS = $(camlib_ldflags)
-spca50x_la_DEPENDENCIES = $(camlib_dependencies)
-spca50x_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES       += spca50x.la
+
+spca50x_la_SOURCES       =
+spca50x_la_SOURCES      += %reldir%/spca50x.c
+spca50x_la_SOURCES      += %reldir%/spca50x.h
+spca50x_la_SOURCES      += %reldir%/spca50x-flash.c
+spca50x_la_SOURCES      += %reldir%/spca50x-flash.h
+spca50x_la_SOURCES      += %reldir%/spca50x-sdram.c
+spca50x_la_SOURCES      += %reldir%/spca50x-sdram.h
+spca50x_la_SOURCES      += %reldir%/library.c
+spca50x_la_SOURCES      += %reldir%/spca50x-jpeg-header.h
+spca50x_la_SOURCES      += %reldir%/spca50x-registers.h
+spca50x_la_SOURCES      += %reldir%/spca50x-avi-header.h
+
+spca50x_la_CFLAGS        = $(camlib_cflags)
+spca50x_la_CPPFLAGS      = $(camlib_cppflags)
+spca50x_la_DEPENDENCIES  = $(camlib_dependencies)
+spca50x_la_LDFLAGS       = $(camlib_ldflags)
+spca50x_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/README.spca50x -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/README.spca50x Changed

@@ -64,7 +64,7 @@
 
 Hartmut Henkel <hartmut_henkel@gmx.de> helped debug a crash with thumbnails.
 Rupert Levene <r.levene@lancaster.ac.uk> helped debug the merged camlib.
-Norbert Möndjen <Norbert.Moendjen@t-online.de> found out that the pencams
+Norbert MÃ¶ndjen <Norbert.Moendjen@t-online.de> found out that the pencams
 don't react well to the reset command.
 Walt Boring <waboring@3gstech.com> helped debug the above reset problem.
 John Feuerstein <bizkit@baze.de> helped figuring out and testing the 
@@ -113,7 +113,7 @@
 ------------------------------------
 This owes everything to the work of Mark Zimmermann <mark@foresthaven.com> whose
 pencamread tool I have simply ported to a gphoto2 camlib. The macam driver by
-Matthias Krauß was also helpfull. All features are theirs, all bugs are mine.
+Matthias KrauÃ was also helpful. All features are theirs, all bugs are mine.
 
 I dont own a camera of this type, so I had to rely on Armin Janssen
 <unclebenz@foni.net> to tirelessly produce usb snoops, test and give feedback.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/library.c Changed

@@ -22,7 +22,7 @@
 /* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,*/
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -34,19 +34,7 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "spca50x.h"
 #include "spca50x-flash.h"
@@ -124,7 +112,7 @@
 	{"D-Link:DSC 350+", 0x084d, 0x0003,
 		BRIDGE_SPCA500, SPCA50X_FLASH},
         {"Minton:S-Cam F5", 0x084d, 0x0003,
-	        BRIDGE_SPCA500, SPCA50X_FLASH},	
+	        BRIDGE_SPCA500, SPCA50X_FLASH},
 	{"PureDigital:Ritz Disposable", 0x04fc, 0xffff,
 		BRIDGE_SPCA504B_PD, SPCA50X_FLASH},
 	{NULL, 0, 0, 0, 0}
@@ -243,9 +231,13 @@
 			free (camera->pl->fats);
 			camera->pl->fats = NULL;
 		}
-		if (camera->pl->files) {
-			free (camera->pl->files);
-			camera->pl->files = NULL;
+		if (camera->pl->flash_files) {
+			free (camera->pl->flash_files);
+			camera->pl->flash_files = NULL;
+		}
+		if (camera->pl->sdram_files) {
+			free (camera->pl->sdram_files);
+			camera->pl->sdram_files = NULL;
 		}
 		if (camera->pl->flash_toc) {
 			free (camera->pl->flash_toc);
@@ -330,7 +322,10 @@
 			CHECK (spca50x_sdram_get_info (camera->pl));
 
 		for (i = 0; i < camera->pl->num_files_on_sdram; i++) {
-			strncpy (temp_file, camera->pl->filesi.name, 12);
+			if (camera->pl->sdram_filesi.name)
+				strncpy (temp_file, camera->pl->sdram_filesi.name, 12);
+			else
+				strcpy (temp_file, "BAD.BAD");
 			temp_file12 = 0;
 			gp_list_append (list, temp_file, NULL);
 		}
@@ -570,10 +565,9 @@
 			break;
 	}
 
-	camera->pl = malloc (sizeof (CameraPrivateLibrary));
+	camera->pl = calloc (sizeof (CameraPrivateLibrary), 1);
 	if (!camera->pl)
 		return (GP_ERROR_NO_MEMORY);
-	memset (camera->pl, 0, sizeof (CameraPrivateLibrary));
 	camera->pl->gpdev = camera->port;
 	camera->pl->dirty_sdram = 1;
 	camera->pl->dirty_flash = 1;
@@ -606,7 +600,7 @@
 	if (camera->pl->fw_rev > 1) {
 		CHECK (spca50x_detect_storage_type (camera->pl));
 	}
-   
+
 	if (cam_has_flash(camera->pl) || cam_has_card(camera->pl) ) {
 		if ((camera->pl->bridge == BRIDGE_SPCA504) ||
 		    (camera->pl->bridge == BRIDGE_SPCA504B_PD))

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-avi-header.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-avi-header.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-flash.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-flash.c Changed

@@ -26,7 +26,7 @@
 /* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,*/
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 #include <string.h>
@@ -36,7 +36,7 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-port-log.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
 
 #define GP_MODULE "spca50x"
 #include "spca50x.h"
@@ -57,11 +57,12 @@
 free_files (CameraPrivateLibrary *pl)
 {
 	int i;
-	if (pl->files) {
-		for (i = 0; i < pl->num_files_on_flash; i++){
-			if(pl->filesi.thumb) free (pl->filesi.thumb);
+	if (pl->flash_files) {
+		for (i = 0; i < pl->num_files_on_flash; i++) {
+			if(pl->flash_filesi.thumb) free (pl->flash_filesi.thumb);
 		}
-		free(pl->files);
+		free(pl->flash_files);
+		pl->flash_files = NULL;
 	}
 }
 
@@ -72,7 +73,9 @@
 	int timeout = 30;
 	uint8_t ready = 0;
 	while (timeout--) {
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep(1);
+#endif
 		if (pl->bridge == BRIDGE_SPCA500) {
 			CHECK (gp_port_usb_msg_read (pl->gpdev,
 							0x00, 0x0000, 0x0101,
@@ -99,8 +102,11 @@
 {
 	int timeout = 30;
 	uint8_t ready = 0;
+
 	while (timeout--) {
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep(1);
+#endif
 	CHECK (gp_port_usb_msg_read (pl->gpdev,
 					0x00, 0x0000, 0x0100,
 					(char*)&ready, 0x01));
@@ -143,13 +149,13 @@
 						(char*)&n_toc_entries, 0x02));
 			/* Each file gets two toc entries, one for the image,
 			   one for the thumbnail */
-			LE16TOH (n_toc_entries);
+			le16toh (n_toc_entries);
 			*filecount = n_toc_entries/2;
 		} else {
 			CHECK (gp_port_usb_msg_read (pl->gpdev,
 						0x54, 0x0000, 0x0000,
 						(char*)&n_toc_entries, 0x02));
-			LE16TOH (n_toc_entries);
+			le16toh (n_toc_entries);
 			*filecount = n_toc_entries;
 		}
 		/* If empty, return now */
@@ -190,8 +196,8 @@
 		/* Now, create the files info buffer */
 		free_files(pl);
 		/* NOTE: using calloc to ensure new block is "empty" */
-		pl->files = calloc (1, *filecount * sizeof (struct SPCA50xFile));
-		if (!pl->files)
+		pl->flash_files = calloc (*filecount , sizeof (struct SPCA50xFile));
+		if (!pl->flash_files)
 			return GP_ERROR_NO_MEMORY;
 	} else { /* all other cams with flash... */
 		/* read the TOC from the cam */
@@ -219,13 +225,13 @@
 						(char*)&response, 0x02));
 			/* Each file gets two toc entries, one for the
 			   image, one for the thumbnail */
-			LE16TOH (response);
+			le16toh (response);
 			*filecount = response/2;
 		} else {
 			CHECK (gp_port_usb_msg_read (pl->gpdev,
 						0x54, 0x0000, 0x0000,
 						(char*)&response, 0x02));
-			LE16TOH (response);
+			le16toh (response);
 			*filecount = response;
 		}
 	}
@@ -315,8 +321,10 @@
 
 		/* wait until the camera is not busy any more */
 		/* spca50x_flash_wait_for_ready doesn't work here */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep(3);
-		
+#endif
+
 		/* invalidate TOC/info cache */
 		pl->dirty_flash = 1;
 		return GP_OK;
@@ -332,7 +340,7 @@
 {
 	uint8_t *p;
 	if (pl->bridge == BRIDGE_SPCA500) {
-		char p14;
+		char p30;
 		int w, h, type, size;
 
 		memset (p, 0, sizeof(p));
@@ -351,7 +359,7 @@
 		else{
 			snprintf (p, sizeof(p), "Unknown");
 		}
-		memcpy (name, p, sizeof(p) );
+		strcpy (name, p);
 	} else {
 		if (pl->fw_rev == 1) {
 			p = pl->flash_toc + index*2*32;
@@ -389,12 +397,12 @@
 
 	/* First, check if the info. is already buffered in the cam private lib
 	 * We DO NOT want to be fetching the entire thumbnail just to get the file size...*/
-	 if ((pl->dirty_flash == 0) && (pl->filesindex.type != 0)){
+	 if ((pl->dirty_flash == 0) && (pl->flash_filesindex.type != 0)){
 		 /* This file must have been checked before */
-		*w = pl->filesindex.width ;
-		*h = pl->filesindex.height ;
-		*t = pl->filesindex.type ;
-		*sz = pl->filesindex.size ;
+		*w = pl->flash_filesindex.width ;
+		*h = pl->flash_filesindex.height ;
+		*t = pl->flash_filesindex.type ;
+		*sz = pl->flash_filesindex.size ;
 		return GP_OK;
 	 } else if (pl->dirty_flash != 0){ /* should never happen, but just in case... */
 		CHECK(spca50x_flash_get_TOC (pl, &i));
@@ -429,9 +437,9 @@
 	{
 		int j;
 		uint8_t * buf;
-		if (pl->filesindex.thumb){
-			free (pl->filesindex.thumb); /* discard any previous thumbnail data */
-			pl->filesindex.thumb = NULL;
+		if (pl->flash_filesindex.thumb){
+			free (pl->flash_filesindex.thumb); /* discard any previous thumbnail data */
+			pl->flash_filesindex.thumb = NULL;
 		}
 		buf = malloc (38 * 256); /* create a new buffer to hold the thumbnail data */
 		if (buf){
@@ -441,12 +449,12 @@
 				CHECK (gp_port_read (pl->gpdev, (char *)&bufj, 256));
 				j += 256;
 			}
-			pl->filesindex.thumb = buf;
+			pl->flash_filesindex.thumb = buf;
 		} else { /* couldn't get a buffer - read in the data anyway and discard it */
 			for (i = 0; i < 38; i++) {/* Thumbnails ALWAYS download 38 blocks...*/
 				CHECK (gp_port_read (pl->gpdev, waste, 256));
 			}
-			pl->filesindex.thumb = NULL;
+			pl->flash_filesindex.thumb = NULL;
 		}
 	} /* end of thumbnail storing loop */
 
@@ -518,10 +526,10 @@
 	if (pl->dirty_flash == 0){
 		/* Only update the files cache if it exists, i.e. if dirty is zero */
 		/* We should never get here if dirty is set, however ! */
-		pl->filesindex.type = *t;
-		pl->filesindex.width = *w;
-		pl->filesindex.height = *h;
-		pl->filesindex.size = *sz;
+		pl->flash_filesindex.type = *t;
+		pl->flash_filesindex.width = *w;
+		pl->flash_filesindex.height = *h;
+		pl->flash_filesindex.size = *sz;
 	}
 
 	return GP_OK;
@@ -572,7 +580,7 @@
 
 	yuv_p = buf;
 	rgb_p = tmp + hdrlen;
-	while (yuv_p < buf + file_size) {
+	while ((yuv_p < buf + file_size) && (rgb_p < tmp + hdrlen + w*h*3 - 6)) {
 		uint32_t u, v, y, y2;
 		uint32_t r, g, b;
 
@@ -609,8 +617,8 @@
 	uint8_t qIndex = 0, format;
 	int file_size;
 
-	int w = pl->filesindex.width;
-	int h = pl->filesindex.height;
+	int w = pl->flash_filesindex.width;
+	int h = pl->flash_filesindex.height;
 
 	/* qindex == 2 seems to be right for all the dsc350 images - so far!!! */
 	qIndex = 2 ; /*  FIXME - what to do about Qtable stuff? */
@@ -662,11 +670,11 @@
 	}
 
 	/* OK, we've decided what type of file it is, now lets upload it... */
-	if ((thumbnail != 0) && (pl->filesindex.thumb != NULL)){
+	if ((thumbnail != 0) && (pl->flash_filesindex.thumb != NULL)){
 		/* We can cheat here - we already have the thumbnail data in a cache, so don't load it again */
 		blks = 38;
-		buf = pl->filesindex.thumb;
-		pl->filesindex.thumb = NULL; /* we will release buf, so this pointer must be "emptied" */
+		buf = pl->flash_filesindex.thumb;
+		pl->flash_filesindex.thumb = NULL; /* we will release buf, so this pointer must be "emptied" */
 	}
 	else {
 		/* We need to download this data from the cam... */
@@ -730,7 +738,7 @@
 	sz = (blks * 256) - 1;
 	/* look for the last non-zero byte in the file...
 	 * I hope the file never *really* ends with a zero!*/
-	while (bufsz == 0) {
+	while ((bufsz == 0)  && (sz>0)) {
 		sz -= 1;
 	}
 	true_len = sz + 1;
@@ -805,6 +813,9 @@
 	if (lib->fw_rev != 1 && thumbnail)
 		return GP_ERROR_NOT_SUPPORTED;
 
+	if (!lib->flash_toc)
+		return GP_ERROR;
+
 	if (thumbnail) {
 		p = lib->flash_toc + (index*2+1) * 32;
 	} else {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-flash.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-flash.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-jpeg-header.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-jpeg-header.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-registers.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-registers.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-sdram.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-sdram.c Changed

@@ -23,41 +23,27 @@
 /* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,*/
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
 #include <gphoto2/gphoto2.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
+
+#include "libgphoto2/i18n.h"
 
 #include "spca50x.h"
 #include "spca50x-sdram.h"
 #include "spca50x-registers.h"
 #include "spca50x-avi-header.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE "spca50x"
+
 static int spca50x_mode_set_idle (CameraPrivateLibrary * lib);
 static int spca50x_is_idle (CameraPrivateLibrary * lib);
 static int spca50x_mode_set_download (CameraPrivateLibrary * lib);
@@ -97,7 +83,8 @@
 					 SPCA50X_FAT_PAGE_SIZE, p));
 			break;
 		default:
-			break;
+			gp_log(GP_LOG_ERROR, "spca50x", "spca50x_sdram_get_fat_page: dramtype %d unhandled", dramtype);
+			return GP_ERROR;
 	}
 
 	return GP_OK;
@@ -116,16 +103,20 @@
 		uint8_t lower, upper;
 
 		CHECK (gp_port_usb_msg_write (lib->gpdev, 0x5, 0, 0, NULL, 0));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep (1);
+#endif
 		CHECK (gp_port_usb_msg_read
 				(lib->gpdev, 0, 0, 0xe15,
 				 (char *) & lib->num_files_on_sdram, 1));
-		LE32TOH (lib->num_files_on_sdram);
+		le32toh (lib->num_files_on_sdram);
 
 		/*  get fatscount */
 		CHECK (gp_port_usb_msg_write
 				(lib->gpdev, 0x05, 0x0000, 0x0008, NULL, 0));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep (1);
+#endif
 		CHECK (gp_port_usb_msg_read
 				(lib->gpdev, 0, 0, 0x0e19,
 				 (char *)&lower, 1));
@@ -165,7 +156,9 @@
 
 	CHECK (gp_port_usb_msg_write
 	       (lib->gpdev, 0x06, fat_index, 0x0007, NULL, 0));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	sleep (1);
+#endif
 
 	/* Reread fats the next time it is accessed */
 	lib->dirty_sdram = 1;
@@ -184,7 +177,9 @@
 		CHECK (gp_port_usb_msg_write
 		       (lib->gpdev, 0x02, 0x0000, 0x0005, NULL, 0));
 	}
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	sleep (3);
+#endif
 
 	/* Reread fats the next time it is accessed */
 	lib->dirty_sdram = 1;
@@ -218,6 +213,7 @@
 	int omit_escape = 0;
 
 	p = g_file->fat;
+	if (!p) return GP_ERROR;
 
 	/* get the position in memory where the image is */
 	start = (p1 & 0xff) + (p2 & 0xff) * 0x100;
@@ -272,7 +268,9 @@
 			free (mybuf);
 			return ret;
 		}
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep (1);
+#endif
 		ret = gp_port_read (lib->gpdev, (char *)mybuf, size);
 		if (ret < GP_OK) {
 			free (mybuf);
@@ -306,7 +304,7 @@
 {
 	int i, j, length, ret;
 	int frame_count = 0, frames_per_fat = 0, fn = 0;
-	int size = 0;
+	unsigned int size = 0;
 	int file_size;
 	int index_size;
 	uint32_t frame_size = 0, frame_width = 0, frame_height = 0;
@@ -380,6 +378,7 @@
 		+ 8 + index_size	/* for index chunk */
 		+ 1024 * 10 * frame_count;
 
+	GP_DEBUG("file_size = %d", file_size);
 	avi = malloc (file_size);
 	if (!avi) {
 		free (avi_index);
@@ -426,6 +425,14 @@
 				+ ((p51 + j * 3 & 0xFF) * 0x100) +
 				(p50 + j * 3 & 0xFF);
 
+			GP_DEBUG("frame_size = %d", frame_size);
+
+			if ((file_size - (avi - start_of_file)) < SPCA50X_AVI_FRAME_HEADER_LENGTH) {
+				free (mybuf);
+				GP_DEBUG("BAD: writing more than we allocated (%ld, %ld vs total %d)", (avi-start_of_file), (file_size - (avi - start_of_file)), SPCA50X_AVI_FRAME_HEADER_LENGTH);
+				return GP_ERROR_CORRUPTED_DATA;
+			}
+
 			memcpy (avi, SPCA50xAviFrameHeader,
 					SPCA50X_AVI_FRAME_HEADER_LENGTH);
 
@@ -433,10 +440,21 @@
 			start_of_frame = avi;
 
 			/* jpeg starts here */
-			create_jpeg_from_data (avi, data, qIndex, frame_width,
+			if ((data - mybuf) + frame_size > size) {
+				free (mybuf);
+				GP_DEBUG("BAD: accessing more than we read (%u vs total %d)", (unsigned int)((data-mybuf)+frame_size), size);
+				return GP_ERROR_CORRUPTED_DATA;
+			}
+			ret = create_jpeg_from_data (avi, data, qIndex, frame_width,
 					       frame_height, 0x22, frame_size,
 					       &length, 1, 0);
 
+			if (ret != GP_OK) {
+				free (mybuf);
+				return ret;
+			}
+
+			GP_DEBUG("avi added length = %d, width %d , height %d", length, frame_width, frame_height);
 			data += (frame_size + 7) & 0xfffffff8;
 			avi += length;
 			/* Make sure the next frame is aligned */
@@ -627,7 +645,9 @@
 			free (mybuf);
 			return ret;
 		}
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep (1);
+#endif
 		ret = gp_port_read (lib->gpdev, (char *)mybuf, size);
 		if (ret < GP_OK) {
 			free (mybuf);
@@ -677,7 +697,7 @@
 int
 spca50x_sdram_get_info (CameraPrivateLibrary * lib)
 {
-	unsigned int index;
+	int index;
 	uint8_t dramtype = 0;
 	uint8_t *p;
 	uint32_t start_page, end_page;
@@ -706,7 +726,11 @@
 	if (lib->num_files_on_sdram > 0) {
 		CHECK (spca50x_get_FATs (lib, dramtype));
 
-		index = lib->fileslib->num_files_on_sdram - 1.fat_end;
+		index = lib->sdram_fileslib->num_files_on_sdram - 1.fat_end;
+		if (index >= lib->num_fats) {
+			gp_log(GP_LOG_ERROR, "spca50x", "%d exceeds num_fats %d", index, lib->num_fats);
+			return GP_ERROR;
+		}
 		p = lib->fats + SPCA50X_FAT_PAGE_SIZE * index;
 		/* p now points to the fat of the last image of the last file */
 
@@ -733,7 +757,7 @@
 {
 	if (lib->dirty_sdram)
 		CHECK (spca50x_sdram_get_info (lib));
-	*g_file = &(lib->filesindex);
+	*g_file = &(lib->sdram_filesindex);
 	return GP_OK;
 }
 static int
@@ -836,7 +860,7 @@
 	unsigned int index = 0;
 	unsigned int file_index = 0;
 	uint8_t *p = NULL;
-	uint8_t buf14;
+	char buf30;
 
 	/* Reset image and movie counter */
 	lib->num_images = lib->num_movies = 0;
@@ -846,17 +870,17 @@
 		lib->fats = NULL;
 	}
 
-	if (lib->files) {
-		free (lib->files);
-		lib->files = NULL;
+	if (lib->sdram_files) {
+		free (lib->sdram_files);
+		lib->sdram_files = NULL;
 	}
 
-	lib->fats = malloc (lib->num_fats * SPCA50X_FAT_PAGE_SIZE);
-	lib->files = malloc (lib->num_files_on_sdram * sizeof (struct SPCA50xFile));
+	lib->fats = calloc (lib->num_fats , SPCA50X_FAT_PAGE_SIZE);
+	lib->sdram_files = calloc (lib->num_files_on_sdram , sizeof (struct SPCA50xFile));
 
 	p = lib->fats;
 	if (lib->bridge == BRIDGE_SPCA504) {
-		while (index < lib->num_fats) {
+		while (index < (unsigned int)lib->num_fats) {
 			CHECK (spca50x_sdram_get_fat_page (lib, index,
 						dramtype, p));
 			if (p0 == 0xFF)
@@ -870,7 +894,9 @@
 		spca50x_reset (lib);
 		CHECK (gp_port_usb_msg_write
 		       (lib->gpdev, 0x05, 0x00, 0x07, NULL, 0));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		sleep (1);
+#endif
 		CHECK (gp_port_read
 		       (lib->gpdev, (char *)lib->fats,
 			lib->num_fats * SPCA50X_FAT_PAGE_SIZE));
@@ -879,7 +905,12 @@
 	p = lib->fats;
 	index = 0;
 
-	while (index < lib->num_fats) {
+	while (index < (unsigned int)lib->num_fats) {
+		if (file_index >= (unsigned int)lib->num_files_on_sdram) {
+			free (lib->fats); lib->fats = NULL;
+			free (lib->sdram_files); lib->sdram_files = NULL;
+			return GP_ERROR;
+		}
 
 		type = p0;
 		/* While the spca504a indicates start of avi as 0x08 and cont.
@@ -887,29 +918,34 @@
 		 * gets its own fat table with a sequence number at p18. */
 		if ((type == 0x80) || (type == 0x03 && (p18 != 0x00))) {
 			/* continuation of an avi */
-			lib->filesfile_index - 1.fat_end = index;
+			if (!file_index)
+				return GP_ERROR;
+			lib->sdram_filesfile_index - 1.fat_end = index;
 		} else {
 			/* its an image */
 			if (type == 0x00 || type == 0x01) {
-				snprintf ((char*)buf, 13, "Image%03d.jpg",
+				snprintf (buf, sizeof(buf), "Image%03d.jpg",
 					  ++lib->num_images);
-				lib->filesfile_index.mime_type =
+				lib->sdram_filesfile_index.mime_type =
 					SPCA50X_FILE_TYPE_IMAGE;
 			} else if ((type == 0x08) || (type == 0x03)) {
 				/* its the start of an avi */
-				snprintf ((char*)buf, 13, "Movie%03d.avi",
+				snprintf (buf, sizeof(buf), "Movie%03d.avi",
 					  ++lib->num_movies);
-				lib->filesfile_index.mime_type =
+				lib->sdram_filesfile_index.mime_type =
 					SPCA50X_FILE_TYPE_AVI;
+			} else {
+				gp_log(GP_LOG_ERROR, "spca50x", "type %d unhandled - error", type);
+				return GP_ERROR;
 			}
-			lib->filesfile_index.fat = p;
-			lib->filesfile_index.fat_start = index;
-			lib->filesfile_index.fat_end = index;
-			lib->filesfile_index.name = strdup ((char*)buf);
+			lib->sdram_filesfile_index.fat = p;
+			lib->sdram_filesfile_index.fat_start = index;
+			lib->sdram_filesfile_index.fat_end = index;
+			lib->sdram_filesfile_index.name = strdup (buf);
 			if (lib->bridge == BRIDGE_SPCA504) {
-				lib->filesfile_index.width =
+				lib->sdram_filesfile_index.width =
 					(p8 & 0xFF) * 16;
-				lib->filesfile_index.height =
+				lib->sdram_filesfile_index.height =
 					(p9 & 0xFF) * 16;
 			} else if (lib->bridge == BRIDGE_SPCA500) {
 				int w, h;
@@ -921,10 +957,10 @@
 					w = 640;
 					h = 480;
 				}
-				lib->filesfile_index.width = w;
-				lib->filesfile_index.height = h;
+				lib->sdram_filesfile_index.width = w;
+				lib->sdram_filesfile_index.height = h;
 			}
-			lib->filesfile_index.thumb = NULL;
+			lib->sdram_filesfile_index.thumb = NULL;
 			file_index++;
 		}
 		p += SPCA50X_FAT_PAGE_SIZE;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x-sdram.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x-sdram.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x.c Changed

@@ -25,38 +25,23 @@
 /* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,*/
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
 #include <gphoto2/gphoto2.h>
-#include "gphoto2-endian.h"
+#include "libgphoto2/gphoto2-endian.h"
+
+#include "libgphoto2/i18n.h"
 
 #include "spca50x.h"
 #include "spca50x-registers.h"
 #include "spca50x-jpeg-header.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define GP_MODULE "spca50x"
 
@@ -78,7 +63,7 @@
 	for (i=0;i<3;i++)
 	{
 		bufi = 0;  /* if no data returned, assume no capability */
-		CHECK (gp_port_usb_msg_read (lib->gpdev, 0x28, 0x0000, 
+		CHECK (gp_port_usb_msg_read (lib->gpdev, 0x28, 0x0000,
 					i, (char *)&bufi, 0x01));
 	}
 
@@ -152,7 +137,9 @@
  			CHECK (spca50x_pd_enable (lib));
 		}
 	}
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	usleep(200000);
+#endif
 	return GP_OK;
 }
 
@@ -189,15 +176,19 @@
 int
 spca50x_capture (CameraPrivateLibrary * lib)
 {
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	sleep (2);
+#endif
         CHECK (gp_port_usb_msg_write
 		(lib->gpdev, 0x06, 0x0000, 0x0003, NULL, 0));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 	sleep (3);
+#endif
 	return GP_OK;
 }
 
-void
-create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex, int w,
+int
+create_jpeg_from_data (uint8_t * dst, uint8_t * src, unsigned int qIndex, int w,
 		       int h, uint8_t format, int o_size, int *size,
 		       int omit_huffman_table, int omit_escape)
 {
@@ -211,6 +202,10 @@
 			SPCA50X_JPG_DEFAULT_HEADER_PART1_LENGTH);
 
 	/* modify quantization table */
+	if (qIndex >= sizeof(SPCA50xQTable)/sizeof(SPCA50xQTable0)/2) {
+		gp_log(GP_LOG_ERROR,"create_jpeg_from_data","qIndex %d too large", qIndex);
+		return GP_ERROR;
+	}
 	memcpy (dst + 7, SPCA50xQTableqIndex * 2, 64);
 	memcpy (dst + 72, SPCA50xQTableqIndex * 2 + 1, 64);
 
@@ -238,18 +233,22 @@
 	dst += SPCA50X_JPG_DEFAULT_HEADER_PART3_LENGTH;
 
 	for (i = 0; i < o_size; i++) {
+		if (dst - start >= *size) return GP_ERROR;
 		value = *(src + i) & 0xFF;
 		*(dst) = value;
 		dst++;
 
 		if (value == 0xFF && !omit_escape) {
+			if (dst - start >= *size) return GP_ERROR;
 			*(dst) = 0x00;
 			dst++;
 		}
 	}
+	if (dst + 2 - start >= *size) return GP_ERROR;
 	/* Add end of image marker */
 	*(dst++) = 0xFF;
 	*(dst++) = 0xD9;
 
 	*size = dst - start;
+	return GP_OK;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/spca50x/spca50x.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/spca50x/spca50x.h Changed

@@ -24,9 +24,10 @@
 /* Boston, MA  02110-1301  USA					*/
 /****************************************************************/
 
-#ifndef __SPCA50X_H__
-#define __SPCA50X_H__
-#include <_stdint.h>
+#ifndef CAMLIBS_SPCA50X_SPCA50X_H
+#define CAMLIBS_SPCA50X_SPCA50X_H
+
+#include <stdint.h>
 #include <gphoto2/gphoto2-camera.h>
 
 #define SPCA50X_FAT_PAGE_SIZE 0x100
@@ -72,7 +73,8 @@
 	int size_free;
 	uint8_t *flash_toc;
 	uint8_t *fats;
-	struct SPCA50xFile *files;
+	struct SPCA50xFile *flash_files;
+	struct SPCA50xFile *sdram_files;
 };
 
 #define SPCA50X_SDRAM 0x01
@@ -85,9 +87,9 @@
 int spca50x_reset (CameraPrivateLibrary * lib);
 int spca50x_capture (CameraPrivateLibrary * lib);
 int yuv2rgb (uint32_t y, uint32_t u, uint32_t v, uint32_t *r, uint32_t *g, uint32_t *b);
-void create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex,
+int create_jpeg_from_data (uint8_t * dst, uint8_t * src, unsigned int qIndex,
 				   int w, int h, uint8_t format,
 				   int original_size, int *size,
 				   int omit_huffman_table, int omit_escape);
 
-#endif /* __SPCA50X_H__ */
+#endif /* !defined(CAMLIBS_SPCA50X_SPCA50X_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sq905/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sq905/Makefile-files Changed

@@ -1,11 +1,25 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += sq905/README.913C sq905/README.sq905 sq905/ChangeLog sq905/TODO
-camlibdoc_DATA += sq905/README.913C sq905/README.sq905
+EXTRA_DIST            += %reldir%/ChangeLog
+EXTRA_DIST            += %reldir%/TODO
 
-EXTRA_LTLIBRARIES += sq905.la
+EXTRA_DIST            += %reldir%/README.913C
+camlibdoc_DATA        += %reldir%/README.913C
 
-sq905_la_SOURCES = sq905/library.c sq905/sq905.c sq905/sq905.h sq905/postprocess.c 
-sq905_la_LDFLAGS = $(camlib_ldflags)
-sq905_la_DEPENDENCIES = $(camlib_dependencies)
-sq905_la_LIBADD = $(camlib_libadd)
+EXTRA_DIST            += %reldir%/README.sq905
+camlibdoc_DATA        += %reldir%/README.sq905
+
+
+EXTRA_LTLIBRARIES     += sq905.la
+
+sq905_la_SOURCES       =
+sq905_la_SOURCES      += %reldir%/library.c
+sq905_la_SOURCES      += %reldir%/sq905.c
+sq905_la_SOURCES      += %reldir%/sq905.h
+sq905_la_SOURCES      += %reldir%/postprocess.c
+
+sq905_la_CFLAGS        = $(camlib_cflags)
+sq905_la_CPPFLAGS      = $(camlib_cppflags)
+sq905_la_DEPENDENCIES  = $(camlib_dependencies)
+sq905_la_LDFLAGS       = $(camlib_ldflags)
+sq905_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sq905/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sq905/library.c Changed

@@ -18,7 +18,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <config.h>
 
@@ -26,8 +26,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bayer.h>
-#include <gamma.h>
+#include <libgphoto2/bayer.h>
+#include <libgphoto2/gamma.h>
 
 
 #include <gphoto2/gphoto2.h>
@@ -88,7 +88,7 @@
 	                      GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
 	{"Global Point Splash Mini (underwater camera)",
 	                      GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x9120},
-	{NULL,0,0}
+	{NULL,0,0,0}
 };
 
 int
@@ -186,7 +186,7 @@
 file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
                 void *data, GPContext *context)
 {
-	Camera *camera = data; 
+	Camera *camera = data;
 	int i,n;
 	GP_DEBUG ("List files in %s\n", folder);
 	if (0==strcmp(folder, "/")) {
@@ -260,8 +260,8 @@
 
 		return GP_ERROR_NOT_SUPPORTED;
 	}
-	
-	
+
+
 	/* Get the entry number of the photo on the camera */
 	entry = -1;
 	if (0==strcmp(folder, "/")) {
@@ -271,7 +271,7 @@
 			while (sq_is_clip(camera->pl, entry)
 					&& entry<camera->pl->nb_entries);
 			i--;
-		} 
+		}
 		while (i>0);
 		if (entry == camera->pl->nb_entries)
 			return GP_ERROR_FILE_NOT_FOUND;
@@ -280,7 +280,7 @@
 	} else {
 		i = atoi(folder+1+4);
 		do {
-			do entry++; 
+			do entry++;
 			while (!sq_is_clip(camera->pl, entry) &&
 						entry<camera->pl->nb_entries);
 			i--;
@@ -306,7 +306,7 @@
 	GP_DEBUG ("last entry was %d\n", camera->pl->last_fetched_entry);
 
 	/* Change register to DATA, but only if necessary */
-	if ((camera->pl->last_fetched_entry == -1) 
+	if ((camera->pl->last_fetched_entry == -1)
 	|| ((is_in_clip) && (frame == 0)) )
 
 	sq_access_reg(camera->port, DATA);
@@ -331,23 +331,27 @@
 		case 320: h = 240; break;
 		default:  h = 288; break;
 		}
+		if (!comp_ratio) {
+			sq_rewind(camera->port, camera->pl);
+			return GP_ERROR;
+		}
 		b = nb_frames * w * h / comp_ratio;
 		do_preprocess = 1;
 		if (camera->pl->last_fetched_data) break;
 
-		camera->pl->last_fetched_data = malloc (nb_frames*w*h);
+		camera->pl->last_fetched_data = malloc ((long)nb_frames*w*h);
 		if (!camera->pl->last_fetched_data) {
 			sq_rewind(camera->port, camera->pl);
 			return GP_ERROR_NO_MEMORY;
 		}
 		GP_DEBUG("Fetch entry %i\n", to_fetch);
-		sq_read_picture_data 
+		sq_read_picture_data
 			    (camera->port, camera->pl->last_fetched_data, b);
 		camera->pl->last_fetched_entry = to_fetch;
 	} while (camera->pl->last_fetched_entry<entry);
 
 	frame_data = camera->pl->last_fetched_data+(w*h)*frame/comp_ratio;
-	/* sq_preprocess ( ) turns the photo right-side-up and for some 
+	/* sq_preprocess ( ) turns the photo right-side-up and for some
 	 * models must also de-mirror the photo
 	 */
 
@@ -357,9 +361,9 @@
 			sq_preprocess(camera->pl->model, comp_ratio,
 					is_in_clip, frame_data, w, h);
 		}
-		
+
 		/*
-		 * Now put the data into a PPM image file. 
+		 * Now put the data into a PPM image file.
 		 */
 		ppm = malloc (w * h * 3 + 256); /* room for data + header */
 		if (!ppm) { return GP_ERROR_NO_MEMORY; }
@@ -383,14 +387,14 @@
 		size = size + (w * h * 3);
 		GP_DEBUG ("size = %i\n", size);
 		if (comp_ratio>1) {
-			rawdata = malloc (w*h);
+			rawdata = malloc ((long)w*h);
 			if (!rawdata) {
 				free (ppm);
 				return GP_ERROR_NO_MEMORY;
 			}
 			sq_decompress (camera->pl->model, rawdata,
 						frame_data, w, h);
-			gp_gamma_fill_table (gtable, .65); 
+			gp_gamma_fill_table (gtable, .65);
 		} else {
 			rawdata = frame_data;
 			gp_gamma_fill_table (gtable, .55);
@@ -474,7 +478,7 @@
 		break;
 	}
 
-	/* TO DO: 
+	/* TO DO:
 	 * Adapt some postprocessing routine to work here, because results
 	 * can vary greatly, depending both on lighting conditions and on
 	 * camera model.
@@ -535,7 +539,7 @@
 
 	ret = gp_port_get_settings(camera->port,&settings);
 	if (ret < 0) return ret;
- 
+
 	ret = gp_port_set_settings(camera->port,settings);
 	if (ret < 0) return ret;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sq905/postprocess.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sq905/postprocess.c Changed

@@ -1,18 +1,18 @@
 /*
  * postprocess.c
  *
- * Here are the decompression function  for the compressed photos and the 
- * postprocessing for uncompressed photos. 
+ * Here are the decompression function  for the compressed photos and the
+ * postprocessing for uncompressed photos.
  *
  * Copyright (c) 2003 Theodore Kilgore <kilgota@auburn.edu>
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
- * The chip supported by this driver is presumed to be the SQ905,  
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
+ * The chip supported by this driver is presumed to be the SQ905,
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
 #include <config.h>
 
@@ -23,15 +23,12 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include "sq905.h"
 
-#define GP_MODULE "sq905" 
+#define GP_MODULE "sq905"
 
 #define RED 0
 #define GREEN 1
@@ -45,8 +42,8 @@
 #endif
 
 
-static int 
-decode_panel	(unsigned char *panel_out, unsigned char *panel,               
+static int
+decode_panel	(unsigned char *panel_out, unsigned char *panel,
                     		int panelwidth, int height, int color);
 
 int
@@ -54,11 +51,11 @@
 	    int w, int h)
 {
 	/*
-	 * Data arranged in planar form. We decompress the raw data first, 
-	 * one colorplane at a time, and put the results into a standard 
+	 * Data arranged in planar form. We decompress the raw data first,
+	 * one colorplane at a time, and put the results into a standard
 	 * Bayer pattern. The byte-reversal routine having been done already,
-	 * the planes are in the order RBG. The R and B planes  each have 
-	 * dimensions (w/4)*(h/2), and the G is (w/4)*h. 
+	 * the planes are in the order RBG. The R and B planes  each have
+	 * dimensions (w/4)*(h/2), and the G is (w/4)*h.
 	 */
 
 	unsigned char *red, *green, *blue, *red_out, *green_out, *blue_out;
@@ -84,33 +81,33 @@
 		return -1;
 	}
 	decode_panel (red_out, red, w/2, h/2, RED);
-	decode_panel (blue_out, blue, w/2, h/2, BLUE);		
+	decode_panel (blue_out, blue, w/2, h/2, BLUE);
 	decode_panel (green_out, green, w/2, h, GREEN);
 
 
 	/* Now, put things in their proper places */
-	
+
 	for ( m = 0; m < h/2 ; m++ ) {
 		for ( i = 0; i < w/2; i++ ) {
 			/* Reds in even rows, even columns */
 			output(2*m)*w+2*i  = red_outm*w/2+i ;
 			/* Blues in odd rows, odd columns */
 			output(2*m+1)*w+2*i +1 = blue_outm*w/2+i;
-			/* For the greens (note m*w = (2*m)*w/2) we 
+			/* For the greens (note m*w = (2*m)*w/2) we
 			 * get first the even rows, odd columns */
 			output(2*m)*w+ 2*i+1 = green_outm*w +i;
 			/* and then, the greens on odd rows, even columns. */
 			output(2*m+1)*w+ 2*i = green_out(2*m+1)*w/2 +i;
 		}
 	}
-	
+
 
 
 	/* De-mirroring for some models */
 	switch(model) {
 	case(SQ_MODEL_MAGPIX):
 	case(SQ_MODEL_POCK_CAM):
-        for (i = 0; i < h; i++) {                                              
+        for (i = 0; i < h; i++) {
 	        for (m = 0 ; m < w/2; m++) {
 	                temp = outputw*i +m;
 	                outputw*i + m = outputw*i + w -1 -m;
@@ -129,7 +126,7 @@
 static
 int decode_panel (unsigned char *panel_out, unsigned char *panel,
 			int panelwidth, int height, int color) {
-	/* Here, "panelwidth" signifies width of panel_out 
+	/* Here, "panelwidth" signifies width of panel_out
 	 * which is w/2, and height equals h */
 
 	int diff = 0;
@@ -142,7 +139,7 @@
 	int delta_table = {-144,-110,-77,-53,-35,-21,-11,-3,
 				2,10,20,34,52,76,110,144};
 
-	unsigned char *temp_line;	
+	unsigned char *temp_line;
 	temp_line = malloc(panelwidth);
 
 	if (!temp_line)
@@ -162,9 +159,9 @@
 				input_counter ++;
 				/* left pixel */
 				diff = delta_tabledelta_left;
-				if (!i) 
+				if (!i)
 					tempval = (temp_line2*i) + diff;
-				else 
+				else
 					tempval = (temp_line2*i
 				        + panel_outm*panelwidth+2*i-1)/2 + diff;
 				tempval = MIN(tempval, 0xff);
@@ -192,9 +189,9 @@
 				input_counter ++;
 				/* left pixel */
 				diff = delta_tabledelta_left;
-				if (!i) 
+				if (!i)
 					tempval = (temp_line0+temp_line1)/2 + diff;
-				else 
+				else
 					tempval = (temp_line2*i+1
 				        + panel_out2*m*panelwidth+2*i-1)/2 + diff;
 				tempval = MIN(tempval, 0xff);
@@ -203,15 +200,15 @@
 				temp_line2*i = tempval;
 				/* right pixel */
 				diff = delta_tabledelta_right;
-				if (2*i == panelwidth - 2 ) 
+				if (2*i == panelwidth - 2 )
 					tempval = (temp_line2*i+1
 						+ panel_out
-							2*m*panelwidth+2*i)/2 
+							2*m*panelwidth+2*i)/2
 							+ diff;
 				else
 					tempval = (temp_line2*i+2
 						+ panel_out
-							2*m*panelwidth+2*i)/2 
+							2*m*panelwidth+2*i)/2
 							+ diff;
 				tempval = MIN(tempval, 0xff);
 				tempval = MAX(tempval, 0);
@@ -225,12 +222,12 @@
 				input_counter ++;
 				/* left pixel */
 				diff = delta_tabledelta_left;
-				if (!i) 
+				if (!i)
 					tempval = (temp_line2*i) + diff;
-				else 
+				else
 					tempval = (temp_line2*i
 				    	    + panel_out
-						(2*m+1)*panelwidth+2*i-1)/2 
+						(2*m+1)*panelwidth+2*i-1)/2
 						+ diff;
 				tempval = MIN(tempval, 0xff);
 				tempval = MAX(tempval, 0);
@@ -239,7 +236,7 @@
 				/* right pixel */
 				diff = delta_tabledelta_right;
 				tempval = (temp_line2*i+1
-					+ panel_out(2*m+1)*panelwidth+2*i)/2 
+					+ panel_out(2*m+1)*panelwidth+2*i)/2
 					+ diff;
 				tempval = MIN(tempval, 0xff);
 				tempval = MAX(tempval, 0);
@@ -249,7 +246,7 @@
 		}
 		free (temp_line);
 		return GP_OK;
-	}	
+	}
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sq905/sq905.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sq905/sq905.c Changed

@@ -1,17 +1,17 @@
 /*
  * sq905.c
  *
- * Here, the functions which are needed to get data from the camera.  
+ * Here, the functions which are needed to get data from the camera.
  *
  * Copyright (c) 2003 Theodore Kilgore <kilgota@auburn.edu>
- * Camera library support under libgphoto2.1.1 for camera(s) 
- * with chipset from Service & Quality Technologies, Taiwan. 
- * The chip supported by this driver is presumed to be the SQ905,  
+ * Camera library support under libgphoto2.1.1 for camera(s)
+ * with chipset from Service & Quality Technologies, Taiwan.
+ * The chip supported by this driver is presumed to be the SQ905,
  *
  * Licensed under GNU Lesser General Public License, as part of Gphoto
- * camera support project. For a copy of the license, see the file 
+ * camera support project. For a copy of the license, see the file
  * COPYING in the main source tree of libgphoto2.
- */    
+ */
 
 #include <config.h>
 
@@ -22,15 +22,12 @@
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
-#ifdef OS2
-#include <db.h>
-#endif
 
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include "sq905.h"
 
-#define GP_MODULE "sq905" 
+#define GP_MODULE "sq905"
 
 #define SQWRITE gp_port_usb_msg_write
 #define SQREAD  gp_port_usb_msg_read
@@ -40,13 +37,13 @@
 static int
 sq_read_data (GPPort *port, unsigned char *data, int size)
 {
-	SQWRITE (port, 0x0c, 0x03, size, zero, 1); 
-	gp_port_read (port, (char *)data, size); 
+	SQWRITE (port, 0x0c, 0x03, size, zero, 1);
+	gp_port_read (port, (char *)data, size);
 	return GP_OK;
 }
 
 
-int sq_access_reg (GPPort *port, int reg) 
+int sq_access_reg (GPPort *port, int reg)
 {
 	char c;
 	SQWRITE (port, 0x0c, 0x06, reg, zero, 1);	/* Access a register */
@@ -54,7 +51,7 @@
 	return GP_OK;
 }
 
-int 
+int
 sq_init (GPPort *port, CameraPrivateLibrary *priv)
 {
 	unsigned char c0x4;
@@ -88,7 +85,7 @@
 	sq_read_data(port, catalog, 0x4000); /* We need 16 bytes for each photo. */
 	sq_reset (port);
 
-	/* The first occurence of a zero denotes end of files entries (here clips count as 1 entry) */
+	/* The first occurrence of a zero denotes end of files entries (here clips count as 1 entry) */
 	for (i=0; i<0x4000 && catalogi; i+=16) ;
 	priv->nb_entries = i>>4;
 	if (i) {
@@ -115,7 +112,7 @@
 sq_get_num_frames (CameraPrivateLibrary *priv, int entry)
 {
 	if (sq_is_clip(priv, entry)) {
-		GP_DEBUG(" Number of frames in clip %i is %i\n", entry, priv->catalog16*entry+7);	
+		GP_DEBUG(" Number of frames in clip %i is %i\n", entry, priv->catalog16*entry+7);
 		return priv->catalog16*entry+7;
 	} else {
 		return 1;
@@ -136,7 +133,7 @@
 	case 0x43:
 	case 0x52:
 	case 0x53:
-	case 0x56: 
+	case 0x56:
 	case 0x72: return 1;
 	default:
 		GP_DEBUG ("Your camera has unknown resolution settings.\n");
@@ -147,7 +144,7 @@
 int
 sq_get_picture_width (CameraPrivateLibrary *priv, int entry)
 {
-	switch (priv->catalog16*entry) {  
+	switch (priv->catalog16*entry) {
 	case 0x41:
 	case 0x52:
 	case 0x61: return 352;
@@ -168,7 +165,7 @@
 int
 sq_is_clip (CameraPrivateLibrary *priv, int entry)
 {
-	switch (priv->catalog16*entry) {  
+	switch (priv->catalog16*entry) {
 	case 0x52:
 	case 0x53:
 	case 0x72: return 1;
@@ -180,8 +177,8 @@
 sq_rewind (GPPort *port, CameraPrivateLibrary *priv)
 {
 	static unsigned char dummy_buf0x4000;
-	
-	
+
+
 	GP_DEBUG("REWIND cam's data pointer");
 
 	/* One has to read the catalog to rewind the data stream...
@@ -222,17 +219,17 @@
 	}
  	sq_read_data (port, data + offset, remainder);
 
-    	SQWRITE (port, 0x0c, 0xc0, 0x00, &c, 1);  
+    	SQWRITE (port, 0x0c, 0xc0, 0x00, &c, 1);
     	return GP_OK;
-} 
+}
 
 int
 sq_delete_all (GPPort *port, CameraPrivateLibrary *priv)
 {
-	/* This will work on the Argus DC-1510, perhaps some others. 
+	/* This will work on the Argus DC-1510, perhaps some others.
 	 * Will not successfully delete on all SQ905 cameras!
-	 */  
-	 
+	 */
+
 	switch (priv->catalog2) {
 	case 0xd0: 				/* Searches for DC-1510 */
 		sq_access_reg(port, CAPTURE);	/* used here to delete */
@@ -240,13 +237,13 @@
 		sq_reset(port);
 		break;
 	default:
-		return (GP_ERROR_NOT_SUPPORTED);	
+		return (GP_ERROR_NOT_SUPPORTED);
 	}
     	return GP_OK;
 }
 
-int 
-sq_preprocess (SQModel model, int comp_ratio, unsigned char is_in_clip,  
+int
+sq_preprocess (SQModel model, int comp_ratio, unsigned char is_in_clip,
 				    unsigned char *data, int w, int h)
 {
 	int i, m, b;
@@ -261,23 +258,23 @@
         		temp = datai;
         		datai = datab -1 -i;
         		datab - 1 - i = temp;
-    		}    	
+    		}
 		/* But clip frames are already right-side-up */
     	}
 	/*
-	 * POCK_CAM needs de-mirror-imaging, too. But if a photo is 
-	 * compressed we de-mirror after decompression, so not here. 
+	 * POCK_CAM needs de-mirror-imaging, too. But if a photo is
+	 * compressed we de-mirror after decompression, so not here.
 	 */
 	if ((model == SQ_MODEL_POCK_CAM) && (comp_ratio == 1)) {
     		for (i = 0; i < h; i++) {
-			for (m = 0 ; m < w/2; m++) { 
+			for (m = 0 ; m < w/2; m++) {
         			temp = dataw*i +m;
 				dataw*i + m = dataw*i + w -1 -m;
 				dataw*i + w - 1 - m = temp;
 			}
-    		} 
+    		}
 	}
 	return GP_OK;
-}	
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sq905/sq905.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sq905/sq905.h Changed

@@ -1,5 +1,5 @@
-#ifndef __SQ905_H__
-#define __SQ905_H__
+#ifndef CAMLIBS_SQ905_SQ905_H
+#define CAMLIBS_SQ905_SQ905_H
 
 #include <gphoto2/gphoto2-port.h>
 
@@ -7,8 +7,8 @@
  * A 'clip' is an autoshoot clip.
  * A 'frame' is a single a picture out of a clip.
  * An 'entry' corresponds to a line listed in the camera's configuration data,
- * part of which is a rudimentary allocation table (the 'catalog'). 
- * An entry, therefore, may be either a picture or a clip. 
+ * part of which is a rudimentary allocation table (the 'catalog').
+ * An entry, therefore, may be either a picture or a clip.
  * We reserve the word 'file' for the user fetchable file,
  * that is, a picture or a frame.
  */
@@ -16,7 +16,7 @@
 typedef enum {
 	SQ_MODEL_POCK_CAM,
 	SQ_MODEL_PRECISION,
-	SQ_MODEL_MAGPIX, 
+	SQ_MODEL_MAGPIX,
 /*	SQ_MODEL_913c, */
 	SQ_MODEL_DEFAULT
 } SQModel;
@@ -46,17 +46,18 @@
 
 /* Those functions don't need data transfer with the camera */
 int sq_get_num_frames                (CameraPrivateLibrary *, int entry);
- 
+
 int sq_get_comp_ratio      	     (CameraPrivateLibrary *, int entry);
 int sq_get_picture_width             (CameraPrivateLibrary *, int entry);
 int sq_is_clip                       (CameraPrivateLibrary *, int entry);
 
 int
-sq_preprocess		(SQModel model, int comp_ratio, 
-				unsigned char is_in_clip, 
+sq_preprocess		(SQModel model, int comp_ratio,
+				unsigned char is_in_clip,
 				unsigned char *data, int w, int h);
 int
-sq_decompress 		(SQModel model, unsigned char *output, unsigned char *data, 
+sq_decompress 		(SQModel model, unsigned char *output, unsigned char *data,
 				int w, int h);
-#endif
+
+#endif /* !defined(CAMLIBS_SQ905_SQ905_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/st2205/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/st2205/Makefile-files Changed

@@ -1,12 +1,33 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += st2205/README.st2205-compression st2205/README.st2205
-camlibdoc_DATA += st2205/README.st2205-compression st2205/README.st2205
+EXTRA_DIST             += %reldir%/README.st2205-compression
+camlibdoc_DATA         += %reldir%/README.st2205-compression
 
-EXTRA_LTLIBRARIES += st2205.la
+EXTRA_DIST             += %reldir%/README.st2205
+camlibdoc_DATA         += %reldir%/README.st2205
 
-st2205_la_SOURCES = st2205/library.c st2205/st2205.c st2205/st2205.h st2205/st2205_decode.c st2205/st2205_tables.c
-st2205_la_LDFLAGS = $(camlib_ldflags)
-st2205_la_DEPENDENCIES = $(camlib_dependencies)
-st2205_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LTLIBICONV)
-st2205_la_CFLAGS = @LIBGD_CFLAGS@
+
+EXTRA_LTLIBRARIES      += st2205.la
+
+st2205_la_SOURCES       =
+
+st2205_la_SOURCES      += %reldir%/library.c
+st2205_la_SOURCES      += %reldir%/st2205.c
+st2205_la_SOURCES      += %reldir%/st2205.h
+st2205_la_SOURCES      += %reldir%/st2205_decode.c
+st2205_la_SOURCES      += %reldir%/st2205_tables.c
+
+st2205_la_CFLAGS        = $(camlib_cflags)
+st2205_la_CPPFLAGS      = $(camlib_cppflags)
+st2205_la_DEPENDENCIES  = $(camlib_dependencies)
+st2205_la_LDFLAGS       = $(camlib_ldflags)
+st2205_la_LIBADD        = $(camlib_libadd)
+
+st2205_la_CFLAGS       += $(LIBGD_CFLAGS)
+st2205_la_LIBADD       += $(LIBGD_LIBS)
+
+st2205_la_LIBADD       += $(LTLIBICONV)
+
+# On systems such as mingw/Windows, mmap(2) is not part of the
+# standard library and needs an explicit library to link against.
+st2205_la_LIBADD       += $(MMAP_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/st2205/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/st2205/library.c Changed

@@ -13,11 +13,11 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #include "config.h"
 
 #include <string.h>
@@ -33,21 +33,11 @@
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-setting.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "st2205.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 int
 camera_id (CameraText *id)
@@ -70,7 +60,7 @@
 	a.usb_vendor = 0x1403;
 	a.usb_product= 0x0001;
 	a.operations = GP_OPERATION_NONE;
-	a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE | 
+	a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE |
 			      GP_FOLDER_OPERATION_DELETE_ALL;
 	a.file_operations   = GP_FILE_OPERATION_DELETE | GP_FILE_OPERATION_RAW;
 	return gp_abilities_list_append (list, a);
@@ -237,7 +227,7 @@
 	ret = gp_file_set_mime_type (file, GP_MIME_PNG);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
-	ret = gp_file_set_name (file, filename); 
+	ret = gp_file_set_name (file, filename);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
 	ret = gp_file_append (file, gdpng, size);
@@ -250,7 +240,7 @@
 }
 
 static int
-put_file_func (CameraFilesystem *fs, const char *folder, const char *name, 
+put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
 	CameraFileType type, CameraFile *file, void *data, GPContext *context)
 {
 #ifdef HAVE_LIBGD
@@ -284,7 +274,7 @@
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)
 	in = in_name;
 	out = out_name;
-	if (iconv (camera->pl->cd, &in, &inc, &out, &outc) == -1) {
+	if (iconv (camera->pl->cd, &in, &inc, &out, &outc) == (size_t)(-1)) {
 		free (in_name);
 		free (out_name);
 		gp_log (GP_LOG_ERROR, "iconv",
@@ -443,7 +433,7 @@
 file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
 		void *data, GPContext *context)
 {
-	Camera *camera = data; 
+	Camera *camera = data;
 	int i, ret;
 
 	for (i = 0; i < ST2205_MAX_NO_FILES; i++) {
@@ -584,7 +574,7 @@
 }
 
 static int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	char buf2;
 
@@ -606,7 +596,7 @@
 }
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
 	int i, j, ret;
 #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/st2205/st2205.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/st2205/st2205.c Changed

@@ -13,18 +13,19 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #define _POSIX_C_SOURCE 1
+#define _DARWIN_C_SOURCE
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
@@ -50,7 +51,7 @@
 #ifdef HAVE_SYS_MMAN_H
 	int fd;
 	char *aligned;
-	
+
 	fd = open ("/dev/zero", O_RDWR);
 	aligned = mmap (0, size, PROT_READ|PROT_WRITE,MAP_PRIVATE, fd, 0);
 	close (fd);
@@ -236,12 +237,12 @@
 			break;
 	}
 
-	camera->pl->mem_size = 524288 << i;	
+	camera->pl->mem_size = 524288 << i;
 
 	st2205_free_page_aligned(buf0, ST2205_BLOCK_SIZE);
 	st2205_free_page_aligned(buf1, ST2205_BLOCK_SIZE);
 
-	return GP_OK;	
+	return GP_OK;
 }
 
 static int
@@ -501,7 +502,7 @@
 			"trying to read a deleted file");
 		return GP_ERROR_BAD_PARAMETERS;
 	}
-	LE32TOH(entry.address);
+	le32toh(entry.address);
 
 	GP_DEBUG ("file: %d start at: %08x\n", idx, entry.address);
 
@@ -514,10 +515,10 @@
 			return GP_ERROR_CORRUPTED_DATA;
 		}
 
-		BE16TOH(header.width);
-		BE16TOH(header.height);
-		BE16TOH(header.length);
-		BE16TOH(header.blocks);
+		be16toh(header.width);
+		be16toh(header.height);
+		be16toh(header.length);
+		be16toh(header.blocks);
 
 		if ((header.width != camera->pl->width) ||
 		    (header.height != camera->pl->height)) {
@@ -618,8 +619,8 @@
 							      &header,
 							      sizeof(header)))
 
-					BE16TOH(header.length);
-					end = start + sizeof(header) + 
+					be16toh(header.length);
+					end = start + sizeof(header) +
 					      header.length;
 				} else
 					end = start + size;
@@ -658,7 +659,7 @@
 			}
 		}
 	}
-	
+
 	/* No freespace found, try again with uv correction tables disabled */
 	if (camera->pl->compressed && allow_uv_corr)
 		return st2205_real_write_file (camera, filename, rgb24, buf,
@@ -825,7 +826,8 @@
 		  { 0xff, 0xff, 0x04, 0x04, 0x04, 0x04, 0x04 }, },
 		{ 96, 64, 7, 7,
 		  { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }, },
-		{ 0, 0, 0 }
+		{ 0, 0, 0, 0,
+		  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }
 	};
 	const int uncompressed_firmware_checksums = {
 	        0x00ab02fc, /* Frame 96x64 from blokker (Netherlands) */
@@ -870,7 +872,7 @@
 	 * -lookup tables directly followed by shuffle tables at 0x8477
 	 * -pictures starting at 0x10000
 	 * -64k of firmware at the end of memory
-	 * Version 2 devices show up as 2 disks, with the second second disk
+	 * Version 2 devices show up as 2 disks, with the second disk
 	 * containing a msdos filesystem with the windows software. These have:
 	 * -1 copy of the "FAT"
 	 * -lookup tables as part of the firmware at memory-end - 0x27b89 bytes
@@ -968,7 +970,7 @@
 
 	CHECK (st2205_check_fat_checksum (camera))
 
-	camera->pl->rand_seed = time(NULL);
+	camera->pl->rand_seed = time(NULL) & 0xffffffff;
 
 	/* Some 96x64 models don't use compression, unfortunately I've found
 	   no way to detect if this is the case, so we keep a list of firmware
@@ -1103,7 +1105,7 @@
 							      &header,
 							      sizeof(header)))
 
-					BE16TOH(header.length);
+					be16toh(header.length);
 					end = start + sizeof(header) +
 					      header.length;
 				} else {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/st2205/st2205.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/st2205/st2205.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/st2205/st2205_decode.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/st2205/st2205_decode.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0674/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0674/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0674/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0674/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0674/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0674/library.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0674/stv0674.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0674/stv0674.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0674/stv0674.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0674/stv0674.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/LICENCE -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/LICENCE Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/Makefile-files Changed

@@ -1,19 +1,30 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += \
-	stv0680/CREDITS stv0680/ChangeLog stv0680/LICENCE \
-	stv0680/README.pdf \
-	stv0680/680_commands_and_communication_sdk.pdf.gz
+EXTRA_DIST              += %reldir%/680_commands_and_communication_sdk.pdf.gz
+EXTRA_DIST              += %reldir%/CREDITS
+EXTRA_DIST              += %reldir%/ChangeLog
+EXTRA_DIST              += %reldir%/LICENCE
+EXTRA_DIST              += %reldir%/README.pdf
 
-EXTRA_LTLIBRARIES += stv0680.la
 
-stv0680_la_SOURCES = \
-	stv0680/stv0680.c stv0680/stv0680.h \
-	stv0680/library.c stv0680/library.h \
-	stv0680/bayer.c stv0680/bayer.h \
-	stv0680/sharpen.c stv0680/sharpen.h \
-	stv0680/saturate.c stv0680/saturate.h \
-	stv0680/demosaic_sharpen.h stv0680/demosaic_sharpen.c
-stv0680_la_LDFLAGS = $(camlib_ldflags)
-stv0680_la_DEPENDENCIES = $(camlib_dependencies)
-stv0680_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES       += stv0680.la
+
+stv0680_la_SOURCES       =
+stv0680_la_SOURCES      += %reldir%/stv0680.c
+stv0680_la_SOURCES      += %reldir%/stv0680.h
+stv0680_la_SOURCES      += %reldir%/library.c
+stv0680_la_SOURCES      += %reldir%/library.h
+stv0680_la_SOURCES      += %reldir%/stv0680-bayer.c
+stv0680_la_SOURCES      += %reldir%/stv0680-bayer.h
+stv0680_la_SOURCES      += %reldir%/sharpen.c
+stv0680_la_SOURCES      += %reldir%/sharpen.h
+stv0680_la_SOURCES      += %reldir%/saturate.c
+stv0680_la_SOURCES      += %reldir%/saturate.h
+stv0680_la_SOURCES      += %reldir%/demosaic_sharpen.h
+stv0680_la_SOURCES      += %reldir%/demosaic_sharpen.c
+
+stv0680_la_CFLAGS        = $(camlib_cflags)
+stv0680_la_CPPFLAGS      = $(camlib_cppflags)
+stv0680_la_DEPENDENCIES  = $(camlib_dependencies)
+stv0680_la_LDFLAGS       = $(camlib_ldflags)
+stv0680_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/demosaic_sharpen.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/demosaic_sharpen.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/demosaic_sharpen.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/demosaic_sharpen.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/library.c Changed

@@ -27,27 +27,16 @@
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
+#include "libgphoto2/i18n.h"
+
 #include "stv0680.h"
 #include "library.h"
 #include "sharpen.h"
-#include "bayer.h"
+#include "stv0680-bayer.h"
 #include "saturate.h"
-#include "../../libgphoto2/bayer.h"
+#include "libgphoto2/bayer.h"
 #include "demosaic_sharpen.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define CMD_RETRIES		0x03
 
@@ -147,6 +136,7 @@
 			return ret;
 		}
 	    }
+	    break;
 	}
 	default:
 	    return GP_ERROR_NOT_SUPPORTED;
@@ -308,7 +298,7 @@
 	struct stv680_image_header imghdr;
 	char header64;
 	unsigned char *raw, *data;
-	int h,w,rh,rw,scale,rsize,size;
+	unsigned int h,w,rh,rw,scale,rsize,size;
 	int ret;
 
 	switch (port->type) {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/library.h Changed

@@ -1,25 +1,25 @@
 /*
  * STV0680 Vision Camera Chipset Driver
- * Copyright 2000 Adam Harrison <adam@antispin.org> 
- * 
+ * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef LIBRARY_H
-#define LIBRARY_H
+#ifndef CAMLIBS_STV0680_LIBRARY_H
+#define CAMLIBS_STV0680_LIBRARY_H
 
 #include <gphoto2/gphoto2-port.h>
 
@@ -34,4 +34,4 @@
 int stv0680_capture	      (GPPort *port);
 int stv0680_delete_all	      (GPPort *port);
 
-#endif
+#endif /* !defined(CAMLIBS_STV0680_LIBRARY_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/saturate.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/saturate.c Changed

@@ -16,7 +16,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  *
- * Simplified and modified by Kevin Sisson <kjsisson@bellsouth.net> for use 
+ * Simplified and modified by Kevin Sisson <kjsisson@bellsouth.net> for use
  * in the pencam program, December, 2001
  *
  * Integrated into gphoto2 by Marcus Meissner <marcus@jet.franken.de>, Dec 2001
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "saturate.h"
 
-/* FIXME: should be variable, and user configurable. Which is problematic in 
+/* FIXME: should be variable, and user configurable. Which is problematic in
  * gphoto2 :/ */
 #define HUE_DATA        40
 #define LIGHTNESS_DATA  40
@@ -163,12 +163,12 @@
 static void hue_saturation_initialize (HueSaturationDialog *hsd)
 {
   int i;
-  
+
   for (i = 0; i < 7; i++)
     {
       hsd->huei = 0.0;
       hsd->lightnessi = 0.0;
-      hsd->saturationi = (double) (hsd->saturation_data)/2;  
+      hsd->saturationi = (double) (hsd->saturation_data)/2;
     }
 }
 
@@ -294,9 +294,9 @@
 	  dBLUE_PIX = b;
 
 	  s += 3;   /* bytes/pixel = 3  */
-	  d += 3;  
+	  d += 3;
 	}
-      src += 3*width; 
+      src += 3*width;
       dest += 3*width;
     }
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/saturate.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/saturate.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/sharpen.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/sharpen.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/sharpen.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/sharpen.h Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/stv0680-bayer.c Added

@@ -0,0 +1,199 @@
+/*
+ * STV0680 Vision Camera Chipset Driver
+ * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "stv0680-bayer.h"
+
+/* Enhanced by Kurt Garloff to do scaling and debayering at the same time. */
+void bayer_unshuffle_preview(unsigned int w, unsigned int h, unsigned int scale, unsigned char *raw, unsigned char *output)
+{
+
+    int x, y, nx, ny;
+    int colour; int rgb3;
+    int nw = w >> scale;
+    int nh = h >> scale;
+    int incr = 1<<scale;
+
+    for (ny = 0; ny < nh; ++ny, raw += w<<scale) {
+	for (nx = 0; nx < nw; ++nx, output += 3) {
+	    rgb0 = 0; rgb1 = 0; rgb2 = 0;
+	    for (y = 0; y < incr; ++y) {
+		for (x = 0; x < incr; ++x) {
+		    colour = 1 - (x&1) + (y&1);
+		    rgbcolour += rawy*w + (nx<<(scale-1))+(x>>1) + ((x&1)? 0: (w>>1));
+		}
+	    }
+	    output0 = rgb0>>(2*scale-2);
+	    output1 = rgb1>>(2*scale-1);
+	    output2 = rgb2>>(2*scale-2);
+	}
+    }
+}
+
+/****** gamma correction from trans, plus hardcoded white balance */
+/* Thanks to Alexander Schwartx <alexander.schwartx@gmx.net> for this code.
+   Gamma correction (trans values generated by (pow((i-17)/239, GAMMA)*254)
+   where GAMMA=0.5x, 1<i<255. */
+/* KG: Looking at very dark parts of images, the sensor seems to produce
+ * only very few points below 0x11 and almost none below 14. Therefore we map everything
+ * below 14 to 0 and ev'thing below 17 to 1; then the power function reigns.
+ */
+
+#define ZERO0 14 /* 0--13 mapped to 0 */
+#define ZERO1 17 /* 14--16 mapped to 1 */
+
+typedef struct _rgbgamma {
+	float ampl, gamma;
+} rgbgamma;
+
+
+/* KG: Some notes on these:
+ * - Try to avoid strong deviations from 1.00 for the amplification,
+ *   because this potentially results in not using the full range
+ *   of colours (<1) or in clipping (>1) multiple colours to max,
+ *   which would be a loss of information.
+ * - The gamma mainly determines how fast values increase after ZERO1.
+ *   Influence on the highlights is small; therefore the description
+ *   with amplifiaction and gamma seems not very appropriate; a better
+ *   correction function would allow to influence the slope for small
+ *   and for large values independently without incurring loss of
+ *   accuracy/information. It should not be hard to construct such a
+ *   thing. (Splines or Bézier or Triginometric/Hyperbolic functions
+ *   could be used, e.g.)
+ * - The below parameters have been found by lots of experiments with
+ *   pictures taken at different light levels. They're optimized for
+ *   my PenCam (and my screens), of course. No theory behind this;
+ *   I don't have insight into the physics of the imaging sensor.
+ *   CCDs are linear, basically; but higher order effects may play
+ *   a role as well as the electronics that controls the shutter
+ *   and the one doing the readout.
+ */
+static const rgbgamma gampar63 = {
+	{ { 1.02, 0.56 }, { 1.00, 0.61 }, { 0.99, 0.65 } }, /* cold */
+	{ { 1.01, 0.56 }, { 1.00, 0.58 }, { 1.00, 0.61 } }, /* coldish */
+	{ { 1.00, 0.55 }, { 1.00, 0.57 }, { 1.00, 0.59 } }, /* mid */
+	{ { 1.00, 0.55 }, { 1.00, 0.56 }, { 1.01, 0.55 } }, /* warmish */
+	{ { 1.01, 0.56 }, { 0.99, 0.57 }, { 1.03, 0.50 } }, /* warm */
+	{ { 1.03, 0.52 }, { 0.97, 0.57 }, { 1.04, 0.49 } }  /* warm bright */
+};
+
+void light_enhance(unsigned int vw, unsigned int vh, unsigned int coarse, unsigned int fine,
+		   unsigned char avg_pix, unsigned char *output)
+{
+    unsigned long int i;
+    int lt=3; /* 3 is auto */
+    /* float wb33; */
+    unsigned char trans3256;
+    unsigned char col;
+    /* int tmp1, tmp2, tmp3, whitex=20, whitey=20, j, k; */
+
+    double brightness = 1.00; /* FIXME: configurable? */
+
+    /* fprintf(stderr, "(FineExp=%i CoarseExp=%i => filter=", fine, coarse); */
+
+#if 0
+    if (fine >= (coarse<<1)) {
+	lt = 0;
+	/* fprintf(stderr, "natural)\n"); */
+    } else if (((fine<<1) < coarse) && (coarse < 400)) {
+	lt = 2;
+	/* fprintf(stderr, "incandescent)\n"); */
+    } else {
+	lt = 1;
+	/* fprintf(stderr, "fluorescent)\n"); */
+    }
+    wb00 = 1.08 * x;  wb01 = 1.00 * x;  wb02 = 0.95 * x; /* natural */
+    wb10 = 1.00 * x;  wb11 = 1.00 * x;  wb12 = 1.00 * x; /* fluorescent */
+    wb20 = 0.90 * x;  wb21 = 1.00 * x;  wb22 = 1.11 * x; /* incandescent */
+#else
+    if (fine > coarse) {
+	lt = 0; /* fprintf (stderr, "cold)\n"); */
+    } else if (coarse < 100) {
+	lt = 1; /* fprintf (stderr, "coldish)\n"); */
+    } else if (coarse < 200) {
+	lt = 2; /* fprintf (stderr, "mid)\n"); */
+    } else if (coarse < 400) {
+	lt = 3; /* fprintf (stderr, "warmish)\n"); */
+    } else if (avg_pix < 94) {
+	lt = 4; /* fprintf (stderr, "warm)\n"); */
+    } else {
+	lt = 5; /* fprintf (stderr, "warm, bright)\n"); */
+    }
+#endif
+
+#if 0
+    /* find white pixel */
+    for (j=0;j<vh;j++)
+    {
+	for (k=0; k<vw; k++)
+	{
+	    i = (j*vw + k)*3;
+	    tmp1 = abs(*(output+i) - *(output+i+1));
+	    tmp2 = abs(*(output+i) - *(output+i+2));
+	    tmp3 = abs(*(output+i+1) - *(output+i+2));
+	    if ((tmp1<16) && (tmp2<16) && (tmp3<16) && (*(output+i)>=160)) {
+		whitex = k;  whitey = j;
+		break;
+	    }
+	}
+    }
+#endif
+
+    for (col = 0; col < 3; col++) {
+	double y;
+	const rgbgamma *gp = gamparlt + col;
+	for(i=0; i<256; ++i) {
+		if (i < ZERO0)
+			y = 0;
+		else if (i < ZERO1)
+			y = 1;
+		else
+			y = brightness * gp->ampl * (2 + pow((i-ZERO1)/((double)254-ZERO1),gp->gamma) * 253.5);
+		if (y > 255.0)
+			y = 255.0;
+		transcoli = (unsigned char) y;
+	}
+    }
+
+    for (i=0;i<(vw*vh*3);i+=3)
+    {
+	int r,g,b;
+	r = *(output+i);
+	g = *(output+i+1);
+	b = *(output+i+2);
+	/* this (adjusting white) isn't quite right yet, so I turned it off */
+	if ( 0 && (abs(r-g) < 8) &&
+	          (abs(r-b) < 8) &&
+	          (abs(b-g) < 8)) {
+		int v = trans1(r+b+g+1)/3;
+		*(output+i) =   (unsigned char) (v);
+		*(output+i+1) = (unsigned char) (v);
+		*(output+i+2) = (unsigned char) (v);
+		fprintf(stderr,"Adjusting white\n");
+	} else {          /* this is OK */
+		*(output+i)   = trans0r;
+		*(output+i+1) = trans1g;
+		*(output+i+2) = trans2b;
+	}
+    }  /* for */
+}  /* light_enhance */

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/stv0680-bayer.h Added

@@ -0,0 +1,29 @@
+/*
+ * STV0680 Vision Camera Chipset Driver
+ * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef CAMLIBS_STV0680_BAYER_H
+#define CAMLIBS_STV0680_BAYER_H
+
+void bayer_unshuffle_preview(unsigned int w, unsigned int h, unsigned int scale,
+			     unsigned char *raw, unsigned char *output);
+void light_enhance(unsigned int vw, unsigned int vh, unsigned int coarse, unsigned int fine,
+		   unsigned char avg_pix_val, unsigned char *output);
+
+#endif /* !defined(CAMLIBS_STV0680_BAYER_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/stv0680.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/stv0680.c Changed

@@ -1,17 +1,17 @@
 /*
  * STV0680 Vision Camera Chipset Driver
- * Copyright 2000 Adam Harrison <adam@antispin.org> 
- * 
+ * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
@@ -23,23 +23,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-library.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 #include "stv0680.h"
 #include "library.h"
@@ -58,7 +47,7 @@
 
 	/* You can search in google for them, using either:
 	 * 	AAA 80 CIF
-	 * or 
+	 * or
 	 * 	AAA 26 VGA
 	 * It has been rebranded and rereleased dozens of times.
 	 */
@@ -95,9 +84,9 @@
       	{ "DigitalDream:la ronde",   0x0553, 0x0202, 0 },
 	/* https://sf.net/tracker/index.php?func=detail&aid=1000498&group_id=8874&atid=358874 */
 	{ "DigitalDream:l'espion XS", 0x1183, 0x0001, 0 },
-	
 
-	/* reported by jerry white */ 
+
+	/* reported by jerry white */
 	{ "Argus:DC-1500",		0x0553, 0x0202, 1 },
 	/* reported by Philippe Libat <philippe@mandrakesoft.com>,
 	 * serial only. */
@@ -126,14 +115,14 @@
 	{ "Creative:Go Mini",		0x041e, 0x4007, 1 }
 };
 
-int camera_id (CameraText *id) 
+int camera_id (CameraText *id)
 {
 	strcpy(id->text, "STV0680");
 
 	return (GP_OK);
 }
 
-int camera_abilities (CameraAbilitiesList *list) 
+int camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 	unsigned int i;
@@ -156,7 +145,7 @@
 			a.status = GP_DRIVER_STATUS_PRODUCTION;
 			a.port     |= GP_PORT_USB;
 			a.operations |= GP_OPERATION_CAPTURE_PREVIEW;
-			a.usb_vendor  = camera_to_usbi.idVendor;		
+			a.usb_vendor  = camera_to_usbi.idVendor;
 			a.usb_product = camera_to_usbi.idProduct;
 		}
 		if (camera_to_usbi.serial) {
@@ -170,8 +159,8 @@
 	return (GP_OK);
 }
 
-static int file_list_func (CameraFilesystem *fs, const char *folder, 
-			   CameraList *list, void *data, GPContext *context) 
+static int file_list_func (CameraFilesystem *fs, const char *folder,
+			   CameraList *list, void *data, GPContext *context)
 {
 	Camera *camera = data;
 	int count, result;
@@ -198,7 +187,7 @@
 	if(image_no < 0)
 		return image_no;
 
-	gp_file_set_mime_type (file, GP_MIME_PNM); 
+	gp_file_set_mime_type (file, GP_MIME_PNM);
 	switch (type) {
 	case GP_FILE_TYPE_NORMAL:
 		result = stv0680_get_image (camera->port, image_no, file);
@@ -253,20 +242,20 @@
 	if (result < 0)
 		return result;
 
-	gp_file_set_mime_type (file, GP_MIME_PNM); 
+	gp_file_set_mime_type (file, GP_MIME_PNM);
 	gp_file_set_data_and_size (file, data, size);
 	return (GP_OK);
 }
 
-static int camera_summary (Camera *camera, CameraText *summary, GPContext *context) 
+static int camera_summary (Camera *camera, CameraText *summary, GPContext *context)
 {
 	stv0680_summary(camera->port,summary->text);
 	return (GP_OK);
 }
 
-static int camera_about (Camera *camera, CameraText *about, GPContext *context) 
+static int camera_about (Camera *camera, CameraText *about, GPContext *context)
 {
-	strcpy (about->text, 
+	strcpy (about->text,
 		_("STV0680\n"
 		"Adam Harrison <adam@antispin.org>\n"
 		"Driver for cameras using the STV0680 processor ASIC.\n"
@@ -346,7 +335,7 @@
 	.storage_info_func = storage_info_func
 };
 
-int camera_init (Camera *camera, GPContext *context) 
+int camera_init (Camera *camera, GPContext *context)
 {
 	GPPortSettings settings;
 
@@ -358,7 +347,7 @@
 
 	gp_port_get_settings(camera->port, &settings);
 	switch(camera->port->type) {
-	case GP_PORT_SERIAL:		
+	case GP_PORT_SERIAL:
         	gp_port_set_timeout(camera->port, 1000);
 		settings.serial.speed = 115200;
         	settings.serial.bits = 8;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/stv0680/stv0680.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/stv0680/stv0680.h Changed

@@ -1,25 +1,25 @@
 /*
  * STV0680 Vision Camera Chipset Driver
- * Copyright 2000 Adam Harrison <adam@antispin.org> 
- * 
+ * Copyright 2000 Adam Harrison <adam@antispin.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., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef STV0680_H
-#define STV0680_H
+#ifndef CAMLIBS_STV0680_STV0680_H
+#define CAMLIBS_STV0680_STV0680_H
 
 #define CMDID_CLEAR_COMMS_ERROR           0x80
 struct stv680_error_info {
@@ -123,7 +123,7 @@
     unsigned char flags;
 #define IMAGE_IS_VALID		0x01
 #define IMAGE_FROM_STREAM	0x04
-#define IMAGE_FIRST_OF_MOVIE	0x10 
+#define IMAGE_FIRST_OF_MOVIE	0x10
 };
 
 #define CMDID_GRAB_UPLOAD			0x89
@@ -171,4 +171,4 @@
                 unsigned char *response, unsigned char response_len);
 
 
-#endif
+#endif /* !defined(CAMLIBS_STV0680_STV0680_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sx330z/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sx330z/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sx330z/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sx330z/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sx330z/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sx330z/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sx330z/sx330z.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sx330z/sx330z.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/sx330z/sx330z.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/sx330z/sx330z.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/template/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/template/Makefile-files Changed

@@ -1,4 +1,4 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
 # If you use this as template for a real camlib (say 'foobar.la'),
 # make sure to change the "noinst_" at the beginning of the following
@@ -6,20 +6,29 @@
 #   * "noinst_DATA" into "camlibdoc_DATA"
 #   * "noinst_LTLIBRARIES" into "EXTRA_LTLIBRARIES"
 #
-# Additionally, you must add add an include line to the Makefile-files
+# Additionally, you must add an include line to the Makefile-files
 # of the new camlib to camlibs/Makefile.am:
 #   * "include my-new-camlib/Makefile-files"
 #
 # And as the last step, you need to add it to configure.ac:
 #   * GP_CAMLIB(foobar)dnl
+#
+# Also, do not forget to add any *.c source files containing
+# translated strings to POTFILES.in.
+
+EXTRA_DIST               += %reldir%/ChangeLog
+
+EXTRA_DIST               += %reldir%/README.template
+noinst_DATA              += %reldir%/README.template
+
+noinst_LTLIBRARIES       += template.la
 
-EXTRA_DIST += template/README.template template/ChangeLog
+template_la_SOURCES       = %reldir%/template.c
 
-noinst_DATA += template/README.template
-noinst_LTLIBRARIES += template.la
+template_la_CFLAGS        = $(camlib_cflags)
+template_la_CPPFLAGS      = $(camlib_cppflags)
+template_la_DEPENDENCIES  = $(camlib_dependencies)
+template_la_LDFLAGS       = $(camlib_ldflags)
+template_la_LIBADD        = $(camlib_libadd)
 
-template_la_SOURCES = template/template.c
-template_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS)
-template_la_LDFLAGS = $(camlib_ldflags)
-template_la_DEPENDENCIES = $(camlib_dependencies)
-template_la_LIBADD = $(camlib_libadd)
+template_la_CFLAGS       += $(NO_UNUSED_CFLAGS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/template/template.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/template/template.c Changed

@@ -11,10 +11,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -32,13 +32,13 @@
  *
  * We implement the camlib API functions last in this file because
  * camera_init() must reference all the object member functions and by
- * making camera_init() the last function in this file, we can avoid 
+ * making camera_init() the last function in this file, we can avoid
  * the need for forward declarations of the object member functions.
  *
  * \section linknote Note about "static" functions and exporting symbols
  *
  * The build system uses libtool to explicitly specify the list of
- * exported symbols. Only the three functions of the camlib API 
+ * exported symbols. Only the three functions of the camlib API
  * (camera_init(), camera_id(), and camera_abilities()) are exported.
  *
  * Therefore it doesn't matter whether you declare your other
@@ -56,29 +56,7 @@
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-result.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-/**
- * This define is the string translation macro used in
- * libgphoto2. It will resolve to a dcgettext() function call and
- * does both the translation itself and also marks up the string
- * for the collector (xgettext).
- */
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-/**
- * This is the noop translation macro, which does not translate the
- * string, but marks it up for the extraction of translatable strings.
- */
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
 
 
 /**********************************************************************/
@@ -100,7 +78,7 @@
  */
 int camera_exit (Camera *camera, GPContext *context);
 int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	return GP_OK;
 }
@@ -113,7 +91,7 @@
  */
 int camera_config_get (Camera *camera, CameraWidget **window, GPContext *context);
 int
-camera_config_get (Camera *camera, CameraWidget **window, GPContext *context) 
+camera_config_get (Camera *camera, CameraWidget **window, GPContext *context)
 {
 	gp_widget_new (GP_WIDGET_WINDOW, "Camera Configuration", window);
 
@@ -132,7 +110,7 @@
  */
 int camera_config_set (Camera *camera, CameraWidget *window, GPContext *context);
 int
-camera_config_set (Camera *camera, CameraWidget *window, GPContext *context) 
+camera_config_set (Camera *camera, CameraWidget *window, GPContext *context)
 {
 	/*
 	 * Check if the widgets' values have changed. If yes, tell the camera.
@@ -145,7 +123,7 @@
 /**
  * Capture a preview and return the data in the given file (again,
  * use gp_file_set_data_and_size, gp_file_set_mime_type, etc.).
- * libgphoto2 assumes that previews are NOT stored on the camera's 
+ * libgphoto2 assumes that previews are NOT stored on the camera's
  * disk. If your camera does, please delete it from the camera.
  *
  * This function is a method of the Camera object.
@@ -176,7 +154,7 @@
 
 
 /**
- * Fill out the summary with textual information about the current 
+ * Fill out the summary with textual information about the current
  * state of the camera (like pictures taken, etc.).
  *
  * This function is a method of the Camera object.
@@ -192,7 +170,7 @@
 
 /**
  * Return the camera drivers manual.
- * If you would like to tell the user some information about how 
+ * If you would like to tell the user some information about how
  * to use the camera or the driver, this is the place to do.
  *
  * This function is a method of the Camera object.
@@ -329,7 +307,7 @@
 
 /**
  * Get the file info here and write it to space provided by caller.
- * 
+ *
  * \param info Space provided by caller in which file info is written.
  *
  * This function is a CameraFilesystem method.
@@ -420,7 +398,7 @@
 storage_info_func (CameraFilesystem *fs,
 		CameraStorageInformation **storageinformations,
 		int *nrofstorageinformations, void *data,
-		GPContext *context) 
+		GPContext *context)
 {
 	/*Camera *camera = data;*/
 
@@ -450,7 +428,7 @@
  * This is a camlib API function.
  */
 int
-camera_id (CameraText *id) 
+camera_id (CameraText *id)
 {
 	strcpy(id->text, "REPLACE WITH UNIQUE LIBRARY ID");
 
@@ -473,7 +451,7 @@
  * This is a camlib API function.
  */
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -482,9 +460,9 @@
 	a.status = GP_DRIVER_STATUS_PRODUCTION;
 	a.port     = GP_PORT_SERIAL | GP_PORT_USB;
 	a.speed0 = 0;
-	a.operations        = 	GP_OPERATION_CAPTURE_PREVIEW | 
+	a.operations        = 	GP_OPERATION_CAPTURE_PREVIEW |
 				GP_CAPTURE_IMAGE;
-	a.file_operations   = 	GP_FILE_OPERATION_DELETE | 
+	a.file_operations   = 	GP_FILE_OPERATION_DELETE |
 				GP_FILE_OPERATION_PREVIEW;
 	a.folder_operations = 	GP_FOLDER_OPERATION_NONE;
 
@@ -523,7 +501,7 @@
  * This is a camlib API function.
  */
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
         /* First, set up all the function pointers */
         camera->functions->exit                 = camera_exit;
@@ -543,9 +521,9 @@
 	 * already open). You just have to use functions like
 	 * gp_port_timeout_set, gp_port_settings_get, gp_port_settings_set.
 	 */
-	
+
 	/*
-	 * Once you have configured the port, you should check if a 
+	 * Once you have configured the port, you should check if a
 	 * connection to the camera can be established.
 	 */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/Makefile-files Changed

@@ -1,9 +1,25 @@
-# -*- Makefile -*-
-
-EXTRA_LTLIBRARIES += topfield.la
-EXTRA_DIST += topfield/ChangeLog
-topfield_la_SOURCES =  topfield/crc16.c topfield/crc16.h topfield/tf_bytes.c topfield/tf_bytes.h topfield/mjd.c topfield/mjd.h \
-			topfield/puppy.c topfield/usb_io.h topfield/usb_io.c
-topfield_la_LDFLAGS = $(camlib_ldflags)
-topfield_la_DEPENDENCIES = $(camlib_dependencies)
-topfield_la_LIBADD = $(camlib_libadd) $(LTLIBICONV)
+# -*- Makefile-automake -*-
+
+EXTRA_DIST               += %reldir%/ChangeLog
+
+
+EXTRA_LTLIBRARIES        += topfield.la
+
+topfield_la_SOURCES       =
+topfield_la_SOURCES      += %reldir%/crc16.c
+topfield_la_SOURCES      += %reldir%/crc16.h
+topfield_la_SOURCES      += %reldir%/tf_bytes.c
+topfield_la_SOURCES      += %reldir%/tf_bytes.h
+topfield_la_SOURCES      += %reldir%/mjd.c
+topfield_la_SOURCES      += %reldir%/mjd.h
+topfield_la_SOURCES      += %reldir%/puppy.c
+topfield_la_SOURCES      += %reldir%/usb_io.h
+topfield_la_SOURCES      += %reldir%/usb_io.c
+
+topfield_la_CFLAGS        = $(camlib_cflags)
+topfield_la_CPPFLAGS      = $(camlib_cppflags)
+topfield_la_DEPENDENCIES  = $(camlib_dependencies)
+topfield_la_LDFLAGS       = $(camlib_ldflags)
+topfield_la_LIBADD        = $(camlib_libadd)
+
+topfield_la_LIBADD       += $(LTLIBICONV)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/crc16.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/crc16.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/crc16.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/crc16.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/mjd.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/mjd.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/mjd.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/mjd.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/puppy.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/puppy.c Changed

@@ -16,35 +16,17 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with puppy; if not, write to the 
+  along with puppy; if not, write to the
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA  02110-1301  USA
 
 */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
 #include <string.h>
 
-#include <gphoto2/gphoto2-library.h>
-#include <gphoto2/gphoto2-result.h>
-#include <gphoto2/gphoto2-setting.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -60,6 +42,12 @@
 # include <langinfo.h>
 #endif
 
+#include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-result.h>
+#include <gphoto2/gphoto2-setting.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "usb_io.h"
 #include "tf_bytes.h"
 
@@ -106,11 +94,11 @@
 		dst = dest = calloc (dstlen,1);
 		if (!dst) return NULL;
 		ret = iconv (cd_locale_to_latin1, &src, &srclen, &dst, &dstlen);
-		if ((ret == -1) && (errno == E2BIG)) {
+		if ((ret == (size_t)(-1)) && (errno == E2BIG)) {
 			ndstlen *= 2;
 			continue;
 		}
-		if (ret == -1) {
+		if (ret == (size_t)(-1)) {
 			perror("iconv");
 			free (dest);
 			dest = NULL;
@@ -136,11 +124,11 @@
 		dst = dest = malloc (dstlen);
 		if (!dst) return NULL;
 		ret = iconv (cd_latin1_to_locale, &src, &srclen, &dst, &dstlen);
-		if ((ret == -1) && (errno == E2BIG)) {
+		if ((ret == (size_t)(-1)) && (errno == E2BIG)) {
 			ndstlen *= 2;
 			continue;
 		}
-		if (ret == -1) {
+		if (ret == (size_t)(-1)) {
 			perror("iconv");
 			free (dest);
 			return NULL;
@@ -540,7 +528,7 @@
 #endif
 
 static int
-camera_config_get (Camera *camera, CameraWidget **window, GPContext *context) 
+camera_config_get (Camera *camera, CameraWidget **window, GPContext *context)
 {
         CameraWidget *section, *turbo;
 	char buf1024;
@@ -573,7 +561,7 @@
 
 
 static int
-camera_config_set (Camera *camera, CameraWidget *window, GPContext *context) 
+camera_config_set (Camera *camera, CameraWidget *window, GPContext *context)
 {
 	int ret;
 	CameraWidget *turbo;
@@ -769,7 +757,7 @@
 	fileSize = srcStat.st_size;
 	if(fileSize == 0)
 	{
-		gp_log (GP_LOG_ERROR, "topfield", "ERROR: Source file is empty - not transfering.\n");
+		gp_log (GP_LOG_ERROR, "topfield", "ERROR: Source file is empty - not transferring.\n");
 		result = -ENODATA;
 		goto out;
 	}
@@ -1065,7 +1053,7 @@
 storage_info_func (CameraFilesystem *fs,
 		CameraStorageInformation **storageinformations,
 		int *nrofstorageinformations, void *data,
-		GPContext *context) 
+		GPContext *context)
 {
 	Camera *camera = data;
 	int r;
@@ -1154,7 +1142,7 @@
 
 /**********************************************************************/
 int
-camera_id (CameraText *id) 
+camera_id (CameraText *id)
 {
 	strcpy(id->text, "Topfield 5000 PVR");
 	return GP_OK;
@@ -1162,7 +1150,7 @@
 
 
 int
-camera_abilities (CameraAbilitiesList *list) 
+camera_abilities (CameraAbilitiesList *list)
 {
 	CameraAbilities a;
 
@@ -1208,7 +1196,7 @@
 }
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
 	char *curloc;
 	/* First, set up all the function pointers */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/tf_bytes.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/tf_bytes.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/tf_bytes.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/tf_bytes.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/usb_io.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/usb_io.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/topfield/usb_io.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/topfield/usb_io.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/toshiba/pdrm11/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/toshiba/pdrm11/Makefile-files Changed

@@ -1,13 +1,18 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += toshiba/pdrm11/README.toshiba-pdrm11
-camlibdoc_DATA += toshiba/pdrm11/README.toshiba-pdrm11
+EXTRA_DIST                     += %reldir%/README.toshiba-pdrm11
+camlibdoc_DATA                 += %reldir%/README.toshiba-pdrm11
 
-EXTRA_LTLIBRARIES += toshiba_pdrm11.la
 
-toshiba_pdrm11_la_SOURCES = \
-	toshiba/pdrm11/library.c \
-	 toshiba/pdrm11/pdrm11.c toshiba/pdrm11/pdrm11.h
-toshiba_pdrm11_la_LDFLAGS = $(camlib_ldflags)
-toshiba_pdrm11_la_DEPENDENCIES = $(camlib_dependencies)
-toshiba_pdrm11_la_LIBADD = $(camlib_libadd)
+EXTRA_LTLIBRARIES              += toshiba_pdrm11.la
+
+toshiba_pdrm11_la_SOURCES       =
+toshiba_pdrm11_la_SOURCES      += %reldir%/library.c
+toshiba_pdrm11_la_SOURCES      += %reldir%/pdrm11.c
+toshiba_pdrm11_la_SOURCES      += %reldir%/pdrm11.h
+
+toshiba_pdrm11_la_CFLAGS        = $(camlib_cflags)
+toshiba_pdrm11_la_CPPFLAGS      = $(camlib_cppflags)
+toshiba_pdrm11_la_DEPENDENCIES  = $(camlib_dependencies)
+toshiba_pdrm11_la_LDFLAGS       = $(camlib_ldflags)
+toshiba_pdrm11_la_LIBADD        = $(camlib_libadd)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/toshiba/pdrm11/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/toshiba/pdrm11/library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/toshiba/pdrm11/pdrm11.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/toshiba/pdrm11/pdrm11.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/toshiba/pdrm11/pdrm11.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/toshiba/pdrm11/pdrm11.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/tp6801/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/tp6801/Makefile-files Changed

@@ -1,12 +1,23 @@
-# -*- Makefile -*-
+# -*- Makefile-automake -*-
 
-EXTRA_DIST += tp6801/README.tp6801 tp6801/tp6801-dump.c
-camlibdoc_DATA += tp6801/README.tp6801
+EXTRA_DIST             += %reldir%/tp6801-dump.c
 
-EXTRA_LTLIBRARIES += tp6801.la
+EXTRA_DIST             += %reldir%/README.tp6801
+camlibdoc_DATA         += %reldir%/README.tp6801
 
-tp6801_la_SOURCES = tp6801/library.c tp6801/tp6801.c tp6801/tp6801.h
-tp6801_la_LDFLAGS = $(camlib_ldflags)
-tp6801_la_DEPENDENCIES = $(camlib_dependencies)
-tp6801_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@
-tp6801_la_CFLAGS = @LIBGD_CFLAGS@
+
+EXTRA_LTLIBRARIES      += tp6801.la
+
+tp6801_la_SOURCES       =
+tp6801_la_SOURCES      += %reldir%/library.c
+tp6801_la_SOURCES      += %reldir%/tp6801.c
+tp6801_la_SOURCES      += %reldir%/tp6801.h
+
+tp6801_la_CFLAGS        = $(camlib_cflags)
+tp6801_la_CPPFLAGS      = $(camlib_cppflags)
+tp6801_la_DEPENDENCIES  = $(camlib_dependencies)
+tp6801_la_LDFLAGS       = $(camlib_ldflags)
+tp6801_la_LIBADD        = $(camlib_libadd)
+
+tp6801_la_CPPFLAGS     += $(LIBGD_CFLAGS)
+tp6801_la_LIBADD       += $(LIBGD_LIBS)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/tp6801/library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/tp6801/library.c Changed

@@ -13,12 +13,12 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #include "config.h"
 
 #include <string.h>
@@ -31,21 +31,11 @@
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port.h>
 #include <gphoto2/gphoto2-setting.h>
+
+#include "libgphoto2/i18n.h"
+
 #include "tp6801.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static const struct tp6801_devinfo tp6801_devinfo = {
 	{ 0x0168, 0x3011 },
@@ -77,7 +67,7 @@
 		a.usb_vendor = tp6801_devinfoi.vendor_id;
 		a.usb_product= tp6801_devinfoi.product_id;
 		a.operations = GP_OPERATION_NONE;
-		a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE | 
+		a.folder_operations = GP_FOLDER_OPERATION_PUT_FILE |
 				      GP_FOLDER_OPERATION_DELETE_ALL;
 		a.file_operations   = GP_FILE_OPERATION_DELETE |
 				      GP_FILE_OPERATION_RAW;
@@ -206,7 +196,7 @@
 	ret = gp_file_set_mime_type (file, GP_MIME_PNG);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
-	ret = gp_file_set_name (file, filename); 
+	ret = gp_file_set_name (file, filename);
 	if (ret < 0) { gdFree (gdpng); return ret; }
 
 	ret = gp_file_append (file, gdpng, size);
@@ -219,7 +209,7 @@
 }
 
 static int
-put_file_func (CameraFilesystem *fs, const char *folder, const char *name, 
+put_file_func (CameraFilesystem *fs, const char *folder, const char *name,
 	CameraFileType type, CameraFile *file, void *data, GPContext *context)
 {
 #ifdef HAVE_LIBGD
@@ -354,9 +344,9 @@
 file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
 		void *data, GPContext *context)
 {
-	Camera *camera = data; 
+	Camera *camera = data;
 	int i, count, present;
-	char buf16;
+	char buf30;
 
 	count = tp6801_max_filecount (camera);
 	if (count < 0) return count;
@@ -461,7 +451,7 @@
 }
 
 static int
-camera_exit (Camera *camera, GPContext *context) 
+camera_exit (Camera *camera, GPContext *context)
 {
 	char buf2;
 
@@ -477,7 +467,7 @@
 }
 
 int
-camera_init (Camera *camera, GPContext *context) 
+camera_init (Camera *camera, GPContext *context)
 {
     	CameraAbilities a;
     	int ret;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/tp6801/tp6801-dump.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/tp6801/tp6801-dump.c Changed

@@ -13,14 +13,16 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <scsi/sg.h>
@@ -28,6 +30,7 @@
 #define READ 0
 #define WRITE 1
 
+static
 void tp6801_send_cmd(int fd, int rw, int cmd, int offset, unsigned char *data, int data_size)
 {
     int i;
@@ -36,7 +39,7 @@
     unsigned char cmd_buffer16;
 
     memset(cmd_buffer, 0, sizeof(cmd_buffer));
-    cmd_buffer0 = cmd; 
+    cmd_buffer0 = cmd;
     cmd_buffer1 = 0x11;
     cmd_buffer2 = 0x31;
     cmd_buffer3 = 0x0f;
@@ -69,16 +72,19 @@
     }
 }
 
+static
 void eeprom_read(int fd, int offset, unsigned char *data, int data_size)
 {
     tp6801_send_cmd(fd, READ, 0xc1, offset, data, data_size);
 }
 
+static
 void eeprom_erase_block(int fd, int offset)
 {
     tp6801_send_cmd(fd, READ, 0xc6, offset, NULL, 0);
 }
 
+static
 void eeprom_program_page(int fd, int offset, unsigned char *data)
 {
     tp6801_send_cmd(fd, WRITE, 0xcb, offset, data, 256);
@@ -120,6 +126,6 @@
 #endif
     fclose(f);
     close(fd);
-    
+
     return 0;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/tp6801/tp6801.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/tp6801/tp6801.c Changed

@@ -13,23 +13,24 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <_stdint.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #ifdef HAVE_LIBGD
 #include <gd.h>
 #endif
@@ -78,7 +79,7 @@
 	char sense_buffer32;
 
 	memset (cmd_buffer, 0, sizeof (cmd_buffer));
-	
+
 	cmd_buffer0 = TP6801_SET_TIME;
 	cmd_buffer1 = 0x11;
 	cmd_buffer2 = 0x31;
@@ -323,7 +324,7 @@
 tp6801_max_filecount(Camera *camera)
 {
 	int free_mem, size;
-	
+
 	size = tp6801_filesize (camera);
 	free_mem = camera->pl->mem_size - TP6801_PICTURE_OFFSET(0, size);
 	free_mem -= TP6801_CONST_DATA_SIZE;
@@ -691,7 +692,7 @@
 		camera->pl->page_stateTP6801_PAT_PAGE |= TP6801_PAGE_DIRTY;
 	}
 
-	/* And commit the block with the PAT */	
+	/* And commit the block with the PAT */
 	CHECK (tp6801_commit_block (camera, 0))
 
 	return GP_OK;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/camlibs/tp6801/tp6801.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/camlibs/tp6801/tp6801.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/config.h.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/config.h.in Changed

@@ -3,22 +3,36 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* Whether we have flex and bison for GP2DDB */
-#undef ENABLED_GP2DDB
-
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
 
-/* The gettext domain we're using */
-#undef GETTEXT_PACKAGE
+/* text domain for string translations */
+#undef GETTEXT_PACKAGE_LIBGPHOTO2
+
+/* The actually defined set of camlibs to build */
+#undef GP_CAMLIB_SET
+
+/* define when the camlib set to buidl is non-standard */
+#undef GP_CAMLIB_SET_IS_NONSTANDARD
+
+/* If defined, the camlibs which are skipped due to missing dependencies */
+#undef GP_CAMLIB_SET_SKIPPING
 
 /* Define if there is asm .symver support. */
 #undef HAVE_ASM_SYMVERS
 
-/* The C compiler we're using */
+/* The C compiler we are using */
 #undef HAVE_CC
 
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
@@ -48,7 +62,7 @@
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the `inet_aton' function. */
@@ -60,6 +74,9 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
+/* whether we compile with libcurl support */
+#undef HAVE_LIBCURL
+
 /* whether we compile with libexif support */
 #undef HAVE_LIBEXIF
 
@@ -72,9 +89,15 @@
 /* Define to 1 if you have the `ibs' library (-libs). */
 #undef HAVE_LIBIBS
 
-/* define if we found LIBJPEG and its headers */
+/* define if building with libjpeg */
 #undef HAVE_LIBJPEG
 
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* define if we found LIBWS232 and its headers */
+#undef HAVE_LIBWS232
+
 /* whether we compile with libxml-2.0 support */
 #undef HAVE_LIBXML2
 
@@ -90,9 +113,6 @@
 /* Define to 1 if you have the `lstat' function. */
 #undef HAVE_LSTAT
 
-/* Whether libltdl (of libtool fame) is present */
-#undef HAVE_LTDL
-
 /* Define to 1 if you have the <mcheck.h> header file. */
 #undef HAVE_MCHECK_H
 
@@ -117,12 +137,15 @@
 /* Define to 1 if you have the `sprintf' function. */
 #undef HAVE_SPRINTF
 
-/* Define to 1 if you have the `statfs' function. */
-#undef HAVE_STATFS
+/* Define to 1 if you have the `statvfs' function. */
+#undef HAVE_STATVFS
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -141,15 +164,6 @@
 /* Define to 1 if you have the `strncpy' function. */
 #undef HAVE_STRNCPY
 
-/* Define to 1 if `f_bavail' is a member of `struct statfs'. */
-#undef HAVE_STRUCT_STATFS_F_BAVAIL
-
-/* Define to 1 if `f_bfree' is a member of `struct statfs'. */
-#undef HAVE_STRUCT_STATFS_F_BFREE
-
-/* Define to 1 if `f_favail' is a member of `struct statfs'. */
-#undef HAVE_STRUCT_STATFS_F_FAVAIL
-
 /* Define to 1 if `f_blocks' is a member of `struct statvfs'. */
 #undef HAVE_STRUCT_STATVFS_F_BLOCKS
 
@@ -173,8 +187,8 @@
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-#undef HAVE_SYS_STATFS_H
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#undef HAVE_SYS_STATVFS_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
@@ -206,9 +220,6 @@
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
-/* Whether the set of camlibs built is incomplete */
-#undef INCOMPLETE_CAMLIB_SET
-
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
@@ -242,7 +253,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
@@ -278,11 +291,6 @@
 # endif
 #endif
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/configure -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/configure Changed

@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libgphoto2 photo camera library 2.5.18.
+# Generated by GNU Autoconf 2.71 for libgphoto2 photo camera library 2.5.31.
 #
 # Report bugs to <gphoto-devel@lists.sourceforge.net>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,12 +169,15 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
@@ -207,30 +192,38 @@
     PATH=/empty FPATH=/empty; export PATH FPATH
     test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
       || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -238,14 +231,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -263,18 +263,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
 $0: gphoto-devel@lists.sourceforge.net about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
@@ -302,6 +303,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -319,6 +321,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -333,7 +343,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -342,7 +352,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -381,12 +391,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -398,18 +409,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
 # ----------------------------------------
@@ -421,9 +441,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -450,7 +470,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -494,7 +514,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -508,6 +528,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -521,6 +545,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -590,56 +621,51 @@
 # Identity of this package.
 PACKAGE_NAME='libgphoto2 photo camera library'
 PACKAGE_TARNAME='libgphoto2'
-PACKAGE_VERSION='2.5.18'
-PACKAGE_STRING='libgphoto2 photo camera library 2.5.18'
+PACKAGE_VERSION='2.5.31'
+PACKAGE_STRING='libgphoto2 photo camera library 2.5.31'
 PACKAGE_BUGREPORT='gphoto-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
 ac_unique_file="libgphoto2/gphoto2-version.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
+gt_needs=
 enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 subdirs
-HAVE_CXX_FALSE
-HAVE_CXX_TRUE
 HAVE_LIBEXIF_FALSE
 HAVE_LIBEXIF_TRUE
 REQUIREMENTS_FOR_LIBEXIF
@@ -651,9 +677,6 @@
 hotplugdocdir
 HAVE_LINUX_FALSE
 HAVE_LINUX_TRUE
-ENABLE_RPM_FALSE
-ENABLE_RPM_TRUE
-RPMBUILD
 camlibdocdir
 apidocdir
 ENABLE_GTK_DOC_FALSE
@@ -665,51 +688,74 @@
 DOXYGEN_OUTPUT_DIR
 HTML_APIDOC_DIR
 HAVE_DOT
-HAVE_DOT_FALSE
-HAVE_DOT_TRUE
 HAVE_DOXYGEN_FALSE
 HAVE_DOXYGEN_TRUE
 DOXYGEN
+HAVE_DOT_FALSE
+HAVE_DOT_TRUE
 DOT
-ALL_DEFAULT_CAMLIBS
-ALL_DEFINED_CAMLIBS
-BUILD_THESE_CAMLIBS
+GP_CAMLIB_SET_EVERYTHING
+GP_CAMLIB_SET
+COMM
+SLEEP
+EXPR
+UNIQ
+TR
+SORT
+CMP
+DEFAULT_CAMLIBS
 camlibdir
 HAVE_UDEV_FALSE
 HAVE_UDEV_TRUE
 udevscriptdir
 utilsdir
 effective_target
+MMAP_LIBS
 HAVE_LIBGD_FALSE
 HAVE_LIBGD_TRUE
 REQUIREMENTS_FOR_LIBGD
 LIBGD_CONFIG_PROG
 LIBGD_LIBS
 LIBGD_CFLAGS
+HAVE_LIBCURL_FALSE
+HAVE_LIBCURL_TRUE
+REQUIREMENTS_FOR_LIBCURL
+LIBCURL_CONFIG_PROG
+LIBCURL_LIBS
+LIBCURL_CFLAGS
 HAVE_LIBXML2_FALSE
 HAVE_LIBXML2_TRUE
 REQUIREMENTS_FOR_LIBXML2
 LIBXML2_CONFIG_PROG
 LIBXML2_LIBS
 LIBXML2_CFLAGS
+LIBWS232_LIBS
+LIBWS232_CFLAGS
+LIBJPEG_LIBS
+LIBJPEG_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-LIBJPEG
-VERSIONMAPLDFLAGS
+HAVE_ASM_SYMVER_FALSE
+HAVE_ASM_SYMVER_TRUE
 POSUB
 LTLIBINTL
 LIBINTL
 INTLLIBS
 LTLIBICONV
 LIBICONV
+INTL_MACOSX_LIBS
+XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
+XGETTEXT_015
 XGETTEXT
+GMSGFMT_015
+MSGFMT_015
 GMSGFMT
 MSGFMT
+GETTEXT_MACRO_VERSION
 USE_NLS
-MKINSTALLDIRS
-GETTEXT_PACKAGE
+GETTEXT_PACKAGE_LIBGPHOTO2
 MAIL_GPHOTO_TRANSLATION
 MAIL_GPHOTO_USER
 MAIL_GPHOTO_DEVEL
@@ -729,17 +775,15 @@
 DSYMUTIL
 MANIFEST_TOOL
 RANLIB
+FILECMD
 LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
-SED
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
+EGREP
+GREP
 host_os
 host_vendor
 host_cpu
@@ -748,12 +792,10 @@
 build_vendor
 build_cpu
 build
-ENABLED_GP2DDB_FALSE
-ENABLED_GP2DDB_TRUE
-BISON
-FLEX
-EGREP
-GREP
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 AM_LDFLAGS
 AM_CXXFLAGS
 AM_CFLAGS
@@ -761,8 +803,41 @@
 HAVE_GCC_FALSE
 HAVE_GCC_TRUE
 NO_UNUSED_CFLAGS
+GP_PEDANTIC_CXXFLAGS_CXX20
+GP_HAVE_PEDANTIC_FLAGS_CXX20_FALSE
+GP_HAVE_PEDANTIC_FLAGS_CXX20_TRUE
+GP_PEDANTIC_CXXFLAGS_CXX17
+GP_HAVE_PEDANTIC_FLAGS_CXX17_FALSE
+GP_HAVE_PEDANTIC_FLAGS_CXX17_TRUE
+GP_PEDANTIC_CXXFLAGS_CXX14
+GP_HAVE_PEDANTIC_FLAGS_CXX14_FALSE
+GP_HAVE_PEDANTIC_FLAGS_CXX14_TRUE
+GP_PEDANTIC_CXXFLAGS_CXX11
+GP_HAVE_PEDANTIC_FLAGS_CXX11_FALSE
+GP_HAVE_PEDANTIC_FLAGS_CXX11_TRUE
+GP_PEDANTIC_CXXFLAGS_CXX98
+GP_HAVE_PEDANTIC_FLAGS_CXX98_FALSE
+GP_HAVE_PEDANTIC_FLAGS_CXX98_TRUE
+GP_PEDANTIC_CFLAGS_C2X
+GP_HAVE_PEDANTIC_FLAGS_C2X_FALSE
+GP_HAVE_PEDANTIC_FLAGS_C2X_TRUE
+GP_PEDANTIC_CFLAGS_C11
+GP_HAVE_PEDANTIC_FLAGS_C11_FALSE
+GP_HAVE_PEDANTIC_FLAGS_C11_TRUE
+GP_PEDANTIC_CFLAGS_C99
+GP_HAVE_PEDANTIC_FLAGS_C99_FALSE
+GP_HAVE_PEDANTIC_FLAGS_C99_TRUE
+GP_PEDANTIC_CFLAGS_C90
+GP_HAVE_PEDANTIC_FLAGS_C90_FALSE
+GP_HAVE_PEDANTIC_FLAGS_C90_TRUE
+HAVE_RSYNC_FALSE
+HAVE_RSYNC_TRUE
+RSYNC
+HAVE_CXX_FALSE
+HAVE_CXX_TRUE
 ac_ct_AR
 AR
+SED
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
@@ -777,7 +852,6 @@
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -796,6 +870,9 @@
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -838,6 +915,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -856,13 +934,13 @@
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
+SHELL
+am__quote'
+ac_subst_files='GP_GETTEXT_SETUP_MK'
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
-enable_gp2ddb
 enable_static
 enable_shared
 with_pic
@@ -877,15 +955,14 @@
 with_libintl_prefix
 enable_largefile
 with_jpeg
+with_ws232
 with_libxml_2_0
+with_libcurl
 with_gdlib
 with_camlibdir
 with_camlibs
-with_doc_dir
 enable_internal_docs
 enable_docs
-with_html_dir
-with_rpmbuild
 with_hotplug_doc_dir
 with_hotplug_usermap_dir
 with_libexif
@@ -902,6 +979,7 @@
 CXX
 CXXFLAGS
 CCC
+RSYNC
 LT_SYS_LIBRARY_PATH
 CXXCPP
 LTDLINCL
@@ -909,12 +987,27 @@
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+LIBJPEG_CFLAGS
+LIBJPEG_LIBS
 LIBXML2_CFLAGS
 LIBXML2_LIBS
+LIBCURL_CFLAGS
+LIBCURL_LIBS
 LIBGD_CFLAGS
 LIBGD_LIBS
 utilsdir
 udevscriptdir
+camlibdir
+DEFAULT_CAMLIBS
+CMP
+SORT
+TR
+UNIQ
+EXPR
+SLEEP
+COMM
+DOT
+DOXYGEN
 LIBEXIF_CFLAGS
 LIBEXIF_LIBS'
 ac_subdirs_all='libgphoto2_port'
@@ -955,6 +1048,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -984,8 +1078,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1026,9 +1118,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1052,9 +1144,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1207,6 +1299,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1256,9 +1357,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1272,9 +1373,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1318,9 +1419,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1336,7 +1437,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1344,7 +1445,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1400,7 +1501,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -1457,7 +1558,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 libgphoto2 photo camera library 2.5.18 to adapt to many kinds of systems.
+\`configure' configures libgphoto2 photo camera library 2.5.31 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1497,6 +1598,7 @@
   --sysconfdir=DIR        read-only single-machine data PREFIX/etc
   --sharedstatedir=DIR    modifiable architecture-independent data PREFIX/com
   --localstatedir=DIR     modifiable single-machine data PREFIX/var
+  --runstatedir=DIR       modifiable per-process data LOCALSTATEDIR/run
   --libdir=DIR            object code libraries EPREFIX/lib
   --includedir=DIR        C header files PREFIX/include
   --oldincludedir=DIR     C header files for non-gcc /usr/include
@@ -1527,7 +1629,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libgphoto2 photo camera library 2.5.18:";;
+     short | recursive ) echo "Configuration of libgphoto2 photo camera library 2.5.31:";;
    esac
   cat <<\_ACEOF
 
@@ -1541,8 +1643,6 @@
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
-  --enable-gp2ddb         enable EXPERIMENTAL PRE-ALPHA gphoto2 device
-                          database code
   --enable-static=PKGS  build static libraries default=no
   --enable-shared=PKGS  build shared libraries default=yes
   --enable-fast-install=PKGS
@@ -1565,36 +1665,39 @@
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --without-jpeg          Build without jpeg library (default: no)
+  --without-jpeg          Build without libjpeg (default: autodetect)
+  --without-ws232         Build without ws2_32 library (default: no)
   --with-libxml-2.0=PREFIX
                           where to find libxml-2.0, "no" or "auto"
+  --with-libcurl=PREFIX   where to find libcurl, "no" or "auto"
   --with-gdlib=PREFIX     where to find gdlib, "no" or "auto"
-  --with-camlibdir=<path> install camlibs in directory <path>
-  --with-camlibs=<list>   Compile camera drivers (camlibs) in <list>. Drivers
+  --with-camlibdir=<path> deprecated (use camlibdir= variable instead)
+  --with-camlibs=<list>   Compile camera drivers (camlibs) in <list>. Camlibs
                           may be separated with commas. CAUTION: DRIVER NAMES
-                          AND CAMERA NAMES MAY DIFFER. 'all' is the default
-                          and compiles all camlibs. Possible camlibs are:
-                          adc65 agfa_cl20 aox ax203 barbie canon casio_qv
-                          clicksmart310 digigr8 digita dimera3500 directory
-                          enigma13 fuji gsmart300 hp215 iclick jamcam jd11
-                          jl2005a jl2005c kodak_dc120 kodak_dc210 kodak_dc240
+                          AND CAMERA NAMES MAY DIFFER. 'standard' is the
+                          default and is a standard set of camlibs: ax203
+                          canon digigr8 directory docupen jl2005a jl2005c
+                          kodak_dc240 lumix mars dimagev pentax ptp2 ricoh_g3
+                          sierra sonix sq905 st2205 topfield tp6801.
+                          'outdated' is a set of camlibs for very old cameras:
+                          adc65 agfa_cl20 aox barbie casio_qv clicksmart310
+                          digita dimera3500 enigma13 fuji gsmart300 hp215
+                          iclick jamcam jd11 kodak_dc120 kodak_dc210
                           kodak_dc3200 kodak_ez200 konica konica_qm150 largan
-                          lg_gsm mars dimagev mustek panasonic_coolshot
-                          panasonic_l859 panasonic_dc1000 panasonic_dc1580
-                          pccam300 pccam600 pentax polaroid_pdc320
-                          polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3
-                          samsung sierra sipix_blink2 sipix_web2 smal sonix
-                          sony_dscf1 sony_dscf55 soundvision spca50x sq905
-                          st2205 stv0674 stv0680 sx330z topfield
-                          toshiba_pdrm11 tp6801
-  --with-doc-dir=PATH     Where to install docs default=autodetect
-  --with-html-dir=PATH    Where to install html docs default=autodetect
-  --with-rpmbuild=PATH    Program to use for building RPMs
+                          lg_gsm mustek panasonic_coolshot panasonic_l859
+                          panasonic_dc1000 panasonic_dc1580 pccam300 pccam600
+                          polaroid_pdc320 polaroid_pdc640 polaroid_pdc700
+                          ricoh samsung sipix_blink2 sipix_web2 smal
+                          sony_dscf1 sony_dscf55 soundvision spca50x stv0674
+                          stv0680 sx330z toshiba_pdrm11. 'everything' is the
+                          set including every camlib. You can add or remove
+                          camlibs or camlib sets by appending them to the list
+                          with a + or - sign in front.
   --with-hotplug-doc-dir=PATH
                           Where to install hotplug scripts as docs
                           default=autodetect
@@ -1614,6 +1717,7 @@
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  RSYNC       rsync file copying command
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
   CXXCPP      C++ preprocessor
@@ -1624,10 +1728,18 @@
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  LIBJPEG_CFLAGS
+              C compiler flags for LIBJPEG, overriding pkg-config
+  LIBJPEG_LIBS
+              linker flags for LIBJPEG, overriding pkg-config
   LIBXML2_CFLAGS
               CFLAGS for compiling with libxml-2.0
   LIBXML2_LIBS
               LIBS to add for linking against libxml-2.0
+  LIBCURL_CFLAGS
+              CFLAGS for compiling with libcurl
+  LIBCURL_LIBS
+              LIBS to add for linking against libcurl
   LIBGD_CFLAGS
               CFLAGS for compiling with gdlib
   LIBGD_LIBS  LIBS to add for linking against gdlib
@@ -1636,6 +1748,20 @@
   udevscriptdir
               Directory where udev scripts like check-ptp-camera will be
               installed
+  camlibdir   where to install camlibs (default:
+              ${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION})
+  DEFAULT_CAMLIBS
+              default location to look for camlibs at runtime (if not given,
+              use ${camlibdir})
+  CMP         cmp file comparison command
+  SORT        sort text file line sorting command
+  TR          tr string character translation command
+  UNIQ        uniq sorted file unification command
+  EXPR        expr expression evaluation command
+  SLEEP       sleep delay command
+  COMM        comm line by line comparison command
+  DOT         dot graphviz directed graph drawing command
+  DOXYGEN     doxygen software documentation generator command
   LIBEXIF_CFLAGS
               CFLAGS for compiling with libexif
   LIBEXIF_LIBS
@@ -1660,9 +1786,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1690,7 +1816,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1698,7 +1825,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1707,10 +1834,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libgphoto2 photo camera library configure 2.5.18
-generated by GNU Autoconf 2.69
+libgphoto2 photo camera library configure 2.5.31
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1727,14 +1854,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1742,14 +1869,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1771,7 +1899,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1779,14 +1907,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -1802,14 +1931,14 @@
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1817,14 +1946,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1834,139 +1964,6 @@
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $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
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&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;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$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 gphoto-devel@lists.sourceforge.net ##
-## ------------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $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
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1974,26 +1971,28 @@
 ac_fn_c_check_header_compile ()
 {
   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
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2004,14 +2003,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2019,17 +2018,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2050,11 +2050,12 @@
 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
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2062,16 +2063,9 @@
 #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
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2089,24 +2083,25 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     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; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2123,7 +2118,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2131,14 +2126,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -2154,14 +2150,14 @@
 ac_fn_cxx_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2169,17 +2165,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2194,6 +2191,49 @@
 
 } # ac_fn_cxx_try_link
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2201,17 +2241,18 @@
 ac_fn_c_check_type ()
 {
   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
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2219,12 +2260,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2232,18 +2274,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2255,16 +2298,17 @@
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2273,14 +2317,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2289,29 +2334,50 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 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 libgphoto2 photo camera library $as_me 2.5.18, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by libgphoto2 photo camera library $as_me 2.5.31, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2344,8 +2410,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2380,7 +2450,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2415,11 +2485,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2430,8 +2502,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2455,7 +2527,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2463,14 +2535,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2478,15 +2550,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2494,8 +2566,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2509,63 +2581,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2575,19 +2632,651 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       \\/* | ?:\\/* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data;
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->datai = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_arrayni.number;
+  dynamic_array0 = argv00;
+  dynamic_arrayni.number - 1 = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
+	 || dynamic_arrayni.number - 1 != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int100),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+  extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+  try {
+    throw "test";
+  } catch (const char *s) {
+    // Extra parentheses suppress a warning when building autoconf itself,
+    // due to lint rules shared with more typical C programs.
+    assert (!(strcmp) (s, "test"));
+  }
+}
+
+template <typename T> struct test_template
+{
+  T const val;
+  explicit test_template(T t) : val(t) {}
+  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+  assert (argc);
+  assert (! argv0);
+{
+  test_exception_syntax ();
+  test_template<double> tt (2.0);
+  assert (tt.add (4) == 6.0);
+  assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+  constexpr int get_val() { return 20; }
+
+  struct testinit
+  {
+    int i;
+    double d;
+  };
+
+  class delegate
+  {
+  public:
+    delegate(int n) : n(n) {}
+    delegate(): delegate(2354) {}
+
+    virtual int getval() { return this->n; };
+  protected:
+    int n;
+  };
+
+  class overridden : public delegate
+  {
+  public:
+    overridden(int n): delegate(n) {}
+    virtual int getval() override final { return this->n * 2; }
+  };
+
+  class nocopy
+  {
+  public:
+    nocopy(int i): i(i) {}
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy & operator=(const nocopy&) = delete;
+  private:
+    int i;
+  };
+
+  // for testing lambda expressions
+  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+  {
+    return f(v);
+  }
+
+  // for testing variadic templates and trailing return types
+  template <typename V> auto sum(V first) -> V
+  {
+    return first;
+  }
+  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+  {
+    return first + sum(rest...);
+  }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+  // Test auto and decltype
+  auto a1 = 6538;
+  auto a2 = 48573953.4;
+  auto a3 = "String literal";
+
+  int total = 0;
+  for (auto i = a3; *i; ++i) { total += *i; }
+
+  decltype(a2) a4 = 34895.034;
+}
+{
+  // Test constexpr
+  short sacxx11test::get_val() = { 0 };
+}
+{
+  // Test initializer lists
+  cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+  // Test range-based for
+  int array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+  for (auto &x : array) { x += 23; }
+}
+{
+  // Test lambda expressions
+  using cxx11test::eval;
+  assert (eval ((int x) { return x*2; }, 21) == 42);
+  double d = 2.0;
+  assert (eval (&(double x) { return d += x; }, 3.0) == 5.0);
+  assert (d == 5.0);
+  assert (eval (=(double x) mutable { return d += x; }, 4.0) == 9.0);
+  assert (d == 5.0);
+}
+{
+  // Test use of variadic templates
+  using cxx11test::sum;
+  auto a = sum(1);
+  auto b = sum(1, 2);
+  auto c = sum(1.0, 2.0, 3.0);
+}
+{
+  // Test constructor delegation
+  cxx11test::delegate d1;
+  cxx11test::delegate d2();
+  cxx11test::delegate d3(45);
+}
+{
+  // Test override and final
+  cxx11test::overridden o1(55464);
+}
+{
+  // Test nullptr
+  char *c = nullptr;
+}
+{
+  // Test template brackets
+  test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+  // Unicode literals
+  char const *utf8 = u8"UTF-8 string \u2500";
+  char16_t const *utf16 = u"UTF-8 string \u2500";
+  char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  ${ac_cxx_conftest_cxx11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+gt_needs="$gt_needs "
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.rpath config.guess config.sub ltmain.sh ar-lib compile missing install-sh"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/auto-aux"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2598,12 +3287,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -2612,24 +3301,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2639,11 +3328,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2661,38 +3351,12 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_aux_dir=
-for ac_dir in auto-aux "$srcdir"/auto-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in auto-aux \"$srcdir\"/auto-aux" "$LINENO" 5
-fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+am__api_version='1.16'
 
 
-am__api_version='1.15'
 
-# Find a good install program.  We prefer a C program (faster),
+  # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -2706,20 +3370,25 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /cC/* | \
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
@@ -2729,13 +3398,13 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
@@ -2743,12 +3412,12 @@
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
@@ -2764,7 +3433,7 @@
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
+  if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -2774,8 +3443,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2785,8 +3454,8 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2840,8 +3509,8 @@
    as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
@@ -2860,26 +3529,23 @@
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
 
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
-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
+
+  if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -2899,11 +3565,12 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -2911,11 +3578,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2926,11 +3597,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2939,11 +3610,12 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; 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_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -2951,11 +3623,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2966,11 +3642,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2978,8 +3654,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2991,25 +3667,31 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
@@ -3020,7 +3702,7 @@
 fi
 
   test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -3030,18 +3712,19 @@
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -3049,11 +3732,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3064,24 +3751,25 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -3097,12 +3785,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3116,7 +3804,8 @@
 rmdir .tst 2>/dev/null
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
   enableval=$enable_silent_rules;
 fi
 
@@ -3126,12 +3815,13 @@
     *) AM_DEFAULT_VERBOSITY=1;;
 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))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -3143,8 +3833,8 @@
   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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$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)'
@@ -3176,17 +3866,13 @@
 
 # Define the identity of the package.
  PACKAGE='libgphoto2'
- VERSION='2.5.18'
+ VERSION='2.5.31'
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
+printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -3206,8 +3892,8 @@
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -3226,6 +3912,20 @@
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -3258,7 +3958,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3271,10 +3971,11 @@
 
 
 
-# Use the silent-rules feature when possible.
+
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
   enableval=$enable_silent_rules;
 fi
 
@@ -3284,12 +3985,13 @@
     *) AM_DEFAULT_VERBOSITY=1;;
 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))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -3301,8 +4003,8 @@
   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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$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)'
@@ -3314,6 +4016,9 @@
 
 
 
+
+
+
 # make sure "cd" doesn't print anything on stdout
 if test x"${CDPATH+set}" = xset
 then
@@ -3322,20 +4027,20 @@
 fi
 
 # make sure $() command substitution works
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX sh \$() command substitution" >&5
-$as_echo_n "checking for POSIX sh \$() command substitution... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX sh \$() command substitution" >&5
+printf %s "checking for POSIX sh \$() command substitution... " >&6; }
 if test "x$(pwd)" = "x`pwd`" && test "y$(echo "foobar")" = "y`echo foobar`" # ''''
 then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	uname=`uname 2>&1` # ''
 	uname_a=`uname -a 2>&1` # ''
 	as_fn_error $? "
 
-* POSIX sh \$() command substition does not work with this shell.
+* POSIX sh \$() command substitution does not work with this shell.
 *
 * You are running a very rare species of shell. Please report this
 * sighting to <${PACKAGE_BUGREPORT}>:
@@ -3378,11 +4083,11 @@
 "
 
 
-LIBGPHOTO2_AGE=1
+LIBGPHOTO2_AGE=3
 
 LIBGPHOTO2_REVISION=0
 
-LIBGPHOTO2_CURRENT=7
+LIBGPHOTO2_CURRENT=9
 
 LIBGPHOTO2_CURRENT_MIN=`expr $LIBGPHOTO2_CURRENT - $LIBGPHOTO2_AGE`
 
@@ -3391,6 +4096,24 @@
 
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking original CC value" >&5
+printf %s "checking original CC value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$CC\"" >&5
+printf "%s\n" "\"$CC\"" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking original CXX value" >&5
+printf %s "checking original CXX value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$CXX\"" >&5
+printf "%s\n" "\"$CXX\"" >&6; }
+
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3399,11 +4122,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3411,11 +4135,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3426,11 +4154,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3439,11 +4167,12 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; 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_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3451,11 +4180,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3466,11 +4199,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3478,8 +4211,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3492,11 +4225,12 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3504,11 +4238,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3519,11 +4257,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3532,11 +4270,12 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3545,15 +4284,19 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3569,18 +4312,18 @@
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3591,11 +4334,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3603,11 +4347,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3618,11 +4366,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3635,11 +4383,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3647,11 +4396,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3662,11 +4415,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3678,8 +4431,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3687,25 +4440,129 @@
 fi
 
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3715,7 +4572,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3723,7 +4580,7 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3735,9 +4592,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3758,11 +4615,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3779,7 +4637,7 @@
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
@@ -3795,44 +4653,46 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3846,15 +4706,15 @@
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3863,7 +4723,7 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -3875,8 +4735,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3884,10 +4744,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3895,39 +4755,40 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3941,11 +4802,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3954,31 +4816,32 @@
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -3988,29 +4851,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4019,57 +4886,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -4084,94 +4954,144 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0  ||  f (e, argv, 1) != argv1;
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -4180,21 +5100,23 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=c
+
+  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4222,8 +5144,8 @@
   rm -f core conftest*
   unset am_i
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -4242,48 +5164,49 @@
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 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
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf "%s\n" "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test ${enable_dependency_tracking+y}
+then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -4304,11 +5227,12 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   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
@@ -4415,8 +5339,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4435,40 +5359,36 @@
 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4480,10 +5400,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4493,7 +5414,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4505,29 +5427,24 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4539,10 +5456,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4552,11 +5470,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -4567,6 +5486,12 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+
+
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4577,15 +5502,16 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -4593,11 +5519,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4608,11 +5538,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4621,15 +5551,16 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -4637,11 +5568,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4652,11 +5587,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4668,8 +5603,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -4679,7 +5614,7 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -4689,7 +5624,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4699,20 +5634,21 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -4722,29 +5658,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -4753,57 +5693,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -4818,6 +5761,100 @@
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4826,11 +5863,12 @@
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CXX_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   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
@@ -4937,8 +5975,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -4953,18 +5991,94 @@
 
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
 
-if test -n "$ac_tool_prefix"; then
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
+
+  if test -n "$ac_tool_prefix"; then
   for ac_prog in ar lib "link -lib"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -4972,11 +6086,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4987,11 +6105,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5004,11 +6122,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -5016,11 +6135,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5031,11 +6154,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5047,8 +6170,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -5057,11 +6180,12 @@
 
 : ${AR=ar}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
-if ${am_cv_ar_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+printf %s "checking the archiver ($AR) interface... " >&6; }
+if test ${am_cv_ar_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5073,12 +6197,13 @@
 /* end confdefs.h.  */
 int some_variable = 0;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test "$ac_status" -eq 0; then
         am_cv_ar_interface=ar
@@ -5087,7 +6212,7 @@
         { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         if test "$ac_status" -eq 0; then
           am_cv_ar_interface=lib
@@ -5098,7 +6223,7 @@
       rm -f conftest.lib libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5106,8 +6231,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-$as_echo "$am_cv_ar_interface" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf "%s\n" "$am_cv_ar_interface" >&6; }
 
 case $am_cv_ar_interface in
 ar)
@@ -5127,945 +6252,1865 @@
 esac
 
 
-SED=${SED-sed}
 
-if test "x$GCC" = "xyes"; then
-	# CFLAGS="$CFLAGS --std=c99 -Wall -Wextra -Werror -pedantic"
-	CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Wmissing-prototypes"
-	LDFLAGS="$LDFLAGS"
-	NO_UNUSED_CFLAGS=-Wno-unused
-
-fi
- if test "x$GCC" = "xyes"; then
-  HAVE_GCC_TRUE=
-  HAVE_GCC_FALSE='#'
+ if test "x$CXX" != "x" && test "x$CXX" != "xno"; then
+  HAVE_CXX_TRUE=
+  HAVE_CXX_FALSE='#'
 else
-  HAVE_GCC_TRUE='#'
-  HAVE_GCC_FALSE=
+  HAVE_CXX_TRUE='#'
+  HAVE_CXX_FALSE=
 fi
 
 
-# Activate internal code
-AM_CPPFLAGS="$AM_CPPFLAGS -D_GPHOTO2_INTERNAL_CODE"
-
-# CPPFLAGS: C PreProcessor flags
-
-# CFLAGS: C compiler flags
-
-# CXXFLAGS: C++ compiler flags
-
-# LDFLAGS: Linker flags
-
-
-# Check for va_copy()
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
+if ${RSYNC:+false} :
+then :
+  # Extract the first word of "rsync", so it can be a program name with args.
+set dummy rsync; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_RSYNC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $RSYNC in
+  \\/* | ?:\\/*)
+  ac_cv_path_RSYNC="$RSYNC" # Let the user override the test with a path.
+  ;;
+  *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_RSYNC="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
 
+  test -z "$ac_cv_path_RSYNC" && ac_cv_path_RSYNC="no"
+  ;;
+esac
+fi
+RSYNC=$ac_cv_path_RSYNC
+if test -n "$RSYNC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RSYNC" >&5
+printf "%s\n" "$RSYNC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
+fi
 
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
+ if test "x$RSYNC" != xno; then
+  HAVE_RSYNC_TRUE=
+  HAVE_RSYNC_FALSE='#'
 else
-  ac_cv_path_EGREP=$EGREP
+  HAVE_RSYNC_TRUE='#'
+  HAVE_RSYNC_FALSE=
 fi
 
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+cat confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: saving original confdefs.h and creating empty confdefs.h" >&5
+printf "%s\n" "$as_me: saving original confdefs.h and creating empty confdefs.h" >&6;}
+rm -f confdefs.h.saved
+mv confdefs.h confdefs.h.saved
+cat <<EOF >confdefs.h
+/* confdefs.h forced empty for the pedantic compile tests */
+EOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS value before" >&5
+printf %s "checking CFLAGS value before... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
+printf "%s\n" "$CFLAGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS value before" >&5
+printf %s "checking CXXFLAGS value before... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXFLAGS" >&5
+printf "%s\n" "$CXXFLAGS" >&6; }
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(C90,C,-std=c90)
+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
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C90,-std=c90)
+gp_compiler_flags_saved_CFLAGS="$CFLAGS"
+CFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C90,GP_HAVE_PEDANTIC_FLAGS_C90,-std=c90)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c90)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -std=c90 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -std=c90" >&5
+printf %s "checking whether CFLAGS can append -std=c90... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
-int
-main ()
+#include <stdio.h>
+int main(int argc, char *argv)
 {
-
-  ;
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
   return 0;
 }
+
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -std=c90"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c90)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
 
 fi
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_C90_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_C90_FALSE='#'
+else
+  GP_HAVE_PEDANTIC_FLAGS_C90_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_C90_FALSE=
+fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+GP_PEDANTIC_CFLAGS_C90="$CFLAGS"
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c90" >&5
+printf %s "checking whether to test pedantic -std=c90... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_C90_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C90,GP_HAVE_PEDANTIC_FLAGS_C90,-std=c90)
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+GP_PEDANTIC_CFLAGS_C90="$CFLAGS"
+CFLAGS="$gp_compiler_flags_saved_CFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C90,-std=c90)
+
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(C90,C,-std=c90)
+
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(C99,C,-std=c99)
+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
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C99,-std=c99)
+gp_compiler_flags_saved_CFLAGS="$CFLAGS"
+CFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C99,GP_HAVE_PEDANTIC_FLAGS_C99,-std=c99)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c99)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -std=c99 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -std=c99" >&5
+printf %s "checking whether CFLAGS can append -std=c99... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
+#include <stdio.h>
+int main(int argc, char *argv)
 {
   int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
   return 0;
 }
+
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -std=c99"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c99)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
+
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
 
 fi
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_C99_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_C99_FALSE='#'
+else
+  GP_HAVE_PEDANTIC_FLAGS_C99_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_C99_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+GP_PEDANTIC_CFLAGS_C99="$CFLAGS"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c99" >&5
+printf %s "checking whether to test pedantic -std=c99... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_C99_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C99,GP_HAVE_PEDANTIC_FLAGS_C99,-std=c99)
+
+GP_PEDANTIC_CFLAGS_C99="$CFLAGS"
+CFLAGS="$gp_compiler_flags_saved_CFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C99,-std=c99)
+
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(C99,C,-std=c99)
+
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(C11,C,-std=c11)
+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
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C11,-std=c11)
+gp_compiler_flags_saved_CFLAGS="$CFLAGS"
+CFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C11,GP_HAVE_PEDANTIC_FLAGS_C11,-std=c11)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c11)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -std=c11 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -std=c11" >&5
+printf %s "checking whether CFLAGS can append -std=c11... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -std=c11"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c11)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-done
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
 
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdarg_h" = xyes; then :
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
 
+fi
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_C11_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_C11_FALSE='#'
 else
+  GP_HAVE_PEDANTIC_FLAGS_C11_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_C11_FALSE=
+fi
 
-	as_fn_error $? "
-Building $PACKAGE_NAME requires <stdarg.h>.
-" "$LINENO" 5
+GP_PEDANTIC_CFLAGS_C11="$CFLAGS"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c11" >&5
+printf %s "checking whether to test pedantic -std=c11... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_C11_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C11,GP_HAVE_PEDANTIC_FLAGS_C11,-std=c11)
 
+GP_PEDANTIC_CFLAGS_C11="$CFLAGS"
+CFLAGS="$gp_compiler_flags_saved_CFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C11,-std=c11)
 
-have_va_copy=no
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(C11,C,-std=c11)
+
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(C2X,C,-std=c2x)
+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
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C2X,-std=c2x)
+gp_compiler_flags_saved_CFLAGS="$CFLAGS"
+CFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C2X,GP_HAVE_PEDANTIC_FLAGS_C2X,-std=c2x)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c2x)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -std=c2x -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -std=c2x" >&5
+printf %s "checking whether CFLAGS can append -std=c2x... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-	#include <stdarg.h>
-
-int
-main ()
+#include <stdio.h>
+int main(int argc, char *argv)
 {
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
 
-	va_list a,b;
-	va_copy(a,b);
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -std=c2x"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-  ;
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-std=c2x)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
   return 0;
 }
+
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-	have_va_copy="va_copy"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-pedantic -Wall -Wextra -Werror)
 
+fi
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_C2X_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_C2X_FALSE='#'
 else
+  GP_HAVE_PEDANTIC_FLAGS_C2X_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_C2X_FALSE=
+fi
 
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+GP_PEDANTIC_CFLAGS_C2X="$CFLAGS"
 
-		#include <stdarg.h>
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c2x" >&5
+printf %s "checking whether to test pedantic -std=c2x... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_C2X_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-int
-main ()
-{
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-		va_list a,b;
-		__va_copy(a,b);
+fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,GP_PEDANTIC_CFLAGS_C2X,GP_HAVE_PEDANTIC_FLAGS_C2X,-std=c2x)
 
-  ;
+GP_PEDANTIC_CFLAGS_C2X="$CFLAGS"
+CFLAGS="$gp_compiler_flags_saved_CFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CFLAGS,C2X,-std=c2x)
+
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(C2X,C,-std=c2x)
+
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(CXX98,C++,-std=c++98)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX98,-std=c++98)
+gp_compiler_flags_saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX98,GP_HAVE_PEDANTIC_FLAGS_CXX98,-std=c++98)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++98)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -std=c++98 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -std=c++98" >&5
+printf %s "checking whether CXXFLAGS can append -std=c++98... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
   return 0;
 }
+
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -std=c++98"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
-		have_va_copy="__va_copy"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++98)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-$as_echo "#define va_copy __va_copy" >>confdefs.h
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
 
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy() or replacement" >&5
-$as_echo_n "checking for va_copy() or replacement... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_va_copy" >&5
-$as_echo "$have_va_copy" >&6; }
-if test "x$have_va_copy" != "xno"; then
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_CXX98_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_CXX98_FALSE='#'
+else
+  GP_HAVE_PEDANTIC_FLAGS_CXX98_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_CXX98_FALSE=
+fi
+
+GP_PEDANTIC_CXXFLAGS_CXX98="$CXXFLAGS"
 
-$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c++98" >&5
+printf %s "checking whether to test pedantic -std=c++98... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_CXX98_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX98,GP_HAVE_PEDANTIC_FLAGS_CXX98,-std=c++98)
 
+GP_PEDANTIC_CXXFLAGS_CXX98="$CXXFLAGS"
+CXXFLAGS="$gp_compiler_flags_saved_CXXFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX98,-std=c++98)
 
-# Note: Do NOT add specific libraries and stuff to the generic _FLAGS.
-#       Put these into LIBFOO_CFLAGS and LIBFOO_LIBS instead.
+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
 
+# END GP_PEDANTIC_COMPILER_FLAGS(CXX98,C++,-std=c++98)
 
-try_gp2ddb=false
-msg_gp2ddb=""
-gp_msg_dp2ddb="no"
-
-# Check whether --enable-gp2ddb was given.
-if test "${enable_gp2ddb+set}" = set; then :
-  enableval=$enable_gp2ddb;
-	if test "x$enableval" = "xyes"; then
-		try_gp2ddb=true
-		msg_dp2ddb="(--enable-gp2ddb detected)"
-	elif test "x$enableval" = "xno"; then
-		try_gp2ddb=false
-		msg_dp2ddb="(--disable-gp2ddb detected)"
-	fi
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(CXX11,C++,-std=c++11)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX11,-std=c++11)
+gp_compiler_flags_saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX11,GP_HAVE_PEDANTIC_FLAGS_CXX11,-std=c++11)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++11)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -std=c++11 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -std=c++11" >&5
+printf %s "checking whether CXXFLAGS can append -std=c++11... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -std=c++11"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++11)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
 
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; 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_FLEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $FLEX in
-  \\/* | ?:\\/*)
-  ac_cv_path_FLEX="$FLEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FLEX="$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
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
 
-  ;;
-esac
 fi
-FLEX=$ac_cv_path_FLEX
-if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
-$as_echo "$FLEX" >&6; }
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_CXX11_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_CXX11_FALSE='#'
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  GP_HAVE_PEDANTIC_FLAGS_CXX11_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_CXX11_FALSE=
 fi
 
+GP_PEDANTIC_CXXFLAGS_CXX11="$CXXFLAGS"
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c++11" >&5
+printf %s "checking whether to test pedantic -std=c++11... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_CXX11_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-# Extract the first word of "bison", so it can be a program name with args.
-set dummy bison; 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_BISON+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  case $BISON in
-  \\/* | ?:\\/*)
-  ac_cv_path_BISON="$BISON" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BISON="$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
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-  ;;
-esac
-fi
-BISON=$ac_cv_path_BISON
-if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
-$as_echo "$BISON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX11,GP_HAVE_PEDANTIC_FLAGS_CXX11,-std=c++11)
 
+GP_PEDANTIC_CXXFLAGS_CXX11="$CXXFLAGS"
+CXXFLAGS="$gp_compiler_flags_saved_CXXFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX11,-std=c++11)
 
+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
 
+# END GP_PEDANTIC_COMPILER_FLAGS(CXX11,C++,-std=c++11)
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GP2DDB" >&5
-$as_echo_n "checking whether to enable GP2DDB... " >&6; }
-if "$try_gp2ddb"; then
-   if test -x "$FLEX" && test -x "$BISON"; then
-      gp_msg_dp2ddb="yes $msg_dp2ddb"
-   else
-      as_fn_error $? "Fatal: GP2DDB support requires flex and bison!
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(CXX14,C++,-std=c++14)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX14,-std=c++14)
+gp_compiler_flags_saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX14,GP_HAVE_PEDANTIC_FLAGS_CXX14,-std=c++14)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++14)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -std=c++14 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -std=c++14" >&5
+printf %s "checking whether CXXFLAGS can append -std=c++14... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-Aborting configuration.
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
 
-Install flex and bison into your PATH or run configure with --disable-gp2ddb
-to disable GP2DDB support.
-" "$LINENO" 5
-   fi
-else
-      gp_msg_dp2ddb="no $msg_dp2ddb"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${gp_msg_gp2ddb}" >&5
-$as_echo "${gp_msg_gp2ddb}" >&6; }
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -std=c++14"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
- if "$try_gp2ddb" && test -x "$FLEX" && test -x "$BISON"; then
-  ENABLED_GP2DDB_TRUE=
-  ENABLED_GP2DDB_FALSE='#'
-else
-  ENABLED_GP2DDB_TRUE='#'
-  ENABLED_GP2DDB_FALSE=
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++14)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
 
-if "$try_gp2ddb" && test -x "$FLEX" && test -x "$BISON"; then
-	gp_msg_gp2ddb="yes $msg_gp2ddb"
-
-$as_echo "#define ENABLED_GP2DDB 1" >>confdefs.h
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
-else
-	gp_msg_gp2ddb="no $msg_gp2ddb"
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
 
-gp_config_msg_len="$(expr "GP2DDB support" : '.*')"
-if test "$gp_config_msg_len" -ge "$gp_config_len"; then
-	gp_config_msg_lhs="$(expr "GP2DDB support" : "$.\{0,${gp_config_len3}\}$")..:"
+fi
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_CXX14_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_CXX14_FALSE='#'
 else
-	gp_config_msg_lhs="$(expr "GP2DDB support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+  GP_HAVE_PEDANTIC_FLAGS_CXX14_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_CXX14_FALSE=
 fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${gp_msg_gp2ddb} (EXPERIMENTAL)
-"
 
+GP_PEDANTIC_CXXFLAGS_CXX14="$CXXFLAGS"
 
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=no
-fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c++14" >&5
+printf %s "checking whether to test pedantic -std=c++14... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_CXX14_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX14,GP_HAVE_PEDANTIC_FLAGS_CXX14,-std=c++14)
 
+GP_PEDANTIC_CXXFLAGS_CXX14="$CXXFLAGS"
+CXXFLAGS="$gp_compiler_flags_saved_CXXFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX14,-std=c++14)
 
+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
 
+# END GP_PEDANTIC_COMPILER_FLAGS(CXX14,C++,-std=c++14)
 
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(CXX17,C++,-std=c++17)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX17,-std=c++17)
+gp_compiler_flags_saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX17,GP_HAVE_PEDANTIC_FLAGS_CXX17,-std=c++17)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++17)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -std=c++17 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -std=c++17" >&5
+printf %s "checking whether CXXFLAGS can append -std=c++17... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
 
-# 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
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -std=c++17"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
 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
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++17)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
-{ $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
-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
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
 
 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
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_CXX17_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_CXX17_FALSE='#'
+else
+  GP_HAVE_PEDANTIC_FLAGS_CXX17_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_CXX17_FALSE=
+fi
 
+GP_PEDANTIC_CXXFLAGS_CXX17="$CXXFLAGS"
 
-enable_win32_dll=yes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c++17" >&5
+printf %s "checking whether to test pedantic -std=c++17... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_CXX17_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; 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_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $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
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX17,GP_HAVE_PEDANTIC_FLAGS_CXX17,-std=c++17)
 
+GP_PEDANTIC_CXXFLAGS_CXX17="$CXXFLAGS"
+CXXFLAGS="$gp_compiler_flags_saved_CXXFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX17,-std=c++17)
+
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(CXX17,C++,-std=c++17)
+
+# BEGIN GP_PEDANTIC_COMPILER_FLAGS(CXX20,C++,-std=c++20)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# BEGIN _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX20,-std=c++20)
+gp_compiler_flags_saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=""
+# BEGIN __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX20,GP_HAVE_PEDANTIC_FLAGS_CXX20,-std=c++20)
+gp_have_pedantic_compiler=yes
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++20)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -std=c++20 -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -std=c++20" >&5
+printf %s "checking whether CXXFLAGS can append -std=c++20... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -std=c++20"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
 fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; 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_ac_ct_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $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
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-std=c++20)
+if test "x$gp_have_pedantic_compiler" = xyes
+then :
+    # BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+saved_CXXFLAGS="${CXXFLAGS}"
+CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror" >&5
+printf %s "checking whether CXXFLAGS can append -pedantic -Wall -Wextra -Werror... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CXXFLAGS="${saved_CXXFLAGS} -pedantic -Wall -Wextra -Werror"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CXXFLAGS="$saved_CXXFLAGS"
 
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# END GP_CONDITIONAL_COMPILE_FLAGS(CXXFLAGS,-pedantic -Wall -Wextra -Werror)
+
 fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
+ if test "x$gp_have_pedantic_compiler" = "xyes"; then
+  GP_HAVE_PEDANTIC_FLAGS_CXX20_TRUE=
+  GP_HAVE_PEDANTIC_FLAGS_CXX20_FALSE='#'
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  GP_HAVE_PEDANTIC_FLAGS_CXX20_TRUE='#'
+  GP_HAVE_PEDANTIC_FLAGS_CXX20_FALSE=
 fi
 
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
+GP_PEDANTIC_CXXFLAGS_CXX20="$CXXFLAGS"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to test pedantic -std=c++20" >&5
+printf %s "checking whether to test pedantic -std=c++20... " >&6; }
+if test -z "$GP_HAVE_PEDANTIC_FLAGS_CXX20_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $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
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
+# END __GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,GP_PEDANTIC_CXXFLAGS_CXX20,GP_HAVE_PEDANTIC_FLAGS_CXX20,-std=c++20)
+
+GP_PEDANTIC_CXXFLAGS_CXX20="$CXXFLAGS"
+CXXFLAGS="$gp_compiler_flags_saved_CXXFLAGS"
+# END _GP_PEDANTIC_COMPILER_FLAGS(CXXFLAGS,CXX20,-std=c++20)
+
+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
+
+# END GP_PEDANTIC_COMPILER_FLAGS(CXX20,C++,-std=c++20)
+
+
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Werror=unknown-warning-option)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wunknown-warning-option -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Werror=unknown-warning-option" >&5
+printf %s "checking whether CFLAGS can append -Werror=unknown-warning-option... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Werror=unknown-warning-option"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
+
 fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Werror=unknown-warning-option)
+
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wall)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wall -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wall" >&5
+printf %s "checking whether CFLAGS can append -Wall... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
 
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wall"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
 fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; 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_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $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
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wall)
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wextra)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wextra -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wextra" >&5
+printf %s "checking whether CFLAGS can append -Wextra... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wextra"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wextra)
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wmost)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wmost -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wmost" >&5
+printf %s "checking whether CFLAGS can append -Wmost... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wmost"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
+
 fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wmost)
+
+
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-error=reserved-identifier)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wreserved-identifier -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wno-error=reserved-identifier" >&5
+printf %s "checking whether CFLAGS can append -Wno-error=reserved-identifier... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wno-error=reserved-identifier"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
+
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-error=reserved-identifier)
+
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-error=documentation-deprecated-sync)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wdocumentation-deprecated-sync -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wno-error=documentation-deprecated-sync" >&5
+printf %s "checking whether CFLAGS can append -Wno-error=documentation-deprecated-sync... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wno-error=documentation-deprecated-sync"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-error=documentation-deprecated-sync)
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $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
+
+# BEGIN GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-unused-parameter)
+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
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${saved_CFLAGS} -Wunused-parameter -Werror"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CFLAGS can append -Wno-unused-parameter" >&5
+printf %s "checking whether CFLAGS can append -Wno-unused-parameter... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  CFLAGS="${saved_CFLAGS} -Wno-unused-parameter"
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_have_pedantic_compiler=no
+  CFLAGS="$saved_CFLAGS"
 
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
+# END GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS,-Wno-unused-parameter)
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS value after" >&5
+printf %s "checking CFLAGS value after... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
+printf "%s\n" "$CFLAGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS value after" >&5
+printf %s "checking CXXFLAGS value after... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXFLAGS" >&5
+printf "%s\n" "$CXXFLAGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: restoring original confdefs.h" >&5
+printf "%s\n" "$as_me: restoring original confdefs.h" >&6;}
+rm -f confdefs.h
+mv confdefs.h.saved confdefs.h
+cat confdefs.h
+
+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
+
+
+
+if test "x$GCC" = "xyes"; then
+	NO_UNUSED_CFLAGS=-Wno-unused
+
 fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
+ if test "x$GCC" = "xyes"; then
+  HAVE_GCC_TRUE=
+  HAVE_GCC_FALSE='#'
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  HAVE_GCC_TRUE='#'
+  HAVE_GCC_FALSE=
 fi
 
 
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+# Activate internal code
+AM_CPPFLAGS="$AM_CPPFLAGS -D_GPHOTO2_INTERNAL_CODE"
+
+# CPPFLAGS: C PreProcessor flags
+
+# CFLAGS: C compiler flags
+
+# CXXFLAGS: C++ compiler flags
+
+# LDFLAGS: Linker flags
+
+
+# Check for va_copy()
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
   fi
 done
-  done
-IFS=$as_save_IFS
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = xyes
+then :
+
+else $as_nop
+
+	as_fn_error $? "
+Building $PACKAGE_NAME requires <stdarg.h>.
+" "$LINENO" 5
 
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
-  ;;
-esac
+have_va_copy=no
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-test -z "$AS" && AS=as
+	#include <stdarg.h>
+
+int
+main (void)
+{
+
+	va_list a,b;
+	va_copy(a,b);
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
 
+	have_va_copy="va_copy"
 
+else $as_nop
 
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-test -z "$DLLTOOL" && DLLTOOL=dlltool
+		#include <stdarg.h>
 
+int
+main (void)
+{
 
+		va_list a,b;
+		__va_copy(a,b);
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
 
+		have_va_copy="__va_copy"
 
-test -z "$OBJDUMP" && OBJDUMP=objdump
+printf "%s\n" "#define va_copy __va_copy" >>confdefs.h
 
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy() or replacement" >&5
+printf %s "checking for va_copy() or replacement... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_va_copy" >&5
+printf "%s\n" "$have_va_copy" >&6; }
+if test "x$have_va_copy" != "xno"; then
 
+printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h
 
+fi
 
 
-enable_dlopen=yes
+# Note: Do NOT add specific libraries and stuff to the generic _FLAGS.
+#       Put these into LIBFOO_CFLAGS and LIBFOO_LIBS instead.
 
 
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.4.6'
-macro_revision='2.4.6'
+macro_version='2.4.7'
+macro_revision='2.4.7'
+
 
 
 
@@ -6081,6 +8126,81 @@
 
 ltmain=$ac_aux_dir/ltmain.sh
 
+
+
+  # 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
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$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
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+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
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$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
+
+
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 sed_quote_subst='s/$"`$\\$/\\\1/g'
@@ -6102,8 +8222,8 @@
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -6129,12 +8249,12 @@
 }
 
 case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
+  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf "%s\n" "printf" >&6; } ;;
+  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf "%s\n" "print -r" >&6; } ;;
+  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf "%s\n" "cat" >&6; } ;;
 esac
 
 
@@ -6150,11 +8270,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -6168,10 +8289,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -6180,13 +8306,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6214,8 +8340,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -6232,11 +8358,154 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+printf %s "checking for fgrep... " >&6; }
+if test ${ac_cv_path_FGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
@@ -6247,10 +8516,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in fgrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
@@ -6259,13 +8533,13 @@
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
+    printf "%s\n" 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6294,8 +8568,8 @@
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf "%s\n" "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
@@ -6320,17 +8594,18 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return, which upsets mingw
@@ -6359,15 +8634,16 @@
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -6396,18 +8672,19 @@
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -6418,8 +8695,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -6430,11 +8707,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test ${lt_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM=$NM
@@ -6459,13 +8737,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -6484,8 +8762,8 @@
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf "%s\n" "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -6498,11 +8776,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
@@ -6510,11 +8789,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6525,11 +8808,11 @@
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf "%s\n" "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6542,11 +8825,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
@@ -6554,11 +8838,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6569,11 +8857,11 @@
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6585,15 +8873,15 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
   fi
 fi
 
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -6614,11 +8902,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+printf %s "checking the name lister ($NM) interface... " >&6; }
+if test ${lt_cv_nm_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
   (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
@@ -6634,26 +8923,27 @@
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf "%s\n" "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+printf %s "checking the maximum length of command line arguments... " >&6; }
+if test ${lt_cv_sys_max_cmd_len+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
     i=0
   teststring=ABCD
 
@@ -6695,7 +8985,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6738,7 +9028,7 @@
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -6780,11 +9070,11 @@
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -6828,11 +9118,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+printf %s "checking how to convert $build file names to $host format... " >&6; }
+if test ${lt_cv_to_host_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $host in
   *-*-mingw* )
     case $build in
@@ -6868,18 +9159,19 @@
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+printf %s "checking how to convert $build file names to toolchain format... " >&6; }
+if test ${lt_cv_to_tool_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
@@ -6895,22 +9187,23 @@
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+printf %s "checking for $LD option to reload object files... " >&6; }
+if test ${lt_cv_ld_reload_flag+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -6941,13 +9234,122 @@
 
 
 if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FILECMD"; then
+  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FILECMD="${ac_tool_prefix}file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FILECMD=$ac_cv_prog_FILECMD
+if test -n "$FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf "%s\n" "$FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FILECMD"; then
+  ac_ct_FILECMD=$FILECMD
+  # Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_FILECMD"; then
+  ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_FILECMD="file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
+if test -n "$ac_ct_FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
+printf "%s\n" "$ac_ct_FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_FILECMD" = x; then
+    FILECMD=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FILECMD=$ac_ct_FILECMD
+  fi
+else
+  FILECMD="$ac_cv_prog_FILECMD"
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
@@ -6955,11 +9357,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6970,11 +9376,11 @@
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf "%s\n" "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6983,11 +9389,12 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
@@ -6995,11 +9402,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7010,11 +9421,11 @@
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -7022,8 +9433,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -7039,11 +9450,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+printf %s "checking how to recognize dependent libraries... " >&6; }
+if test ${lt_cv_deplibs_check_method+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
@@ -7069,7 +9481,7 @@
 
 bsdi45*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -7103,14 +9515,14 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -7124,7 +9536,7 @@
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -7171,7 +9583,7 @@
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -7239,8 +9651,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -7284,11 +9696,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
@@ -7296,11 +9709,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7311,11 +9728,11 @@
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf "%s\n" "$DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7324,11 +9741,12 @@
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; 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_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
@@ -7336,11 +9754,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7351,11 +9773,11 @@
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -7363,8 +9785,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -7381,11 +9803,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+printf %s "checking how to associate runtime and link libraries... " >&6; }
+if test ${lt_cv_sharedlib_from_linklib_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
@@ -7408,8 +9831,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -7424,11 +9847,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -7436,11 +9860,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7451,11 +9879,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7468,11 +9896,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -7480,11 +9909,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7495,11 +9928,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7511,8 +9944,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7520,42 +9953,60 @@
 fi
 
 : ${AR=ar}
-: ${AR_FLAGS=cru}
 
 
 
 
 
 
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
 
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+printf %s "checking for archiver @FILE support... " >&6; }
+if test ${lt_cv_ar_at_file+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ar_at_file=no
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   echo conftest.$ac_objext > conftest.lst
       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -7563,7 +10014,7 @@
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -7572,11 +10023,11 @@
       rm -f conftest.* libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf "%s\n" "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -7593,11 +10044,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -7605,11 +10057,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7620,11 +10076,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7633,11 +10089,12 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; 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_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -7645,11 +10102,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7660,11 +10121,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -7672,8 +10133,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -7692,11 +10153,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -7704,11 +10166,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7719,11 +10185,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7732,11 +10198,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; 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_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -7744,11 +10211,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7759,11 +10230,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7771,8 +10242,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7861,11 +10332,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+printf %s "checking command to parse $NM output from $compiler object... " >&6; }
+if test ${lt_cv_sys_global_symbol_pipe+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix.  What could be older than Ultrix?!! ;)
@@ -7920,7 +10392,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
@@ -7938,20 +10410,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
@@ -7975,7 +10447,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -7993,9 +10465,9 @@
 "     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -8017,14 +10489,14 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -8093,7 +10565,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -8128,11 +10600,11 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 fi
 
 # Response file support.
@@ -8178,13 +10650,14 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+printf %s "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
+if test ${with_sysroot+y}
+then :
   withval=$with_sysroot;
-else
+else $as_nop
   with_sysroot=no
 fi
 
@@ -8197,29 +10670,30 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf "%s\n" "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf "%s\n" "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+printf %s "checking for a working dd... " >&6; }
+if test ${ac_cv_path_lt_DD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 : ${lt_DD:=$DD}
@@ -8230,10 +10704,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in dd
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_lt_DD" || continue
 if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
   cmp -s conftest.i conftest.out \
@@ -8253,15 +10732,16 @@
 
 rm -f conftest.i conftest2.i conftest.out
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+printf %s "checking how to truncate binary pipes... " >&6; }
+if test ${lt_cv_truncate_bin+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 lt_cv_truncate_bin=
@@ -8272,8 +10752,8 @@
 rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf "%s\n" "$lt_cv_truncate_bin" >&6; }
 
 
 
@@ -8296,7 +10776,8 @@
 }
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
+if test ${enable_libtool_lock+y}
+then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -8312,9 +10793,9 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -8332,10 +10813,10 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -8347,7 +10828,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -8370,10 +10851,10 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -8381,7 +10862,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -8389,7 +10870,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -8411,16 +10892,16 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -8474,11 +10955,12 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+printf %s "checking whether the C compiler needs -belf... " >&6; }
+if test ${lt_cv_cc_needs_belf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8489,19 +10971,20 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_cc_needs_belf=yes
-else
+else $as_nop
   lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8510,8 +10993,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -8524,9 +11007,9 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -8561,11 +11044,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$MANIFEST_TOOL"; then
   ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 else
@@ -8573,11 +11057,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8588,11 +11076,11 @@
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf "%s\n" "$MANIFEST_TOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8601,11 +11089,12 @@
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; 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_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_MANIFEST_TOOL"; then
   ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
@@ -8613,11 +11102,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8628,11 +11121,11 @@
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -8640,8 +11133,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -8651,11 +11144,12 @@
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if test ${lt_cv_path_mainfest_tool+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_path_mainfest_tool=no
   echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
@@ -8665,8 +11159,8 @@
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
 if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -8681,11 +11175,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
@@ -8693,11 +11188,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8708,11 +11207,11 @@
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf "%s\n" "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8721,11 +11220,12 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; 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_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
@@ -8733,11 +11233,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8748,11 +11252,11 @@
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -8760,8 +11264,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -8773,11 +11277,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
@@ -8785,11 +11290,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8800,11 +11309,11 @@
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf "%s\n" "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8813,11 +11322,12 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; 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_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
@@ -8825,11 +11335,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8840,11 +11354,11 @@
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf "%s\n" "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -8852,8 +11366,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -8865,11 +11379,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; 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_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
@@ -8877,11 +11392,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8892,11 +11411,11 @@
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf "%s\n" "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8905,11 +11424,12 @@
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; 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_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
@@ -8917,11 +11437,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8932,11 +11456,11 @@
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf "%s\n" "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -8944,8 +11468,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -8957,11 +11481,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; 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_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
@@ -8969,11 +11494,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8984,11 +11513,11 @@
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf "%s\n" "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8997,11 +11526,12 @@
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; 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_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
@@ -9009,11 +11539,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9024,11 +11558,11 @@
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf "%s\n" "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -9036,8 +11570,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -9049,11 +11583,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
@@ -9061,11 +11596,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9076,11 +11615,11 @@
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf "%s\n" "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9089,11 +11628,12 @@
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; 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_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
@@ -9101,11 +11641,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9116,11 +11660,11 @@
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf "%s\n" "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -9128,8 +11672,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -9164,11 +11708,12 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+printf %s "checking for -single_module linker flag... " >&6; }
+if test ${lt_cv_apple_cc_single_mod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_apple_cc_single_mod=no
       if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
@@ -9197,14 +11742,15 @@
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+printf %s "checking for -exported_symbols_list linker flag... " >&6; }
+if test ${lt_cv_ld_exported_symbols_list+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
@@ -9213,39 +11759,41 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_ld_exported_symbols_list=yes
-else
+else $as_nop
   lt_cv_ld_exported_symbols_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+printf %s "checking for -force_load linker flag... " >&6; }
+if test ${lt_cv_ld_force_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -9265,24 +11813,19 @@
         rm -rf conftest.dSYM
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf "%s\n" "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.012)
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -9337,20 +11880,14 @@
     esac
 }
 
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
-done
-
-
 
 
 func_stripname_cnf ()
@@ -9366,13 +11903,375 @@
 
 
 # Set options
+# Check whether --enable-static was given.
+if test ${enable_static+y}
+then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  enable_static=no
+fi
+
+
+
+
+
+
+
+enable_dlopen=yes
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf "%s\n" "$AS" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf "%s\n" "$ac_ct_AS" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf "%s\n" "$DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf "%s\n" "$OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
 
 
 
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -9390,7 +12289,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   enable_shared=yes
 fi
 
@@ -9405,7 +12304,8 @@
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
+if test ${with_pic+y}
+then :
   withval=$with_pic; lt_p=${PACKAGE-default}
     case $withval in
     yes|no) pic_mode=$withval ;;
@@ -9422,7 +12322,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   pic_mode=default
 fi
 
@@ -9434,7 +12334,8 @@
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
+if test ${enable_fast_install+y}
+then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -9452,7 +12353,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   enable_fast_install=yes
 fi
 
@@ -9466,11 +12367,12 @@
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix5-9*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
 
 # Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
+if test ${with_aix_soname+y}
+then :
   withval=$with_aix_soname; case $withval in
     aix|svr4|both)
       ;;
@@ -9479,18 +12381,19 @@
       ;;
     esac
     lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  if test ${lt_cv_with_aix_soname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_with_aix_soname=aix
 fi
 
     with_aix_soname=$lt_cv_with_aix_soname
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf "%s\n" "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -9572,11 +12475,12 @@
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+printf %s "checking for objdir... " >&6; }
+if test ${lt_cv_objdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -9587,17 +12491,15 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf "%s\n" "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
+printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -9618,8 +12520,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9643,11 +12545,12 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+printf %s "checking for ${ac_tool_prefix}file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -9696,11 +12599,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9709,11 +12612,12 @@
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+printf %s "checking for file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -9762,11 +12666,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9851,11 +12755,12 @@
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test ${lt_cv_prog_compiler_rtti_exceptions+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9886,8 +12791,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -10128,7 +13033,7 @@
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
@@ -10244,26 +13149,28 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10294,8 +13201,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -10323,11 +13230,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -10351,8 +13259,8 @@
    LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -10366,11 +13274,12 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -10413,19 +13322,20 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -10468,8 +13378,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -10477,19 +13387,19 @@
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -10501,8 +13411,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -10546,15 +13456,15 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -10606,7 +13516,7 @@
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -10718,6 +13628,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     interix3-9*)
@@ -10732,7 +13643,7 @@
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -10775,7 +13686,7 @@
 	  compiler_needs_object=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
@@ -10787,7 +13698,7 @@
 
         if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
@@ -10803,7 +13714,7 @@
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -10935,7 +13846,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -11057,21 +13968,23 @@
         if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -11086,7 +13999,7 @@
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
@@ -11110,21 +14023,23 @@
 	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -11139,7 +14054,7 @@
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
@@ -11202,12 +14117,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -11248,7 +14163,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -11289,8 +14204,8 @@
     output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -11324,7 +14239,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -11390,11 +14305,12 @@
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+printf %s "checking if $CC understands -b... " >&6; }
+if test ${lt_cv_prog_compiler__b+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler__b=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
@@ -11418,8 +14334,8 @@
    LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -11459,28 +14375,30 @@
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if test ${lt_cv_irix_exported_symbol+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   save_LDFLAGS=$LDFLAGS
 	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_irix_exported_symbol=yes
-else
+else $as_nop
   lt_cv_irix_exported_symbol=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
            LDFLAGS=$save_LDFLAGS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -11572,6 +14490,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     osf3*)
@@ -11760,8 +14679,8 @@
     fi
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf "%s\n" "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -11797,18 +14716,19 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+if test ${lt_cv_archive_cmds_need_lc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -11826,7 +14746,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -11840,8 +14760,8 @@
 	$RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -12000,8 +14920,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
   case $host_os in
@@ -12263,7 +15183,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
@@ -12273,14 +15193,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -12299,7 +15219,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -12336,7 +15256,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -12369,7 +15289,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -12562,9 +15482,10 @@
   shlibpath_overrides_runpath=no
 
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_shlibpath_overrides_runpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
@@ -12574,19 +15495,21 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+if ac_fn_c_try_link "$LINENO"
+then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
+then :
   lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
@@ -12818,8 +15741,8 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12940,8 +15863,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
@@ -12965,8 +15888,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf "%s\n" "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -13010,11 +15933,12 @@
 
   darwin*)
     # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13023,32 +15947,31 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
+else $as_nop
 
     lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
@@ -13068,14 +15991,16 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = xyes
+then :
   lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13084,41 +16009,42 @@
 /* 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 shl_load ();
 int
-main ()
+main (void)
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_shl_load=yes
-else
+else $as_nop
   ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
+else $as_nop
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13127,37 +16053,37 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+printf %s "checking for dlopen in -lsvld... " >&6; }
+if test ${ac_cv_lib_svld_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13166,37 +16092,37 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_svld_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+printf %s "checking for dld_link in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_dld_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13205,30 +16131,29 @@
 /* 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 dld_link ();
 int
-main ()
+main (void)
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_dld_link=yes
-else
+else $as_nop
   ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes
+then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
@@ -13267,11 +16192,12 @@
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+printf %s "checking whether a program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
@@ -13350,7 +16276,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13368,16 +16294,17 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf "%s\n" "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self_static+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
@@ -13456,7 +16383,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13474,8 +16401,8 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -13513,32 +16440,43 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+printf %s "checking whether stripping libraries is possible... " >&6; }
+if test -z "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&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: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      fi
+      ;;
+    *)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      ;;
+    esac
+  fi
 fi
 
 
@@ -13553,13 +16491,13 @@
 
 
   # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+printf %s "checking if libtool supports shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf "%s\n" "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13583,15 +16521,15 @@
     fi
     ;;
   esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf "%s\n" "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf "%s\n" "$enable_static" >&6; }
 
 
 
@@ -13613,36 +16551,32 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
+  if test ${ac_cv_prog_CXXCPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CXX needs to be expanded
+    for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -13654,10 +16588,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -13667,7 +16602,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -13679,29 +16615,24 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf "%s\n" "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -13713,10 +16644,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -13726,11 +16658,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -13866,17 +16799,18 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return, which upsets mingw
@@ -13905,15 +16839,16 @@
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -13942,18 +16877,19 @@
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -13964,8 +16900,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -14019,8 +16955,8 @@
     fi
 
     # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
     ld_shlibs_CXX=yes
     case $host_os in
       aix3*)
@@ -14158,21 +17094,23 @@
           if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath__CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -14187,7 +17125,7 @@
     lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath__CXX"; then
     lt_cv_aix_libpath__CXX=/usr/lib:/lib
@@ -14212,21 +17150,23 @@
 	    if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath__CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -14241,7 +17181,7 @@
     lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath__CXX"; then
     lt_cv_aix_libpath__CXX=/usr/lib:/lib
@@ -14306,8 +17246,8 @@
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  hardcode_libdir_flag_spec_CXX=' '
@@ -14398,11 +17338,11 @@
     output_verbose_link_cmd=func_echo_all
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
        if test yes != "$lt_cv_apple_cc_single_mod"; then
       archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 
   else
@@ -14437,6 +17377,7 @@
 	  emximp -o $lib $output_objdir/$libname.def'
 	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	enable_shared_with_static_runtimes_CXX=yes
+	file_list_spec_CXX='@'
 	;;
 
       dgux*)
@@ -14467,7 +17408,7 @@
         archive_cmds_need_lc_CXX=no
         ;;
 
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         ld_shlibs_CXX=yes
@@ -14604,7 +17545,7 @@
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
@@ -14744,13 +17685,13 @@
 	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    if test yes = "$supports_anon_versioning"; then
 	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
                 echo "local: *; };" >> $output_objdir/$libname.ver~
                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      no_undefined_flag_CXX=' -zdefs'
@@ -15092,8 +18033,8 @@
         ;;
     esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf "%s\n" "$ld_shlibs_CXX" >&6; }
     test no = "$ld_shlibs_CXX" && can_build_shared=no
 
     GCC_CXX=$GXX
@@ -15131,7 +18072,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -15407,7 +18348,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -15490,7 +18431,7 @@
 	    lt_prog_compiler_static_CXX='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      lt_prog_compiler_pic_CXX='-KPIC'
@@ -15612,26 +18553,28 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; }
 lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_works_CXX=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -15662,8 +18605,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
     case $lt_prog_compiler_pic_CXX in
@@ -15685,11 +18628,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -15713,8 +18657,8 @@
    LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
     :
@@ -15725,11 +18669,12 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o_CXX=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -15772,16 +18717,17 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o_CXX=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -15824,8 +18770,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
@@ -15833,19 +18779,19 @@
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -15854,8 +18800,8 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
@@ -15872,7 +18818,7 @@
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -15880,7 +18826,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
+    cl* | icl*)
       exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -15894,8 +18840,8 @@
     ;;
   esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf "%s\n" "$ld_shlibs_CXX" >&6; }
 test no = "$ld_shlibs_CXX" && can_build_shared=no
 
 with_gnu_ld_CXX=$with_gnu_ld
@@ -15922,18 +18868,19 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+if test ${lt_cv_archive_cmds_need_lc_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -15951,7 +18898,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc_CXX=no
@@ -15965,8 +18912,8 @@
 	$RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
       archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
       ;;
     esac
@@ -16035,8 +18982,8 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
 libname_spec='lib$name'
@@ -16227,7 +19174,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
       ;;
     mingw* | cegcc*)
@@ -16236,14 +19183,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -16262,7 +19209,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -16299,7 +19246,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -16331,7 +19278,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -16524,9 +19471,10 @@
   shlibpath_overrides_runpath=no
 
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_shlibpath_overrides_runpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
@@ -16536,19 +19484,21 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+if ac_fn_cxx_try_link "$LINENO"
+then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
+then :
   lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
@@ -16780,8 +19730,8 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -16845,8 +19795,8 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
    test -n "$runpath_var_CXX" ||
@@ -16870,8 +19820,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+printf "%s\n" "$hardcode_action_CXX" >&6; }
 
 if test relink = "$hardcode_action_CXX" ||
    test yes = "$inherit_rpath_CXX"; then
@@ -16933,113 +19883,193 @@
 
 
 
+have_libltdl=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl" >&5
+printf %s "checking for libltdl... " >&6; }
+if test "x${LTDLINCL}${LIBLTDL}" != x
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: variables given explicitly" >&5
+printf "%s\n" "variables given explicitly" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LTDLINCL (given explicitly)" >&5
+printf %s "checking LTDLINCL (given explicitly)... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LTDLINCL}" >&5
+printf "%s\n" "${LTDLINCL}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBLTDL (given explictly)" >&5
+printf %s "checking LIBLTDL (given explictly)... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LIBLTDL}" >&5
+printf "%s\n" "${LIBLTDL}" >&6; }
 
-if test "x${LTDLINCL}${LIBLTDL}" = "x"; then
-ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
-$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
-if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lltdl  $LIBS"
+  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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LTDLINCL"
+LIBS="$LIBS $LIBLTDL"
 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 lt_dlinit ();
+#include <stdlib.h> /* for NULL */
+#include <ltdl.h>   /* for lt_* */
+
 int
-main ()
+main (void)
 {
-return lt_dlinit ();
+
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ltdl_lt_dlinit=yes
-else
-  ac_cv_lib_ltdl_lt_dlinit=no
+if ac_fn_c_try_link "$LINENO"
+then :
+      have_libltdl=yes
+
+else $as_nop
+      as_fn_error $? "
+${PACKAGE} requires libltdl (a part of libtool)
+
+Please make sure that the proper development package is installed
+(may be called libltdl-dev, libtool-ltdl-devel, libltdl, etc.) and if
+the autodetection fails, that the LTDLINCL and LIBLTDL variables are
+set properly on the configure command line.
+" "$LINENO" 5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
-$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
-if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :
-  LTDLINCL=""
-LIBLTDL="-lltdl"
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+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
 
-$as_echo "#define HAVE_LTDL 1" >>confdefs.h
 
 
-else
-  as_fn_error $? "
-$PACKAGE requires the ltdl library, included with libtool
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetecting" >&5
+printf "%s\n" "autodetecting" >&6; }
+
+  if test "x$have_libltdl" = xno
+then :
+      LTDLINCL=""
+    LIBLTDL="-lltdl"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl at default location" >&5
+printf %s "checking for libltdl at default location... " >&6; }
+    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
 
-Please make sure that the proper development package is installed
-(libltdl-dev, libtool-ltdl-devel, etc.)
-" "$LINENO" 5
-fi
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LTDLINCL"
+LIBS="$LIBS $LIBLTDL"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-fi
+#include <stdlib.h> /* for NULL */
+#include <ltdl.h>   /* for lt_* */
 
+int
+main (void)
+{
 
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl flags" >&5
-$as_echo_n "checking for libltdl flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: set explicitly: ${LTDLINCL} ${LIBLTDL}" >&5
-$as_echo "set explicitly: ${LTDLINCL} ${LIBLTDL}" >&6; }
-fi
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+      have_libltdl=yes
+
+else $as_nop
+        { LTDLINCL=; unset LTDLINCL;}
+      { LIBLTDL=; unset LIBLTDL;}
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
 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
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that we can compile and link with libltdl" >&5
-$as_echo_n "checking that we can compile and link with libltdl... " >&6; }
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
+
+fi
+
+        for gp_prefix in /usr/local /usr/pkg `brew --prefix 2>/dev/null`; do
+    if test -d "$gp_prefix"
+then :
+        if test "x$have_libltdl" = xno
+then :
+          LTDLINCL="-I${gp_prefix}/include"
+        LIBLTDL="-L${gp_prefix}/lib -lltdl"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl at $gp_prefix" >&5
+printf %s "checking for libltdl at $gp_prefix... " >&6; }
+        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
+
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $LTDLINCL"
 LIBS="$LIBS $LIBLTDL"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h> /* for NULL */
 #include <ltdl.h>   /* for lt_* */
 
 int
-main ()
+main (void)
 {
-int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-as_fn_error $? "cannot compile and link against libltdl
-${PACKAGE_TARNAME} requires libltdl (the libtool dl* library),
-but cannot compile and link against it.
-Aborting.
-" "$LINENO" 5
+if ac_fn_c_try_link "$LINENO"
+then :
+
+          have_libltdl=yes
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
+          break
+
+else $as_nop
+            { LTDLINCL=; unset LTDLINCL;}
+          { LIBLTDL=; unset LIBLTDL;}
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 CPPFLAGS="$saved_CPPFLAGS"
 LIBS="$saved_LIBS"
@@ -17051,6 +20081,38 @@
 
 
 
+fi
+
+fi
+  done
+
+  if test "x$have_libltdl" = xyes
+then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LTDLINCL (autodetected)" >&5
+printf %s "checking LTDLINCL (autodetected)... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LTDLINCL}" >&5
+printf "%s\n" "${LTDLINCL}" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBLTDL (autodetected)" >&5
+printf %s "checking LIBLTDL (autodetected)... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LIBLTDL}" >&5
+printf "%s\n" "${LIBLTDL}" >&6; }
+
+else $as_nop
+      as_fn_error $? "
+${PACKAGE} requires libltdl (a part of libtool)
+
+Please make sure that the proper development package is installed
+(may be called libltdl-dev, libtool-ltdl-devel, libltdl, etc.) and if
+the autodetection fails, that the LTDLINCL and LIBLTDL variables are
+set properly on the configure command line.
+" "$LINENO" 5
+
+
+fi
+
+fi
+
+
 
 # report on compiler/libtool setup
 
@@ -17085,9 +20147,7 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CC "$CC"
-_ACEOF
+printf "%s\n" "#define HAVE_CC \"$CC\"" >>confdefs.h
 
 
 
@@ -17098,28 +20158,22 @@
 URL_GPHOTO_HOME="http://www.gphoto.org/"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_GPHOTO_HOME "http://www.gphoto.org/"
-_ACEOF
+printf "%s\n" "#define URL_GPHOTO_HOME \"http://www.gphoto.org/\"" >>confdefs.h
 
 
 
 URL_GPHOTO_PROJECT="https://github.com/gphoto"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_GPHOTO_PROJECT "https://github.com/gphoto"
-_ACEOF
+printf "%s\n" "#define URL_GPHOTO_PROJECT \"https://github.com/gphoto\"" >>confdefs.h
 
 
 
 
-URL_DIGICAM_LIST="http://www.teaser.fr/~hfiguiere/linux/digicam.html"
+URL_DIGICAM_LIST="http://gphoto.org/proj/libgphoto2/support.php"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_DIGICAM_LIST "http://www.teaser.fr/~hfiguiere/linux/digicam.html"
-_ACEOF
+printf "%s\n" "#define URL_DIGICAM_LIST \"http://gphoto.org/proj/libgphoto2/support.php\"" >>confdefs.h
 
 
 
@@ -17127,9 +20181,7 @@
 URL_JPHOTO_HOME="http://jphoto.sourceforge.net/"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_JPHOTO_HOME "http://jphoto.sourceforge.net/"
-_ACEOF
+printf "%s\n" "#define URL_JPHOTO_HOME \"http://jphoto.sourceforge.net/\"" >>confdefs.h
 
 
 
@@ -17137,9 +20189,7 @@
 URL_USB_MASSSTORAGE="http://www.linux-usb.org/USB-guide/x498.html"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_USB_MASSSTORAGE "http://www.linux-usb.org/USB-guide/x498.html"
-_ACEOF
+printf "%s\n" "#define URL_USB_MASSSTORAGE \"http://www.linux-usb.org/USB-guide/x498.html\"" >>confdefs.h
 
 
 
@@ -17147,9 +20197,7 @@
 MAIL_GPHOTO_DEVEL="<gphoto-devel@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_DEVEL "<gphoto-devel@lists.sourceforge.net>"
-_ACEOF
+printf "%s\n" "#define MAIL_GPHOTO_DEVEL \"<gphoto-devel@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
@@ -17157,9 +20205,7 @@
 MAIL_GPHOTO_USER="<gphoto-user@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_USER "<gphoto-user@lists.sourceforge.net>"
-_ACEOF
+printf "%s\n" "#define MAIL_GPHOTO_USER \"<gphoto-user@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
@@ -17167,9 +20213,7 @@
 MAIL_GPHOTO_TRANSLATION="<gphoto-translation@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_TRANSLATION "<gphoto-translation@lists.sourceforge.net>"
-_ACEOF
+printf "%s\n" "#define MAIL_GPHOTO_TRANSLATION \"<gphoto-translation@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
@@ -17182,86 +20226,93 @@
 
 
 
-ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
-
-GETTEXT_PACKAGE="${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}"
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
-sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = The gPhoto Team|"
-
-if test -n "$PACKAGE_BUGREPORT"; then
-   sed_mb="${PACKAGE_BUGREPORT}"
-else
-   as_fn_error $? "
-*** Your configure.{ac,in} is wrong.
-*** Either define PACKAGE_BUGREPORT (by using the 4-parameter AC INIT syntax)
-*** or give GP_GETTEXT_HACK the third parameter.
-***
-" "$LINENO" 5
-fi
-
-sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
-# Not so sure whether this hack is all *that* evil...
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for po/Makevars requiring hack" >&5
-$as_echo_n "checking for po/Makevars requiring hack... " >&6; }
-if test -f "${srcdir}/po/Makevars.template"; then
-   sed "$sed_cmds" < "${srcdir}/po/Makevars.template" > "${srcdir}/po/Makevars"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, done." >&5
-$as_echo "yes, done." >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\""'${localedir}'"\\\""
 
+GP_GETTEXT_SETUP_MK="gp-gettext-setup.mk"
+cat >${GP_GETTEXT_SETUP_MK} <<EOF
 
+# ${GP_GETTEXT_SETUP_MK} autogenerated by GP_GETTEXT_SETUP_INIT
 
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
+distclean-local: distclean-local-gp-gettext-setup
+.PHONY: distclean-local-gp-gettext-setup
+distclean-local-gp-gettext-setup:
+	-rm -f ${GP_GETTEXT_SETUP_MK}
+
+all-local: all-local-gp-gettext-setup
+.PHONY: all-local-gp-gettext-setup
+all-local-gp-gettext-setup:
+	@:
+EOF
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation text domain symbol" >&5
+printf %s "checking translation text domain symbol... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GETTEXT_PACKAGE_LIBGPHOTO2" >&5
+printf "%s\n" "GETTEXT_PACKAGE_LIBGPHOTO2" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation text domain value" >&5
+printf %s "checking translation text domain value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}" >&5
+printf "%s\n" "${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation subdirectory" >&5
+printf %s "checking translation subdirectory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: po" >&5
+printf "%s\n" "po" >&6; }
+
+printf "%s\n" "#define GETTEXT_PACKAGE_LIBGPHOTO2 \"${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}\"" >>confdefs.h
+
+GETTEXT_PACKAGE_LIBGPHOTO2=${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}
+
+cat >>${GP_GETTEXT_SETUP_MK} <<EOF
+	@set -ex; \\
+	MAKEVARS_FILE="\$\$(test -f 'po/Makevars' || echo '\$(srcdir)/')po/Makevars"; \\
+	MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \\{0,\\}= \\{0,\\}//p' "\$\$MAKEVARS_FILE")"; \\
+	MAKE_TIME_DOMAIN="\$(GETTEXT_PACKAGE_LIBGPHOTO2)"; \\
+	echo "  MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \\
+	echo "  GETTEXT_PACKAGE_LIBGPHOTO2=\$(GETTEXT_PACKAGE_LIBGPHOTO2)"; \\
+	if test "x\$\$MAKEVARS_DOMAIN" = "x\$(GETTEXT_PACKAGE_LIBGPHOTO2)"; then \\
+	     echo "Good: Matching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2))"; \\
+	     true; \\
+	elif test "x\$\$USE_NLS" = xyes; then \\
+	     echo "Error: Mismatching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     false; \\
+	else \\
+	     echo "Warning: Mismatching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     true; \\
+	fi
+EOF
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+printf %s "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
+if test ${enable_nls+y}
+then :
   enableval=$enable_nls; USE_NLS=$enableval
-else
+else $as_nop
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
 
 
 
 
+      GETTEXT_MACRO_VERSION=0.19
+
+
 
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -17280,11 +20331,12 @@
 
 # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGFMT" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
@@ -17296,7 +20348,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -17311,20 +20364,21 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf "%s\n" "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GMSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GMSGFMT in
   \\/* | ?:\\/*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
@@ -17334,11 +20388,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$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
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17351,28 +20409,38 @@
 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; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf "%s\n" "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
+    case `$MSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -17391,11 +20459,12 @@
 
 # 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_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XGETTEXT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$XGETTEXT" in
   \\/* | ?:\\/*)
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
@@ -17407,7 +20476,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -17422,28 +20492,33 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf "%s\n" "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
     rm -f messages.po
 
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -17462,11 +20537,12 @@
 
 # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGMERGE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGMERGE" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
@@ -17478,7 +20554,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
             ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
             break 2
           fi
@@ -17492,39 +20569,22 @@
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf "%s\n" "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
+        test -n "$localedir" || localedir='${datadir}/locale'
 
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
 
-  ac_config_commands="$ac_config_commands default-1"
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
 
 
 
@@ -17544,31 +20604,33 @@
   prefix="$acl_save_prefix"
 
 
+
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -17578,12 +20640,12 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    \\/* | A-Za-z:\\/*)
+    \\/* | ?:\\/*)
       re_direlt='/^/^/*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -17597,33 +20659,37 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${acl_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -17631,37 +20697,43 @@
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${acl_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+printf %s "checking for shared library run path origin... " >&6; }
+if test ${acl_cv_rpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
@@ -17670,19 +20742,22 @@
     acl_cv_rpath=done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf "%s\n" "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
   enableval=$enable_rpath; :
-else
+else $as_nop
   enable_rpath=yes
 fi
 
@@ -17690,6 +20765,77 @@
 
 
 
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+printf %s "checking for 64-bit host... " >&6; }
+if test ${gl_cv_solaris_64bit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1
+then :
+  gl_cv_solaris_64bit=yes
+else $as_nop
+  gl_cv_solaris_64bit=no
+fi
+rm -rf conftest*
+
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+printf "%s\n" "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
+
 
 
 
@@ -17708,7 +20854,8 @@
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
+if test ${with_libiconv_prefix+y}
+then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -17728,7 +20875,11 @@
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 
@@ -17737,6 +20888,8 @@
       LIBICONV=
   LTLIBICONV=
   INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -17754,7 +20907,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -17770,22 +20923,52 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
@@ -17801,21 +20984,44 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -17826,7 +21032,9 @@
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -17839,10 +21047,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -17874,7 +21082,7 @@
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -17891,8 +21099,18 @@
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -17902,7 +21120,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -17941,12 +21159,14 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -18043,21 +21263,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -18086,17 +21306,97 @@
 
 
 
-  { $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
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main (void)
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else $as_nop
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+printf %s "checking for CFLocaleCopyCurrent... " >&6; }
+if test ${gt_cv_func_CFLocaleCopyCurrent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main (void)
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else $as_nop
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -18105,45 +21405,73 @@
   LTLIBINTL=
   POSUB=
 
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
 
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
 
-
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if ${gt_cv_func_gnugettext1_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+printf %s "checking for GNU gettext in libc... " >&6; }
+if eval test \${$gt_func_gnugettext_libc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libc=yes
-else
-  gt_cv_func_gnugettext1_libc=no
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$gt_func_gnugettext_libc=yes"
+else $as_nop
+  eval "$gt_func_gnugettext_libc=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5
-$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
 
 
@@ -18174,72 +21502,224 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes
+then :
+
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\342\202\254"; /* EURO SIGN */
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\263";
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304";
+        static char buf2 = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf1 != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf50;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  am_cv_func_iconv_works=yes
+else $as_nop
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -18251,6 +21731,11 @@
 
 
 
+
+
+
+
+
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -18266,7 +21751,8 @@
 
 
 # Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
+if test ${with_libintl_prefix+y}
+then :
   withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -18286,7 +21772,11 @@
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 
@@ -18295,6 +21785,8 @@
       LIBINTL=
   LTLIBINTL=
   INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -18312,7 +21804,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -18328,22 +21820,52 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
@@ -18359,21 +21881,44 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -18384,7 +21929,9 @@
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -18397,10 +21944,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -18432,7 +21979,7 @@
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -18449,8 +21996,18 @@
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -18460,7 +22017,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -18499,12 +22056,14 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -18601,21 +22160,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -18627,78 +22186,97 @@
     done
   fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if ${gt_cv_func_gnugettext1_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+
+
+
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+printf %s "checking for GNU gettext in libintl... " >&6; }
+if eval test \${$gt_func_gnugettext_libintl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libintl=yes
-else
-  gt_cv_func_gnugettext1_libintl=no
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$gt_func_gnugettext_libintl=yes"
+else $as_nop
+  eval "$gt_func_gnugettext_libintl=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5
-$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
         fi
 
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -18710,25 +22288,33 @@
 
 
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+printf %s "checking whether to use NLS... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -18736,18 +22322,18 @@
     else
       gt_source="included intl directory"
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf "%s\n" "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+printf %s "checking how to link with libintl... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf "%s\n" "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -18774,10 +22360,10 @@
       fi
 
 
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -18797,287 +22383,6 @@
 
 
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$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
-
-  # 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 as_fn_executable_p "$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  \\/* | ?:\\/*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$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
-
-    rm -f messages.po
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
-
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
-
-  ac_config_commands="$ac_config_commands default-2"
-
-
-
-
-
-
 
           am_save_CPPFLAGS="$CPPFLAGS"
 
@@ -19104,72 +22409,224 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes
+then :
+
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\342\202\254"; /* EURO SIGN */
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\263";
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304";
+        static char buf2 = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf1 != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf50;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  am_cv_func_iconv_works=yes
+else $as_nop
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -19179,11 +22636,12 @@
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
-$as_echo_n "checking for iconv declaration... " >&6; }
-    if ${am_cv_proto_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+printf %s "checking for iconv declaration... " >&6; }
+    if test ${am_cv_proto_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19194,47 +22652,42 @@
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   am_cv_proto_iconv_arg1=""
-else
+else $as_nop
   am_cv_proto_iconv_arg1="const"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-$as_echo "${ac_t:-
-         }$am_cv_proto_iconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
+         $am_cv_proto_iconv" >&5
+printf "%s\n" "
+         $am_cv_proto_iconv" >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
-
-  fi
+printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h
 
 
+  fi
 
 
-if test "x${BUILD_INCLUDED_LIBINTL}" = "xyes"; then
-   AM_CFLAGS="${AM_CFLAGS} -I\$(top_srcdir)/intl"
-fi
 
 gp_config_msg_len="$(expr "Use translations" : '.*')"
 if test "$gp_config_msg_len" -ge "$gp_config_len"; then
@@ -19245,41 +22698,26 @@
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${USE_NLS}
 "
 
-if test "x$USE_NLS" = "xyes" && test "${BUILD_INCLUDED_LIBINTL}"; then
-
-gp_config_msg_len="$(expr "Use included libintl" : '.*')"
-if test "$gp_config_msg_len" -ge "$gp_config_len"; then
-	gp_config_msg_lhs="$(expr "Use included libintl" : "$.\{0,${gp_config_len3}\}$")..:"
-else
-	gp_config_msg_lhs="$(expr "Use included libintl:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
-fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${BUILD_INCLUDED_LIBINTL}
-"
-
-fi
-
 
 # same trick as with libdl:
 # if gettext() doesn't require linking against libintl,
 # we don't have to check for gettext in libintl. Otherwise
 # we may even require libintl.
 
-localedir="\$(datadir)/locale"
-
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+printf %s "checking for special C compiler options needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
@@ -19293,44 +22731,47 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test ${ac_cv_sys_file_offset_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19339,22 +22780,23 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
@@ -19363,43 +22805,43 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
+printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test ${ac_cv_sys_large_files+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19408,22 +22850,23 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
@@ -19432,86 +22875,96 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf "%s\n" "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
+printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm .symver support" >&5
-$as_echo_n "checking for asm .symver support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm .symver support" >&5
+printf %s "checking for asm .symver support... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+    void f1(void);
+    void f1() {}
+    void f2(void);
+    void f2() {}
+    asm(".symver f1, f@VER1");
+    asm(".symver f2, f@@VER2");
+
 int
-main ()
+main (void)
 {
 
-		int f1() { }
-		int f2() { }
-		asm(".symver f1, f@VER1");
-		asm(".symver f2, f@@VER2");
-		int main(int argc, char **argv) { }
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  have_asm_symver=yes
 
+printf "%s\n" "#define HAVE_ASM_SYMVERS 1" >>confdefs.h
 
-$as_echo "#define HAVE_ASM_SYMVERS 1" >>confdefs.h
 
-	VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2.ver"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  have_asm_symver=no
 
-	VERSIONMAPLDFLAGS=""
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -libs" >&5
-$as_echo_n "checking for main in -libs... " >&6; }
-if ${ac_cv_lib_ibs_main+:} false; then :
-  $as_echo_n "(cached) " >&6
+ if test "x$have_asm_symver" = xyes; then
+  HAVE_ASM_SYMVER_TRUE=
+  HAVE_ASM_SYMVER_FALSE='#'
 else
+  HAVE_ASM_SYMVER_TRUE='#'
+  HAVE_ASM_SYMVER_FALSE=
+fi
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -libs" >&5
+printf %s "checking for main in -libs... " >&6; }
+if test ${ac_cv_lib_ibs_main+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-libs  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19519,110 +22972,79 @@
 
 
 int
-main ()
+main (void)
 {
 return main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ibs_main=yes
-else
+else $as_nop
   ac_cv_lib_ibs_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ibs_main" >&5
-$as_echo "$ac_cv_lib_ibs_main" >&6; }
-if test "x$ac_cv_lib_ibs_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIBS 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ibs_main" >&5
+printf "%s\n" "$ac_cv_lib_ibs_main" >&6; }
+if test "x$ac_cv_lib_ibs_main" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBIBS 1" >>confdefs.h
 
   LIBS="-libs $LIBS"
 
 fi
 
 
-
-LIBJPEG=""
-libjpeg_msg="no"
-
-
-# Check whether --with-jpeg was given.
-if test "${with_jpeg+set}" = set; then :
-  withval=$with_jpeg;
-fi
-
-if test "x$with_jpeg" != "xno"; then :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in -ljpeg" >&5
-$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_start_decompress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
+printf %s "checking for sqrt in -lm... " >&6; }
+if test ${ac_cv_lib_m_sqrt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg  $LIBS"
+LIBS="-lm  $LIBS"
 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 jpeg_start_decompress ();
+char sqrt ();
 int
-main ()
+main (void)
 {
-return jpeg_start_decompress ();
+return sqrt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jpeg_jpeg_start_decompress=yes
-else
-  ac_cv_lib_jpeg_jpeg_start_decompress=no
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_m_sqrt=yes
+else $as_nop
+  ac_cv_lib_m_sqrt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = xyes; then :
-
-		ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
+printf "%s\n" "$ac_cv_lib_m_sqrt" >&6; }
+if test "x$ac_cv_lib_m_sqrt" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
 
-
-$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
-
-			LIBJPEG="-ljpeg"
-			libjpeg_msg="yes"
+  LIBS="-lm $LIBS"
 
 fi
 
 
 
-fi
-
-
-fi
-
-gp_config_msg_len="$(expr "JPEG mangling support" : '.*')"
-if test "$gp_config_msg_len" -ge "$gp_config_len"; then
-	gp_config_msg_lhs="$(expr "JPEG mangling support" : "$.\{0,${gp_config_len3}\}$")..:"
-else
-	gp_config_msg_lhs="$(expr "JPEG mangling support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
-fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${libjpeg_msg}
-"
 
 
 
@@ -19636,11 +23058,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -19650,11 +23073,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19666,11 +23093,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -19679,11 +23106,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -19693,11 +23121,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19709,11 +23141,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -19721,8 +23153,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -19734,19 +23166,527 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dynamic library extension" >&5
-$as_echo_n "checking for dynamic library extension... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with libjpeg" >&5
+printf %s "checking whether to build with libjpeg... " >&6; }
+
+# Check whether --with-jpeg was given.
+if test ${with_jpeg+y}
+then :
+  withval=$with_jpeg;   case $with_jpeg in #(
+  autodetect) :
+    with_jpeg=auto ;; #(
+  *) :
+     ;;
+esac
+
+else $as_nop
+    with_jpeg=auto
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_jpeg" >&5
+printf "%s\n" "$with_jpeg" >&6; }
+case $with_jpeg in #(
+  no) :
+
+  # libjpeg explictly disabled from command line
+
+gp_config_msg_len="$(expr "JPEG mangling support" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "JPEG mangling support" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "JPEG mangling support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} no (disabled by --without-jpeg)
+"
+
+ ;; #(
+  auto|yes) :
+
+    have_libjpeg=no
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg via variables" >&5
+printf %s "checking for libjpeg via variables... " >&6; }
+  if test "x$LIBJPEG_LIBS$LIBJPEG_CFLAGS" != x
+then :
+      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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
+LIBS="$LIBS $LIBJPEG_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+/* jpeglib.h fails to include all required system headers, so jpeglib.h
+ * must be included after stddef.h (size_t) and stdio.h (FILE).
+ */
+#include <jpeglib.h>
+
+int main(int argc, char **argv)
+{
+  j_decompress_ptr cinfo = NULL;
+  (void) argc;
+  (void) argv;
+  /* Running this will give a segfault */
+  if (jpeg_start_decompress(cinfo)) {
+    printf("true\n");
+  } else {
+    printf("false\n");
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found and works" >&5
+printf "%s\n" "found and works" >&6; }
+      have_libjpeg=yes
+
+else $as_nop
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found but fails to link" >&5
+printf "%s\n" "found but fails to link" >&6; }
+      as_fn_error $? "
+libjpeg not found despite LIBJPEG_CFLAGS and/or LIBJPEG_LIBS being set.
+" "$LINENO" 5
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+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
+
+
+
+else $as_nop
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+
+  if test "x$have_libjpeg" = xno
+then :
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBJPEG" >&5
+printf %s "checking for LIBJPEG... " >&6; }
+
+if test -n "$LIBJPEG_CFLAGS"; then
+    pkg_cv_LIBJPEG_CFLAGS="$LIBJPEG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBJPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBJPEG_LIBS"; then
+    pkg_cv_LIBJPEG_LIBS="$LIBJPEG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBJPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBJPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libjpeg" 2>&1`
+        else
+	        LIBJPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libjpeg" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBJPEG_PKG_ERRORS" >&5
+
+	      LIBJPEG_LIBS="-ljpeg"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg at default location" >&5
+printf %s "checking for libjpeg at default location... " >&6; }
+      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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
+LIBS="$LIBS $LIBJPEG_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+/* jpeglib.h fails to include all required system headers, so jpeglib.h
+ * must be included after stddef.h (size_t) and stdio.h (FILE).
+ */
+#include <jpeglib.h>
+
+int main(int argc, char **argv)
+{
+  j_decompress_ptr cinfo = NULL;
+  (void) argc;
+  (void) argv;
+  /* Running this will give a segfault */
+  if (jpeg_start_decompress(cinfo)) {
+    printf("true\n");
+  } else {
+    printf("false\n");
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+          have_libjpeg=yes
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else $as_nop
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { LIBJPEG_LIBS=; unset LIBJPEG_LIBS;}
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+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
+
+
+
+elif test $pkg_failed = untried; then
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	      LIBJPEG_LIBS="-ljpeg"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg at default location" >&5
+printf %s "checking for libjpeg at default location... " >&6; }
+      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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
+LIBS="$LIBS $LIBJPEG_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+/* jpeglib.h fails to include all required system headers, so jpeglib.h
+ * must be included after stddef.h (size_t) and stdio.h (FILE).
+ */
+#include <jpeglib.h>
+
+int main(int argc, char **argv)
+{
+  j_decompress_ptr cinfo = NULL;
+  (void) argc;
+  (void) argv;
+  /* Running this will give a segfault */
+  if (jpeg_start_decompress(cinfo)) {
+    printf("true\n");
+  } else {
+    printf("false\n");
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+          have_libjpeg=yes
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else $as_nop
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { LIBJPEG_LIBS=; unset LIBJPEG_LIBS;}
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+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
+
+
+
+else
+	LIBJPEG_CFLAGS=$pkg_cv_LIBJPEG_CFLAGS
+	LIBJPEG_LIBS=$pkg_cv_LIBJPEG_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+	      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linking with libjpeg works" >&5
+printf %s "checking linking with libjpeg works... " >&6; }
+      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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
+LIBS="$LIBS $LIBJPEG_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+/* jpeglib.h fails to include all required system headers, so jpeglib.h
+ * must be included after stddef.h (size_t) and stdio.h (FILE).
+ */
+#include <jpeglib.h>
+
+int main(int argc, char **argv)
+{
+  j_decompress_ptr cinfo = NULL;
+  (void) argc;
+  (void) argv;
+  /* Running this will give a segfault */
+  if (jpeg_start_decompress(cinfo)) {
+    printf("true\n");
+  } else {
+    printf("false\n");
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+          have_libjpeg=yes
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else $as_nop
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+
+fi
+
+
+  if test "x$have_libjpeg" = xno
+then :
+      if test "x$with_jpeg" = xyes
+then :
+        as_fn_error $? "
+libjpeg has been requested explicitly (--with-jpeg=yes), but could not be
+found and made to work.
+" "$LINENO" 5
+
+else $as_nop
+
+gp_config_msg_len="$(expr "JPEG mangling support" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "JPEG mangling support" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "JPEG mangling support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${have_libjpeg} (could not find working libjpeg)
+"
+
+
+fi
+
+else $as_nop
+
+printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h
+
+
+gp_config_msg_len="$(expr "JPEG mangling support" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "JPEG mangling support" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "JPEG mangling support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${have_libjpeg}
+"
+
+
+fi
+ ;; #(
+  *) :
+    as_fn_error $? "
+Unhandled value given to --with-jpeg: ${with_jpeg}
+
+To allow the auto-detection of libjpeg, set up the pkg-config related
+environment variables (PKG_CONFIG, PKG_CONFIG_PATH, PKG_CONFIG_LIBDIR)
+or have libjpeg installed in the standard location to include from and
+link to.
+
+To force specific compile and link flags for libjpeg, set the
+environment variables LIBJPEG_CFLAGS and $LIBJPEG_LIBS accordingly.
+" "$LINENO" 5
+ ;;
+esac
+
+
+
+LIBWS232_CFLAGS=""
+LIBWS232_LIBS=""
+libws232_msg="no"
+
+
+
+# Check whether --with-ws232 was given.
+if test ${with_ws232+y}
+then :
+  withval=$with_ws232;
+fi
+
+if test "x$with_ws232" != "xno"
+then :
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WSAStartup in -lws2_32" >&5
+printf %s "checking for WSAStartup in -lws2_32... " >&6; }
+if test ${ac_cv_lib_ws2_32_WSAStartup+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lws2_32  $LIBS"
+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.  */
+char WSAStartup ();
+int
+main (void)
+{
+return WSAStartup ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_ws2_32_WSAStartup=yes
+else $as_nop
+  ac_cv_lib_ws2_32_WSAStartup=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_WSAStartup" >&5
+printf "%s\n" "$ac_cv_lib_ws2_32_WSAStartup" >&6; }
+if test "x$ac_cv_lib_ws2_32_WSAStartup" = xyes
+then :
+  		ac_fn_c_check_header_compile "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock_h" = xyes
+then :
+
+printf "%s\n" "#define HAVE_LIBWS232 1" >>confdefs.h
+
+			LIBWS232_LIBS="-lws2_32"
+			libws232_msg="yes"
+
+fi
+
+
+fi
+
+
+fi
+
+gp_config_msg_len="$(expr "Winsocket support (for PTP/IP)" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "Winsocket support (for PTP/IP)" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "Winsocket support (for PTP/IP):${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${libws232_msg}
+"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dynamic library extension" >&5
+printf %s "checking for dynamic library extension... " >&6; }
 soext=""
 case "$host" in
 	*linux*)	soext=".so" ;;
@@ -19761,17 +23701,17 @@
 esac
 if test "x$soext" = "x"; then
 	soext=".so"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
-$as_echo "${soext}" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
+printf "%s\n" "${soext}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 Host system \"${host}\" not recognized, defaulting to \"${soext}\".
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 Host system \"${host}\" not recognized, defaulting to \"${soext}\".
 " >&2;}
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
-$as_echo "${soext}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
+printf "%s\n" "${soext}" >&6; }
 fi
 
 
@@ -19785,8 +23725,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 to use" >&5
-$as_echo_n "checking for libxml-2.0 to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 to use" >&5
+printf %s "checking for libxml-2.0 to use... " >&6; }
 REQUIREMENTS_FOR_LIBXML2="libxml-2.0 >= 2.0"
 userdef_LIBXML2=no
 have_LIBXML2=no
@@ -19795,7 +23735,8 @@
 				try_LIBXML2=auto
 
 # Check whether --with-libxml-2.0 was given.
-if test "${with_libxml_2_0+set}" = set; then :
+if test ${with_libxml_2_0+y}
+then :
   withval=$with_libxml_2_0; try_LIBXML2="$withval"
 fi
 
@@ -19803,8 +23744,8 @@
               REQUIREMENTS_FOR_LIBXML2=
 	fi
 	if test "x${try_LIBXML2}" = "xauto"; then try_LIBXML2=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBXML2}" >&5
-$as_echo "${try_LIBXML2}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBXML2}" >&5
+printf "%s\n" "${try_LIBXML2}" >&6; }
 		if test "x${try_LIBXML2}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -19812,17 +23753,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0" >&5
-$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
+printf %s "checking for LIBXML2... " >&6; }
 
 if test -n "$LIBXML2_CFLAGS"; then
     pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -19836,10 +23777,10 @@
     pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -19853,8 +23794,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -19871,31 +23812,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
 	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBXML2=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBXML2}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 config program" >&5
-$as_echo_n "checking libxml-2.0 config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: xml2-config" >&5
-$as_echo "xml2-config" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 config program" >&5
+printf %s "checking libxml-2.0 config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: xml2-config" >&5
+printf "%s\n" "xml2-config" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy xml2-config; 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_LIBXML2_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBXML2_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBXML2_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBXML2_CONFIG_PROG="$LIBXML2_CONFIG_PROG" # Let the user override the test with a path.
@@ -19905,11 +23847,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBXML2_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBXML2_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19921,19 +23867,19 @@
 fi
 LIBXML2_CONFIG_PROG=$ac_cv_path_LIBXML2_CONFIG_PROG
 if test -n "$LIBXML2_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CONFIG_PROG" >&5
-$as_echo "$LIBXML2_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CONFIG_PROG" >&5
+printf "%s\n" "$LIBXML2_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBXML2_CONFIG_PROG}" &&
 				test "${LIBXML2_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 version according to xml2-config" >&5
-$as_echo_n "checking for libxml-2.0 version according to xml2-config... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 version according to xml2-config" >&5
+printf %s "checking for libxml-2.0 version according to xml2-config... " >&6; }
 								_LIBXML2_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBXML2_REQ_1="2"
@@ -19946,8 +23892,8 @@
 				_LIBXML2_VER_2="$(echo "${_LIBXML2_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBXML2_VER_3="$(echo "${_LIBXML2_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBXML2_VER_4="$(echo "${_LIBXML2_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBXML2_VERSION}" >&5
-$as_echo "${_LIBXML2_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBXML2_VERSION}" >&5
+printf "%s\n" "${_LIBXML2_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBXML2_VER_1}" "${_LIBXML2_COMPN}" "${_LIBXML2_REQ_1}"; then _tmp=true;
 				elif test "${_LIBXML2_VER_2}" "${_LIBXML2_COMPN}" "${_LIBXML2_REQ_2}"; then _tmp=true;
@@ -19955,28 +23901,28 @@
 				elif test "x${_LIBXML2_VER_4}" = "x" && test "x${_LIBXML2_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBXML2_VER_4}" "${_LIBXML2_COMPN}" "${_LIBXML2_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libxml-2.0 version is matching requirement >= 2.0" >&5
-$as_echo_n "checking if libxml-2.0 version is matching requirement >= 2.0... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libxml-2.0 version is matching requirement >= 2.0" >&5
+printf %s "checking if libxml-2.0 version is matching requirement >= 2.0... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement libxml-2.0 >= 2.0 not met. Found: ${_LIBXML2_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 parameters from xml2-config" >&5
-$as_echo_n "checking for libxml-2.0 parameters from xml2-config... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 parameters from xml2-config" >&5
+printf %s "checking for libxml-2.0 parameters from xml2-config... " >&6; }
 				LIBXML2_LIBS="$(${LIBXML2_CONFIG_PROG} --libs || echo "*error*")"
 				LIBXML2_CFLAGS="$(${LIBXML2_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBXML2_LIBS}" = "*error*" ||
 					test "x${LIBXML2_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBXML2=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -19986,32 +23932,32 @@
 	else
 		# We've been given a prefix to look in for library libxml-2.0.
 		# We start looking for libxml-2.0.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0.la file in ${try_LIBXML2}" >&5
-$as_echo_n "checking for libxml-2.0.la file in ${try_LIBXML2}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0.la file in ${try_LIBXML2}" >&5
+printf %s "checking for libxml-2.0.la file in ${try_LIBXML2}... " >&6; }
 		if test -f "${try_LIBXML2}/lib/libxml-2.0.la"; then
 			LIBXML2_LIBS="${try_LIBXML2}/lib/libxml-2.0.la"
 			LIBXML2_CFLAGS="-I${try_LIBXML2}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBXML2_LIBS (good)" >&5
-$as_echo "libtool file $LIBXML2_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBXML2_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBXML2_LIBS (good)" >&6; }
 			have_LIBXML2=yes
 		elif test -f "${try_LIBXML2}/lib64/libxml-2.0.la"; then # HACK
 			LIBXML2_LIBS="${try_LIBXML2}/lib64/libxml-2.0.la"
 			LIBXML2_CFLAGS="-I${try_LIBXML2}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBXML2_LIBS (good)" >&5
-$as_echo "libtool file $LIBXML2_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBXML2_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBXML2_LIBS (good)" >&6; }
 			have_LIBXML2=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBXML2" >&5
-$as_echo "wild guess that something is in $try_LIBXML2" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBXML2" >&5
+printf "%s\n" "wild guess that something is in $try_LIBXML2" >&6; }
 			LIBXML2_LIBS="-L${try_LIBXML2}/lib -l$(echo "libxml-2.0" | sed 's/^lib//')"
 			LIBXML2_CFLAGS="-I${try_LIBXML2}/include"
 			have_LIBXML2=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file libxml-2.0.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file libxml-2.0.la could not be found.
 *   We may be linking against the WRONG library.
@@ -20019,13 +23965,13 @@
 		fi
 	fi
 elif test "x${LIBXML2_LIBS}" != "x" && test "x${LIBXML2_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBXML2=yes
 	have_LIBXML2=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -20038,19 +23984,19 @@
 if test "x${have_LIBXML2}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBXML2_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxml_parser_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxml_parser_h" = xyes
+then :
   have_LIBXML2=yes
-else
+else $as_nop
   have_LIBXML2=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBXML2}" = "xno" && test "x${have_LIBXML2}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function xmlFirstElementChild in libxml-2.0" >&5
-$as_echo_n "checking for function xmlFirstElementChild in libxml-2.0... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function xmlFirstElementChild in libxml-2.0" >&5
+printf %s "checking for function xmlFirstElementChild in libxml-2.0... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBXML2_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20059,28 +24005,26 @@
 /* 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 xmlFirstElementChild ();
 int
-main ()
+main (void)
 {
 return xmlFirstElementChild ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBXML2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBXML2}" >&5
-$as_echo "${have_LIBXML2}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBXML2}" >&5
+printf "%s\n" "${have_LIBXML2}" >&6; }
 fi
  if test "x$have_LIBXML2" = "xyes"; then
   HAVE_LIBXML2_TRUE=
@@ -20092,7 +24036,7 @@
 
 if test "x$have_LIBXML2" = "xyes"; then
 
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "libxml-2.0" : '.*')"
@@ -20103,14 +24047,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 library flags" >&5
-$as_echo_n "checking libxml-2.0 library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBXML2_LIBS}\"" >&5
-$as_echo "\"${LIBXML2_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 cpp flags" >&5
-$as_echo_n "checking libxml-2.0 cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBXML2_CFLAGS}\"" >&5
-$as_echo "\"${LIBXML2_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 library flags" >&5
+printf %s "checking libxml-2.0 library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBXML2_LIBS}\"" >&5
+printf "%s\n" "\"${LIBXML2_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libxml-2.0 cpp flags" >&5
+printf %s "checking libxml-2.0 cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBXML2_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBXML2_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBXML2=
 
@@ -20137,6 +24081,371 @@
 
 
 # ----------------------------------------------------------------------
+# GP_CHECK_LIBRARY(LIBCURL,libcurl,>= 7.1,
+#                    curl/curl.h,curl_easy_init,
+#                    ...,...,default-on)
+# https://www.curl.org
+
+# ----------------------------------------------------------------------
+# Use _CFLAGS and _LIBS given to configure.
+# This makes it possible to set these vars in a configure script
+# and AC_CONFIG_SUBDIRS this configure.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl to use" >&5
+printf %s "checking for libcurl to use... " >&6; }
+REQUIREMENTS_FOR_LIBCURL="libcurl >= 7.1"
+userdef_LIBCURL=no
+have_LIBCURL=no
+if test "x${LIBCURL_LIBS}" = "x" && test "x${LIBCURL_CFLAGS}" = "x"; then
+	# define --with/--without argument
+				try_LIBCURL=auto
+
+# Check whether --with-libcurl was given.
+if test ${with_libcurl+y}
+then :
+  withval=$with_libcurl; try_LIBCURL="$withval"
+fi
+
+	if test "x${try_LIBCURL}" = "xno"; then
+              REQUIREMENTS_FOR_LIBCURL=
+	fi
+	if test "x${try_LIBCURL}" = "xauto"; then try_LIBCURL=autodetect; fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBCURL}" >&5
+printf "%s\n" "${try_LIBCURL}" >&6; }
+		if test "x${try_LIBCURL}" = "xautodetect"; then
+		# OK, we have to autodetect.
+		# We start autodetection with the cleanest known method: pkg-config
+		if test "x${have_LIBCURL}" = "xno"; then
+			# we need that line break after the PKG_CHECK_MODULES
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5
+printf %s "checking for LIBCURL... " >&6; }
+
+if test -n "$LIBCURL_CFLAGS"; then
+    pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.1") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBCURL_LIBS"; then
+    pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcurl >= 7.1") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.1" 2>&1`
+        else
+	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBCURL_PKG_ERRORS" >&5
+
+	:
+elif test $pkg_failed = untried; then
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	:
+else
+	LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS
+	LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+	have_LIBCURL=yes
+fi
+		fi
+		# If pkg-config didn't find anything, try the libfoo-config program
+		# certain known libraries ship with.
+		if test "x${have_LIBCURL}" = "xno"; then
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libcurl config program" >&5
+printf %s "checking libcurl config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
+			# Extract the first word of "gp_lib_config", so it can be a program name with args.
+set dummy none; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBCURL_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $LIBCURL_CONFIG_PROG in
+  \\/* | ?:\\/*)
+  ac_cv_path_LIBCURL_CONFIG_PROG="$LIBCURL_CONFIG_PROG" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBCURL_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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
+LIBCURL_CONFIG_PROG=$ac_cv_path_LIBCURL_CONFIG_PROG
+if test -n "$LIBCURL_CONFIG_PROG"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBCURL_CONFIG_PROG" >&5
+printf "%s\n" "$LIBCURL_CONFIG_PROG" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+			if test -n "${LIBCURL_CONFIG_PROG}" &&
+				test "${LIBCURL_CONFIG_PROG}" != "none"; then
+
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl version according to none" >&5
+printf %s "checking for libcurl version according to none... " >&6; }
+								_LIBCURL_COMPN="-lt"
+								# split requested version number using m4 regexps
+				_LIBCURL_REQ_1="7"
+				_LIBCURL_REQ_2="1"
+				_LIBCURL_REQ_3=""
+				_LIBCURL_REQ_4=""
+				# split installed version number via shell and sed
+				_LIBCURL_VERSION="$("${LIBCURL_CONFIG_PROG}" --version | sed 's/^.* //')"
+				_LIBCURL_VER_1="$(echo "${_LIBCURL_VERSION}" | sed 's/$0-9*$.*/\1/g')"
+				_LIBCURL_VER_2="$(echo "${_LIBCURL_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
+				_LIBCURL_VER_3="$(echo "${_LIBCURL_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
+				_LIBCURL_VER_4="$(echo "${_LIBCURL_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBCURL_VERSION}" >&5
+printf "%s\n" "${_LIBCURL_VERSION}" >&6; }
+				_tmp=false
+				if   test "${_LIBCURL_VER_1}" "${_LIBCURL_COMPN}" "${_LIBCURL_REQ_1}"; then _tmp=true;
+				elif test "${_LIBCURL_VER_2}" "${_LIBCURL_COMPN}" "${_LIBCURL_REQ_2}"; then _tmp=true;
+				elif test "${_LIBCURL_VER_3}" "${_LIBCURL_COMPN}" "${_LIBCURL_REQ_3}"; then _tmp=true;
+				elif test "x${_LIBCURL_VER_4}" = "x" && test "x${_LIBCURL_REQ_4}" != "x"; then _tmp=true;
+				elif test "${_LIBCURL_VER_4}" "${_LIBCURL_COMPN}" "${_LIBCURL_REQ_4}"; then _tmp=true;
+				fi
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl version is matching requirement >= 7.1" >&5
+printf %s "checking if libcurl version is matching requirement >= 7.1... " >&6; }
+				if "${_tmp}"; then
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+				   as_fn_error $? "Version requirement libcurl >= 7.1 not met. Found: ${_LIBCURL_VERSION}" "$LINENO" 5
+				else
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+				fi
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl parameters from none" >&5
+printf %s "checking for libcurl parameters from none... " >&6; }
+				LIBCURL_LIBS="$(${LIBCURL_CONFIG_PROG} --libs || echo "*error*")"
+				LIBCURL_CFLAGS="$(${LIBCURL_CONFIG_PROG} --cflags || echo "*error*")"
+				if test "x${LIBCURL_LIBS}" = "*error*" ||
+					test "x${LIBCURL_CFLAGS}" = "*error*"; then
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
+				else
+					have_LIBCURL=yes
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
+				fi
+			fi
+					fi
+		# Version requirement given, so we do not rely on probing.
+	elif test "x${try_LIBCURL}" = "xno"; then
+		:
+	else
+		# We've been given a prefix to look in for library libcurl.
+		# We start looking for libcurl.la files first.
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl.la file in ${try_LIBCURL}" >&5
+printf %s "checking for libcurl.la file in ${try_LIBCURL}... " >&6; }
+		if test -f "${try_LIBCURL}/lib/libcurl.la"; then
+			LIBCURL_LIBS="${try_LIBCURL}/lib/libcurl.la"
+			LIBCURL_CFLAGS="-I${try_LIBCURL}/include"
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBCURL_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBCURL_LIBS (good)" >&6; }
+			have_LIBCURL=yes
+		elif test -f "${try_LIBCURL}/lib64/libcurl.la"; then # HACK
+			LIBCURL_LIBS="${try_LIBCURL}/lib64/libcurl.la"
+			LIBCURL_CFLAGS="-I${try_LIBCURL}/include"
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBCURL_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBCURL_LIBS (good)" >&6; }
+			have_LIBCURL=yes
+		else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBCURL" >&5
+printf "%s\n" "wild guess that something is in $try_LIBCURL" >&6; }
+			LIBCURL_LIBS="-L${try_LIBCURL}/lib -l$(echo "libcurl" | sed 's/^lib//')"
+			LIBCURL_CFLAGS="-I${try_LIBCURL}/include"
+			have_LIBCURL=yes
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+* Warning:
+*   libtool file libcurl.la could not be found.
+*   We may be linking against the WRONG library.
+" >&5
+printf "%s\n" "$as_me: WARNING:
+* Warning:
+*   libtool file libcurl.la could not be found.
+*   We may be linking against the WRONG library.
+" >&2;}
+		fi
+	fi
+elif test "x${LIBCURL_LIBS}" != "x" && test "x${LIBCURL_CFLAGS}" != "x"; then
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
+	userdef_LIBCURL=yes
+	have_LIBCURL=yes
+else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
+	as_fn_error $? "
+* Fatal:
+* When calling configure for ${PACKAGE_TARNAME}
+*     ${PACKAGE_NAME}
+* either set both LIBCURL_LIBS *and* LIBCURL_CFLAGS
+* or neither.
+" "$LINENO" 5
+fi
+
+if test "x${have_LIBCURL}" = "xyes"; then
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="${LIBCURL_CFLAGS}"
+ac_fn_c_check_header_compile "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_curl_h" = xyes
+then :
+  have_LIBCURL=yes
+else $as_nop
+  have_LIBCURL=no
+fi
+
+CPPFLAGS="$CPPFLAGS_save"
+fi
+if test "x${userdef_LIBCURL}" = "xno" && test "x${have_LIBCURL}" = "xyes"; then
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function curl_easy_init in libcurl" >&5
+printf %s "checking for function curl_easy_init in libcurl... " >&6; }
+	LIBS_save="$LIBS"
+	LIBS="${LIBCURL_LIBS}"
+	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.  */
+char curl_easy_init ();
+int
+main (void)
+{
+return curl_easy_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+else $as_nop
+  have_LIBCURL=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+	LIBS="$LIBS_save"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBCURL}" >&5
+printf "%s\n" "${have_LIBCURL}" >&6; }
+fi
+ if test "x$have_LIBCURL" = "xyes"; then
+  HAVE_LIBCURL_TRUE=
+  HAVE_LIBCURL_FALSE='#'
+else
+  HAVE_LIBCURL_TRUE='#'
+  HAVE_LIBCURL_FALSE=
+fi
+
+if test "x$have_LIBCURL" = "xyes"; then
+
+printf "%s\n" "#define HAVE_LIBCURL 1" >>confdefs.h
+
+
+gp_config_msg_len="$(expr "libcurl" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "libcurl" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "libcurl:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
+"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libcurl library flags" >&5
+printf %s "checking libcurl library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBCURL_LIBS}\"" >&5
+printf "%s\n" "\"${LIBCURL_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libcurl cpp flags" >&5
+printf %s "checking libcurl cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBCURL_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBCURL_CFLAGS}\"" >&6; }
+else
+	REQUIREMENTS_FOR_LIBCURL=
+
+gp_config_msg_len="$(expr "libcurl" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "libcurl" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "libcurl:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} no
+"
+fi
+
+
+gp_config_msg_len="$(expr "CURL support for Lumix Wifi" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "CURL support for Lumix Wifi" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "CURL support for Lumix Wifi:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${have_LIBCURL}
+"
+
+
+
+# ----------------------------------------------------------------------
 # GP_CHECK_LIBRARY(LIBGD,gdlib,>= 2.0,
 #                    gd.h,gdImageCreateTrueColor,
 #                    ...,...,default-on)
@@ -20145,8 +24454,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib to use" >&5
-$as_echo_n "checking for gdlib to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib to use" >&5
+printf %s "checking for gdlib to use... " >&6; }
 REQUIREMENTS_FOR_LIBGD="gdlib >= 2.0"
 userdef_LIBGD=no
 have_LIBGD=no
@@ -20155,7 +24464,8 @@
 				try_LIBGD=auto
 
 # Check whether --with-gdlib was given.
-if test "${with_gdlib+set}" = set; then :
+if test ${with_gdlib+y}
+then :
   withval=$with_gdlib; try_LIBGD="$withval"
 fi
 
@@ -20163,8 +24473,8 @@
               REQUIREMENTS_FOR_LIBGD=
 	fi
 	if test "x${try_LIBGD}" = "xauto"; then try_LIBGD=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBGD}" >&5
-$as_echo "${try_LIBGD}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBGD}" >&5
+printf "%s\n" "${try_LIBGD}" >&6; }
 		if test "x${try_LIBGD}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -20172,17 +24482,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.0" >&5
-$as_echo_n "checking for gdlib >= 2.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBGD" >&5
+printf %s "checking for LIBGD... " >&6; }
 
 if test -n "$LIBGD_CFLAGS"; then
     pkg_cv_LIBGD_CFLAGS="$LIBGD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBGD_CFLAGS=`$PKG_CONFIG --cflags "gdlib >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20196,10 +24506,10 @@
     pkg_cv_LIBGD_LIBS="$LIBGD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBGD_LIBS=`$PKG_CONFIG --libs "gdlib >= 2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -20213,8 +24523,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -20231,31 +24541,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBGD_CFLAGS=$pkg_cv_LIBGD_CFLAGS
 	LIBGD_LIBS=$pkg_cv_LIBGD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBGD=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBGD}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gdlib config program" >&5
-$as_echo_n "checking gdlib config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gdlib-config" >&5
-$as_echo "gdlib-config" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gdlib config program" >&5
+printf %s "checking gdlib config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gdlib-config" >&5
+printf "%s\n" "gdlib-config" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy gdlib-config; 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_LIBGD_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBGD_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBGD_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBGD_CONFIG_PROG="$LIBGD_CONFIG_PROG" # Let the user override the test with a path.
@@ -20265,11 +24576,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBGD_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBGD_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -20281,19 +24596,19 @@
 fi
 LIBGD_CONFIG_PROG=$ac_cv_path_LIBGD_CONFIG_PROG
 if test -n "$LIBGD_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGD_CONFIG_PROG" >&5
-$as_echo "$LIBGD_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBGD_CONFIG_PROG" >&5
+printf "%s\n" "$LIBGD_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBGD_CONFIG_PROG}" &&
 				test "${LIBGD_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib version according to gdlib-config" >&5
-$as_echo_n "checking for gdlib version according to gdlib-config... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib version according to gdlib-config" >&5
+printf %s "checking for gdlib version according to gdlib-config... " >&6; }
 								_LIBGD_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBGD_REQ_1="2"
@@ -20306,8 +24621,8 @@
 				_LIBGD_VER_2="$(echo "${_LIBGD_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBGD_VER_3="$(echo "${_LIBGD_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBGD_VER_4="$(echo "${_LIBGD_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBGD_VERSION}" >&5
-$as_echo "${_LIBGD_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBGD_VERSION}" >&5
+printf "%s\n" "${_LIBGD_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBGD_VER_1}" "${_LIBGD_COMPN}" "${_LIBGD_REQ_1}"; then _tmp=true;
 				elif test "${_LIBGD_VER_2}" "${_LIBGD_COMPN}" "${_LIBGD_REQ_2}"; then _tmp=true;
@@ -20315,28 +24630,28 @@
 				elif test "x${_LIBGD_VER_4}" = "x" && test "x${_LIBGD_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBGD_VER_4}" "${_LIBGD_COMPN}" "${_LIBGD_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gdlib version is matching requirement >= 2.0" >&5
-$as_echo_n "checking if gdlib version is matching requirement >= 2.0... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gdlib version is matching requirement >= 2.0" >&5
+printf %s "checking if gdlib version is matching requirement >= 2.0... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement gdlib >= 2.0 not met. Found: ${_LIBGD_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib parameters from gdlib-config" >&5
-$as_echo_n "checking for gdlib parameters from gdlib-config... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib parameters from gdlib-config" >&5
+printf %s "checking for gdlib parameters from gdlib-config... " >&6; }
 				LIBGD_LIBS="$(${LIBGD_CONFIG_PROG} --libs || echo "*error*")"
 				LIBGD_CFLAGS="$(${LIBGD_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBGD_LIBS}" = "*error*" ||
 					test "x${LIBGD_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBGD=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -20346,32 +24661,32 @@
 	else
 		# We've been given a prefix to look in for library gdlib.
 		# We start looking for gdlib.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib.la file in ${try_LIBGD}" >&5
-$as_echo_n "checking for gdlib.la file in ${try_LIBGD}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib.la file in ${try_LIBGD}" >&5
+printf %s "checking for gdlib.la file in ${try_LIBGD}... " >&6; }
 		if test -f "${try_LIBGD}/lib/gdlib.la"; then
 			LIBGD_LIBS="${try_LIBGD}/lib/gdlib.la"
 			LIBGD_CFLAGS="-I${try_LIBGD}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBGD_LIBS (good)" >&5
-$as_echo "libtool file $LIBGD_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBGD_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBGD_LIBS (good)" >&6; }
 			have_LIBGD=yes
 		elif test -f "${try_LIBGD}/lib64/gdlib.la"; then # HACK
 			LIBGD_LIBS="${try_LIBGD}/lib64/gdlib.la"
 			LIBGD_CFLAGS="-I${try_LIBGD}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBGD_LIBS (good)" >&5
-$as_echo "libtool file $LIBGD_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBGD_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBGD_LIBS (good)" >&6; }
 			have_LIBGD=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBGD" >&5
-$as_echo "wild guess that something is in $try_LIBGD" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBGD" >&5
+printf "%s\n" "wild guess that something is in $try_LIBGD" >&6; }
 			LIBGD_LIBS="-L${try_LIBGD}/lib -l$(echo "gdlib" | sed 's/^lib//')"
 			LIBGD_CFLAGS="-I${try_LIBGD}/include"
 			have_LIBGD=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file gdlib.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file gdlib.la could not be found.
 *   We may be linking against the WRONG library.
@@ -20379,13 +24694,13 @@
 		fi
 	fi
 elif test "x${LIBGD_LIBS}" != "x" && test "x${LIBGD_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBGD=yes
 	have_LIBGD=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -20406,19 +24721,19 @@
 if test "x${have_LIBGD}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBGD_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "gd.h" "ac_cv_header_gd_h" "$ac_includes_default"
-if test "x$ac_cv_header_gd_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "gd.h" "ac_cv_header_gd_h" "$ac_includes_default"
+if test "x$ac_cv_header_gd_h" = xyes
+then :
   have_LIBGD=yes
-else
+else $as_nop
   have_LIBGD=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBGD}" = "xno" && test "x${have_LIBGD}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function gdImageCreateTrueColor in gdlib" >&5
-$as_echo_n "checking for function gdImageCreateTrueColor in gdlib... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function gdImageCreateTrueColor in gdlib" >&5
+printf %s "checking for function gdImageCreateTrueColor in gdlib... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBGD_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20427,28 +24742,26 @@
 /* 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 gdImageCreateTrueColor ();
 int
-main ()
+main (void)
 {
 return gdImageCreateTrueColor ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBGD=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBGD}" >&5
-$as_echo "${have_LIBGD}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBGD}" >&5
+printf "%s\n" "${have_LIBGD}" >&6; }
 fi
  if test "x$have_LIBGD" = "xyes"; then
   HAVE_LIBGD_TRUE=
@@ -20460,7 +24773,7 @@
 
 if test "x$have_LIBGD" = "xyes"; then
 
-$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBGD 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "gdlib" : '.*')"
@@ -20471,14 +24784,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gdlib library flags" >&5
-$as_echo_n "checking gdlib library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBGD_LIBS}\"" >&5
-$as_echo "\"${LIBGD_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gdlib cpp flags" >&5
-$as_echo_n "checking gdlib cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBGD_CFLAGS}\"" >&5
-$as_echo "\"${LIBGD_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gdlib library flags" >&5
+printf %s "checking gdlib library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBGD_LIBS}\"" >&5
+printf "%s\n" "\"${LIBGD_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gdlib cpp flags" >&5
+printf %s "checking gdlib cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBGD_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBGD_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBGD=
 
@@ -20505,19 +24818,20 @@
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
 
 int
-main ()
+main (void)
 {
 if ((DIR *) 0)
 return 0;
@@ -20525,19 +24839,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$as_ac_Header=yes"
-else
+else $as_nop
   eval "$as_ac_Header=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -20546,11 +24862,12 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20558,56 +24875,59 @@
 /* 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 opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' dir; do
+for ac_lib in '' dir
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20615,205 +24935,296 @@
 /* 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 opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' x; do
+for ac_lib in '' x
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-# before _HEADER_STDC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
 
-int
-main ()
-{
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  ac_cv_header_stdc=no
+  ac_cv_path_EGREP=$EGREP
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
+
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
 fi
-rm -f conftest*
+ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_select_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+fi
+ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+fi
+ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
+if test "x$ac_cv_header_memory_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
+if test "x$ac_cv_header_getopt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+ac_fn_c_check_header_compile "$LINENO" "mcheck.h" "ac_cv_header_mcheck_h" "$ac_includes_default"
+if test "x$ac_cv_header_mcheck_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MCHECK_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
+if test "x$ac_cv_header_limits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_langinfo_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
+
+fi
+
+
+MMAP_LIBS=""
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+    gp_saved_LIBS="$LIBS"
+  LIBS=""
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing mmap" >&5
+printf %s "checking for library containing mmap... " >&6; }
+if test ${ac_cv_search_mmap+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+/* 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.  */
+char mmap ();
 int
-main ()
+main (void)
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+return mmap ();
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
+for ac_lib in '' mman
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_mmap=$ac_res
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_mmap+y}
+then :
+  break
 fi
+done
+if test ${ac_cv_search_mmap+y}
+then :
 
+else $as_nop
+  ac_cv_search_mmap=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mmap" >&5
+printf "%s\n" "$ac_cv_search_mmap" >&6; }
+ac_res=$ac_cv_search_mmap
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-# after _HEADER_STDC
-for ac_header in sys/param.h sys/mman.h sys/select.h locale.h memory.h getopt.h unistd.h mcheck.h limits.h sys/time.h langinfo.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+  MMAP_LIBS="$LIBS"
+  LIBS="$gp_saved_LIBS"
 
 fi
 
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+printf %s "checking for inline... " >&6; }
+if test ${ac_cv_c_inline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
+static $ac_kw foo_t static_foo (void) {return 0; }
+$ac_kw foo_t foo (void) {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf "%s\n" "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -20830,16 +25241,17 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 #ifndef __cplusplus
@@ -20852,7 +25264,7 @@
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
+  /* IBM XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -20880,7 +25292,7 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap3; } bx;
     struct s *b = &bx; b->j = 5;
@@ -20896,18 +25308,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_const=yes
-else
+else $as_nop
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
+printf "%s\n" "#define const /**/" >>confdefs.h
 
 fi
 
@@ -20915,42 +25328,133 @@
 
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
 
-for ac_func in getenv getopt getopt_long mkdir setenv strdup strncpy strcpy snprintf sprintf vsnprintf gmtime_r statfs localtime_r lstat inet_aton rand_r
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "getenv" "ac_cv_func_getenv"
+if test "x$ac_cv_func_getenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETENV 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
+if test "x$ac_cv_func_getopt" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
+if test "x$ac_cv_func_getopt_long" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT_LONG 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+fi
+ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
+if test "x$ac_cv_func_mkdir" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKDIR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
+if test "x$ac_cv_func_setenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+if test "x$ac_cv_func_strdup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strncpy" "ac_cv_func_strncpy"
+if test "x$ac_cv_func_strncpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNCPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcpy" "ac_cv_func_strcpy"
+if test "x$ac_cv_func_strcpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sprintf" "ac_cv_func_sprintf"
+if test "x$ac_cv_func_sprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
+if test "x$ac_cv_func_gmtime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
+if test "x$ac_cv_func_statvfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+if test "x$ac_cv_func_localtime_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat"
+if test "x$ac_cv_func_lstat" = xyes
+then :
+  printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "rand_r" "ac_cv_func_rand_r"
+if test "x$ac_cv_func_rand_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_RAND_R 1" >>confdefs.h
+
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test ${ac_cv_struct_tm+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -20959,24 +25463,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_tm=time.h
-else
+else $as_nop
   ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+printf "%s\n" "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
-$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
+printf %s "checking for tm_gmtoff in struct tm... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20984,7 +25489,7 @@
 #include <$ac_cv_struct_tm>
 
 int
-main ()
+main (void)
 {
 
 struct tm tm;
@@ -20994,112 +25499,67 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
+printf "%s\n" "#define HAVE_TM_GMTOFF 1" >>confdefs.h
 
-$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "
 #include <sys/types.h>
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if test "x$ac_cv_header_sys_mount_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
 
 fi
-
-done
-
-
-ac_fn_c_check_member "$LINENO" "struct statfs" "f_bfree" "ac_cv_member_struct_statfs_f_bfree" "
+ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "
 #include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
+#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_MOUNT_H
-# include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-# include <sys/statfs.h>
-#endif
 
 "
-if test "x$ac_cv_member_struct_statfs_f_bfree" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STATFS_F_BFREE 1
-_ACEOF
-
+if test "x$ac_cv_header_sys_statvfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_member "$LINENO" "struct statfs" "f_bavail" "ac_cv_member_struct_statfs_f_bavail" "
+ac_fn_c_check_header_compile "$LINENO" "sys/user.h" "ac_cv_header_sys_user_h" "
 #include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
+#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_MOUNT_H
-# include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-# include <sys/statfs.h>
-#endif
 
 "
-if test "x$ac_cv_member_struct_statfs_f_bavail" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STATFS_F_BAVAIL 1
-_ACEOF
-
+if test "x$ac_cv_header_sys_user_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_USER_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_member "$LINENO" "struct statfs" "f_favail" "ac_cv_member_struct_statfs_f_favail" "
+ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "
 #include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
+#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_MOUNT_H
-# include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-# include <sys/statfs.h>
-#endif
 
 "
-if test "x$ac_cv_member_struct_statfs_f_favail" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STATFS_F_FAVAIL 1
-_ACEOF
-
+if test "x$ac_cv_header_sys_vfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h
 
 fi
 
@@ -21110,191 +25570,22 @@
 #endif
 
 "
-if test "x$ac_cv_member_struct_statvfs_f_blocks" = xyes; then :
+if test "x$ac_cv_member_struct_statvfs_f_blocks" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STATVFS_F_BLOCKS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STATVFS_F_BLOCKS 1" >>confdefs.h
 
 
 fi
 
 
 
-
-
-
-ac_dir=`$as_dirname -- "libgphoto2/_stdint.h" ||
-$as_expr X"libgphoto2/_stdint.h" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"libgphoto2/_stdint.h" : 'X$//$^/' \| \
-	 X"libgphoto2/_stdint.h" : 'X$//$$' \| \
-	 X"libgphoto2/_stdint.h" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"libgphoto2/_stdint.h" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-if test "$ac_dir" != "libgphoto2/_stdint.h" && test "$ac_dir" != .; then
-  # The file is in a subdirectory.
-  test ! -d "$ac_dir" && as_dir="$ac_dir"; as_fn_mkdir_p
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint8_t in stdint.h" >&5
-$as_echo_n "checking for uint8_t in stdint.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "(^|^a-zA-Z_0-9)uint8_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
-  ac_cv_type_uint8_t=yes
-else
-  ac_cv_type_uint8_t=no
-fi
-rm -f conftest*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uint8_t" >&5
-$as_echo "$ac_cv_type_uint8_t" >&6; }
-if test $ac_cv_type_uint8_t = yes; then
-
-cat > "libgphoto2/_stdint.h" <<EOF
-/* This file is generated automatically by configure */
-#include <stdint.h>
-EOF
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint8_t in inttypes.h" >&5
-$as_echo_n "checking for uint8_t in inttypes.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <inttypes.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "(^|^a-zA-Z_0-9)uint8_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
-  ac_cv_type_uint8_t=yes
-else
-  ac_cv_type_uint8_t=no
-fi
-rm -f conftest*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uint8_t" >&5
-$as_echo "$ac_cv_type_uint8_t" >&6; }
-if test $ac_cv_type_uint8_t = yes; then
-  cat > "libgphoto2/_stdint.h" <<EOF
-/* This file is generated automatically by configure */
-#include <inttypes.h>
-EOF
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint8_t in sys/types.h" >&5
-$as_echo_n "checking for uint8_t in sys/types.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "(^|^a-zA-Z_0-9)uint8_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
-  ac_cv_type_uint8_t=yes
-else
-  ac_cv_type_uint8_t=no
-fi
-rm -f conftest*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uint8_t" >&5
-$as_echo "$ac_cv_type_uint8_t" >&6; }
-if test $ac_cv_type_uint8_t = yes; then
-  cat > "libgphoto2/_stdint.h" <<EOF
-/* This file is generated automatically by configure */
-#include <sys/types.h>
-EOF
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int8_t in sys/types.h" >&5
-$as_echo_n "checking for u_int8_t in sys/types.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "(^|^a-zA-Z_0-9)u_int8_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
-  ac_cv_type_u_int8_t=yes
-else
-  ac_cv_type_u_int8_t=no
-fi
-rm -f conftest*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int8_t" >&5
-$as_echo "$ac_cv_type_u_int8_t" >&6; }
-if test $ac_cv_type_u_int8_t = yes; then
-  cat > "libgphoto2/_stdint.h" <<EOF
-/* This file is generated automatically by configure */
-#ifndef __STDINT_H
-#define __STDINT_H
-#include <sys/types.h>
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-EOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int64_t in sys/types.h" >&5
-$as_echo_n "checking for u_int64_t in sys/types.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "(^|^a-zA-Z_0-9)u_int64_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
-  ac_cv_type_u_int64_t=yes
-else
-  ac_cv_type_u_int64_t=no
-fi
-rm -f conftest*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int64_t" >&5
-$as_echo "$ac_cv_type_u_int64_t" >&6; }
-if test $ac_cv_type_u_int64_t = yes; then
-  cat >> "libgphoto2/_stdint.h" <<EOF
-typedef u_int64_t uint64_t;
-#endif /*!__STDINT_H*/
-EOF
-else
-  cat >> "libgphoto2/_stdint.h" <<EOF
-/* 64-bit types are not available on this system */
-/* typedef u_int64_t uint64_t; */
-#endif /*!__STDINT_H*/
-EOF
-fi
-
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I can't find size-specific integer definitions on this system" >&5
-$as_echo "$as_me: WARNING: I can't find size-specific integer definitions on this system" >&2;}
-if test -e "libgphoto2/_stdint.h" ; then
-	rm -f "libgphoto2/_stdint.h"
-fi
-
-fi
-
-fi
-
-fi
-
-fi
-
-
-
 ac_dir=`$as_dirname -- "libgphoto2/gphoto2-endian.h" ||
 $as_expr X"libgphoto2/gphoto2-endian.h" : 'X$.*^/$//*^/^/*/*$' \| \
 	 X"libgphoto2/gphoto2-endian.h" : 'X$//$^/' \| \
 	 X"libgphoto2/gphoto2-endian.h" : 'X$//$$' \| \
 	 X"libgphoto2/gphoto2-endian.h" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"libgphoto2/gphoto2-endian.h" |
+printf "%s\n" X"libgphoto2/gphoto2-endian.h" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -21319,7 +25610,7 @@
 
 # We're only interested in the target CPU, but it's not always set
 effective_target="$target"
-if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
+if test "x$effective_target" = xNONE || test "x$effective_target" = x ; then
 	effective_target="$host"
 fi
 
@@ -21328,16 +25619,17 @@
 /* This file is generated automatically by configure */
 /* It is valid only for the system type ${effective_target} */
 
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
+#ifndef GP_BYTEORDER_H
+#define GP_BYTEORDER_H
 
 EOF
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21348,7 +25640,8 @@
 	     typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags.  It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -21372,7 +25665,7 @@
 	 fi
        done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21381,7 +25674,7 @@
 	     #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -21393,7 +25686,8 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21401,7 +25695,7 @@
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -21411,14 +25705,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -21427,7 +25722,7 @@
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
@@ -21437,14 +25732,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -21454,31 +25750,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm =
+unsigned short int ascii_mm =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
+		unsigned short int ascii_ii =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mmi + ascii_iii;
 		}
-		short int ebcdic_ii =
+		unsigned short int ebcdic_ii =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
+		unsigned short int ebcdic_mm =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mmi + ebcdic_iii;
@@ -21486,14 +25784,15 @@
 		extern int foo;
 
 int
-main ()
+main (void)
 {
 return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -21506,13 +25805,13 @@
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -21528,9 +25827,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_bigendian=no
-else
+else $as_nop
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -21539,17 +25839,17 @@
 
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -21559,8 +25859,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for le32toh in machine/endian.h" >&5
-$as_echo_n "checking for le32toh in machine/endian.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for le32toh in machine/endian.h" >&5
+printf %s "checking for le32toh in machine/endian.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21571,9 +25871,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<le32toh\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<le32toh\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 HAVE_LE32TOH=1
  cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* extended byte swapping macros are already available */
@@ -21581,14 +25882,14 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in arpa/inet.h" >&5
-$as_echo_n "checking for ntohl in arpa/inet.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ntohl in arpa/inet.h" >&5
+printf %s "checking for ntohl in arpa/inet.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21599,9 +25900,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* ntohl and relatives live here */
 #include <arpa/inet.h>
@@ -21609,12 +25911,12 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in netinet/in.h" >&5
-$as_echo_n "checking for ntohl in netinet/in.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ntohl in netinet/in.h" >&5
+printf %s "checking for ntohl in netinet/in.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21625,9 +25927,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* ntohl and relatives live here */
 #include <netinet/in.h>
@@ -21635,28 +25938,28 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 true
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for swap32 in machine/endian.h" >&5
-$as_echo_n "checking for swap32 in machine/endian.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for swap32 in machine/endian.h" >&5
+printf %s "checking for swap32 in machine/endian.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21667,21 +25970,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<swap32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<swap32\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* swap32 and swap16 are defined in machine/endian.h */
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap_32 in byteswap.h" >&5
-$as_echo_n "checking for bswap_32 in byteswap.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bswap_32 in byteswap.h" >&5
+printf %s "checking for bswap_32 in byteswap.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21692,9 +25996,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<bswap_32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<bswap_32\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* Define generic byte swapping functions */
 #include <byteswap.h>
@@ -21704,13 +26009,13 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
-$as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
+printf %s "checking for bswap32 in machine/endian.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21721,9 +26026,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<bswap32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<bswap32\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   	 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* Define generic byte swapping functions */
 EOF
@@ -21737,13 +26043,13 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __byte_swap_long in sys/types.h" >&5
-$as_echo_n "checking for __byte_swap_long in sys/types.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __byte_swap_long in sys/types.h" >&5
+printf %s "checking for __byte_swap_long in sys/types.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21754,9 +26060,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<__byte_swap_long\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<__byte_swap_long\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* Define generic byte swapping functions */
 #include <sys/types.h>
@@ -21774,13 +26081,13 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NXSwapLong in machine/byte_order.h" >&5
-$as_echo_n "checking for NXSwapLong in machine/byte_order.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NXSwapLong in machine/byte_order.h" >&5
+printf %s "checking for NXSwapLong in machine/byte_order.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21791,9 +26098,10 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<NXSwapLong\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  $EGREP "symbol is present|\<NXSwapLong\>" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* Define generic byte swapping functions */
 #include <machine/byte_order.h>
@@ -21803,9 +26111,9 @@
 
 EOF
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 	if test $ac_cv_c_bigendian = yes; then
 		cat >> "libgphoto2/gphoto2-endian.h" << EOF
@@ -21855,27 +26163,27 @@
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 
@@ -22020,7 +26328,7 @@
 
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
 /* Define the C99 standard length-specific integer types */
-#include <_stdint.h>
+#include <stdint.h>
 
 EOF
 
@@ -22117,7 +26425,7 @@
 
 
 cat >> "libgphoto2/gphoto2-endian.h" << EOF
-#endif /*__BYTEORDER_H*/
+#endif /* GP_BYTEORDER_H */
 EOF
 
 
@@ -22127,7 +26435,6 @@
 
 
 
-
 if test "x${utilsdir}" = "x"; then utilsdir="\${libdir}/\${PACKAGE_TARNAME}"; fi
 
 
@@ -22146,201 +26453,1378 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install camlibs" >&5
-$as_echo_n "checking where to install camlibs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to install camlibs (camlibdir)" >&5
+printf %s "checking where to install camlibs (camlibdir)... " >&6; }
+
+if ${camlibdir:+false} :
+then :
+  	camlibdir="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${camlibdir} (default)" >&5
+printf "%s\n" "${camlibdir} (default)" >&6; }
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${camlibdir} (set explictly)" >&5
+printf "%s\n" "${camlibdir} (set explictly)" >&6; }
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deprecated --with-camlibdir argument" >&5
+printf %s "checking for deprecated --with-camlibdir argument... " >&6; }
 
 # Check whether --with-camlibdir was given.
-if test "${with_camlibdir+set}" = set; then :
-  withval=$with_camlibdir;
-	camlibdir="$withval"
-
-else
-
-	camlibdir="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}"
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${camlibdir}" >&5
-$as_echo "${camlibdir}" >&6; }
-
-AM_CPPFLAGS="$AM_CPPFLAGS -DCAMLIBS=\\\"\$(camlibdir)\\\""
-
-
-
-# GP_CAMLIB(adc65)
-# GP_CAMLIB(agfa_cl20)
-# GP_CAMLIB(aox)
-# GP_CAMLIB(ax203)
-# GP_CAMLIB(barbie)
-# GP_CAMLIB(canon)
-# GP_CAMLIB(casio_qv)
-# GP_CAMLIB(clicksmart310)
-# GP_CAMLIB(digigr8)
-# GP_CAMLIB(digita)
-# GP_CAMLIB(dimera3500)
-# GP_CAMLIB(directory)
-# GP_CAMLIB(enigma13)
-# GP_CAMLIB(fuji)
-# GP_CAMLIB(gsmart300)
-# GP_CAMLIB(hp215)
-# GP_CAMLIB(iclick)
-# GP_CAMLIB(jamcam)
-# GP_CAMLIB(jd11)
-# GP_CAMLIB(jl2005a)
-# GP_CAMLIB(jl2005c)
-# GP_CAMLIB(kodak_dc120)
-# GP_CAMLIB(kodak_dc210)
-# GP_CAMLIB(kodak_dc240)
-# GP_CAMLIB(kodak_dc3200)
-# GP_CAMLIB(kodak_ez200)
-# GP_CAMLIB(konica)
-# GP_CAMLIB(konica_qm150)
-# GP_CAMLIB(largan)
-# GP_CAMLIB(lg_gsm)
-# GP_CAMLIB(mars)
-# GP_CAMLIB(dimagev)
-# GP_CAMLIB(mustek)
-# GP_CAMLIB(panasonic_coolshot)
-# GP_CAMLIB(panasonic_l859)
-# GP_CAMLIB(panasonic_dc1000)
-# GP_CAMLIB(panasonic_dc1580)
-# GP_CAMLIB(pccam300)
-# GP_CAMLIB(pccam600)
-# GP_CAMLIB(pentax)
-# GP_CAMLIB(polaroid_pdc320)
-# GP_CAMLIB(polaroid_pdc640)
-# GP_CAMLIB(polaroid_pdc700)
-# GP_CAMLIB(ptp2)
-# GP_CAMLIB(ricoh)
-# GP_CAMLIB(ricoh_g3)
-# GP_CAMLIB(samsung)
-# GP_CAMLIB(sierra)
-# GP_CAMLIB(sipix_blink,unlisted)
-# GP_CAMLIB(sipix_blink2)
-# GP_CAMLIB(sipix_web2)
-# GP_CAMLIB(smal)
-# GP_CAMLIB(sonix)
-# GP_CAMLIB(sony_dscf1)
-# GP_CAMLIB(sony_dscf55)
-# GP_CAMLIB(soundvision)
-# GP_CAMLIB(spca50x)
-# GP_CAMLIB(sq905)
-# GP_CAMLIB(st2205)
-# GP_CAMLIB(stv0674)
-# GP_CAMLIB(stv0680)
-# GP_CAMLIB(sx330z)
-# GP_CAMLIB(template,unlisted)
-# GP_CAMLIB(topfield)
-# GP_CAMLIB(toshiba_pdrm11)
-# GP_CAMLIB(tp6801)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which camlibs to compile" >&5
-$as_echo_n "checking which camlibs to compile... " >&6; }
+if test ${with_camlibdir+y}
+then :
+  withval=$with_camlibdir; 	if ${camlibdir:+false} :
+then :
+  		camlibdir="$withval"
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${camlibdir} (from DEPRECATED --with-camlibdir)" >&5
+printf "%s\n" "${camlibdir} (from DEPRECATED --with-camlibdir)" >&6; }
+
+else $as_nop
+  		if test "x$camlibdir" = x"$withval"
+then :
+  			# Nothing to do, camlibdir has already been set to this value.
+
+else $as_nop
+  			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${withval} (differs from camlibdir value)" >&5
+printf "%s\n" "${withval} (differs from camlibdir value)" >&6; }
+			as_fn_error $? "
+If both the camlibdir= variable and the DEPRECATED --with-camlibdir= argument
+are used, their value MUST be the same.
+" "$LINENO" 5
 
-# Check whether --with-camlibs was given.
-if test "${with_camlibs+set}" = set; then :
-  withval=$with_camlibs; camlibs="$withval"
+fi
+
+fi
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not used (very good)" >&5
+printf "%s\n" "not used (very good)" >&6; }
+
+fi
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking default location to look for camlibs" >&5
+printf %s "checking default location to look for camlibs... " >&6; }
+if ${DEFAULT_CAMLIBS:+false} :
+then :
+  	DEFAULT_CAMLIBS="\${camlibdir}"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: value of camlibdir (default)" >&5
+printf "%s\n" "value of camlibdir (default)" >&6; }
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${DEFAULT_CAMLIBS} (set explicitly)" >&5
+printf "%s\n" "${DEFAULT_CAMLIBS} (set explicitly)" >&6; }
+
+fi
+AM_CPPFLAGS="$AM_CPPFLAGS -DCAMLIBS=\\\"${DEFAULT_CAMLIBS}\\\""
+
+
+
+if ${CMP:+false} :
+then :
+  # Extract the first word of "cmp", so it can be a program name with args.
+set dummy cmp; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $CMP in
+  \\/* | ?:\\/*)
+  ac_cv_path_CMP="$CMP" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CMP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_CMP" && ac_cv_path_CMP="no"
+  ;;
+esac
+fi
+CMP=$ac_cv_path_CMP
+if test -n "$CMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
+printf "%s\n" "$CMP" >&6; }
 else
-  camlibs="all"
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-ALL_DEFINED_CAMLIBS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z topfield toshiba_pdrm11 tp6801 sipix_blink template"
-ALL_DEFAULT_CAMLIBS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z topfield toshiba_pdrm11 tp6801"
-BUILD_THESE_CAMLIBS_BASE=""
-if test "$camlibs" = "all"; then
-	BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all" >&5
-$as_echo "all" >&6; }
-else
-	# If the string starts with "all,", we start with the default list
-	# and add the explicitly defined ones later
-	if echo "$camlibs" | grep "^all," > /dev/null; then
-		BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-		camlibs="$(echo "$camlibs" | sed 's/^all,//')"
-	fi
-	# camlibs=$(echo $camlibs | sed 's/,/ /g')
-	IFS_save="$IFS"
-	IFS=",$IFS"
-	# Walk through enumeration of camlibs given by user and add them to list
-	# of camlibs to build if we know them.
-	for camlib in ${camlibs}; do
-		IFS="$IFS_save"
-		found=false
-		for from_all_camlib in ${ALL_DEFINED_CAMLIBS}; do
-			if test "$camlib" = "$from_all_camlib"; then
-				if test "x$BUILD_THESE_CAMLIBS_BASE" = "x"; then
-					BUILD_THESE_CAMLIBS_BASE="$camlib"
-				else
-					BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE $camlib"
-				fi
-				found=:
-				break
-			fi
-		done
-		if $found; then :; else
-			as_fn_error $? "Unknown camlib $camlib!" "$LINENO" 5
-		fi
-	done
-        if test "x$BUILD_THESE_CAMLIBS_BASE" = "xcanon" ; then
-		# Gentoo mode... if user just said "canon", add "ptp2" ... should save support requests.
-		BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE ptp2"
-		camlibs="$camlibs ptp2"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-		\"You have just selected the old canon driver. However most current Canons\n\"
-		\"are supported by the PTP2 driver.\n\"
-		\"Autoselecting ptp2 driver too to avoid support requests.\n\"
-		" >&5
-$as_echo "$as_me: WARNING:
-		\"You have just selected the old canon driver. However most current Canons\n\"
-		\"are supported by the PTP2 driver.\n\"
-		\"Autoselecting ptp2 driver too to avoid support requests.\n\"
-		" >&2;}
-        fi
-	IFS="$IFS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $camlibs" >&5
-$as_echo "$camlibs" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-#
-# Many cameras of several brands are supported by a camlib with a
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the \"ptp2\" camlib
-#   * or even better, just build \"all\" camlibs.
+
+
+fi
+
+if ${SORT:+false} :
+then :
+  # Extract the first word of "sort", so it can be a program name with args.
+set dummy sort; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SORT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $SORT in
+  \\/* | ?:\\/*)
+  ac_cv_path_SORT="$SORT" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SORT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_SORT" && ac_cv_path_SORT="no"
+  ;;
+esac
+fi
+SORT=$ac_cv_path_SORT
+if test -n "$SORT"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
+printf "%s\n" "$SORT" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+
+if ${TR:+false} :
+then :
+  # Extract the first word of "tr", so it can be a program name with args.
+set dummy tr; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_TR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $TR in
+  \\/* | ?:\\/*)
+  ac_cv_path_TR="$TR" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_TR="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_TR" && ac_cv_path_TR="no"
+  ;;
+esac
+fi
+TR=$ac_cv_path_TR
+if test -n "$TR"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
+printf "%s\n" "$TR" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+
+if ${UNIQ:+false} :
+then :
+  # Extract the first word of "uniq", so it can be a program name with args.
+set dummy uniq; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_UNIQ+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $UNIQ in
+  \\/* | ?:\\/*)
+  ac_cv_path_UNIQ="$UNIQ" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_UNIQ="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_UNIQ" && ac_cv_path_UNIQ="no"
+  ;;
+esac
+fi
+UNIQ=$ac_cv_path_UNIQ
+if test -n "$UNIQ"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5
+printf "%s\n" "$UNIQ" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+
+
+        : > "gp-set-file--camlib-set-standard"
+: > "gp-set-file--camlib-set-unlisted"
+: > "gp-set-file--camlib-set-outdated"
+
+gp_set_shfn_check ()
+{
+  if test -f "$1"; then :; else
+    as_fn_error $? "\"Error: set $1 has not been defined yet\"" "$LINENO" 5
+  fi
+} # gp_set_shfn_check
+
+gp_set_shfn_set_add ()
+{
+  gp_set_shfn_check "$1"
+  printf "%s\n" "$2" >> "$1"
+} # gp_set_shfn_set_add
+
+      gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "adc65"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "agfa_cl20"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "aox"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "ax203"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "barbie"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "canon"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "casio_qv"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "clicksmart310"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "digigr8"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "digita"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "dimera3500"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "directory"
+
+  if test -z "$HAVE_LIBGD_TRUE"; then :
+    gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "docupen"
+
+
+fi
+      gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "enigma13"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "fuji"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "gsmart300"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "hp215"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "iclick"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "jamcam"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "jd11"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "jl2005a"
+
+    gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "jl2005c"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "kodak_dc120"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "kodak_dc210"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "kodak_dc240"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "kodak_dc3200"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "kodak_ez200"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "konica"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "konica_qm150"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "largan"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "lg_gsm"
+
+      if test -z "$HAVE_LIBCURL_TRUE"; then :
+  if test -z "$HAVE_LIBXML2_TRUE"; then :
+    gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "lumix"
+
+
+fi
+
+fi
+  gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "mars"
+
+    gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "dimagev"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "mustek"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "panasonic_coolshot"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "panasonic_l859"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "panasonic_dc1000"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "panasonic_dc1580"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "pccam300"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "pccam600"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "pentax"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "polaroid_pdc320"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "polaroid_pdc640"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "polaroid_pdc700"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "ptp2"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "ricoh"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "ricoh_g3"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "samsung"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "sierra"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-unlisted" "sipix_blink"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "sipix_blink2"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "sipix_web2"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "smal"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "sonix"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "sony_dscf1"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "sony_dscf55"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "soundvision"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "spca50x"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "sq905"
+
+    gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "st2205"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "stv0674"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "stv0680"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "sx330z"
+
+            gp_set_shfn_set_add "gp-set-file--camlib-set-unlisted" "template"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "topfield"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-outdated" "toshiba_pdrm11"
+
+        gp_set_shfn_set_add "gp-set-file--camlib-set-standard" "tp6801"
+
+  if ${EXPR:+false} :
+then :
+  # Extract the first word of "expr", so it can be a program name with args.
+set dummy expr; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_EXPR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $EXPR in
+  \\/* | ?:\\/*)
+  ac_cv_path_EXPR="$EXPR" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_EXPR="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_EXPR" && ac_cv_path_EXPR="no"
+  ;;
+esac
+fi
+EXPR=$ac_cv_path_EXPR
+if test -n "$EXPR"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
+printf "%s\n" "$EXPR" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+
+gp_set_shfn_union ()
+{
+  local result_fname="$1"
+  gp_set_shfn_check "$result_fname"
+  if shift; then
+    cat "$@" > "${result_fname}.tmp"
+    mv -f "${result_fname}.tmp" "${result_fname}"
+  fi
+} # gp_set_shfn_union
+
+if ${SLEEP:+false} :
+then :
+  # Extract the first word of "sleep", so it can be a program name with args.
+set dummy sleep; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SLEEP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $SLEEP in
+  \\/* | ?:\\/*)
+  ac_cv_path_SLEEP="$SLEEP" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SLEEP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_SLEEP" && ac_cv_path_SLEEP="no"
+  ;;
+esac
+fi
+SLEEP=$ac_cv_path_SLEEP
+if test -n "$SLEEP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SLEEP" >&5
+printf "%s\n" "$SLEEP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sleep" >&5
+printf %s "checking for sleep... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SLEEP}" >&5
+printf "%s\n" "${SLEEP}" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether configure script should sleep" >&5
+printf %s "checking whether configure script should sleep... " >&6; }
+if test "x$SLEEP" != x && test "x$SLEEP" != xno
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  gp_sleep=$SLEEP
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  gp_sleep=:
+
+fi
+
+gp_set_shfn_canonicalize ()
+{
+  gp_set_shfn_check "$1"
+  ( set -e
+    ${SORT} < "$1" | ${UNIQ} > "$1.tmp"
+    mv -f "$1.tmp" "$1"; )
+} # gp_set_shfn_canonicalize
+
+if ${COMM:+false} :
+then :
+  # Extract the first word of "comm", so it can be a program name with args.
+set dummy comm; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_COMM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $COMM in
+  \\/* | ?:\\/*)
+  ac_cv_path_COMM="$COMM" # 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
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_COMM="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_COMM" && ac_cv_path_COMM="no"
+  ;;
+esac
+fi
+COMM=$ac_cv_path_COMM
+if test -n "$COMM"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
+printf "%s\n" "$COMM" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+
+cat>confset_a.txt<<EOF
+x
+y
+EOF
+cat>confset_b.txt<<EOF
+y
+z
+EOF
+cat>confset_res_23.txt<<EOF
+x
+EOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether comm -23 works" >&5
+printf %s "checking whether comm -23 works... " >&6; }
+if ${COMM} -23 confset_a.txt confset_b.txt > confset_diff_23.txt
+then :
+    if ${CMP} confset_diff_23.txt confset_res_23.txt > /dev/null 2>&1
+then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+    rm -f confset_a.txt confset_b.txt confset_diff_23.txt confset_res_23.txt
+
+else $as_nop
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (wrong result)" >&5
+printf "%s\n" "no (wrong result)" >&6; }
+    as_fn_error $? "comm -23 must work for GP_SET_xyz difference calculations" "$LINENO" 5
+
+fi
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (does not run)" >&5
+printf "%s\n" "no (does not run)" >&6; }
+  as_fn_error $? "comm -23 must work for GP_SET_xyz difference calculations" "$LINENO" 5
+
+fi
+gp_set_shfn_difference ()
+{
+  local result_fname="$1"
+  gp_set_shfn_check "$result_fname"
+  if shift; then
+    gp_set_shfn_canonicalize "$1"
+    cat "$1" > "$result_fname"
+    if shift; then
+      for gp_s
+      do
+        gp_set_shfn_canonicalize "$gp_s"
+        ${COMM} -23 "${result_fname}" "$gp_s" > "${result_fname}.tmp"
+        mv -f "${result_fname}.tmp" "${result_fname}"
+      done
+    fi
+  fi
+} # gp_set_shfn_difference
+
+gp_set_shfn_remove ()
+{
+  gp_set_shfn_check "$1"
+  ${GREP} -v "^$2$" < "$1" > "$1.tmp"
+  mv -f "$1.tmp" "$1"
+} # gp_set_shfn_remove
+
+gp_set_shfn_debug_var ()
+{
+  gp_set_shfn_check "$1"
+  gp_set_shfn_canonicalize "$1"
+  local element
+  local gp_set_is_first=:
+  local gp_set_saved_ifs="$IFS"
+  IFS=""
+  while read element
+  do
+    if "$gp_set_is_first"
+    then
+      eval "$2=\"{ \""
+      gp_set_is_first=false
+    else
+      eval "$2=\"\${$2}, \""
+    fi
+    if test "x$element" = "x"
+    then
+      eval "$2=\"\${$2}''\""
+    else
+      eval "$2=\"\${$2}'\$element'\""
+    fi
+  done < "$1"
+  IFS="$gp_set_saved_ifs"
+  if "$gp_set_is_first"
+  then
+    eval "$2=\"{ }\""
+  else
+    eval "$2=\"\${$2} }\""
+  fi
+} # gp_set_shfn_debug_var
+
+# BEGIN GP_CAMLIBS_DEFINE()
+
+
+: > "gp-set-file--m4-camlib-set-everything"
+
+gp_set_shfn_check "gp-set-file--m4-camlib-set-everything"
+cat>>"gp-set-file--m4-camlib-set-everything"<<EOF
+adc65
+agfa_cl20
+aox
+ax203
+barbie
+canon
+casio_qv
+clicksmart310
+digigr8
+digita
+dimera3500
+directory
+docupen
+enigma13
+fuji
+gsmart300
+hp215
+iclick
+jamcam
+jd11
+jl2005a
+jl2005c
+kodak_dc120
+kodak_dc210
+kodak_dc240
+kodak_dc3200
+kodak_ez200
+konica
+konica_qm150
+largan
+lg_gsm
+lumix
+mars
+dimagev
+mustek
+panasonic_coolshot
+panasonic_l859
+panasonic_dc1000
+panasonic_dc1580
+pccam300
+pccam600
+pentax
+polaroid_pdc320
+polaroid_pdc640
+polaroid_pdc700
+ptp2
+ricoh
+ricoh_g3
+samsung
+sierra
+sipix_blink
+sipix_blink2
+sipix_web2
+smal
+sonix
+sony_dscf1
+sony_dscf55
+soundvision
+spca50x
+sq905
+st2205
+stv0674
+stv0680
+sx330z
+template
+topfield
+toshiba_pdrm11
+tp6801
+EOF
+
+: > "gp-set-file--m4-camlib-set-standard"
+
+gp_set_shfn_check "gp-set-file--m4-camlib-set-standard"
+cat>>"gp-set-file--m4-camlib-set-standard"<<EOF
+ax203
+canon
+digigr8
+directory
+docupen
+jl2005a
+jl2005c
+kodak_dc240
+lumix
+mars
+dimagev
+pentax
+ptp2
+ricoh_g3
+sierra
+sonix
+sq905
+st2205
+topfield
+tp6801
+EOF
+
+: > "gp-set-file--m4-camlib-set-outdated"
+
+gp_set_shfn_check "gp-set-file--m4-camlib-set-outdated"
+cat>>"gp-set-file--m4-camlib-set-outdated"<<EOF
+adc65
+agfa_cl20
+aox
+barbie
+casio_qv
+clicksmart310
+digita
+dimera3500
+enigma13
+fuji
+gsmart300
+hp215
+iclick
+jamcam
+jd11
+kodak_dc120
+kodak_dc210
+kodak_dc3200
+kodak_ez200
+konica
+konica_qm150
+largan
+lg_gsm
+mustek
+panasonic_coolshot
+panasonic_l859
+panasonic_dc1000
+panasonic_dc1580
+pccam300
+pccam600
+polaroid_pdc320
+polaroid_pdc640
+polaroid_pdc700
+ricoh
+samsung
+sipix_blink2
+sipix_web2
+smal
+sony_dscf1
+sony_dscf55
+soundvision
+spca50x
+stv0674
+stv0680
+sx330z
+toshiba_pdrm11
+EOF
+
+: > "gp-set-file--m4-camlib-set-unlisted"
+
+gp_set_shfn_check "gp-set-file--m4-camlib-set-unlisted"
+cat>>"gp-set-file--m4-camlib-set-unlisted"<<EOF
+sipix_blink
+template
+EOF
+
+
+
+: > "gp-set-file--camlib-set-everything"
+gp_set_shfn_union  "gp-set-file--camlib-set-everything" "gp-set-file--camlib-set-standard" "gp-set-file--camlib-set-outdated" "gp-set-file--camlib-set-unlisted"
+
+
+
+
+# Check whether --with-camlibs was given.
+if test ${with_camlibs+y}
+then :
+  withval=$with_camlibs; gp_sh_with_camlibs="${withval}"
+else $as_nop
+  gp_sh_with_camlibs="standard"
+fi
+
+if test "x$gp_sh_with_camlibs" = xall
+then :
+    gp_sh_with_camlibs="standard"
+
+fi
+if test "x$gp_sh_with_camlibs" = xcanon
+then :
+  	gp_sh_with_camlibs="${gp_sh_with_camlibs} ptp2"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+    #==============================================================#
+    # You have selected only the old 'canon' driver. However, most #
+    # current Canon camera models require the 'ptp2' driver.       #
+    #                                                              #
+    # Autoselecting the 'ptp2' driver in addition to the 'canon'   #
+    # driver to prevent unnecessary support requests.              #
+    #==============================================================#
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-#
-# Many cameras of several brands are supported by a camlib with a
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the \"ptp2\" camlib
-#   * or even better, just build \"all\" camlibs.
+    #==============================================================#
+    # You have selected only the old 'canon' driver. However, most #
+    # current Canon camera models require the 'ptp2' driver.       #
+    #                                                              #
+    # Autoselecting the 'ptp2' driver in addition to the 'canon'   #
+    # driver to prevent unnecessary support requests.              #
+    #==============================================================#
 " >&2;}
-sleep 2
+	if test -t 1
+then :
+  $gp_sleep 5
 
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define INCOMPLETE_CAMLIB_SET "$BUILD_THESE_CAMLIBS_BASE"
-_ACEOF
 
 fi
-BUILD_THESE_CAMLIBS=""
-for f in $BUILD_THESE_CAMLIBS_BASE
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking with-camlibs requested" >&5
+printf %s "checking with-camlibs requested... " >&6; }
+if test "x$gp_sh_with_camlibs" = xstandard
+then :
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: standard set" >&5
+printf "%s\n" "standard set" >&6; }
+
+else $as_nop
+  	gp_sh_with_camlibs="$(printf "%s\n" "${gp_sh_with_camlibs}" | ${TR} ',' ' ')"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_sh_with_camlibs}" >&5
+printf "%s\n" "${gp_sh_with_camlibs}" >&6; }
+
+fi
+
+
+: > "gp-set-file--m4-camlib-set"
+
+: > "gp-set-file--camlib-set"
+
+for gp_camlib in ${gp_sh_with_camlibs}
 do
-    BUILD_THESE_CAMLIBS="${BUILD_THESE_CAMLIBS}${BUILD_THESE_CAMLIBS+ }${f}.la"
+    case "X$gp_camlib" in #(
+    X-*)
+	operator=remove
+	gp_camlib="$(printf "%s\n" "Y${gp_camlib}" | ${SED} 's/^Y.//')"
+	;; #(
+    X+*)
+	operator=add
+	gp_camlib="$(printf "%s\n" "Y${gp_camlib}" | ${SED} 's/^Y.//')"
+	;; #(
+    XA-Za-z0-9*)
+	operator=add
+	;; #(
+    *)
+	as_fn_error $? "Invalid name given for camlib set or camlib: '${gp_camlib}'" "$LINENO" 5
+	;;
+    esac
+
+        case "$gp_camlib" in #(
+    all)
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+    #=============================================================#
+    # You have used 'all' in the argument to the configure script #
+    # --with-camlibs= parameter.  'all' is a deprecated name for  #
+    # the 'standard' camlib set.                                  #
+    #                                                             #
+    # Please change your call to the configure script to use      #
+    # 'standard' instead.                                         #
+    #=============================================================#
+" >&5
+printf "%s\n" "$as_me: WARNING:
+
+    #=============================================================#
+    # You have used 'all' in the argument to the configure script #
+    # --with-camlibs= parameter.  'all' is a deprecated name for  #
+    # the 'standard' camlib set.                                  #
+    #                                                             #
+    # Please change your call to the configure script to use      #
+    # 'standard' instead.                                         #
+    #=============================================================#
+" >&2;}
+	if test -t 1
+then :
+  $gp_sleep 5
+
+fi
+
+	gp_camlib="standard"
+	;;
+    esac
+
+        case "$operator" in #(
+    add)
+        case "$gp_camlib" in #(
+        standard)
+            gp_set_shfn_union  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-standard"
+
+            gp_set_shfn_union  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-standard"
+
+            ;; #(
+        outdated)
+            gp_set_shfn_union  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-outdated"
+
+            gp_set_shfn_union  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-outdated"
+
+            ;; #(
+        unlisted)
+            gp_set_shfn_union  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-unlisted"
+
+            gp_set_shfn_union  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-unlisted"
+
+            ;; #(
+        everything)
+            gp_set_shfn_union  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-everything"
+
+            gp_set_shfn_union  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-everything"
+
+            ;; #(
+        *)
+	    gp_set_shfn_check "gp-set-file--m4-camlib-set-everything"
+if test "0" -lt "$(${GREP} -c "^"${gp_camlib}"\$" < "gp-set-file--m4-camlib-set-everything")"
+then :
+                  gp_set_shfn_set_add "gp-set-file--m4-camlib-set" ""$gp_camlib""
+
+                gp_set_shfn_set_add "gp-set-file--camlib-set" ""$gp_camlib""
+
+
+else $as_nop
+                  as_fn_error $? "Unknown camlib found in --with-camlibs: '${gp_camlib}'" "$LINENO" 5
+
+fi
+
+            ;;
+        esac
+	;; #(
+    remove)
+        case "$gp_camlib" in #(
+        standard)
+            gp_set_shfn_difference  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-standard"
+
+            gp_set_shfn_difference  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-standard"
+
+            ;; #(
+        outdated)
+            gp_set_shfn_difference  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-outdated"
+
+            gp_set_shfn_difference  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-outdated"
+
+            ;; #(
+        unlisted)
+            gp_set_shfn_difference  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-unlisted"
+
+            gp_set_shfn_difference  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-unlisted"
+
+            ;; #(
+        everything)
+            gp_set_shfn_difference  "gp-set-file--camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-everything"
+
+            gp_set_shfn_difference  "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set" "gp-set-file--m4-camlib-set-everything"
+
+            ;; #(
+        *)
+	    gp_set_shfn_check "gp-set-file--m4-camlib-set-everything"
+if test "0" -lt "$(${GREP} -c "^"${gp_camlib}"\$" < "gp-set-file--m4-camlib-set-everything")"
+then :
+                  gp_set_shfn_remove "gp-set-file--camlib-set" ""$gp_camlib""
+
+	        gp_set_shfn_check "gp-set-file--m4-camlib-set"
+if test "0" -lt "$(${GREP} -c "^"$gp_camlib"\$" < "gp-set-file--m4-camlib-set")"
+then :
+                      gp_set_shfn_remove "gp-set-file--m4-camlib-set" ""$gp_camlib""
+
+
+else $as_nop
+  		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Removing camlib ${gp_camlib} from m4-camlib-set which does not contain ${gp_camlib}" >&5
+printf "%s\n" "$as_me: WARNING: Removing camlib ${gp_camlib} from m4-camlib-set which does not contain ${gp_camlib}" >&2;}
+
+fi
+
+
+else $as_nop
+                  as_fn_error $? "Unknown camlib found in --with-camlibs: '${gp_camlib}'" "$LINENO" 5
+
+fi
+
+            ;;
+        esac
+	;;
+    esac
 done
+{ gp_camlib=; unset gp_camlib;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking with-camlibs parsing" >&5
+printf %s "checking with-camlibs parsing... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: finished" >&5
+printf "%s\n" "finished" >&6; }
+
+
+: > "gp-set-file--camlib-set-diff-skipping"
+
+gp_set_shfn_difference  "gp-set-file--camlib-set-diff-skipping" "gp-set-file--m4-camlib-set" "gp-set-file--camlib-set"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-skipping" >&5
+printf %s "checking value of set camlib-set-diff-skipping... " >&6; }
+gp_set_msg_result_var=""
+gp_set_shfn_check "gp-set-file--camlib-set-diff-skipping"
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read element
+do
+  IFS="$gp_set_saved_ifs"
+  if test "x$gp_set_msg_result_var" = "x"
+then :
+    gp_set_msg_result_var="$element"
 
+else $as_nop
+    gp_set_msg_result_var="$gp_set_msg_result_var $element"
+
+fi
+
+done < "gp-set-file--camlib-set-diff-skipping"
+IFS="$gp_set_saved_ifs"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+
+: > "gp-set-file--camlib-set-diff-over-standard"
+
+gp_set_shfn_difference  "gp-set-file--camlib-set-diff-over-standard" "gp-set-file--camlib-set" "gp-set-file--camlib-set-standard"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-over-standard" >&5
+printf %s "checking value of set camlib-set-diff-over-standard... " >&6; }
+gp_set_msg_result_var=""
+gp_set_shfn_check "gp-set-file--camlib-set-diff-over-standard"
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read element
+do
+  IFS="$gp_set_saved_ifs"
+  if test "x$gp_set_msg_result_var" = "x"
+then :
+    gp_set_msg_result_var="$element"
+
+else $as_nop
+    gp_set_msg_result_var="$gp_set_msg_result_var $element"
+
+fi
+
+done < "gp-set-file--camlib-set-diff-over-standard"
+IFS="$gp_set_saved_ifs"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+
+: > "gp-set-file--camlib-set-diff-from-standard"
+
+gp_set_shfn_difference  "gp-set-file--camlib-set-diff-from-standard" "gp-set-file--camlib-set-standard" "gp-set-file--camlib-set"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-from-standard" >&5
+printf %s "checking value of set camlib-set-diff-from-standard... " >&6; }
+gp_set_msg_result_var=""
+gp_set_shfn_check "gp-set-file--camlib-set-diff-from-standard"
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read element
+do
+  IFS="$gp_set_saved_ifs"
+  if test "x$gp_set_msg_result_var" = "x"
+then :
+    gp_set_msg_result_var="$element"
+
+else $as_nop
+    gp_set_msg_result_var="$gp_set_msg_result_var $element"
+
+fi
+
+done < "gp-set-file--camlib-set-diff-from-standard"
+IFS="$gp_set_saved_ifs"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-skipping" >&5
+printf %s "checking value of set camlib-set-diff-skipping... " >&6; }
+gp_set_shfn_debug_var "gp-set-file--camlib-set-diff-skipping" "gp_set_msg_result_var"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-from-standard" >&5
+printf %s "checking value of set camlib-set-diff-from-standard... " >&6; }
+gp_set_shfn_debug_var "gp-set-file--camlib-set-diff-from-standard" "gp_set_msg_result_var"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking value of set camlib-set-diff-over-standard" >&5
+printf %s "checking value of set camlib-set-diff-over-standard... " >&6; }
+gp_set_shfn_debug_var "gp-set-file--camlib-set-diff-over-standard" "gp_set_msg_result_var"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_set_msg_result_var}" >&5
+printf "%s\n" "${gp_set_msg_result_var}" >&6; }
+
+
+
+gp_camlib_set_skipping=""
+gp_set_shfn_check "gp-set-file--camlib-set-diff-skipping"
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read element
+do
+  IFS="$gp_set_saved_ifs"
+  if test "x$gp_camlib_set_skipping" = "x"
+then :
+    gp_camlib_set_skipping="$element"
+
+else $as_nop
+    gp_camlib_set_skipping="$gp_camlib_set_skipping $element"
+
+fi
+
+done < "gp-set-file--camlib-set-diff-skipping"
+IFS="$gp_set_saved_ifs"
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether skipping some requested camlibs" >&5
+printf %s "checking whether skipping some requested camlibs... " >&6; }
+if test "x$gp_camlib_set_skipping" = "x"
+then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+else $as_nop
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (${gp_camlib_set_skipping})" >&5
+printf "%s\n" "yes (${gp_camlib_set_skipping})" >&6; }
+
+printf "%s\n" "#define GP_CAMLIB_SET_SKIPPING \"${gp_camlib_set_skipping}\"" >>confdefs.h
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+    #=========================================================#
+    # We are skipping building one or more camlibs, probably  #
+    # due to missing dependencies.  Check the dependencies if #
+    # you insist on building these camlibs.                   #
+    #=========================================================#
+" >&5
+printf "%s\n" "$as_me: WARNING:
+
+    #=========================================================#
+    # We are skipping building one or more camlibs, probably  #
+    # due to missing dependencies.  Check the dependencies if #
+    # you insist on building these camlibs.                   #
+    #=========================================================#
+" >&2;}
+    if test -t 1
+then :
+  $gp_sleep 5
+
+fi
+
+
+fi
+
+gp_camlib_set=""
+gp_set_shfn_check "gp-set-file--camlib-set"
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read element
+do
+  IFS="$gp_set_saved_ifs"
+  if test "x$gp_camlib_set" = "x"
+then :
+    gp_camlib_set="$element"
+
+else $as_nop
+    gp_camlib_set="$gp_camlib_set $element"
+
+fi
+
+done < "gp-set-file--camlib-set"
+IFS="$gp_set_saved_ifs"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking camlib set to build in detail" >&5
+printf %s "checking camlib set to build in detail... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${gp_camlib_set}" >&5
+printf "%s\n" "${gp_camlib_set}" >&6; }
+
+if test "x$gp_sh_with_camlibs" = xstandard
+then :
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+  #=====================================================================#
+  # Caution: You have chosen to build a non-standard set of camlibs.    #
+  #          You may have disabled the camlib required for your camera, #
+  #          or enabled a camlib which does *not* work and overrides    #
+  #          the camlib which *does* work. Consequently,                #
+  #          YOUR CAMERA MAY NOT WORK!                                  #
+  #                                                                     #
+  # Many cameras of several brands are supported by a camlib with a     #
+  # name different from the name of the camera brand or model. If you   #
+  # are unsure, please                                                  #
+  #   * enable at least the 'ptp2' camlib                               #
+  #   * or even better, just build the standard set of camlibs.         #
+  #=====================================================================#
+" >&5
+printf "%s\n" "$as_me: WARNING:
+
+  #=====================================================================#
+  # Caution: You have chosen to build a non-standard set of camlibs.    #
+  #          You may have disabled the camlib required for your camera, #
+  #          or enabled a camlib which does *not* work and overrides    #
+  #          the camlib which *does* work. Consequently,                #
+  #          YOUR CAMERA MAY NOT WORK!                                  #
+  #                                                                     #
+  # Many cameras of several brands are supported by a camlib with a     #
+  # name different from the name of the camera brand or model. If you   #
+  # are unsure, please                                                  #
+  #   * enable at least the 'ptp2' camlib                               #
+  #   * or even better, just build the standard set of camlibs.         #
+  #=====================================================================#
+" >&2;}
+if test -t 1
+then :
+  $gp_sleep 5
+
+fi
+
+
+
+fi
+
+
+gp_set_shfn_canonicalize "gp-set-file--camlib-set"
+gp_set_shfn_canonicalize "gp-set-file--camlib-set-standard"
+if ${CMP} "gp-set-file--camlib-set" "gp-set-file--camlib-set-standard" > /dev/null 2>&1
+then :
+      if test "x$gp_camlib_set_skipping" = "x"
+then :
+
+gp_config_msg_len="$(expr "Camlibs" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "Camlibs" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "Camlibs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} standard set (${gp_camlib_set})
+"
 
 
+else $as_nop
 
 gp_config_msg_len="$(expr "Camlibs" : '.*')"
 if test "$gp_config_msg_len" -ge "$gp_config_len"; then
@@ -22348,69 +27832,73 @@
 else
 	gp_config_msg_lhs="$(expr "Camlibs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
 fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${camlibs}
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} standard set (${gp_camlib_set} SKIPPING ${gp_camlib_set_skipping})
 "
 
 
+fi
+
+else $as_nop
+      if test "x$gp_camlib_set_skipping" = "x"
+then :
 
+gp_config_msg_len="$(expr "Camlibs" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "Camlibs" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "Camlibs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} non-standard set (${gp_camlib_set})
+"
 
 
+else $as_nop
 
-# Check whether --with-doc-dir was given.
-if test "${with_doc_dir+set}" = set; then :
-  withval=$with_doc_dir;
+gp_config_msg_len="$(expr "Camlibs" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "Camlibs" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "Camlibs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
 fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} non-standard set (${gp_camlib_set} SKIPPING ${gp_camlib_set_skipping})
+"
+
+
+fi
+
+printf "%s\n" "#define GP_CAMLIB_SET_IS_NONSTANDARD 1" >>confdefs.h
 
 
-# check for the main ("root") documentation directory
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking main docdir" >&5
-$as_echo_n "checking main docdir... " >&6; }
-
-if test "x${with_doc_dir}" != "x"
-then # docdir is given as parameter
-    docdir="${with_doc_dir}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (from parameter)" >&5
-$as_echo "${docdir} (from parameter)" >&6; }
-else # otherwise invent a docdir hopefully compatible with system policy
-    if test -d "/usr/share/doc"
-    then
-        maindocdir='${prefix}/share/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (FHS style)" >&5
-$as_echo "${maindocdir} (FHS style)" >&6; }
-    elif test -d "/usr/doc"
-    then
-        maindocdir='${prefix}/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (old style)" >&5
-$as_echo "${maindocdir} (old style)" >&6; }
-    else
-        maindocdir='${datadir}/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (default value)" >&5
-$as_echo "${maindocdir} (default value)" >&6; }
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking package docdir" >&5
-$as_echo_n "checking package docdir... " >&6; }
-    # check whether to include package version into documentation path
-    # FIXME: doesn't work properly.
-    if ls -d /usr/{share/,}doc/make-0-9* > /dev/null 2>&1
-    then
-        docdir="${maindocdir}/${PACKAGE}-${VERSION}"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (redhat style)" >&5
-$as_echo "${docdir} (redhat style)" >&6; }
-    else
-        docdir="${maindocdir}/${PACKAGE}"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (default style)" >&5
-$as_echo "${docdir} (default style)" >&6; }
-    fi
 fi
 
 
-# Extract the first word of "dot", so it can be a program name with args.
+printf "%s\n" "#define GP_CAMLIB_SET \"${gp_camlib_set}\"" >>confdefs.h
+
+
+{ GP_CAMLIB_SET=; unset GP_CAMLIB_SET;}
+for f in ${gp_camlib_set}
+do
+    GP_CAMLIB_SET="${GP_CAMLIB_SET}${GP_CAMLIB_SET+ }${f}.la"
+done
+{ f=; unset f;}
+
+
+GP_CAMLIB_SET_EVERYTHING="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 digita dimera3500 directory docupen enigma13 fuji gsmart300 hp215 iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan lg_gsm lumix mars dimagev mustek panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template topfield toshiba_pdrm11 tp6801"
+
+
+# END GP_CAMLIBS_DEFINE()
+
+
+if ${DOT:+false} :
+then :
+  # Extract the first word of "dot", so it can be a program name with args.
 set dummy dot; 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_DOT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DOT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DOT in
   \\/* | ?:\\/*)
   ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
@@ -22420,38 +27908,68 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_DOT" && ac_cv_path_DOT="false"
+  test -z "$ac_cv_path_DOT" && ac_cv_path_DOT="no"
   ;;
 esac
 fi
 DOT=$ac_cv_path_DOT
 if test -n "$DOT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
-$as_echo "$DOT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
+printf "%s\n" "$DOT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-# Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; 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_DOXYGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
+fi
+
+ if test "x$DOT" != xno; then
+  HAVE_DOT_TRUE=
+  HAVE_DOT_FALSE='#'
 else
+  HAVE_DOT_TRUE='#'
+  HAVE_DOT_FALSE=
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HAVE_DOT" >&5
+printf %s "checking HAVE_DOT... " >&6; }
+if test -z "$HAVE_DOT_TRUE"; then :
+    gp_config_msg_dot=", using dot (${DOT})"
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($DOT)" >&5
+printf "%s\n" "yes ($DOT)" >&6; }
+
+else
+    gp_config_msg_dot=", not using dot"
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+if ${DOXYGEN:+false} :
+then :
+  # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DOXYGEN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DOXYGEN in
   \\/* | ?:\\/*)
   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
@@ -22461,32 +27979,38 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOXYGEN="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$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_DOXYGEN" && ac_cv_path_DOXYGEN="false"
+  test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="no"
   ;;
 esac
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
 if test -n "$DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+printf "%s\n" "$DOXYGEN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
- if test "x$DOXYGEN" != "xfalse"; then
+fi
+
+ if test "x$DOXYGEN" != xno; then
   HAVE_DOXYGEN_TRUE=
   HAVE_DOXYGEN_FALSE='#'
 else
@@ -22494,19 +28018,42 @@
   HAVE_DOXYGEN_FALSE=
 fi
 
- if test "x$DOT" != "xfalse"; then
-  HAVE_DOT_TRUE=
-  HAVE_DOT_FALSE='#'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HAVE_DOXYGEN" >&5
+printf %s "checking HAVE_DOXYGEN... " >&6; }
+if test -z "$HAVE_DOXYGEN_TRUE"; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($DOXYGEN)${gp_config_msg_dot})" >&5
+printf "%s\n" "yes ($DOXYGEN)${gp_config_msg_dot})" >&6; }
+
+gp_config_msg_len="$(expr "build doxygen docs" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "build doxygen docs" : "$.\{0,${gp_config_len3}\}$")..:"
 else
-  HAVE_DOT_TRUE='#'
-  HAVE_DOT_FALSE=
+	gp_config_msg_lhs="$(expr "build doxygen docs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
+"
+
+
+else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+gp_config_msg_len="$(expr "build doxygen docs" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "build doxygen docs" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "build doxygen docs:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
 fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} no
+"
 
-if test "x$DOT" != "xfalse"; then
-	HAVE_DOT=YES
+
+fi
+if test -z "$HAVE_DOT_TRUE"; then :
+  HAVE_DOT=YES
 
 else
-	HAVE_DOT=NO
+  HAVE_DOT=NO
 
 fi
 HTML_APIDOC_DIR="${PACKAGE_TARNAME}-api.html"
@@ -22521,7 +28068,8 @@
 # graphs, so it is disabled by default.
 set_enable_internal_docs=no
 # Check whether --enable-internal-docs was given.
-if test "${enable_internal_docs+set}" = set; then :
+if test ${enable_internal_docs+y}
+then :
   enableval=$enable_internal_docs;   if   test "x$enableval" = xno \
     || test "x$enableval" = xoff \
     || test "x$enableval" = xfalse;
@@ -22536,10 +28084,10 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to create internal code docs" >&5
-$as_echo_n "checking whether to create internal code docs... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${set_enable_internal_docs}" >&5
-$as_echo "${set_enable_internal_docs}" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to create internal code docs" >&5
+printf %s "checking whether to create internal code docs... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${set_enable_internal_docs}" >&5
+printf "%s\n" "${set_enable_internal_docs}" >&6; }
  if test "x${set_enable_internal_docs}" = "xyes"; then
   ENABLE_INTERNAL_DOCS_TRUE=
   ENABLE_INTERNAL_DOCS_FALSE='#'
@@ -22548,19 +28096,16 @@
   ENABLE_INTERNAL_DOCS_FALSE=
 fi
 
-
-# docdir has to be determined in advance
-
-
 # ---------------------------------------------------------------------------
 # gtk-doc: We use gtk-doc for building our documentation. However, we
-#          require the user to explicitely request the build.
+#          require the user to explicitly request the build.
 # ---------------------------------------------------------------------------
 try_gtkdoc=false
 gtkdoc_msg="no (not requested)"
 have_gtkdoc=false
 # Check whether --enable-docs was given.
-if test "${enable_docs+set}" = set; then :
+if test ${enable_docs+y}
+then :
   enableval=$enable_docs;
 	if test x$enableval = xyes; then
 		try_gtkdoc=true
@@ -22571,11 +28116,12 @@
 if $try_gtkdoc; then
 	# Extract the first word of "gtkdoc-mkdb", so it can be a program name with args.
 set dummy gtkdoc-mkdb; 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_GTKDOC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GTKDOC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GTKDOC in
   \\/* | ?:\\/*)
   ac_cv_path_GTKDOC="$GTKDOC" # Let the user override the test with a path.
@@ -22585,11 +28131,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTKDOC="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22601,11 +28151,11 @@
 fi
 GTKDOC=$ac_cv_path_GTKDOC
 if test -n "$GTKDOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC" >&5
-$as_echo "$GTKDOC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC" >&5
+printf "%s\n" "$GTKDOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -22635,114 +28185,13 @@
 "
 
 
-
-# ---------------------------------------------------------------------------
-# Give the user the possibility to install html documentation in a
-# user-defined location.
-# ---------------------------------------------------------------------------
-
-# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then :
-  withval=$with_html_dir;
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html dir" >&5
-$as_echo_n "checking for html dir... " >&6; }
-if test "x${with_html_dir}" = "x" ; then
-    htmldir="${docdir}/html"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${htmldir} (default)" >&5
-$as_echo "${htmldir} (default)" >&6; }
-else
-    htmldir="${with_html_dir}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${htmldir} (from parameter)" >&5
-$as_echo "${htmldir} (from parameter)" >&6; }
-fi
-
 apidocdir="${htmldir}/api"
 
-
 camlibdocdir='${docdir}/camlibs'
 
 
 
 
-
-# Check whether --with-rpmbuild was given.
-if test "${with_rpmbuild+set}" = set; then :
-  withval=$with_rpmbuild;
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmbuild or rpm" >&5
-$as_echo_n "checking for rpmbuild or rpm... " >&6; }
-if test -x "${with_rpmbuild}"
-then
-    RPMBUILD="${with_rpmbuild}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${RPMBUILD} (from parameter)" >&5
-$as_echo "${RPMBUILD} (from parameter)" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using autodetection" >&5
-$as_echo "using autodetection" >&6; }
-    for ac_prog in rpmbuild rpm
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_RPMBUILD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RPMBUILD"; then
-  ac_cv_prog_RPMBUILD="$RPMBUILD" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RPMBUILD="$ac_prog"
-    $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
-
-fi
-fi
-RPMBUILD=$ac_cv_prog_RPMBUILD
-if test -n "$RPMBUILD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5
-$as_echo "$RPMBUILD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$RPMBUILD" && break
-done
-test -n "$RPMBUILD" || RPMBUILD="false"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmbuild or rpm" >&5
-$as_echo_n "checking for rpmbuild or rpm... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${RPMBUILD} (autodetected)" >&5
-$as_echo "${RPMBUILD} (autodetected)" >&6; }
-fi
-
- if test "$RPMBUILD" != "false"; then
-  ENABLE_RPM_TRUE=
-  ENABLE_RPM_FALSE='#'
-else
-  ENABLE_RPM_TRUE='#'
-  ENABLE_RPM_FALSE=
-fi
-
-
-
 	# effective_target has to be determined in advance
 
 
@@ -22761,29 +28210,26 @@
 fi
 
 
-	# required for docdir
-	# FIXME: Implicit dependency
-	# AC_REQUIRE(GP_CHECK_DOC_DIR)
-
 
 # Check whether --with-hotplug-doc-dir was given.
-if test "${with_hotplug_doc_dir+set}" = set; then :
+if test ${with_hotplug_doc_dir+y}
+then :
   withval=$with_hotplug_doc_dir;
 fi
 
 
 	if "$is_linux"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hotplug doc dir" >&5
-$as_echo_n "checking for hotplug doc dir... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hotplug doc dir" >&5
+printf %s "checking for hotplug doc dir... " >&6; }
 		if test "x${with_hotplug_doc_dir}" != "x"
 		then # given as parameter
 		    hotplugdocdir="${with_hotplug_doc_dir}"
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${hotplugdocdir} (from parameter)" >&5
-$as_echo "${hotplugdocdir} (from parameter)" >&6; }
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${hotplugdocdir} (from parameter)" >&5
+printf "%s\n" "${hotplugdocdir} (from parameter)" >&6; }
 		else # start at docdir
 		    hotplugdocdir="${docdir}/linux-hotplug"
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${hotplugdocdir} (default)" >&5
-$as_echo "${hotplugdocdir} (default)" >&6; }
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${hotplugdocdir} (default)" >&5
+printf "%s\n" "${hotplugdocdir} (default)" >&6; }
 		fi
 	else
 		hotplugdocdir=""
@@ -22791,23 +28237,24 @@
 
 
 # Check whether --with-hotplug-usermap-dir was given.
-if test "${with_hotplug_usermap_dir+set}" = set; then :
+if test ${with_hotplug_usermap_dir+y}
+then :
   withval=$with_hotplug_usermap_dir;
 fi
 
 
 	if "$is_linux"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hotplug usermap dir" >&5
-$as_echo_n "checking for hotplug usermap dir... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hotplug usermap dir" >&5
+printf %s "checking for hotplug usermap dir... " >&6; }
 		if test "x${with_hotplug_usermap_dir}" != "x"
 		then # given as parameter
 		    hotplugusermapdir="${with_hotplug_usermap_dir}"
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${hotplugusermapdir} (from parameter)" >&5
-$as_echo "${hotplugusermapdir} (from parameter)" >&6; }
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${hotplugusermapdir} (from parameter)" >&5
+printf "%s\n" "${hotplugusermapdir} (from parameter)" >&6; }
 		else # start at docdir
 		    hotplugusermapdir="${docdir}/linux-hotplug"
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${hotplugusermapdir} (default)" >&5
-$as_echo "${hotplugusermapdir} (default)" >&6; }
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${hotplugusermapdir} (default)" >&5
+printf "%s\n" "${hotplugusermapdir} (default)" >&6; }
 		fi
 	else
 		hotplugusermapdir=""
@@ -22833,8 +28280,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif to use" >&5
-$as_echo_n "checking for libexif to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif to use" >&5
+printf %s "checking for libexif to use... " >&6; }
 REQUIREMENTS_FOR_LIBEXIF="libexif >= 0.6.13"
 userdef_LIBEXIF=no
 have_LIBEXIF=no
@@ -22843,7 +28290,8 @@
 				try_LIBEXIF=auto
 
 # Check whether --with-libexif was given.
-if test "${with_libexif+set}" = set; then :
+if test ${with_libexif+y}
+then :
   withval=$with_libexif; try_LIBEXIF="$withval"
 fi
 
@@ -22851,8 +28299,8 @@
               REQUIREMENTS_FOR_LIBEXIF=
 	fi
 	if test "x${try_LIBEXIF}" = "xauto"; then try_LIBEXIF=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBEXIF}" >&5
-$as_echo "${try_LIBEXIF}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBEXIF}" >&5
+printf "%s\n" "${try_LIBEXIF}" >&6; }
 		if test "x${try_LIBEXIF}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -22860,17 +28308,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif >= 0.6.13" >&5
-$as_echo_n "checking for libexif >= 0.6.13... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF" >&5
+printf %s "checking for LIBEXIF... " >&6; }
 
 if test -n "$LIBEXIF_CFLAGS"; then
     pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexif >= 0.6.13") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.13" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22884,10 +28332,10 @@
     pkg_cv_LIBEXIF_LIBS="$LIBEXIF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexif >= 0.6.13") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.13" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22901,8 +28349,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -22919,31 +28367,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
 	LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBEXIF=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBEXIF}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif config program" >&5
-$as_echo_n "checking libexif config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif config program" >&5
+printf %s "checking libexif config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy none; 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_LIBEXIF_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBEXIF_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBEXIF_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBEXIF_CONFIG_PROG="$LIBEXIF_CONFIG_PROG" # Let the user override the test with a path.
@@ -22953,11 +28402,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBEXIF_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBEXIF_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22969,19 +28422,19 @@
 fi
 LIBEXIF_CONFIG_PROG=$ac_cv_path_LIBEXIF_CONFIG_PROG
 if test -n "$LIBEXIF_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXIF_CONFIG_PROG" >&5
-$as_echo "$LIBEXIF_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBEXIF_CONFIG_PROG" >&5
+printf "%s\n" "$LIBEXIF_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBEXIF_CONFIG_PROG}" &&
 				test "${LIBEXIF_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif version according to none" >&5
-$as_echo_n "checking for libexif version according to none... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif version according to none" >&5
+printf %s "checking for libexif version according to none... " >&6; }
 								_LIBEXIF_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBEXIF_REQ_1="0"
@@ -22994,8 +28447,8 @@
 				_LIBEXIF_VER_2="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBEXIF_VER_3="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBEXIF_VER_4="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBEXIF_VERSION}" >&5
-$as_echo "${_LIBEXIF_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBEXIF_VERSION}" >&5
+printf "%s\n" "${_LIBEXIF_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBEXIF_VER_1}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_1}"; then _tmp=true;
 				elif test "${_LIBEXIF_VER_2}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_2}"; then _tmp=true;
@@ -23003,28 +28456,28 @@
 				elif test "x${_LIBEXIF_VER_4}" = "x" && test "x${_LIBEXIF_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBEXIF_VER_4}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libexif version is matching requirement >= 0.6.13" >&5
-$as_echo_n "checking if libexif version is matching requirement >= 0.6.13... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libexif version is matching requirement >= 0.6.13" >&5
+printf %s "checking if libexif version is matching requirement >= 0.6.13... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement libexif >= 0.6.13 not met. Found: ${_LIBEXIF_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif parameters from none" >&5
-$as_echo_n "checking for libexif parameters from none... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif parameters from none" >&5
+printf %s "checking for libexif parameters from none... " >&6; }
 				LIBEXIF_LIBS="$(${LIBEXIF_CONFIG_PROG} --libs || echo "*error*")"
 				LIBEXIF_CFLAGS="$(${LIBEXIF_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBEXIF_LIBS}" = "*error*" ||
 					test "x${LIBEXIF_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBEXIF=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -23034,32 +28487,32 @@
 	else
 		# We've been given a prefix to look in for library libexif.
 		# We start looking for libexif.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif.la file in ${try_LIBEXIF}" >&5
-$as_echo_n "checking for libexif.la file in ${try_LIBEXIF}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif.la file in ${try_LIBEXIF}" >&5
+printf %s "checking for libexif.la file in ${try_LIBEXIF}... " >&6; }
 		if test -f "${try_LIBEXIF}/lib/libexif.la"; then
 			LIBEXIF_LIBS="${try_LIBEXIF}/lib/libexif.la"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
-$as_echo "libtool file $LIBEXIF_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBEXIF_LIBS (good)" >&6; }
 			have_LIBEXIF=yes
 		elif test -f "${try_LIBEXIF}/lib64/libexif.la"; then # HACK
 			LIBEXIF_LIBS="${try_LIBEXIF}/lib64/libexif.la"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
-$as_echo "libtool file $LIBEXIF_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBEXIF_LIBS (good)" >&6; }
 			have_LIBEXIF=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBEXIF" >&5
-$as_echo "wild guess that something is in $try_LIBEXIF" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBEXIF" >&5
+printf "%s\n" "wild guess that something is in $try_LIBEXIF" >&6; }
 			LIBEXIF_LIBS="-L${try_LIBEXIF}/lib -l$(echo "libexif" | sed 's/^lib//')"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
 			have_LIBEXIF=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file libexif.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file libexif.la could not be found.
 *   We may be linking against the WRONG library.
@@ -23067,13 +28520,13 @@
 		fi
 	fi
 elif test "x${LIBEXIF_LIBS}" != "x" && test "x${LIBEXIF_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBEXIF=yes
 	have_LIBEXIF=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -23086,8 +28539,8 @@
 if test "x${have_LIBEXIF}" = "xyes"; then
 # ACTION-IF-FOUND
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we use a version of libexif with ExifData.ifd" >&5
-$as_echo_n "checking whether we use a version of libexif with ExifData.ifd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we use a version of libexif with ExifData.ifd" >&5
+printf %s "checking whether we use a version of libexif with ExifData.ifd... " >&6; }
 # Check for libexif version
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$LIBEXIF_CFLAGS"
@@ -23101,40 +28554,39 @@
 #include <libexif/exif-content.h>
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_LIBEXIF_IFD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEXIF_IFD 1" >>confdefs.h
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CPPFLAGS="$CPPFLAGS_save"
 
 fi
 if test "x${have_LIBEXIF}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBEXIF_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default"
-if test "x$ac_cv_header_libexif_exif_data_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default"
+if test "x$ac_cv_header_libexif_exif_data_h" = xyes
+then :
   have_LIBEXIF=yes
-else
+else $as_nop
   have_LIBEXIF=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBEXIF}" = "xno" && test "x${have_LIBEXIF}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function exif_data_new in libexif" >&5
-$as_echo_n "checking for function exif_data_new in libexif... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function exif_data_new in libexif" >&5
+printf %s "checking for function exif_data_new in libexif... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBEXIF_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23143,28 +28595,26 @@
 /* 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 exif_data_new ();
 int
-main ()
+main (void)
 {
 return exif_data_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBEXIF=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBEXIF}" >&5
-$as_echo "${have_LIBEXIF}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBEXIF}" >&5
+printf "%s\n" "${have_LIBEXIF}" >&6; }
 fi
  if test "x$have_LIBEXIF" = "xyes"; then
   HAVE_LIBEXIF_TRUE=
@@ -23176,7 +28626,7 @@
 
 if test "x$have_LIBEXIF" = "xyes"; then
 
-$as_echo "#define HAVE_LIBEXIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEXIF 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "libexif" : '.*')"
@@ -23187,14 +28637,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif library flags" >&5
-$as_echo_n "checking libexif library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_LIBS}\"" >&5
-$as_echo "\"${LIBEXIF_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif cpp flags" >&5
-$as_echo_n "checking libexif cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_CFLAGS}\"" >&5
-$as_echo "\"${LIBEXIF_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif library flags" >&5
+printf %s "checking libexif library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_LIBS}\"" >&5
+printf "%s\n" "\"${LIBEXIF_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif cpp flags" >&5
+printf %s "checking libexif cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBEXIF_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBEXIF=
 
@@ -23209,16 +28659,6 @@
 fi
 
 
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
-  HAVE_CXX_TRUE=
-  HAVE_CXX_FALSE='#'
-else
-  HAVE_CXX_TRUE='#'
-  HAVE_CXX_FALSE=
-fi
-
-
-
 if test -d "$srcdir/libgphoto2_port"; then
 
 
@@ -23226,16 +28666,24 @@
 
 else
 	as_fn_error $? "
-*** Hey, where have you hidden my libgphoto2_port?
-*** I needed that!
+******************************************************
+*** Hey, where have you hidden my libgphoto2_port? ***
+*** I needed that!                                 ***
+******************************************************
 " "$LINENO" 5
 fi
 
 
 # ---------------------------------------------------------------------------
+# clean up
+# ---------------------------------------------------------------------------
+rm -f "gp-set-file--camlib-set-standard" "gp-set-file--camlib-set-unlisted" "gp-set-file--camlib-set-outdated" "gp-set-file--m4-camlib-set-everything" "gp-set-file--m4-camlib-set-standard" "gp-set-file--m4-camlib-set-outdated" "gp-set-file--m4-camlib-set-unlisted" "gp-set-file--camlib-set-everything" "gp-set-file--m4-camlib-set" "gp-set-file--camlib-set" "gp-set-file--camlib-set-diff-skipping" "gp-set-file--camlib-set-diff-over-standard" "gp-set-file--camlib-set-diff-from-standard"
+
+
+# ---------------------------------------------------------------------------
 # Create output files
 # ---------------------------------------------------------------------------
-ac_config_files="$ac_config_files Makefile gphoto2-config camlibs/Makefile camlibs/canon/doc/Makefile camlibs/konica/localization/Makefile gphoto-m4/Makefile libgphoto2/Makefile libgphoto2.pc libgphoto2-uninstalled.pc examples/Makefile tests/Makefile tests/ddb/Makefile tests/ddb/check-ddb.sh packaging/Makefile packaging/linux-hotplug/Makefile packaging/generic/Makefile packaging/rpm/Makefile packaging/rpm/package.spec po/Makefile.in doc/Makefile doc/Doxyfile doc/Doxyfile-internals doc/api/Makefile"
+ac_config_files="$ac_config_files Makefile gphoto2-config camlibs/Makefile camlibs/canon/doc/Makefile libgphoto2/Makefile libgphoto2.pc libgphoto2-uninstalled.pc examples/Makefile tests/Makefile packaging/Makefile packaging/generic/Makefile po/Makefile.in doc/Makefile doc/Doxyfile doc/Doxyfile-internals doc/api/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23264,8 +28712,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -23295,15 +28743,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
+     s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
      t end
      s/^$^=*$=$.*$$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -23317,8 +28765,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -23335,7 +28783,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -23346,14 +28794,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -23374,18 +28822,66 @@
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_RSYNC_TRUE}" && test -z "${HAVE_RSYNC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_RSYNC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_C90_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_C90_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_C90\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_C99_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_C99_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_C99\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_C11_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_C11_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_C11\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_C2X_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_C2X_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_C2X\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX98_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX98_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_CXX98\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX11_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX11_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_CXX11\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX14_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX14_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_CXX14\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX17_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX17_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_CXX17\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX20_TRUE}" && test -z "${GP_HAVE_PEDANTIC_FLAGS_CXX20_FALSE}"; then
+  as_fn_error $? "conditional \"GP_HAVE_PEDANTIC_FLAGS_CXX20\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_GCC_TRUE}" && test -z "${HAVE_GCC_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_GCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLED_GP2DDB_TRUE}" && test -z "${ENABLED_GP2DDB_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLED_GP2DDB\" was never defined.
+if test -z "${HAVE_ASM_SYMVER_TRUE}" && test -z "${HAVE_ASM_SYMVER_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ASM_SYMVER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBXML2_TRUE}" && test -z "${HAVE_LIBXML2_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBXML2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LIBCURL_TRUE}" && test -z "${HAVE_LIBCURL_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LIBCURL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LIBGD_TRUE}" && test -z "${HAVE_LIBGD_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBGD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23395,14 +28891,14 @@
   as_fn_error $? "conditional \"HAVE_UDEV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_DOT_TRUE}" && test -z "${HAVE_DOT_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_DOT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_INTERNAL_DOCS_TRUE}" && test -z "${ENABLE_INTERNAL_DOCS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_INTERNAL_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23411,10 +28907,6 @@
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_RPM_TRUE}" && test -z "${ENABLE_RPM_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_RPM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_LINUX_TRUE}" && test -z "${HAVE_LINUX_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23423,17 +28915,13 @@
   as_fn_error $? "conditional \"HAVE_LIBEXIF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -23456,14 +28944,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -23473,46 +28963,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -23521,13 +29011,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -23536,8 +29019,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -23549,30 +29036,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -23585,13 +29052,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -23618,18 +29086,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -23641,12 +29111,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -23677,7 +29148,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -23699,6 +29170,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -23712,6 +29187,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -23753,7 +29234,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -23762,7 +29243,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -23824,8 +29305,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libgphoto2 photo camera library $as_me 2.5.18, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by libgphoto2 photo camera library $as_me 2.5.31, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -23887,14 +29368,16 @@
 Report bugs to <gphoto-devel@lists.sourceforge.net>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-libgphoto2 photo camera library config.status 2.5.18
-configured by $0, generated by GNU Autoconf 2.69,
+libgphoto2 photo camera library config.status 2.5.31
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -23934,15 +29417,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -23950,7 +29433,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -23959,7 +29442,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -23987,7 +29470,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -24001,7 +29484,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -24009,7 +29492,7 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -24019,12 +29502,12 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -24056,12 +29539,14 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -24239,13 +29724,13 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
+FILECMD \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
-AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -24395,14 +29880,7 @@
 
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -24419,26 +29897,18 @@
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-    "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "gphoto2-config") CONFIG_FILES="$CONFIG_FILES gphoto2-config" ;;
     "camlibs/Makefile") CONFIG_FILES="$CONFIG_FILES camlibs/Makefile" ;;
     "camlibs/canon/doc/Makefile") CONFIG_FILES="$CONFIG_FILES camlibs/canon/doc/Makefile" ;;
-    "camlibs/konica/localization/Makefile") CONFIG_FILES="$CONFIG_FILES camlibs/konica/localization/Makefile" ;;
-    "gphoto-m4/Makefile") CONFIG_FILES="$CONFIG_FILES gphoto-m4/Makefile" ;;
     "libgphoto2/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2/Makefile" ;;
     "libgphoto2.pc") CONFIG_FILES="$CONFIG_FILES libgphoto2.pc" ;;
     "libgphoto2-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libgphoto2-uninstalled.pc" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "tests/ddb/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ddb/Makefile" ;;
-    "tests/ddb/check-ddb.sh") CONFIG_FILES="$CONFIG_FILES tests/ddb/check-ddb.sh" ;;
     "packaging/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/Makefile" ;;
-    "packaging/linux-hotplug/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/linux-hotplug/Makefile" ;;
     "packaging/generic/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/generic/Makefile" ;;
-    "packaging/rpm/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/rpm/Makefile" ;;
-    "packaging/rpm/package.spec") CONFIG_FILES="$CONFIG_FILES packaging/rpm/package.spec" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
@@ -24455,9 +29925,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -24492,7 +29962,24 @@
 # This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+  ac_cs_awk_getline=:
+  ac_cs_awk_pipe_init=
+  ac_cs_awk_read_file='
+      while ((getline aline < (Fkey)) > 0)
+	print(aline)
+      close(Fkey)'
+  ac_cs_awk_pipe_fini=
+else
+  ac_cs_awk_getline=false
+  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+  ac_cs_awk_read_file='
+      print "|#_!!_#|"
+      print "cat " Fkey " &&"
+      '$ac_cs_awk_pipe_init
+  # The final `:' finishes the AND list.
+  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+fi
 ac_cr=`echo X | tr X '\015'`
 # On cygwin, bash can eat \r inside `` if the user requested igncr.
 # But we know of no other shell where ac_cr would be empty at this
@@ -24510,6 +29997,17 @@
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
+# Create commands to substitute file output variables.
+{
+  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo "$ac_subst_files" | sed 's/.*/F"&"="$&"/' &&
+  echo "_ACAWK" &&
+  echo "_ACEOF"
+} >conf$$files.sh &&
+. ./conf$$files.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
 
 {
   echo "cat >conf$$subs.awk <<_ACEOF" &&
@@ -24586,7 +30084,7 @@
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_setkey = 1
   FS = "&#x7;"
-
+  \$ac_cs_awk_pipe_init
 }
 {
   line = $ 0
@@ -24604,10 +30102,16 @@
     } else
       len += 1 + keylen
   }
-
+  if (nfields == 3 && !substed) {
+    key = field2
+    if (Fkey != "" && line ~ /^	 *@.*@	 *$/) {
+      \$ac_cs_awk_read_file
+      next
+    }
+  }
   print line
 }
-
+\$ac_cs_awk_pipe_fini
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -24793,7 +30297,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -24801,17 +30305,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/\\\\&|/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -24828,7 +30332,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -24852,9 +30356,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -24916,8 +30420,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -24954,16 +30458,21 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+if $ac_cs_awk_getline; then
+  $AWK -f "$ac_tmp/subs.awk"
+else
+  $AWK -f "$ac_tmp/subs.awk" | $SHELL
+fi \
   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -24979,20 +30488,20 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -25012,7 +30521,7 @@
 	 X"$_am_arg" : 'X$//$^/' \| \
 	 X"$_am_arg" : 'X$//$$' \| \
 	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+printf "%s\n" X"$_am_arg" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -25032,8 +30541,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -25043,29 +30552,35 @@
   # Older Autoconf 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
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_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
+    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: 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" ||
-$as_expr X"$mf" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$mf" : 'X$//$^/' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$am_mf" : 'X$//$^/' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+printf "%s\n" X"$am_mf" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -25083,53 +30598,50 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    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"`
-    # 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'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$file" : 'X$//$^/' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/$^/^/*$/*$' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+printf "%s\n" X/"$am_mf" |
+    sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/\/$$/{
+	  /^X\/$\/\/$$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/$.*/{
+	  /^X\/$\/$.*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE=\"gmake\" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)
@@ -25183,6 +30695,10 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
@@ -25195,10 +30711,6 @@
 # Object dumper program.
 OBJDUMP=$lt_OBJDUMP
 
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -25275,6 +30787,9 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# A file(cmd) program that detects file types.
+FILECMD=$lt_FILECMD
+
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -25293,8 +30808,11 @@
 # The archiver.
 AR=$lt_AR
 
+# Flags to create an archive (by configure).
+lt_ar_flags=$lt_ar_flags
+
 # Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
+AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
@@ -25676,6 +31194,7 @@
   esac
 
 
+
 ltmain=$ac_aux_dir/ltmain.sh
 
 
@@ -25683,7 +31202,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -25844,7 +31363,7 @@
 _LT_EOF
 
  ;;
-    "default-1":C)
+    "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile:infile:infile..."
       case "$ac_file" in
@@ -25854,7 +31373,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -25864,10 +31383,14 @@
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ ${gt_tab}*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -25877,12 +31400,13 @@
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -25953,276 +31477,6 @@
         ;;
       esac
     done ;;
-    "default-2":C)
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile:infile:infile..."
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; 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
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
-    "Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "gphoto2-config":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "camlibs/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "camlibs/canon/doc/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "camlibs/konica/localization/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "gphoto-m4/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "libgphoto2/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "libgphoto2.pc":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "libgphoto2-uninstalled.pc":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "examples/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "tests/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "tests/ddb/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "tests/ddb/check-ddb.sh":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "packaging/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "packaging/linux-hotplug/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "packaging/generic/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "packaging/rpm/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "packaging/rpm/package.spec":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "po/Makefile.in":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "doc/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "doc/Doxyfile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "doc/Doxyfile-internals":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
-    "doc/api/Makefile":F)
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
- ;;
 
   esac
 done # for ac_tag
@@ -26296,7 +31550,7 @@
       ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
@@ -26306,7 +31560,7 @@
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -26327,17 +31581,17 @@
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    printf "%s\n" "$ac_msg" >&6
     as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -26367,17 +31621,15 @@
 
     cd "$ac_dir"
 
-    # Check for guested configure; otherwise get Cygnus style configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       ac_sub_configure=$ac_srcdir/configure.gnu
     elif test -f "$ac_srcdir/configure"; then
       ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -26390,8 +31642,8 @@
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -26402,20 +31654,29 @@
   done
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 if test "x$CDPATH" != "x"
-then
-        echo
-        echo "***********************************************************"
-        echo "* You have CDPATH set. You may have to run \"unset CDPATH\" *"
-        echo "* before running \"make dist\" or \"make rpm\".               *"
-        echo "***********************************************************"
-fi
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+    #=========================================================#
+    # You have CDPATH set. You may have to run \"unset CDPATH\" #
+    # before running \"make dist\".                             #
+    #=========================================================#
+" >&5
+printf "%s\n" "$as_me: WARNING:
+
+    #=========================================================#
+    # You have CDPATH set. You may have to run \"unset CDPATH\" #
+    # before running \"make dist\".                             #
+    #=========================================================#
+" >&2;}
 
+fi
 # Message about configured subprojects
 if test "x$subdirs" != "x"; then
 
@@ -26445,46 +31706,60 @@
 You may run \"make\" and \"make install\" now."
 
 
-if test "x$camlibs" = "xall"; then
-   :
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+if test "x$gp_sh_with_camlibs" = xstandard
+then :
 
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-#
-# Many cameras of several brands are supported by a camlib with a
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the \"ptp2\" camlib
-#   * or even better, just build \"all\" camlibs.
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+
+  #=====================================================================#
+  # Caution: You have chosen to build a non-standard set of camlibs.    #
+  #          You may have disabled the camlib required for your camera, #
+  #          or enabled a camlib which does *not* work and overrides    #
+  #          the camlib which *does* work. Consequently,                #
+  #          YOUR CAMERA MAY NOT WORK!                                  #
+  #                                                                     #
+  # Many cameras of several brands are supported by a camlib with a     #
+  # name different from the name of the camera brand or model. If you   #
+  # are unsure, please                                                  #
+  #   * enable at least the 'ptp2' camlib                               #
+  #   * or even better, just build the standard set of camlibs.         #
+  #=====================================================================#
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-#
-# Many cameras of several brands are supported by a camlib with a
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the \"ptp2\" camlib
-#   * or even better, just build \"all\" camlibs.
+  #=====================================================================#
+  # Caution: You have chosen to build a non-standard set of camlibs.    #
+  #          You may have disabled the camlib required for your camera, #
+  #          or enabled a camlib which does *not* work and overrides    #
+  #          the camlib which *does* work. Consequently,                #
+  #          YOUR CAMERA MAY NOT WORK!                                  #
+  #                                                                     #
+  # Many cameras of several brands are supported by a camlib with a     #
+  # name different from the name of the camera brand or model. If you   #
+  # are unsure, please                                                  #
+  #   * enable at least the 'ptp2' camlib                               #
+  #   * or even better, just build the standard set of camlibs.         #
+  #=====================================================================#
 " >&2;}
-sleep 2
+if test -t 1
+then :
+  $gp_sleep 5
+
+fi
+
+
 
 fi
 
-echo "Please check whether the configuration I detected matches what you
-would like to have. E.g. make sure that USB support is there if you
-intend to use USB cameras with $PACKAGE_NAME.
+
+cat<<EOF
+Please check whether the configuration I have detected matches what
+you would like to have. E.g. make sure that USB support is there if
+you intend to use USB cameras with ${PACKAGE_NAME}.
 
 Please also check that PKG_CONFIG_PATH contains
     ${pkgconfigdir}
 before compiling any libgphoto2 frontend.
-"
+EOF
+

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/configure.ac -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/configure.ac Changed

@@ -1,30 +1,59 @@
 dnl Process this file with autoreconf to produce a configure script.
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
 
 dnl NOTE: Be version style _higher_ than the last release.
 dnl       So lastversion.X.trunk for instance. Bump X if necessary.
 
-dnl ******* THE NEXT RELEASE VERSION MUST BE 2.5.18 at least or higher!
-AC_INIT(libgphoto2 photo camera library, 2.5.18, gphoto-devel@lists.sourceforge.net, libgphoto2)
+dnl ******* THE NEXT RELEASE VERSION MUST BE 2.5.31 at least or higher!
+AC_INIT(libgphoto2 photo camera library,
+        2.5.31,
+        gphoto-devel@lists.sourceforge.net,
+        libgphoto2)
 
 AC_CONFIG_SRCDIR(libgphoto2/gphoto2-version.c)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR(auto-m4)
 AC_CONFIG_AUX_DIR(auto-aux)
-dnl Working around bug in automake <= 1.9.6:
-dnl  - Please do not add filename-length-max=99 here.
-dnl  - Otherwise "make distdir" will fail in gphoto-suite
-dnl The generated Makefile rule fails to remove the absolute part at
-dnl the beginning of the /path/to/buildroot/PACKAGE-VERSION/foo/bar
-dnl before determining the string length. However, the only relevant
-dnl string to determine the length of would be PACKAGE-VERSION/foo/bar
-AM_INIT_AUTOMAKE(-Wall foreign 1.9 dist-bzip2 check-news subdir-objects)
-
-
-# Use the silent-rules feature when possible.
-m4_ifndef(AM_SILENT_RULES, m4_define(AM_SILENT_RULES,))
+AM_INIT_AUTOMAKE(
+  -Wall
+  foreign
+  1.14
+  dist-bzip2
+  dist-xz
+  check-news
+  subdir-objects
+)
+
+
+dnl Notable tool releases and why they are important for us:
+dnl
+dnl   autoconf 2012-04-25 2.69    (what libexif requires)
+dnl   autoconf 2006-04-12 2.59c   (introduces localedir, docdir, htmldir)
+dnl
+dnl   automake 2013-12-24 1.14.1  (what libexif requires)
+dnl   automake 2013-06-20 1.14    (introduces %reldir%, implies AM_PROG_CC_C_O)
+dnl   automake 2013-05-15 1.13.2  (bugfix for handling multiple m4 macro dirs)
+dnl   automake 2012-04-25 1.12    (introduces AM_PROG_AR)
+dnl   automake 2009-05-17 1.11    (introduces AM_SILENT_RULES, pkglibexecdir)
+dnl   automake 2005-07-10 1.9.6   (fixes filename-length-max=99)
+dnl   automake 2004-07-28 1.9     (libgphoto2 requirement since 2.2.1.3 2006-09-28)
+dnl
+dnl   gettext  2014-06-10 0.19.1  (allows building without updating *.po)
+dnl   gettext  2013-07-07 0.18.3  (what libexif requires)
+dnl   gettext  2012-12-08 0.18.2
+dnl   gettext  2004-01-30 0.14.1
+dnl
+dnl   libtool  2014-10-27 2.4.3
+dnl   libtool  2011-10-18 2.4.2
+
+
 AM_SILENT_RULES(no)
 
+
+dnl Flag all GP_ strings in result as error unless specifically allowed.
+m4_pattern_forbid(^_?GP_)dnl
+
+
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG(Build)
 GP_CONFIG_MSG(Source code location,${srcdir})
@@ -32,23 +61,24 @@
 dnl ---------------------------------------------------------------------------
 dnl Advanced information about versioning:
 dnl   * "Writing shared libraries" by Mike Hearn
-dnl         http://navi.cx/~mike/writing-shared-libraries.html
+dnl         http://plan99.net/~mike/writing-shared-libraries.html
+dnl         originally http://navi.cx/~mike/writing-shared-libraries.html
 dnl   * libtool.info chapter "Versioning"
 dnl   * libtool.info chapter "Updating library version information"
 dnl ---------------------------------------------------------------------------
 dnl Versioning:
 dnl  - AGE (Micro):      Increment if any interfaces have been added; set to 0
-dnl		         if any interfaces have been removed. Removal has 
+dnl		         if any interfaces have been removed. Removal has
 dnl                      precedence over adding, so set to 0 if both happened.
 dnl                      It denotes upward compatibility.
-dnl  - REVISION (Minor): Increment any time the source changes; set to 
+dnl  - REVISION (Minor): Increment any time the source changes; set to
 dnl			 0 if you incremented CURRENT.
 dnl  - CURRENT (Major):  Increment if the interface has changes. AGE is always
 dnl                      *changed* at the same time.
 dnl
 dnl  To summarize. Any interface *change* increment CURRENT. If that interface
-dnl  change does not break upward compatibility (ie it is an addition), 
-dnl  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, 
+dnl  change does not break upward compatibility (ie it is an addition),
+dnl  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
 dnl  REVISION is set to 0, otherwise REVISION is incremented.
 dnl ---------------------------------------------------------------------------
 dnl A:R:C=1:1:3  libgphoto2-2.2
@@ -58,9 +88,12 @@
 dnl              libgphoto2-2.3.1.1.trunk (new gp_file_slurp() function)
 dnl              libgphoto2-2.3.1.2.trunk (new gp_camera_get_storageinfo() function + enums + struct)
 dnl A:R:C=0:0:6  libgphoto2-2.5.0	(fixed CameraList API, ... )
-AC_SUBST(LIBGPHOTO2_AGE,      1)
+dnl A:R:C=1:0:7  libgphoto2-2.5.24	(added GP_EVENT_FILE_CHANGED ... )
+dnl A:R:C=2:0:8  libgphoto2-2.5.28	(added gp_filesystem_set_info_dirty ... )
+dnl A:R:C=3:0:9  libgphoto2-2.5.XXX	(added gp_init_localedir ... )
+AC_SUBST(LIBGPHOTO2_AGE,      3)
 AC_SUBST(LIBGPHOTO2_REVISION, 0)
-AC_SUBST(LIBGPHOTO2_CURRENT,  7)
+AC_SUBST(LIBGPHOTO2_CURRENT,  9)
 AC_SUBST(LIBGPHOTO2_CURRENT_MIN,
          `expr $LIBGPHOTO2_CURRENT - $LIBGPHOTO2_AGE`)
 AC_SUBST(LIBGPHOTO2_VERSION_INFO,
@@ -71,25 +104,118 @@
 dnl Checks for programs.
 dnl ---------------------------------------------------------------------------
 
+AC_MSG_CHECKING(original CC value)
+AC_MSG_RESULT("$CC")
+AC_MSG_CHECKING(original CXX value)
+AC_MSG_RESULT("$CXX")
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_INSTALL
-AM_PROG_CC_C_O
-m4_ifdef(AM_PROG_AR, AM_PROG_AR)
+AC_PROG_SED
+AM_PROG_AR
+
+
+dnl If CXX is neither unset nor empty nor "no", presume we can compile
+dnl C++ sources. A C++ compiler is not required for libgphoto2 itself,
+dnl but is useful to make sure that the libgphoto2 header files
+dnl compile when included into C++ source files.
+AM_CONDITIONAL(HAVE_CXX, test "x$CXX" != "x" && test "x$CXX" != "xno")
+
+
+dnl Not strictly necessary, but helps pulling translations.
+GP_CHECK_PROG(RSYNC, rsync, file copying command)
+AM_CONDITIONAL(HAVE_RSYNC, test "x$RSYNC" != xno)
+
+
+dnl --------------------------------------------------------------------
+dnl Determine the most pedantic compiler flags we can find for both
+dnl C and C++, so that we can test that the libgphoto2 headers compile
+dnl with those flags.
+dnl --------------------------------------------------------------------
+dnl
+dnl
+GP_WITH_EMPTY_CONFDEFS_H(dnl
+dnl
+GP_PEDANTIC_COMPILER_FLAGS(C90,   C,   -std=c90)
+GP_PEDANTIC_COMPILER_FLAGS(C99,   C,   -std=c99)
+GP_PEDANTIC_COMPILER_FLAGS(C11,   C,   -std=c11)
+GP_PEDANTIC_COMPILER_FLAGS(C2X,   C,   -std=c2x)
+dnl
+GP_PEDANTIC_COMPILER_FLAGS(CXX98, C++, -std=c++98)
+GP_PEDANTIC_COMPILER_FLAGS(CXX11, C++, -std=c++11)
+GP_PEDANTIC_COMPILER_FLAGS(CXX14, C++, -std=c++14)
+GP_PEDANTIC_COMPILER_FLAGS(CXX17, C++, -std=c++17)
+GP_PEDANTIC_COMPILER_FLAGS(CXX20, C++, -std=c++20)
+dnl
+
+dnl --------------------------------------------------------------------
+dnl The goals here are twofold:
+dnl
+dnl   * Produce as many compiler warnings as possible to find
+dnl     potential problems in our own code.
+dnl
+dnl   * Make sure our API header files are as broadly compatible as
+dnl     possible.
+dnl
+dnl We want our library and driver code to compile with the lowest
+dnl possible number of warnings, and the pedantic compilation tests to
+dnl compile with zero warnings (-Werror) so we do not limit the users
+dnl of our API in their use of compiler warnings.
+dnl
+dnl If, for some reason, you need to build without all these compiler
+dnl warnings, run the build while setting CFLAGS to an empty string:
+dnl
+dnl     $ make all check CFLAGS=
+dnl --------------------------------------------------------------------
+
+dnl * gcc exits non-zero when it encounters an unknown warning option
+dnl * clang by default ignores unknown warning option
+dnl * clang with -Werror=unknown-warning-option will exit non-zero
+dnl   when it encounters an unknown warning option
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Werror=unknown-warning-option)
+
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wall)
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wextra)
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wmost)
+
+dnl We used to have these two defined for GCC instead of the whole -Wextra
+dnl GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wmissing-declarations)
+dnl GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wmissing-prototypes)
+
+dnl clang finds the underscores in all the "struct _Foo" definitions
+dnl which means they fall into the reserved category. Before we can
+dnl think about renaming those idenifiers, we need to verify they are
+dnl not part of our public API.
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-error=reserved-identifier)
+
+dnl clang finds "/** comments using \deprecated */" without a
+dnl corresponding __attribute__(( deprecated )). We need a good header
+dnl file defining such compiler and standard library specific
+dnl attributes purely as C preprocessor macros without configure
+dnl involvement before we can change anything about this in the public
+dnl API's include files.
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-error=documentation-deprecated-sync)
+
+dnl We used to have these four... no idea why, though. Stop reporting
+dnl unused parameters for now, as those are VERY numerous and not much
+dnl of a security risk, unlike the format and string warnings.
+GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-unused-parameter)
+dnl GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-format-overflow)
+dnl GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-format-truncation)
+dnl GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-stringop-truncation)
+
+)dnl GP_WITH_EMPTY_CONFDEFS_H
+
+dnl Every compile example after here will be using the C language
+AC_LANG(C)
 
-dnl Something with the sequences is not quite alright yet.
-dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the
-dnl sequence seems to get mixed up.
-SED=${SED-sed}
 
 dnl ---------------------------------------------------------------------------
 dnl Turn on (almost) all warnings when using gcc
 dnl ---------------------------------------------------------------------------
 if test "x$GCC" = "xyes"; then
-	# CFLAGS="$CFLAGS --std=c99 -Wall -Wextra -Werror -pedantic"
-	CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Wmissing-prototypes"
-	LDFLAGS="$LDFLAGS"
 	AC_SUBST(NO_UNUSED_CFLAGS, -Wno-unused)
 fi
 AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
@@ -113,71 +239,24 @@
 #       Put these into LIBFOO_CFLAGS and LIBFOO_LIBS instead.
 
 
-try_gp2ddb=false
-msg_gp2ddb=""
-gp_msg_dp2ddb="no"
-
-AC_ARG_ENABLE(gp2ddb,
-AS_HELP_STRING(--enable-gp2ddb,
-		enable EXPERIMENTAL PRE-ALPHA gphoto2 device database code),
-	if test "x$enableval" = "xyes"; then
-		try_gp2ddb=true
-		msg_dp2ddb="(--enable-gp2ddb detected)"
-	elif test "x$enableval" = "xno"; then
-		try_gp2ddb=false
-		msg_dp2ddb="(--disable-gp2ddb detected)"
-	fi
-)
-
-AC_PATH_PROG(FLEX, flex)
-AC_SUBST(FLEX)
-AC_PATH_PROG(BISON, bison)
-AC_SUBST(BISON)
-
-AC_MSG_CHECKING(whether to enable GP2DDB)
-if "$try_gp2ddb"; then
-   if test -x "$FLEX" && test -x "$BISON"; then
-      gp_msg_dp2ddb="yes $msg_dp2ddb"
-   else
-      AC_MSG_ERROR(Fatal: GP2DDB support requires flex and bison!
-
-Aborting configuration.
-
-Install flex and bison into your PATH or run configure with --disable-gp2ddb
-to disable GP2DDB support.
-)
-   fi
-else
-      gp_msg_dp2ddb="no $msg_dp2ddb"
-fi
-AC_MSG_RESULT(${gp_msg_gp2ddb})
-
-AM_CONDITIONAL(ENABLED_GP2DDB, "$try_gp2ddb" && test -x "$FLEX" && test -x "$BISON")
-
-if "$try_gp2ddb" && test -x "$FLEX" && test -x "$BISON"; then
-	gp_msg_gp2ddb="yes $msg_gp2ddb"
-        AC_DEFINE(ENABLED_GP2DDB, 1, Whether we have flex and bison for GP2DDB)
-else
-	gp_msg_gp2ddb="no $msg_gp2ddb"
-fi
-GP_CONFIG_MSG(GP2DDB support, ${gp_msg_gp2ddb} (EXPERIMENTAL))
-
 dnl check for/set up libtool and libltdl
-dnl AC_DISABLE_STATIC
-dnl AC_DISABLE_SHARED
-dnl AC_LIBLTDL_CONVENIENCE(libltdl)
-dnl AC_WITH_LTDL
-dnl AC_LIB_LTDL
-AC_DISABLE_STATIC 
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-dnl We are using our own libltdl checks instead of AC_WITH_LTDL
-dnl because we do not want to ship our own copy of libltdl any more.
-dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
-dnl and relying on standard autoconf's "autoreconf".
-GP_LIB_LTDL
+m4_pattern_forbid(^LT_PREREQ)dnl
+LT_PREREQ(2.4.2)
+dnl Disable building static library, as no one uses it anyway.
+m4_pattern_forbid(^LT_INIT)dnl
+LT_INIT(
+  disable-static
+  dlopen
+  win32-dll
+)
+dnl
+dnl LTDL_INIT(external)
+dnl
+dnl We are using our own libltdl checks instead of LTDL_INIT because
+dnl we do not want to ship our own two copies of libltdl (one for
+dnl libgphoto2 and one for libgphoto2_port), and LTDL_INIT insists on
+dnl that.
+GP_LIBLTDL
 
 
 # report on compiler/libtool setup
@@ -185,7 +264,8 @@
 GP_CONFIG_MSG(libltdl includes,$LTDLINCL)
 GP_CONFIG_MSG(libltdl library,$LIBLTDL)
 
-AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",The C compiler we're using)
+AC_DEFINE_UNQUOTED(HAVE_CC, "$CC",
+                   The C compiler we are using)
 
 
 dnl ---------------------------------------------------------------------------
@@ -202,13 +282,16 @@
 dnl i18n support (including some hacks)
 dnl ---------------------------------------------------------------------------
 
-ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
-GP_GETTEXT_HACK(${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN},The gPhoto Team,${MAIL_GPHOTO_TRANSLATION})
-AM_GNU_GETTEXT_VERSION(0.14.1)
-AM_GNU_GETTEXT(external)
+GP_GETTEXT_SETUP(GETTEXT_PACKAGE_LIBGPHOTO2,
+                 ${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN},
+                 po)
 AM_PO_SUBDIRS()
+AM_GNU_GETTEXT_VERSION(0.19.1)
+AM_GNU_GETTEXT(external)
 AM_ICONV()
-GP_GETTEXT_FLAGS()
+
+GP_CONFIG_MSG(Use translations,
+              ${USE_NLS})
 
 dnl FIXME: We have to make sure this works first
 dnl AC_CHECK_FUNC(gettext, gettext_without_libintl=true)
@@ -216,58 +299,59 @@
 # if gettext() doesn't require linking against libintl,
 # we don't have to check for gettext in libintl. Otherwise
 # we may even require libintl.
-dnl if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then
+dnl if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; then
 dnl        AC_CHECK_LIB(intl, gettext, INTLLIBS="$INTLLIBS -lintl")
 dnl fi
 
-AC_SUBST(localedir,"\$(datadir)/locale")
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 AC_SYS_LARGEFILE
 
-AC_MSG_CHECKING(for asm .symver support)
-AC_COMPILE_IFELSE(dnl
-	AC_LANG_PROGRAM(,
-		int f1() { }
-		int f2() { }
-		asm(".symver f1, f@VER1");
-		asm(".symver f2, f@@VER2");
-		int main(int argc, char **argv) { }
-	)dnl
-,
-	AC_DEFINE(HAVE_ASM_SYMVERS,1,Define if there is asm .symver support.)
-	VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2.ver"
-	AC_MSG_RESULT(yes)
-,
-	VERSIONMAPLDFLAGS=""
-	AC_MSG_RESULT(no)
-)
-AC_SUBST(VERSIONMAPLDFLAGS)
+GP_ASM_SYMVER_SUPPORT
 
 dnl ---------------------------------------------------------------------------
 dnl FIXME: What is this good for?
 dnl Replace `main' with a function in -libs:
 dnl ---------------------------------------------------------------------------
-AC_CHECK_LIB(ibs, main)
+AC_CHECK_LIB(ibs, main)
+
+dnl we use some libm functions in some drivers, so just add -lm
+AC_CHECK_LIB(m, sqrt)
+
+
+dnl ---------------------------------------------------------------------------
+dnl test GP_SET_ macros from gp-set.m4
+dnl ---------------------------------------------------------------------------
+dnl GP_SET_TESTSUITE
+dnl AC_MSG_ERROR(gp-set.m4 testsuite done.)
+
+
+dnl ---------------------------------------------------------------------------
+dnl libjpeg (from libjpeg-turbo or a number of other implementations)
+dnl ---------------------------------------------------------------------------
+GP_LIBJPEG
 
 
 dnl ---------------------------------------------------------------------------
-dnl check for libjpeg
+dnl check for ws2_32
 dnl ---------------------------------------------------------------------------
-LIBJPEG=""
-libjpeg_msg="no"
-AC_SUBST(LIBJPEG)
-AC_ARG_WITH(jpeg, AS_HELP_STRING(--without-jpeg, Build without jpeg library (default: no)))
-AS_IF(test "x$with_jpeg" != "xno", 
-	AC_CHECK_LIB(jpeg,jpeg_start_decompress,
-		AC_CHECK_HEADER(jpeglib.h,
-			AC_DEFINE(HAVE_LIBJPEG,1,define if we found LIBJPEG and its headers)
-			LIBJPEG="-ljpeg"
-			libjpeg_msg="yes"
+LIBWS232_CFLAGS=""
+LIBWS232_LIBS=""
+libws232_msg="no"
+AC_SUBST(LIBWS232_CFLAGS)
+AC_SUBST(LIBWS232_LIBS)
+AC_ARG_WITH(ws232,
+            AS_HELP_STRING(--without-ws232,
+	                    Build without ws2_32 library (default: no)))
+AS_IF(test "x$with_ws232" != "xno", dnl
+	AC_CHECK_LIB(ws2_32, WSAStartup, dnl
+		AC_CHECK_HEADER(winsock.h, dnl
+			AC_DEFINE(HAVE_LIBWS232, 1,
+			          define if we found LIBWS232 and its headers)
+			LIBWS232_LIBS="-lws2_32"
+			libws232_msg="yes"
 		)
 	)
 )
-GP_CONFIG_MSG(JPEG mangling support,${libjpeg_msg})
+GP_CONFIG_MSG(Winsocket support (for PTP/IP),${libws232_msg})
 
 dnl ---------------------------------------------------------------------------
 dnl check for libxml2
@@ -279,6 +363,13 @@
 )
 GP_CONFIG_MSG(XML support for Olympus E series,${have_LIBXML2})
 
+GP_CHECK_LIBRARY(LIBCURL,libcurl,>= 7.1,
+		curl/curl.h,curl_easy_init,,,
+                default-on,
+		https://www.curl.org
+)
+GP_CONFIG_MSG(CURL support for Lumix Wifi,${have_LIBCURL})
+
 dnl ---------------------------------------------------------------------------
 dnl check for libgd
 dnl they call it "gdlib" ... confusing.
@@ -294,10 +385,21 @@
 dnl Checks for header files.
 dnl ---------------------------------------------------------------------------
 AC_HEADER_DIRENT
-# before _HEADER_STDC
 AC_HEADER_STDC
-# after _HEADER_STDC
 AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/select.h locale.h memory.h getopt.h unistd.h mcheck.h limits.h sys/time.h langinfo.h)
+
+dnl If sys/mman.h is present, check whether mmap requires the mman
+dnl library (see camlibs/st2205/st2205.c st2205_malloc_page_aligned()).
+MMAP_LIBS=""
+AS_VAR_IF(ac_cv_header_sys_mman_h, yes, dnl
+  gp_saved_LIBS="$LIBS"
+  LIBS=""
+  AC_SEARCH_LIBS(mmap, mman)
+  MMAP_LIBS="$LIBS"
+  LIBS="$gp_saved_LIBS"
+)dnl
+AC_SUBST(MMAP_LIBS)
+
 AC_C_INLINE()
 AC_C_CONST()
 dnl FIXME: AC_STRUCT_TIMEZONE
@@ -311,7 +413,7 @@
 AC_TYPE_SIZE_T
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(getenv getopt getopt_long mkdir setenv strdup strncpy strcpy snprintf sprintf vsnprintf gmtime_r statfs localtime_r lstat inet_aton rand_r)
+AC_CHECK_FUNCS(getenv getopt getopt_long mkdir setenv strdup strncpy strcpy snprintf sprintf vsnprintf gmtime_r statvfs localtime_r lstat inet_aton rand_r)
 
 dnl Find out how to get struct tm
 AC_STRUCT_TM
@@ -326,95 +428,31 @@
 struct tm tm;
 tm.tm_gmtoff;
 )dnl
-,
-AC_DEFINE(HAVE_TM_GMTOFF,1,whether struct tm has tm_gmtoff field)
-AC_MSG_RESULT(yes)
-,
-AC_MSG_RESULT(no)
+, dnl
+  AC_DEFINE(HAVE_TM_GMTOFF, 1,
+            whether struct tm has tm_gmtoff field)
+  AC_MSG_RESULT(yes)
+, dnl
+  AC_MSG_RESULT(no)
 )
 
-AC_CHECK_HEADERS(sys/mount.h sys/statfs.h sys/user.h sys/vfs.h,,,
+AC_CHECK_HEADERS(sys/mount.h sys/statvfs.h sys/user.h sys/vfs.h, , , 
 #include <sys/types.h>
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 )
 
-dnl Check for statfs members
-AC_CHECK_MEMBERS(struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f_favail,,,
-#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-# include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-# include <sys/statfs.h>
-#endif
-)
-
-AC_CHECK_MEMBERS(struct statvfs.f_blocks,,,
+AC_CHECK_MEMBERS(struct statvfs.f_blocks, , , 
 #ifdef HAVE_SYS_STATVFS_H
 # include <sys/statvfs.h>
 #endif
 )
 
-
-dnl ---------------------------------------------------------------------------
-dnl Checks for integer types.
-dnl ---------------------------------------------------------------------------
-dnl
-dnl FIXME: Test AC_TYPE_UINT32_T & Co and check whether that could work for us.
-dnl        Potential problem: The required autoconf version.
-dnl Note: We are already using AC_TYPE_SIZE_T somewhere else in here.
-
-
-dnl Create a stdint.h-like file containing size-specific integer definitions
-dnl that will always be available
-AX_NEED_STDINT_H(libgphoto2/_stdint.h)
-
 dnl Create a header file containing NetBSD-style byte swapping macros
 AC_NEED_BYTEORDER_H(libgphoto2/gphoto2-endian.h)
 
 
-dnl ---------------------------------------------------------------------------
-dnl Old libtool stuff left here for reference purposes. For now.
-dnl dnl ---------------------------------------------------------------------------
-dnl dnl Check for libtool: lt_dlforeachfile has been introduced in 
-dnl dnl		       libtool-1.4. However, there are still systems out
-dnl dnl		       there running libtool-1.3. For those, we will need
-dnl dnl		       dlopen. Note that on some systems (e.g. FreeBSD)
-dnl dnl		       -ldl isn't needed.
-dnl dnl ---------------------------------------------------------------------------
-dnl AC_PROG_LIBTOOL
-dnl have_ltdl=false
-dnl ltdl_msg="no"
-dnl try_ltdl=false
-dnl AC_ARG_WITH(ltdl,   --with-ltdl             Use ltdl,
-dnl         if test x$withval = xyes; then
-dnl 		try_ltdl=true
-dnl 	fi)
-dnl if $try_ltdl; then
-dnl 	AC_CHECK_LIB(ltdl, lt_dlforeachfile,
-dnl 		AC_CHECK_HEADER(ltdl.h,
-dnl 			AC_DEFINE(HAVE_LTDL,1,whether we use libltdl)
-dnl 			LTDL_LIBS="-lltdl"
-dnl 			ltdl_msg="yes"
-dnl 			have_ltdl=true))
-dnl fi
-dnl if ! $have_ltdl; then
-dnl 	AC_CHECK_FUNC(dlopen,,
-dnl 		AC_CHECK_LIB(dl, dlopen,LTDL_LIBS="-ldl",AC_ERROR(
-dnl *** Could not determine how to handle
-dnl *** shared libraries!)))
-dnl fi
-dnl AC_SUBST(LTDL_LIBS)
-
-
 dnl should be obsolete (we're not using grep and tr any more)
 dnl dnl Solaris hack for grep and tr
 dnl 
@@ -447,105 +485,102 @@
 dnl ---------------------------------------------------------------------------
 dnl camlib installation directory
 dnl ---------------------------------------------------------------------------
-AC_MSG_CHECKING(where to install camlibs)
-AC_ARG_WITH(camlibdir,AS_HELP_STRING(
-	--with-camlibdir=<path>,
-	install camlibs in directory <path>)dnl
-,
-	camlibdir="$withval"
-,
-	camlibdir="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}"
-)
-AC_MSG_RESULT(${camlibdir})
-AC_SUBST(camlibdir)
-AM_CPPFLAGS="$AM_CPPFLAGS -DCAMLIBS=\\\"\$(camlibdir)\\\""
+GP_DRIVERDIR(camlibdir, CAMLIBS, camlibs)
 
 
 dnl ---------------------------------------------------------------------------
 dnl Camera drivers (camlibs)
 dnl ---------------------------------------------------------------------------
-dnl * See m4m/gp-camlibs.m4 for usage details, e.g. for marking camlibs as
+dnl * See gp-camlibs.m4 for usage details, e.g. for marking camlibs as
 dnl   unlisted.
 dnl * Please add new camlibs in alphabetical order.
 dnl * Selective build:
 dnl   $ make -C camlibs canon.la ptp2.la
+dnl   or
+dnl   $ make -C camlibs GP_CAMLIB_SET="canon.la ptp2.la"
 dnl * Selective install:
-dnl   $ make CAMLIBS="canon.la ptp2.la" install-camlibs
-GP_CAMLIB(adc65)dnl
-GP_CAMLIB(agfa_cl20)dnl
-GP_CAMLIB(aox)dnl
+dnl   $ make GP_CAMLIB_SET="canon.la ptp2.la" install-camlibs
+GP_CAMLIB(adc65,outdated)dnl very old serial camera
+GP_CAMLIB(agfa_cl20,outdated)dnl
+GP_CAMLIB(aox,outdated)dnl
 GP_CAMLIB(ax203)dnl
-GP_CAMLIB(barbie)dnl
+GP_CAMLIB(barbie,outdated)dnl
 GP_CAMLIB(canon)dnl
-GP_CAMLIB(casio_qv)dnl
-GP_CAMLIB(clicksmart310)dnl
+GP_CAMLIB(casio_qv,outdated)dnl
+GP_CAMLIB(clicksmart310,outdated)dnl
 GP_CAMLIB(digigr8)dnl
-GP_CAMLIB(digita)dnl
-GP_CAMLIB(dimera3500)dnl
+GP_CAMLIB(digita,outdated)dnl
+GP_CAMLIB(dimera3500,outdated)dnl
 GP_CAMLIB(directory)dnl
-GP_CAMLIB(enigma13)dnl
-GP_CAMLIB(fuji)dnl
-GP_CAMLIB(gsmart300)dnl
-GP_CAMLIB(hp215)dnl
-GP_CAMLIB(iclick)dnl
-GP_CAMLIB(jamcam)dnl
-GP_CAMLIB(jd11)dnl
+AM_COND_IF(HAVE_LIBGD, dnl
+GP_CAMLIB(docupen)dnl
+)
+GP_CAMLIB(enigma13,outdated)dnl
+GP_CAMLIB(fuji,outdated)dnl
+GP_CAMLIB(gsmart300,outdated)dnl
+GP_CAMLIB(hp215,outdated)dnl
+GP_CAMLIB(iclick,outdated)dnl
+GP_CAMLIB(jamcam,outdated)dnl
+GP_CAMLIB(jd11,outdated)dnl
 GP_CAMLIB(jl2005a)dnl
 GP_CAMLIB(jl2005c)dnl
-GP_CAMLIB(kodak_dc120)dnl
-GP_CAMLIB(kodak_dc210)dnl
+GP_CAMLIB(kodak_dc120,outdated)dnl
+GP_CAMLIB(kodak_dc210,outdated)dnl
 GP_CAMLIB(kodak_dc240)dnl
-GP_CAMLIB(kodak_dc3200)dnl
-GP_CAMLIB(kodak_ez200)dnl
-GP_CAMLIB(konica)dnl
-GP_CAMLIB(konica_qm150)dnl
-GP_CAMLIB(largan)dnl
-GP_CAMLIB(lg_gsm)dnl
+GP_CAMLIB(kodak_dc3200,outdated)dnl
+GP_CAMLIB(kodak_ez200,outdated)dnl
+GP_CAMLIB(konica,outdated)dnl
+GP_CAMLIB(konica_qm150,outdated)dnl
+GP_CAMLIB(largan,outdated)dnl
+GP_CAMLIB(lg_gsm,outdated)dnl
+AM_COND_IF(HAVE_LIBCURL, dnl
+AM_COND_IF(HAVE_LIBXML2, dnl
+GP_CAMLIB(lumix)dnl
+)
+)
 GP_CAMLIB(mars)dnl
 GP_CAMLIB(dimagev)dnl
-GP_CAMLIB(mustek)dnl
-GP_CAMLIB(panasonic_coolshot)dnl
-GP_CAMLIB(panasonic_l859)dnl
-GP_CAMLIB(panasonic_dc1000)dnl
-GP_CAMLIB(panasonic_dc1580)dnl
-GP_CAMLIB(pccam300)dnl
-GP_CAMLIB(pccam600)dnl
+GP_CAMLIB(mustek,outdated)dnl
+GP_CAMLIB(panasonic_coolshot,outdated)dnl
+GP_CAMLIB(panasonic_l859,outdated)dnl
+GP_CAMLIB(panasonic_dc1000,outdated)dnl
+GP_CAMLIB(panasonic_dc1580,outdated)dnl
+GP_CAMLIB(pccam300,outdated)dnl
+GP_CAMLIB(pccam600,outdated)dnl
 GP_CAMLIB(pentax)dnl
-GP_CAMLIB(polaroid_pdc320)dnl
-GP_CAMLIB(polaroid_pdc640)dnl
-GP_CAMLIB(polaroid_pdc700)dnl
+GP_CAMLIB(polaroid_pdc320,outdated)dnl
+GP_CAMLIB(polaroid_pdc640,outdated)dnl
+GP_CAMLIB(polaroid_pdc700,outdated)dnl
 GP_CAMLIB(ptp2)dnl
-GP_CAMLIB(ricoh)dnl
+GP_CAMLIB(ricoh,outdated)dnl
 GP_CAMLIB(ricoh_g3)dnl
-GP_CAMLIB(samsung)dnl
+GP_CAMLIB(samsung,outdated)dnl
 GP_CAMLIB(sierra)dnl
 GP_CAMLIB(sipix_blink, unlisted)dnl did not find out the correct decompressor, unfinished
-GP_CAMLIB(sipix_blink2)dnl
-GP_CAMLIB(sipix_web2)dnl
-GP_CAMLIB(smal)dnl
+GP_CAMLIB(sipix_blink2,outdated)dnl
+GP_CAMLIB(sipix_web2,outdated)dnl
+GP_CAMLIB(smal,outdated)dnl
 GP_CAMLIB(sonix)dnl
-GP_CAMLIB(sony_dscf1)dnl
-GP_CAMLIB(sony_dscf55)dnl
-GP_CAMLIB(soundvision)dnl
-GP_CAMLIB(spca50x)dnl
+GP_CAMLIB(sony_dscf1,outdated)dnl
+GP_CAMLIB(sony_dscf55,outdated)dnl
+GP_CAMLIB(soundvision,outdated)dnl
+GP_CAMLIB(spca50x,outdated)dnl
 GP_CAMLIB(sq905)dnl
 GP_CAMLIB(st2205)dnl
-GP_CAMLIB(stv0674)dnl
-GP_CAMLIB(stv0680)dnl
-GP_CAMLIB(sx330z)dnl
+GP_CAMLIB(stv0674,outdated)dnl
+GP_CAMLIB(stv0680,outdated)dnl
+GP_CAMLIB(sx330z,outdated)dnl
 GP_CAMLIB(template, unlisted)dnl
 GP_CAMLIB(topfield)dnl
-GP_CAMLIB(toshiba_pdrm11)dnl
+GP_CAMLIB(toshiba_pdrm11,outdated)dnl
 GP_CAMLIB(tp6801)dnl
 dnl
 GP_CAMLIBS_DEFINE()dnl
-GP_CONFIG_MSG(Camlibs,${camlibs})
 
 
 dnl --------------------------------------------------------------------
 dnl documentation
 dnl --------------------------------------------------------------------
-GP_CHECK_DOC_DIR()dnl
 GP_CHECK_DOXYGEN()dnl
 GP_INTERNAL_DOCS()dnl
 GP_BUILD_GTK_DOCS()dnl
@@ -555,8 +590,7 @@
 dnl --------------------------------------------------------------------
 dnl initialize convenience packaging
 dnl --------------------------------------------------------------------
-GPKG_CHECK_RPM()dnl Check wether to package for a system using RPM
-GPKG_CHECK_LINUX()dnl Check wether to package for a linux system
+GPKG_CHECK_LINUX()dnl Check whether to package for a linux system
 
 
 dnl --------------------------------------------------------------------
@@ -591,21 +625,17 @@
 	ExifContent *ec0, *ec1;
 	ec0 = &ed.ifd0;
 	ec1 = &ed.ifd1;
-), 
-   AC_DEFINE(HAVE_LIBEXIF_IFD,1,
+), dnl
+   AC_DEFINE(HAVE_LIBEXIF_IFD, 1,
 	     whether we use a version of libexif with ExifData.ifd)
    AC_MSG_RESULT(yes)
-, 
+, dnl
    AC_MSG_RESULT(no)
 )
 CPPFLAGS="$CPPFLAGS_save"
 ,,default-on,http://www.sourceforge.net/projects/libexif)dnl
 
 
-dnl FIXME: Is this accurate?
-AM_CONDITIONAL(HAVE_CXX, test -n "$CXX" && test "X$CXX" != "Xno")
-
-
 dnl ---------------------------------------------------------------------------
 dnl Configure subprojects
 dnl ---------------------------------------------------------------------------
@@ -613,75 +643,66 @@
 	AC_CONFIG_SUBDIRS(libgphoto2_port)
 else
 	AC_MSG_ERROR(
-*** Hey, where have you hidden my libgphoto2_port?
-*** I needed that!
+******************************************************
+*** Hey, where have you hidden my libgphoto2_port? ***
+*** I needed that!                                 ***
+******************************************************
 )
 fi
 
 
 # ---------------------------------------------------------------------------
+# clean up
+# ---------------------------------------------------------------------------
+GP_SET_CLEAN_FILES
+
+
+# ---------------------------------------------------------------------------
 # Create output files
 # ---------------------------------------------------------------------------
 AC_CONFIG_FILES(
-Makefile
-gphoto2-config
-camlibs/Makefile
-camlibs/canon/doc/Makefile
-camlibs/konica/localization/Makefile
-gphoto-m4/Makefile
-libgphoto2/Makefile
-libgphoto2.pc
-libgphoto2-uninstalled.pc
-examples/Makefile
-tests/Makefile
-tests/ddb/Makefile
-tests/ddb/check-ddb.sh
-packaging/Makefile
-packaging/linux-hotplug/Makefile
-packaging/generic/Makefile
-packaging/rpm/Makefile
-packaging/rpm/package.spec
-po/Makefile.in
-doc/Makefile
-doc/Doxyfile
-doc/Doxyfile-internals
-doc/api/Makefile
-,
-dnl This relies on this code being called for each of the above files
-dnl with ac_file set to the filename.
-	if echo "$ac_file" | grep '.sh$' > /dev/null; then
-		if test -f "$ac_file"; then
-			chmod +x "$ac_file"
-		fi
-	fi
+  Makefile
+  gphoto2-config
+  camlibs/Makefile
+  camlibs/canon/doc/Makefile
+  libgphoto2/Makefile
+  libgphoto2.pc
+  libgphoto2-uninstalled.pc
+  examples/Makefile
+  tests/Makefile
+  packaging/Makefile
+  packaging/generic/Makefile
+  po/Makefile.in
+  doc/Makefile
+  doc/Doxyfile
+  doc/Doxyfile-internals
+  doc/api/Makefile
 )
 AC_OUTPUT
 
-if test "x$CDPATH" != "x"
-then
-        echo
-        echo "***********************************************************"
-        echo "* You have CDPATH set. You may have to run \"unset CDPATH\" *"
-        echo "* before running \"make dist\" or \"make rpm\".               *"
-        echo "***********************************************************"
-fi
+AS_IF(test "x$CDPATH" != "x", dnl
+  AC_MSG_WARN(
+
+    #=========================================================#
+    # You have CDPATH set. You may have to run "unset CDPATH" #
+    # before running "make dist".                             #
+    #=========================================================#
+)
+)dnl
 
 GP_CONFIG_OUTPUT
 
 dnl Catch the Gentoo folks about to shoot themselves in the foot.
 dnl Just enabling "foo" often does not make a camera made by
 dnl manufacturer "Foo" work.
-if test "x$camlibs" = "xall"; then
-   :
-else
-   GP_CAMLIBS_WARNING
-fi
+GP_CAMLIBS_CONDITIONAL_WARNING
 
-echo "Please check whether the configuration I detected matches what you
-would like to have. E.g. make sure that USB support is there if you
-intend to use USB cameras with $PACKAGE_NAME.
+cat<<EOF
+Please check whether the configuration I have detected matches what
+you would like to have. E.g. make sure that USB support is there if
+you intend to use USB cameras with ${PACKAGE_NAME}.
 
 Please also check that PKG_CONFIG_PATH contains
-    ${pkgconfigdir} 
+    ${pkgconfigdir}
 before compiling any libgphoto2 frontend.
-"
+EOF

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/Makefile.am Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/api/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/api/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/api/gphoto2-api.sgml -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/api/gphoto2-api.sgml Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/camlib_devel.lyx -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/camlib_devel.lyx Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/camlib_devel.sgml -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/camlib_devel.sgml Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/camlib_devel.txt -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/camlib_devel.txt Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/libgphoto2-api.html.tar.gz -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/libgphoto2-api.html.tar.gz Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/libgphoto2.3 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/libgphoto2.3 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/doc/libgphoto2_port.3 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/doc/libgphoto2_port.3 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/Makefile.am Changed

@@ -1,23 +1,11 @@
-EXTRA_DIST = README
+EXTRA_DIST = README sample-libfuzz.c
 EXTRA_PROGRAMS =
 check_PROGRAMS =
 check_SCRIPTS =
-TESTS =
-INSTALL_TESTS =
 noinst_PROGRAMS =
 
 
-# Now that we build all the camlibs in one directory, we can run our checks
-# with CAMLIBS set to the camlib build directory.
-TESTS_ENVIRONMENT = env \
-	CAMLIBS="$(top_builddir)/camlibs"
-
-# After installation, this will be CAMLIBS = $(DESTDIR)$(camlibdir)
-INSTALL_TESTS_ENVIRONMENT = env \
-	CAMLIBS="$(DESTDIR)$(camlibdir)" \
-	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
-
-AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)  -I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/libgphoto2 -I$(top_builddir)/libgphoto2
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libgphoto2_port
 
 CLEANFILES = $(check_SCRIPTS)
 
@@ -45,79 +33,10 @@
 sample_tether_SOURCES = samples.h sample-tether.c context.c config.c
 best_iso_SOURCES = best-iso.c
 sample_justfocus_SOURCES = samples.h sample-justfocus.c context.c focus.c
+# sample_libfuzz_SOURCES = samples.h sample-libfuzz.c context.c autodetect.c
 
 LDADD = $(top_builddir)/libgphoto2/libgphoto2.la \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
 	$(LIBLTDL) \
 	$(LIBEXIF_LIBS) \
 	$(INTLLIBS)
-
-#noinst_PROGRAMS += test-filesys
-#test_filesys_SOURCE = test-filesys.c
-#test_filesys_LDADD = \
-#	$(top_builddir)/libgphoto2/libgphoto2.la \
-#	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-#	$(LIBLTDL) \
-#	$(LIBEXIF_LIBS) \
-#	$(INTLLIBS)
-
-
-
-#TESTS += test-camera-list
-#INSTALL_TESTS += test-camera-list
-#check_PROGRAMS += test-camera-list
-#test_camera_list_SOURCE = test-camera-list.c
-#test_camera_list_LDADD = \
-#	$(top_builddir)/libgphoto2/libgphoto2.la \
-#	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-#	$(LIBLTDL) \
-#	$(LIBEXIF_LIBS) \
-#	$(INTLLIBS)
-
-
-#if HAVE_GCC
-#PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Wextra -Werror
-#PEDANTIC_CXXFLAGS = -std=c++98 -pedantic-errors -W -Wall -Wextra -Werror
-#else
-#PEDANTIC_CFLAGS = 
-#PEDANTIC_CXXFLAGS = 
-#endif
-#
-#TESTS += test-pedantic-c
-#check_PROGRAMS += test-pedantic-c
-#test_pedantic_c_SOURCES = test-pedantic-compilation.c
-#test_pedantic_c_CPPFLAGS = \
-#	$(AM_CPPFLAGS) $(CPPFLAGS) \
-#	-U_GPHOTO2_INTERNAL_CODE
-#test_pedantic_c_CFLAGS = \
-#	$(AM_CFLAGS) $(PEDANTIC_CFLAGS) $(CFLAGS) \
-#	-U_GPHOTO2_INTERNAL_CODE
-#test_pedantic_c_LDADD = \
-#	$(top_builddir)/libgphoto2/libgphoto2.la \
-#	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-#	$(LIBLTDL) \
-#	$(LIBEXIF_LIBS) \
-#	$(INTLLIBS)
-
-
-#if HAVE_CXX
-#check_PROGRAMS += test-pedantic-cxx
-#TESTS += test-pedantic-cxx
-#else
-#EXTRA_PROGRAMS += test-pedantic-cxx
-#endif
-#test_pedantic_cxx_SOURCES = test-pedantic-compilation.cxx
-#test_pedantic_cxx_CPPFLAGS = \
-#	$(AM_CPPFLAGS) $(CPPFLAGS) \
-#	-U_GPHOTO2_INTERNAL_CODE
-#test_pedantic_cxx_CXXFLAGS = \
-#	$(AM_CXXFLAGS) $(PEDANTIC_CXXFLAGS) $(CXXFLAGS) \
-#	-U_GPHOTO2_INTERNAL_CODE
-#test_pedantic_cxx_LDADD = \
-#	$(top_builddir)/libgphoto2/libgphoto2.la \
-#	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-#	$(LIBLTDL) \
-#	$(LIBEXIF_LIBS) \
-#	$(INTLLIBS)
-
-include $(top_srcdir)/installcheck.mk

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/best-iso.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/best-iso.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/config.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/config.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/focus.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/focus.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/lunkwill-canon-capture.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/lunkwill-canon-capture.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/preview.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/preview.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-afl.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-afl.c Changed

@@ -16,7 +16,7 @@
 	fprintf(stderr, "%s:%s\n", domain, str);
 }
 
-static int 
+static int
 recursive_directory(Camera *camera, const char *folder, GPContext *context, int *foundfile) {
 	int		i, ret;
 	CameraList	*list;
@@ -45,12 +45,16 @@
 
 		gp_list_get_name (list, i, &newfolder);
 
+		if (!strlen(newfolder)) continue;
+
 		buf = malloc (strlen(folder) + 1 + strlen(newfolder) + 1);
 		strcpy(buf, folder);
 		if (strcmp(folder,"/"))		/* avoid double / */
 			strcat(buf, "/");
 		strcat(buf, newfolder);
 
+		fprintf(stderr,"newfolder=%s\n", newfolder);
+
 		ret = recursive_directory (camera, buf, context, &havefile);
 		free (buf);
 		if (ret != GP_OK) {
@@ -83,6 +87,33 @@
 		return ret;
 	}
 
+	/* get file */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_NORMAL, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		printf ("Could not get file.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	/* get preview */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_PREVIEW, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		printf ("Could not get file preview.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	/* get exif */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_EXIF, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		printf ("Could not get file preview.\n");
+		return ret;
+	}
+	gp_file_unref (file);
 	/* Trigger the ptp things */
 	gp_file_new (&file);
 	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_METADATA, file, context);
@@ -91,7 +122,7 @@
 		printf ("Could not get file metadata.\n");
 		return ret;
 	}
-	gp_file_free (file);
+	gp_file_unref (file);
 	if (foundfile) *foundfile = 1;
 	gp_list_free (list);
 	return GP_OK;
@@ -100,11 +131,19 @@
 
 int main(int argc, char **argv) {
 	Camera		*camera = NULL;
-	int		ret;
+	int		ret, storagecnt;
+	CameraStorageInformation	*storageinfo;
+	GPPortInfoList	*gpinfolist;
 	GPContext	*context;
 	CameraWidget	*rootwidget;
 	char		buf200;
-	CameraText	summary;
+	const char	*name;
+	CameraText		summary;
+	CameraFile		*file;
+	/*CameraFilePath		path;*/
+	CameraList		*list;
+	CameraAbilitiesList      *abilities = NULL;
+
 
         gp_log_add_func(GP_LOG_DEBUG, errordumper, NULL);
 
@@ -116,11 +155,42 @@
 
 	fprintf(stderr,"setting path %s.\n", buf);
 
-	ret = sample_open_camera (&camera, "USB PTP Class Camera", buf, context);
+	gp_port_info_list_new (&gpinfolist);
+	ret = gp_port_info_list_load (gpinfolist);
+	if (ret < GP_OK) return ret;
+
+	ret = gp_port_info_list_lookup_path (gpinfolist, buf);
+	if (ret < GP_OK) return ret;
+
+        /* Detect all the cameras that can be autodetected... */
+        ret = gp_list_new (&list);
+        if (ret < GP_OK) return 1;
+
+	/* Load all the camera drivers we have... */
+	ret = gp_abilities_list_new (&abilities);
+	if (ret < GP_OK) return ret;
+	ret = gp_abilities_list_load (abilities, context);
+	if (ret < GP_OK) return ret;
+	ret = gp_abilities_list_detect (abilities, gpinfolist, list, context);
+	if (ret < GP_OK) return ret;
+
+	gp_port_info_list_free (gpinfolist);
+	gp_abilities_list_free (abilities);
+
+	fprintf(stderr, "detect list has count %d\n", gp_list_count(list));
+
+	ret = gp_list_get_name(list, 0, &name);
+	if (ret < GP_OK) goto out;
+
+	fprintf(stderr, "name is %s\n", name);
+
+	ret = sample_open_camera (&camera, name, buf, context);
         if (ret < GP_OK) {
-		fprintf(stderr,"camera %s not found.\n", buf);
+		fprintf(stderr,"camera %s at %s not found.\n", name, buf);
+		gp_list_free (list);
 		goto out;
 	}
+	gp_list_free (list);
 
 	ret = gp_camera_init (camera, context);
 	if (ret < GP_OK) {
@@ -137,7 +207,7 @@
 	}
 
 	ret = gp_camera_get_summary (camera, &summary, context);
-	if (ret < GP_OK) {
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
 		printf ("Could not get summary.\n");
 		goto out;
 	}
@@ -148,8 +218,23 @@
 		fprintf (stderr,"Could not get config.\n");
 		goto out;
 	}
+	gp_widget_free (rootwidget);
 #endif
 	printf ("OK, %s\n", summary.text);
+
+	ret = gp_camera_get_storageinfo (camera, &storageinfo, &storagecnt, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		printf ("Could not get storage info.\n");
+		goto out;
+	}
+	free(storageinfo);
+
+	ret = gp_camera_trigger_capture (camera, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		printf ("Could not trigger capture.\n");
+		goto out;
+	}
+
 	while (1) {
 		CameraEventType evttype;
 		void *data = NULL;
@@ -160,9 +245,28 @@
 		if (evttype == GP_EVENT_TIMEOUT) break;
 	}
 
+	gp_file_new (&file);
+	ret = gp_camera_capture_preview (camera, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_file_free (file);
+		printf ("Could not capture preview.\n");
+		goto out;
+	}
+	gp_file_free (file);
+
+#if 0
+	/* this gives endless event check loops occasionaly ... need review how to do this best */
+	ret = gp_camera_capture (camera, GP_CAPTURE_IMAGE, &path, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		printf ("Could not capture preview.\n");
+		goto out;
+	}
+#endif
+
 	/* AFL PART ENDS HERE */
 out:
 	gp_camera_exit (camera, context);
+	gp_context_unref (context);
 	gp_camera_free (camera);
 	return 0;
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-capture.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-capture.c Changed

@@ -1,13 +1,13 @@
-/* 
+/*
  * This code released into the public domain 21 July 2008
- * 
+ *
  * This program does the equivalent of:
  * gphoto2 --shell
  *   > set-config capture=1
  *   > capture-image-and-download
  * compile with gcc -Wall -o canon-capture -lgphoto2 canon-capture.c
  *
- * Taken from: http://credentiality2.blogspot.com/2008/07/linux-libgphoto2-image-capture-from.html 
+ * Taken from: http://credentiality2.blogspot.com/2008/07/linux-libgphoto2-image-capture-from.html
  *
  * and condensed into simple capture sample
  */
@@ -62,9 +62,10 @@
 
 static void
 capture_to_file(Camera *camera, GPContext *context, char *fn) {
-	int fd, retval;
-	CameraFile *file;
-	CameraFilePath camera_file_path;
+	int		fd, retval;
+	CameraFile	*file;
+	CameraFilePath	camera_file_path;
+	CameraFileInfo	info;
 
 	printf("Capturing.\n");
 
@@ -75,8 +76,15 @@
 	retval = gp_camera_capture(camera, GP_CAPTURE_IMAGE, &camera_file_path, context);
 	printf("  Retval: %d\n", retval);
 
+
 	printf("Pathname on the camera: %s/%s\n", camera_file_path.folder, camera_file_path.name);
 
+	retval = gp_camera_file_get_info (camera, camera_file_path.folder, camera_file_path.name, &info, context);
+	printf ("       file info reported flags: %d\n", info.file.fields);
+	if (info.file.fields & GP_FILE_INFO_MTIME) printf ("    info reported mtime: %ld\n", info.file.mtime);
+	if (info.file.fields & GP_FILE_INFO_SIZE) printf ("     info reported size: %ld\n", info.file.size);
+	if (info.file.fields & GP_FILE_INFO_TYPE) printf ("     info reported type: %s\n", info.file.type);
+
 	fd = open(fn, O_CREAT | O_WRONLY | O_BINARY, 0644);
 	retval = gp_file_new_from_fd(&file, fd);
 	printf("  Retval: %d\n", retval);
@@ -122,7 +130,7 @@
 	f = fopen("foo2.jpg", "wb");
 	if (f) {
 		retval = fwrite (data, size, 1, f);
-		if (retval != size) {
+		if (retval != (int)size) {
 			printf("  fwrite size %ld, written %d\n", size, retval);
 		}
 		fclose(f);

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-libfuzz.c Added

@@ -0,0 +1,312 @@
+/*
+ * This is a sample for use by LibFuzzer.
+ *
+ * How to build:
+ * install clang
+ * CC="clang" CFLAGS="-fsanitize=address,fuzzer-no-link -O2 -g" ./configure --prefix=/usr --libdir=/usr/lib64 --enable-vusb
+ * make
+ * sudo make install
+ * rm usb1.* from port drivers
+ * in examples/
+ * clang -fsanitize=address,fuzzer -O2 -g sample-libfuzz.c autodetect.c context.c -lgphoto2 -lgphoto2_port -o fuzzer
+ * mkdir CORPUS
+ * ./fuzzer -detect_leaks=0 CORPUS/
+ *
+ * FIXME:
+ * - currently this seems to have memory leaks, it slows down and gets more and more memory over time. 
+ *   restarting cures it for a while
+ * - It crashes on start in 80% of the cases. You might need retry multiple times to start it.
+ *   reason is i think the fuzzer creates a bitmap in an area where the loaded camlibs are mapped into after the fact.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <gphoto2/gphoto2-camera.h>
+#include <gphoto2/gphoto2-port-log.h>
+
+#include "samples.h"
+
+/* Sample for AFL usage.
+ *
+ */
+
+void errordumper(GPLogLevel level, const char *domain, const char *str,
+                 void *data) {
+	/* Do not log ... but let it appear here so we discover debug paths */
+	//fprintf(stderr, "%s:%s\n", domain, str);
+}
+void contexterror (GPContext *context, const char *text, void *data) {
+}
+
+
+static int
+recursive_directory(Camera *camera, const char *folder, GPContext *context, int *foundfile) {
+	int		i, ret;
+	CameraList	*list;
+	const char	*newfile;
+	CameraFileInfo	fileinfo;
+	CameraFile	*file;
+
+	ret = gp_list_new (&list);
+	if (ret < GP_OK) {
+		printf ("Could not allocate list.\n");
+		return ret;
+	}
+
+	ret = gp_camera_folder_list_folders (camera, folder, list, context);
+	if (ret < GP_OK) {
+		//fprintf (stderr, "Could not list folders.\n");
+		gp_list_free (list);
+		return ret;
+	}
+	gp_list_sort (list);
+
+	for (i = 0; i < gp_list_count (list); i++) {
+		const char *newfolder;
+		char *buf;
+		int havefile = 0;
+
+		gp_list_get_name (list, i, &newfolder);
+
+		if (!strlen(newfolder)) continue;
+
+		buf = (char*)malloc (strlen(folder) + 1 + strlen(newfolder) + 1);
+		strcpy(buf, folder);
+		if (strcmp(folder,"/"))		/* avoid double / */
+			strcat(buf, "/");
+		strcat(buf, newfolder);
+
+		//fprintf(stderr,"newfolder=%s\n", newfolder);
+
+		ret = recursive_directory (camera, buf, context, &havefile);
+		free (buf);
+		if (ret != GP_OK) {
+			gp_list_free (list);
+			//fprintf (stderr, "Failed to recursively list folders.\n");
+			return ret;
+		}
+		if (havefile) /* only look for the first directory with a file */
+			break;
+	}
+	gp_list_reset (list);
+
+	ret = gp_camera_folder_list_files (camera, folder, list, context);
+	if (ret < GP_OK) {
+		gp_list_free (list);
+		//fprintf (stderr, "Could not list files.\n");
+		return ret;
+	}
+	gp_list_sort (list);
+	if (gp_list_count (list) <= 0) {
+		gp_list_free (list);
+		return GP_OK;
+	}
+
+	gp_list_get_name (list, 0, &newfile); /* only entry 0 needed */
+	ret = gp_camera_file_get_info (camera, folder, newfile, &fileinfo, context);
+	if (ret != GP_OK) {
+		gp_list_free (list);
+		//fprintf (stderr, "Could not get file info.\n");
+		return ret;
+	}
+
+	/* get file */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_NORMAL, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		//fprintf (stderr, "Could not get file.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	/* get preview */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_PREVIEW, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		// fprintf (stderr, "Could not get file preview.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	/* get exif */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_EXIF, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		printf ("Could not get file preview.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	/* Trigger the ptp things */
+	gp_file_new (&file);
+	ret = gp_camera_file_get (camera, folder, newfile, GP_FILE_TYPE_METADATA, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_list_free (list);
+		printf ("Could not get file metadata.\n");
+		return ret;
+	}
+	gp_file_unref (file);
+	if (foundfile) *foundfile = 1;
+	gp_list_free (list);
+	return GP_OK;
+}
+
+
+static GPPortInfoList		*gpinfolist = NULL;
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+	static int			initialized = 0;
+	int				ret, storagecnt;
+	static Camera			*camera = NULL;
+	CameraStorageInformation	*storageinfo;
+
+	GPPortInfo			pi;
+	static GPContext		*context = NULL;
+	char				buf200;
+	static const char		*name;
+	static const char		*port;
+	char				*xpath;
+	char				tmpfn200 = { 0 };
+
+	int				fd;
+	CameraWidget			*rootwidget;
+	CameraText			summary;
+	CameraFile			*file;
+	/*CameraFilePath		path;*/
+	CameraList			*list;
+
+        gp_log_add_func(GP_LOG_DEBUG, errordumper, NULL);
+
+	if (!gpinfolist) {
+		gp_port_info_list_new (&gpinfolist);
+		ret = gp_port_info_list_load (gpinfolist);
+		if (ret < GP_OK) return 0;
+	}
+	if (!context) {
+		context = sample_create_context (); /* see context.c */
+		gp_context_set_error_func (context, contexterror, NULL);
+	}
+
+	if (!initialized) {
+		/* Detect all the cameras that can be autodetected... */
+		ret = gp_list_new (&list);
+		if (ret < GP_OK) return 0;
+
+		gp_camera_autodetect (list, context);
+
+		//fprintf(stderr, "detect list has count %d\n", gp_list_count(list));
+		if (gp_list_count(list) < 1) goto out;
+
+		ret = gp_list_get_name(list, 0, &name);
+		if (ret < GP_OK) goto out;
+		ret = gp_list_get_value(list, 0, &port);
+		if (ret < GP_OK) goto out;
+		//fprintf(stderr,"camera %s detected at port %s.\n", name, port);
+
+		ret = sample_open_camera (&camera, name, port, context);
+		if (ret < GP_OK) {
+			fprintf(stderr,"camera %s not found.\n", name);
+			goto out;
+		}
+		initialized = 1;
+	}
+	/* code that runs all the time */
+
+	strcpy(tmpfn,"/dev/shm/gphotofuzz.XXXXXX");
+	fd = mkstemp(tmpfn);
+	write (fd, Data, Size);
+	close(fd);
+
+	strcpy(buf,"vusb:"); strcat(buf,tmpfn);
+
+	//fprintf(stderr,"setting path %s.\n", buf);
+
+	ret = gp_port_info_list_lookup_path (gpinfolist, buf);
+	if (ret < GP_OK) goto out;
+	gp_port_info_list_get_info (gpinfolist, ret, &pi);
+
+	ret = gp_camera_set_port_info (camera, pi);
+	if (ret < GP_OK) {
+		fprintf(stderr,"portinfo not set %d.\n", ret);
+		goto out;
+	}
+
+	ret = gp_camera_init (camera, context);
+	if (ret < GP_OK) {
+		//fprintf(stderr,"Camera not initialized %d.\n", ret);
+		goto out;
+	}
+
+	ret = recursive_directory(camera, "/", context, NULL);
+	if (ret < GP_OK) {
+		//fprintf (stderr, "Could not recursive list files.\n");
+		goto out;
+	}
+
+	ret = gp_camera_get_summary (camera, &summary, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		//fprintf (stderr, "Could not get summary.\n");
+		goto out;
+	}
+
+#if 1
+	ret = gp_camera_get_config (camera, &rootwidget, context);
+	if (ret < GP_OK) {
+		//fprintf (stderr,"Could not get config.\n");
+		goto out;
+	}
+	gp_widget_free (rootwidget);
+#endif
+	//printf ("OK, %s\n", summary.text);
+
+	ret = gp_camera_get_storageinfo (camera, &storageinfo, &storagecnt, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		//fprintf (stderr, "Could not get storage info.\n");
+		goto out;
+	}
+	free(storageinfo);
+
+	ret = gp_camera_trigger_capture (camera, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		//fprintf (stderr, "Could not trigger capture.\n");
+		goto out;
+	}
+
+	while (1) {
+		CameraEventType evttype;
+		void *data = NULL;
+
+		ret = gp_camera_wait_for_event(camera, 1, &evttype, &data, context);
+		if (ret < GP_OK) break;
+		if (data) free (data);
+		if (evttype == GP_EVENT_TIMEOUT) break;
+	}
+
+	gp_file_new (&file);
+	ret = gp_camera_capture_preview (camera, file, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		gp_file_free (file);
+		//fprintf (stderr, "Could not capture preview.\n");
+		goto out;
+	}
+	gp_file_free (file);
+
+#if 0
+	/* this gives endless event check loops occasionaly ... need review how to do this best */
+	ret = gp_camera_capture (camera, GP_CAPTURE_IMAGE, &path, context);
+	if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
+		printf ("Could not capture preview.\n");
+		goto out;
+	}
+#endif
+
+	/* AFL PART ENDS HERE */
+out:
+	if (camera) gp_camera_exit (camera, context);
+	/*gp_context_unref (context);*/
+	/*gp_camera_free (camera);*/
+	if (tmpfn0) unlink (tmpfn);
+	return 0;
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-owner.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-owner.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-photobooth.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-photobooth.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-tether.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-tether.c Changed

@@ -1,4 +1,4 @@
-/* 
+/*
  * This program does the equivalent of:
  * gphoto2 --wait-event-and-download
  *
@@ -24,11 +24,12 @@
 
 static void
 camera_tether(Camera *camera, GPContext *context) {
-	int fd, retval;
-	CameraFile *file;
+	int		fd, retval;
+	CameraFile	*file;
 	CameraEventType	evttype;
 	CameraFilePath	*path;
-	void	*evtdata;
+	CameraFileInfo	info;
+	void		*evtdata;
 
 	printf("Tethering...\n");
 
@@ -41,6 +42,12 @@
 			path = (CameraFilePath*)evtdata;
 			printf("File added on the camera: %s/%s\n", path->folder, path->name);
 
+			retval = gp_camera_file_get_info (camera, path->folder, path->name, &info, context);
+			printf ("	info reported flags: %d\n", info.file.fields);
+			if (info.file.fields & GP_FILE_INFO_MTIME) printf ("	info reported mtime: %ld\n", info.file.mtime);
+			if (info.file.fields & GP_FILE_INFO_SIZE) printf ("	info reported size: %ld\n", info.file.size);
+			if (info.file.fields & GP_FILE_INFO_TYPE) printf ("	info reported type: %s\n", info.file.type);
+
 			fd = open (path->name, O_CREAT | O_WRONLY | O_BINARY, 0644);
 			retval = gp_file_new_from_fd(&file, fd);
 			printf("  Downloading %s...\n", path->name);
@@ -71,6 +78,7 @@
 		case GP_EVENT_UNKNOWN:
 			if (evtdata) {
 				printf("Unknown event: %s.\n", (char*)evtdata);
+				free(evtdata);
 			} else {
 				printf("Unknown event.\n");
 			}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/sample-trigger-capture.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/sample-trigger-capture.c Changed

@@ -1,4 +1,4 @@
-/* 
+/*
  */
 
 #include <stdlib.h>
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
 #include <gphoto2/gphoto2.h>
@@ -41,12 +42,12 @@
 		waittime = 10; /* just drain the event queue */
 
 	while (1) {
-		unsigned int timediff;
+		int timediff;
 
 	        gettimeofday (&curtime, NULL);
 
 		timediff = ((curtime.tv_sec - start.tv_sec)*1000)+((curtime.tv_usec - start.tv_usec)/1000);
-		if (timediff >= waittime) 
+		if (timediff >= waittime)
 			break;
 
 		retval = gp_camera_wait_for_event(camera, waittime - timediff, &evtype, &data, context);
@@ -60,6 +61,8 @@
 			fprintf (stderr, "wait for event CAPTURE_COMPLETE\n");
 			break;
 		case GP_EVENT_UNKNOWN:
+			free(data);
+			break;
 		case GP_EVENT_TIMEOUT:
 			break;
 		case GP_EVENT_FOLDER_ADDED:
@@ -126,7 +129,7 @@
 		}
 		if (-1 == lseek(fd, 0, SEEK_SET))
 			perror("lseek");
-		if (-1 == write (fd, buffer, size)) 
+		if (-1 == write (fd, buffer, size))
 			perror("write");
 		close (fd);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/examples/samples.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/examples/samples.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-abilities-list.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-abilities-list.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-camera.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-camera.h Changed

@@ -11,10 +11,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -23,8 +23,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GPHOTO2_CAMERA_H__
-#define __GPHOTO2_CAMERA_H__
+#ifndef LIBGPHOTO2_GPHOTO2_CAMERA_H
+#define LIBGPHOTO2_GPHOTO2_CAMERA_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,7 +35,7 @@
  *
  * A Camera object represents a specific instance of a (physical of
  * virtual) camera attached to the system.
- * 
+ *
  * The abilities of this type of camera are stored in a CameraAbility
  * object.
  *
@@ -58,7 +58,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/** 
+/**
  * \brief CameraText structure used in various functions.
  *
  * A text structure containing translated text returned
@@ -69,7 +69,7 @@
 	char text 32 * 1024; /**< \brief Character string containing the translated text. */
 } CameraText;
 
-/** 
+/**
  * \brief A structure created by the capture operation.
  *
  * A structure containing the folder and filename of an object
@@ -112,7 +112,7 @@
 /**
  * \name Camera object member functions
  *
- * These functions must be implemented by a camlib and the camlib's 
+ * These functions must be implemented by a camlib and the camlib's
  * camera_init() function will add them to a Camera object.
  *
  * @{
@@ -133,7 +133,7 @@
  * Implement this function if you need to any of this stuff, otherwise leave
  * it out.
  *
- * \returns a gphoto error code 
+ * \returns a gphoto error code
  */
 typedef int (*CameraExitFunc)      (Camera *camera, GPContext *context);
 
@@ -172,7 +172,7 @@
  * frontend, which then renders it, allows user input and sends it back
  * via the #CameraSetConfigFunc function to have the driver configure itself
  * or the camera.
- * 
+ *
  * This specific function retrieves one specific named entry, and not the full
  * tree to allow for querying specific settings faster.
  *
@@ -196,7 +196,7 @@
  * frontend, which then renders it, allows user input and sends it back
  * via the #CameraSetConfigFunc function to have the driver configure itself
  * or the camera.
- * 
+ *
  * This specific function retrieves all the available configuration values in a flat list.
  *
  * This is different than the GetConfigFunc, which returns a configuration tree.
@@ -210,14 +210,14 @@
 /**
  * \brief Set the configuration in the camera
  *
- * \param camera the current camera 
+ * \param camera the current camera
  * \param widget the configuration widget tree that was changed
  * \param context the active #GPContext
  *
  * This function is called in the driver after the configuration is set.
  * It is called directly after setting the value and might called multiple
  * times (or never) after just one #CameraGetConfigFunc.
- * 
+ *
  * \returns a gphoto error code
  */
 typedef int (*CameraSetConfigFunc) (Camera *camera, CameraWidget  *widget,
@@ -225,13 +225,13 @@
 /**
  * \brief Set a single configuration variable in the camera
  *
- * \param camera the current camera 
+ * \param camera the current camera
  * \param name the widget to set
  * \param widget the configuration widget tree that was changed
  * \param context the active #GPContext
  *
  * This function is called in the driver after the configuration value is set.
- * 
+ *
  * \returns a gphoto error code
  */
 typedef int (*CameraSetSingleConfigFunc) (Camera *camera, const char *name, CameraWidget  *widget,
@@ -263,8 +263,8 @@
  * be initialized before or reset the after each access from
  * libgphoto2.
  *
- * For example, you would probably set the speed to the highest one 
- * right before downloading an image, and reset it to the default speed 
+ * For example, you would probably set the speed to the highest one
+ * right before downloading an image, and reset it to the default speed
  * afterwards so that other programs will not be affected by this speed
  * change.
  */
@@ -340,7 +340,7 @@
 int gp_camera_new               (Camera **camera);
 
 
-/** \name Preparing initialization 
+/** \name Preparing initialization
  * @{
  */
 int gp_camera_set_abilities     (Camera *camera, CameraAbilities  abilities);
@@ -365,19 +365,19 @@
 /**@}*/
 
 
-/** \name Initialization 
- * @{ 
+/** \name Initialization
+ * @{
  */
 int gp_camera_autodetect 	 (CameraList *list, GPContext *context);
 int gp_camera_init               (Camera *camera, GPContext *context);
 int gp_camera_exit               (Camera *camera, GPContext *context);
 
 /**@}*/
- 
 
 
-/** \name Operations on cameras 
- * @{ 
+
+/** \name Operations on cameras
+ * @{
  */
 int gp_camera_ref   		 (Camera *camera);
 int gp_camera_unref 		 (Camera *camera);
@@ -414,12 +414,12 @@
 /**@}*/
 
 
-/** \name Operations on folders 
+/** \name Operations on folders
  * @{
  */
-int gp_camera_folder_list_files   (Camera *camera, const char *folder, 
+int gp_camera_folder_list_files   (Camera *camera, const char *folder,
 				   CameraList *list, GPContext *context);
-int gp_camera_folder_list_folders (Camera *camera, const char *folder, 
+int gp_camera_folder_list_folders (Camera *camera, const char *folder,
 				   CameraList *list, GPContext *context);
 int gp_camera_folder_delete_all   (Camera *camera, const char *folder,
 				   GPContext *context);
@@ -434,29 +434,29 @@
 /**@}*/
 
 
-/** \name Operations on files 
+/** \name Operations on files
  * @{
  */
-int gp_camera_file_get_info 	(Camera *camera, const char *folder, 
+int gp_camera_file_get_info 	(Camera *camera, const char *folder,
 				 const char *file, CameraFileInfo *info,
 				 GPContext *context);
-int gp_camera_file_set_info 	(Camera *camera, const char *folder, 
+int gp_camera_file_set_info 	(Camera *camera, const char *folder,
 				 const char *file, CameraFileInfo info,
 				 GPContext *context);
-int gp_camera_file_get		(Camera *camera, const char *folder, 
+int gp_camera_file_get		(Camera *camera, const char *folder,
 				 const char *file, CameraFileType type,
 				 CameraFile *camera_file, GPContext *context);
 int gp_camera_file_read		(Camera *camera, const char *folder, const char *file,
-		    		 CameraFileType type, 
+		    		 CameraFileType type,
 		    		 uint64_t offset, char *buf, uint64_t *size,
 		    		 GPContext *context);
-int gp_camera_file_delete     	(Camera *camera, const char *folder, 
+int gp_camera_file_delete     	(Camera *camera, const char *folder,
 				 const char *file, GPContext *context);
 /**@}*/
 
 
 /**
- * \name Some cameras need 'keep-alive-messages'. 
+ * \name Some cameras need 'keep-alive-messages'.
  * @{
  */
 typedef int          (* CameraTimeoutFunc)      (Camera *camera,
@@ -481,4 +481,4 @@
 #endif /* __cplusplus */
 
 
-#endif /* __GPHOTO2_CAMERA_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_CAMERA_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-context.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-context.h Changed

@@ -1,4 +1,4 @@
-/** \file 
+/** \file
  * \brief Context callback operation functions.
  *
  * \author Copyright 2001 Lutz Mueller <lutz@users.sourceforge.net>
@@ -10,10 +10,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -22,8 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GPHOTO2_CONTEXT_H__
-#define __GPHOTO2_CONTEXT_H__
+#ifndef LIBGPHOTO2_GPHOTO2_CONTEXT_H
+#define LIBGPHOTO2_GPHOTO2_CONTEXT_H
 
 #include <stdarg.h>
 
@@ -34,7 +34,7 @@
 /**
  * \brief The gphoto context structure.
  *
- * This structure allows callback handling, passing error contexts back, 
+ * This structure allows callback handling, passing error contexts back,
  * progress handling and download cancellation and similar things.
  * It is usually passed around the functions.
  */
@@ -135,4 +135,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* __GPHOTO2_CONTEXT_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_CONTEXT_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-file.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-file.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-filesys.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-filesys.h Changed

@@ -15,10 +15,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -27,8 +27,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GPHOTO2_FILESYS_H__
-#define __GPHOTO2_FILESYS_H__
+#ifndef LIBGPHOTO2_GPHOTO2_FILESYS_H
+#define LIBGPHOTO2_GPHOTO2_FILESYS_H
 
 #include <time.h>
 #include <stdint.h>
@@ -41,15 +41,15 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/** 
+/**
  * \brief Bitmask on what fields are set in the CameraFileInfo structure.
  *
  * Bitmask to mark up which fields are set in the CameraFileInfo
  * structure. The other fields might be uninitialized.
- * If you set information via gp_camera_file_set_info() you 
+ * If you set information via gp_camera_file_set_info() you
  * need to set those flags. If you retrieve information via
  * gp_camera_file_get_info() you need to check those flags.
- * They are seperate for both "normal" and "preview" parts
+ * They are separate for both "normal" and "preview" parts
  * and are mostly image related.
  */
 typedef enum {
@@ -132,7 +132,7 @@
 	char type64;			/**< \brief MIME type of the audio file. */
 } CameraFileInfoAudio;
 
-/** 
+/**
  * \brief File information structure.
  *
  * Contains the normal, preview and audio file information structures
@@ -144,14 +144,14 @@
 	CameraFileInfoAudio   audio;
 } CameraFileInfo;
 
-/** 
+/**
  * \brief Storage information flags.
  *
  * Bitmask to specify which entries of the filesystem
  * storage information is set.
  */
 typedef enum {
-	GP_STORAGEINFO_BASE		= (1<<0),	/**< \brief The base directory. 
+	GP_STORAGEINFO_BASE		= (1<<0),	/**< \brief The base directory.
 							 * Usually / if just 1 storage is attached.
 							 */
 	GP_STORAGEINFO_LABEL		= (1<<1),	/**< \brief Label of the filesystem.
@@ -168,7 +168,7 @@
 
 /**
  * \brief Hardware storage types.
- * 
+ *
  * Type of hardware this storage is on. The types and values
  * are the same as the PTP standard uses (PTP_ST_xxx).
  */
@@ -182,7 +182,7 @@
 
 /**
  * \brief Storage access modes.
- * 
+ *
  * The modes we can access the storage with. Uses the same
  * types and values as the PTP standard (PTP_AC_xxx).
  */
@@ -194,7 +194,7 @@
 
 /**
  * \brief Filesystem hierarchy types.
- * 
+ *
  * The type of the filesystem hierarchy the devices uses.
  * Same types and values as the PTP standard defines (PTP_FST_xxx).
  */
@@ -224,7 +224,7 @@
 	uint64_t			freeimages;	/**< \brief Free space in images (guessed by camera). */
 } CameraStorageInformation;
 
-/** 
+/**
  * \brief Filesystem structure, only exposed to camera drivers.
  *
  * Internal structure, contents not exposed to frontends. Camera
@@ -242,6 +242,9 @@
 int gp_filesystem_set_info_noop    (CameraFilesystem *fs,
 				    const char *folder, const char *filename,
 				    CameraFileInfo info, GPContext *context);
+int gp_filesystem_set_info_dirty   (CameraFilesystem *fs,
+				    const char *folder, const char *filename,
+				    GPContext *context);
 int gp_filesystem_set_file_noop    (CameraFilesystem *fs,
 				    const char *folder, const char *filename,
 				    CameraFileType type,
@@ -381,4 +384,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* __GPHOTO2_FILESYS_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_FILESYS_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-library.h Changed

@@ -1,6 +1,6 @@
 /** \file
  * \brief Camery driver header.
- * 
+ *
  * \author Copyright 2000 Scott Fritzinger
  *
  * \note
@@ -10,10 +10,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -22,8 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GPHOTO2_LIBRARY_H__
-#define __GPHOTO2_LIBRARY_H__
+#ifndef LIBGPHOTO2_GPHOTO2_LIBRARY_H
+#define LIBGPHOTO2_GPHOTO2_LIBRARY_H
 
 #include <gphoto2/gphoto2-abilities-list.h>
 #include <gphoto2/gphoto2-camera.h>
@@ -58,14 +58,14 @@
  * \return a gphoto2 error code
  *
  * The camera driver will establish a first connection
- * to the camera and configure the camera variable (i.e. using 
+ * to the camera and configure the camera variable (i.e. using
  * #gp_filesystem_set_list_funcs or #gp_port_get_settings).
  *
  **/
 typedef int (* CameraLibraryInitFunc)      (Camera *camera, GPContext *context);
 
 /*
- * If you want to write a camera library, you need to implement 
+ * If you want to write a camera library, you need to implement
  * the following three functions. Everything else should be declared
  * as static.
  */
@@ -77,4 +77,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* __GPHOTO2_LIBRARY_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_LIBRARY_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-list.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-list.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-result.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-result.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-setting.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-setting.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-version.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-version.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2-widget.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2-widget.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/gphoto2/gphoto2.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/gphoto2/gphoto2.h Changed

@@ -10,10 +10,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -21,22 +21,14 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef __GPHOTO2_H__
-#define __GPHOTO2_H__
+
+#ifndef LIBGPHOTO2_GPHOTO2_H
+#define LIBGPHOTO2_GPHOTO2_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef OS2
-#  include <db.h>
-#  include <sys/param.h>
-#  define CAMLIBS     getenv("CAMLIBS")
-#  define RTLD_LAZY   0x001
-#  define VERSION     "2"
-#  define usleep(t)   _sleep2(((t)+500)/ 1000)
-#endif
-
 #ifdef WIN32
 #ifndef CAMLIBS
 #define CAMLIBS "."
@@ -55,4 +47,4 @@
 }
 #endif
 
-#endif /* __GPHOTO2_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2-uninstalled.pc.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2-uninstalled.pc.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2.pc.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2.pc.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/Makefile.am Changed

@@ -1,59 +1,93 @@
-lib_LTLIBRARIES = libgphoto2.la
+EXTRA_DIST =
+
+
+# included by all *.c files containing translated string literals as
+# libgphoto2/i18n.h
+EXTRA_DIST += i18n.h
+
+
+# dummy file needed by gtk-doc
+EXTRA_DIST += gphoto2-library.c
+
+
+lib_LTLIBRARIES             = libgphoto2.la
+libgphoto2_la_CFLAGS        =
+libgphoto2_la_CPPFLAGS      =
+libgphoto2_la_DEPENDENCIES  =
+libgphoto2_la_LDFLAGS       =
+libgphoto2_la_LIBADD        =
+libgphoto2_la_SOURCES       =
+
+libgphoto2_la_CPPFLAGS     += -I$(top_srcdir)
+libgphoto2_la_CPPFLAGS     += -I$(top_builddir)
+
+libgphoto2_la_CPPFLAGS     += -I$(top_srcdir)/libgphoto2_port
+libgphoto2_la_CPPFLAGS     += -I$(top_builddir)/libgphoto2_port
+
+libgphoto2_la_CPPFLAGS     += $(AM_CPPFLAGS)
+
+libgphoto2_la_LDFLAGS      += -no-undefined
 
 # Notes about the list of exported symbols:
 #    gp_* also contains internal symbols which are intended for
 #         INTERNAL USE ONLY and should be converted into gpi_* symbols
 #    gpi_* are for libgphoto2/camlib internal use only
 #          NEVER USE gpi_* in frontends!
-#    gp_* gphoto2 API, used in 
+#    gp_* gphoto2 API, used in
 #         - frontends
 #           BE AWARE that NOT ALL gp_* FUNCTIONS ARE CONSIDERED PUBLIC.
 #
 # Yes, this is messy, but we are going to clean this up.
 
-libgphoto2_la_CPPFLAGS =				\
-	-I$(top_srcdir) -I$(top_builddir)		\
-	-I$(top_srcdir)/libgphoto2_port -I$(top_builddir)/libgphoto2_port		\
-	$(AM_CPPFLAGS) $(CPPFLAGS)			\
-	$(LTDLINCL)					\
-	$(LIBEXIF_CFLAGS)
-
-libgphoto2_la_LDFLAGS =	\
-	-no-undefined	\
-	-export-symbols $(srcdir)/libgphoto2.sym \
-	-version-info @LIBGPHOTO2_VERSION_INFO@
-
-libgphoto2_la_SOURCES = 	\
-	gphoto2-abilities-list.c\
-	ahd_bayer.c 		\
-	bayer.c bayer.h		\
-	gphoto2-camera.c	\
-	gphoto2-context.c	\
-	exif.c exif.h		\
-	gphoto2-file.c		\
-	gphoto2-filesys.c	\
-	gamma.c gamma.h		\
-	jpeg.c jpeg.h		\
-	gphoto2-list.c		\
-	gphoto2-result.c	\
-	gphoto2-version.c	\
-	gphoto2-setting.c	\
-	gphoto2-widget.c
-
-libgphoto2_la_LIBADD =					\
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL)					\
-	$(LIBEXIF_LIBS)					\
-	-lm $(INTLLIBS)
+# Keep on using libgphoto2.sym until we actually have a libgphoto2.ver
+# version script.
+# EXTRA_DIST                 += libgphoto2.ver
+EXTRA_DIST                 += libgphoto2.sym
+# if HAVE_ASM_SYMVER
+# libgphoto2_la_DEPENDENCIES += libgphoto2.ver
+# libgphoto2_la_LDFLAGS      += -Wl,--version-script=$(srcdir)/libgphoto2.ver
+# else
+libgphoto2_la_DEPENDENCIES += libgphoto2.sym
+libgphoto2_la_LDFLAGS      += -export-symbols $(srcdir)/libgphoto2.sym
+# endif
+
+libgphoto2_la_LDFLAGS      += -version-info @LIBGPHOTO2_VERSION_INFO@
+
+libgphoto2_la_LIBADD       += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+
 # The libtool docs describe these params, but they don't build.
 #	"-dlopen" self \
 #	"-dlopen" $(top_builddir)/camlibs/canon/....la \
 #	"-dlopen" $(top_builddir)/camlibs/ptp2/....la
 
-libgphoto2_la_DEPENDENCIES = \
-	$(top_srcdir)/gphoto2/gphoto2-version.h \
-	$(srcdir)/libgphoto2.sym
+libgphoto2_la_CPPFLAGS     += $(LTDLINCL)
+libgphoto2_la_LIBADD       += $(LIBLTDL)
+
+libgphoto2_la_CPPFLAGS     += $(LIBEXIF_CFLAGS)
+libgphoto2_la_LIBADD       += $(LIBEXIF_LIBS)
+
+libgphoto2_la_LIBADD       += -lm
+libgphoto2_la_LIBADD       += $(INTLLIBS)
 
-EXTRA_DIST = gphoto2-library.c libgphoto2.sym
+libgphoto2_la_SOURCES      += gphoto2-abilities-list.c
+libgphoto2_la_SOURCES      += ahd_bayer.c
+libgphoto2_la_SOURCES      += bayer.c
+libgphoto2_la_SOURCES      += bayer.h
+libgphoto2_la_SOURCES      += bayer-types.h
+libgphoto2_la_SOURCES      += gphoto2-camera.c
+libgphoto2_la_SOURCES      += gphoto2-context.c
+libgphoto2_la_SOURCES      += exif.c
+libgphoto2_la_SOURCES      += exif.h
+libgphoto2_la_SOURCES      += gphoto2-file.c
+libgphoto2_la_SOURCES      += gphoto2-filesys.c
+libgphoto2_la_SOURCES      += gamma.c
+libgphoto2_la_SOURCES      += gamma.h
+libgphoto2_la_SOURCES      += jpeg.c
+libgphoto2_la_SOURCES      += jpeg.h
+libgphoto2_la_SOURCES      += gphoto2-list.c
+libgphoto2_la_SOURCES      += gphoto2-result.c
+libgphoto2_la_SOURCES      += gphoto2-version.c
+libgphoto2_la_SOURCES      += gphoto2-setting.c
+libgphoto2_la_SOURCES      += gphoto2-widget.c
 
-DISTCLEANFILES = _stdint.h
+libgphoto2_la_DEPENDENCIES += $(top_srcdir)/gphoto2/gphoto2-version.h

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/ahd_bayer.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/ahd_bayer.c Changed

@@ -1,22 +1,22 @@
 /** \file ahd_bayer.c
- *  
+ *
  * \brief Adaptive Homogeneity-Directed Bayer array conversion routine.
  *
  * \author Copyright March 12, 2008 Theodore Kilgore <kilgota@auburn.edu>
  *
  * \par
  * gp_ahd_interpolate() from Eero Salminen <esalmine@gmail.com>
- * and Theodore Kilgore. The work of Eero Salminen is for partial completion 
- * of a Diploma in Information and Computer Science, 
+ * and Theodore Kilgore. The work of Eero Salminen is for partial completion
+ * of a Diploma in Information and Computer Science,
  * Helsinki University of Technology, Finland.
  *
  * \par
  * The algorithm is based upon the paper
  *
  * \par
- * Adaptive Homogeneity-Directed Democsaicing Algoritm, 
- * Keigo Hirakawa and Thomas W. Parks, presented in the 
- * IEEE Transactions on Image Processing, vol. 14, no. 3, March 2005. 
+ * Adaptive Homogeneity-Directed Democsaicing Algorithm,
+ * Keigo Hirakawa and Thomas W. Parks, presented in the
+ * IEEE Transactions on Image Processing, vol. 14, no. 3, March 2005.
  *
  * \par License
  * This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
- 
+
 
 
 #include <stdio.h>
@@ -46,7 +46,7 @@
 #include <time.h>
 
 #include "config.h"
-#include "bayer.h"
+#include "libgphoto2/bayer.h"
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
@@ -60,21 +60,21 @@
 static
 int dRGB(int i1, int i2, unsigned char *RGB);
 static
-int do_rb_ctr_row(unsigned char *image_h, unsigned char *image_v, int w, 
+int do_rb_ctr_row(unsigned char *image_h, unsigned char *image_v, int w,
 					int h, int y, int *pos_code);
 static
-int do_green_ctr_row(unsigned char *image, unsigned char *image_h, 
+int do_green_ctr_row(unsigned char *image, unsigned char *image_h,
 		    unsigned char *image_v, int w, int h, int y, int *pos_code);
 static
-int get_diffs_row2(unsigned char * hom_buffer_h, unsigned char *hom_buffer_v, 
+int get_diffs_row2(unsigned char * hom_buffer_h, unsigned char *hom_buffer_v,
 		    unsigned char * buffer_h, unsigned char *buffer_v, int w);
 
 #define AD(x, y, w) ((y)*(w)*3+3*(x))
 /**
- * \brief This function computes distance^2 between two sets of pixel data. 
+ * \brief This function computes distance^2 between two sets of pixel data.
  * \param i1 location of a pixel
  * \param i2 location of another pixel
- * \param RGB some RGB data. 
+ * \param RGB some RGB data.
  */
 static
 int dRGB(int i1, int i2, unsigned char *RGB) {
@@ -89,39 +89,39 @@
  * \param image_h three-row window, horizontal interpolation of row 1 is done
  * \param image_v three-row window, vertical interpolation of row 1 is done
  * \param w width of image
- * \param h height of image. 
+ * \param h height of image.
  * \param y row number from image which is under construction
  * \param pos_code position code related to Bayer tiling in use
  */
 static
-int do_rb_ctr_row(unsigned char *image_h, unsigned char *image_v, int w, 
-					int h, int y, int *pos_code) 
+int do_rb_ctr_row(unsigned char *image_h, unsigned char *image_v, int w,
+					int h, int y, int *pos_code)
 {
 	int x, bayer;
 	int value,value2,div,color;
 	/*
-	 * pos_code0 = red. green lrtb, blue diagonals 
-	 * pos_code1 = green. red lr, blue tb 
-	 * pos_code2 = green. blue lr, red tb 
-	 * pos_code3 = blue. green lrtb, red diagonals 
+	 * pos_code0 = red. green lrtb, blue diagonals
+	 * pos_code1 = green. red lr, blue tb
+	 * pos_code2 = green. blue lr, red tb
+	 * pos_code3 = blue. green lrtb, red diagonals
 	 *
 	 * The Red channel reconstruction is R=G+L(Rs-Gs), in which
 	 *	G = interpolated & known Green
 	 *	Rs = known Red
 	 *	Gs = values of G at the positions of Rs
-	 *	L()= should be a 2D lowpass filter, now we'll check 
+	 *	L()= should be a 2D lowpass filter, now we'll check
 	 *	them from a 3x3 square
-	 *	L-functions' convolution matrix is 
+	 *	L-functions' convolution matrix is
 	 *	1/4 1/2 1/4;1/2 1 1/2; 1/4 1/2 1/4
-	 * 
+	 *
 	 * The Blue channel reconstruction uses exactly the same methods.
 	 */
-	for (x = 0; x < w; x++) 
+	for (x = 0; x < w; x++)
 	{
 		bayer = (x&1?0:1) + (y&1?0:2);
 		for (color=0; color < 3; color+=2) {
-			if ((color==RED && bayer == pos_code3) 
-					|| (color==BLUE 
+			if ((color==RED && bayer == pos_code3)
+					|| (color==BLUE
 						    && bayer == pos_code0)) {
 				value=value2=div=0;
 				if (x > 0 && y > 0) {
@@ -159,8 +159,8 @@
 				image_vAD(x,1,w)+color=
 						CLAMP(image_vAD(x,1,w)+GREEN
 						+value2/div);
-			} else if ((color==RED && bayer == pos_code2) 
-					|| (color==BLUE 
+			} else if ((color==RED && bayer == pos_code2)
+					|| (color==BLUE
 						    && bayer == pos_code1)) {
 				value=value2=div=0;
 				if (y > 0) {
@@ -185,8 +185,8 @@
 						CLAMP(
 						image_vAD(x,1,w)+GREEN
 						+value2/div);
-			} else if ((color==RED && bayer == pos_code1) 
-					|| (color==BLUE 
+			} else if ((color==RED && bayer == pos_code1)
+					|| (color==BLUE
 						    && bayer == pos_code2)) {
 					value=value2=div=0;
 				if (x > 0) {
@@ -224,19 +224,19 @@
  * \param image_h three-row window, horizontal interpolation of row 1 is done
  * \param image_v three-row window, vertical interpolation of row 1 is done
  * \param w width of image
- * \param h height of image. 
+ * \param h height of image.
  * \param y row number from image which is under construction
  * \param pos_code position code related to Bayer tiling in use
  */
 
 static
-int do_green_ctr_row(unsigned char *image, unsigned char *image_h, 
+int do_green_ctr_row(unsigned char *image, unsigned char *image_h,
 		    unsigned char *image_v, int w, int h, int y, int *pos_code)
 {
 	int x, bayer;
 	int value,div;
 	/*
-	 * The horizontal green estimation on a red-green row is 
+	 * The horizontal green estimation on a red-green row is
 	 * G(x) = (2*R(x)+2*G(x+1)+2*G(x-1)-R(x-2)-R(x+2))/4
 	 * The estimation on a green-blue row works in the same
 	 * way.
@@ -254,7 +254,7 @@
 			div+=2;
 			if (x < (w-1)) {
 				value += 2*imageAD(x+1,y,w)+GREEN;
-				div+=2;	
+				div+=2;
 			}
 			if (x < (w-2)) {
 				if (bayer==pos_code0)
@@ -275,9 +275,9 @@
 				div--;
 			}
 			image_hAD(x,1,w)+GREEN = CLAMP(value / div);
-			/* The method for vertical estimation is just like 
-			 * what is done for horizontal estimation, with only  
-			 * the obvious difference that it is done vertically. 
+			/* The method for vertical estimation is just like
+			 * what is done for horizontal estimation, with only
+			 * the obvious difference that it is done vertically.
 			 */
 			div=value=0;
 			if (bayer==pos_code0)
@@ -287,7 +287,7 @@
 			div+=2;
 			if (y < (h-1)) {
 				value += 2*imageAD(x,y+1,w)+GREEN;
-				div+=2;	
+				div+=2;
 			}
 			if (y < (h-2)) {
 				if (bayer==pos_code0)
@@ -308,7 +308,7 @@
 				div--;
 			}
 			image_vAD(x,1,w)+GREEN = CLAMP(value / div);
-			
+
 		}
 	}
 	return GP_OK;
@@ -324,7 +324,7 @@
  */
 
 static
-int get_diffs_row2(unsigned char * hom_buffer_h, unsigned char *hom_buffer_v, 
+int get_diffs_row2(unsigned char * hom_buffer_h, unsigned char *hom_buffer_v,
 		    unsigned char * buffer_h, unsigned char *buffer_v, int w)
 {
 	int i,j;
@@ -336,23 +336,23 @@
 		Usize_h=0;
 		Usize_v=0;
 
-		/* 
-		 * Data collected here for adaptive estimates. First we take 
+		/*
+		 * Data collected here for adaptive estimates. First we take
 		 * at the given pixel vertical diffs if working in window_v;
 		 * left and right diffs if working in window_h. We then choose
-		 * of these two diffs as a permissible epsilon-radius within 
-		 * which to work. Checking within this radius, we will 
-		 * compute scores for the various possibilities. The score 
-		 * added in each step is either 1, if the directional change 
-		 * is within the prescribed epsilon, or 0 if it is not. 
+		 * of these two diffs as a permissible epsilon-radius within
+		 * which to work. Checking within this radius, we will
+		 * compute scores for the various possibilities. The score
+		 * added in each step is either 1, if the directional change
+		 * is within the prescribed epsilon, or 0 if it is not.
 		 */
-		 
+
 		RGBeps=MIN(
 			MAX(dRGB(i,i-3,buffer_h),dRGB(i,i+3,buffer_h)),
 			MAX(dRGB(i,i-3*w,buffer_v),dRGB(i,i+3*w,buffer_v))
 			);
 		/*
-		 * The scores for the homogeneity mapping. These will be used 
+		 * The scores for the homogeneity mapping. These will be used
 		 * in the choice algorithm to choose the best value.
 		 */
 
@@ -384,38 +384,38 @@
  * \param image the linear RGB array as both input and output
  * \param w width of the above array
  * \param h height of the above array
- * \param tile how the 2x2 bayer array is layed out
+ * \param tile how the 2x2 bayer array is laid out
  *
  * This function interpolates a bayer array which has been pre-expanded
- * by gp_bayer_expand() to an RGB image. It applies the method of adaptive 
- * homogeneity-directed demosaicing. 
+ * by gp_bayer_expand() to an RGB image. It applies the method of adaptive
+ * homogeneity-directed demosaicing.
  *
  * \return a gphoto error code
  *
  * \par
- * In outline, the interpolation algorithm used here does the 
+ * In outline, the interpolation algorithm used here does the
  * following:
  *
  * \par
- * In principle, the first thing which is done is to split off from the 
- * image two copies. In one of these, interpolation will be done in the 
- * vertical direction only, and in the other copy only in the 
- * horizontal direction. "Cross-color" data is used throughout, on the 
- * principle that it can be used as a corrector for brightness even if it is 
- * derived from the "wrong" color. Finally, at each pixel there is a choice 
- * criterion to decide whether to use the result of the vertical 
- * interpolation, the horizontal interpolation, or an average of the two. 
+ * In principle, the first thing which is done is to split off from the
+ * image two copies. In one of these, interpolation will be done in the
+ * vertical direction only, and in the other copy only in the
+ * horizontal direction. "Cross-color" data is used throughout, on the
+ * principle that it can be used as a corrector for brightness even if it is
+ * derived from the "wrong" color. Finally, at each pixel there is a choice
+ * criterion to decide whether to use the result of the vertical
+ * interpolation, the horizontal interpolation, or an average of the two.
  *
  * \par
- * Memory use and speed are optimized by using two sliding windows, one  
- * for the vertical interpolation and the other for the horizontal 
- * interpolation instead of using two copies of the entire input image. The 
+ * Memory use and speed are optimized by using two sliding windows, one
+ * for the vertical interpolation and the other for the horizontal
+ * interpolation instead of using two copies of the entire input image. The
  * nterpolation and the choice algorithm are then implemented entirely within
  * these windows, too. When this has been done, a completed row is written back
- * to the image. Then the windows are moved, and the process repeats. 
+ * to the image. Then the windows are moved, and the process repeats.
  */
 
-int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile) 
+int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile)
 {
 	int i, j, k, x, y;
 	int p4;
@@ -460,53 +460,53 @@
 		break;
 	}
 
-	/* 
-	 * Once the algorithm is initialized and running, one cycle of the 
+	/*
+	 * Once the algorithm is initialized and running, one cycle of the
 	 * algorithm can be described thus:
-	 * 
+	 *
 	 * Step 1
-	 * Write from row y+3 of the image to row 5 in window_v and in 
-	 * window_h. 
+	 * Write from row y+3 of the image to row 5 in window_v and in
+	 * window_h.
 	 *
 	 * Step 2
 	 * Interpolate missing green data on row 5 in each window. Data from
-	 * the image only is needed for this, not data from the windows. 
+	 * the image only is needed for this, not data from the windows.
 	 *
 	 * Step 3
-	 * Now interpolate the missing red or blue data on row 4 in both 
-	 * windows. We need to do this inside the windows; what is required 
-	 * is the real or interpolated green data from rows 3 and 5, and the 
-	 * real data on rows 3 and 5 about the color being interpolated on 
-	 * row 4, so all of this information is available in the two windows. 
-	 * Note that for this operation we are interpolating the center row 
-	 * of cur_window_v and cur_window_h. 
-	 * 
+	 * Now interpolate the missing red or blue data on row 4 in both
+	 * windows. We need to do this inside the windows; what is required
+	 * is the real or interpolated green data from rows 3 and 5, and the
+	 * real data on rows 3 and 5 about the color being interpolated on
+	 * row 4, so all of this information is available in the two windows.
+	 * Note that for this operation we are interpolating the center row
+	 * of cur_window_v and cur_window_h.
+	 *
 	 * Step 4
 	 * Now we have five completed rows in each window, 0 through 4 (rows
-	 * 0 - 3 having been done in previous cycles). Completed rows 0 - 4 
-	 * are what is required in order to run the choice algorithm at 
-	 * each pixel location across row 2, to decide whether to choose the 
-	 * data for that pixel from window_v or from window_h. We run the 
-	 * choice algorithm, sending the data from row 2 over to row y of the 
-	 * image, pixel by pixel. 
+	 * 0 - 3 having been done in previous cycles). Completed rows 0 - 4
+	 * are what is required in order to run the choice algorithm at
+	 * each pixel location across row 2, to decide whether to choose the
+	 * data for that pixel from window_v or from window_h. We run the
+	 * choice algorithm, sending the data from row 2 over to row y of the
+	 * image, pixel by pixel.
 	 *
 	 * Step 5
 	 * Move the windows down (or the data in them up) by one row.
 	 * Increment y, the row counter for the image. Go to Step 1.
-	 * 
-	 * Initialization of the algorithm clearly requires some special 
-	 * steps, which are described below as they occur. 
+	 *
+	 * Initialization of the algorithm clearly requires some special
+	 * steps, which are described below as they occur.
 	 */
-	cur_window_h = window_h+9*w; 
-	cur_window_v = window_v+9*w; 
+	cur_window_h = window_h+9*w;
+	cur_window_v = window_v+9*w;
 	/*
 	 * Getting started. Copy row 0 from image to line 4 of windows
-	 * and row 1 from image to line 5 of windows. 
+	 * and row 1 from image to line 5 of windows.
 	 */
 	memcpy (window_h+12*w, image, 6*w);
 	memcpy (window_v+12*w, image, 6*w);
 	/*
-	 * Now do the green interpolation in row 4 of the windows, the 
+	 * Now do the green interpolation in row 4 of the windows, the
 	 * "center" row of cur_window_v and  _h, with the help of image row 0
 	 * and image row 1.
 	 */
@@ -514,38 +514,38 @@
 	/* this does the green interpolation in row 5 of the windows */
 	do_green_ctr_row(image, cur_window_h+3*w, cur_window_v+3*w, w, h, 1, p);
 	/*
-	 * we are now ready to do the rb interpolation on row 4 of the 
-	 * windows, which relates to row 0 of the image. 
-	 */ 
+	 * we are now ready to do the rb interpolation on row 4 of the
+	 * windows, which relates to row 0 of the image.
+	 */
 	do_rb_ctr_row(cur_window_h, cur_window_v, w, h, 0, p);
 	/*
 	 * Row row 4, which will be mapped to image row 0, is finished in both
-	 * windows. Row 5 has had only the green interpolation. 
+	 * windows. Row 5 has had only the green interpolation.
 	 */
 	memmove(window_h, window_h+3*w,15*w);
 	memmove(window_v, window_v+3*w,15*w);
 	memcpy (window_h+15*w, image+6*w, 3*w);
 	memcpy (window_v+15*w, image+6*w, 3*w);
 	/*
-	 * now we have shifted backwards and we have row 0 of the image in 
+	 * now we have shifted backwards and we have row 0 of the image in
 	 * row 3 of the windows. Row 4 of the window contains row 1 of image
-	 * and needs the rb interpolation. We have copied row 2 of the image 
-	 * into row 5 of the windows and need to do green interpolation. 
+	 * and needs the rb interpolation. We have copied row 2 of the image
+	 * into row 5 of the windows and need to do green interpolation.
 	 */
 	do_green_ctr_row(image, cur_window_h+3*w, cur_window_v+3*w, w, h, 2, p);
 	do_rb_ctr_row(cur_window_h, cur_window_v, w, h, 1, p);
 	memmove (window_h, window_h+3*w, 15*w);
-	memmove(window_v, window_v+3*w,15*w); 
+	memmove(window_v, window_v+3*w,15*w);
 	/*
-	 * We have shifted one more time. Row 2 of the two windows is 
-	 * the original row 0 of the image, now fully interpolated. Rows 3 
-	 * and 4 of the windows contain the original rows 1 and 2 of the 
-	 * image, also fully interpolated. They will be used while applying 
+	 * We have shifted one more time. Row 2 of the two windows is
+	 * the original row 0 of the image, now fully interpolated. Rows 3
+	 * and 4 of the windows contain the original rows 1 and 2 of the
+	 * image, also fully interpolated. They will be used while applying
 	 * the choice algorithm on row 2, in order to write it back to row
-	 * 0 of the image. The algorithm is now fully initialized. We enter 
+	 * 0 of the image. The algorithm is now fully initialized. We enter
 	 * the loop which will complete the algorithm for the whole image.
 	 */
-	 
+
 	for (y = 0; y < h; y++) {
 		if(y<h-3) {
 			memcpy (window_v+15*w,image+3*y*w+9*w, 3*w);
@@ -554,16 +554,16 @@
 			memset(window_v+15*w, 0, 3*w);
 			memset(window_h+15*w, 0, 3*w);
 		}
-		if (y<h-3) 
-			do_green_ctr_row(image, cur_window_h+3*w, 
+		if (y<h-3)
+			do_green_ctr_row(image, cur_window_h+3*w,
 					cur_window_v+3*w, w, h, y+3, p);
-		if (y<h-2) 
+		if (y<h-2)
 			do_rb_ctr_row(cur_window_h, cur_window_v, w, h, y+2, p);
 		/*
-		 * The next function writes row 2 of diffs, which is the set of 
-		 * diff scores for row y+1 of the image, which is row 3 of our 
+		 * The next function writes row 2 of diffs, which is the set of
+		 * diff scores for row y+1 of the image, which is row 3 of our
 		 * windows. When starting with row 0 of the image, this is all
-		 * we need. As we continue, the results of this calculation 
+		 * we need. As we continue, the results of this calculation
 		 * will also be rotated; in general we need the diffs for rows
 		 * y-1, y, and y+1 in order to carry out the choice algorithm
 		 * for writing row y.
@@ -572,17 +572,19 @@
 		memset(homo_ch, 0, w);
 		memset(homo_cv, 0, w);
 
-		/* The choice algorithm now will use the sum of the nine diff 
-		 * scores computed at the pixel location and at its eight 
-		 * nearest neighbors. The direction with highest score will 
-		 * be used; if the scores are equal an average is used. 
+		/* The choice algorithm now will use the sum of the nine diff
+		 * scores computed at the pixel location and at its eight
+		 * nearest neighbors. The direction with highest score will
+		 * be used; if the scores are equal an average is used.
 		 */
 		for (x=0; x < w; x++) {
 			for (i=-1; i < 2;i++) {
 				for (k=0; k < 3;k++) {
-					j=i+x+w*k; 
-					homo_chx+=homo_hj;
-					homo_cvx+=homo_vj;
+					j=i+x+w*k;
+					if ((j >= 0) && ( j < w*3)) {
+						homo_chx+=homo_hj;
+						homo_cvx+=homo_vj;
+					}
 				}
 			}
 			for (color=0; color < 3; color++) {
@@ -620,17 +622,17 @@
  * \param w width of the above array
  * \param h height of the above array
  * \param output RGB output array (linear, 3 bytes of R,G,B for every pixel)
- * \param tile how the 2x2 bayer array is layed out
+ * \param tile how the 2x2 bayer array is laid out
  *
  * A regular CCD uses a raster of 2 green, 1 blue and 1 red components to
  * cover a 2x2 pixel area. The camera or the driver then interpolates a
  * 2x2 RGB pixel set out of this data.
  *
  * This function expands and interpolates the bayer array to 3 times larger
- * bitmap with RGB values interpolated. It does the same job as  
+ * bitmap with RGB values interpolated. It does the same job as
  * gp_bayer_decode() but it calls gp_ahd_interpolate() instead of calling
- * gp_bayer_interpolate(). Use this instead of gp_bayer_decode() if you 
- * want to use or to test AHD interpolation in a camera library. 
+ * gp_bayer_interpolate(). Use this instead of gp_bayer_decode() if you
+ * want to use or to test AHD interpolation in a camera library.
  * \return a gphoto error code
  */

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/bayer-types.h Added

@@ -0,0 +1,44 @@
+/** \file bayer-types.h
+ * \brief bayer type definitions common to camlibs and libgphoto2
+ *
+ * \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
+ *
+ * \note
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * \note
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * \note
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef LIBGPHOTO2_BAYER_TYPES_H
+#define LIBGPHOTO2_BAYER_TYPES_H
+
+/**
+ * \brief how the bayer CCD array is laid out
+ *
+ * This enumeration defines how the CCD bayer array is laid out.
+ */
+typedef enum {
+	BAYER_TILE_RGGB = 0,			/**< \brief raster is RG,GN */
+	BAYER_TILE_GRBG = 1,			/**< \brief raster is GR,BG */
+	BAYER_TILE_BGGR = 2,			/**< \brief raster is BG,GR */
+	BAYER_TILE_GBRG = 3,			/**< \brief raster is RG,GB */
+	BAYER_TILE_RGGB_INTERLACED = 4,		/**< \brief scanline order: R1,G1,R2,G2,...,G1,B1,G2,B2,... */
+	BAYER_TILE_GRBG_INTERLACED = 5,		/**< \brief scanline order: G1,R1,R2,G2,...,B1,G1,B2,G2,... */
+	BAYER_TILE_BGGR_INTERLACED = 6,		/**< \brief scanline order: B1,G1,R2,G2,...,G1,R1,G2,R2,... */
+	BAYER_TILE_GBRG_INTERLACED = 7,		/**< \brief scanline order: G1,B1,G2,B2,...,R1,G1,R2,G2,... */
+} BayerTile;
+
+#endif /* !defined(LIBGPHOTO2_BAYER_TYPES_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/bayer.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/bayer.c Changed

@@ -29,8 +29,9 @@
  */
 
 #include "config.h"
-#include "bayer.h"
+#include "libgphoto2/bayer.h"
 
+#include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-result.h>
 
 static const int tile_colours84 = {
@@ -58,7 +59,7 @@
  * \param w width of the above array
  * \param h height of the above array
  * \param output RGB output array (linear, 3 bytes of R,G,B for every pixel)
- * \param tile how the 2x2 bayer array is layed out
+ * \param tile how the 2x2 bayer array is laid out
  *
  * A regular CCD uses a raster of 2 green, 1 blue and 1 red components to
  * cover a 2x2 pixel area. The camera or the driver then interpolates a
@@ -67,7 +68,7 @@
  * This function expands the bayer array to 3 times larger bitmap with
  * RGB values copied as-is. Pixels were no sensor was there are 0.
  * The data is supposed to be processed further by for instance gp_bayer_interpolate().
- * 
+ *
  * \return a gphoto error code
  */
 int
@@ -78,6 +79,7 @@
 	int colour, bayer;
 	unsigned char *ptr = input;
 
+	gp_log (GP_LOG_DEBUG, "bayer", "w=%d, h=%d\n", w, h);
 	switch (tile) {
 
 		case BAYER_TILE_RGGB:
@@ -111,7 +113,7 @@
 					bayer = (x&1?0:1) + (y&1?0:2);
 
 					colour = tile_colourstilebayer;
-	
+
 					i = (y * w + x) * 3;
 
 					outputi+RED    = 0;
@@ -133,7 +135,7 @@
  * \param image the linear RGB array as both input and output
  * \param w width of the above array
  * \param h height of the above array
- * \param tile how the 2x2 bayer array is layed out
+ * \param tile how the 2x2 bayer array is laid out
  *
  * This function interpolates a bayer array which has been pre-expanded
  * by gp_bayer_expand() to an RGB image. It uses various interpolation
@@ -148,6 +150,8 @@
 	int p0, p1, p2;
 	int value, div ;
 
+	if (w < 2 || h < 2) return GP_ERROR;
+
 	switch (tile) {
 	default:
 	case BAYER_TILE_RGGB:
@@ -247,7 +251,7 @@
 }
 /**
  * \brief interpolate one pixel from a bayer 2x2 raster
- * 
+ *
  * For red and blue data, compare the four surrounding values.  If three
  * values are all one side of the mean value, the fourth value is ignored.
  * This will sharpen boundaries. Treatment of green data looks for vertical and
@@ -268,7 +272,7 @@
 	int i ;
 	x0 = x0 ; x1 = x1 ; x2 = x2 ; x3 = x3 ;
 	y0 = y0 ; y1 = y1 ; y2 = y2 ; y3 = y3 ;
-	
+
 	/* special treatment for green */
 	counter = sum_of_values = 0 ;
 	if(colour == GREEN)
@@ -278,7 +282,7 @@
 		 * interpolation procedure. Therefore, we determine whether
 		 * we might have such a line structure.
 		 */
-	  	
+
 		for (i = 0 ; i < 4 ; i++)
 	  	{	if ((xi >= 0) && (xi < w) && (yi >= 0) && (yi < h))
 			{
@@ -291,7 +295,7 @@
 			}
 	  	}
 		if(counter == 4)
-		{	
+		{
 			/* It is assumed that x0,y0 and x1,y1 are on a
 			 * horizontal line and
 			 * x2,y2 and x3,y3 are on a vertical line
@@ -317,7 +321,7 @@
 		/* if we do not have four points then we proceed as we do for
 		 * blue and red */
 	}
-	
+
 	/* for blue and red */
 	counter = sum_of_values = 0 ;
 	for (i = 0 ; i < 4 ; i++)
@@ -352,7 +356,7 @@
  * \param w width of the above array
  * \param h height of the above array
  * \param output RGB output array (linear, 3 bytes of R,G,B for every pixel)
- * \param tile how the 2x2 bayer array is layed out
+ * \param tile how the 2x2 bayer array is laid out
  *
  * A regular CCD uses a raster of 2 green, 1 blue and 1 red components to
  * cover a 2x2 pixel area. The camera or the driver then interpolates a
@@ -360,7 +364,7 @@
  *
  * This function expands and interpolates the bayer array to 3 times larger
  * bitmap with RGB values interpolated.
- * 
+ *
  * \return a gphoto error code
  */
 int

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/bayer.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/bayer.h Changed

@@ -1,4 +1,4 @@
-/** \file
+/** \file bayer.h
  *
  * \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
  *
@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -21,24 +21,12 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __BAYER_H__
-#define __BAYER_H__
+#ifndef LIBGPHOTO2_BAYER_H
+#define LIBGPHOTO2_BAYER_H
+
+
+#include "libgphoto2/bayer-types.h"
 
-/**
- * \brief how the bayer CCD array is layed out
- * 
- * This enumeration defines how the CCD bayer array is laid out.
- */
-typedef enum {
-	BAYER_TILE_RGGB = 0,			/**< \brief raster is RG,GN */
-	BAYER_TILE_GRBG = 1,			/**< \brief raster is GR,BG */
-	BAYER_TILE_BGGR = 2,			/**< \brief raster is BG,GR */
-	BAYER_TILE_GBRG = 3,			/**< \brief raster is RG,GB */
-	BAYER_TILE_RGGB_INTERLACED = 4,		/**< \brief scanline order: R1,G1,R2,G2,...,G1,B1,G2,B2,... */
-	BAYER_TILE_GRBG_INTERLACED = 5,		/**< \brief scanline order: G1,R1,R2,G2,...,B1,G1,B2,G2,... */
-	BAYER_TILE_BGGR_INTERLACED = 6,		/**< \brief scanline order: B1,G1,R2,G2,...,G1,R1,G2,R2,... */
-	BAYER_TILE_GBRG_INTERLACED = 7,		/**< \brief scanline order: G1,B1,G2,B2,...,R1,G1,R2,G2,... */
-} BayerTile;
 
 int gp_bayer_expand (unsigned char *input, int w, int h, unsigned char *output,
                      BayerTile tile);
@@ -47,9 +35,9 @@
 int gp_bayer_interpolate (unsigned char *image, int w, int h, BayerTile tile);
 /*
  * The following two functions use an alternative procedure called Adaptive
- * Homogeneity-directed demosaicing instead of the standard bilinear 
- * interpolation with basic edge-detection method used in the previous two 
- * functions. To use or test this method of Bayer interpolation, just use 
+ * Homogeneity-directed demosaicing instead of the standard bilinear
+ * interpolation with basic edge-detection method used in the previous two
+ * functions. To use or test this method of Bayer interpolation, just use
  * gp_ahd_decode() in the same way and in the same place as gp_bayer_decode()
  * is used.
  */
@@ -58,4 +46,4 @@
 		     BayerTile tile);
 int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile);
 
-#endif /* __BAYER_H__ */
+#endif /* !defined(LIBGPHOTO2_BAYER_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/exif.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/exif.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/exif.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/exif.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gamma.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gamma.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gamma.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gamma.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-abilities-list.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-abilities-list.c Changed

@@ -10,10 +10,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -21,10 +21,12 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+#define _DARWIN_C_SOURCE
 
 #include "config.h"
 #include <gphoto2/gphoto2-abilities-list.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,26 +36,10 @@
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-library.h>
+#include <gphoto2/gphoto2-port-locking.h>
+
+#include "libgphoto2/i18n.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define bind_textdomain_codeset(Domain,Charset) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /** \internal */
 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);}
@@ -74,17 +60,65 @@
  * \brief Set the current character codeset libgphoto2 is operating in.
  *
  * Set the codeset for all messages returned by libgphoto2.
+ *
  * \param codeset New codeset for the messages. For instance "utf-8".
  * \return old codeset as returned from bind_textdomain_codeset().
- *
- * You would then call gp_abilities_list_load() in order to 
- * populate it.
  */
 const char*
 gp_message_codeset (const char *codeset)
 {
 	gp_port_message_codeset (codeset);
-	return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset);
+	return bind_textdomain_codeset (GETTEXT_PACKAGE_LIBGPHOTO2, codeset);
+}
+
+/**
+ * \brief Initialize the localedir directory for the libgphoto2 gettext domain
+ *
+ * Override the localedir directory libgphoto2 uses for its message
+ * translations.
+ *
+ * You only need to call this if you have a non-standard installation
+ * where the locale files are at a location which differs from the
+ * compiled in default location.
+ *
+ * If you do need to call this function, call it before calling any
+ * non-initialization function.
+ *
+ * Internally, this will make sure bindtextdomain() is called for the
+ * relevant gettext text domain(s).
+ *
+ * \param localedir Root directory of libgphoto2's localization files.
+ *                  If NULL, use the compiled in default value, which
+ *                  will be something like "/usr/share/locale".
+ * \return gphoto2 error code.
+ */
+int
+gp_init_localedir (const char *localedir)
+{
+	static int locale_initialized = 0;
+	if (locale_initialized) {
+		gp_log(GP_LOG_DEBUG, "gp_init_localedir",
+		       "ignoring late call (localedir value %s)",
+		       localedir?localedir:"NULL");
+		return GP_OK;
+	}
+	const int gpp_result = gp_port_init_localedir (localedir);
+	if (gpp_result != GP_OK) {
+		return gpp_result;
+	}
+	const char *actual_localedir = (localedir?localedir:LOCALEDIR);
+	const char *const gettext_domain = GETTEXT_PACKAGE_LIBGPHOTO2;
+	if (bindtextdomain (gettext_domain, actual_localedir) == NULL) {
+		if (errno == ENOMEM)
+			return GP_ERROR_NO_MEMORY;
+		return GP_ERROR;
+	}
+	gp_log(GP_LOG_DEBUG, "gp_init_localedir",
+	       "localedir has been set to %s%s",
+	       actual_localedir,
+	       localedir?"":" (compile-time default)");
+	locale_initialized = 1;
+	return GP_OK;
 }
 
 /**
@@ -94,7 +128,7 @@
  * \param list CameraAbilitiesList object to initialize
  * \return gphoto2 error code
  *
- * You would then call gp_abilities_list_load() in order to 
+ * You would then call gp_abilities_list_load() in order to
  * populate it.
  */
 int
@@ -108,7 +142,7 @@
 	 * an other way without introducing a global initialization
 	 * function...
 	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	gp_init_localedir (NULL);
 
 	C_MEM (*list = calloc (1, sizeof (CameraAbilitiesList)));
 
@@ -152,9 +186,8 @@
 	return ((fd->result == GP_OK)?0:1);
 }
 
-
-int
-gp_abilities_list_load_dir (CameraAbilitiesList *list, const char *dir,
+static int
+unlocked_gp_abilities_list_load_dir (CameraAbilitiesList *list, const char *dir,
 			    GPContext *context)
 {
 	CameraLibraryIdFunc id;
@@ -235,7 +268,7 @@
 		if (gp_abilities_list_lookup_id (list, text.text) >= 0) {
 			lt_dlclose (lh);
 			continue;
-		} 
+		}
 
 		/* camera_abilities */
 		ab = lt_dlsym (lh, "camera_abilities");
@@ -259,10 +292,9 @@
 		}
 
 		/* do not free the library in valgrind mode */
-#if !defined(VALGRIND) 
+#if !defined(VALGRIND)
 		lt_dlclose (lh);
 #endif
-
 		new_count = gp_abilities_list_count (list);
 		if (new_count < 0)
 			continue;
@@ -277,17 +309,30 @@
 		if (gp_context_cancel (context) == GP_CONTEXT_FEEDBACK_CANCEL) {
 			lt_dlexit ();
 			gp_list_free (flist);
-			return (GP_ERROR_CANCEL); 
+			return GP_ERROR_CANCEL;
 		}
 	}
 	gp_context_progress_stop (context, p);
 	lt_dlexit ();
 	gp_list_free (flist);
 
-	return (GP_OK);
+	return GP_OK;
+}
+
+int
+gp_abilities_list_load_dir (CameraAbilitiesList *list, const char *dir,
+			    GPContext *context)
+{
+	int ret;
+
+	gpi_libltdl_lock();
+	ret = unlocked_gp_abilities_list_load_dir (list, dir, context);
+	gpi_libltdl_unlock();
+	return ret;
 }
 
 
+
 /**
  * \brief Scans the system for camera drivers.
  *
@@ -338,7 +383,7 @@
 					list->abilitiesi.model, v, p);
 				*ability = i;
 			} else if (res < 0 && res != GP_ERROR_IO_USB_FIND) {
-				/* another error occurred. 
+				/* another error occurred.
 				 * perhaps we should better
 				 * report this to the calling
 				 * method?
@@ -363,7 +408,7 @@
 					list->abilitiesi.model, c, s, p);
 				*ability = i;
 			} else if (res < 0 && res != GP_ERROR_IO_USB_FIND) {
-				/* another error occurred. 
+				/* another error occurred.
 				 * perhaps we should better
 				 * report this to the calling
 				 * method?
@@ -428,7 +473,7 @@
 		case GP_PORT_USB_SCSI:
 		case GP_PORT_USB_DISK_DIRECT: {
 			int ability;
-			
+
 			res = gp_abilities_list_detect_usb (list, &ability, port);
 			if (res == GP_OK) {
 				gp_list_append(l,
@@ -442,7 +487,7 @@
 		case GP_PORT_DISK: {
 			char	*s, path1024;
 			struct stat stbuf;
-		
+
 			s = strchr (xpath, ':');
 			if (!s)
 				break;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-camera.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-camera.c Changed

@@ -12,10 +12,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -37,25 +37,10 @@
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-library.h>
 #include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-port-locking.h>
+
+#include "libgphoto2/i18n.h"
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 #define CAMERA_UNUSED(c,ctx)						\
 {									\
@@ -107,8 +92,8 @@
  *     to a 'Reset' signal on the camera.  I quote from the Digita 'Host
  *     Interface Specification' document:
  *
- *     "The Reset signal is a pulse on the Reset/Att line (which cooresponds 
- *     sic to pin 2 at the camera side) sent from the host computer to the 
+ *     "The Reset signal is a pulse on the Reset/Att line (which cooresponds
+ *     sic to pin 2 at the camera side) sent from the host computer to the
  *     camera.  This pulse must be at least 50us."
  */
 
@@ -254,21 +239,22 @@
  * Closes a connection to the camera and therefore gives other application
  * the possibility to access the camera, too.
  *
- * It is recommended that you 
+ * It is recommended that you
  * call this function when you currently don't need the camera. The camera
- * will get reinitialized by gp_camera_init() automatically if you try to 
+ * will get reinitialized by gp_camera_init() automatically if you try to
  * access the camera again.
  *
  */
 int
 gp_camera_exit (Camera *camera, GPContext *context)
 {
+	int exit_result = GP_OK;
 	C_PARAMS (camera);
 
 	GP_LOG_D ("Exiting camera ('%s')...", camera->pc->a.model);
 
 	/*
-	 * We have to postpone this operation if the camera is currently 
+	 * We have to postpone this operation if the camera is currently
 	 * in use. gp_camera_exit will be called again if the
 	 * camera->pc->used will drop to zero.
 	 */
@@ -287,22 +273,24 @@
 #ifdef HAVE_MULTI
 		gp_port_open (camera->port);
 #endif
-		camera->functions->exit (camera, context);
+		exit_result = camera->functions->exit (camera, context);
 	}
 	gp_port_close (camera->port);
 	memset (camera->functions, 0, sizeof (CameraFunctions));
 
 	if (camera->pc->lh) {
 #if !defined(VALGRIND)
+		gpi_libltdl_lock();
 		lt_dlclose (camera->pc->lh);
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 #endif
 		camera->pc->lh = NULL;
 	}
 
 	gp_filesystem_reset (camera->fs);
 
-	return (GP_OK);
+	return exit_result;
 }
 
 
@@ -350,7 +338,7 @@
 
 
 /**
- * \brief Sets the camera abilities. 
+ * \brief Sets the camera abilities.
  *
  * @param camera a #Camera
  * @param abilities the #CameraAbilities to be set
@@ -358,8 +346,8 @@
  *
  * You need to call this function before calling #gp_camera_init the
  * first time unless you want gphoto2 to autodetect cameras and choose
- * the first detected one. By setting the \c abilities, you 
- * tell gphoto2 what model the \c camera is and what camera driver should 
+ * the first detected one. By setting the \c abilities, you
+ * tell gphoto2 what model the \c camera is and what camera driver should
  * be used for accessing the \c camera. You can get \c abilities by calling
  * #gp_abilities_list_get_abilities.
  *
@@ -385,7 +373,7 @@
 
 
 /**
- * Retrieve the \c abilities of the \c camera. 
+ * Retrieve the \c abilities of the \c camera.
  *
  * @param camera a #Camera
  * @param abilities
@@ -443,11 +431,11 @@
  * @param speed the speed
  * @return a gphoto2 error code
  *
- * This function is typically used prior first initialization 
+ * This function is typically used prior first initialization
  * using #gp_camera_init for debugging purposes. Normally, a camera driver
  * will try to figure out the current speed of the camera and set the speed
- * to the optimal one automatically. Note that this function only works with 
- * serial ports. In other words, you have to set the camera's port to a 
+ * to the optimal one automatically. Note that this function only works with
+ * serial ports. In other words, you have to set the camera's port to a
  * serial one (using #gp_camera_set_port_path or #gp_camera_set_port_name)
  * prior calling this function.
  *
@@ -480,7 +468,7 @@
 }
 
 
-/** 
+/**
  * Retrieve the current speed.
  *
  * @param camera a #Camera
@@ -520,7 +508,7 @@
  * @param camera a #Camera
  * @return a gphoto2 error code
  *
- * If the reference count reaches %0, the \c camera will be freed 
+ * If the reference count reaches %0, the \c camera will be freed
  * automatically.
  *
  */
@@ -554,7 +542,7 @@
  * @param camera a #Camera
  * @return a gphoto2 error code
  *
- * \deprecated 
+ * \deprecated
  * This function should never be used. Please use #gp_camera_unref instead.
  *
  */
@@ -593,7 +581,7 @@
                 free (camera->functions);
 		camera->functions = NULL;
 	}
- 
+
 	free (camera);
 
 	return (GP_OK);
@@ -664,7 +652,7 @@
 }
 
 /**
- * Initiate a connection to the \c camera. 
+ * Initiate a connection to the \c camera.
  *
  * @param camera a #Camera
  * @param context a #GPContext
@@ -691,7 +679,7 @@
 
 	C_PARAMS (camera);
 	/*
-	 * Reset the exit_requested flag. If this flag is set, 
+	 * Reset the exit_requested flag. If this flag is set,
 	 * gp_camera_exit will be called as soon as the camera is no
 	 * longer in use (used flag).
 	 */
@@ -792,24 +780,32 @@
 
 	/* Load the library. */
 	GP_LOG_D ("Loading '%s'...", camera->pc->a.library);
+	gpi_libltdl_lock();
 	lt_dlinit ();
 	camera->pc->lh = lt_dlopenext (camera->pc->a.library);
+	gpi_libltdl_unlock();
 	if (!camera->pc->lh) {
+		gpi_libltdl_lock();
 		gp_context_error (context, _("Could not load required "
 			"camera driver '%s' (%s)."), camera->pc->a.library,
 			lt_dlerror ());
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 		return (GP_ERROR_LIBRARY);
 	}
 
 	/* Initialize the camera */
+	gpi_libltdl_lock();
 	init_func = lt_dlsym (camera->pc->lh, "camera_init");
+	gpi_libltdl_unlock();
 	if (!init_func) {
+		gpi_libltdl_lock();
 		lt_dlclose (camera->pc->lh);
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 		camera->pc->lh = NULL;
 		gp_context_error (context, _("Camera driver '%s' is "
-			"missing the 'camera_init' function."), 
+			"missing the 'camera_init' function."),
 			camera->pc->a.library);
 		return (GP_ERROR_LIBRARY);
 	}
@@ -817,8 +813,10 @@
 	if (strcasecmp (camera->pc->a.model, "Directory Browse")) {
 		result = gp_port_open (camera->port);
 		if (result < 0) {
+			gpi_libltdl_lock();
 			lt_dlclose (camera->pc->lh);
 			lt_dlexit ();
+			gpi_libltdl_unlock();
 			camera->pc->lh = NULL;
 			return (result);
 		}
@@ -827,8 +825,10 @@
 	result = init_func (camera, context);
 	if (result < 0) {
 		gp_port_close (camera->port);
+		gpi_libltdl_lock();
 		lt_dlclose (camera->pc->lh);
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 		camera->pc->lh = NULL;
 		memset (camera->functions, 0, sizeof (CameraFunctions));
 		return (result);
@@ -1094,7 +1094,7 @@
  * @param context a #GPContext
  * @return a gphoto2 error code
  *
- * Typically, a \c window is retrieved using #gp_camera_get_config and passed 
+ * Typically, a \c window is retrieved using #gp_camera_get_config and passed
  * to this function in order to adjust the settings on the camera.
  *
  **/
@@ -1372,8 +1372,8 @@
 }
 
 /**
- * Captures a preview that won't be stored on the camera but returned in 
- * supplied file. 
+ * Captures a preview that won't be stored on the camera but returned in
+ * supplied file.
  *
  * @param camera a #Camera
  * @param file a #CameraFile
@@ -1429,7 +1429,7 @@
  * If an event is received then eventtype is set to the type of event, and
  * eventdata is set to event specific data.  See the CameraEventType enum
  * to see which eventtypes match to which types of eventdata.
- * 
+ *
  * Note that this function will return one event after each other, you need
  * to be able to call it multiple times, e.g. in a loop, when waiting for specific
  * events.
@@ -1464,7 +1464,7 @@
  *
  **/
 int
-gp_camera_folder_list_files (Camera *camera, const char *folder, 
+gp_camera_folder_list_files (Camera *camera, const char *folder,
 			     CameraList *list, GPContext *context)
 {
 	GP_LOG_D ("Listing files in '%s'...", folder);
@@ -1492,7 +1492,7 @@
  *
  **/
 int
-gp_camera_folder_list_folders (Camera *camera, const char* folder, 
+gp_camera_folder_list_folders (Camera *camera, const char* folder,
 			       CameraList *list, GPContext *context)
 {
 	GP_LOG_D ("Listing folders in '%s'...", folder);
@@ -1575,7 +1575,7 @@
  *
  **/
 int
-gp_camera_file_get_info (Camera *camera, const char *folder, 
+gp_camera_file_get_info (Camera *camera, const char *folder,
 			 const char *file, CameraFileInfo *info,
 			 GPContext *context)
 {
@@ -1641,7 +1641,7 @@
  *
  **/
 int
-gp_camera_file_set_info (Camera *camera, const char *folder, 
+gp_camera_file_set_info (Camera *camera, const char *folder,
 			 const char *file, CameraFileInfo info,
 			 GPContext *context)
 {
@@ -1667,7 +1667,7 @@
  * @return a gphoto2 error code
  *
  **/
-int 
+int
 gp_camera_file_get (Camera *camera, const char *folder, const char *file,
 		    CameraFileType type, CameraFile *camera_file,
 		    GPContext *context)
@@ -1688,7 +1688,7 @@
 		CAMERA_UNUSED (camera, context);
 		return (GP_ERROR_FILE_NOT_FOUND);
 	}
-  
+
 	CHECK_RESULT_OPEN_CLOSE (camera, gp_filesystem_get_file (camera->fs,
 			folder, file, type, camera_file, context), context);
 
@@ -1730,7 +1730,7 @@
 		CAMERA_UNUSED (camera, context);
 		return (GP_ERROR_FILE_NOT_FOUND);
 	}
-  
+
 	CHECK_RESULT_OPEN_CLOSE (camera, gp_filesystem_read_file (camera->fs,
 			folder, file, type, offset, buf, size, context), context);
 
@@ -1923,7 +1923,7 @@
  * Stop periodic calls to keepalive function.
  *
  * @param camera a #Camera
- * @param id the id of the background process previously returned by 
+ * @param id the id of the background process previously returned by
  *       #gp_camera_start_timeout
  *
  * Call this function in the camera driver if you want to stop a periodic

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-context.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-context.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-file.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-file.c Changed

@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \note
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \note
  * You should have received a copy of the GNU Lesser General Public
@@ -25,7 +25,8 @@
  * external software modules is considered <strong>deprecated</strong>.
  */
 #define _POSIX_SOURCE
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
 
 #include "config.h"
 #include <gphoto2/gphoto2-file.h>
@@ -36,6 +37,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
+#include <unistd.h>
 
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-port-portability.h>
@@ -149,7 +151,7 @@
 	C_PARAMS (file);
 
 	CHECK_RESULT (gp_file_clean (file));
-	
+
 	if (file->accesstype == GP_FILE_ACCESSTYPE_FD)
 		close (file->fd);
 
@@ -169,7 +171,7 @@
 	C_PARAMS (file);
 
 	file->ref_count += 1;
-	
+
 	return (GP_OK);
 }
 
@@ -184,7 +186,7 @@
 gp_file_unref (CameraFile *file)
 {
 	C_PARAMS (file);
-	
+
 	file->ref_count -= 1;
 
 	if (file->ref_count == 0)
@@ -202,7 +204,7 @@
  *
  **/
 int
-gp_file_append (CameraFile *file, const char *data, 
+gp_file_append (CameraFile *file, const char *data,
 		unsigned long int size)
 {
 	C_PARAMS (file);
@@ -214,7 +216,7 @@
 		file->size += size;
 		break;
 	case GP_FILE_ACCESSTYPE_FD: {
-		unsigned long int curwritten = 0; 
+		unsigned long int curwritten = 0;
 		while (curwritten < size) {
 			ssize_t	res = write (file->fd, data+curwritten, size-curwritten);
 			if (res == -1) {
@@ -251,7 +253,7 @@
  * Internal.
  **/
 int
-gp_file_slurp (CameraFile *file, char *data, 
+gp_file_slurp (CameraFile *file, char *data,
 	size_t size, size_t *readlen
 ) {
 	C_PARAMS (file);
@@ -265,7 +267,7 @@
 		if (readlen) *readlen = size;
 		break;
 	case GP_FILE_ACCESSTYPE_FD: {
-		unsigned long int curread = 0; 
+		unsigned long int curread = 0;
 		while (curread < size) {
 			ssize_t	res = read (file->fd, data+curread, size-curread);
 			if (res == -1) {
@@ -386,8 +388,12 @@
  *
  * Both data and size can be NULL and will then be ignored.
  *
- * The pointer to data that is returned is still owned by libgphoto2
- * and its lifetime is the same as the #file.
+ * For regular CameraFiles, the pointer to data that is returned is
+ * still owned by libgphoto2 and its lifetime is the same as the #file.
+ *
+ * For filedescriptor or handler based CameraFile types, the returned
+ * data pointer is owned by the caller and needs to be free()d to avoid
+ * memory leaks.
  *
  **/
 int
@@ -405,7 +411,7 @@
 		break;
 	case GP_FILE_ACCESSTYPE_FD: {
 		off_t	offset;
-		unsigned long int curread = 0;
+		off_t	curread = 0;
 
 		if (-1 == lseek (file->fd, 0, SEEK_END)) {
 			if (errno == EBADF) return GP_ERROR_IO;
@@ -500,7 +506,7 @@
 		break;
 	case GP_FILE_ACCESSTYPE_FD: {
 		char *data;
-		unsigned long int curread = 0;
+		off_t	curread = 0;
 		off_t	offset;
 
 		if (-1 == lseek (file->fd, 0, SEEK_END))
@@ -533,7 +539,7 @@
 				unlink (filename);
 				return GP_ERROR_IO_READ;
 			}
-			if (fwrite (data, 1, res, fp) != res) {
+			if ((int)fwrite (data, 1, res, fp) != res) {
 				GP_LOG_E ("Not enough space on device in order to save '%s'.", filename);
 				free (data);
 				fclose (fp);
@@ -694,7 +700,7 @@
 int
 gp_file_clean (CameraFile *file)
 {
-        /* 
+        /*
 	 * Frees a CameraFile's components, not the CameraFile itself.
 	 * This is used to prep a CameraFile struct to be filled.
          */
@@ -746,7 +752,7 @@
 		(source->accesstype == GP_FILE_ACCESSTYPE_FD)
 	) {
 		off_t	offset;
-		unsigned long int curread = 0;
+		off_t	curread = 0;
 
 		free (destination->data);
 		destination->data = NULL;
@@ -795,7 +801,7 @@
 		lseek (source->fd, 0, SEEK_SET);
 		C_MEM (data = malloc (65536));
 		while (1) {
-			unsigned long curwritten = 0;
+			ssize_t curwritten = 0;
 			ssize_t res;
 
 			res = read (source->fd, data, 65536);
@@ -1093,6 +1099,8 @@
 		GP_MIME_AVI,  "avi",
 		GP_MIME_CRW,  "crw",
 		GP_MIME_CR2,  "cr2",
+		GP_MIME_CR3,  "cr3",
+		GP_MIME_ARW,  "arw",
 		GP_MIME_NEF,  "nef",
 		GP_MIME_TXT,  "txt",
 		NULL};
@@ -1111,7 +1119,7 @@
 			break;
 		}
 	GP_LOG_D ("Name adjusted to '%s'.", file->name);
-	
+
 	return (GP_OK);
 }

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-filesys.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-filesys.c Changed

@@ -23,7 +23,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 #include <gphoto2/gphoto2-filesys.h>
@@ -42,24 +42,8 @@
 #  include <libexif/exif-data.h>
 #endif
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2/i18n.h"
+
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
@@ -97,7 +81,7 @@
 
 /**
  * The default number of pictures to keep in the internal cache,
- * can be overriden by settings.
+ * can be overridden by settings.
  */
 #define PICTURES_TO_KEEP	2
 /**
@@ -390,7 +374,7 @@
 			char		*copy = strdup (foldername);
 			int		ret;
 			/*
-			 * The parent folder is dirty. List the folders in the parent 
+			 * The parent folder is dirty. List the folders in the parent
 			 * folder to make it clean.
 			 */
 			/* the character _before_ curpt is a /, overwrite it temporary with \0 */
@@ -411,7 +395,7 @@
 		while (f) {
 			if (s) {
 				if (!strncmp(f->name,curpt, (s-curpt)) &&
-				    (strlen(f->name) == (s-curpt))
+				    ((ssize_t)strlen(f->name) == (s-curpt))
 				) {
 					folder = f;
 					curpt = s;
@@ -553,7 +537,7 @@
 	while (f) {
 		if (s) {
 			if (!strncmp(f->name,foldername, (s-foldername)) &&
-			    (strlen(f->name) == (s-foldername))
+			    ((ssize_t)strlen(f->name) == (s-foldername))
 			)
 				return append_to_folder (f, s+1, newfolder);
 		} else {
@@ -633,6 +617,10 @@
 	GP_LOG_D ("resetting filesystem");
 	CR (gp_filesystem_lru_clear (fs));
 	CR (delete_all_folders (fs, "/", NULL));
+
+	/* the recurse delete will not delete the files in /, only in subdirs */
+	delete_all_files (fs, fs->rootfolder);
+
 	if (fs->rootfolder) {
 		fs->rootfolder->files_dirty = 1;
 		fs->rootfolder->folders_dirty = 1;
@@ -784,7 +772,7 @@
 		GP_LOG_D ("%*s    %s", depth, " ", xfile->name);
 		xfile = xfile->next;
 	}
-	
+
 	f = folder->folders;
 	while (f) {
 		recursive_fs_dump (f, depth+4);
@@ -1235,7 +1223,7 @@
 		CameraList	*list;
 		int		ret;
 		/*
-		 * The owning folder is dirty. List the folders in it 
+		 * The owning folder is dirty. List the folders in it
 		 * to make it clean.
 		 */
 		GP_LOG_D ("Folder %s is dirty. "
@@ -1746,18 +1734,18 @@
  * \param type the type of the file
  * \param offset the offset where the data starts
  * \param buf the targetbuffer where the data will be put
- * \param size the size to read and that was read into the buffer 
+ * \param size the size to read and that was read into the buffer
  * \param context a #GPContext
  *
  * Downloads the file called filename from the folder using the
  * read_file_func if such a function has been previously supplied. If the
  * file has been previously downloaded, the file is retrieved from cache.
- * 
+ *
  * The file is read partially into the passed buffer. The read starts
  * at offset on the device and goes for at most size bytes.
  * Reading over the end of the file might give errors, so get the maximum
  * file size via an info function before.
- * 
+ *
  * \return a gphoto2 error code.
  **/
 int
@@ -2349,6 +2337,37 @@
 }
 
 /**
+ * \brief Mark the file info as dirty
+ * \param fs a #CameraFilesystem
+ * \param folder the foldername
+ * \param filename the filename
+ * \param context a #GPContext
+ *
+ * Mark the file info as dirty, so that the next attempt
+ * to retrieve the file info will query the camera driver
+ * instead of possibly returning cached data.
+ *
+ * \return a gphoto2 error code
+ **/
+int gp_filesystem_set_info_dirty    (CameraFilesystem *fs,
+				    const char *folder, const char *filename,
+				    GPContext *context)
+{
+	CameraFilesystemFolder	*f;
+	CameraFilesystemFile	*xfile;
+
+	C_PARAMS (fs && folder);
+	CC (context);
+	CA (folder, context);
+
+	/* Search folder and file */
+	CR (lookup_folder_file (fs, folder, filename, &f, &xfile, context));
+
+	xfile->info_dirty = 1;
+	return (GP_OK);
+}
+
+/**
  * \brief Set information about a file
  * \param fs a #CameraFilesystem
  * \param folder foldername where the file resides

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-library.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-library.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-list.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-list.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-result.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-result.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-setting.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-setting.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-version.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-version.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/gphoto2-widget.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/gphoto2-widget.c Changed

@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+#define _DARWIN_C_SOURCE
 #include "config.h"
 #include <gphoto2/gphoto2-widget.h>
 
@@ -53,8 +54,8 @@
 	int     choice_count;
 
 	/* For Range */
-	float   min; 
-	float   max; 
+	float   min;
+	float   max;
 	float   increment;
 
 	/* Child info */
@@ -85,13 +86,13 @@
  *
  * @param type the type
  * @param label the label
- * @param widget 
+ * @param widget
  * @return a gphoto2 error code.
- * 
+ *
  **/
 int
-gp_widget_new (CameraWidgetType type, const char *label, 
-		   CameraWidget **widget) 
+gp_widget_new (CameraWidgetType type, const char *label,
+		   CameraWidget **widget)
 {
 	static int i = 0;
 
@@ -101,7 +102,7 @@
 
 	(*widget)->type = type;
 	strcpy ((*widget)->label, label);
-	
+
 	/* set the value to nothing */
 	(*widget)->value_int    	= 0;
         (*widget)->value_float  	= 0.0;
@@ -126,7 +127,7 @@
  *
  * @param widget the #CameraWidget to be freed
  * @return a gphoto2 error code.
- * 
+ *
  **/
 int
 gp_widget_free (CameraWidget *widget)
@@ -157,7 +158,7 @@
  *
  **/
 int
-gp_widget_ref (CameraWidget *widget) 
+gp_widget_ref (CameraWidget *widget)
 {
 	C_PARAMS (widget);
 
@@ -174,7 +175,7 @@
  *
  **/
 int
-gp_widget_unref (CameraWidget *widget) 
+gp_widget_unref (CameraWidget *widget)
 {
 	C_PARAMS (widget);
 
@@ -261,7 +262,7 @@
  * \brief Retrieves the unique id of the #CameraWidget
  *
  * @param widget a #CameraWidget
- * @param id 
+ * @param id
  * @return a gphoto2 error code.
  *
  **/
@@ -281,7 +282,7 @@
  * @param changed a boolean whether we changed or not
  * @return a gphoto2 error code
  *
- * Sets the changed of the CameraWidget depending on 
+ * Sets the changed of the CameraWidget depending on
  * the changed parameter.
  *
  **/
@@ -301,7 +302,7 @@
  * @param changed a boolean whether we are readonly or not
  * @return a gphoto2 error code
  *
- * Sets the readonly of the CameraWidget depending on 
+ * Sets the readonly of the CameraWidget depending on
  * the changed parameter.
  *
  * Only useful when called from the camera driver.
@@ -324,7 +325,7 @@
  *
  **/
 int
-gp_widget_get_readonly (CameraWidget *widget, int *readonly) 
+gp_widget_get_readonly (CameraWidget *widget, int *readonly)
 {
 	C_PARAMS (widget && readonly);
 
@@ -341,7 +342,7 @@
  *
  **/
 int
-gp_widget_get_type (CameraWidget *widget, CameraWidgetType *type) 
+gp_widget_get_type (CameraWidget *widget, CameraWidgetType *type)
 {
 	C_PARAMS (widget && type);
 
@@ -358,7 +359,7 @@
  *
  **/
 int
-gp_widget_get_label (CameraWidget *widget, const char **label) 
+gp_widget_get_label (CameraWidget *widget, const char **label)
 {
 	C_PARAMS (widget && label);
 
@@ -370,7 +371,7 @@
  * \brief Sets the value of the widget
  *
  * @param widget a #CameraWidget
- * @param value 
+ * @param value
  * @return a gphoto2 error code.
  *
  * Please pass
@@ -381,7 +382,7 @@
  *
  **/
 int
-gp_widget_set_value (CameraWidget *widget, const void *value) 
+gp_widget_set_value (CameraWidget *widget, const void *value)
 {
 	C_PARAMS (widget && value);
 
@@ -431,7 +432,7 @@
  *
  **/
 int
-gp_widget_get_value (CameraWidget *widget, void *value) 
+gp_widget_get_value (CameraWidget *widget, void *value)
 {
 	C_PARAMS (widget && value);
 
@@ -467,7 +468,7 @@
  *
  **/
 int
-gp_widget_append (CameraWidget *widget, CameraWidget *child) 
+gp_widget_append (CameraWidget *widget, CameraWidget *child)
 {
 	C_PARAMS (widget && child);
 
@@ -493,7 +494,7 @@
  *
  **/
 int
-gp_widget_prepend (CameraWidget *widget, CameraWidget *child) 
+gp_widget_prepend (CameraWidget *widget, CameraWidget *child)
 {
 	int x;
 
@@ -526,7 +527,7 @@
  *
  **/
 int
-gp_widget_count_children (CameraWidget *widget) 
+gp_widget_count_children (CameraWidget *widget)
 {
 	C_PARAMS (widget);
 
@@ -543,8 +544,8 @@
  *
  **/
 int
-gp_widget_get_child (CameraWidget *widget, int child_number, 
-		     CameraWidget **child) 
+gp_widget_get_child (CameraWidget *widget, int child_number,
+		     CameraWidget **child)
 {
 	C_PARAMS (widget && child);
 	C_PARAMS (child_number < widget->children_count);
@@ -563,7 +564,7 @@
  *
  **/
 int
-gp_widget_get_child_by_label (CameraWidget *widget, const char *label, 
+gp_widget_get_child_by_label (CameraWidget *widget, const char *label,
 			      CameraWidget **child)
 {
 	int x;
@@ -578,8 +579,8 @@
 	for (x = 0; x < widget->children_count; x++) {
 		int result;
 		CameraWidget *child_rec;
-		
-		result = gp_widget_get_child_by_label (widget->childrenx, 
+
+		result = gp_widget_get_child_by_label (widget->childrenx,
 						       label, &child_rec);
 		if (result == GP_OK) {
 			*child = child_rec;
@@ -600,7 +601,7 @@
  *
  **/
 int
-gp_widget_get_child_by_id (CameraWidget *widget, int id, CameraWidget **child) 
+gp_widget_get_child_by_id (CameraWidget *widget, int id, CameraWidget **child)
 {
 	int x;
 
@@ -610,12 +611,12 @@
 		*child = widget;
 		return (GP_OK);
 	}
-	
+
 	for (x = 0; x < widget->children_count; x++) {
 		int result;
 		CameraWidget *child_rec;
-		
-		result = gp_widget_get_child_by_id (widget->childrenx, id, 
+
+		result = gp_widget_get_child_by_id (widget->childrenx, id,
 						    &child_rec);
 		if (result == GP_OK) {
 			*child = child_rec;
@@ -646,11 +647,11 @@
 		*child = widget;
 		return (GP_OK);
 	}
-	
+
 	for (x = 0; x < widget->children_count; x++) {
 		int result;
 		CameraWidget *child_rec;
-		
+
 		result = gp_widget_get_child_by_name (widget->childrenx, name,
 						      &child_rec);
 		if (result == GP_OK) {
@@ -689,11 +690,11 @@
  *
  **/
 int
-gp_widget_get_root (CameraWidget *widget, CameraWidget **root) 
+gp_widget_get_root (CameraWidget *widget, CameraWidget **root)
 {
 	C_PARAMS (widget && root);
 
-	if (widget->parent) 
+	if (widget->parent)
 		return (gp_widget_get_root (widget->parent, root));
 	else {
 		*root = widget;
@@ -735,8 +736,8 @@
  *
  **/
 int
-gp_widget_get_range (CameraWidget *range, float *min, float *max, 
-		     float *increment) 
+gp_widget_get_range (CameraWidget *range, float *min, float *max,
+		     float *increment)
 {
 	C_PARAMS (range && min && max && increment);
 	C_PARAMS (range->type == GP_WIDGET_RANGE);
@@ -757,7 +758,7 @@
  *
  **/
 int
-gp_widget_add_choice (CameraWidget *widget, const char *choice) 
+gp_widget_add_choice (CameraWidget *widget, const char *choice)
 {
 	C_PARAMS (widget && choice);
 	C_PARAMS ((widget->type == GP_WIDGET_RADIO) ||
@@ -774,10 +775,10 @@
  *
  * @param widget a #CameraWidget of type GP_WIDGET_RADIO or GP_WIDGET_MENU
  * @return a gphoto2 error code or number of choices.
- * 
+ *
  **/
 int
-gp_widget_count_choices (CameraWidget *widget) 
+gp_widget_count_choices (CameraWidget *widget)
 {
 	C_PARAMS (widget);
 	C_PARAMS ((widget->type == GP_WIDGET_RADIO) ||
@@ -796,8 +797,8 @@
  *
  **/
 int
-gp_widget_get_choice (CameraWidget *widget, int choice_number, 
-		      const char **choice) 
+gp_widget_get_choice (CameraWidget *widget, int choice_number,
+		      const char **choice)
 {
 	C_PARAMS (widget && choice);
 	C_PARAMS ((widget->type == GP_WIDGET_RADIO) ||
@@ -820,7 +821,7 @@
  *
  **/
 int
-gp_widget_changed (CameraWidget *widget) 
+gp_widget_changed (CameraWidget *widget)
 {
 	C_PARAMS (widget);

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/i18n.h Added

@@ -0,0 +1,33 @@
+/** \file libgphoto2/i18n.h
+ * \brief Common include header for all C sources containing translated strings
+ *
+ * \todo Replace this file by the gettext.h file from gettext?
+ */
+
+#ifndef LIBGPHOTO2_I18N_H
+#define LIBGPHOTO2_I18N_H
+
+#include "config.h"
+
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (GETTEXT_PACKAGE_LIBGPHOTO2, String)
+#  ifdef gettext_noop
+#      define N_(String) gettext_noop (String)
+#  else
+#      define N_(String) (String)
+#  endif
+#else
+#  define N_(String) (String)
+#  define _(String) (String)
+#  define bind_textdomain_codeset(Domain, codeset) (codeset)
+#  define bindtextdomain(Domain, Directory) (Domain)
+#  define dcgettext(Domain, Message, Type) (Message)
+#  define dgettext(Domain, Message) (Message)
+#  define gettext(String) (String)
+#  define ngettext(String1, String2, Count) ((Count==1)?String1:String2)
+#  define textdomain(String) (String)
+#endif
+
+#endif /* !defined(LIBGPHOTO2_I18N_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/jpeg.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/jpeg.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/jpeg.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/jpeg.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2/libgphoto2.sym -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2/libgphoto2.sym Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/ABOUT-NLS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/ABOUT-NLS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/COPYING.LIB -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/COPYING.LIB Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/ChangeLog Changed

@@ -278,7 +278,7 @@
 	* configure.in, serial/Makefile.am: Do not use xx_LDFLAGS, 
 	  automake is unhappy about that.
 
-2002-07-25  Christophe Barbé <christophe.barbe@ufies.org>
+2002-07-25  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    po files from Stefan Bj|rnelund <stefanb@update.uu.se>
 
@@ -288,52 +288,52 @@
 
 	* ABOUT-NLS: Remove this file, it is generated by gettextize.
 
-2002-07-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-07-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Use ltdl if available.
 
-2002-06-27  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-27  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* autogen.sh: We don't need this file.
 
-2002-06-21  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-21  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    po files from Takeshi AIHANA <aihana@jcom.home.ne.jp>
 
 	* libgphoto2_port/po/ja.po: Update Japan translation.
 			
-2002-06-18  Christophe Barbé <christophe.barbe@ufies.org>
+2002-06-18  Christophe BarbÃ© <christophe.barbe@ufies.org>
 
    po file from Fabian Mandelbaum <fabman@mandrakesoft.com>
 
 	* libgphoto2_port/po/es.po: Spanish translation.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Fix indentation.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Arnaud Launay <asl@launay.org>, slightly modified:
 
 	* configure.in: Check for usb_busses in -lusb.
 
-2002-06-17  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-17  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* Makefile.am: Remove 'autogen.sh' from EXTRA_DIST - people 
 	  that compile our tarballs don't need it.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/gphoto2-port-info-list.c: Cleanup the ltdl-specific
 	  part.
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/Makefile.am:
 	* configure.in: Fix (?) -version-info
 
-2002-06-14  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-14  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Don't use ltdl.h - libtool is just too broken
 	  (or I am too stupid to use it).
@@ -346,23 +346,23 @@
 	  - only set have_xmlto* to true if have_xmlto
 	  - output which formats we will create under which file/dir name
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in:
 	* libgphoto2_port/gphoto2-port-info-list.c: Make libgphoto2_port
 	  use ltdl.h. I needed to introduce a global variable - code is
 	  marked as UGLY_HACK. If you know how to fix it, please tell me.
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* serial/unix.c: Substitute some '#if's by '#ifdef's.
 
-2002-06-12  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-12  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* m4/documentation.m4: People reported problems with AC_CHECK_PROG.
 	  Let's try AC_PATH_PROG instead.
 
-2002-06-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* m4/documentation.m4: Fix checks for xmlto-html,pdf,man,ps.
 
@@ -370,22 +370,22 @@
 
 	* m4/packaging.m4: package dependency on libusb only if required
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Patrick Mansfield <patman@aracnet.com>:
 
 	* libgphoto2_port/gphoto2-port-info-list.c: #ifdef instead of #if
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* m4/documentation.m4: Fix this ugly output all over the place.
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
         * intl: Remove these files - they should be generated by gettextize.
         * autogen.sh: Check for and run gettextize.
 
-2002-06-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-06-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* acconfig.h: According to 
 	  http://www.gnu.org/manual/autoconf-2.53/html_mono/autoconf.html,
@@ -416,13 +416,13 @@
 	* m4/documentation.m4: use AC_BEFORE where sensible
 	* serial/unix.c: the locking problems only concern RS232 cams
 
-2002-05-25  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-25  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	Patch by Dave Woodman <dave@naffnet.org>, slightly modified:
 
 	* serial/unix.c: Make sure speed changes have been successful.
 
-2002-05-23  Lutz Müller <lutz@users.sourceforge.net>
+2002-05-23  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* test/test-gp-port.c: More tests.
 	* libgphoto2_port/gphoto2-port.c: Nicer debugging output.
@@ -450,7 +450,7 @@
 	* m4/byteorder.m4: Added support for cross-compilation.
 	  Changed to look for machine/endian.h instead of sys/endian.h on *BSD.
 
-2003-03-22  Lutz Müller <lutz@users.sourceforge.net>
+2003-03-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/Makefile.am: Remove "-g" from C,LDFLAGS. If you
 	  need it, please add it again in configure.in.
@@ -485,7 +485,7 @@
 	* changed all _event, eventep to _int and intep as it describes usb
 	  inerrupt endpoint
 
-2002-03-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-03-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* configure.in: Fix versionning.
 
@@ -505,20 +505,20 @@
 	* libgphoto2_port/gphoto2-port-info-list.c: Fixed error test for
 	  non-GNU regex.
 
-2002-02-23  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-23  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* serial,usb/Makefile.am: LIBADD libgphoto2_port.
 
-2002-02-22  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-22  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* serial/unix.c: Improved IRIX fix to set the speed exactly once after
 	  opening the device.
 
-2002-02-21  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-21  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* serial/unix.c: IRIX fixes.
 
-2002-02-19  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-19  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* serial/unix.c (gp_port_library_list): Don't check for return
 	  value when adding generic ports. Fixes #518616.
@@ -536,7 +536,7 @@
 	* gphoto2-port.h: placed typedefs after the enums (GPPin and GPLevel)
 	  since g++ does not like it.
 	  
-2002-02-11  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-11  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* doc/DocRules.am: Fix building docs when $(builddir) == $(srcdir).
 
@@ -544,11 +544,11 @@
 
 	* serial/unix.c: Added serial ports for Tru64 UNIX
 
-2002-02-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* m4/documentation.m4: Fix #510543.
 
-2002-02-06  Lutz Müller <lutz@users.sourceforge.net>
+2002-02-06  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/gphoto2-port.h: extern C.
 
@@ -556,7 +556,7 @@
 
 	* configure.in: Added "ja" to ALL_LINGUAS to fix broken "make dist"
 	
-2002-01-31  Lutz Müller <lutz@users.sourceforge.net>
+2002-01-31  Lutz MÃ¼ller <lutz@users.sourceforge.net>
 
 	* libgphoto2_port/gphoto-port.c,h: The buffer that is sent using
 	  gp_port_write is "const".
@@ -600,7 +600,7 @@
 	* libgphoto2_port/gphoto2-port.h: Moved typedefs after the definitions
 	  of the dependent types.
 
-2002-01-08  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-08  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Substitute AM_PROG_LIBTOOL by AC_PROG_LIBTOOL (first
 	  is deprecated).
@@ -618,39 +618,39 @@
 
 	* po/de.po: Update.
 
-2002-01-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2002-01-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/Makefile.am:
 	* usb/Makefile.am:
 	* serial/Makefile.am: Install io-drivers into versioned
 	  subdirectories.
 
-2001-12-20  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-20  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Tim Waugh <twaugh@redhat.com>:
 
 	* usb/libusb.c: "I think this makes it clearer exactly which kernel
 	  module to unload when dc2xx is loaded."
 
-2001-12-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Comment out check for ltdl.h. See comment in there.
 
-2001-12-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-port-config.in: Added missing -lgphoto2_port
 
-2001-12-13  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-13  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Check if ltdl.h is available and ...
 	* libgphoto2_port: ... use it.
 
-2001-12-12  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-12  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Remove some error codes, and move some variable names into the
 	gp-namespace.
 
-2001-12-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-result.c,h: Remove
 	  GP_ERROR_IO_TIMEOUT - we already have GP_ERROR_TIMEOUT.
@@ -661,7 +661,7 @@
 	* doc/gphoto2-port-sections.txt: added lots of constants, a few macros and
 	  created new sections about serial and usb specific stuff
 
-2001-12-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-12-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: You won't believe how much dead code there is...
 
@@ -678,12 +678,12 @@
 	* m4/packaging.m4: help cosmetics, renamed PGK_* to GPKG_*,
 	  improved messages
 	
-2001-11-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-info-list.c: The logic was still
 	  broken...
 
-2001-11-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-info-list.c: Oh god, I checked in a
 	  #if 0 that I used for debugging purposes. Sorry, guys....
@@ -693,12 +693,12 @@
 	* libgphoto2_port/gphoto2-port-portability.h: OpenBSD also prepends
 	  underscores to symbols.
 
-2001-11-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-info-list.c: Fix regex stuff 
 	  (at least for HAVE_GNU_REGEX).
 
-2001-11-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Check for GNU regex
 	* acconfig.h: HAVE_GNU_REGEX
@@ -715,54 +715,54 @@
 	* po/libgphoto2_port.pot: I'm sick of all the diffs
 	* po/de.po: I'm still sick of all the diffs
 
-2001-11-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c (gp_port_library_list): Lock device here before
 	  trying to access a port, too.
 
-2001-11-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Fix typo (USB_LIBS, not USB_LDFLAGS) *sigh*
 	* usb/Makefile.am: libgphoto2-port-usb.so needs -lusb, therefore add
 	  it using LIBADD (ldopen is not clever enough to figure that out).
 
-2001-11-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-port-config.in: Remove another reference to IOLIB_CFLAGS...
 
-2001-11-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: Always set the speed at the beginning - don't assume
 	  it to be at 9600.
 
-2001-11-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: For flush and break, check that the device is open
 	  and at the right speed.
 
-2001-11-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: Try to fix logic of speed setting: Now check before
 	  each read/write operation if the current speed is the requested one.
 	  If not, change it and remember it in dev->pl->baudrate.
 
-2001-11-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/Makefile.am: @IOLIB_CFLAGS@ doesn't exist any more.
 
-2001-11-23  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-23  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: Only set the baudrate if the device is open. If you
 	  set parameters on device 0, you mess up the console...
 
-2001-11-23  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-23  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in:
 	* serial/Makefile.am
 	* usb/Makefile.am: Clean up Makefiles. Avoid version on io-drivers
 	  (we don't check it anyways)
 
-2001-11-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Marr <marr@shianet.org>:
 
@@ -775,48 +775,48 @@
 
 	* configure.in (Module): Added 'de' to ALL_LINGUAS.
 
-2001-11-11  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-11-11  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Look for usb.h in locations specified by
 	  libusb-config.
 
-2001-10-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* usb/libusb.c: memset port->pl to 0 so that we can later detect
 	  errors
 
-2001-10-28  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-28  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-portability.c,h (GP_SYSTEM_RMDIR):
 	  New
 
-2001-10-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2: Updated documentation
 
-2001-10-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include: Move everything from here to ...
 	* libgphoto2_port: ... here.
 
-2001-10-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Give users the possibility _not_ to compile in USB
 	  support. Same with SERIAL.
 
-2001-10-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port.h: Changed the syntax of gp_port_new to
 	  be consistent with gp_camera_new.
 
-2001-10-26  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-26  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* network
 	* parallel
 	* ieee1394: Removed. Once someone wants to implement those, they can
 	  be easily resurrected.
 
-2001-10-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* usb/libusb.c:
 	* include/gphoto2-port.h: Cleanup.
@@ -828,28 +828,28 @@
 	  failed.
 	  Fix bug when logging data in gp_port_usb_msg_read().
 
-2001-10-25  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-25  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-core.c,h: Replaced by ...
 	* libgphoto2_port/gphoto2-port-info-list.c,h: ... this file.
 
-2001-10-23  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-23  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-log.c,h: Remove the history stuff.
 	* libgphoto2_port/gp_port.c (gp_port_set_error), (gp_port_get_error):
 	  New.
 	* serial/unix.c: Use gp_port_set_error
 
-2001-10-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-log.c,h: Use va_list instead of 
 	  a buffers. That means, no more incomplete data dumps.
 
-2001-10-20  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gp_port.c: Forot to set default speed to 0
 
-2001-10-20  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-20  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* configure.in: Add some more warning flags
 	* include/gphoto2-port.h: More cleanup in preparation of documentation
@@ -857,22 +857,22 @@
 	* serial/unix.c: Move internals into port->pl. If speed in settings
 	  is 0, set to 9600 (default).
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gphoto2-port-log.c,h: Added GP_LOG_DATA
 
-2001-10-17  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-17  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port-debug.h
 	* libgphoto2_port/debug.c: Removed
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/result.c:
 	* include/gphoto2-port-result.h: #define GP_ERROR_NOT_SUPPORTED
 	* libgphoto2_port/gp_port.c: Clean up in preparation of documentation
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* ieee1394/Makefile.am:
 	* serial/Makefile.am:
@@ -884,37 +884,37 @@
 	* include/gphoto2-port.h: GPPortType, GPPortOperations, GPPort
 	* libgphoto2_port/gphoto2-port-core.c,h: New. 
 
-2001-10-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* doc: Create framework for documentation.
 	* libgphoto2_port/gphoto2-port-log.c,h: Updated
 
-2001-10-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port-result.h: GP_ERROR_NO_MEMORY
 	* libgphoto2_port/result.c: GP_ERROR_NO_MEMORY
 
-2001-10-12  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-12  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Fredrik <fredrik@krixor.xy.org>:
 
 	* libgphoto2_port/gp_port.c: 
 	* usb/libusb.c: Better error checking
 
-2001-10-07  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-07  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
         Patch from David Faure <david@mandrakesoft.com>
 
 	* libgphoto2_port/library.c: Fix logic
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Suggestions from Hans Ulrich Niedermann <gp@n-dimensional.de>:
 
 	* libgphoto2_port/debug.c: #warn the user #ifndef HAVE_VSNPRINTF and
 	use a #define at the beginning instead of #ifdefs in the code.
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port-debug.h
 	* libgphoto2_port/debug.c (gp_port_debug_history_get_size): New.
@@ -923,7 +923,7 @@
 	(gp_port_history_append): Don't try to remove full messages, just 
 	remove as many bytes as needed.
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port-debug.h
 	* libgphoto2/debug.c (gp_port_debug_get_level): New. In addition,
@@ -937,19 +937,19 @@
 	* serial/unix.c: Adjust to above changes
 	* usb/libusb.c: Use gp_port_debug_printf instead of fprintf
 
-2001-10-06  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-06  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Chris Byrne <adapt@ihug.co.nz> found this bug:
 
 	* libgphoto2_port/debug.c: Use "%s" because the string we print can
 	contain characters like "%%%%i%s&%i".
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gp_port.c: Print what we received only if we received
 	something...
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Hans Ulrich Niedermann <gp@n-dimensional.de>, slightly
 	adapted:
@@ -958,30 +958,30 @@
 	* libgphoto2_port/debug.c (gp_port_debug_print_data): New
 	* libgphoto2_port/gp_port.c: Use the new function.
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/debug.c: #include <config.h>
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Suggestion from Fredrik <fredrik@krixor.xy.org>:
 
 	* configure.in: Check for vsnprintf
 	* libgphoto2_port/debug.c: Use vsnprintf if available
 
-2001-10-05  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-05  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch based on suggestions from Fredrik <fredrik@krixor.xy.org>:
 
 	* libgphoto2_port/debug.c: Make sure we memset the same number of 
 	bytes we malloc.
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: 
 	* usb/libusb.c: Fix includes
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/Makefile.am
 	* include/gphoto2-port-result.h
@@ -991,7 +991,7 @@
 	* include/gphoto2-port.h: Clean up
 	* libgphoto2_port/debug.c: Check if history is big enough for message
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/Makefile.am
 	* include/gphoto2-port-debug.h
@@ -999,45 +999,45 @@
 	* libgphoto2_port/debug.c: New files
 	* libgphoto2_port/gp_port.c: Move debugging stuff out of here.
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port.h:
 	* libgphoto2_port/gp_port.c: Revert the result_as_description thing
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* acconfig.h:
 	* configure.in:
 	* serial/unix.c: Use baudboy.h if available (Red Hat)
 
-2001-10-04  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-04  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Thanks to Bill Richardson <bill@riverstonenet.com>:
 
 	* test/Makefile.am: Oops, don't use -lgphoto_port
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* acconfig.h: #undef HAVE_TTYLOCK
 	* configure.in: Improved checks for locking headers/libs
 	* serial/unix.c: Yet another locking lib: ttylock.h
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port.h:
 	* libgphoto2_port/gp_port.c: Explain to the users why claiming an 
 	interface could fail.
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port.h:
 	* libgphoto2_port/gp_port.c (gp_port_result_as_description): New
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* serial/unix.c: Correctly interpret the return value of dev_unlock
 
-2001-10-03  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-10-03  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* test/gphoto2-port-test.c: Renamed into 
 	* test/test-gp-port.c
@@ -1048,12 +1048,12 @@
 	* serial/Makefile.am: -llockdev if that is available
 	* serial/unix.c: Use lockdev if available
 
-2001-09-24  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-24  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gp_port.c (gp_port_count): Make sure
 	libgphoto2_port is initialized.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Fredrik <fredrik@krixor.xy.org>
 
@@ -1062,7 +1062,7 @@
 	* serial/unix.c:
 	* usb/libusb.c: Clean up settings code.
 
-2001-09-22  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-22  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Carsten Pfeiffer <carpdjih@sp.zrz.tu-berlin.de>
 
@@ -1076,30 +1076,30 @@
 	  usb/libusb.c: changed *usb_msg_read* and *usb_msg_write* functions
 	  to allow passing in of request and index values.
 
-2001-09-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Patch from Fredrik <fredrik@krixor.xy.org>:
 
 	* usb/libusb.c: Only set configuration stuff on gp_port_usb_update
 	(instead of gp_port_usb_open).
 
-2001-09-14  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-14  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gp_port.c: Set some default settings in case of
 	GP_PORT_USB, too.
 
-2001-09-02  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-09-02  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-portability.h:
 	* include/libgphoto2_port/portability.c: const *char
 
-2001-08-30  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-30  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* include/gphoto2-port.h: GP_ERROR_IO_LOCK
 	* libgphoto2_port/gp_port.c: Better error reporting.
 	* serial/unix.c: Implement locking of serial ports
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	All work from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:
 
@@ -1107,12 +1107,12 @@
 	open .*
 	* usb/libusb.c (gp_port_usb_close): Release the interface here.
 
-2001-08-29  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-29  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* libgphoto2_port/gp_port.c: if (!dev) return (GP_OK) instead of
 	accessing dev->whatever... Plus, set the timeout on gp_port_open.
 
-2001-08-27  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-08-27  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	Suggestion from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:
 
@@ -1123,7 +1123,7 @@
 
 	* parallel/Makefile.am: Remove some references to libgpio.
 
-2001-03-16  Lutz Müller <urc8@rz.uni-karlsruhe.de>
+2001-03-16  Lutz MÃ¼ller <urc8@rz.uni-karlsruhe.de>
 
 	* gphoto2-port-test.c: Applied patch from Michael 
 	  <michael.spanier@abh.uni-karlsruhe.de> which brings the file

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/INSTALL -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/INSTALL Changed

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
+   Briefly, the shell command './configure && make && make install'
 should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
 
    The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
      privileges.
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
      distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -113,21 +112,21 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, `make install
+affected directory.  For example, 'make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
 
    Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
+execution of 'make' will be.  For these packages, running './configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
 
 Particular systems
 ==================
 
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
      ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
+   HP-UX 'make' updates targets which have the same timestamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try
 
      ./configure CC="cc"
 
@@ -242,26 +240,26 @@
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
 
      ./configure --prefix=/boot/common
 
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
+   There may be some features 'configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
 
      CPU-COMPANY-SYSTEM
 
@@ -270,101 +268,101 @@
      OS
      KERNEL-OS
 
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+environment passed to 'configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:
 
      CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-`configure' Invocation
+'configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
+   'configure' recognizes the following options to control how it
 operates.
 
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.
 
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
      Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.
 
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
      script, and exit.
 
-`--cache-file=FILE'
+'--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
      disable caching.
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
 
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
      messages will still be shown).
 
-`--srcdir=DIR'
+'--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     'configure' can determine that directory automatically.
 
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.
 
-`--no-create'
-`-n'
+'--no-create'
+'-n'
      Run the configure checks, but stop before creating any output
      files.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/Makefile.am Changed

@@ -25,7 +25,20 @@
 bin_SCRIPTS = gphoto2-port-config
 
 # The . stands for the current dir, i.e. the iolibs to build.
-SUBDIRS = po libgphoto2_port test . doc gphoto-m4
+# Make sure the iolibs are built before running tests on them.
+SUBDIRS = po libgphoto2_port . tests doc
+
+include gphoto-m4/Makefile-files
+
+@GP_GETTEXT_SETUP_MK@
+
+# Dummy target to force Automake to make the all target depend on it
+all-local:
+	@:
+
+# Dummy target to force Automake to make the distclean target depend on it
+distclean-local:
+	@:
 
 
 ########################################################################
@@ -91,20 +104,4 @@
 	gphoto2/gphoto2-port-result.h
 
 EXTRA_DIST += gphoto2/gphoto2-port-library.h
-
-
-# Compatibility for header inclusions.
-#
-# - Old code has -I/usr/include/gphoto2
-#   #include <gphoto2-camera.h>
-#
-# - New code has -I/usr/include
-#   #include <gphoto2/gphoto2-camera.h>
-
-install-data-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2
-	$(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2
-
-uninstall-local:
-	rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2
+EXTRA_DIST += gphoto2/gphoto2-port-locking.h

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/NEWS -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/NEWS Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/aclocal.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,14 +14,14 @@
 m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
-m4_warning(this file was generated for autoconf 2.69.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.71,,
+m4_warning(this file was generated for autoconf 2.71.
 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'.))
 
 # pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# serial 11 (pkg-config-0.29.1)
 
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -63,7 +63,7 @@
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun(PKG_PREREQ,
-m4_define(PKG_MACROS_VERSION, 0.29.2)
+m4_define(PKG_MACROS_VERSION, 0.29.1)
 m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
     m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
 )dnl PKG_PREREQ
@@ -164,7 +164,7 @@
 AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
 
 pkg_failed=no
-AC_MSG_CHECKING(for $2)
+AC_MSG_CHECKING(for $1)
 
 _PKG_CONFIG($1_CFLAGS, cflags, $2)
 _PKG_CONFIG($1_LIBS, libs, $2)
@@ -174,11 +174,11 @@
 See the pkg-config man page for more details.)
 
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT(no)
+   	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
+        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
@@ -195,7 +195,7 @@
 _PKG_TEXT)dnl
         )
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT(no)
+     	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
@@ -296,7 +296,75 @@
 AS_VAR_IF($1, "", $5, $4)dnl
 )dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   ACTION-IF-FOUND,ACTION-IF-NOT-FOUND,
+dnl   DESCRIPTION, DEFAULT)
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl VARIABLE-PREFIX name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN(PKG_WITH_MODULES,
+
+m4_pushdef(with_arg, m4_tolower($1))
+
+m4_pushdef(description,
+           m4_default($5, build with with_arg support))
+
+m4_pushdef(def_arg, m4_default($6, auto))
+m4_pushdef(def_action_if_found, AS_TR_SH(with_with_arg)=yes)
+m4_pushdef(def_action_if_not_found, AS_TR_SH(with_with_arg)=no)
+
+m4_case(def_arg,
+            yes,m4_pushdef(with_without, --without-with_arg),
+            m4_pushdef(with_without,--with-with_arg))
+
+AC_ARG_WITH(with_arg,
+     AS_HELP_STRING(with_without, description @<:@default=def_arg@:>@),,
+    AS_TR_SH(with_with_arg)=def_arg)
+
+AS_CASE($AS_TR_SH(with_with_arg),
+            yes,PKG_CHECK_MODULES($1,$2,$3,$4),
+            auto,PKG_CHECK_MODULES($1,$2,
+                                        m4_n(def_action_if_found) $3,
+                                        m4_n(def_action_if_not_found) $4))
+
+m4_popdef(with_arg)
+m4_popdef(description)
+m4_popdef(def_arg)
+
+)dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   DESCRIPTION, DEFAULT)
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._VARIABLE-PREFIX is exported as make variable.
+AC_DEFUN(PKG_HAVE_WITH_MODULES,
+
+PKG_WITH_MODULES($1,$2,,,$3,$4)
+
+AM_CONDITIONAL(HAVE_$1,
+               test "$AS_TR_SH(with_m4_tolower($1))" = "yes")
+)dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   DESCRIPTION, DEFAULT)
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_VARIABLE-PREFIX is exported as make
+dnl and preprocessor variable.
+AC_DEFUN(PKG_HAVE_DEFINE_WITH_MODULES,
+
+PKG_HAVE_WITH_MODULES($1,$2,$3,$4)
+
+AS_IF(test "$AS_TR_SH(with_m4_tolower($1))" = "yes",
+        AC_DEFINE(HAVE_$1, 1, Enable m4_tolower($1) support))
+)dnl PKG_HAVE_DEFINE_WITH_MODULES
+
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -308,10 +376,10 @@
 # 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.15'
+am__api_version='1.16'
 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.15.1, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -327,12 +395,12 @@
 # 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.15.1)dnl
+AM_AUTOMAKE_VERSION(1.16.5)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -394,7 +462,7 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -446,7 +514,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -477,7 +545,7 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -668,13 +736,12 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
@@ -682,49 +749,43 @@
   # Older Autoconf 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
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE($CONFIG_FILES,
+          *\'*, eval set x "$CONFIG_FILES",
+          *, set x $CONFIG_FILES)
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_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
+    am_mf=`AS_ECHO("$am_mf") | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: 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"`
-    # 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'`; 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
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME("$am_mf")`
+    am_filepart=`AS_BASENAME("$am_mf")`
+    AM_RUN_LOG(cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE(Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).)
+  fi
+  AS_UNSET(am_dirpart)
+  AS_UNSET(am_filepart)
+  AS_UNSET(am_mf)
+  AS_UNSET(am_rc)
+  rm -f conftest-deps.mk
 }
 )# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -733,18 +794,17 @@
 # -----------------------------
 # 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.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll 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")
-)
+     AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"))
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,6 +832,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))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
@@ -808,7 +872,7 @@
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(AC_PACKAGE_VERSION, ok),
   ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
@@ -831,8 +895,8 @@
 AC_REQUIRE(AC_PROG_MKDIR_P)dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST(mkdir_p, '$(MKDIR_P)')
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -860,6 +924,20 @@
 		  m4_define(AC_PROG_OBJCXX,
 			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
 )
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST(CTAGS)
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST(ETAGS)
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST(CSCOPE)
+
 AC_REQUIRE(AM_SILENT_RULES)dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -899,7 +977,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -941,7 +1019,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -962,7 +1040,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -983,7 +1061,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -991,49 +1069,42 @@
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN(AM_MAKE_INCLUDE,
-am_make=${MAKE-make}
-cat > confinc << 'END'
+AC_MSG_CHECKING(whether ${MAKE-make} supports the include directive)
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .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
-)
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG(${MAKE-make} -f confmf.$s && cat confinc.out)
+  AS_CASE($?:`cat confinc.out 2>/dev/null`,
+      '0:this is the am__doit target',
+      AS_CASE($s,
+          BSD, am__include='.include' am__quote='"',
+          am__include='include' am__quote=''))
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT(${_am_result})
+AC_SUBST(am__include))
+AC_SUBST(am__quote))
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1054,12 +1125,7 @@
 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
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -1072,7 +1138,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1101,7 +1167,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1148,7 +1214,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1167,7 +1233,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1248,7 +1314,7 @@
 rm -f conftest.file
 )
 
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1308,7 +1374,7 @@
 _AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
 )
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1336,7 +1402,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1355,7 +1421,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1486,18 +1552,21 @@
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR
 
+m4_include(gphoto-m4/gp-asm-symver-ifelse.m4)
+m4_include(gphoto-m4/gp-asm-symver-support.m4)
 m4_include(gphoto-m4/gp-check-library.m4)
 m4_include(gphoto-m4/gp-check-shell-environment.m4)
 m4_include(gphoto-m4/gp-config-msg.m4)
 m4_include(gphoto-m4/gp-documentation.m4)
-m4_include(gphoto-m4/gp-gettext-hack.m4)
+m4_include(gphoto-m4/gp-driverdir.m4)
+m4_include(gphoto-m4/gp-gettext-setup.m4)
 m4_include(gphoto-m4/gp-libltdl.m4)
-m4_include(gphoto-m4/gp-pkg-config.m4)
 m4_include(gphoto-m4/gp-references.m4)
 m4_include(gphoto-m4/gp-udev.m4)
 m4_include(gphoto-m4/gp-va-copy.m4)
 m4_include(auto-m4/gettext.m4)
 m4_include(auto-m4/iconv.m4)
+m4_include(auto-m4/intlmacosx.m4)
 m4_include(auto-m4/lib-ld.m4)
 m4_include(auto-m4/lib-link.m4)
 m4_include(auto-m4/lib-prefix.m4)

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/ar-lib -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/ar-lib Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/compile -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/compile Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/config.guess -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/config.guess Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/config.rpath -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/config.rpath Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/config.sub -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/config.sub Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/depcomp -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/depcomp Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/install-sh -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/install-sh Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/ltmain.sh -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/ltmain.sh Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/missing -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/missing Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/mkinstalldirs -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/mkinstalldirs Changed

@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2020-07-26.22; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -92,6 +92,8 @@
   *)
     if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
        test ! -d ./--version; then
+      echo "umask 22"
+      umask 22
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
     else
@@ -104,6 +106,9 @@
     ;;
 esac
 
+echo "umask 22"
+umask 22
+
 for file
 do
   case $file in
@@ -132,21 +137,16 @@
 
       if test ! -d "$pathcomp"; then
 	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
       fi
     fi
 
     pathcomp=$pathcomp/
   done
+
+  if test ! -z "$dirmode"; then
+    echo "chmod $dirmode $file"
+    chmod "$dirmode" "$file" || errstatus=$?
+  fi
 done
 
 exit $errstatus
@@ -154,9 +154,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-aux/test-driver -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-aux/test-driver Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/gettext.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/gettext.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/iconv.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/iconv.m4 Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/intlmacosx.m4 Added

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/lib-ld.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/lib-ld.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/lib-link.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/lib-link.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/lib-prefix.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/lib-prefix.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/libtool.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/libtool.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/ltoptions.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/ltoptions.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/ltsugar.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/ltsugar.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/ltversion.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/ltversion.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/lt~obsolete.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/lt~obsolete.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/nls.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/nls.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/po.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/po.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/auto-m4/progtest.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/auto-m4/progtest.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/config.h.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/config.h.in Changed

@@ -7,8 +7,8 @@
    language is requested. */
 #undef ENABLE_NLS
 
-/* The gettext domain we're using */
-#undef GETTEXT_PACKAGE
+/* text domain for string translations */
+#undef GETTEXT_PACKAGE_LIBGPHOTO2_PORT
 
 /* Define to 1 if you have the <asm/io.h> header file. */
 #undef HAVE_ASM_IO_H
@@ -22,6 +22,14 @@
 /* The C compiler we're using */
 #undef HAVE_CC
 
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
@@ -54,7 +62,7 @@
 /* Define if you have GNU regex. */
 #undef HAVE_GNU_REGEX
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -90,12 +98,6 @@
 /* Define if you have dev_lock/lockdev based locking. */
 #undef HAVE_LOCKDEV
 
-/* Whether libltdl (of libtool fame) is present */
-#undef HAVE_LTDL
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <mntent.h> header file. */
 #undef HAVE_MNTENT_H
 
@@ -242,7 +244,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* camera list with support status */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/configure -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/configure Changed

@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libgphoto2 port access library 0.12.0.
+# Generated by GNU Autoconf 2.71 for libgphoto2 port access library 0.12.2.
 #
 # Report bugs to <gphoto-devel@lists.sourceforge.net>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,17 +169,21 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
 
   test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
     ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
@@ -205,32 +191,39 @@
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     PATH=/empty FPATH=/empty; export PATH FPATH
     test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -238,14 +231,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
 
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
-      if test "x$CONFIG_SHELL" != x; then :
+
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -263,18 +263,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
 $0: gphoto-devel@lists.sourceforge.net about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
@@ -302,6 +303,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -319,6 +321,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -333,7 +343,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -342,7 +352,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -381,12 +391,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -398,18 +409,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
 # ----------------------------------------
@@ -421,9 +441,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -450,7 +470,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -494,7 +514,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -508,6 +528,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -521,6 +545,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -590,48 +621,45 @@
 # Identity of this package.
 PACKAGE_NAME='libgphoto2 port access library'
 PACKAGE_TARNAME='libgphoto2_port'
-PACKAGE_VERSION='0.12.0'
-PACKAGE_STRING='libgphoto2 port access library 0.12.0'
+PACKAGE_VERSION='0.12.2'
+PACKAGE_STRING='libgphoto2 port access library 0.12.2'
 PACKAGE_BUGREPORT='gphoto-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
 ac_unique_file="libgphoto2_port/gphoto2-port-version.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
+gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -645,9 +673,10 @@
 ENABLE_GTK_DOC_TRUE
 GTKDOC
 pkgconfigdir
-iolibdir
 IOLIB_LTLIST
 IOLIB_LIST
+DEFAULT_IOLIBS
+iolibdir
 HAVE_UDEV_FALSE
 HAVE_UDEV_TRUE
 udevscriptdir
@@ -668,25 +697,31 @@
 HAVE_LIBEXIF_TRUE
 REQUIREMENTS_FOR_LIBEXIF
 LIBEXIF_CONFIG_PROG
-PKG_CONFIG_LIBDIR
 LIBEXIF_LIBS
 LIBEXIF_CFLAGS
+PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-VERSIONMAPLDFLAGS
+HAVE_ASM_SYMVER_FALSE
+HAVE_ASM_SYMVER_TRUE
 POSUB
 LTLIBINTL
 LIBINTL
 INTLLIBS
 LTLIBICONV
 LIBICONV
+INTL_MACOSX_LIBS
+XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
+XGETTEXT_015
 XGETTEXT
+GMSGFMT_015
+MSGFMT_015
 GMSGFMT
 MSGFMT
+GETTEXT_MACRO_VERSION
 USE_NLS
-MKINSTALLDIRS
-GETTEXT_PACKAGE
+GETTEXT_PACKAGE_LIBGPHOTO2_PORT
 MAIL_GPHOTO_TRANSLATION
 MAIL_GPHOTO_USER
 MAIL_GPHOTO_DEVEL
@@ -705,6 +740,7 @@
 DSYMUTIL
 MANIFEST_TOOL
 RANLIB
+FILECMD
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -713,11 +749,6 @@
 FGREP
 EGREP
 GREP
-SED
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
 host_os
 host_vendor
 host_cpu
@@ -726,8 +757,13 @@
 build_vendor
 build_cpu
 build
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 ac_ct_AR
 AR
+SED
 CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -736,7 +772,6 @@
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -755,6 +790,9 @@
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -797,6 +835,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -815,8 +854,9 @@
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
+SHELL
+am__quote'
+ac_subst_files='GP_GETTEXT_SETUP_MK'
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
@@ -842,10 +882,9 @@
 enable_disk
 enable_vusb
 enable_ptpip
+with_iolibdir
 enable_debug
-with_doc_dir
 enable_docs
-with_html_dir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -861,14 +900,16 @@
 LIBLTDL
 PKG_CONFIG
 PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 LIBEXIF_CFLAGS
 LIBEXIF_LIBS
-PKG_CONFIG_LIBDIR
 LIBUSB1_CFLAGS
 LIBUSB1_LIBS
 LIBUSB_CFLAGS
 LIBUSB_LIBS
-udevscriptdir'
+udevscriptdir
+iolibdir
+DEFAULT_IOLIBS'
 
 
 # Initialize some variables set by options.
@@ -907,6 +948,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -936,8 +978,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -978,9 +1018,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1004,9 +1044,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1159,6 +1199,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1208,9 +1257,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1224,9 +1273,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1270,9 +1319,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1288,7 +1337,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1296,7 +1345,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1352,7 +1401,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -1409,7 +1458,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 libgphoto2 port access library 0.12.0 to adapt to many kinds of systems.
+\`configure' configures libgphoto2 port access library 0.12.2 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1449,6 +1498,7 @@
   --sysconfdir=DIR        read-only single-machine data PREFIX/etc
   --sharedstatedir=DIR    modifiable architecture-independent data PREFIX/com
   --localstatedir=DIR     modifiable single-machine data PREFIX/var
+  --runstatedir=DIR       modifiable per-process data LOCALSTATEDIR/run
   --libdir=DIR            object code libraries EPREFIX/lib
   --includedir=DIR        C header files PREFIX/include
   --oldincludedir=DIR     C header files for non-gcc /usr/include
@@ -1479,7 +1529,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libgphoto2 port access library 0.12.0:";;
+     short | recursive ) echo "Configuration of libgphoto2 port access library 0.12.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1502,9 +1552,7 @@
   --disable-rpath         do not hardcode runtime library paths
   --disable-serial        do not compile in SERIAL support
   --disable-ttylock       do not use ttylock library
-
   --disable-lockdev       do not use lockdev library
-
   --disable-disk          disable the 'disk' port driver
   --enable-vusb           enable the 'vusb' virtual USB port driver
   --disable-ptpip         disable the 'ptpip' port driver for TCP/IP connected
@@ -1523,7 +1571,7 @@
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
@@ -1532,8 +1580,7 @@
   --with-libusb-1.0=PREFIX
                           where to find libusb-1.0, "no" or "auto"
   --with-libusb=PREFIX    where to find libusb, "no" or "auto"
-  --with-doc-dir=PATH     Where to install docs default=autodetect
-  --with-html-dir=PATH    Where to install html docs default=autodetect
+  --with-iolibdir=<path>  deprecated (use iolibdir= variable instead)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1548,15 +1595,15 @@
               User-defined run-time library search path.
   LTDLINCL    CFLAGS for compiling with libltdl
   LIBLTDL     LIBS to add for linking against libltdl
-  PKG_CONFIG  pkg-config package config utility
+  PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
-              directory where pkg-config looks for *.pc files
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   LIBEXIF_CFLAGS
               CFLAGS for compiling with libexif
   LIBEXIF_LIBS
               LIBS to add for linking against libexif
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
   LIBUSB1_CFLAGS
               CFLAGS for compiling with libusb-1.0
   LIBUSB1_LIBS
@@ -1567,6 +1614,11 @@
   udevscriptdir
               Directory where udev scripts like check-ptp-camera will be
               installed
+  iolibdir    where to install iolibs (port libraries) (default:
+              ${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION})
+  DEFAULT_IOLIBS
+              default location to look for iolibs (port libraries) at runtime
+              (if not given, use ${iolibdir})
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1587,9 +1639,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1617,7 +1669,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1625,7 +1678,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1634,10 +1687,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libgphoto2 port access library configure 0.12.0
-generated by GNU Autoconf 2.69
+libgphoto2 port access library configure 0.12.2
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1654,14 +1707,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1669,14 +1722,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1698,7 +1752,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1706,14 +1760,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -1729,14 +1784,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1744,17 +1799,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1776,83 +1832,44 @@
 ac_fn_c_check_header_compile ()
 {
   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
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # 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
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1860,16 +1877,9 @@
 #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
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -1887,126 +1897,99 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     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; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$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
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $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
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&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;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$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 gphoto-devel@lists.sourceforge.net ##
-## ------------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $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
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+       ac_retval=$ac_status
 fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
 
-} # ac_fn_c_check_header_mongrel
 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 libgphoto2 port access library $as_me 0.12.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by libgphoto2 port access library $as_me 0.12.2, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2039,8 +2022,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2075,7 +2062,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2110,11 +2097,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2125,8 +2114,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2150,7 +2139,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2158,14 +2147,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2173,15 +2162,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2189,8 +2178,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2204,63 +2193,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2270,19 +2244,435 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       \\/* | ?:\\/* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data;
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->datai = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_arrayni.number;
+  dynamic_array0 = argv00;
+  dynamic_arrayni.number - 1 = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
+	 || dynamic_arrayni.number - 1 != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int100),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+gt_needs="$gt_needs "
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.rpath config.guess config.sub ltmain.sh ar-lib compile missing install-sh"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/auto-aux"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2293,12 +2683,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -2307,24 +2697,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2334,11 +2724,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2352,41 +2743,16 @@
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_aux_dir=
-for ac_dir in auto-aux "$srcdir"/auto-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in auto-aux \"$srcdir\"/auto-aux" "$LINENO" 5
-fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+am__api_version='1.16'
 
 
-am__api_version='1.15'
 
-# Find a good install program.  We prefer a C program (faster),
+  # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -2400,20 +2766,25 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /cC/* | \
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
@@ -2423,13 +2794,13 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
@@ -2437,12 +2808,12 @@
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
@@ -2458,7 +2829,7 @@
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
+  if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -2468,8 +2839,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2479,8 +2850,8 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2534,8 +2905,8 @@
    as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
@@ -2554,26 +2925,23 @@
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
 
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
-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
+
+  if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -2593,11 +2961,12 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -2605,11 +2974,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2620,11 +2993,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2633,11 +3006,12 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; 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_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -2645,11 +3019,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2660,11 +3038,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2672,8 +3050,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2685,25 +3063,31 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
@@ -2714,7 +3098,7 @@
 fi
 
   test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -2724,18 +3108,19 @@
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -2743,11 +3128,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2758,24 +3147,25 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -2791,12 +3181,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2810,7 +3200,8 @@
 rmdir .tst 2>/dev/null
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
   enableval=$enable_silent_rules;
 fi
 
@@ -2820,12 +3211,13 @@
     *) AM_DEFAULT_VERBOSITY=1;;
 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))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -2837,8 +3229,8 @@
   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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$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)'
@@ -2870,17 +3262,13 @@
 
 # Define the identity of the package.
  PACKAGE='libgphoto2_port'
- VERSION='0.12.0'
+ VERSION='0.12.2'
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
+printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -2900,8 +3288,8 @@
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -2920,6 +3308,20 @@
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -2952,7 +3354,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -2964,17 +3366,10 @@
 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
-
-
-# Use the silent-rules feature when possible.
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
   enableval=$enable_silent_rules;
 fi
 
@@ -2984,12 +3379,13 @@
     *) AM_DEFAULT_VERBOSITY=1;;
 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))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -3001,8 +3397,8 @@
   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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$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)'
@@ -3013,11 +3409,23 @@
 AM_BACKSLASH='\'
 
 
-LIBGPHOTO2_PORT_AGE=0
+
+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
+
+
+
+
+
+
+LIBGPHOTO2_PORT_AGE=2
 
 LIBGPHOTO2_PORT_REVISION=0
 
-LIBGPHOTO2_PORT_CURRENT=12
+LIBGPHOTO2_PORT_CURRENT=14
 
 LIBGPHOTO2_PORT_CURRENT_MIN=`expr $LIBGPHOTO2_PORT_CURRENT - $LIBGPHOTO2_PORT_AGE`
 
@@ -3025,6 +3433,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3033,11 +3450,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3045,11 +3463,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3060,11 +3482,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3073,11 +3495,12 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; 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_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3085,11 +3508,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3100,11 +3527,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3112,8 +3539,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3126,11 +3553,12 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3138,11 +3566,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3153,11 +3585,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3166,11 +3598,12 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3179,15 +3612,19 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3203,18 +3640,18 @@
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3225,11 +3662,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3237,11 +3675,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3252,11 +3694,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3269,11 +3711,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3281,11 +3724,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3296,11 +3743,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3312,8 +3759,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3321,25 +3768,129 @@
 fi
 
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3349,7 +3900,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3357,7 +3908,7 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3369,9 +3920,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3392,11 +3943,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3413,7 +3965,7 @@
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
@@ -3429,44 +3981,46 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3480,15 +4034,15 @@
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3497,7 +4051,7 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -3509,8 +4063,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3518,10 +4072,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3529,39 +4083,40 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3575,11 +4130,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3588,31 +4144,32 @@
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -3622,29 +4179,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -3653,57 +4214,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -3718,94 +4282,144 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0  ||  f (e, argv, 1) != argv1;
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -3814,21 +4428,23 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=c
+
+  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3856,8 +4472,8 @@
   rm -f core conftest*
   unset am_i
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -3876,48 +4492,49 @@
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 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
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf "%s\n" "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test ${enable_dependency_tracking+y}
+then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -3938,11 +4555,12 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   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
@@ -4049,8 +4667,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4069,40 +4687,36 @@
 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4114,10 +4728,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4127,7 +4742,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4139,29 +4755,24 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4173,10 +4784,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4186,11 +4798,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -4202,18 +4815,94 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
 
-if test -n "$ac_tool_prefix"; then
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
+
+  if test -n "$ac_tool_prefix"; then
   for ac_prog in ar lib "link -lib"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -4221,11 +4910,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4236,11 +4929,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4253,11 +4946,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -4265,11 +4959,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4280,11 +4978,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4296,8 +4994,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -4306,11 +5004,12 @@
 
 : ${AR=ar}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
-if ${am_cv_ar_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+printf %s "checking the archiver ($AR) interface... " >&6; }
+if test ${am_cv_ar_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4322,12 +5021,13 @@
 /* end confdefs.h.  */
 int some_variable = 0;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test "$ac_status" -eq 0; then
         am_cv_ar_interface=ar
@@ -4336,7 +5036,7 @@
         { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         if test "$ac_status" -eq 0; then
           am_cv_ar_interface=lib
@@ -4347,7 +5047,7 @@
       rm -f conftest.lib libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4355,8 +5055,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-$as_echo "$am_cv_ar_interface" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf "%s\n" "$am_cv_ar_interface" >&6; }
 
 case $am_cv_ar_interface in
 ar)
@@ -4377,59 +5077,56 @@
 
 
 
-SED=${SED-sed}
 
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=no
-fi
+case `pwd` in
+  *\ * | *\	*)
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
 
 
 
+macro_version='2.4.7'
+macro_revision='2.4.7'
 
 
 
 
 
 
-# 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
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+
+  # 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
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  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
+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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -4448,21 +5145,22 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 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
+  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
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -4481,338 +5179,6 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; 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_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $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
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; 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_ac_ct_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $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
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $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
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; 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_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $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
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $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
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $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
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-enable_dlopen=yes
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.6'
-macro_revision='2.4.6'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 sed_quote_subst='s/$"`$\\$/\\\1/g'
@@ -4834,8 +5200,8 @@
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -4861,12 +5227,12 @@
 }
 
 case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
+  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf "%s\n" "printf" >&6; } ;;
+  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf "%s\n" "print -r" >&6; } ;;
+  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf "%s\n" "cat" >&6; } ;;
 esac
 
 
@@ -4882,11 +5248,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -4900,10 +5267,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -4912,13 +5284,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4946,8 +5318,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4964,11 +5336,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -4976,10 +5349,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -4988,13 +5366,13 @@
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5022,16 +5400,17 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
@@ -5042,10 +5421,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -5054,13 +5438,13 @@
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5089,16 +5473,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+printf %s "checking for fgrep... " >&6; }
+if test ${ac_cv_path_FGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
@@ -5109,10 +5494,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in fgrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
@@ -5121,13 +5511,13 @@
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
+    printf "%s\n" 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5156,8 +5546,8 @@
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf "%s\n" "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
@@ -5182,17 +5572,18 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return, which upsets mingw
@@ -5221,15 +5612,16 @@
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -5258,18 +5650,19 @@
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -5280,8 +5673,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -5292,11 +5685,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test ${lt_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM=$NM
@@ -5321,13 +5715,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -5346,8 +5740,8 @@
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf "%s\n" "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -5360,11 +5754,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
@@ -5372,11 +5767,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5387,11 +5786,11 @@
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf "%s\n" "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5404,11 +5803,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
@@ -5416,11 +5816,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5431,11 +5835,11 @@
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5447,15 +5851,15 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
   fi
 fi
 
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -5476,11 +5880,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+printf %s "checking the name lister ($NM) interface... " >&6; }
+if test ${lt_cv_nm_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
   (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
@@ -5496,26 +5901,27 @@
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf "%s\n" "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+printf %s "checking the maximum length of command line arguments... " >&6; }
+if test ${lt_cv_sys_max_cmd_len+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
     i=0
   teststring=ABCD
 
@@ -5557,7 +5963,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5600,7 +6006,7 @@
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -5642,11 +6048,11 @@
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -5690,11 +6096,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+printf %s "checking how to convert $build file names to $host format... " >&6; }
+if test ${lt_cv_to_host_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $host in
   *-*-mingw* )
     case $build in
@@ -5730,18 +6137,19 @@
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+printf %s "checking how to convert $build file names to toolchain format... " >&6; }
+if test ${lt_cv_to_tool_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
@@ -5757,22 +6165,23 @@
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+printf %s "checking for $LD option to reload object files... " >&6; }
+if test ${lt_cv_ld_reload_flag+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -5803,13 +6212,122 @@
 
 
 if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FILECMD"; then
+  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FILECMD="${ac_tool_prefix}file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FILECMD=$ac_cv_prog_FILECMD
+if test -n "$FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf "%s\n" "$FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FILECMD"; then
+  ac_ct_FILECMD=$FILECMD
+  # Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_FILECMD"; then
+  ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_FILECMD="file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
+if test -n "$ac_ct_FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
+printf "%s\n" "$ac_ct_FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_FILECMD" = x; then
+    FILECMD=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FILECMD=$ac_ct_FILECMD
+  fi
+else
+  FILECMD="$ac_cv_prog_FILECMD"
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
@@ -5817,11 +6335,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5832,11 +6354,11 @@
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf "%s\n" "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5845,11 +6367,12 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
@@ -5857,11 +6380,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5872,11 +6399,11 @@
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5884,8 +6411,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5901,11 +6428,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+printf %s "checking how to recognize dependent libraries... " >&6; }
+if test ${lt_cv_deplibs_check_method+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
@@ -5931,7 +6459,7 @@
 
 bsdi45*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -5965,14 +6493,14 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -5986,7 +6514,7 @@
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -6033,7 +6561,7 @@
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -6101,8 +6629,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -6146,11 +6674,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
@@ -6158,11 +6687,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6173,11 +6706,11 @@
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf "%s\n" "$DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6186,11 +6719,12 @@
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; 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_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
@@ -6198,11 +6732,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6213,11 +6751,11 @@
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -6225,8 +6763,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -6243,11 +6781,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+printf %s "checking how to associate runtime and link libraries... " >&6; }
+if test ${lt_cv_sharedlib_from_linklib_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
@@ -6270,8 +6809,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -6286,11 +6825,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; 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_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -6298,11 +6838,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6313,11 +6857,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6330,11 +6874,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -6342,11 +6887,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6357,11 +6906,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6373,8 +6922,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6382,42 +6931,60 @@
 fi
 
 : ${AR=ar}
-: ${AR_FLAGS=cru}
 
 
 
 
 
 
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
 
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+printf %s "checking for archiver @FILE support... " >&6; }
+if test ${lt_cv_ar_at_file+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ar_at_file=no
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   echo conftest.$ac_objext > conftest.lst
       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6425,7 +6992,7 @@
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -6434,11 +7001,11 @@
       rm -f conftest.* libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf "%s\n" "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -6455,11 +7022,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -6467,11 +7035,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6482,11 +7054,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6495,11 +7067,12 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; 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_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -6507,11 +7080,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6522,11 +7099,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6534,8 +7111,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6554,11 +7131,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -6566,11 +7144,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6581,11 +7163,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6594,11 +7176,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; 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_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -6606,11 +7189,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6621,11 +7208,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6633,8 +7220,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -6723,11 +7310,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+printf %s "checking command to parse $NM output from $compiler object... " >&6; }
+if test ${lt_cv_sys_global_symbol_pipe+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix.  What could be older than Ultrix?!! ;)
@@ -6782,7 +7370,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* $.*$$/  {\"\1\", (void *) 0},/p'"
@@ -6800,20 +7388,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/  {\"\1\", (void *) \&\1},/p'"\
@@ -6837,7 +7425,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -6855,9 +7443,9 @@
 "     s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -6879,14 +7467,14 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -6955,7 +7543,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -6990,11 +7578,11 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 fi
 
 # Response file support.
@@ -7040,13 +7628,14 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+printf %s "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
+if test ${with_sysroot+y}
+then :
   withval=$with_sysroot;
-else
+else $as_nop
   with_sysroot=no
 fi
 
@@ -7059,29 +7648,30 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf "%s\n" "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf "%s\n" "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+printf %s "checking for a working dd... " >&6; }
+if test ${ac_cv_path_lt_DD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 : ${lt_DD:=$DD}
@@ -7092,10 +7682,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in dd
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_lt_DD" || continue
 if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
   cmp -s conftest.i conftest.out \
@@ -7115,15 +7710,16 @@
 
 rm -f conftest.i conftest2.i conftest.out
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+printf %s "checking how to truncate binary pipes... " >&6; }
+if test ${lt_cv_truncate_bin+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 lt_cv_truncate_bin=
@@ -7134,8 +7730,8 @@
 rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf "%s\n" "$lt_cv_truncate_bin" >&6; }
 
 
 
@@ -7158,7 +7754,8 @@
 }
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
+if test ${enable_libtool_lock+y}
+then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -7174,9 +7771,9 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -7194,10 +7791,10 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -7209,7 +7806,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -7232,10 +7829,10 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -7243,7 +7840,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -7251,7 +7848,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -7273,16 +7870,16 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -7336,11 +7933,12 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+printf %s "checking whether the C compiler needs -belf... " >&6; }
+if test ${lt_cv_cc_needs_belf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7351,19 +7949,20 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_cc_needs_belf=yes
-else
+else $as_nop
   lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7372,8 +7971,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -7386,9 +7985,9 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -7423,11 +8022,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$MANIFEST_TOOL"; then
   ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 else
@@ -7435,11 +8035,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7450,11 +8054,11 @@
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf "%s\n" "$MANIFEST_TOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7463,11 +8067,12 @@
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; 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_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_MANIFEST_TOOL"; then
   ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
@@ -7475,11 +8080,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7490,11 +8099,11 @@
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -7502,8 +8111,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -7513,11 +8122,12 @@
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if test ${lt_cv_path_mainfest_tool+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_path_mainfest_tool=no
   echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
@@ -7527,8 +8137,8 @@
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
 if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -7543,11 +8153,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
@@ -7555,11 +8166,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7570,11 +8185,11 @@
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf "%s\n" "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7583,11 +8198,12 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; 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_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
@@ -7595,11 +8211,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7610,11 +8230,11 @@
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7622,8 +8242,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7635,11 +8255,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
@@ -7647,11 +8268,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7662,11 +8287,11 @@
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf "%s\n" "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7675,11 +8300,12 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; 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_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
@@ -7687,11 +8313,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7702,11 +8332,11 @@
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf "%s\n" "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7714,8 +8344,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7727,11 +8357,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; 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_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
@@ -7739,11 +8370,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7754,11 +8389,11 @@
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf "%s\n" "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7767,11 +8402,12 @@
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; 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_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
@@ -7779,11 +8415,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7794,11 +8434,11 @@
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf "%s\n" "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -7806,8 +8446,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -7819,11 +8459,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; 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_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
@@ -7831,11 +8472,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7846,11 +8491,11 @@
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf "%s\n" "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7859,11 +8504,12 @@
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; 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_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
@@ -7871,11 +8517,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7886,11 +8536,11 @@
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf "%s\n" "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -7898,8 +8548,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -7911,11 +8561,12 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
@@ -7923,11 +8574,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7938,11 +8593,11 @@
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf "%s\n" "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7951,11 +8606,12 @@
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; 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_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
@@ -7963,11 +8619,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7978,11 +8638,11 @@
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf "%s\n" "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -7990,8 +8650,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -8026,11 +8686,12 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+printf %s "checking for -single_module linker flag... " >&6; }
+if test ${lt_cv_apple_cc_single_mod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_apple_cc_single_mod=no
       if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
@@ -8059,14 +8720,15 @@
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+printf %s "checking for -exported_symbols_list linker flag... " >&6; }
+if test ${lt_cv_ld_exported_symbols_list+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
@@ -8075,39 +8737,41 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_ld_exported_symbols_list=yes
-else
+else $as_nop
   lt_cv_ld_exported_symbols_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+printf %s "checking for -force_load linker flag... " >&6; }
+if test ${lt_cv_ld_force_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -8127,24 +8791,19 @@
         rm -rf conftest.dSYM
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf "%s\n" "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.012)
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -8199,161 +8858,417 @@
     esac
 }
 
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+fi
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
+
+
+
+# Set options
+# Check whether --enable-static was given.
+if test ${enable_static+y}
+then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  enable_static=no
 fi
-rm -f conftest*
 
+
+
+
+
+
+
+enable_dlopen=yes
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf "%s\n" "$AS" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf "%s\n" "$ac_ct_AS" >&6; }
 else
-  ac_cv_header_stdc=no
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f conftest*
 
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf "%s\n" "$DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
-  ac_cv_header_stdc=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf "%s\n" "$OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
-done
+  ;;
+esac
 
+test -z "$AS" && AS=as
 
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
 
-fi
 
-done
 
 
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
 
 
 
-# Set options
 
 
 
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -8371,7 +9286,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   enable_shared=yes
 fi
 
@@ -8386,7 +9301,8 @@
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
+if test ${with_pic+y}
+then :
   withval=$with_pic; lt_p=${PACKAGE-default}
     case $withval in
     yes|no) pic_mode=$withval ;;
@@ -8403,7 +9319,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   pic_mode=default
 fi
 
@@ -8415,7 +9331,8 @@
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
+if test ${enable_fast_install+y}
+then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -8433,7 +9350,7 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else
+else $as_nop
   enable_fast_install=yes
 fi
 
@@ -8447,11 +9364,12 @@
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix5-9*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
 
 # Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
+if test ${with_aix_soname+y}
+then :
   withval=$with_aix_soname; case $withval in
     aix|svr4|both)
       ;;
@@ -8460,18 +9378,19 @@
       ;;
     esac
     lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  if test ${lt_cv_with_aix_soname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_with_aix_soname=aix
 fi
 
     with_aix_soname=$lt_cv_with_aix_soname
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf "%s\n" "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -8553,11 +9472,12 @@
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+printf %s "checking for objdir... " >&6; }
+if test ${lt_cv_objdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -8568,17 +9488,15 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf "%s\n" "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
+printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -8599,8 +9517,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -8624,11 +9542,12 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+printf %s "checking for ${ac_tool_prefix}file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -8677,11 +9596,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8690,11 +9609,12 @@
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+printf %s "checking for file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -8743,11 +9663,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8832,11 +9752,12 @@
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test ${lt_cv_prog_compiler_rtti_exceptions+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8867,8 +9788,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9109,7 +10030,7 @@
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
@@ -9225,26 +10146,28 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9275,8 +10198,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -9304,11 +10227,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9332,8 +10256,8 @@
    LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -9347,11 +10271,12 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -9394,19 +10319,20 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
@@ -9449,8 +10375,8 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9458,19 +10384,19 @@
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9482,8 +10408,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -9527,15 +10453,15 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -9587,7 +10513,7 @@
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -9699,6 +10625,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     interix3-9*)
@@ -9713,7 +10640,7 @@
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -9756,7 +10683,7 @@
 	  compiler_needs_object=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
@@ -9768,7 +10695,7 @@
 
         if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
@@ -9784,7 +10711,7 @@
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -9916,7 +10843,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -10038,21 +10965,23 @@
         if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -10067,7 +10996,7 @@
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
@@ -10091,21 +11020,23 @@
 	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
@@ -10120,7 +11051,7 @@
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
@@ -10183,12 +11114,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10229,7 +11160,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -10270,8 +11201,8 @@
     output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
@@ -10305,7 +11236,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -10371,11 +11302,12 @@
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+printf %s "checking if $CC understands -b... " >&6; }
+if test ${lt_cv_prog_compiler__b+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_prog_compiler__b=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
@@ -10399,8 +11331,8 @@
    LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -10440,28 +11372,30 @@
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if test ${lt_cv_irix_exported_symbol+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   save_LDFLAGS=$LDFLAGS
 	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   lt_cv_irix_exported_symbol=yes
-else
+else $as_nop
   lt_cv_irix_exported_symbol=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
            LDFLAGS=$save_LDFLAGS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -10553,6 +11487,7 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
       ;;
 
     osf3*)
@@ -10741,8 +11676,8 @@
     fi
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf "%s\n" "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10778,18 +11713,19 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+if test ${lt_cv_archive_cmds_need_lc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -10807,7 +11743,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -10821,8 +11757,8 @@
 	$RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -10981,8 +11917,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
   case $host_os in
@@ -11244,7 +12180,7 @@
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
@@ -11254,14 +12190,14 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11280,7 +12216,7 @@
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -11317,7 +12253,7 @@
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -11350,7 +12286,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -11543,9 +12479,10 @@
   shlibpath_overrides_runpath=no
 
   # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${lt_cv_shlibpath_overrides_runpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
@@ -11555,19 +12492,21 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+if ac_fn_c_try_link "$LINENO"
+then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
+then :
   lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
@@ -11799,8 +12738,8 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11921,8 +12860,8 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
@@ -11946,8 +12885,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf "%s\n" "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -11991,11 +12930,12 @@
 
   darwin*)
     # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12004,32 +12944,31 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
+else $as_nop
 
     lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
@@ -12049,14 +12988,16 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
+if test "x$ac_cv_func_shl_load" = xyes
+then :
   lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12065,41 +13006,42 @@
 /* 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 shl_load ();
 int
-main ()
+main (void)
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_shl_load=yes
-else
+else $as_nop
   ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
+else $as_nop
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+if test "x$ac_cv_func_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12108,37 +13050,37 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+printf %s "checking for dlopen in -lsvld... " >&6; }
+if test ${ac_cv_lib_svld_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12147,37 +13089,37 @@
 /* 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 dlopen ();
 int
-main ()
+main (void)
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_svld_dlopen=yes
-else
+else $as_nop
   ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes
+then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+printf %s "checking for dld_link in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_dld_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12186,30 +13128,29 @@
 /* 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 dld_link ();
 int
-main ()
+main (void)
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dld_dld_link=yes
-else
+else $as_nop
   ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes
+then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
@@ -12248,11 +13189,12 @@
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+printf %s "checking whether a program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
@@ -12331,7 +13273,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -12349,16 +13291,17 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf "%s\n" "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self_static+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
@@ -12437,7 +13380,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -12455,8 +13398,8 @@
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -12494,32 +13437,43 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+printf %s "checking whether stripping libraries is possible... " >&6; }
+if test -z "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&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: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      fi
+      ;;
+    *)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      ;;
+    esac
+  fi
 fi
 
 
@@ -12534,13 +13488,13 @@
 
 
   # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+printf %s "checking if libtool supports shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf "%s\n" "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
@@ -12564,15 +13518,15 @@
     fi
     ;;
   esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf "%s\n" "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf "%s\n" "$enable_static" >&6; }
 
 
 
@@ -12610,113 +13564,193 @@
 
 
 
+have_libltdl=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl" >&5
+printf %s "checking for libltdl... " >&6; }
+if test "x${LTDLINCL}${LIBLTDL}" != x
+then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: variables given explicitly" >&5
+printf "%s\n" "variables given explicitly" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LTDLINCL (given explicitly)" >&5
+printf %s "checking LTDLINCL (given explicitly)... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LTDLINCL}" >&5
+printf "%s\n" "${LTDLINCL}" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBLTDL (given explictly)" >&5
+printf %s "checking LIBLTDL (given explictly)... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LIBLTDL}" >&5
+printf "%s\n" "${LIBLTDL}" >&6; }
 
-if test "x${LTDLINCL}${LIBLTDL}" = "x"; then
-ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
-$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
-if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lltdl  $LIBS"
+  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
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LTDLINCL"
+LIBS="$LIBS $LIBLTDL"
 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 lt_dlinit ();
+#include <stdlib.h> /* for NULL */
+#include <ltdl.h>   /* for lt_* */
+
 int
-main ()
+main (void)
 {
-return lt_dlinit ();
+
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ltdl_lt_dlinit=yes
-else
-  ac_cv_lib_ltdl_lt_dlinit=no
+if ac_fn_c_try_link "$LINENO"
+then :
+      have_libltdl=yes
+
+else $as_nop
+      as_fn_error $? "
+${PACKAGE} requires libltdl (a part of libtool)
+
+Please make sure that the proper development package is installed
+(may be called libltdl-dev, libtool-ltdl-devel, libltdl, etc.) and if
+the autodetection fails, that the LTDLINCL and LIBLTDL variables are
+set properly on the configure command line.
+" "$LINENO" 5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
-$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; }
-if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then :
-  LTDLINCL=""
-LIBLTDL="-lltdl"
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+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
 
-$as_echo "#define HAVE_LTDL 1" >>confdefs.h
 
 
-else
-  as_fn_error $? "
-$PACKAGE requires the ltdl library, included with libtool
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetecting" >&5
+printf "%s\n" "autodetecting" >&6; }
+
+  if test "x$have_libltdl" = xno
+then :
+      LTDLINCL=""
+    LIBLTDL="-lltdl"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl at default location" >&5
+printf %s "checking for libltdl at default location... " >&6; }
+    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
 
-Please make sure that the proper development package is installed
-(libltdl-dev, libtool-ltdl-devel, etc.)
-" "$LINENO" 5
-fi
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LTDLINCL"
+LIBS="$LIBS $LIBLTDL"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-fi
+#include <stdlib.h> /* for NULL */
+#include <ltdl.h>   /* for lt_* */
 
+int
+main (void)
+{
 
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl flags" >&5
-$as_echo_n "checking for libltdl flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: set explicitly: ${LTDLINCL} ${LIBLTDL}" >&5
-$as_echo "set explicitly: ${LTDLINCL} ${LIBLTDL}" >&6; }
-fi
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+      have_libltdl=yes
 
+else $as_nop
+        { LTDLINCL=; unset LTDLINCL;}
+      { LIBLTDL=; unset LIBLTDL;}
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
 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
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that we can compile and link with libltdl" >&5
-$as_echo_n "checking that we can compile and link with libltdl... " >&6; }
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
+
+fi
+
+        for gp_prefix in /usr/local /usr/pkg `brew --prefix 2>/dev/null`; do
+    if test -d "$gp_prefix"
+then :
+        if test "x$have_libltdl" = xno
+then :
+          LTDLINCL="-I${gp_prefix}/include"
+        LIBLTDL="-L${gp_prefix}/lib -lltdl"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libltdl at $gp_prefix" >&5
+printf %s "checking for libltdl at $gp_prefix... " >&6; }
+        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
+
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $LTDLINCL"
 LIBS="$LIBS $LIBLTDL"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h> /* for NULL */
 #include <ltdl.h>   /* for lt_* */
 
 int
-main ()
+main (void)
 {
-int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-as_fn_error $? "cannot compile and link against libltdl
-${PACKAGE_TARNAME} requires libltdl (the libtool dl* library),
-but cannot compile and link against it.
-Aborting.
-" "$LINENO" 5
+if ac_fn_c_try_link "$LINENO"
+then :
+
+          have_libltdl=yes
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
+          break
+
+else $as_nop
+            { LTDLINCL=; unset LTDLINCL;}
+          { LIBLTDL=; unset LIBLTDL;}
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libltdl" >&5
+printf "%s\n" "$have_libltdl" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 CPPFLAGS="$saved_CPPFLAGS"
 LIBS="$saved_LIBS"
@@ -12728,6 +13762,38 @@
 
 
 
+fi
+
+fi
+  done
+
+  if test "x$have_libltdl" = xyes
+then :
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LTDLINCL (autodetected)" >&5
+printf %s "checking LTDLINCL (autodetected)... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LTDLINCL}" >&5
+printf "%s\n" "${LTDLINCL}" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBLTDL (autodetected)" >&5
+printf %s "checking LIBLTDL (autodetected)... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${LIBLTDL}" >&5
+printf "%s\n" "${LIBLTDL}" >&6; }
+
+else $as_nop
+      as_fn_error $? "
+${PACKAGE} requires libltdl (a part of libtool)
+
+Please make sure that the proper development package is installed
+(may be called libltdl-dev, libtool-ltdl-devel, libltdl, etc.) and if
+the autodetection fails, that the LTDLINCL and LIBLTDL variables are
+set properly on the configure command line.
+" "$LINENO" 5
+
+
+fi
+
+fi
+
+
 
 # report on compiler/libtool setup
 
@@ -12739,20 +13805,20 @@
 fi
 
 # make sure $() command substitution works
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX sh \$() command substitution" >&5
-$as_echo_n "checking for POSIX sh \$() command substitution... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX sh \$() command substitution" >&5
+printf %s "checking for POSIX sh \$() command substitution... " >&6; }
 if test "x$(pwd)" = "x`pwd`" && test "y$(echo "foobar")" = "y`echo foobar`" # ''''
 then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	uname=`uname 2>&1` # ''
 	uname_a=`uname -a 2>&1` # ''
 	as_fn_error $? "
 
-* POSIX sh \$() command substition does not work with this shell.
+* POSIX sh \$() command substitution does not work with this shell.
 *
 * You are running a very rare species of shell. Please report this
 * sighting to <${PACKAGE_BUGREPORT}>:
@@ -12826,9 +13892,7 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CC "$CC"
-_ACEOF
+printf "%s\n" "#define HAVE_CC \"$CC\"" >>confdefs.h
 
 
 AM_CPPFLAGS=""
@@ -12843,28 +13907,22 @@
 URL_GPHOTO_HOME="http://www.gphoto.org/"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_GPHOTO_HOME "http://www.gphoto.org/"
-_ACEOF
+printf "%s\n" "#define URL_GPHOTO_HOME \"http://www.gphoto.org/\"" >>confdefs.h
 
 
 
 URL_GPHOTO_PROJECT="https://github.com/gphoto"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_GPHOTO_PROJECT "https://github.com/gphoto"
-_ACEOF
+printf "%s\n" "#define URL_GPHOTO_PROJECT \"https://github.com/gphoto\"" >>confdefs.h
 
 
 
 
-URL_DIGICAM_LIST="http://www.teaser.fr/~hfiguiere/linux/digicam.html"
+URL_DIGICAM_LIST="http://gphoto.org/proj/libgphoto2/support.php"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_DIGICAM_LIST "http://www.teaser.fr/~hfiguiere/linux/digicam.html"
-_ACEOF
+printf "%s\n" "#define URL_DIGICAM_LIST \"http://gphoto.org/proj/libgphoto2/support.php\"" >>confdefs.h
 
 
 
@@ -12872,9 +13930,7 @@
 URL_JPHOTO_HOME="http://jphoto.sourceforge.net/"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_JPHOTO_HOME "http://jphoto.sourceforge.net/"
-_ACEOF
+printf "%s\n" "#define URL_JPHOTO_HOME \"http://jphoto.sourceforge.net/\"" >>confdefs.h
 
 
 
@@ -12882,9 +13938,7 @@
 URL_USB_MASSSTORAGE="http://www.linux-usb.org/USB-guide/x498.html"
 
 
-cat >>confdefs.h <<_ACEOF
-#define URL_USB_MASSSTORAGE "http://www.linux-usb.org/USB-guide/x498.html"
-_ACEOF
+printf "%s\n" "#define URL_USB_MASSSTORAGE \"http://www.linux-usb.org/USB-guide/x498.html\"" >>confdefs.h
 
 
 
@@ -12892,9 +13946,7 @@
 MAIL_GPHOTO_DEVEL="<gphoto-devel@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_DEVEL "<gphoto-devel@lists.sourceforge.net>"
-_ACEOF
+printf "%s\n" "#define MAIL_GPHOTO_DEVEL \"<gphoto-devel@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
@@ -12902,9 +13954,7 @@
 MAIL_GPHOTO_USER="<gphoto-user@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_USER "<gphoto-user@lists.sourceforge.net>"
-_ACEOF
+printf "%s\n" "#define MAIL_GPHOTO_USER \"<gphoto-user@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
@@ -12912,96 +13962,100 @@
 MAIL_GPHOTO_TRANSLATION="<gphoto-translation@lists.sourceforge.net>"
 
 
-cat >>confdefs.h <<_ACEOF
-#define MAIL_GPHOTO_TRANSLATION "<gphoto-translation@lists.sourceforge.net>"
-_ACEOF
-
-
+printf "%s\n" "#define MAIL_GPHOTO_TRANSLATION \"<gphoto-translation@lists.sourceforge.net>\"" >>confdefs.h
 
 
 
 
 
 
-GETTEXT_PACKAGE="${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}"
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
-sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = Lutz Mueller and others|"
-
-if test -n "$PACKAGE_BUGREPORT"; then
-   sed_mb="${PACKAGE_BUGREPORT}"
-else
-   as_fn_error $? "
-*** Your configure.{ac,in} is wrong.
-*** Either define PACKAGE_BUGREPORT (by using the 4-parameter AC INIT syntax)
-*** or give GP_GETTEXT_HACK the third parameter.
-***
-" "$LINENO" 5
-fi
-
-sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
-# Not so sure whether this hack is all *that* evil...
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for po/Makevars requiring hack" >&5
-$as_echo_n "checking for po/Makevars requiring hack... " >&6; }
-if test -f "${srcdir}/po/Makevars.template"; then
-   sed "$sed_cmds" < "${srcdir}/po/Makevars.template" > "${srcdir}/po/Makevars"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, done." >&5
-$as_echo "yes, done." >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW"
-
-
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
+AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\""'${localedir}'"\\\""
 
+GP_GETTEXT_SETUP_MK="gp-gettext-setup.mk"
+cat >${GP_GETTEXT_SETUP_MK} <<EOF
+
+# ${GP_GETTEXT_SETUP_MK} autogenerated by GP_GETTEXT_SETUP_INIT
+
+distclean-local: distclean-local-gp-gettext-setup
+.PHONY: distclean-local-gp-gettext-setup
+distclean-local-gp-gettext-setup:
+	-rm -f ${GP_GETTEXT_SETUP_MK}
+
+all-local: all-local-gp-gettext-setup
+.PHONY: all-local-gp-gettext-setup
+all-local-gp-gettext-setup:
+	@:
+EOF
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation text domain symbol" >&5
+printf %s "checking translation text domain symbol... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GETTEXT_PACKAGE_LIBGPHOTO2_PORT" >&5
+printf "%s\n" "GETTEXT_PACKAGE_LIBGPHOTO2_PORT" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation text domain value" >&5
+printf %s "checking translation text domain value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}" >&5
+printf "%s\n" "${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking translation subdirectory" >&5
+printf %s "checking translation subdirectory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: po" >&5
+printf "%s\n" "po" >&6; }
+
+printf "%s\n" "#define GETTEXT_PACKAGE_LIBGPHOTO2_PORT \"${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}\"" >>confdefs.h
+
+GETTEXT_PACKAGE_LIBGPHOTO2_PORT=${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}
+
+cat >>${GP_GETTEXT_SETUP_MK} <<EOF
+	@set -ex; \\
+	MAKEVARS_FILE="\$\$(test -f 'po/Makevars' || echo '\$(srcdir)/')po/Makevars"; \\
+	MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \\{0,\\}= \\{0,\\}//p' "\$\$MAKEVARS_FILE")"; \\
+	MAKE_TIME_DOMAIN="\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT)"; \\
+	echo "  MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \\
+	echo "  GETTEXT_PACKAGE_LIBGPHOTO2_PORT=\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT)"; \\
+	if test "x\$\$MAKEVARS_DOMAIN" = "x\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT)"; then \\
+	     echo "Good: Matching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT))"; \\
+	     true; \\
+	elif test "x\$\$USE_NLS" = xyes; then \\
+	     echo "Error: Mismatching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     false; \\
+	else \\
+	     echo "Warning: Mismatching gettext domain values (\$(GETTEXT_PACKAGE_LIBGPHOTO2_PORT) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     true; \\
+	fi
+EOF
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+printf %s "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
+if test ${enable_nls+y}
+then :
   enableval=$enable_nls; USE_NLS=$enableval
-else
+else $as_nop
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
+
 
 
 
+      GETTEXT_MACRO_VERSION=0.19
+
 
 
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -13020,11 +14074,12 @@
 
 # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGFMT" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
@@ -13036,7 +14091,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -13051,20 +14107,21 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf "%s\n" "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GMSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GMSGFMT in
   \\/* | ?:\\/*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
@@ -13074,11 +14131,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$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
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -13091,28 +14152,38 @@
 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; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf "%s\n" "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
+    case `$MSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -13131,11 +14202,12 @@
 
 # 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_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XGETTEXT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$XGETTEXT" in
   \\/* | ?:\\/*)
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
@@ -13147,7 +14219,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -13162,28 +14235,33 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf "%s\n" "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
     rm -f messages.po
 
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+    '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -13202,11 +14280,12 @@
 
 # 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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGMERGE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGMERGE" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
@@ -13218,7 +14297,8 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
             ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
             break 2
           fi
@@ -13232,39 +14312,22 @@
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf "%s\n" "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
+        test -n "$localedir" || localedir='${datadir}/locale'
 
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
 
-  ac_config_commands="$ac_config_commands default-1"
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
 
 
 
@@ -13284,31 +14347,33 @@
   prefix="$acl_save_prefix"
 
 
+
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -13318,12 +14383,12 @@
   esac
   case $ac_prog in
     # Accept absolute paths.
-    \\/* | A-Za-z:\\/*)
+    \\/* | ?:\\/*)
       re_direlt='/^/^/*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -13337,33 +14402,37 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${acl_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -13371,37 +14440,43 @@
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${acl_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+printf %s "checking for shared library run path origin... " >&6; }
+if test ${acl_cv_rpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
@@ -13410,19 +14485,22 @@
     acl_cv_rpath=done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf "%s\n" "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
   enableval=$enable_rpath; :
-else
+else $as_nop
   enable_rpath=yes
 fi
 
@@ -13430,6 +14508,77 @@
 
 
 
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+printf %s "checking for 64-bit host... " >&6; }
+if test ${gl_cv_solaris_64bit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1
+then :
+  gl_cv_solaris_64bit=yes
+else $as_nop
+  gl_cv_solaris_64bit=no
+fi
+rm -rf conftest*
+
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+printf "%s\n" "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
+
 
 
 
@@ -13448,7 +14597,8 @@
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
+if test ${with_libiconv_prefix+y}
+then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -13468,7 +14618,11 @@
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 
@@ -13477,6 +14631,8 @@
       LIBICONV=
   LTLIBICONV=
   INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -13494,7 +14650,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -13510,22 +14666,52 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
@@ -13541,21 +14727,44 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -13566,7 +14775,9 @@
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -13579,10 +14790,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -13614,7 +14825,7 @@
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -13631,8 +14842,18 @@
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -13642,7 +14863,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -13681,12 +14902,14 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -13783,21 +15006,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -13826,17 +15049,97 @@
 
 
 
-  { $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
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main (void)
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else $as_nop
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+printf %s "checking for CFLocaleCopyCurrent... " >&6; }
+if test ${gt_cv_func_CFLocaleCopyCurrent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main (void)
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else $as_nop
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -13845,45 +15148,73 @@
   LTLIBINTL=
   POSUB=
 
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
 
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array 2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1;
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
 
-
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if ${gt_cv_func_gnugettext1_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+printf %s "checking for GNU gettext in libc... " >&6; }
+if eval test \${$gt_func_gnugettext_libc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libc=yes
-else
-  gt_cv_func_gnugettext1_libc=no
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$gt_func_gnugettext_libc=yes"
+else $as_nop
+  eval "$gt_func_gnugettext_libc=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5
-$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
 
 
@@ -13914,72 +15245,224 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes
+then :
+
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\342\202\254"; /* EURO SIGN */
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\263";
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304";
+        static char buf2 = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf1 != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf50;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  am_cv_func_iconv_works=yes
+else $as_nop
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -13991,6 +15474,11 @@
 
 
 
+
+
+
+
+
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -14006,7 +15494,8 @@
 
 
 # Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
+if test ${with_libintl_prefix+y}
+then :
   withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -14026,7 +15515,11 @@
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 
@@ -14035,6 +15528,8 @@
       LIBINTL=
   LTLIBINTL=
   INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -14052,7 +15547,7 @@
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -14068,22 +15563,52 @@
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
@@ -14099,21 +15624,44 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -14124,7 +15672,9 @@
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -14137,10 +15687,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -14172,7 +15722,7 @@
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -14189,8 +15739,18 @@
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -14200,7 +15760,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -14239,12 +15799,14 @@
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -14341,21 +15903,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -14367,78 +15929,97 @@
     done
   fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if ${gt_cv_func_gnugettext1_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+
+
+
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+printf %s "checking for GNU gettext in libintl... " >&6; }
+if eval test \${$gt_func_gnugettext_libintl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_gnugettext1_libintl=yes
-else
-  gt_cv_func_gnugettext1_libintl=no
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$gt_func_gnugettext_libintl=yes"
+else $as_nop
+  eval "$gt_func_gnugettext_libintl=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (const char *);
+
 int
-main ()
+main (void)
 {
+
 bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5
-$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
         fi
 
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -14450,25 +16031,33 @@
 
 
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+printf %s "checking whether to use NLS... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -14476,18 +16065,18 @@
     else
       gt_source="included intl directory"
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf "%s\n" "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+printf %s "checking how to link with libintl... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf "%s\n" "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -14514,10 +16103,10 @@
       fi
 
 
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -14537,287 +16126,6 @@
 
 
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$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
-
-  # 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 as_fn_executable_p "$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  \\/* | ?:\\/*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$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
-
-    rm -f messages.po
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# 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.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
-
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
-
-  ac_config_commands="$ac_config_commands default-2"
-
-
-
-
-
-
 
           am_save_CPPFLAGS="$CPPFLAGS"
 
@@ -14844,72 +16152,224 @@
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes
+then :
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+         case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\342\202\254"; /* EURO SIGN */
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input = "\263";
+        char buf10;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304";
+        static char buf2 = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf1 != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf50;
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  am_cv_func_iconv_works=yes
+else $as_nop
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -14919,11 +16379,12 @@
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
-$as_echo_n "checking for iconv declaration... " >&6; }
-    if ${am_cv_proto_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+printf %s "checking for iconv declaration... " >&6; }
+    if test ${am_cv_proto_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14934,47 +16395,42 @@
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   am_cv_proto_iconv_arg1=""
-else
+else $as_nop
   am_cv_proto_iconv_arg1="const"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-$as_echo "${ac_t:-
-         }$am_cv_proto_iconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
+         $am_cv_proto_iconv" >&5
+printf "%s\n" "
+         $am_cv_proto_iconv" >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
-
-  fi
+printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h
 
 
+  fi
 
 
-if test "x${BUILD_INCLUDED_LIBINTL}" = "xyes"; then
-   AM_CFLAGS="${AM_CFLAGS} -I\$(top_srcdir)/intl"
-fi
 
 gp_config_msg_len="$(expr "Use translations" : '.*')"
 if test "$gp_config_msg_len" -ge "$gp_config_len"; then
@@ -14985,26 +16441,10 @@
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${USE_NLS}
 "
 
-if test "x$USE_NLS" = "xyes" && test "${BUILD_INCLUDED_LIBINTL}"; then
-
-gp_config_msg_len="$(expr "Use included libintl" : '.*')"
-if test "$gp_config_msg_len" -ge "$gp_config_len"; then
-	gp_config_msg_lhs="$(expr "Use included libintl" : "$.\{0,${gp_config_len3}\}$")..:"
-else
-	gp_config_msg_lhs="$(expr "Use included libintl:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
-fi
-gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} ${BUILD_INCLUDED_LIBINTL}
-"
-
-fi
-
-
-localedir="\$(datadir)/locale"
-
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
 
 ac_fn_c_check_func "$LINENO" "gettext" "ac_cv_func_gettext"
-if test "x$ac_cv_func_gettext" = xyes; then :
+if test "x$ac_cv_func_gettext" = xyes
+then :
   gettext_without_libintl=true
 fi
 
@@ -15012,12 +16452,13 @@
 # if gettext() doesn't require linking against libintl,
 # we don't have to check for gettext in libintl. Otherwise
 # we may even require libintl.
-if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
-$as_echo_n "checking for gettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_gettext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
+printf %s "checking for gettext in -lintl... " >&6; }
+if test ${ac_cv_lib_intl_gettext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15026,30 +16467,29 @@
 /* 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 gettext ();
 int
-main ()
+main (void)
 {
 return gettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_intl_gettext=yes
-else
+else $as_nop
   ac_cv_lib_intl_gettext=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
-$as_echo "$ac_cv_lib_intl_gettext" >&6; }
-if test "x$ac_cv_lib_intl_gettext" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
+printf "%s\n" "$ac_cv_lib_intl_gettext" >&6; }
+if test "x$ac_cv_lib_intl_gettext" = xyes
+then :
   INTLLIBS="$INTLLIBS -lintl"
 fi
 
@@ -15058,19 +16498,20 @@
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
 
 int
-main ()
+main (void)
 {
 if ((DIR *) 0)
 return 0;
@@ -15078,19 +16519,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$as_ac_Header=yes"
-else
+else $as_nop
   eval "$as_ac_Header=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -15099,11 +16542,12 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15111,56 +16555,59 @@
 /* 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 opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' dir; do
+for ac_lib in '' dir
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15168,191 +16615,160 @@
 /* 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 opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' x; do
+for ac_lib in '' x
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  ac_cv_path_EGREP=$EGREP
 fi
 
+   fi
 fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+printf %s "checking for inline... " >&6; }
+if test ${ac_cv_c_inline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
+static $ac_kw foo_t static_foo (void) {return 0; }
+$ac_kw foo_t foo (void) {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf "%s\n" "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -15369,16 +16785,17 @@
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 #ifndef __cplusplus
@@ -15391,7 +16808,7 @@
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
+  /* IBM XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -15419,7 +16836,7 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap3; } bx;
     struct s *b = &bx; b->j = 5;
@@ -15435,53 +16852,201 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_const=yes
-else
+else $as_nop
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
+printf "%s\n" "#define const /**/" >>confdefs.h
 
 fi
 
 
-for ac_header in stdlib.h unistd.h stdio.h fcntl.h errno.h sys/time.h	\
-	sys/param.h sys/select.h termios.h sgetty.h ttold.h ioctl-types.h	\
-	fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h unistd.h	\
-	endian.h byteswap.h asm/io.h mntent.h sys/mntent.h sys/mnttab.h \
-	scsi/sg.h limits.h sys/file.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
 
+fi
+ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h
 
-ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
-if test "x$ac_cv_header_regex_h" = xyes; then :
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
 
-$as_echo "#define HAVE_REGEX 1" >>confdefs.h
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_select_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
 
+fi
+ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_termios_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lregex" >&5
-$as_echo_n "checking for regexec in -lregex... " >&6; }
-if ${ac_cv_lib_regex_regexec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+fi
+ac_fn_c_check_header_compile "$LINENO" "sgetty.h" "ac_cv_header_sgetty_h" "$ac_includes_default"
+if test "x$ac_cv_header_sgetty_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SGETTY_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "ttold.h" "ac_cv_header_ttold_h" "$ac_includes_default"
+if test "x$ac_cv_header_ttold_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TTOLD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "ioctl-types.h" "ac_cv_header_ioctl_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_ioctl_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_IOCTL_TYPES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sgtty.h" "ac_cv_header_sgtty_h" "$ac_includes_default"
+if test "x$ac_cv_header_sgtty_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SGTTY_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default"
+if test "x$ac_cv_header_termio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERMIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_endian_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ENDIAN_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+if test "x$ac_cv_header_byteswap_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_BYTESWAP_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "asm/io.h" "ac_cv_header_asm_io_h" "$ac_includes_default"
+if test "x$ac_cv_header_asm_io_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASM_IO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
+if test "x$ac_cv_header_mntent_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MNTENT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mntent.h" "ac_cv_header_sys_mntent_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mntent_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MNTENT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/mnttab.h" "ac_cv_header_sys_mnttab_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mnttab_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MNTTAB_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "scsi/sg.h" "ac_cv_header_scsi_sg_h" "$ac_includes_default"
+if test "x$ac_cv_header_scsi_sg_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SCSI_SG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
+if test "x$ac_cv_header_limits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_file_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_header_compile "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
+if test "x$ac_cv_header_regex_h" = xyes
+then :
+
+printf "%s\n" "#define HAVE_REGEX 1" >>confdefs.h
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for regexec in -lregex" >&5
+printf %s "checking for regexec in -lregex... " >&6; }
+if test ${ac_cv_lib_regex_regexec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lregex  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15490,79 +17055,88 @@
 /* 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 regexec ();
 int
-main ()
+main (void)
 {
 return regexec ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_regex_regexec=yes
-else
+else $as_nop
   ac_cv_lib_regex_regexec=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_regex_regexec" >&5
-$as_echo "$ac_cv_lib_regex_regexec" >&6; }
-if test "x$ac_cv_lib_regex_regexec" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBREGEX 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_regex_regexec" >&5
+printf "%s\n" "$ac_cv_lib_regex_regexec" >&6; }
+if test "x$ac_cv_lib_regex_regexec" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBREGEX 1" >>confdefs.h
 
   LIBS="-lregex $LIBS"
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm .symver support" >&5
-$as_echo_n "checking for asm .symver support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm .symver support" >&5
+printf %s "checking for asm .symver support... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+    void f1(void);
+    void f1() {}
+    void f2(void);
+    void f2() {}
+    asm(".symver f1, f@VER1");
+    asm(".symver f2, f@@VER2");
+
 int
-main ()
+main (void)
 {
 
-		int f1() { }
-		int f2() { }
-		asm(".symver f1, f@VER1");
-		asm(".symver f2, f@@VER2");
-		int main(int argc, char **argv) { }
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  have_asm_symver=yes
 
+printf "%s\n" "#define HAVE_ASM_SYMVERS 1" >>confdefs.h
 
-$as_echo "#define HAVE_ASM_SYMVERS 1" >>confdefs.h
 
-	VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2_port.ver"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-else
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  have_asm_symver=no
 
-	VERSIONMAPLDFLAGS=""
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+ if test "x$have_asm_symver" = xyes; then
+  HAVE_ASM_SYMVER_TRUE=
+  HAVE_ASM_SYMVER_FALSE='#'
+else
+  HAVE_ASM_SYMVER_TRUE='#'
+  HAVE_ASM_SYMVER_FALSE=
+fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mnt_mountp in struct mnttab" >&5
-$as_echo_n "checking for mnt_mountp in struct mnttab... " >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mnt_mountp in struct mnttab" >&5
+printf %s "checking for mnt_mountp in struct mnttab... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15572,7 +17146,7 @@
 #endif
 
 int
-main ()
+main (void)
 {
 
 struct mnttab mt;
@@ -15582,111 +17156,140 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
+printf "%s\n" "#define HAVE_MNTTAB 1" >>confdefs.h
 
-$as_echo "#define HAVE_MNTTAB 1" >>confdefs.h
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else $as_nop
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-else
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ac_fn_c_check_func "$LINENO" "setmntent" "ac_cv_func_setmntent"
+if test "x$ac_cv_func_setmntent" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETMNTENT 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_fn_c_check_func "$LINENO" "endmntent" "ac_cv_func_endmntent"
+if test "x$ac_cv_func_endmntent" = xyes
+then :
+  printf "%s\n" "#define HAVE_ENDMNTENT 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
 
-for ac_func in setmntent endmntent strerror snprintf vsnprintf flock
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
+if test "x$ac_cv_func_flock" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
 
 fi
-done
 
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termios.h>
 int
-main ()
+main (void)
 {
 int foo = TIOCM_RTS;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_RTS_IOCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RTS_IOCTL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termio.h>
 int
-main ()
+main (void)
 {
 int foo = TIOCM_RTS;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_RTS_IOCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RTS_IOCTL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ioctl-types.h>
 int
-main ()
+main (void)
 {
 int foo = TIOCM_RTS;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_RTS_IOCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RTS_IOCTL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/ioctl.h>
 int
-main ()
+main (void)
 {
 int foo = TIOCM_RTS;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define HAVE_RTS_IOCTL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RTS_IOCTL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 # Check for va_copy()
-ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdarg_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = xyes
+then :
 
-else
+else $as_nop
 
 	as_fn_error $? "
 Building $PACKAGE_NAME requires <stdarg.h>.
@@ -15694,7 +17297,6 @@
 
 fi
 
-
 have_va_copy=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15702,7 +17304,7 @@
 	#include <stdarg.h>
 
 int
-main ()
+main (void)
 {
 
 	va_list a,b;
@@ -15712,11 +17314,12 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 	have_va_copy="va_copy"
 
-else
+else $as_nop
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15724,7 +17327,7 @@
 		#include <stdarg.h>
 
 int
-main ()
+main (void)
 {
 
 		va_list a,b;
@@ -15734,132 +17337,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 		have_va_copy="__va_copy"
 
-$as_echo "#define va_copy __va_copy" >>confdefs.h
+printf "%s\n" "#define va_copy __va_copy" >>confdefs.h
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy() or replacement" >&5
-$as_echo_n "checking for va_copy() or replacement... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_va_copy" >&5
-$as_echo "$have_va_copy" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy() or replacement" >&5
+printf %s "checking for va_copy() or replacement... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_va_copy" >&5
+printf "%s\n" "$have_va_copy" >&6; }
 if test "x$have_va_copy" != "xno"; then
 
-$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h
 
 fi
 
 
 
-#
-# GP_PKG_CONFIG
-#
-
-export PKG_CONFIG
-
-export PKG_CONFIG_PATH
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PKG_CONFIG_PATH" >&5
-$as_echo_n "checking PKG_CONFIG_PATH... " >&6; }
-if test "x${PKG_CONFIG_PATH}" = "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: empty" >&5
-$as_echo "empty" >&6; }
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PKG_CONFIG_PATH}" >&5
-$as_echo "${PKG_CONFIG_PATH}" >&6; }
-fi
-
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  \\/* | ?:\\/*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="false"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$PKG_CONFIG" = "false"; then
-as_fn_error $? "
-*** Build requires pkg-config
-***
-*** Possible solutions:
-***   - set PKG_CONFIG to where your pkg-config is located
-***   - set PATH to include the directory where pkg-config is installed
-***   - get it from http://freedesktop.org/software/pkgconfig/ and install it
-" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dynamic library extension" >&5
-$as_echo_n "checking for dynamic library extension... " >&6; }
-soext=""
-case "$host" in
-	*linux*)	soext=".so" ;;
-	*sunos*)	soext=".so" ;;
-	*solaris*)	soext=".so" ;;
-	*bsd*)		soext=".so" ;;
-	*darwin*)	soext=".dylib" ;;
-	*w32*)		soext=".dll" ;;
-esac
-case "$host_os" in
-	gnu*)		soext=".so" ;;
-esac
-if test "x$soext" = "x"; then
-	soext=".so"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
-$as_echo "${soext}" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-Host system \"${host}\" not recognized, defaulting to \"${soext}\".
-" >&5
-$as_echo "$as_me: WARNING:
-Host system \"${host}\" not recognized, defaulting to \"${soext}\".
-" >&2;}
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
-$as_echo "${soext}" >&6; }
-fi
-
-
 
 
 
@@ -15870,11 +17374,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -15884,11 +17389,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -15900,11 +17409,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -15913,11 +17422,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -15927,11 +17437,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -15943,11 +17457,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -15955,8 +17469,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -15968,17 +17482,46 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dynamic library extension" >&5
+printf %s "checking for dynamic library extension... " >&6; }
+soext=""
+case "$host" in
+	*linux*)	soext=".so" ;;
+	*sunos*)	soext=".so" ;;
+	*solaris*)	soext=".so" ;;
+	*bsd*)		soext=".so" ;;
+	*darwin*)	soext=".dylib" ;;
+	*w32*)		soext=".dll" ;;
+esac
+case "$host_os" in
+	gnu*)		soext=".so" ;;
+esac
+if test "x$soext" = "x"; then
+	soext=".so"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
+printf "%s\n" "${soext}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
+Host system \"${host}\" not recognized, defaulting to \"${soext}\".
+" >&5
+printf "%s\n" "$as_me: WARNING:
+Host system \"${host}\" not recognized, defaulting to \"${soext}\".
+" >&2;}
+else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${soext}" >&5
+printf "%s\n" "${soext}" >&6; }
+fi
+
 
 # ----------------------------------------------------------------------
 # GP_CHECK_LIBRARY(LIBEXIF,libexif,>= 0.6.13,
@@ -15989,8 +17532,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif to use" >&5
-$as_echo_n "checking for libexif to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif to use" >&5
+printf %s "checking for libexif to use... " >&6; }
 REQUIREMENTS_FOR_LIBEXIF="libexif >= 0.6.13"
 userdef_LIBEXIF=no
 have_LIBEXIF=no
@@ -15999,7 +17542,8 @@
 				try_LIBEXIF=auto
 
 # Check whether --with-libexif was given.
-if test "${with_libexif+set}" = set; then :
+if test ${with_libexif+y}
+then :
   withval=$with_libexif; try_LIBEXIF="$withval"
 fi
 
@@ -16007,8 +17551,8 @@
               REQUIREMENTS_FOR_LIBEXIF=
 	fi
 	if test "x${try_LIBEXIF}" = "xauto"; then try_LIBEXIF=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBEXIF}" >&5
-$as_echo "${try_LIBEXIF}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBEXIF}" >&5
+printf "%s\n" "${try_LIBEXIF}" >&6; }
 		if test "x${try_LIBEXIF}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -16016,17 +17560,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif >= 0.6.13" >&5
-$as_echo_n "checking for libexif >= 0.6.13... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF" >&5
+printf %s "checking for LIBEXIF... " >&6; }
 
 if test -n "$LIBEXIF_CFLAGS"; then
     pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexif >= 0.6.13") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.13" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -16040,10 +17584,10 @@
     pkg_cv_LIBEXIF_LIBS="$LIBEXIF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= 0.6.13\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexif >= 0.6.13") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.13" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -16057,8 +17601,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -16075,31 +17619,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
 	LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBEXIF=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBEXIF}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif config program" >&5
-$as_echo_n "checking libexif config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif config program" >&5
+printf %s "checking libexif config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy none; 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_LIBEXIF_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBEXIF_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBEXIF_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBEXIF_CONFIG_PROG="$LIBEXIF_CONFIG_PROG" # Let the user override the test with a path.
@@ -16109,11 +17654,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBEXIF_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBEXIF_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16125,19 +17674,19 @@
 fi
 LIBEXIF_CONFIG_PROG=$ac_cv_path_LIBEXIF_CONFIG_PROG
 if test -n "$LIBEXIF_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBEXIF_CONFIG_PROG" >&5
-$as_echo "$LIBEXIF_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBEXIF_CONFIG_PROG" >&5
+printf "%s\n" "$LIBEXIF_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBEXIF_CONFIG_PROG}" &&
 				test "${LIBEXIF_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif version according to none" >&5
-$as_echo_n "checking for libexif version according to none... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif version according to none" >&5
+printf %s "checking for libexif version according to none... " >&6; }
 								_LIBEXIF_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBEXIF_REQ_1="0"
@@ -16150,8 +17699,8 @@
 				_LIBEXIF_VER_2="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBEXIF_VER_3="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBEXIF_VER_4="$(echo "${_LIBEXIF_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBEXIF_VERSION}" >&5
-$as_echo "${_LIBEXIF_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBEXIF_VERSION}" >&5
+printf "%s\n" "${_LIBEXIF_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBEXIF_VER_1}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_1}"; then _tmp=true;
 				elif test "${_LIBEXIF_VER_2}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_2}"; then _tmp=true;
@@ -16159,28 +17708,28 @@
 				elif test "x${_LIBEXIF_VER_4}" = "x" && test "x${_LIBEXIF_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBEXIF_VER_4}" "${_LIBEXIF_COMPN}" "${_LIBEXIF_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libexif version is matching requirement >= 0.6.13" >&5
-$as_echo_n "checking if libexif version is matching requirement >= 0.6.13... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libexif version is matching requirement >= 0.6.13" >&5
+printf %s "checking if libexif version is matching requirement >= 0.6.13... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement libexif >= 0.6.13 not met. Found: ${_LIBEXIF_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif parameters from none" >&5
-$as_echo_n "checking for libexif parameters from none... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif parameters from none" >&5
+printf %s "checking for libexif parameters from none... " >&6; }
 				LIBEXIF_LIBS="$(${LIBEXIF_CONFIG_PROG} --libs || echo "*error*")"
 				LIBEXIF_CFLAGS="$(${LIBEXIF_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBEXIF_LIBS}" = "*error*" ||
 					test "x${LIBEXIF_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBEXIF=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -16190,32 +17739,32 @@
 	else
 		# We've been given a prefix to look in for library libexif.
 		# We start looking for libexif.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif.la file in ${try_LIBEXIF}" >&5
-$as_echo_n "checking for libexif.la file in ${try_LIBEXIF}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexif.la file in ${try_LIBEXIF}" >&5
+printf %s "checking for libexif.la file in ${try_LIBEXIF}... " >&6; }
 		if test -f "${try_LIBEXIF}/lib/libexif.la"; then
 			LIBEXIF_LIBS="${try_LIBEXIF}/lib/libexif.la"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
-$as_echo "libtool file $LIBEXIF_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBEXIF_LIBS (good)" >&6; }
 			have_LIBEXIF=yes
 		elif test -f "${try_LIBEXIF}/lib64/libexif.la"; then # HACK
 			LIBEXIF_LIBS="${try_LIBEXIF}/lib64/libexif.la"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
-$as_echo "libtool file $LIBEXIF_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBEXIF_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBEXIF_LIBS (good)" >&6; }
 			have_LIBEXIF=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBEXIF" >&5
-$as_echo "wild guess that something is in $try_LIBEXIF" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBEXIF" >&5
+printf "%s\n" "wild guess that something is in $try_LIBEXIF" >&6; }
 			LIBEXIF_LIBS="-L${try_LIBEXIF}/lib -l$(echo "libexif" | sed 's/^lib//')"
 			LIBEXIF_CFLAGS="-I${try_LIBEXIF}/include"
 			have_LIBEXIF=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file libexif.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file libexif.la could not be found.
 *   We may be linking against the WRONG library.
@@ -16223,13 +17772,13 @@
 		fi
 	fi
 elif test "x${LIBEXIF_LIBS}" != "x" && test "x${LIBEXIF_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBEXIF=yes
 	have_LIBEXIF=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -16242,8 +17791,8 @@
 if test "x${have_LIBEXIF}" = "xyes"; then
 # ACTION-IF-FOUND
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we use a version of libexif with ExifData.ifd" >&5
-$as_echo_n "checking whether we use a version of libexif with ExifData.ifd... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we use a version of libexif with ExifData.ifd" >&5
+printf %s "checking whether we use a version of libexif with ExifData.ifd... " >&6; }
 # Check for libexif version
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$LIBEXIF_CFLAGS"
@@ -16257,40 +17806,39 @@
 #include <libexif/exif-content.h>
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
+printf "%s\n" "#define HAVE_LIBEXIF_IFD 1" >>confdefs.h
 
-$as_echo "#define HAVE_LIBEXIF_IFD 1" >>confdefs.h
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CPPFLAGS="$CPPFLAGS_save"
 
 fi
 if test "x${have_LIBEXIF}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBEXIF_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default"
-if test "x$ac_cv_header_libexif_exif_data_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default"
+if test "x$ac_cv_header_libexif_exif_data_h" = xyes
+then :
   have_LIBEXIF=yes
-else
+else $as_nop
   have_LIBEXIF=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBEXIF}" = "xno" && test "x${have_LIBEXIF}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function exif_data_new in libexif" >&5
-$as_echo_n "checking for function exif_data_new in libexif... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function exif_data_new in libexif" >&5
+printf %s "checking for function exif_data_new in libexif... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBEXIF_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16299,28 +17847,26 @@
 /* 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 exif_data_new ();
 int
-main ()
+main (void)
 {
 return exif_data_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBEXIF=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBEXIF}" >&5
-$as_echo "${have_LIBEXIF}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBEXIF}" >&5
+printf "%s\n" "${have_LIBEXIF}" >&6; }
 fi
  if test "x$have_LIBEXIF" = "xyes"; then
   HAVE_LIBEXIF_TRUE=
@@ -16332,7 +17878,7 @@
 
 if test "x$have_LIBEXIF" = "xyes"; then
 
-$as_echo "#define HAVE_LIBEXIF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEXIF 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "libexif" : '.*')"
@@ -16343,14 +17889,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif library flags" >&5
-$as_echo_n "checking libexif library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_LIBS}\"" >&5
-$as_echo "\"${LIBEXIF_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexif cpp flags" >&5
-$as_echo_n "checking libexif cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_CFLAGS}\"" >&5
-$as_echo "\"${LIBEXIF_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif library flags" >&5
+printf %s "checking libexif library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_LIBS}\"" >&5
+printf "%s\n" "\"${LIBEXIF_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libexif cpp flags" >&5
+printf %s "checking libexif cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBEXIF_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBEXIF_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBEXIF=
 
@@ -16379,9 +17925,9 @@
 fi
 
 # Check whether --enable-serial was given.
-if test "${enable_serial+set}" = set; then :
-  enableval=$enable_serial;
-	if test x$enableval = xno; then
+if test ${enable_serial+y}
+then :
+  enableval=$enable_serial; 	if test x$enableval = xno; then
 		have_serial=false
 		serial_msg=no
 		try_ttylock=false
@@ -16394,7 +17940,7 @@
 if $have_serial; then
 	IOLIB_LIST="$IOLIB_LIST serial"
 
-$as_echo "#define HAVE_SERIAL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SERIAL 1" >>confdefs.h
 
 fi
 
@@ -16418,9 +17964,9 @@
 
 # GP_SERLOCK(ttylock)
 # Check whether --enable-ttylock was given.
-if test "${enable_ttylock+set}" = set; then :
-  enableval=$enable_ttylock;
-	if test x$enableval = xno; then
+if test ${enable_ttylock+y}
+then :
+  enableval=$enable_ttylock; 	if test x$enableval = xno; then
 		try_ttylock=false
 	fi
 
@@ -16428,9 +17974,9 @@
 
 # GP_SERLOCK(lockdev)
 # Check whether --enable-lockdev was given.
-if test "${enable_lockdev+set}" = set; then :
-  enableval=$enable_lockdev;
-	if test x$enableval = xno; then
+if test ${enable_lockdev+y}
+then :
+  enableval=$enable_lockdev; 	if test x$enableval = xno; then
 		try_lockdev=false
 	fi
 
@@ -16439,36 +17985,37 @@
 
 ttylock_msg=no
 if $try_ttylock; then
-	ac_fn_c_check_header_mongrel "$LINENO" "lockdev.h" "ac_cv_header_lockdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_lockdev_h" = xyes; then :
+	ac_fn_c_check_header_compile "$LINENO" "lockdev.h" "ac_cv_header_lockdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_lockdev_h" = xyes
+then :
 
 fi
 
-
 	ac_fn_c_check_header_compile "$LINENO" "ttylock.h" "ac_cv_header_ttylock_h" "#ifdef HAVE_LOCKDEV_H
 # include <lockdev.h>
 #endif
 
 "
-if test "x$ac_cv_header_ttylock_h" = xyes; then :
-
-		lockdev_result="no"
+if test "x$ac_cv_header_ttylock_h" = xyes
+then :
+  		lockdev_result="no"
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ttylock.h>
 int
-main ()
+main (void)
 {
 ttylocked ("/dev/foo");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 			lockdev_result="no"
 
-$as_echo "#define HAVE_TTYLOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TTYLOCK 1" >>confdefs.h
 
 			ttylock_msg=yes
 			try_lockdev=false,
@@ -16478,39 +18025,39 @@
 /* end confdefs.h.  */
 #include <ttylock.h>
 int
-main ()
+main (void)
 {
 ttylocked ("/dev/foo");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
 				lockdev_result="yes"
 
-$as_echo "#define HAVE_TTYLOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TTYLOCK 1" >>confdefs.h
 
 				ttylock_msg=yes
 				try_lockdev=false
 				SERIAL_LIBS=-llockdev
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 			LIBS="$save_LIBS"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ttylock needs lockdev" >&5
-$as_echo_n "checking if ttylock needs lockdev... " >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lockdev_result}" >&5
-$as_echo "${lockdev_result}" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ttylock needs lockdev" >&5
+printf %s "checking if ttylock needs lockdev... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lockdev_result}" >&5
+printf "%s\n" "${lockdev_result}" >&6; }
 
 fi
 
-
 fi
 
 gp_config_msg_len="$(expr "ttylock locking" : '.*')"
@@ -16525,11 +18072,12 @@
 
 lockdev_msg=no
 if $try_lockdev; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dev_lock in -llockdev" >&5
-$as_echo_n "checking for dev_lock in -llockdev... " >&6; }
-if ${ac_cv_lib_lockdev_dev_lock+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dev_lock in -llockdev" >&5
+printf %s "checking for dev_lock in -llockdev... " >&6; }
+if test ${ac_cv_lib_lockdev_dev_lock+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llockdev  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16538,36 +18086,34 @@
 /* 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 dev_lock ();
 int
-main ()
+main (void)
 {
 return dev_lock ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_lockdev_dev_lock=yes
-else
+else $as_nop
   ac_cv_lib_lockdev_dev_lock=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockdev_dev_lock" >&5
-$as_echo "$ac_cv_lib_lockdev_dev_lock" >&6; }
-if test "x$ac_cv_lib_lockdev_dev_lock" = xyes; then :
-
-		ac_fn_c_check_header_mongrel "$LINENO" "lockdev.h" "ac_cv_header_lockdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_lockdev_h" = xyes; then :
-
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockdev_dev_lock" >&5
+printf "%s\n" "$ac_cv_lib_lockdev_dev_lock" >&6; }
+if test "x$ac_cv_lib_lockdev_dev_lock" = xyes
+then :
+  		ac_fn_c_check_header_compile "$LINENO" "lockdev.h" "ac_cv_header_lockdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_lockdev_h" = xyes
+then :
 
-$as_echo "#define HAVE_LOCKDEV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LOCKDEV 1" >>confdefs.h
 
 			lockdev_msg=yes
 			SERIAL_LIBS=-llockdev
@@ -16575,7 +18121,6 @@
 fi
 
 
-
 fi
 
 fi
@@ -16596,11 +18141,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+printf %s "checking for pthread_create in -lpthread... " >&6; }
+if test ${ac_cv_lib_pthread_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16609,33 +18155,30 @@
 /* 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_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthread_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_pthread_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 
   LIBS="-lpthread $LIBS"
 
@@ -16658,8 +18201,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 to use" >&5
-$as_echo_n "checking for libusb-1.0 to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 to use" >&5
+printf %s "checking for libusb-1.0 to use... " >&6; }
 REQUIREMENTS_FOR_LIBUSB1="libusb-1.0 >= 1.0.0"
 userdef_LIBUSB1=no
 have_LIBUSB1=no
@@ -16668,7 +18211,8 @@
 				try_LIBUSB1=auto
 
 # Check whether --with-libusb-1.0 was given.
-if test "${with_libusb_1_0+set}" = set; then :
+if test ${with_libusb_1_0+y}
+then :
   withval=$with_libusb_1_0; try_LIBUSB1="$withval"
 fi
 
@@ -16676,8 +18220,8 @@
               REQUIREMENTS_FOR_LIBUSB1=
 	fi
 	if test "x${try_LIBUSB1}" = "xauto"; then try_LIBUSB1=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBUSB1}" >&5
-$as_echo "${try_LIBUSB1}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBUSB1}" >&5
+printf "%s\n" "${try_LIBUSB1}" >&6; }
 		if test "x${try_LIBUSB1}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -16685,17 +18229,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 >= 1.0.0" >&5
-$as_echo_n "checking for libusb-1.0 >= 1.0.0... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBUSB1" >&5
+printf %s "checking for LIBUSB1... " >&6; }
 
 if test -n "$LIBUSB1_CFLAGS"; then
     pkg_cv_LIBUSB1_CFLAGS="$LIBUSB1_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUSB1_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -16709,10 +18253,10 @@
     pkg_cv_LIBUSB1_LIBS="$LIBUSB1_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUSB1_LIBS=`$PKG_CONFIG --libs "libusb-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -16726,8 +18270,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -16744,31 +18288,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBUSB1_CFLAGS=$pkg_cv_LIBUSB1_CFLAGS
 	LIBUSB1_LIBS=$pkg_cv_LIBUSB1_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBUSB1=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBUSB1}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 config program" >&5
-$as_echo_n "checking libusb-1.0 config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 config program" >&5
+printf %s "checking libusb-1.0 config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy none; 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_LIBUSB1_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBUSB1_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBUSB1_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBUSB1_CONFIG_PROG="$LIBUSB1_CONFIG_PROG" # Let the user override the test with a path.
@@ -16778,11 +18323,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBUSB1_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBUSB1_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16794,19 +18343,19 @@
 fi
 LIBUSB1_CONFIG_PROG=$ac_cv_path_LIBUSB1_CONFIG_PROG
 if test -n "$LIBUSB1_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBUSB1_CONFIG_PROG" >&5
-$as_echo "$LIBUSB1_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBUSB1_CONFIG_PROG" >&5
+printf "%s\n" "$LIBUSB1_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBUSB1_CONFIG_PROG}" &&
 				test "${LIBUSB1_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 version according to none" >&5
-$as_echo_n "checking for libusb-1.0 version according to none... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 version according to none" >&5
+printf %s "checking for libusb-1.0 version according to none... " >&6; }
 								_LIBUSB1_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBUSB1_REQ_1="1"
@@ -16819,8 +18368,8 @@
 				_LIBUSB1_VER_2="$(echo "${_LIBUSB1_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBUSB1_VER_3="$(echo "${_LIBUSB1_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBUSB1_VER_4="$(echo "${_LIBUSB1_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBUSB1_VERSION}" >&5
-$as_echo "${_LIBUSB1_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBUSB1_VERSION}" >&5
+printf "%s\n" "${_LIBUSB1_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBUSB1_VER_1}" "${_LIBUSB1_COMPN}" "${_LIBUSB1_REQ_1}"; then _tmp=true;
 				elif test "${_LIBUSB1_VER_2}" "${_LIBUSB1_COMPN}" "${_LIBUSB1_REQ_2}"; then _tmp=true;
@@ -16828,28 +18377,28 @@
 				elif test "x${_LIBUSB1_VER_4}" = "x" && test "x${_LIBUSB1_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBUSB1_VER_4}" "${_LIBUSB1_COMPN}" "${_LIBUSB1_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libusb-1.0 version is matching requirement >= 1.0.0" >&5
-$as_echo_n "checking if libusb-1.0 version is matching requirement >= 1.0.0... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libusb-1.0 version is matching requirement >= 1.0.0" >&5
+printf %s "checking if libusb-1.0 version is matching requirement >= 1.0.0... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement libusb-1.0 >= 1.0.0 not met. Found: ${_LIBUSB1_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 parameters from none" >&5
-$as_echo_n "checking for libusb-1.0 parameters from none... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0 parameters from none" >&5
+printf %s "checking for libusb-1.0 parameters from none... " >&6; }
 				LIBUSB1_LIBS="$(${LIBUSB1_CONFIG_PROG} --libs || echo "*error*")"
 				LIBUSB1_CFLAGS="$(${LIBUSB1_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBUSB1_LIBS}" = "*error*" ||
 					test "x${LIBUSB1_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBUSB1=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -16859,32 +18408,32 @@
 	else
 		# We've been given a prefix to look in for library libusb-1.0.
 		# We start looking for libusb-1.0.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0.la file in ${try_LIBUSB1}" >&5
-$as_echo_n "checking for libusb-1.0.la file in ${try_LIBUSB1}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0.la file in ${try_LIBUSB1}" >&5
+printf %s "checking for libusb-1.0.la file in ${try_LIBUSB1}... " >&6; }
 		if test -f "${try_LIBUSB1}/lib/libusb-1.0.la"; then
 			LIBUSB1_LIBS="${try_LIBUSB1}/lib/libusb-1.0.la"
 			LIBUSB1_CFLAGS="-I${try_LIBUSB1}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB1_LIBS (good)" >&5
-$as_echo "libtool file $LIBUSB1_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB1_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBUSB1_LIBS (good)" >&6; }
 			have_LIBUSB1=yes
 		elif test -f "${try_LIBUSB1}/lib64/libusb-1.0.la"; then # HACK
 			LIBUSB1_LIBS="${try_LIBUSB1}/lib64/libusb-1.0.la"
 			LIBUSB1_CFLAGS="-I${try_LIBUSB1}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB1_LIBS (good)" >&5
-$as_echo "libtool file $LIBUSB1_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB1_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBUSB1_LIBS (good)" >&6; }
 			have_LIBUSB1=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBUSB1" >&5
-$as_echo "wild guess that something is in $try_LIBUSB1" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBUSB1" >&5
+printf "%s\n" "wild guess that something is in $try_LIBUSB1" >&6; }
 			LIBUSB1_LIBS="-L${try_LIBUSB1}/lib -l$(echo "libusb-1.0" | sed 's/^lib//')"
 			LIBUSB1_CFLAGS="-I${try_LIBUSB1}/include"
 			have_LIBUSB1=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file libusb-1.0.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file libusb-1.0.la could not be found.
 *   We may be linking against the WRONG library.
@@ -16892,13 +18441,13 @@
 		fi
 	fi
 elif test "x${LIBUSB1_LIBS}" != "x" && test "x${LIBUSB1_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBUSB1=yes
 	have_LIBUSB1=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -16912,11 +18461,11 @@
 # ACTION-IF-FOUND
 
         case "$host" in
-          *-*-mingw* | *-*-cygwin* | *-*-msvc* )
-	  IOLIB_LIST="$IOLIB_LIST usb1"
+          *-linux*)
+	  IOLIB_LIST="$IOLIB_LIST usb1 usbdiskdirect usbscsi"
           ;;
           *)
-	  IOLIB_LIST="$IOLIB_LIST usb1 usbdiskdirect usbscsi"
+	  IOLIB_LIST="$IOLIB_LIST usb1"
           ;;
         esac
 
@@ -16925,34 +18474,33 @@
 	save_LIBS="$LIBS"
 	LIBS="$LIBS $LIBUSB1_LIBS"
 	ac_fn_c_check_func "$LINENO" "libusb_strerror" "ac_cv_func_libusb_strerror"
-if test "x$ac_cv_func_libusb_strerror" = xyes; then :
+if test "x$ac_cv_func_libusb_strerror" = xyes
+then :
 
-
-$as_echo "#define HAVE_LIBUSB_STRERROR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBUSB_STRERROR 1" >>confdefs.h
 
 
 fi
 
 	LIBS="$save_LIBS"
 
-
 fi
 if test "x${have_LIBUSB1}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBUSB1_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default"
-if test "x$ac_cv_header_libusb_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default"
+if test "x$ac_cv_header_libusb_h" = xyes
+then :
   have_LIBUSB1=yes
-else
+else $as_nop
   have_LIBUSB1=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBUSB1}" = "xno" && test "x${have_LIBUSB1}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function libusb_init in libusb-1.0" >&5
-$as_echo_n "checking for function libusb_init in libusb-1.0... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function libusb_init in libusb-1.0" >&5
+printf %s "checking for function libusb_init in libusb-1.0... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBUSB1_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16961,28 +18509,26 @@
 /* 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 libusb_init ();
 int
-main ()
+main (void)
 {
 return libusb_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBUSB1=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBUSB1}" >&5
-$as_echo "${have_LIBUSB1}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBUSB1}" >&5
+printf "%s\n" "${have_LIBUSB1}" >&6; }
 fi
  if test "x$have_LIBUSB1" = "xyes"; then
   HAVE_LIBUSB1_TRUE=
@@ -16994,7 +18540,7 @@
 
 if test "x$have_LIBUSB1" = "xyes"; then
 
-$as_echo "#define HAVE_LIBUSB1 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBUSB1 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "libusb-1.0" : '.*')"
@@ -17005,14 +18551,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 library flags" >&5
-$as_echo_n "checking libusb-1.0 library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB1_LIBS}\"" >&5
-$as_echo "\"${LIBUSB1_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 cpp flags" >&5
-$as_echo_n "checking libusb-1.0 cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB1_CFLAGS}\"" >&5
-$as_echo "\"${LIBUSB1_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 library flags" >&5
+printf %s "checking libusb-1.0 library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB1_LIBS}\"" >&5
+printf "%s\n" "\"${LIBUSB1_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb-1.0 cpp flags" >&5
+printf %s "checking libusb-1.0 cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB1_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBUSB1_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBUSB1=
 
@@ -17038,8 +18584,8 @@
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script
 # and AC_CONFIG_SUBDIRS this configure.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb to use" >&5
-$as_echo_n "checking for libusb to use... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb to use" >&5
+printf %s "checking for libusb to use... " >&6; }
 REQUIREMENTS_FOR_LIBUSB="libusb >= 0.1.5"
 userdef_LIBUSB=no
 have_LIBUSB=no
@@ -17048,7 +18594,8 @@
 				try_LIBUSB=auto
 
 # Check whether --with-libusb was given.
-if test "${with_libusb+set}" = set; then :
+if test ${with_libusb+y}
+then :
   withval=$with_libusb; try_LIBUSB="$withval"
 fi
 
@@ -17056,8 +18603,8 @@
               REQUIREMENTS_FOR_LIBUSB=
 	fi
 	if test "x${try_LIBUSB}" = "xauto"; then try_LIBUSB=autodetect; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${try_LIBUSB}" >&5
-$as_echo "${try_LIBUSB}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${try_LIBUSB}" >&5
+printf "%s\n" "${try_LIBUSB}" >&6; }
 		if test "x${try_LIBUSB}" = "xautodetect"; then
 		# OK, we have to autodetect.
 		# We start autodetection with the cleanest known method: pkg-config
@@ -17065,17 +18612,17 @@
 			# we need that line break after the PKG_CHECK_MODULES
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb >= 0.1.5" >&5
-$as_echo_n "checking for libusb >= 0.1.5... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBUSB" >&5
+printf %s "checking for LIBUSB... " >&6; }
 
 if test -n "$LIBUSB_CFLAGS"; then
     pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17089,10 +18636,10 @@
     pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.5\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17106,8 +18653,8 @@
 
 
 if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -17124,31 +18671,32 @@
 
 	:
 elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	:
 else
 	LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS
 	LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	have_LIBUSB=yes
 fi
 		fi
 		# If pkg-config didn't find anything, try the libfoo-config program
 		# certain known libraries ship with.
 		if test "x${have_LIBUSB}" = "xno"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb config program" >&5
-$as_echo_n "checking libusb config program... " >&6; }
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libusb-config" >&5
-$as_echo "libusb-config" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb config program" >&5
+printf %s "checking libusb config program... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libusb-config" >&5
+printf "%s\n" "libusb-config" >&6; }
 			# Extract the first word of "gp_lib_config", so it can be a program name with args.
 set dummy libusb-config; 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_LIBUSB_CONFIG_PROG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LIBUSB_CONFIG_PROG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LIBUSB_CONFIG_PROG in
   \\/* | ?:\\/*)
   ac_cv_path_LIBUSB_CONFIG_PROG="$LIBUSB_CONFIG_PROG" # Let the user override the test with a path.
@@ -17158,11 +18706,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LIBUSB_CONFIG_PROG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBUSB_CONFIG_PROG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17174,19 +18726,19 @@
 fi
 LIBUSB_CONFIG_PROG=$ac_cv_path_LIBUSB_CONFIG_PROG
 if test -n "$LIBUSB_CONFIG_PROG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBUSB_CONFIG_PROG" >&5
-$as_echo "$LIBUSB_CONFIG_PROG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBUSB_CONFIG_PROG" >&5
+printf "%s\n" "$LIBUSB_CONFIG_PROG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 			if test -n "${LIBUSB_CONFIG_PROG}" &&
 				test "${LIBUSB_CONFIG_PROG}" != "none"; then
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb version according to libusb-config" >&5
-$as_echo_n "checking for libusb version according to libusb-config... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb version according to libusb-config" >&5
+printf %s "checking for libusb version according to libusb-config... " >&6; }
 								_LIBUSB_COMPN="-lt"
 								# split requested version number using m4 regexps
 				_LIBUSB_REQ_1="0"
@@ -17199,8 +18751,8 @@
 				_LIBUSB_VER_2="$(echo "${_LIBUSB_VERSION}" | sed 's/$0-9*$\.$0-9*$.*/\2/g')"
 				_LIBUSB_VER_3="$(echo "${_LIBUSB_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/g')"
 				_LIBUSB_VER_4="$(echo "${_LIBUSB_VERSION}" | sed 's/$0-9*$\.$0-9*$\.$0-9*$$.*$/\4/g')"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_LIBUSB_VERSION}" >&5
-$as_echo "${_LIBUSB_VERSION}" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_LIBUSB_VERSION}" >&5
+printf "%s\n" "${_LIBUSB_VERSION}" >&6; }
 				_tmp=false
 				if   test "${_LIBUSB_VER_1}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_1}"; then _tmp=true;
 				elif test "${_LIBUSB_VER_2}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_2}"; then _tmp=true;
@@ -17208,28 +18760,28 @@
 				elif test "x${_LIBUSB_VER_4}" = "x" && test "x${_LIBUSB_REQ_4}" != "x"; then _tmp=true;
 				elif test "${_LIBUSB_VER_4}" "${_LIBUSB_COMPN}" "${_LIBUSB_REQ_4}"; then _tmp=true;
 				fi
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libusb version is matching requirement >= 0.1.5" >&5
-$as_echo_n "checking if libusb version is matching requirement >= 0.1.5... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libusb version is matching requirement >= 0.1.5" >&5
+printf %s "checking if libusb version is matching requirement >= 0.1.5... " >&6; }
 				if "${_tmp}"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				   as_fn_error $? "Version requirement libusb >= 0.1.5 not met. Found: ${_LIBUSB_VERSION}" "$LINENO" 5
 				else
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 				fi
-								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb parameters from libusb-config" >&5
-$as_echo_n "checking for libusb parameters from libusb-config... " >&6; }
+								{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb parameters from libusb-config" >&5
+printf %s "checking for libusb parameters from libusb-config... " >&6; }
 				LIBUSB_LIBS="$(${LIBUSB_CONFIG_PROG} --libs || echo "*error*")"
 				LIBUSB_CFLAGS="$(${LIBUSB_CONFIG_PROG} --cflags || echo "*error*")"
 				if test "x${LIBUSB_LIBS}" = "*error*" ||
 					test "x${LIBUSB_CFLAGS}" = "*error*"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
-$as_echo "error" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5
+printf "%s\n" "error" >&6; }
 				else
 					have_LIBUSB=yes
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 				fi
 			fi
 					fi
@@ -17239,32 +18791,32 @@
 	else
 		# We've been given a prefix to look in for library libusb.
 		# We start looking for libusb.la files first.
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb.la file in ${try_LIBUSB}" >&5
-$as_echo_n "checking for libusb.la file in ${try_LIBUSB}... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb.la file in ${try_LIBUSB}" >&5
+printf %s "checking for libusb.la file in ${try_LIBUSB}... " >&6; }
 		if test -f "${try_LIBUSB}/lib/libusb.la"; then
 			LIBUSB_LIBS="${try_LIBUSB}/lib/libusb.la"
 			LIBUSB_CFLAGS="-I${try_LIBUSB}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB_LIBS (good)" >&5
-$as_echo "libtool file $LIBUSB_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBUSB_LIBS (good)" >&6; }
 			have_LIBUSB=yes
 		elif test -f "${try_LIBUSB}/lib64/libusb.la"; then # HACK
 			LIBUSB_LIBS="${try_LIBUSB}/lib64/libusb.la"
 			LIBUSB_CFLAGS="-I${try_LIBUSB}/include"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB_LIBS (good)" >&5
-$as_echo "libtool file $LIBUSB_LIBS (good)" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libtool file $LIBUSB_LIBS (good)" >&5
+printf "%s\n" "libtool file $LIBUSB_LIBS (good)" >&6; }
 			have_LIBUSB=yes
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBUSB" >&5
-$as_echo "wild guess that something is in $try_LIBUSB" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: wild guess that something is in $try_LIBUSB" >&5
+printf "%s\n" "wild guess that something is in $try_LIBUSB" >&6; }
 			LIBUSB_LIBS="-L${try_LIBUSB}/lib -l$(echo "libusb" | sed 's/^lib//')"
 			LIBUSB_CFLAGS="-I${try_LIBUSB}/include"
 			have_LIBUSB=yes
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
 * Warning:
 *   libtool file libusb.la could not be found.
 *   We may be linking against the WRONG library.
 " >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
 * Warning:
 *   libtool file libusb.la could not be found.
 *   We may be linking against the WRONG library.
@@ -17272,13 +18824,13 @@
 		fi
 	fi
 elif test "x${LIBUSB_LIBS}" != "x" && test "x${LIBUSB_CFLAGS}" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
-$as_echo "user-defined" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: user-defined" >&5
+printf "%s\n" "user-defined" >&6; }
 	userdef_LIBUSB=yes
 	have_LIBUSB=yes
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
-$as_echo "broken call" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken call" >&5
+printf "%s\n" "broken call" >&6; }
 	as_fn_error $? "
 * Fatal:
 * When calling configure for ${PACKAGE_TARNAME}
@@ -17295,7 +18847,7 @@
 	  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
 	  	  IOLIB_LIST="$IOLIB_LIST usb"
 	  ;;
-	  *)
+          *-linux*)
 	  if test "x$have_LIBUSB1" != xyes; then
 		IOLIB_LIST="$IOLIB_LIST usb usbdiskdirect usbscsi"
           else
@@ -17311,25 +18863,41 @@
 
           fi
 	  ;;
+	  *)
+	  if test "x$have_LIBUSB1" != xyes; then
+		IOLIB_LIST="$IOLIB_LIST usb"
+          else
+
+gp_config_msg_len="$(expr "libusb0 support" : '.*')"
+if test "$gp_config_msg_len" -ge "$gp_config_len"; then
+	gp_config_msg_lhs="$(expr "libusb0 support" : "$.\{0,${gp_config_len3}\}$")..:"
+else
+	gp_config_msg_lhs="$(expr "libusb0 support:${gp_config_empty}" : "$.\{0,${gp_config_len}\}$")"
+fi
+gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} detected, but disabled (libusb1 support is enabled)
+"
+
+          fi
+	  ;;
 	esac
 
 fi
 if test "x${have_LIBUSB}" = "xyes"; then
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="${LIBUSB_CFLAGS}"
-ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
-if test "x$ac_cv_header_usb_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes
+then :
   have_LIBUSB=yes
-else
+else $as_nop
   have_LIBUSB=no
 fi
 
-
 CPPFLAGS="$CPPFLAGS_save"
 fi
 if test "x${userdef_LIBUSB}" = "xno" && test "x${have_LIBUSB}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function usb_open in libusb" >&5
-$as_echo_n "checking for function usb_open in libusb... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for function usb_open in libusb" >&5
+printf %s "checking for function usb_open in libusb... " >&6; }
 	LIBS_save="$LIBS"
 	LIBS="${LIBUSB_LIBS}"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17338,28 +18906,26 @@
 /* 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 usb_open ();
 int
-main ()
+main (void)
 {
 return usb_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   have_LIBUSB=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$LIBS_save"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_LIBUSB}" >&5
-$as_echo "${have_LIBUSB}" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${have_LIBUSB}" >&5
+printf "%s\n" "${have_LIBUSB}" >&6; }
 fi
  if test "x$have_LIBUSB" = "xyes"; then
   HAVE_LIBUSB_TRUE=
@@ -17371,7 +18937,7 @@
 
 if test "x$have_LIBUSB" = "xyes"; then
 
-$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h
 
 
 gp_config_msg_len="$(expr "libusb" : '.*')"
@@ -17382,14 +18948,14 @@
 fi
 gp_config_msg="${gp_config_msg}    ${gp_config_msg_lhs} yes
 "
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb library flags" >&5
-$as_echo_n "checking libusb library flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB_LIBS}\"" >&5
-$as_echo "\"${LIBUSB_LIBS}\"" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb cpp flags" >&5
-$as_echo_n "checking libusb cpp flags... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB_CFLAGS}\"" >&5
-$as_echo "\"${LIBUSB_CFLAGS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb library flags" >&5
+printf %s "checking libusb library flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB_LIBS}\"" >&5
+printf "%s\n" "\"${LIBUSB_LIBS}\"" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking libusb cpp flags" >&5
+printf %s "checking libusb cpp flags... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"${LIBUSB_CFLAGS}\"" >&5
+printf "%s\n" "\"${LIBUSB_CFLAGS}\"" >&6; }
 else
 	REQUIREMENTS_FOR_LIBUSB=
 
@@ -17406,7 +18972,7 @@
 if test "x${udevscriptdir}" = "x"; then	udevscriptdir="\${libdir}/udev"; fi
 
 
- if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes; fi ; then
+ if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes || test "x$have_LIBUSB1" = xyes; fi ; then
   HAVE_UDEV_TRUE=
   HAVE_UDEV_FALSE='#'
 else
@@ -17418,9 +18984,10 @@
 
 
 # Check whether --enable-disk was given.
-if test "${enable_disk+set}" = set; then :
+if test ${enable_disk+y}
+then :
   enableval=$enable_disk;
-else
+else $as_nop
   enable_disk=yes
 fi
 
@@ -17430,11 +18997,11 @@
 fi
 
 # Check whether --enable-vusb was given.
-if test "${enable_vusb+set}" = set; then :
+if test ${enable_vusb+y}
+then :
   enableval=$enable_vusb;
-else
-
-		enable_vusb=no
+else $as_nop
+  		enable_vusb=no
 
 gp_config_msg_len="$(expr "virtual USB support" : '.*')"
 if test "$gp_config_msg_len" -ge "$gp_config_len"; then
@@ -17455,14 +19022,18 @@
 fi
 
 # Check whether --enable-ptpip was given.
-if test "${enable_ptpip+set}" = set; then :
+if test ${enable_ptpip+y}
+then :
   enableval=$enable_ptpip;
-else
-  enable_ptpip=yes
+else $as_nop
+  		enable_ptpip=yes
+
 fi
 
-if test "x$enable_ptpip" = "xyes"; then
-	IOLIB_LIST="$IOLIB_LIST ptpip"
+if test "x$enable_ptpip" = xyes
+then :
+  	IOLIB_LIST="$IOLIB_LIST ptpip"
+
 fi
 
 # ----------------------------------------------------------------------
@@ -17470,19 +19041,88 @@
 # ----------------------------------------------------------------------
 
 
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to install iolibs (port libraries) (iolibdir)" >&5
+printf %s "checking where to install iolibs (port libraries) (iolibdir)... " >&6; }
+
+if ${iolibdir:+false} :
+then :
+  	iolibdir="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${iolibdir} (default)" >&5
+printf "%s\n" "${iolibdir} (default)" >&6; }
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${iolibdir} (set explictly)" >&5
+printf "%s\n" "${iolibdir} (set explictly)" >&6; }
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deprecated --with-iolibdir argument" >&5
+printf %s "checking for deprecated --with-iolibdir argument... " >&6; }
+
+# Check whether --with-iolibdir was given.
+if test ${with_iolibdir+y}
+then :
+  withval=$with_iolibdir; 	if ${iolibdir:+false} :
+then :
+  		iolibdir="$withval"
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${iolibdir} (from DEPRECATED --with-iolibdir)" >&5
+printf "%s\n" "${iolibdir} (from DEPRECATED --with-iolibdir)" >&6; }
+
+else $as_nop
+  		if test "x$iolibdir" = x"$withval"
+then :
+  			# Nothing to do, iolibdir has already been set to this value.
+
+else $as_nop
+  			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${withval} (differs from iolibdir value)" >&5
+printf "%s\n" "${withval} (differs from iolibdir value)" >&6; }
+			as_fn_error $? "
+If both the iolibdir= variable and the DEPRECATED --with-iolibdir= argument
+are used, their value MUST be the same.
+" "$LINENO" 5
+
+fi
+
+fi
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not used (very good)" >&5
+printf "%s\n" "not used (very good)" >&6; }
+
+fi
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking default location to look for iolibs (port libraries)" >&5
+printf %s "checking default location to look for iolibs (port libraries)... " >&6; }
+if ${DEFAULT_IOLIBS:+false} :
+then :
+  	DEFAULT_IOLIBS="\${iolibdir}"
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: value of iolibdir (default)" >&5
+printf "%s\n" "value of iolibdir (default)" >&6; }
+
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${DEFAULT_IOLIBS} (set explicitly)" >&5
+printf "%s\n" "${DEFAULT_IOLIBS} (set explicitly)" >&6; }
+
+fi
+AM_CPPFLAGS="$AM_CPPFLAGS -DIOLIBS=\\\"${DEFAULT_IOLIBS}\\\""
+
+
+
+
 for x in ${IOLIB_LIST}; do
     IOLIB_LTLIST="${IOLIB_LTLIST} ${x}.la"
 done
 
-iolibdir="\$(libdir)/\$(PACKAGE_TARNAME)/\$(VERSION)"
-
-AM_CPPFLAGS="$AM_CPPFLAGS -DIOLIBS=\\\"${iolibdir}\\\""
 
 sorted_iolib_list="$(echo "${IOLIB_LIST}" | tr ' ' '\n' | sort | ${SED} '/^$/d' | tr '\n' ' ' | ${SED} 's/ $//')"
 
-cat >>confdefs.h <<_ACEOF
-#define IOLIB_LIST "${sorted_iolib_list}"
-_ACEOF
+printf "%s\n" "#define IOLIB_LIST \"${sorted_iolib_list}\"" >>confdefs.h
 
 
 gp_config_msg="${gp_config_msg}
@@ -17506,23 +19146,25 @@
 
 
 ac_fn_c_check_func "$LINENO" "re_compile_pattern" "ac_cv_func_re_compile_pattern"
-if test "x$ac_cv_func_re_compile_pattern" = xyes; then :
-
-$as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h
+if test "x$ac_cv_func_re_compile_pattern" = xyes
+then :
 
+printf "%s\n" "#define HAVE_GNU_REGEX 1" >>confdefs.h
 
 fi
 
 
 
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-  if test "$enableval" = "no"; then
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug;     if test "x$enableval" = xno
+then :
 
-$as_echo "#define DISABLE_DEBUGGING 1" >>confdefs.h
+printf "%s\n" "#define DISABLE_DEBUGGING 1" >>confdefs.h
 
-  fi
+
+fi
 
 fi
 
@@ -17536,70 +19178,16 @@
   Documentation
 "
 
-
-
-
-# Check whether --with-doc-dir was given.
-if test "${with_doc_dir+set}" = set; then :
-  withval=$with_doc_dir;
-fi
-
-
-# check for the main ("root") documentation directory
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking main docdir" >&5
-$as_echo_n "checking main docdir... " >&6; }
-
-if test "x${with_doc_dir}" != "x"
-then # docdir is given as parameter
-    docdir="${with_doc_dir}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (from parameter)" >&5
-$as_echo "${docdir} (from parameter)" >&6; }
-else # otherwise invent a docdir hopefully compatible with system policy
-    if test -d "/usr/share/doc"
-    then
-        maindocdir='${prefix}/share/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (FHS style)" >&5
-$as_echo "${maindocdir} (FHS style)" >&6; }
-    elif test -d "/usr/doc"
-    then
-        maindocdir='${prefix}/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (old style)" >&5
-$as_echo "${maindocdir} (old style)" >&6; }
-    else
-        maindocdir='${datadir}/doc'
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${maindocdir} (default value)" >&5
-$as_echo "${maindocdir} (default value)" >&6; }
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking package docdir" >&5
-$as_echo_n "checking package docdir... " >&6; }
-    # check whether to include package version into documentation path
-    # FIXME: doesn't work properly.
-    if ls -d /usr/{share/,}doc/make-0-9* > /dev/null 2>&1
-    then
-        docdir="${maindocdir}/${PACKAGE}-${VERSION}"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (redhat style)" >&5
-$as_echo "${docdir} (redhat style)" >&6; }
-    else
-        docdir="${maindocdir}/${PACKAGE}"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${docdir} (default style)" >&5
-$as_echo "${docdir} (default style)" >&6; }
-    fi
-fi
-
-
-
-# docdir has to be determined in advance
-
-
 # ---------------------------------------------------------------------------
 # gtk-doc: We use gtk-doc for building our documentation. However, we
-#          require the user to explicitely request the build.
+#          require the user to explicitly request the build.
 # ---------------------------------------------------------------------------
 try_gtkdoc=false
 gtkdoc_msg="no (not requested)"
 have_gtkdoc=false
 # Check whether --enable-docs was given.
-if test "${enable_docs+set}" = set; then :
+if test ${enable_docs+y}
+then :
   enableval=$enable_docs;
 	if test x$enableval = xyes; then
 		try_gtkdoc=true
@@ -17610,11 +19198,12 @@
 if $try_gtkdoc; then
 	# Extract the first word of "gtkdoc-mkdb", so it can be a program name with args.
 set dummy gtkdoc-mkdb; 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_GTKDOC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GTKDOC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GTKDOC in
   \\/* | ?:\\/*)
   ac_cv_path_GTKDOC="$GTKDOC" # Let the user override the test with a path.
@@ -17624,11 +19213,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTKDOC="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17640,11 +19233,11 @@
 fi
 GTKDOC=$ac_cv_path_GTKDOC
 if test -n "$GTKDOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC" >&5
-$as_echo "$GTKDOC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC" >&5
+printf "%s\n" "$GTKDOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -17674,35 +19267,10 @@
 "
 
 
-
-# ---------------------------------------------------------------------------
-# Give the user the possibility to install html documentation in a
-# user-defined location.
-# ---------------------------------------------------------------------------
-
-# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then :
-  withval=$with_html_dir;
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for html dir" >&5
-$as_echo_n "checking for html dir... " >&6; }
-if test "x${with_html_dir}" = "x" ; then
-    htmldir="${docdir}/html"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${htmldir} (default)" >&5
-$as_echo "${htmldir} (default)" >&6; }
-else
-    htmldir="${with_html_dir}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${htmldir} (from parameter)" >&5
-$as_echo "${htmldir} (from parameter)" >&6; }
-fi
-
 apidocdir="${htmldir}/api"
 
 
 
-
 if test "$GCC" = "yes"; then
 	CFLAGS="$CFLAGS -Wall"
 	CFLAGS="$CFLAGS -Wmissing-declarations -Wmissing-prototypes"
@@ -17724,7 +19292,7 @@
 # ---------------------------------------------------------------------------
 # Create output files
 # ---------------------------------------------------------------------------
-ac_config_files="$ac_config_files Makefile po/Makefile.in libgphoto2_port/Makefile libgphoto2_port.pc libgphoto2_port-uninstalled.pc gphoto2-port-config test/Makefile doc/Makefile gphoto-m4/Makefile"
+ac_config_files="$ac_config_files Makefile po/Makefile.in libgphoto2_port/Makefile libgphoto2_port.pc libgphoto2_port-uninstalled.pc gphoto2-port-config tests/Makefile doc/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17753,8 +19321,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -17784,15 +19352,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
+     s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
      t end
      s/^$^=*$=$.*$$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -17806,8 +19374,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -17824,7 +19392,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -17835,14 +19403,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -17859,6 +19427,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_ASM_SYMVER_TRUE}" && test -z "${HAVE_ASM_SYMVER_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ASM_SYMVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LIBEXIF_TRUE}" && test -z "${HAVE_LIBEXIF_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBEXIF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17884,8 +19456,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -17908,14 +19480,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -17925,46 +19499,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -17973,13 +19547,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -17988,8 +19555,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -18001,30 +19572,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -18037,13 +19588,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -18070,18 +19622,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -18093,12 +19647,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -18129,7 +19684,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -18151,6 +19706,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -18164,6 +19723,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -18205,7 +19770,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -18214,7 +19779,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -18276,8 +19841,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libgphoto2 port access library $as_me 0.12.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by libgphoto2 port access library $as_me 0.12.2, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18339,14 +19904,16 @@
 Report bugs to <gphoto-devel@lists.sourceforge.net>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-libgphoto2 port access library config.status 0.12.0
-configured by $0, generated by GNU Autoconf 2.69,
+libgphoto2 port access library config.status 0.12.2
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18386,15 +19953,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -18402,7 +19969,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -18411,7 +19978,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -18439,7 +20006,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -18453,7 +20020,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -18461,7 +20028,7 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -18471,12 +20038,12 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -18508,12 +20075,14 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -18637,13 +20206,13 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
+FILECMD \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
-AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -18749,14 +20318,7 @@
 
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -18773,17 +20335,15 @@
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-    "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "libgphoto2_port/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2_port/Makefile" ;;
     "libgphoto2_port.pc") CONFIG_FILES="$CONFIG_FILES libgphoto2_port.pc" ;;
     "libgphoto2_port-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libgphoto2_port-uninstalled.pc" ;;
     "gphoto2-port-config") CONFIG_FILES="$CONFIG_FILES gphoto2-port-config" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "gphoto-m4/Makefile") CONFIG_FILES="$CONFIG_FILES gphoto-m4/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18795,9 +20355,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -18832,7 +20392,24 @@
 # This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+  ac_cs_awk_getline=:
+  ac_cs_awk_pipe_init=
+  ac_cs_awk_read_file='
+      while ((getline aline < (Fkey)) > 0)
+	print(aline)
+      close(Fkey)'
+  ac_cs_awk_pipe_fini=
+else
+  ac_cs_awk_getline=false
+  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+  ac_cs_awk_read_file='
+      print "|#_!!_#|"
+      print "cat " Fkey " &&"
+      '$ac_cs_awk_pipe_init
+  # The final `:' finishes the AND list.
+  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+fi
 ac_cr=`echo X | tr X '\015'`
 # On cygwin, bash can eat \r inside `` if the user requested igncr.
 # But we know of no other shell where ac_cr would be empty at this
@@ -18850,6 +20427,17 @@
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
+# Create commands to substitute file output variables.
+{
+  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo "$ac_subst_files" | sed 's/.*/F"&"="$&"/' &&
+  echo "_ACAWK" &&
+  echo "_ACEOF"
+} >conf$$files.sh &&
+. ./conf$$files.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
 
 {
   echo "cat >conf$$subs.awk <<_ACEOF" &&
@@ -18926,7 +20514,7 @@
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_setkey = 1
   FS = "&#x7;"
-
+  \$ac_cs_awk_pipe_init
 }
 {
   line = $ 0
@@ -18944,10 +20532,16 @@
     } else
       len += 1 + keylen
   }
-
+  if (nfields == 3 && !substed) {
+    key = field2
+    if (Fkey != "" && line ~ /^	 *@.*@	 *$/) {
+      \$ac_cs_awk_read_file
+      next
+    }
+  }
   print line
 }
-
+\$ac_cs_awk_pipe_fini
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19133,7 +20727,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -19141,17 +20735,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/\\\\&|/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -19168,7 +20762,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -19192,9 +20786,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -19256,8 +20850,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -19294,16 +20888,21 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+if $ac_cs_awk_getline; then
+  $AWK -f "$ac_tmp/subs.awk"
+else
+  $AWK -f "$ac_tmp/subs.awk" | $SHELL
+fi \
   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -19319,20 +20918,20 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -19352,7 +20951,7 @@
 	 X"$_am_arg" : 'X$//$^/' \| \
 	 X"$_am_arg" : 'X$//$$' \| \
 	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+printf "%s\n" X"$_am_arg" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -19372,8 +20971,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -19383,29 +20982,35 @@
   # Older Autoconf 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
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_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
+    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: 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" ||
-$as_expr X"$mf" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$mf" : 'X$//$^/' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$am_mf" : 'X$//$^/' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+printf "%s\n" X"$am_mf" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -19423,53 +21028,50 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    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"`
-    # 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'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$file" : 'X$//$^/' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/$^/^/*$/*$' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+printf "%s\n" X/"$am_mf" |
+    sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/\/$$/{
+	  /^X\/$\/\/$$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/$.*/{
+	  /^X\/$\/$.*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE=\"gmake\" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)
@@ -19523,6 +21125,10 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
@@ -19535,10 +21141,6 @@
 # Object dumper program.
 OBJDUMP=$lt_OBJDUMP
 
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -19615,6 +21217,9 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# A file(cmd) program that detects file types.
+FILECMD=$lt_FILECMD
+
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -19633,8 +21238,11 @@
 # The archiver.
 AR=$lt_AR
 
+# Flags to create an archive (by configure).
+lt_ar_flags=$lt_ar_flags
+
 # Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
+AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
@@ -20002,6 +21610,7 @@
   esac
 
 
+
 ltmain=$ac_aux_dir/ltmain.sh
 
 
@@ -20009,7 +21618,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -20017,7 +21626,7 @@
   chmod +x "$ofile"
 
  ;;
-    "default-1":C)
+    "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile:infile:infile..."
       case "$ac_file" in
@@ -20027,7 +21636,7 @@
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -20037,10 +21646,14 @@
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ ${gt_tab}*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -20050,121 +21663,13 @@
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; 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
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
-    "default-2":C)
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile:infile:infile..."
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/^/^/*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/^/*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^ 	*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -20269,8 +21774,8 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
@@ -20304,3 +21809,4 @@
 
 
 # End of file.
+

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/configure.ac -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/configure.ac Changed

@@ -1,45 +1,57 @@
 dnl Process this file with autoreconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT(libgphoto2 port access library, 0.12.0, gphoto-devel@lists.sourceforge.net, libgphoto2_port)
+AC_PREREQ(2.69)
+
+AC_INIT(libgphoto2 port access library,
+        0.12.2,
+        gphoto-devel@lists.sourceforge.net,
+        libgphoto2_port)
+
 AC_CONFIG_SRCDIR(libgphoto2_port/gphoto2-port-version.c)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR(auto-m4)
 AC_CONFIG_AUX_DIR(auto-aux)
-dnl Working around bug in automake <= 1.9.6:
-dnl  - Please do not add filename-length-max=99 here.
-dnl  - Otherwise "make distdir" will fail in libgphoto2
-dnl The generated Makefile rule fails to remove the absolute part at
-dnl the beginning of the /path/to/buildroot/PACKAGE-VERSION/foo/bar
-dnl before determining the string length. However, the only relevant
-dnl string to determine the length of would be PACKAGE-VERSION/foo/bar
-AM_INIT_AUTOMAKE(-Wall gnu 1.9 dist-bzip2 check-news subdir-objects)
-
-AC_LANG(C)
-
-# Use the silent-rules feature when possible.
-m4_ifndef(AM_SILENT_RULES, m4_define(AM_SILENT_RULES,))
+AM_INIT_AUTOMAKE(
+  -Wall
+  gnu
+  1.14
+  dist-bzip2
+  check-news
+  subdir-objects
+)
+
+
 AM_SILENT_RULES(no)
 
+
+AC_LANG(C)
+
+
+
+dnl Flag all GP_ strings in result as error unless specifically allowed.
+m4_pattern_forbid(^_?GP_)dnl
+
+
 dnl ---------------------------------------------------------------------------
 dnl Advanced information about versioning:
 dnl   * "Writing shared libraries" by Mike Hearn
-dnl         http://navi.cx/~mike/writing-shared-libraries.html
+dnl         http://plan99.net/~mike/writing-shared-libraries.html
+dnl         originally http://navi.cx/~mike/writing-shared-libraries.html
 dnl   * libtool.info chapter "Versioning"
 dnl   * libtool.info chapter "Updating library version information"
 dnl ---------------------------------------------------------------------------
 dnl Versioning:
 dnl  - AGE (Micro):      Increment if any interfaces have been added; set to 0
-dnl		         if any interfaces have been removed. Removal has 
+dnl		         if any interfaces have been removed. Removal has
 dnl                      precedence over adding, so set to 0 if both happened.
 dnl                      It denotes upward compatibility.
-dnl  - REVISION (Minor): Increment any time the source changes; set to 
+dnl  - REVISION (Minor): Increment any time the source changes; set to
 dnl			 0 if you incremented CURRENT.
 dnl  - CURRENT (Major):  Increment if the interface has changes. AGE is always
 dnl                      *changed* at the same time.
 dnl
 dnl  To summarize. Any interface *change* increment CURRENT. If that interface
-dnl  change does not break upward compatibility (ie it is an addition), 
-dnl  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, 
+dnl  change does not break upward compatibility (ie it is an addition),
+dnl  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
 dnl  REVISION is set to 0, otherwise REVISION is incremented.
 dnl ---------------------------------------------------------------------------
 dnl A:R:C=6:1:6 libgphoto2_port-0.6.1 libgphoto2-2.2.1
@@ -47,9 +59,11 @@
 dnl A:R:C=7:1:7 libgphoto2_port-0.7.1 libgphoto2-2.3.x
 dnl A:R:C=8:0:8 libgphoto2_port-0.8.0 libgphoto2-2.4.x
 dnl A:R:C=9:1:9 libgphoto2_port-0.10.0 libgphoto2-2.5.x
-AC_SUBST(LIBGPHOTO2_PORT_AGE,      0)
+dnl A:R:C=1:0:13  libgphoto2-2.5.30	(added gp_port_init_localedir ... )
+dnl A:R:C=2:0:14  libgphoto2-2.5.31	(added gpi_libltdl_mutex ... )
+AC_SUBST(LIBGPHOTO2_PORT_AGE,      2)
 AC_SUBST(LIBGPHOTO2_PORT_REVISION, 0)
-AC_SUBST(LIBGPHOTO2_PORT_CURRENT,  12)
+AC_SUBST(LIBGPHOTO2_PORT_CURRENT,  14)
 AC_SUBST(LIBGPHOTO2_PORT_CURRENT_MIN,
          `expr $LIBGPHOTO2_PORT_CURRENT - $LIBGPHOTO2_PORT_AGE`)
 AC_SUBST(LIBGPHOTO2_PORT_VERSION_INFO,
@@ -62,32 +76,28 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-AM_PROG_CC_C_O
-m4_ifdef(AM_PROG_AR, AM_PROG_AR)
-
+AC_PROG_SED
+AM_PROG_AR
 
-dnl Something with the sequences is not quite alright yet.
-dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the
-dnl sequence seems to get mixed up.
-SED=${SED-sed}
 
 dnl check for/set up libtool and libltdl
-dnl AC_DISABLE_STATIC
-dnl AC_DISABLE_SHARED
-dnl AC_LIBLTDL_CONVENIENCE(libltdl)
-dnl AC_WITH_LTDL
-dnl AC_LIB_LTDL
+m4_pattern_forbid(^LT_PREREQ)dnl
+LT_PREREQ(2.4.2)
 dnl Disable building static library, as no one uses it anyway.
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-dnl We are using our own libltdl checks instead of AC_WITH_LTDL
-dnl because we do not want to ship our own copy of libltdl any more.
-dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
-dnl and relying on standard autoconf's "autoreconf".
-GP_LIB_LTDL
+m4_pattern_forbid(^LT_INIT)dnl
+LT_INIT(
+  disable-static
+  dlopen
+  win32-dll
+)
+dnl
+dnl LTDL_INIT(external)
+dnl
+dnl We are using our own libltdl checks instead of LTDL_INIT because
+dnl we do not want to ship our own two copies of libltdl (one for
+dnl libgphoto2 and one for libgphoto2_port), and LTDL_INIT insists on
+dnl that.
+GP_LIBLTDL
 
 
 # report on compiler/libtool setup
@@ -97,7 +107,8 @@
 GP_CONFIG_MSG(libltdl includes,$LTDLINCL)
 GP_CONFIG_MSG(libltdl library,$LIBLTDL)
 
-AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",The C compiler we're using)
+AC_DEFINE_UNQUOTED(HAVE_CC, "$CC",
+                   The C compiler we're using)
 
 AM_CPPFLAGS=""
 
@@ -112,33 +123,25 @@
 dnl i18n support
 dnl ---------------------------------------------------------------------------
 
-dnl The following is a hack to get gphoto2 to build on gettext-0.10.35
-dnl systems - BUILD_INCLUDED_LIBINTL is set only in gettext-0.10.37 which is
-dnl the gettext version provided with gphoto2.
-dnl BUILD_INCLUDED_LIBINTL=no
-dnl AC_SUBST(BUILD_INCLUDED_LIBINTL)
-dnl USE_INCLUDED_LIBINTL=no
-dnl AC_SUBST(USE_INCLUDED_LIBINTL)
-
-GP_GETTEXT_HACK(${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN},Lutz Mueller and others,${MAIL_GPHOTO_TRANSLATION})
-ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW"
-AM_GNU_GETTEXT_VERSION(0.14.1)
-AM_GNU_GETTEXT(external)
+GP_GETTEXT_SETUP(GETTEXT_PACKAGE_LIBGPHOTO2_PORT,
+                 ${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN},
+                 po)
 AM_PO_SUBDIRS()
+AM_GNU_GETTEXT_VERSION(0.19.1)
+AM_GNU_GETTEXT(external)
 AM_ICONV()
-GP_GETTEXT_FLAGS()
 
-AC_SUBST(localedir,"\$(datadir)/locale")
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
+GP_CONFIG_MSG(Use translations,
+              ${USE_NLS})
 
-AC_CHECK_FUNC(gettext, gettext_without_libintl=true)
+AC_CHECK_FUNC(gettext, gettext_without_libintl=true)
 # same trick as with libdl in libgphoto2:
 # if gettext() doesn't require linking against libintl,
 # we don't have to check for gettext in libintl. Otherwise
 # we may even require libintl.
 dnl AC_CHECK_LIB(intl, gettext, LIBS="$LIBS -lintl")
-if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then
-        AC_CHECK_LIB(intl, gettext, INTLLIBS="$INTLLIBS -lintl")
+if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; then
+  AC_CHECK_LIB(intl, gettext, INTLLIBS="$INTLLIBS -lintl")
 fi
 
 
@@ -151,36 +154,21 @@
 AC_C_INLINE()
 AC_C_CONST()
 
-AC_CHECK_HEADERS(stdlib.h unistd.h stdio.h fcntl.h errno.h sys/time.h	\
+AC_CHECK_HEADERS(stdlib.h unistd.h stdio.h fcntl.h errno.h sys/time.h	\
 	sys/param.h sys/select.h termios.h sgetty.h ttold.h ioctl-types.h	\
 	fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h unistd.h	\
 	endian.h byteswap.h asm/io.h mntent.h sys/mntent.h sys/mnttab.h \
-	scsi/sg.h limits.h sys/file.h)
-	
-dnl FIXME: Provide regex.h with the corresponding object code for 
+	scsi/sg.h limits.h sys/file.h)
+
+dnl FIXME: Provide regex.h with the corresponding object code for
 dnl        platforms which do not have it, e.g. Windows.
 AC_CHECK_HEADER(regex.h,
-                AC_DEFINE(HAVE_REGEX,1,whether we have regex.h),)
-AC_CHECK_LIB(regex,regexec)
+                AC_DEFINE(HAVE_REGEX, 1,
+		           whether we have regex.h),
+		)
+AC_CHECK_LIB(regex, regexec)
 
-AC_MSG_CHECKING(for asm .symver support)
-AC_COMPILE_IFELSE(dnl
-	AC_LANG_PROGRAM(,
-		int f1() { }
-		int f2() { }
-		asm(".symver f1, f@VER1");
-		asm(".symver f2, f@@VER2");
-		int main(int argc, char **argv) { }
-	)dnl
-,
-	AC_DEFINE(HAVE_ASM_SYMVERS,1,Define if there is asm .symver support.)
-	VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2_port.ver"
-	AC_MSG_RESULT(yes)
-,
-	VERSIONMAPLDFLAGS=""
-	AC_MSG_RESULT(no)
-)
-AC_SUBST(VERSIONMAPLDFLAGS)
+GP_ASM_SYMVER_SUPPORT
 
 dnl Check for mnt_mountp in struct mnttab
 AC_MSG_CHECKING(for mnt_mountp in struct mnttab)
@@ -194,27 +182,28 @@
 struct mnttab mt;
 mt.mnt_mountp;
 )dnl
-,
-AC_DEFINE(HAVE_MNTTAB,1,whether struct mnttag has mnt_mountp field)
-AC_MSG_RESULT(yes)
-,
-AC_MSG_RESULT(no)
+, dnl
+  AC_DEFINE(HAVE_MNTTAB, 1,
+            whether struct mnttag has mnt_mountp field)
+  AC_MSG_RESULT(yes)
+, dnl
+  AC_MSG_RESULT(no)
 )
 
 
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(setmntent endmntent strerror snprintf vsnprintf flock)
+AC_CHECK_FUNCS(setmntent endmntent strerror snprintf vsnprintf flock)
 
 dnl Check if TIOCM_RTS is included in one of several possible files
 AC_TRY_COMPILE(#include <termios.h>, int foo = TIOCM_RTS;,
-			AC_DEFINE(HAVE_RTS_IOCTL,1,Define if you have TIOCM_RTS.))
+			AC_DEFINE(HAVE_RTS_IOCTL, 1, Define if you have TIOCM_RTS.))
 AC_TRY_COMPILE(#include <termio.h>, int foo = TIOCM_RTS;,
-			AC_DEFINE(HAVE_RTS_IOCTL,1,Define if you have TIOCM_RTS.))
+			AC_DEFINE(HAVE_RTS_IOCTL, 1, Define if you have TIOCM_RTS.))
 AC_TRY_COMPILE(#include <ioctl-types.h>, int foo = TIOCM_RTS;,
-			AC_DEFINE(HAVE_RTS_IOCTL,1,Define if you have TIOCM_TRS.))
+			AC_DEFINE(HAVE_RTS_IOCTL, 1, Define if you have TIOCM_TRS.))
 AC_TRY_COMPILE(#include <sys/ioctl.h>, int foo = TIOCM_RTS;,
-			AC_DEFINE(HAVE_RTS_IOCTL,1,Define if you have TIOCM_TRS.))
+			AC_DEFINE(HAVE_RTS_IOCTL, 1, Define if you have TIOCM_TRS.))
 
 # Check for va_copy()
 GP_VA_COPY
@@ -244,11 +233,11 @@
 	ExifContent *ec0, *ec1;
 	ec0 = &ed.ifd0;
 	ec1 = &ed.ifd1;
-), 
-   AC_DEFINE(HAVE_LIBEXIF_IFD,1,
+), dnl
+   AC_DEFINE(HAVE_LIBEXIF_IFD, 1,
 	     whether we use a version of libexif with ExifData.ifd)
    AC_MSG_RESULT(yes)
-, 
+, dnl
    AC_MSG_RESULT(no)
 )
 CPPFLAGS="$CPPFLAGS_save"
@@ -274,7 +263,7 @@
 AC_ARG_ENABLE(serial,
 	AS_HELP_STRING(--disable-serial,
 			do not compile in SERIAL support),
-
+dnl
 	if test x$enableval = xno; then
 		have_serial=false
 		serial_msg=no
@@ -285,7 +274,8 @@
 )
 if $have_serial; then
 	IOLIB_LIST="$IOLIB_LIST serial"
-	AC_DEFINE(HAVE_SERIAL,1,Whether you have serial support enabled)
+	AC_DEFINE(HAVE_SERIAL, 1,
+	          Whether you have serial support enabled)
 fi
 GP_CONFIG_MSG(Serial ports)
 GP_CONFIG_MSG(Serial support,$serial_msg)
@@ -302,8 +292,8 @@
 # $0($1)
 AC_ARG_ENABLE($1,
 AS_HELP_STRING(--disable-$1,
-		do not use $1 library)
-,
+                do not use $1 library)dnl
+, dnl
 	if test x$enableval = xno; then
 		try_$1=false
 	fi
@@ -315,18 +305,20 @@
 ttylock_msg=no
 if $try_ttylock; then
 	AC_CHECK_HEADER(lockdev.h)
-	AC_CHECK_HEADER(ttylock.h,
+	AC_CHECK_HEADER(ttylock.h, dnl
 		lockdev_result="no"
 		AC_TRY_LINK(#include <ttylock.h>,ttylocked ("/dev/foo");,
 			lockdev_result="no"
-			AC_DEFINE(HAVE_TTYLOCK,1,Define if you have ttylock based tty locking.)
+			AC_DEFINE(HAVE_TTYLOCK, 1,
+			          Define if you have ttylock based tty locking.)
 			ttylock_msg=yes
 			try_lockdev=false,
 			save_LIBS="$LIBS"
 			LIBS="$LIBS -llockdev"
 			AC_TRY_LINK(#include <ttylock.h>,ttylocked ("/dev/foo");,
 				lockdev_result="yes"
-				AC_DEFINE(HAVE_TTYLOCK,1,Define if you have ttylock based tty locking.)
+				AC_DEFINE(HAVE_TTYLOCK, 1,
+				          Define if you have ttylock based tty locking.)
 				ttylock_msg=yes
 				try_lockdev=false
 				SERIAL_LIBS=-llockdev
@@ -335,7 +327,7 @@
 		)
 		AC_MSG_CHECKING(if ttylock needs lockdev)
 		AC_MSG_RESULT(${lockdev_result})
-	,,#ifdef HAVE_LOCKDEV_H
+	, , #ifdef HAVE_LOCKDEV_H
 # include <lockdev.h>
 #endif
 	)
@@ -344,9 +336,10 @@
 
 lockdev_msg=no
 if $try_lockdev; then
-	AC_CHECK_LIB(lockdev, dev_lock,
-		AC_CHECK_HEADER(lockdev.h,
-			AC_DEFINE(HAVE_LOCKDEV,1,Define if you have dev_lock/lockdev based locking.)
+	AC_CHECK_LIB(lockdev, dev_lock, dnl
+		AC_CHECK_HEADER(lockdev.h, dnl
+			AC_DEFINE(HAVE_LOCKDEV, 1,
+			          Define if you have dev_lock/lockdev based locking.)
 			lockdev_msg=yes
 			SERIAL_LIBS=-llockdev
 		)
@@ -366,7 +359,7 @@
 dnl libpthread is dynamically linked by libusb, which is dynamically loaded
 dnl but newer Linux systems need it on startup, not later. So link libgphoto2_port
 dnl against libpthread
-AC_CHECK_LIB(pthread, pthread_create)
+AC_CHECK_LIB(pthread, pthread_create)
 
 dnl ---------------------------------------------------------------------------
 dnl libusb1
@@ -375,11 +368,11 @@
 GP_CHECK_LIBRARY(LIBUSB1,libusb-1.0,>= 1.0.0,
 		libusb.h,libusb_init,
         case "$host" in
-          *-*-mingw* | *-*-cygwin* | *-*-msvc* )
-	  IOLIB_LIST="$IOLIB_LIST usb1"
+          *-linux*)
+	  IOLIB_LIST="$IOLIB_LIST usb1 usbdiskdirect usbscsi"
           ;;
           *)
-	  IOLIB_LIST="$IOLIB_LIST usb1 usbdiskdirect usbscsi"
+	  IOLIB_LIST="$IOLIB_LIST usb1"
           ;;
         esac
 
@@ -387,12 +380,12 @@
 	# note that the library is not always named libusb-1.0.so , e.g. on freebsd it is not.
 	save_LIBS="$LIBS"
 	LIBS="$LIBS $LIBUSB1_LIBS"
-	AC_CHECK_FUNC(libusb_strerror, 
-		AC_DEFINE(HAVE_LIBUSB_STRERROR,1,Define if libusb-1.0 has libusb_strerror)
+	AC_CHECK_FUNC(libusb_strerror, dnl
+		AC_DEFINE(HAVE_LIBUSB_STRERROR, 1,
+		          Define if libusb-1.0 has libusb_strerror)
 	)
 	LIBS="$save_LIBS"
-
-,,
+, ,
 		default-on,
 		http://libusb.sourceforge.net/
 )
@@ -404,25 +397,34 @@
 	  dnl Windows itself has usb.h we mis-detect, in that case remove access to the other usb.h
 	  IOLIB_LIST="$IOLIB_LIST usb"
 	  ;;
-	  *)
+          *-linux*)
 	  if test "x$have_LIBUSB1" != xyes; then
 		IOLIB_LIST="$IOLIB_LIST usb usbdiskdirect usbscsi"
           else
 		GP_CONFIG_MSG(libusb0 support,detected, but disabled (libusb1 support is enabled))
           fi
 	  ;;
+	  *)
+	  if test "x$have_LIBUSB1" != xyes; then
+		IOLIB_LIST="$IOLIB_LIST usb"
+          else
+		GP_CONFIG_MSG(libusb0 support,detected, but disabled (libusb1 support is enabled))
+          fi
+	  ;;
 	esac
-,,
+, ,
 		default-on,
 		http://libusb.sourceforge.net/
 )
 dnl depends on libusb's availability
-GP_UDEV(test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes)
+GP_UDEV(test "x$have_LIBUSB" = xyes || test "x$have_LIBUSB1" = xyes)
 
 
 AC_ARG_ENABLE(disk,
-	AS_HELP_STRING(--disable-disk, disable the 'disk' port driver),
-	,enable_disk=yes)
+	AS_HELP_STRING(--disable-disk,
+	                disable the 'disk' port driver),
+	,
+	enable_disk=yes)
 
 dnl disk port also works everywhere, but it's not really necessary
 if test "x$enable_disk" = "xyes"; then
@@ -430,8 +432,9 @@
 fi
 
 AC_ARG_ENABLE(vusb,
-	AS_HELP_STRING(--enable-vusb, enable the 'vusb' virtual USB port driver),
-	,
+	AS_HELP_STRING(--enable-vusb,
+	                enable the 'vusb' virtual USB port driver),
+	, dnl
 		enable_vusb=no
 		GP_CONFIG_MSG(virtual USB support,disabled, no virtual PTP test camera)
 	
@@ -443,27 +446,40 @@
 fi
 
 AC_ARG_ENABLE(ptpip,
-	AS_HELP_STRING(--disable-ptpip, disable the 'ptpip' port driver for TCP/IP connected PTP cameras),
-	,enable_ptpip=yes)
+	AS_HELP_STRING(--disable-ptpip,
+	                disable the 'ptpip' port driver for TCP/IP connected PTP cameras),
+	, dnl
+		enable_ptpip=yes
+)
 dnl ptpip - works 'everywhere' with TCP/IP stack.
-if test "x$enable_ptpip" = "xyes"; then
+AS_VAR_IF(enable_ptpip, yes, dnl
 	IOLIB_LIST="$IOLIB_LIST ptpip"
-fi
+)
 
 # ----------------------------------------------------------------------
 # Define IOLIB stuff
 # ----------------------------------------------------------------------
 
-AC_SUBST(IOLIB_LIST)
+
+dnl ---------------------------------------------------------------------------
+dnl iolib installation directory
+dnl ---------------------------------------------------------------------------
+
+GP_DRIVERDIR(iolibdir, IOLIBS, iolibs (port libraries))
+
+
+dnl ---------------------------------------------------------------------------
+dnl List of iolibs (port drivers)
+dnl ---------------------------------------------------------------------------
+AC_SUBST(IOLIB_LIST)
 for x in ${IOLIB_LIST}; do
     IOLIB_LTLIST="${IOLIB_LTLIST} ${x}.la"
 done
-AC_SUBST(IOLIB_LTLIST)
-AC_SUBST(iolibdir,"\$(libdir)/\$(PACKAGE_TARNAME)/\$(VERSION)")
-AM_CPPFLAGS="$AM_CPPFLAGS -DIOLIBS=\\\"${iolibdir}\\\""
+AC_SUBST(IOLIB_LTLIST)
 
 sorted_iolib_list="$(echo "${IOLIB_LIST}" | tr ' ' '\n' | sort | ${SED} '/^$/d' | tr '\n' ' ' | ${SED} 's/ $//')"
-AC_DEFINE_UNQUOTED(IOLIB_LIST, "${sorted_iolib_list}", Define as string containing a list of the iolibs)
+AC_DEFINE_UNQUOTED(IOLIB_LIST, "${sorted_iolib_list}",
+                   Define as string containing a list of the iolibs)
 GP_CONFIG_MSG(General)
 GP_CONFIG_MSG(IOLIBs, ${sorted_iolib_list})
 
@@ -478,20 +494,22 @@
 dnl ----------------------------------------------------------------------
 dnl GNU regex?
 dnl ----------------------------------------------------------------------
-AC_CHECK_FUNC(re_compile_pattern,
-              AC_DEFINE(HAVE_GNU_REGEX,1,Define if you have GNU regex.)
-)
+AC_CHECK_FUNC(re_compile_pattern,
+              AC_DEFINE(HAVE_GNU_REGEX, 1,
+	                 Define if you have GNU regex.))
 
 
 dnl ----------------------------------------------------------------------
 dnl disable debugging if requested
 dnl ----------------------------------------------------------------------
 AC_ARG_ENABLE(debug,
-  AS_HELP_STRING(--disable-debug,do not include debugging code),
-
-  if test "$enableval" = "no"; then
-    AC_DEFINE(DISABLE_DEBUGGING,1,Define if you want to disabled debugging.)
-  fi
+  AS_HELP_STRING(--disable-debug,
+                  do not include debugging code),
+  dnl
+    AS_VAR_IF(enableval, no, dnl
+      AC_DEFINE(DISABLE_DEBUGGING, 1,
+                Define if you want to disabled debugging.)
+    )
 )
 
 
@@ -499,7 +517,6 @@
 # gtk-doc?
 # ----------------------------------------------------------------------
 GP_CONFIG_MSG(Documentation)
-GP_CHECK_DOC_DIR()dnl
 GP_BUILD_GTK_DOCS()dnl
 
 
@@ -528,15 +545,14 @@
 # Create output files
 # ---------------------------------------------------------------------------
 AC_CONFIG_FILES(
-Makefile
-po/Makefile.in
-libgphoto2_port/Makefile
-libgphoto2_port.pc
-libgphoto2_port-uninstalled.pc
-gphoto2-port-config
-test/Makefile
-doc/Makefile
-gphoto-m4/Makefile
+  Makefile
+  po/Makefile.in
+  libgphoto2_port/Makefile
+  libgphoto2_port.pc
+  libgphoto2_port-uninstalled.pc
+  gphoto2-port-config
+  tests/Makefile
+  doc/Makefile
 )
 AC_OUTPUT

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/disk/disk.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/disk/disk.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/doc/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/doc/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/doc/gphoto2-port-api.sgml -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/doc/gphoto2-port-api.sgml Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/Makefile-files Changed

@@ -3,6 +3,8 @@
 EXTRA_DIST += %reldir%/README.md
 EXTRA_DIST += %reldir%/gphoto-m4-sync
 
+EXTRA_DIST += %reldir%/gp-asm-symver-ifelse.m4
+EXTRA_DIST += %reldir%/gp-asm-symver-support.m4
 EXTRA_DIST += %reldir%/gp-byteorder.m4
 EXTRA_DIST += %reldir%/gp-camlibs.m4
 EXTRA_DIST += %reldir%/gp-check-doxygen.m4
@@ -11,9 +13,10 @@
 EXTRA_DIST += %reldir%/gp-check-shell-environment.m4
 EXTRA_DIST += %reldir%/gp-config-msg.m4
 EXTRA_DIST += %reldir%/gp-documentation.m4
-EXTRA_DIST += %reldir%/gp-dynamic-libraries.m4
-EXTRA_DIST += %reldir%/gp-gettext-hack.m4
+EXTRA_DIST += %reldir%/gp-driverdir.m4
+EXTRA_DIST += %reldir%/gp-gettext-setup.m4
 EXTRA_DIST += %reldir%/gp-internal-docs.m4
+EXTRA_DIST += %reldir%/gp-libjpeg.m4
 EXTRA_DIST += %reldir%/gp-libltdl.m4
 EXTRA_DIST += %reldir%/gp-manual-docbook-xml.m4
 EXTRA_DIST += %reldir%/gp-manual-documentation.m4
@@ -23,9 +26,11 @@
 EXTRA_DIST += %reldir%/gp-manual-pstoimg.m4
 EXTRA_DIST += %reldir%/gp-manual-w3m.m4
 EXTRA_DIST += %reldir%/gp-packaging.m4
-EXTRA_DIST += %reldir%/gp-pkg-config.m4
+EXTRA_DIST += %reldir%/gp-pedantic-compiler-flags.m4
+EXTRA_DIST += %reldir%/gp-progs.m4
 EXTRA_DIST += %reldir%/gp-references.m4
-EXTRA_DIST += %reldir%/gp-stdint.m4
+EXTRA_DIST += %reldir%/gp-set.m4
+EXTRA_DIST += %reldir%/gp-sleep.m4
 EXTRA_DIST += %reldir%/gp-subpackage.m4
 EXTRA_DIST += %reldir%/gp-udev.m4
 EXTRA_DIST += %reldir%/gp-va-copy.m4

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-asm-symver-ifelse.m4 Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-asm-symver-support.m4 Added

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-byteorder.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-byteorder.m4 Changed

@@ -1,3 +1,9 @@
+# gp-byteorder.m4 - check byteorder and provide functions      -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
 dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE )
 dnl Originally written by Dan Fandrich <dan@coneharvesters.com>
 dnl My contribution is hereby placed into the public domain.
@@ -40,17 +46,18 @@
 
 # We're only interested in the target CPU, but it's not always set
 effective_target="$target"
-if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
+if test "x$effective_target" = xNONE || test "x$effective_target" = x ; then
 	effective_target="$host"
 fi
 AC_SUBST(effective_target)
 
+m4_pattern_allow(GP_BYTEORDER_H)dnl
 cat > "$1" << EOF
 /* This file is generated automatically by configure */
 /* It is valid only for the system type ${effective_target} */
 
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
+#ifndef GP_BYTEORDER_H
+#define GP_BYTEORDER_H
 
 EOF
 
@@ -272,6 +279,9 @@
 #ifndef htole32
 # define htole32(x)      swap32(x)
 #endif
+#ifndef htole64
+# define htole64(x)      swap64(x)
+#endif
 #ifndef le16toh
 # define le16toh(x)      swap16(x)
 #endif
@@ -291,6 +301,7 @@
 
 #define HTOLE16(x)      (x) = htole16(x)
 #define HTOLE32(x)      (x) = htole32(x)
+#define HTOLE64(x)      (x) = htole64(x)
 #define LE16TOH(x)      (x) = le16toh(x)
 #define LE32TOH(x)      (x) = le32toh(x)
 #define LE64TOH(x)      (x) = le64toh(x)
@@ -345,7 +356,7 @@
 
 cat >> "$1" << EOF
 /* Define the C99 standard length-specific integer types */
-#include <_stdint.h>
+#include <stdint.h>
 
 EOF
 
@@ -442,5 +453,13 @@
 
 
 cat >> "$1" << EOF
-#endif /*__BYTEORDER_H*/
-EOF)
+#endif /* GP_BYTEORDER_H */
+EOF
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-camlibs.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-camlibs.m4 Changed

@@ -1,168 +1,494 @@
+# gp-camlibs.m4 - define camlibs and camlib infrastructure     -*- Autoconf -*-
+# serial 14
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl
 dnl GP_CAMLIB & Co.
 dnl
+dnl ####################################################################
+dnl
 dnl Redundancy free definition of libgphoto2 camlibs.
 dnl
-dnl Removes the redundany from the camlib lists, and executes
-dnl additional consistency checks, e.g. to ensure that subdirectories
-dnl actually exist.
+dnl Removes the redundancy from the camlib lists, and executes
+dnl additional consistency checks on the build system.
+dnl
+dnl Every camlib belongs to one of the following (disjunct) sets of
+dnl camlibs:
+dnl
+dnl   * the 'standard' set
+dnl
+dnl     The set of camlibs which is most likely to support the most
+dnl     cameras. This is the default when --with-camlibs=... is not
+dnl     given. This used to be called 'all', even though it
+dnl     definitively does not comprise all camlibs.
+dnl
+dnl   * the 'outdated' set
+dnl
+dnl     These cameras are outdated in some way. The cameras may have
+dnl     fallen out of use, the camlib might have been superseded by
+dnl     another one, or other reasons. Not built by default.
+dnl
+dnl   * the 'unlisted' set
 dnl
-dnl You can mark camlibs as unlisted, i.e. they won't be listed
-dnl explicitly but still be recognized.
+dnl     These camlibs will not be listed by './configure --help', but
+dnl     they can still be added to the set of camlibs to be built.
 dnl
 dnl Example usage:
 dnl
 dnl   GP_CAMLIB(canon)
 dnl   GP_CAMLIB(casio)
 dnl   ...
+dnl   AM_COND_IF(HAVE_LIBCURL, dnl
+dnl   AM_COND_IF(HAVE_LIBXML2, dnl
+dnl     GP_CAMLIB(lumix)dnl
+dnl   )
+dnl   )
+dnl   ...
 dnl   GP_CAMLIB(ptp,unlisted)
 dnl   GP_CAMLIB(ptp2)
 dnl   ...
 dnl   GP_CAMLIB(toshiba)
-dnl   GP_CAMLIBS_DEFINE(camlibs)
+dnl   GP_CAMLIBS_DEFINE()
 dnl
-dnl The camlibs basedir parameter of GP_CAMLIBS_DEFINE is optional.
 dnl
 dnl ####################################################################
+dnl Implementation remarks
+dnl ####################################################################
+dnl
+dnl Note that at this time, the set names are hard coded, but could be
+dnl moved to a m4 time automatic set of set names at a later time.
+dnl
+dnl A few notes on macro and variable naming:
+dnl
+dnl   * GP_* are the macros to be called from configure.ac
+dnl   * GP_CAMLIBS_* are also shell variables exported to configure.ac
+dnl     shell code and Makefile.am files
+dnl   * gp_m4_* are the macros used inside those macros as m4 variables
+dnl   * gp_sh_* are the shell variables used inside the GP_ shell code
+dnl   * The old, inconsistent names of the as untouched variables
+dnl     exported to configure.ac and Makefile.am are still inconsistent.
+dnl
 dnl
-AC_DEFUN(GP_CAMLIBS_INIT,dnl
+dnl ####################################################################
+dnl Forbid everything first, allow specific variable names later
+dnl ####################################################################
+m4_pattern_forbid(GP_CAMLIBS_)dnl
+m4_pattern_forbid(GP_CAMLIB_)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl _GP_CAMLIBS_INIT
+dnl   Called internally when required.
+dnl ####################################################################
+AC_DEFUN_ONCE(_GP_CAMLIBS_INIT,dnl
+dnl # BEGIN $0($@)
 AC_BEFORE($0,GP_CAMLIB)dnl
-m4_define_default(gp_camlib_srcdir, camlibs)dnl
-m4_define_default(gp_camlibs, )dnl
-m4_define_default(gp_camlibs_unlisted, )dnl
+AC_REQUIRE(AC_PROG_GREP)dnl
+AC_REQUIRE(AC_PROG_SED)dnl
+AC_REQUIRE(GP_PROG_CMP)dnl
+AC_REQUIRE(GP_PROG_SORT)dnl
+AC_REQUIRE(GP_PROG_TR)dnl
+AC_REQUIRE(GP_PROG_UNIQ)dnl
+m4_foreach_w(var, everything standard unlisted outdated, dnl
+  m4_set_empty(gp_m4s_camlib_set_var, , dnl
+    m4_errprintn(Error: non-empty set gp_m4s_camlib_set_var already defined)dnl
+    m4_exit(1)dnl
+  )dnl
+)dnl
+GP_SET_DEFINE(camlib-set-standard)dnl
+GP_SET_DEFINE(camlib-set-unlisted)dnl
+GP_SET_DEFINE(camlib-set-outdated)dnl
+dnl # END $0($@)
 )dnl
 dnl
-dnl ####################################################################
 dnl
+dnl ####################################################################
+dnl GP_CAMLIB(mycamlib)
+dnl GP_CAMLIB(mycamlib, outdated)
+dnl   Add the camlib 'mycamlib' to the "standard" set of camlibs or
+dnl   the "outdated" set of camlibs, respectively.
+dnl ####################################################################
+m4_pattern_forbid(GP_CAMLIB)dnl
 AC_DEFUN(GP_CAMLIB,dnl
-AC_REQUIRE(GP_CAMLIBS_INIT)dnl
+dnl # BEGIN $0($@)
+AC_REQUIRE(_GP_CAMLIBS_INIT)dnl
 AC_BEFORE($0,GP_CAMLIBS_DEFINE)dnl
-m4_if($2,unlisted,dnl
-# $0($1,$2)
-m4_append(gp_camlibs_unlisted, $1,  )dnl
-,$#,1,dnl
-# $0($1)
-m4_append(gp_camlibs, $1,  )dnl
-,dnl
-m4_errprint(__file__:__line__: Error:
-*** Illegal parameter 2 to $0: `$2'
-*** Valid values are: undefined or unlisted
-)dnl
+m4_case($#,2,dnl
+  m4_case($2, unlisted, dnl
+    GP_SET_ADD(camlib-set-unlisted, $1)
+    m4_set_add(gp_m4s_camlib_set_unlisted, $1)dnl
+  , outdated, dnl
+    GP_SET_ADD(camlib-set-outdated, $1)
+    m4_set_add(gp_m4s_camlib_set_outdated, $1)dnl
+  , dnl
+    m4_errprintn(__file__:__line__: Error: Wrong second argument to GP_CAMLIB)dnl
+    m4_exit(1)dnl
+  )dnl
+, 1, dnl
+  GP_SET_ADD(camlib-set-standard, $1)
+  m4_set_add(gp_m4s_camlib_set_standard, $1)dnl
+, dnl
+  m4_errprintn(__file__:__line__: Error: Wrong number of arguments to GP_CAMLIB)dnl
+  m4_exit(1)dnl
+)dnl m4_case $#
+m4_set_add(gp_m4s_camlib_set_everything, $1, , dnl
+m4_errprintn(__file__:__line__:Duplicate declaration of camlib $1)dnl
 m4_exit(1)dnl
 )dnl
-)dnl
+dnl # END $0($@)
+)dnl AC_DEFUN GP_CAMLIB
 dnl
-dnl ####################################################################
 dnl
+dnl ####################################################################
+dnl GP_CAMLIBS_WARNING
+dnl   Print warning about building a non-"standard" set of camlibs.
+dnl ####################################################################
 AC_DEFUN(GP_CAMLIBS_WARNING,dnl
 AC_MSG_WARN(
 
-# Caution: You have chosen to build a non-standard set of camlibs.
-#          You may have disabled the camlib required for your camera, or
-#          enabled a camlib that does *not* work, and overrides the camlib
-#          that does work. Consequently,
-#          YOUR CAMERA MAY NOT WORK!
-# 
-# Many cameras of several brands are supported by a camlib with a 
-# name different from the name of the camera brand or model. If you
-# are unsure, please
-#   * enable at least the "ptp2" camlib
-#   * or even better, just build "all" camlibs.
+  #=====================================================================#
+  # Caution: You have chosen to build a non-standard set of camlibs.    #
+  #          You may have disabled the camlib required for your camera, #
+  #          or enabled a camlib which does *not* work and overrides    #
+  #          the camlib which *does* work. Consequently,                #
+  #          YOUR CAMERA MAY NOT WORK!                                  #
+  #                                                                     #
+  # Many cameras of several brands are supported by a camlib with a     #
+  # name different from the name of the camera brand or model. If you   #
+  # are unsure, please                                                  #
+  #   * enable at least the 'ptp2' camlib                               #
+  #   * or even better, just build the standard set of camlibs.         #
+  #=====================================================================#
 )
-sleep 2
+GP_SLEEP_IF_TTY(5)
 )
 dnl
+dnl
 dnl ####################################################################
+dnl GP_CAMLIBS_CONDITIONAL_WARNING
+dnl   Call GP_CAMLIBS_WARNING when required.
+dnl ####################################################################
+AC_DEFUN(GP_CAMLIBS_CONDITIONAL_WARNING, dnl
+AS_VAR_IF(gp_sh_with_camlibs, standard, dnl
+, dnl
+GP_CAMLIBS_WARNING
+)
+)dnl
 dnl
+dnl
+dnl ####################################################################
+dnl GP_CAMLIBS_DEFINE
+dnl   Determine the set of camlibs to build from the --with-camlibs
+dnl   parameter, and set the build variables accordingly.
+dnl ####################################################################
 AC_DEFUN(GP_CAMLIBS_DEFINE,dnl
-AC_REQUIRE(GP_CAMLIBS_INIT)dnl
-m4_pattern_allow(m4_strip)dnl
-m4_ifval($1,m4_define(gp_camlib_srcdir,$1))dnl
-dnl for camlib in m4_strip(gp_camlibs) m4_strip(gp_camlibs_unlisted)
-dnl do
-dnl 	if test -d "$srcdir/m4_strip(gp_camlib_srcdir)/$camlib"; then :; else
-dnl 		AC_MSG_ERROR(
-dnl * Fatal:
-dnl * Source subdirectory for camlib \`$camlib' not found in
-dnl * directory \`$srcdir/m4_strip(gp_camlib_srcdir)/'
-dnl )
-dnl 	fi
-dnl done
-AC_MSG_CHECKING(which camlibs to compile)
+# BEGIN $0($@)
+AC_REQUIRE(_GP_CAMLIBS_INIT)dnl
+AC_REQUIRE(GP_PROG_EXPR)dnl
+
+dnl GP_SET_MSG(camlib-set-standard)
+dnl GP_SET_MSG(camlib-set-outdated)
+dnl GP_SET_MSG(camlib-set-unlisted)
+
+dnl Convert sets defined at m4 time (i.e. autoreconf time)
+dnl into the same format as the sh time (i.e. configure time)
+dnl defined sets.
+m4_foreach_w(var, everything standard outdated unlisted, dnl
+GP_SET_DEFINE(m4-camlib-set-var)
+GP_SET_ADD_ALL(m4-camlib-set-varm4_set_listc(gp_m4s_camlib_set_var))
+)dnl
+
+dnl GP_SET_MSG(m4-camlib-set-standard)
+dnl GP_SET_MSG(m4-camlib-set-unlisted)
+dnl GP_SET_MSG(m4-camlib-set-outdated)
+
+GP_SET_DEFINE(camlib-set-everything)dnl
+GP_SET_UNION(camlib-set-everything, camlib-set-standard, camlib-set-outdated, camlib-set-unlisted)
+
+dnl GP_SET_MSG(camlib-set-everything)
+dnl GP_SET_MSG(m4-camlib-set-everything)
+
 dnl Yes, that help output won't be all that pretty, but we at least
 dnl do not have to edit it by hand.
 AC_ARG_WITH(camlibs,AS_HELP_STRING(
 	--with-camlibs=<list>,
 	Compile camera drivers (camlibs) in <list>. dnl
-	Drivers may be separated with commas. dnl
+	Camlibs may be separated with commas. dnl
 	CAUTION: DRIVER NAMES AND CAMERA NAMES MAY DIFFER. dnl
-	'all' is the default and compiles all camlibs. dnl
-	Possible camlibs are: dnl
-	m4_strip(gp_camlibs)),
-	camlibs="$withval",
-	camlibs="all")dnl
-dnl
-ALL_DEFINED_CAMLIBS="m4_strip(gp_camlibs) m4_strip(gp_camlibs_unlisted)"
-ALL_DEFAULT_CAMLIBS="m4_strip(gp_camlibs)"
-BUILD_THESE_CAMLIBS_BASE=""
-if test "$camlibs" = "all"; then
-	BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-	AC_MSG_RESULT(all)
-else
-	# If the string starts with "all,", we start with the default list
-	# and add the explicitly defined ones later
-	if echo "$camlibs" | grep "^all," > /dev/null; then
-		BUILD_THESE_CAMLIBS_BASE="$ALL_DEFAULT_CAMLIBS"
-		camlibs="$(echo "$camlibs" | sed 's/^all,//')"
-	fi
-	# camlibs=$(echo $camlibs | sed 's/,/ /g')
-	IFS_save="$IFS"
-	IFS=",$IFS"
-	# Walk through enumeration of camlibs given by user and add them to list
-	# of camlibs to build if we know them.
-	for camlib in ${camlibs}; do
-		IFS="$IFS_save"
-		found=false
-		for from_all_camlib in ${ALL_DEFINED_CAMLIBS}; do
-			if test "$camlib" = "$from_all_camlib"; then
-				if test "x$BUILD_THESE_CAMLIBS_BASE" = "x"; then
-					BUILD_THESE_CAMLIBS_BASE="$camlib"
-				else
-					BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE $camlib"
-				fi
-				found=:
-				break
-			fi
-		done
-		if $found; then :; else
-			AC_MSG_ERROR(Unknown camlib $camlib!)		
-		fi
-	done
-        if test "x$BUILD_THESE_CAMLIBS_BASE" = "xcanon" ; then
-		# Gentoo mode... if user just said "canon", add "ptp2" ... should save support requests.
-		BUILD_THESE_CAMLIBS_BASE="$BUILD_THESE_CAMLIBS_BASE ptp2"
-		camlibs="$camlibs ptp2"
-		AC_MSG_WARN(
-		"You have just selected the old canon driver. However most current Canons\n"
-		"are supported by the PTP2 driver.\n"
-		"Autoselecting ptp2 driver too to avoid support requests.\n"
+	'standard' is the default and is a standard set of camlibs: dnl
+	m4_set_contents(gp_m4s_camlib_set_standard,  ).
+	'outdated' is a set of camlibs for very old cameras: dnl
+	m4_set_contents(gp_m4s_camlib_set_outdated,  ).dnl
+	'everything' is the set including every camlib. dnl
+	You can add or remove camlibs or camlib sets by appending dnl
+	them to the list with a + or - sign in front.),
+	gp_sh_with_camlibs="${withval}",
+	gp_sh_with_camlibs="standard")dnl
+
+dnl For backwards compatibility, accept --with-camlibs='all' and
+dnl interpret it as --with-camlibs='standard'.
+AS_VAR_IF(gp_sh_with_camlibs, all, dnl
+  gp_sh_with_camlibs="standard"
+)dnl
+
+dnl Gentoo mode... if user just requested "canon",
+dnl add "ptp2" to save support requests.
+AS_VAR_IF(gp_sh_with_camlibs, canon, dnl
+	gp_sh_with_camlibs="${gp_sh_with_camlibs} ptp2"
+	AC_MSG_WARN(
+
+    #==============================================================#
+    # You have selected only the old 'canon' driver. However, most #
+    # current Canon camera models require the 'ptp2' driver.       #
+    #                                                              #
+    # Autoselecting the 'ptp2' driver in addition to the 'canon'   #
+    # driver to prevent unnecessary support requests.              #
+    #==============================================================#
+)
+	GP_SLEEP_IF_TTY(5)
+)dnl
+
+dnl set -x
+
+AC_MSG_CHECKING(with-camlibs requested)
+AS_VAR_IF(gp_sh_with_camlibs, standard, dnl
+	AC_MSG_RESULT(standard set)
+, dnl
+	gp_sh_with_camlibs="$(AS_ECHO("${gp_sh_with_camlibs}") | ${TR} ',' ' ')"
+	AC_MSG_RESULT(${gp_sh_with_camlibs})
+)
+
+dnl AC_MSG_CHECKING(for nothing)
+dnl AC_MSG_RESULT(nihil)
+
+dnl Iterate over the list of given camlibs.
+dnl
+dnl Replace 'standard', 'outdated', 'unlisted', and 'everything' with
+dnl the respective set of camlibs, and make sure any camlibs specified
+dnl explicitly are actually valid defined camlibs.
+GP_SET_DEFINE(m4-camlib-set)
+GP_SET_DEFINE(camlib-set)
+for gp_camlib in ${gp_sh_with_camlibs}
+do
+    case "X$gp_camlib" in #(
+    X-*)
+	operator=remove
+	gp_camlib="$(AS_ECHO("Y${gp_camlib}") | ${SED} 's/^Y.//')"
+	;; #(
+    X+*)
+	operator=add
+	gp_camlib="$(AS_ECHO("Y${gp_camlib}") | ${SED} 's/^Y.//')"
+	;; #(
+    XA-Za-z0-9*)
+	operator=add
+	;; #(
+    *)
+	AC_MSG_ERROR(Invalid name given for camlib set or camlib: '${gp_camlib}')
+	;;
+    esac
+    dnl AC_MSG_CHECKING(with-camlibs operator)
+    dnl AC_MSG_RESULT(${operator})
+    dnl AC_MSG_CHECKING(with-camlibs camlib)
+    dnl AC_MSG_RESULT(${gp_camlib})
+
+    dnl Convert deprecated "all" parameter to "standard".
+    case "$gp_camlib" in #(
+    all)
+	AC_MSG_WARN(
+
+    #=============================================================#
+    # You have used 'all' in the argument to the configure script #
+    # --with-camlibs= parameter.  'all' is a deprecated name for  #
+    # the 'standard' camlib set.                                  #
+    #                                                             #
+    # Please change your call to the configure script to use      #
+    # 'standard' instead.                                         #
+    #=============================================================#
+)
+	GP_SLEEP_IF_TTY(5)
+	gp_camlib="standard"
+	;;
+    esac
+
+    dnl Now gp_camlib contains the camlib string, and operator 'add' or 'remove'.
+    case "$operator" in #(
+    add)
+        case "$gp_camlib" in #(
+        standard)
+            GP_SET_UNION(m4-camlib-set, m4-camlib-set, m4-camlib-set-standard)
+            GP_SET_UNION(camlib-set, camlib-set, camlib-set-standard)
+            ;; #(
+        outdated)
+            GP_SET_UNION(m4-camlib-set, m4-camlib-set, m4-camlib-set-outdated)
+            GP_SET_UNION(camlib-set, camlib-set, camlib-set-outdated)
+            ;; #(
+        unlisted)
+            GP_SET_UNION(m4-camlib-set, m4-camlib-set, m4-camlib-set-unlisted)
+            GP_SET_UNION(camlib-set, camlib-set, camlib-set-unlisted)
+            ;; #(
+        everything)
+            GP_SET_UNION(m4-camlib-set, m4-camlib-set, m4-camlib-set-everything)
+            GP_SET_UNION(camlib-set, camlib-set, camlib-set-everything)
+            ;; #(
+        *)
+	    GP_SET_CONTAINS_IFELSE(m4-camlib-set-everything, "${gp_camlib}", dnl
+                GP_SET_ADD(m4-camlib-set, "$gp_camlib")
+                GP_SET_ADD(camlib-set, "$gp_camlib")
+            , dnl
+                AC_MSG_ERROR(Unknown camlib found in --with-camlibs: '${gp_camlib}')
+            )
+            ;;
+        esac
+	;; #(
+    remove)
+        case "$gp_camlib" in #(
+        standard)
+            GP_SET_DIFFERENCE(camlib-set, camlib-set, camlib-set-standard)
+            GP_SET_DIFFERENCE(m4-camlib-set, m4-camlib-set, m4-camlib-set-standard)
+            ;; #(
+        outdated)
+            GP_SET_DIFFERENCE(camlib-set, camlib-set, camlib-set-outdated)
+            GP_SET_DIFFERENCE(m4-camlib-set, m4-camlib-set, m4-camlib-set-outdated)
+            ;; #(
+        unlisted)
+            GP_SET_DIFFERENCE(camlib-set, camlib-set, camlib-set-unlisted)
+            GP_SET_DIFFERENCE(m4-camlib-set, m4-camlib-set, m4-camlib-set-unlisted)
+            ;; #(
+        everything)
+            GP_SET_DIFFERENCE(camlib-set, camlib-set, camlib-set-everything)
+            GP_SET_DIFFERENCE(m4-camlib-set, m4-camlib-set, m4-camlib-set-everything)
+            ;; #(
+        *)
+	    GP_SET_CONTAINS_IFELSE(m4-camlib-set-everything, "${gp_camlib}", dnl
+                GP_SET_REMOVE(camlib-set, "$gp_camlib")
+	        GP_SET_CONTAINS_IFELSE(m4-camlib-set, "$gp_camlib", dnl
+                    GP_SET_REMOVE(m4-camlib-set, "$gp_camlib")
+		, dnl
+		    AC_MSG_WARN(Removing camlib ${gp_camlib} from m4-camlib-set which does not contain ${gp_camlib})
 		)
-        fi
-	IFS="$IFS_save"
-	AC_MSG_RESULT($camlibs)
-	GP_CAMLIBS_WARNING
-	AC_DEFINE_UNQUOTED(INCOMPLETE_CAMLIB_SET, "$BUILD_THESE_CAMLIBS_BASE", 
-                           Whether the set of camlibs built is incomplete)
-fi
-BUILD_THESE_CAMLIBS=""
-for f in $BUILD_THESE_CAMLIBS_BASE
+            , dnl
+                AC_MSG_ERROR(Unknown camlib found in --with-camlibs: '${gp_camlib}')
+            )
+            ;;
+        esac
+	;;
+    esac
+done
+AS_UNSET(gp_camlib)
+AC_MSG_CHECKING(with-camlibs parsing)
+AC_MSG_RESULT(finished)
+
+dnl GP_SET_MSG(m4-camlib-set)
+dnl GP_SET_MSG(camlib-set)
+
+dnl Camlibs requested, but cannot be built.
+GP_SET_DEFINE(camlib-set-diff-skipping)
+GP_SET_DIFFERENCE(camlib-set-diff-skipping, m4-camlib-set, camlib-set)
+GP_SET_MSG(camlib-set-diff-skipping)
+
+dnl Camlibs added over the standard set
+GP_SET_DEFINE(camlib-set-diff-over-standard)
+GP_SET_DIFFERENCE(camlib-set-diff-over-standard, camlib-set, camlib-set-standard)
+GP_SET_MSG(camlib-set-diff-over-standard)
+
+dnl Camlibs missing from the standard set
+GP_SET_DEFINE(camlib-set-diff-from-standard)
+GP_SET_DIFFERENCE(camlib-set-diff-from-standard, camlib-set-standard, camlib-set)
+GP_SET_MSG(camlib-set-diff-from-standard)
+
+GP_SET_DEBUG_MSG(camlib-set-diff-skipping)
+GP_SET_DEBUG_MSG(camlib-set-diff-from-standard)
+GP_SET_DEBUG_MSG(camlib-set-diff-over-standard)
+
+GP_SET_SPACE_VAR(camlib-set-diff-skipping, gp_camlib_set_skipping)dnl
+
+dnl We could use the cardinality of the difference sets to determine
+dnl how far we are from the standard set.  If we do not differ too
+dnl much, we can still show the camlib set as "standard plus these
+dnl minus those skipping that" instead of just listing the camlib
+dnl names.
+
+dnl gp_camlibs_from_standard="$(GP_SET_CARDINALITY(camlib-set-diff-from-standard))"
+dnl AC_MSG_CHECKING(camlibs removed from standard set)
+dnl AC_MSG_RESULT(${gp_camlibs_from_standard})
+
+dnl gp_camlibs_over_standard="$(GP_SET_CARDINALITY(camlib-set-diff-over-standard))"
+dnl AC_MSG_CHECKING(camlibs added over standard set)
+dnl AC_MSG_RESULT(${gp_camlibs_over_standard})
+
+dnl gp_camlibs_non_standard="$(${EXPR} ${gp_camlibs_from_standard} + ${gp_camlibs_over_standard})"
+dnl AC_MSG_CHECKING(total number of camlibs differing from standard set)
+dnl AC_MSG_RESULT(${gp_camlibs_non_standard})
+
+AC_MSG_CHECKING(whether skipping some requested camlibs)
+AS_IF(test "x$gp_camlib_set_skipping" = "x", dnl
+    AC_MSG_RESULT(no)
+, dnl
+    AC_MSG_RESULT(yes (${gp_camlib_set_skipping}))
+    AC_DEFINE_UNQUOTED(GP_CAMLIB_SET_SKIPPING, "${gp_camlib_set_skipping}",
+                       If defined, the camlibs which are skipped due to missing dependencies)
+    AC_MSG_WARN(
+
+    #=========================================================#
+    # We are skipping building one or more camlibs, probably  #
+    # due to missing dependencies.  Check the dependencies if #
+    # you insist on building these camlibs.                   #
+    #=========================================================#
+)
+    GP_SLEEP_IF_TTY(5)
+)
+
+GP_SET_SPACE_VAR(camlib-set, gp_camlib_set)
+AC_MSG_CHECKING(camlib set to build in detail)
+AC_MSG_RESULT(${gp_camlib_set})
+
+GP_CAMLIBS_CONDITIONAL_WARNING
+
+dnl Whether user has requested a non-standard set of camlibs
+GP_SET_EQUAL_IFELSE(camlib-set, camlib-set-standard, dnl
+    AS_IF(test "x$gp_camlib_set_skipping" = "x", dnl
+        GP_CONFIG_MSG(Camlibs,
+                      standard set (${gp_camlib_set}))
+    , dnl
+        GP_CONFIG_MSG(Camlibs,
+                      standard set (${gp_camlib_set} SKIPPING ${gp_camlib_set_skipping}))
+    )
+, dnl
+    AS_IF(test "x$gp_camlib_set_skipping" = "x", dnl
+        GP_CONFIG_MSG(Camlibs,
+                      non-standard set (${gp_camlib_set}))
+    , dnl
+        GP_CONFIG_MSG(Camlibs,
+                      non-standard set (${gp_camlib_set} SKIPPING ${gp_camlib_set_skipping}))
+    )
+    m4_pattern_allow(GP_CAMLIB_SET_IS_NONSTANDARD)dnl
+    AC_DEFINE_UNQUOTED(GP_CAMLIB_SET_IS_NONSTANDARD, 1,
+                       define when the camlib set to buidl is non-standard)
+)dnl
+
+m4_pattern_allow(GP_CAMLIB_SET)dnl
+AC_DEFINE_UNQUOTED(GP_CAMLIB_SET, "${gp_camlib_set}",
+                   The actually defined set of camlibs to build)
+
+AS_UNSET(GP_CAMLIB_SET)
+for f in ${gp_camlib_set}
 do
-    BUILD_THESE_CAMLIBS="${BUILD_THESE_CAMLIBS}${BUILD_THESE_CAMLIBS+ }${f}.la"
+    GP_CAMLIB_SET="${GP_CAMLIB_SET}${GP_CAMLIB_SET+ }${f}.la"
 done
-AC_SUBST(BUILD_THESE_CAMLIBS)
-AC_SUBST(ALL_DEFINED_CAMLIBS)
-AC_SUBST(ALL_DEFAULT_CAMLIBS)
+AS_UNSET(f)
+AC_SUBST(GP_CAMLIB_SET)
+
+m4_pattern_allow(GP_CAMLIB_SET_EVERYTHING)dnl
+AC_SUBST(GP_CAMLIB_SET_EVERYTHING,
+         "m4_set_contents(gp_m4s_camlib_set_everything,  )")
+
+# END $0($@)
 )dnl
 dnl
+dnl
 dnl ####################################################################
 dnl
 dnl Local Variables:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-doxygen.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-doxygen.m4 Changed

@@ -1,21 +1,55 @@
+# gp-check-doxygen.m4 - check for doxygen tool                 -*- Autoconf -*-
+# serial 14
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
 dnl doxygen related stuff
 dnl look for tools
 dnl define substitutions for Doxyfile.in
-AC_DEFUN(GP_CHECK_DOXYGEN,dnl
-AC_REQUIRE(GP_CHECK_DOC_DIR)dnl
-AC_PATH_PROG(DOT, dot, false)
-AC_PATH_PROG(DOXYGEN, doxygen, false)
-AM_CONDITIONAL(HAVE_DOXYGEN, test "x$DOXYGEN" != "xfalse")
-AM_CONDITIONAL(HAVE_DOT, test "x$DOT" != "xfalse")
-if test "x$DOT" != "xfalse"; then
-	AC_SUBST(HAVE_DOT,YES)
-else
-	AC_SUBST(HAVE_DOT,NO)
-fi
+dnl ####################################################################
+dnl
+AC_DEFUN(GP_CHECK_DOXYGEN, dnl
+dnl
+GP_CHECK_PROG(DOT, dot, graphviz directed graph drawing command)
+dnl
+AM_CONDITIONAL(HAVE_DOT, test "x$DOT" != xno)
+AC_MSG_CHECKING(HAVE_DOT)
+AM_COND_IF(HAVE_DOT, dnl
+  gp_config_msg_dot=", using dot (${DOT})"
+  AC_MSG_RESULT(yes ($DOT))
+, dnl
+  gp_config_msg_dot=", not using dot"
+  AC_MSG_RESULT(no)
+)
+dnl
+dnl
+GP_CHECK_PROG(DOXYGEN, doxygen, software documentation generator command)
+dnl
+AM_CONDITIONAL(HAVE_DOXYGEN, test "x$DOXYGEN" != xno)
+AC_MSG_CHECKING(HAVE_DOXYGEN)
+AM_COND_IF(HAVE_DOXYGEN, dnl
+  AC_MSG_RESULT(yes ($DOXYGEN)${gp_config_msg_dot}))
+  GP_CONFIG_MSG(build doxygen docs, yes)
+, dnl
+  AC_MSG_RESULT(no)
+  GP_CONFIG_MSG(build doxygen docs, no)
+)
+dnl
+dnl Substitutions for Doxyfile.in
+AM_COND_IF(HAVE_DOT,
+           AC_SUBST(HAVE_DOT, YES),
+           AC_SUBST(HAVE_DOT, NO))
 AC_SUBST(HTML_APIDOC_DIR, "${PACKAGE_TARNAME}-api.html")
 AC_SUBST(DOXYGEN_OUTPUT_DIR, doxygen-output)
 AC_SUBST(HTML_APIDOC_INTERNALS_DIR, "${PACKAGE_TARNAME}-internals.html")
+dnl
 )dnl
-
-
-
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-library.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-library.m4 Changed

@@ -1,3 +1,9 @@
+# gp-check-library.m4 - generic library check                  -*- Autoconf -*-
+# serial 14
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
 dnl @synopsis GP_CHECK_LIBRARY(VARNAMEPART,libname,VERSION-REQUIREMENT,
 dnl                            headername,functionname,
 dnl                            ACTION-IF-FOUND,ACTION-IF-NOT-FOUND,
@@ -70,6 +76,9 @@
 dnl   * Give names of a header file and function name and to a test
 dnl     compilation.
 dnl
+m4_pattern_forbid(PKG_PROG_PKG_CONFIG)dnl
+m4_pattern_forbid(PKG_CHECK_MODULES)dnl
+dnl
 AC_DEFUN(_GP_CHECK_LIBRARY_SOEXT,dnl
 AC_MSG_CHECKING(for dynamic library extension)
 soext=""
@@ -95,6 +104,7 @@
 fi
 )dnl
 dnl
+dnl
 AC_DEFUN(_GP_CHECK_LIBRARY,
 # ----------------------------------------------------------------------
 # GP_CHECK_LIBRARY($1,$2,$3,
@@ -105,8 +115,9 @@
 )dnl
 # ----------------------------------------------------------------------
 dnl
+dnl
 AC_REQUIRE(GP_CONFIG_MSG)dnl
-AC_REQUIRE(GP_PKG_CONFIG)dnl
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 AC_REQUIRE(_GP_CHECK_LIBRARY_SOEXT)dnl
 # Use _CFLAGS and _LIBS given to configure.
 # This makes it possible to set these vars in a configure script

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-popt.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-popt.m4 Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-prog.m4 Added

@@ -0,0 +1,32 @@
+# gp-check-prog.m4 - use user given or look for tool          -*- Autoconf -*-
+# serial 1
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl GP_CHECK_PROG(TOOLVAR, tool, description)
+dnl
+dnl Allow users to define TOOLVAR on the `configure` command line
+dnl overriding all automatic checks. Otherwise, look for `tool` in
+dnl `PATH` and set `TOOLVAR` to that value.
+dnl
+dnl Example:
+dnl   GP_CHECK_PROG(SORT, sort, text file line sorting command)dnl
+dnl
+dnl   ./configure SORT="busybox sort"
+dnl ####################################################################
+dnl
+AC_DEFUN(GP_CHECK_PROG, dnl
+AC_ARG_VAR($1, $2 $3)dnl
+AS_VAR_IF($1, , dnl
+AC_PATH_PROG($1, $2, no)dnl
+)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-shell-environment.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-check-shell-environment.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-config-msg.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-config-msg.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-documentation.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-documentation.m4 Changed

@@ -1,70 +1,20 @@
+# gp-documentation.m4 - whether to build our gtk-doc docs      -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
 dnl
-dnl check where to install documentation
-dnl
-dnl determines documentation "root directory", i.e. the directory
-dnl where all documentation will be placed in
-dnl
-
-AC_DEFUN(GP_CHECK_DOC_DIR,
-
-AC_BEFORE($0, GP_BUILD_GTK_DOCS)dnl
-AC_BEFORE($0, GP_CHECK_DOXYGEN)dnl
-
-AC_ARG_WITH(doc-dir,
-AS_HELP_STRING(--with-doc-dir=PATH,
-Where to install docs  default=autodetect))
-
-# check for the main ("root") documentation directory
-AC_MSG_CHECKING(main docdir)
-
-if test "x${with_doc_dir}" != "x"
-then # docdir is given as parameter
-    docdir="${with_doc_dir}"
-    AC_MSG_RESULT(${docdir} (from parameter))
-else # otherwise invent a docdir hopefully compatible with system policy
-    if test -d "/usr/share/doc"
-    then
-        maindocdir='${prefix}/share/doc'
-        AC_MSG_RESULT(${maindocdir} (FHS style))
-    elif test -d "/usr/doc"
-    then
-        maindocdir='${prefix}/doc'
-        AC_MSG_RESULT(${maindocdir} (old style))
-    else
-        maindocdir='${datadir}/doc'
-        AC_MSG_RESULT(${maindocdir} (default value))
-    fi
-    AC_MSG_CHECKING(package docdir)
-    # check whether to include package version into documentation path
-    # FIXME: doesn't work properly.
-    if ls -d /usr/{share/,}doc/make-0-9* > /dev/null 2>&1
-    then
-        docdir="${maindocdir}/${PACKAGE}-${VERSION}"
-        AC_MSG_RESULT(${docdir} (redhat style))
-    else
-        docdir="${maindocdir}/${PACKAGE}"
-        AC_MSG_RESULT(${docdir} (default style))
-    fi
-fi
-
-AC_SUBST(docdir)
-)dnl
-
-dnl
+dnl ####################################################################
 dnl check whether to build docs and where to:
 dnl
 dnl * determine presence of prerequisites (only gtk-doc for now)
 dnl * determine destination directory for HTML files
+dnl ####################################################################
 dnl
-
-AC_DEFUN(GP_BUILD_GTK_DOCS,
-
-# docdir has to be determined in advance
-AC_REQUIRE(GP_CHECK_DOC_DIR)
-
+AC_DEFUN(GP_BUILD_GTK_DOCS, dnl
 # ---------------------------------------------------------------------------
 # gtk-doc: We use gtk-doc for building our documentation. However, we
-#          require the user to explicitely request the build.
+#          require the user to explicitly request the build.
 # ---------------------------------------------------------------------------
 try_gtkdoc=false
 gtkdoc_msg="no (not requested)"
@@ -88,26 +38,13 @@
 AM_CONDITIONAL(ENABLE_GTK_DOC, $have_gtkdoc)
 GP_CONFIG_MSG(build API docs with gtk-doc,$gtkdoc_msg)
 
-
-# ---------------------------------------------------------------------------
-# Give the user the possibility to install html documentation in a 
-# user-defined location.
-# ---------------------------------------------------------------------------
-AC_ARG_WITH(html-dir,
-AS_HELP_STRING(--with-html-dir=PATH,
-Where to install html docs default=autodetect))
-
-AC_MSG_CHECKING(for html dir)
-if test "x${with_html_dir}" = "x" ; then
-    htmldir="${docdir}/html"
-    AC_MSG_RESULT(${htmldir} (default))
-else
-    htmldir="${with_html_dir}"
-    AC_MSG_RESULT(${htmldir} (from parameter))
-fi
-AC_SUBST(htmldir)
 apidocdir="${htmldir}/api"
 AC_SUBST(apidocdir)
-
 )dnl
-
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-driverdir.m4 Added

@@ -0,0 +1,85 @@
+# gp-driverdir.m4 - define install dirs for camlibs and iolibs -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ###################################################################
+dnl Driver directory (camlibdir or iolibdir)
+dnl ###################################################################
+dnl
+dnl Usage:
+dnl    GP_DRIVERDIR(camlibdir, CAMLIBS, camlibs)
+dnl    GP_DRIVERDIR(iolibdir,  IOLIBS,  iolibs)
+dnl
+dnl ###################################################################
+dnl
+AC_DEFUN(GP_DRIVERDIR, dnl
+AC_MSG_CHECKING(where to install $3 ($1))
+AC_ARG_VAR($1,
+           where to install $3 (default: ${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}))
+AS_VAR_IF($1, , dnl
+	$1="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}"
+	AC_MSG_RESULT(${$1} (default))
+, dnl
+	AC_MSG_RESULT(${$1} (set explictly))
+)
+
+dnl If you see this after 2022-12-31, please remove the following
+dnl section, uncomment the one after, and send a pull request.
+AC_MSG_CHECKING(for deprecated --with-$1 argument)
+AC_ARG_WITH($1, AS_HELP_STRING(
+	--with-$1=<path>,
+	deprecated (use $1= variable instead))dnl
+, dnl
+	AS_VAR_IF($1, , dnl
+		$1="$withval"
+		AC_MSG_RESULT(${$1} (from DEPRECATED --with-$1))
+	, dnl
+		AS_VAR_IF($1, "$withval", dnl
+			# Nothing to do, $1 has already been set to this value.
+		, dnl
+			AC_MSG_RESULT(${withval} (differs from $1 value))
+			AC_MSG_ERROR(
+If both the $1= variable and the DEPRECATED --with-$1= argument
+are used, their value MUST be the same.
+)
+		)
+	)
+, dnl
+	AC_MSG_RESULT(not used (very good))
+)
+
+dnl If you see this after 2022-12-31, please uncomment the following
+dnl section, remove the previous one, and send a pull request.
+dnl
+dnl AC_ARG_WITH($1, AS_HELP_STRING(--with-$1=<path>,
+dnl                                   DEPRECATED (use camlibdir= variable instead))dnl
+dnl , dnl
+dnl 	AC_MSG_ERROR(
+dnl The --with-$1= argument is DEPRECATED.
+dnl
+dnl Use the $1= variable instead.
+dnl )
+dnl )
+
+AC_SUBST($1)
+
+AC_ARG_VAR(DEFAULT_$2,
+           default location to look for $3 at runtime (if not given, use ${$1}))
+AC_MSG_CHECKING(default location to look for $3)
+AS_VAR_IF(DEFAULT_$2, , dnl
+	DEFAULT_$2="\${$1}"
+	AC_MSG_RESULT(value of $1 (default))
+, dnl
+	AC_MSG_RESULT(${DEFAULT_$2} (set explicitly))
+)
+AM_CPPFLAGS="$AM_CPPFLAGS -D$2=\\\"${DEFAULT_$2}\\\""
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 Added

@@ -0,0 +1,122 @@
+# gp-gettext-setup.m4 - set up gettext with some checks        -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl GP_GETTEXT_SETUP(...)
+dnl    Gettext setup with e.g. consistency checks for value of DOMAIN.
+dnl ####################################################################
+dnl
+dnl Usage:
+dnl     GP_GETTEXT_SETUP(DOMAIN_LIBGPHOTO2,
+dnl                      libgphoto2-${LIBGPHOTO2_CURRENT_MIN},
+dnl                      po)
+dnl     GP_GETTEXT_SETUP(DOMAIN_LIBGPHOTO2_PORT,
+dnl                      libgphoto2_port-${LIBGPHOTO2_PORT_CURRENT_MIN},
+dnl                      libgphoto2_port/po)
+dnl
+dnl with the corresponding top level Makefile.am containing
+dnl
+dnl     @GP_GETTEXT_SETUP_MK@
+dnl
+dnl     # Dummy target to force Automake to make the "all" target depend on it
+dnl     all-local:
+dnl     	@:
+dnl
+dnl     # Dummy target to force Automake to make the "distclean" target depend on it
+dnl     distclean-local:
+dnl     	@:
+dnl
+dnl ####################################################################
+dnl
+AC_DEFUN(GP_GETTEXT_SETUP, dnl
+AC_REQUIRE(AC_PROG_GREP)dnl
+AC_REQUIRE(GP_GETTEXT_SETUP_INIT)dnl
+dnl
+AC_MSG_CHECKING(translation text domain symbol)
+AC_MSG_RESULT($1)
+AC_MSG_CHECKING(translation text domain value)
+AC_MSG_RESULT($2)
+AC_MSG_CHECKING(translation subdirectory)
+AC_MSG_RESULT($3)
+dnl
+dnl The text domain can be evaluated as a shell variable, no need for
+dnl recursive make variable evaluation, so we can put the text domain
+dnl into the include file and do not need to define it from a make
+dnl rule on the compiler command line.
+AC_DEFINE_UNQUOTED($1, "$2", text domain for string translations)
+dnl AM_CPPFLAGS="$AM_CPPFLAGS -D$1=\\\""'$2'"\\\""
+AC_SUBST($1, $2)
+dnl
+dnl
+dnl The following check will have "make all" print something like
+dnl     DOMAIN = libgphoto2-6
+dnl if the consistency check has been successful, and have "make all" abort
+dnl     Error: Inconsistent values for GETTEXT_PACKAGE_LIBGPHOTO2 and po/Makevars DOMAIN.
+dnl if the consistency check has failed.
+dnl
+cat >>${GP_GETTEXT_SETUP_MK} <<EOF
+	@set -ex; \\
+	MAKEVARS_FILE="\$\$(test -f '$3/Makevars' || echo '\$(srcdir)/')$3/Makevars"; \\
+	MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \\{0,\\}= \\{0,\\}//p' "\$\$MAKEVARS_FILE")"; \\
+	MAKE_TIME_DOMAIN="\$($1)"; \\
+	echo "  MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \\
+	echo "  $1=\$($1)"; \\
+	if test "x\$\$MAKEVARS_DOMAIN" = "x\$($1)"; then \\
+	     echo "Good: Matching gettext domain values (\$($1))"; \\
+	     true; \\
+	elif test "x\$\$USE_NLS" = xyes; then \\
+	     echo "Error: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     false; \\
+	else \\
+	     echo "Warning: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
+	     true; \\
+	fi
+EOF
+dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl Setup for the po subdir specific setup
+dnl ####################################################################
+dnl
+AC_DEFUN_ONCE(GP_GETTEXT_SETUP_INIT, dnl
+AC_BEFORE($0, GP_GETTEXT_SETUP)dnl
+dnl
+dnl The LOCALEDIR definition contains too many levels of recursive
+dnl make variable definitions to evaluate via shell, so we have make
+dnl resolve that instead of the shell configure script.
+AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\""'${localedir}'"\\\""
+dnl
+dnl
+AC_SUBST_FILE(GP_GETTEXT_SETUP_MK)
+GP_GETTEXT_SETUP_MK="gp-gettext-setup.mk"
+dnl
+dnl
+cat >${GP_GETTEXT_SETUP_MK} <<EOF
+
+# ${GP_GETTEXT_SETUP_MK} autogenerated by $0
+
+distclean-local: distclean-local-gp-gettext-setup
+.PHONY: distclean-local-gp-gettext-setup
+distclean-local-gp-gettext-setup:
+	-rm -f ${GP_GETTEXT_SETUP_MK}
+
+all-local: all-local-gp-gettext-setup
+.PHONY: all-local-gp-gettext-setup
+all-local-gp-gettext-setup:
+	@:
+EOF
+dnl
+dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-internal-docs.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-internal-docs.m4 Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 Added

@@ -0,0 +1,198 @@
+# gp-libjpeg.m4 - check for libjpeg                            -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl GP_LIBJPEG
+dnl ####################################################################
+dnl
+dnl Define the libjpeg related compile and linker flags depending on
+dnl configure arguments and availability on the system.
+dnl
+dnl   * If --without-jpeg or --with-jpeg=no is given, build without
+dnl     libjpeg support.
+dnl
+dnl   * If --with-jpeg=auto or --with-jpeg=autodetect is given,
+dnl     autodetect libjpeg:
+dnl       * If any of LIBJPEG_(CFLAGS|LIBS) is explicitly given, try
+dnl         compile+link using that.
+dnl          * If compile+link works, use that.
+dnl          * If compile+link fails, abort with error message.
+dnl       * If none of LIBJPEG_(CFLAGS|LIBS) are explicitly given, try
+dnl         pkg-config to find libjpeg.pc.
+dnl          * If libjpeg.pc has been found, try compile+link.
+dnl              * If compile+link works, use that.
+dnl              * If compile+link fails, build without libjpeg.
+dnl          * If libjpeg.pc has not been found, try default location.
+dnl              * If compile+link works, use that.
+dnl              * If compile+link fails, build without libjpeg.
+dnl
+dnl   * If --with-jpeg or --with-jpeg=yes is given, autodetect as
+dnl     described above, but abort with an error message if libjpeg
+dnl     could not be found.
+dnl
+dnl   * If neither --with-jpeg nor --without-jpeg are explicitly given,
+dnl     run the above autodetect sequence.
+dnl
+AC_DEFUN(GP_LIBJPEG, dnl
+dnl
+AC_MSG_CHECKING(whether to build with libjpeg)
+AC_ARG_WITH(jpeg,
+            AS_HELP_STRING(--without-jpeg,
+                            Build without libjpeg (default: autodetect)),
+            dnl Normalize --with-jpeg=ARG argument value
+  AS_CASE($with_jpeg,
+    autodetect, with_jpeg=auto,
+  )
+, dnl Default value
+  with_jpeg=auto
+)
+dnl
+AC_MSG_RESULT($with_jpeg)
+dnl
+AS_CASE($with_jpeg,
+no, 
+  # libjpeg explictly disabled from command line
+  GP_CONFIG_MSG(JPEG mangling support,
+                no (disabled by --without-jpeg))
+,
+auto|yes, 
+  GP_LIBJPEG_AUTODETECT
+
+  AS_VAR_IF(have_libjpeg, no, dnl
+    AS_VAR_IF(with_jpeg, yes, dnl
+      AC_MSG_ERROR(
+libjpeg has been requested explicitly (--with-jpeg=yes), but could not be
+found and made to work.
+)
+    , dnl
+      GP_CONFIG_MSG(JPEG mangling support,
+                    ${have_libjpeg} (could not find working libjpeg))
+    )
+  , dnl
+    AC_DEFINE(HAVE_LIBJPEG, 1,
+              define if building with libjpeg)
+    GP_CONFIG_MSG(JPEG mangling support,
+                  ${have_libjpeg})
+  )
+,
+AC_MSG_ERROR(
+Unhandled value given to --with-jpeg: ${with_jpeg}
+
+To allow the auto-detection of libjpeg, set up the pkg-config related
+environment variables (PKG_CONFIG, PKG_CONFIG_PATH, PKG_CONFIG_LIBDIR)
+or have libjpeg installed in the standard location to include from and
+link to.
+
+To force specific compile and link flags for libjpeg, set the
+environment variables LIBJPEG_CFLAGS and $LIBJPEG_LIBS accordingly.
+)
+)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_LIBJPEG_AUTODETECT
+dnl
+dnl Do the actual autodetection of libjpeg, setting
+dnl
+dnl   have_libjpeg=yes
+dnl     If libjpeg has been found and can be both compiled with and
+dnl     linked against.
+dnl
+dnl   have_libjpeg=no
+dnl     If libjpeg has not been found or cannot be compiled with or
+dnl     cannot be linked against.
+dnl
+dnl Used once: By GP_LIBJPEG to make the GP_LIBJPEG code more readable.
+dnl ####################################################################
+dnl
+AC_DEFUN(GP_LIBJPEG_AUTODETECT, dnl
+  have_libjpeg=no
+
+  AC_MSG_CHECKING(for libjpeg via variables)
+  AS_IF(test "x$LIBJPEG_LIBS$LIBJPEG_CFLAGS" != x, dnl
+    GP_LINK_LIBJPEG_IFELSE(
+      AC_MSG_RESULT(found and works)
+      have_libjpeg=yes
+    , dnl
+      AC_MSG_RESULT(found but fails to link)
+      AC_MSG_ERROR(
+libjpeg not found despite LIBJPEG_CFLAGS and/or LIBJPEG_LIBS being set.
+)
+    )
+  , dnl
+    AC_MSG_RESULT(no)
+  )
+
+  AS_VAR_IF(have_libjpeg, no, dnl
+    PKG_CHECK_MODULES(LIBJPEG, libjpeg, dnl
+      AC_MSG_CHECKING(linking with libjpeg works)
+      GP_LINK_LIBJPEG_IFELSE(dnl
+        have_libjpeg=yes
+        AC_MSG_RESULT(yes)
+      , dnl
+        AC_MSG_RESULT(no)
+      )
+    , dnl
+      LIBJPEG_LIBS="-ljpeg"
+      AC_MSG_CHECKING(for libjpeg at default location)
+      GP_LINK_LIBJPEG_IFELSE(dnl
+        have_libjpeg=yes
+        AC_MSG_RESULT(yes)
+      , dnl
+        AC_MSG_RESULT(no)
+        AS_UNSET(LIBJPEG_LIBS)
+      )
+    )
+  )
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_LINK_LIBJPEG_IFELSE(if-true, if-false)
+dnl Make sure we can actually compile and link against libjpeg.
+dnl ####################################################################
+dnl
+AC_DEFUN(GP_LINK_LIBJPEG_IFELSE, dnl
+AC_LANG_PUSH(C)
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
+LIBS="$LIBS $LIBJPEG_LIBS"
+AC_LINK_IFELSE(AC_LANG_SOURCE(
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+/* jpeglib.h fails to include all required system headers, so jpeglib.h
+ * must be included after stddef.h (size_t) and stdio.h (FILE).
+ */
+#include <jpeglib.h>
+
+int main(int argc, char **argv)
+{
+  j_decompress_ptr cinfo = NULL;
+  (void) argc;
+  (void) argv;
+  /* Running this will give a segfault */
+  if (jpeg_start_decompress(cinfo)) {
+    printf("true\n");
+  } else {
+    printf("false\n");
+  }
+  return 0;
+}
+), $1, $2)
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+AC_LANG_POP(C)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-libltdl.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-libltdl.m4 Changed

@@ -1,59 +1,133 @@
+# gp-libltdl.m4 - check for libltdl (from libtool)             -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
 dnl Written by Hans Ulrich Niedermann
 dnl LDFLAGS vs LIBS fix by Dan Nicholson
-dnl 
+dnl
+dnl ####################################################################
+dnl GP_LIBLTDL
+dnl ####################################################################
+dnl
 dnl We are using our own libltdl checks instead of AC_WITH_LTDL
-dnl because we do not want to ship our own copy of libltdl any more.
-dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
-dnl and relying on standard autoconf's "autoreconf".
+dnl because we do not want to ship our own copy of libltdl.
 dnl
 dnl Look for external libltdl, not shipping internal libltdl.
-AC_DEFUN(GP_LIB_LTDL,dnl
-AC_ARG_VAR(LTDLINCL,CFLAGS for compiling with libltdl)
-AC_ARG_VAR(LIBLTDL,LIBS to add for linking against libltdl)
-if test "x${LTDLINCL}${LIBLTDL}" = "x"; then
-AC_CHECK_HEADER(ltdl.h,
-dnl
-AC_CHECK_LIB(ltdl, lt_dlinit,dnl
-LTDLINCL=""
-LIBLTDL="-lltdl"
-AC_DEFINE(HAVE_LTDL,1,Whether libltdl (of libtool fame) is present)
-,dnl
+AC_DEFUN(GP_LIBLTDL, dnl
+AC_ARG_VAR(LTDLINCL, CFLAGS for compiling with libltdl)
+AC_ARG_VAR(LIBLTDL,  LIBS to add for linking against libltdl)
+dnl
+have_libltdl=no
+AC_MSG_CHECKING(for libltdl)
+AS_IF(test "x${LTDLINCL}${LIBLTDL}" != x, dnl
+  AC_MSG_RESULT(variables given explicitly)
+
+  AC_MSG_CHECKING(LTDLINCL (given explicitly))
+  AC_MSG_RESULT(${LTDLINCL})
+  AC_MSG_CHECKING(LIBLTDL (given explictly))
+  AC_MSG_RESULT(${LIBLTDL})
+
+  GP_LINK_LIBLTDL_IFELSE(dnl
+    have_libltdl=yes
+  , dnl
+    GP_MSG_ERROR_LIBLTDL
+  )
+, dnl
+  AC_MSG_RESULT(autodetecting)
+
+  AS_VAR_IF(have_libltdl, no, dnl Try default location
+    LTDLINCL=""
+    LIBLTDL="-lltdl"
+    AC_MSG_CHECKING(for libltdl at default location)
+    GP_LINK_LIBLTDL_IFELSE(
+      have_libltdl=yes
+    , dnl
+      AS_UNSET(LTDLINCL)
+      AS_UNSET(LIBLTDL)
+    )
+    AC_MSG_RESULT($have_libltdl)
+  )
+
+  dnl FreeBSD packages install to /usr/local
+  dnl NetBSD  packages install to /usr/pkg
+  dnl MacOSX  brew packages install to `brew --prefix`
+  for gp_prefix in /usr/local /usr/pkg `brew --prefix 2>/dev/null`; do
+    AS_IF(test -d "$gp_prefix", dnl
+      AS_VAR_IF(have_libltdl, no, dnl
+        LTDLINCL="-I${gp_prefix}/include"
+        LIBLTDL="-L${gp_prefix}/lib -lltdl"
+        AC_MSG_CHECKING(for libltdl at $gp_prefix)
+        GP_LINK_LIBLTDL_IFELSE(
+          have_libltdl=yes
+          AC_MSG_RESULT($have_libltdl)
+          break
+        , dnl
+          AS_UNSET(LTDLINCL)
+          AS_UNSET(LIBLTDL)
+          AC_MSG_RESULT($have_libltdl)
+        )
+      )
+    )
+  done
+
+  AS_VAR_IF(have_libltdl, yes, dnl
+    AC_MSG_CHECKING(LTDLINCL (autodetected))
+    AC_MSG_RESULT(${LTDLINCL})
+    AC_MSG_CHECKING(LIBLTDL (autodetected))
+    AC_MSG_RESULT(${LIBLTDL})
+  , dnl
+    GP_MSG_ERROR_LIBLTDL
+  )
+)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_MSG_ERROR_LIBLTDL
+dnl ####################################################################
+dnl
+dnl Print the error message when libltdl has not been found to work.
+dnl
+AC_DEFUN(GP_MSG_ERROR_LIBLTDL, dnl
 AC_MSG_ERROR(
-$PACKAGE requires the ltdl library, included with libtool
+${PACKAGE} requires libltdl (a part of libtool)
 
 Please make sure that the proper development package is installed
-(libltdl-dev, libtool-ltdl-devel, etc.)
-)dnl
-)dnl
+(may be called libltdl-dev, libtool-ltdl-devel, libltdl, etc.) and if
+the autodetection fails, that the LTDLINCL and LIBLTDL variables are
+set properly on the configure command line.
 )
-else
-	AC_MSG_CHECKING(for libltdl flags)
-	AC_MSG_RESULT(set explicitly: ${LTDLINCL} ${LIBLTDL})
-fi
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_LINK_LIBLTDL_IFELSE
+dnl ####################################################################
 dnl
 dnl Make sure we can actually compile and link against libltdl
+dnl
+AC_DEFUN(GP_LINK_LIBLTDL_IFELSE, dnl
 AC_LANG_PUSH(C)
-AC_MSG_CHECKING(that we can compile and link with libltdl)
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $LTDLINCL"
 LIBS="$LIBS $LIBLTDL"
-AC_LINK_IFELSE(AC_LANG_PROGRAM(dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM(
 #include <stdlib.h> /* for NULL */
 #include <ltdl.h>   /* for lt_* */
-,dnl
-int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
-), AC_MSG_RESULT(yes), dnl
-AC_MSG_RESULT(no)
-AC_MSG_ERROR(cannot compile and link against libltdl
-${PACKAGE_TARNAME} requires libltdl (the libtool dl* library),
-but cannot compile and link against it.
-Aborting.
-)
-)
+, 
+  int ret = lt_dlforeachfile("/usr/lib:/usr/local/lib", NULL, NULL);
+  (void) ret;
+), $1, $2)
 CPPFLAGS="$saved_CPPFLAGS"
 LIBS="$saved_LIBS"
-AC_LANG_POP
+AC_LANG_POP(C)
 )dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-docbook-xml.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-docbook-xml.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-documentation.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-documentation.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-fig2dev.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-fig2dev.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-graphviz.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-graphviz.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-gtk-doc.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-gtk-doc.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-pstoimg.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-pstoimg.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-w3m.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-manual-w3m.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-packaging.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-packaging.m4 Changed

@@ -1,25 +1,9 @@
-AC_DEFUN(GPKG_CHECK_RPM,
-
-AC_ARG_WITH(rpmbuild,
-AS_HELP_STRING(--with-rpmbuild=PATH,
-Program to use for building RPMs))
-
-AC_MSG_CHECKING(for rpmbuild or rpm)
-if test -x "${with_rpmbuild}"
-then
-    RPMBUILD="${with_rpmbuild}"
-    AC_MSG_RESULT(${RPMBUILD} (from parameter))
-else
-    AC_MSG_RESULT(using autodetection)
-    AC_CHECK_PROGS(RPMBUILD, rpmbuild rpm, false)
-    AC_MSG_CHECKING(for rpmbuild or rpm)
-    AC_MSG_RESULT(${RPMBUILD} (autodetected))
-fi
-AC_SUBST(RPMBUILD)
-AM_CONDITIONAL(ENABLE_RPM, test "$RPMBUILD" != "false")
-
-)
-
+# gp-packaging.m4 - help with packaging libgphoto2 for distros -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
 AC_DEFUN(GPKG_CHECK_LINUX,
 
 	# effective_target has to be determined in advance
@@ -33,10 +17,6 @@
 	esac
 	AM_CONDITIONAL(HAVE_LINUX, "$is_linux")
 
-	# required for docdir
-	# FIXME: Implicit dependency
-	# AC_REQUIRE(GP_CHECK_DOC_DIR)
-
 	AC_ARG_WITH(hotplug-doc-dir,
 	AS_HELP_STRING(--with-hotplug-doc-dir=PATH,
 	Where to install hotplug scripts as docs default=autodetect))
@@ -78,4 +58,10 @@
 	AC_SUBST(hotplugdocdir)
 	AC_SUBST(hotplugusermapdir)
 )
-
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-pedantic-compiler-flags.m4 Added

@@ -0,0 +1,214 @@
+# gp-pedantic-compiler-flags.m4 - have compiler warn a LOT     -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl GP_PEDANTIC_COMPILER_FLAGS & Co.
+dnl ####################################################################
+dnl
+dnl
+dnl ####################################################################
+dnl GP_CONDITIONAL_COMPILE_FLAGS(FLAG_VAR, FLAGS)
+dnl ####################################################################
+AC_DEFUN(GP_CONDITIONAL_COMPILE_FLAGS, dnl
+dnl
+# BEGIN $0($@)
+dnl
+m4_pushdef(the_lang,
+           m4_case($1,
+                    CFLAGS, C,
+                    CXXFLAGS, C++,
+                    m4_fatal(unhandled compiler flags variable: $1)))dnl
+dnl
+AC_LANG_PUSH(the_lang)dnl
+dnl
+dnl If $2 is a warning option, normalize it, as -Wno-foo will compile
+dnl successfully, regardless of whether the compiler even knows the
+dnl -Wfoo warning. FIXME: Split $2 and operate on each part?
+m4_pushdef(normalized_option,
+           m4_bpatsubst($2,
+                         ^-W$no-$?$error=$?$-_0-9a-zA-Z=+$$,
+			 -W\3))dnl
+dnl
+saved_$1="${$1}"
+$1="${saved_$1} normalized_option -Werror"
+AC_MSG_CHECKING(whether $1 can append $2)
+AC_COMPILE_IFELSE(dnl
+m4_case(the_lang, C, dnl
+AC_LANG_SOURCE(
+#include <stdio.h>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argvi);
+  }
+  return 0;
+}
+)dnl
+, C++, dnl
+AC_LANG_SOURCE(
+#include <iostream>
+int main(int argc, char *argv)
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argvi << std::endl;
+  }
+  return 0;
+}
+)dnl
+, m4_fatal(unhandled language the_lang))dnl
+, dnl
+  AC_MSG_RESULT(yes)
+  $1="${saved_$1} $2"
+, dnl
+  AC_MSG_RESULT(no)
+  gp_have_pedantic_compiler=no
+  $1="$saved_$1"
+)
+m4_popdef(normalized_option)dnl
+AC_LANG_POP(the_lang)dnl
+m4_popdef(the_lang)dnl
+# END $0($@)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl Params:
+dnl   $1 Depending on the language, CFLAGS or CXXFLAGS
+dnl   $2 The flag variable the caller wants us to set
+dnl   $3 The AM_CONDITIONAL the caller wants us to set
+dnl   $4 The -std= argument (such as -std=c++98 or -std=c99)
+dnl ####################################################################
+AC_DEFUN(__GP_PEDANTIC_COMPILER_FLAGS, dnl
+# BEGIN $0($@)
+gp_have_pedantic_compiler=yes
+GP_CONDITIONAL_COMPILE_FLAGS($1, $4)dnl
+AS_VAR_IF(gp_have_pedantic_compiler, yes, dnl
+  GP_CONDITIONAL_COMPILE_FLAGS($1, -pedantic -Wall -Wextra -Werror)dnl
+)
+AM_CONDITIONAL($3, test "x$gp_have_pedantic_compiler" = "xyes")
+AC_SUBST($2, "$$1")
+AC_MSG_CHECKING(whether to test pedantic $4)
+AM_COND_IF($3, dnl
+  AC_MSG_RESULT(yes)
+, dnl
+  AC_MSG_RESULT(no)
+)
+# END $0($@)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl Params:
+dnl   $1 Depending on the language, CFLAGS or CXXFLAGS
+dnl   $2 The variable/conditional component the caller wants us to use
+dnl   $3 The -std= argument (such as -std=c++98 or -std=c99)
+dnl ####################################################################
+m4_pattern_allow(GP_PEDANTIC_CFLAGS_)dnl
+m4_pattern_allow(GP_PEDANTIC_CXXFLAGS_)dnl
+m4_pattern_allow(GP_HAVE_PEDANTIC_FLAGS_)dnl
+m4_pattern_allow(GP_CONDITIONAL_COMPILE_FLAGS)dnl
+AC_DEFUN(_GP_PEDANTIC_COMPILER_FLAGS, dnl
+# BEGIN $0($@)
+gp_compiler_flags_saved_$1="$$1"
+$1=""
+__GP_PEDANTIC_COMPILER_FLAGS($1,
+                             GP_PEDANTIC_$1_$2,
+                             GP_HAVE_PEDANTIC_FLAGS_$2,
+                             $3)
+GP_PEDANTIC_$1_$2="$$1"
+$1="$gp_compiler_flags_saved_$1"
+# END $0($@)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_PEDANTIC_COMPILER_FLAGS(VAR_COMPONENT, LANG, std-arg)
+dnl Start a new series of compiler flags
+dnl ####################################################################
+AC_DEFUN(GP_PEDANTIC_COMPILER_FLAGS, dnl
+# BEGIN $0($@)
+AC_LANG_PUSH($2)
+_GP_PEDANTIC_COMPILER_FLAGS(m4_case($2,C,CFLAGS,C++,CXXFLAGS,m4_fatal(Unknown language given: $2)), $1, $3)
+AC_LANG_POP($2)
+# END $0($@)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl GP_WITH_EMPTY_CONFDEFS_H
+dnl
+dnl Usage:
+dnl     GP_WITH_EMPTY_CONFDEFS_H(
+dnl       GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-foo)
+dnl       GP_CONDITIONAL_COMPILE_FLAGS(CFLAGS, -Wno-bar)
+dnl     )dnl
+dnl
+dnl Since autoconf 2.63b, the macros defined by AC_DEFINE so far
+dnl (mostly PACKAGE, VERSION, etc.) are in confdefs.h by now and are
+dnl included using AC_LANG_SOURCE or AC_LANG_PROGRAM.
+dnl
+dnl We cannot use a confdefs.h with macro definitions for the pedantic
+dnl compilation tests as that pedantic compilation might complain
+dnl about macros being defined but not used.
+dnl
+dnl We also cannot just put AC_LANG_DEFINES_PROVIDED inside the
+dnl program, as that will make sure the program starts with the
+dnl current content of confdefs.h.
+dnl
+dnl In order to be able to test compile programs without any macro
+dnl definitions from confdefs.ht, we save the original confdefs.h file
+dnl and use an empty confdefs.h for our checks, then restore the
+dnl original confdefs.h after our checks are done.
+dnl
+dnl Of course, we must not append to confdefs.h by e.g. calling
+dnl AC_DEFINE or AC_DEFINE_UNQUOTED until the original confdefs.h has
+dnl been restored, as those definitions would then be lost.
+dnl
+dnl ####################################################################
+AC_DEFUN(GP_WITH_EMPTY_CONFDEFS_H, dnl
+m4_pushdef(AC_DEFINE,
+           m4_fatal(Must not use AC_DEFINE inside $0))dnl
+m4_pushdef(AC_DEFINE_UNQUOTED,
+           m4_fatal(Must not use AC_DEFINE_UNQUOTED inside $0))dnl
+cat confdefs.h
+AC_MSG_NOTICE(saving original confdefs.h and creating empty confdefs.h)
+rm -f confdefs.h.saved
+mv confdefs.h confdefs.h.saved
+cat <<EOF >confdefs.h
+/* confdefs.h forced empty for the pedantic compile tests */
+EOF
+dnl
+AC_MSG_CHECKING(CFLAGS value before)
+AC_MSG_RESULT($CFLAGS)
+AC_MSG_CHECKING(CXXFLAGS value before)
+AC_MSG_RESULT($CXXFLAGS)
+dnl
+$1
+dnl
+AC_MSG_CHECKING(CFLAGS value after)
+AC_MSG_RESULT($CFLAGS)
+AC_MSG_CHECKING(CXXFLAGS value after)
+AC_MSG_RESULT($CXXFLAGS)
+dnl
+AC_MSG_NOTICE(restoring original confdefs.h)
+rm -f confdefs.h
+mv confdefs.h.saved confdefs.h
+cat confdefs.h
+m4_popdef(AC_DEFINE_UNQUOTED)dnl
+m4_popdef(AC_DEFINE)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-progs.m4 Added

@@ -0,0 +1,108 @@
+# gp-progs.m4 - look for certain well-known tools              -*- Autoconf -*-
+# serial 15
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl Find a number of common programs, but allow setting a variable
+dnl to use a specific implementation.
+dnl ####################################################################
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_CMP)dnl
+AC_DEFUN_ONCE(GP_PROG_CMP,dnl
+GP_CHECK_PROG(CMP, cmp, file comparison command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_COMM)dnl
+AC_DEFUN_ONCE(GP_PROG_COMM,dnl
+GP_CHECK_PROG(COMM, comm, line by line comparison command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_DIFF)dnl
+AC_DEFUN_ONCE(GP_PROG_DIFF,dnl
+GP_CHECK_PROG(DIFF, diff, file comparison command)dnl
+dnl
+dnl DIFF_MAYBE_U only contains -u for readability, so if diff does not
+dnl support -u, we can still just run DIFF without -u.
+AC_MSG_CHECKING(whether DIFF supports -u)
+:>gp-empty-file-a
+:>gp-empty-file-b
+AS_IF(diff -u gp-empty-file-a gp-empty-file-b, dnl
+       AC_MSG_RESULT(yes)
+       DIFF_MAYBE_U="${DIFF} -u"
+, dnl
+       AC_MSG_RESULT(no)
+       DIFF_MAYBE_U="${DIFF}"
+)
+rm -f gp-empty-file-a gp-empty-file-b
+AC_SUBST(DIFF_MAYBE_U)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_EXPR)dnl
+AC_DEFUN_ONCE(GP_PROG_EXPR,dnl
+GP_CHECK_PROG(EXPR, expr, expression evaluation command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_SLEEP)dnl
+AC_DEFUN_ONCE(GP_PROG_SLEEP,dnl
+GP_CHECK_PROG(SLEEP, sleep, delay command)dnl
+AC_MSG_CHECKING(for sleep)
+AC_MSG_RESULT(${SLEEP})
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(GP_PROG_SORT)dnl
+AC_DEFUN_ONCE(GP_PROG_SORT,dnl
+GP_CHECK_PROG(SORT, sort, text file line sorting command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(^GP_PROG_TR\()dnl
+m4_pattern_forbid(^GP_PROG_TR$)dnl
+AC_DEFUN_ONCE(GP_PROG_TR,dnl
+GP_CHECK_PROG(TR, tr, string character translation command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl ####################################################################
+m4_pattern_forbid(^GP_PROG_UNIQ\()dnl
+m4_pattern_forbid(^GP_PROG_UNIQ$)dnl
+AC_DEFUN_ONCE(GP_PROG_UNIQ,dnl
+GP_CHECK_PROG(UNIQ, uniq, sorted file unification command)dnl
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-references.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-references.m4 Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-set.m4 Added

@@ -0,0 +1,760 @@
+# gp-set.m4 - implement configure time set arithmetic          -*- Autoconf -*-
+# serial 13
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ######################################################################
+dnl Set operations using shell
+dnl ######################################################################
+dnl
+dnl This implements a set of set operations ('set' in the sense of
+dnl 'set theory') as shell code for use at configure time.  At m4 time
+dnl (aka autoreconf time), there already exists a set of m4_set_*
+dnl macros, but we cannot use those for user specified and
+dnl autodetected changes at configure time.
+dnl
+dnl Not all set operations are implemented, but a few basic ones we
+dnl need for gp-camlibs.m4 are.
+dnl
+dnl   * Basic definitions:
+dnl
+dnl       * GP_SET_DEFINE
+dnl       * GP_SET_UNDEFINE
+dnl
+dnl   * Operations on sets:
+dnl
+dnl       * GP_SET_ADD
+dnl       * GP_SET_ADD_ALL
+dnl       * GP_SET_REMOVE
+dnl
+dnl       * GP_SET_CARDINALITY
+dnl       * GP_SET_DIFFERENCE
+dnl       * GP_SET_UNION
+dnl
+dnl       * GP_SET_FOREACH
+dnl
+dnl   * Conditionals:
+dnl
+dnl       * GP_SET_CONTAINS_IFELSE
+dnl       * GP_SET_EMPTY_IFELSE
+dnl       * GP_SET_EQUAL_IFELSE
+dnl
+dnl       * GP_SET_CLEAN_FILES
+dnl
+dnl   * Internals and debugging help:
+dnl
+dnl       * GP_SET_CANONICALIZE
+dnl       * GP_SET_DUMP_ALL
+dnl       * GP_SET_TESTSUITE
+dnl
+dnl   * Fill shell variables with set contents:
+dnl
+dnl       * GP_SET_DEBUG_VAR
+dnl       * GP_SET_SPACE_VAR
+dnl
+dnl   * Output AC_MSG_* for GP_SET_* sets:
+dnl
+dnl       * GP_SET_DEBUG_MSG
+dnl       * GP_SET_MSG_DEBUG_RESULT
+dnl
+dnl       * GP_SET_SPACE_MSG
+dnl       * GP_SET_MSG_SPACE_RESULT
+dnl
+dnl ######################################################################
+dnl Remarks on usage and implementation of GP_SET_*
+dnl
+dnl   * Sets are stored in text files, one element per line. An empty
+dnl     file is an empty set, and empty lines mean empty elements.
+dnl     Non-empty files not ending with a newline are undefined behaviour.
+dnl
+dnl   * At this time, GP_SET_* macros work with set elements
+dnl     consisting of a limited set of characters, but the storage
+dnl     format allows for a future code cleanup to allow for handling
+dnl     more arbitrarily called elements.
+dnl
+dnl   * Set names given to GP_SET_ macros must be defined at m4
+dnl     (autoreconf) time, not at sh (configure) time.
+dnl
+dnl   * Every set must be declared before use with GP_SET_DEFINE so we
+dnl     can create an empty file for them and keep track of the name of
+dnl     that file for cleaning up later.
+dnl
+dnl   * Use GP_SET_CLEAN_FILES after your last set operations to remove
+dnl     all left over set files.
+dnl
+dnl   * Set text files may contain set elements in any order, and in
+dnl     any number. There is no difference between a set text file
+dnl     containing the same line seven times and one which only contains
+dnl     it one time.
+dnl
+dnl   * Some set operations require or work better on sorted files, so
+dnl     sometimes the implementation sorts the set text files. If you
+dnl     need a set text file sorted for some another reason, use
+dnl     GP_SET_CANONICALIZE(set-name).
+dnl
+dnl   * Some set GP_SET_* operations are implemented using shell
+dnl     functions to reduce the size of the emitted sh code. The goal
+dnl     is for the shell functions to be as compatible with different
+dnl     shells as possible, but if necessary, we can revert to avoiding
+dnl     shell functions and just emitting the same sh code 40 times.
+dnl
+dnl
+dnl ######################################################################
+dnl
+dnl FIXME: Do we need a sh-based replacement for ${COMM} if it is not present?
+dnl FIXME: Do we need to stop using shell functions?
+dnl
+dnl
+dnl ######################################################################
+dnl Try catching unexpanded macros in the output.
+dnl ######################################################################
+m4_pattern_forbid(GP_SET_)dnl
+m4_pattern_forbid(_GP_SET_)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_INIT
+dnl   Called internally before any set operation.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_INIT, dnl
+AC_REQUIRE(AC_PROG_GREP)dnl
+AC_REQUIRE(GP_PROG_SORT)dnl
+AC_REQUIRE(GP_PROG_UNIQ)dnl
+m4_set_empty(gp_set_all_sets, , dnl
+  m4_set_foreach(gp_set_all_sets, elt, dnl
+    m4_errprintn(__file__: __line__: Set gp_set_all_sets contains element elt)dnl
+  )dnl
+  m4_errprintn(__file__:__line__: Error: gp_set_all_sets already defined)dnl
+  dnl m4_exit(1)dnl
+)dnl
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_FILENAME(set_name)
+dnl _GP_SET_FILENAME(set_name, extra-extension)
+dnl   Convert set name to set file name. If present, add the given
+dnl   extra-extension to the file name in some position.
+dnl ######################################################################
+AC_DEFUN(_GP_SET_FILENAME, dnl
+gp-set-file--$1m4_if($2,,,.$2))dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_CHECK_INIT
+dnl   Implement the gp_set_shfn_check() shell function which checks that the
+dnl   given set exists and is in general working order.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_CHECK_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+gp_set_shfn_check ()
+{
+  if test -f "$1"; then :; else
+    AC_MSG_ERROR("Error: set $1 has not been defined yet")
+  fi
+} # gp_set_shfn_check
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_CHECK(set_name)
+dnl   Check that the given set exists and is in general working order.
+dnl   Works by calling the gp_set_shfn_check() shell function.
+dnl ######################################################################
+AC_DEFUN(_GP_SET_CHECK, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_CHECK_INIT)dnl
+gp_set_shfn_check "_GP_SET_FILENAME($1)"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_DUMP_ALL
+dnl   Dump all sets to stdout. Intended for helping with debugging.
+dnl ######################################################################
+AC_DEFUN(GP_SET_DUMP_ALL, dnl
+AC_REQUIRE(AC_PROG_SED)dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+for setfile in gp-set-file--*
+do
+  AS_ECHO("Set file: ${setfile}")
+  ${SED} 's/^/  * <</; s/$/>>/' "${setfile}"
+done
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_DEFINE(set_name)
+dnl   Declare a set of given name, initializing it to an empty set.
+dnl   Not a shell function, as the emitted shell code is shorter than
+dnl   calling a shell function.
+dnl ######################################################################
+AC_DEFUN(GP_SET_DEFINE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+m4_set_add(gp_set_all_sets, $1)dnl
+: > "_GP_SET_FILENAME($1)"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_UNDEFINE(set_name)
+dnl   Undefine a set of given name, removing its file.
+dnl   Not a shell function, as the emitted shell code is shorter than
+dnl   calling a shell function.
+dnl ######################################################################
+AC_DEFUN(GP_SET_UNDEFINE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+_GP_SET_CHECK($1)dnl
+rm -f "_GP_SET_FILENAME($1)"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_ADD_INIT
+dnl   Implement the gp_set_shfn_set_add() shell function which adds a given
+dnl   element to a given set.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_ADD_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_CHECK_INIT)dnl
+gp_set_shfn_set_add ()
+{
+  gp_set_shfn_check "$1"
+  AS_ECHO("$2") >> "$1"
+} # gp_set_shfn_set_add
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_ADD(set_name, element)
+dnl   Add the given element to the given set. Implemented by calling the
+dnl   gp_set_shfn_set_add() shell function.
+dnl   Note: Unlike m4_set_add, this does not handle IF-UNIQ and IF-DUP
+dnl   macro parameters.
+dnl ######################################################################
+AC_DEFUN(GP_SET_ADD, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_ADD_INIT)dnl
+gp_set_shfn_set_add "_GP_SET_FILENAME($1)" "$2"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_ADD_ALL(set_name, element...)
+dnl   Add the given elements to the given set, similar to m4_set_add_all.
+dnl   This can be very useful for initializing a GP_SET_* set from a
+dnl   m4_set_* in one go.
+dnl   Not a shell function, as the emitted shell code is shorter than
+dnl   calling a shell function.
+dnl ######################################################################
+AC_DEFUN(GP_SET_ADD_ALL, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+_GP_SET_CHECK($1)dnl
+cat>>"_GP_SET_FILENAME($1)"<<EOF
+m4_foreach(myvar, m4_shift($@), dnl
+myvar
+)dnl
+EOF
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_REMOVE_INIT
+dnl   Implement the gp_set_shfn_remove() shell function removing a given
+dnl   element from a given set.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_REMOVE_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+gp_set_shfn_remove ()
+{
+  gp_set_shfn_check "$1"
+  ${GREP} -v "^$2$" < "$1" > "$1.tmp"
+  mv -f "$1.tmp" "$1"
+} # gp_set_shfn_remove
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_REMOVE(set_name, element)
+dnl   Remove a given element from a given set.
+dnl   Calls the gp_set_shfn_remove() shell function for the actual work.
+dnl ######################################################################
+AC_DEFUN(GP_SET_REMOVE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_REMOVE_INIT)dnl
+gp_set_shfn_remove "_GP_SET_FILENAME($1)" "$2"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_UNION_INIT
+dnl   Define the gp_set_shfn_union() shell function which defines a
+dnl   result set as the union of 0 or more sets.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_UNION_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+dnl This functions uses the shell builtin 'shift', so it needs to store
+dnl the original $1 in a local variable.
+gp_set_shfn_union ()
+{
+  local result_fname="$1"
+  gp_set_shfn_check "$result_fname"
+  if shift; then
+    cat "$@" > "${result_fname}.tmp"
+    mv -f "${result_fname}.tmp" "${result_fname}"
+  fi
+} # gp_set_shfn_union
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_UNION(result_set, setname...)
+dnl   Define result_set as the union of 0 or more setnames.
+dnl   Calls the gp_set_shfn_union() shell function for the actual work.
+dnl ######################################################################
+AC_DEFUN(GP_SET_UNION, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_UNION_INIT)dnl
+m4_set_add(gp_set_all_sets, $1)dnl
+gp_set_shfn_union m4_foreach(setname, $@,  "_GP_SET_FILENAME(setname)")
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_DIFFERENCE_INIT(result_set_fname, set_fname...)
+dnl   This uses comm(1), which is a POSIX command. We can always
+dnl   re-implement comm(1) with a lot of speed penalties in a bunch
+dnl   of nested sh loops if we run into a system which does not have
+dnl   comm(1) installed or where comm(1) does not work.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_DIFFERENCE_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_CHECK_INIT)dnl
+AC_REQUIRE(_GP_SET_CANONICALIZE_INIT)dnl
+AC_REQUIRE(GP_PROG_COMM)dnl
+cat>confset_a.txt<<EOF
+x
+y
+EOF
+cat>confset_b.txt<<EOF
+y
+z
+EOF
+cat>confset_res_23.txt<<EOF
+x
+EOF
+AC_MSG_CHECKING(whether comm -23 works)
+m4_pattern_allow(GP_SET_xyz)dnl mentioned in message strings
+AS_IF(${COMM} -23 confset_a.txt confset_b.txt > confset_diff_23.txt, dnl
+  AS_IF(${CMP} confset_diff_23.txt confset_res_23.txt > /dev/null 2>&1, dnl
+    AC_MSG_RESULT(yes)
+    rm -f confset_a.txt confset_b.txt confset_diff_23.txt confset_res_23.txt
+  , dnl
+    AC_MSG_RESULT(no (wrong result))
+    AC_MSG_ERROR(comm -23 must work for GP_SET_xyz difference calculations)
+  )
+, dnl
+  AC_MSG_RESULT(no (does not run))
+  AC_MSG_ERROR(comm -23 must work for GP_SET_xyz difference calculations)
+)
+dnl This functions uses the shell builtin 'shift', so it needs to store
+dnl the original $1 and $2 in local variables.
+gp_set_shfn_difference ()
+{
+  local result_fname="$1"
+  gp_set_shfn_check "$result_fname"
+  if shift; then
+    gp_set_shfn_canonicalize "$1"
+    cat "$1" > "$result_fname"
+    if shift; then
+      for gp_s
+      do
+        gp_set_shfn_canonicalize "$gp_s"
+        ${COMM} -23 "${result_fname}" "$gp_s" > "${result_fname}.tmp"
+        mv -f "${result_fname}.tmp" "${result_fname}"
+      done
+    fi
+  fi
+} # gp_set_shfn_difference
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_DIFFERENCE(result_set, setname...)
+dnl   Define result_set as the first setname with the element of all
+dnl   the other sets removed from it.
+dnl ######################################################################
+AC_DEFUN(GP_SET_DIFFERENCE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_DIFFERENCE_INIT)dnl
+m4_set_add(gp_set_all_sets, $1)dnl
+gp_set_shfn_difference m4_foreach(setname, $@,  "_GP_SET_FILENAME(setname)")
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_CARDINALITY_INIT
+dnl   Define gp_set_shfn_cardinality() shell function which writes
+dnl   set cardinality to stdout.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_CARDINALITY_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+gp_set_shfn_cardinality ()
+{
+  gp_set_shfn_check "$1"
+  wc -l < "$1"
+} # gp_set_shfn_cardinality
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_CARDINALITY(set_name)
+dnl   Write set cardinality to stdout.
+dnl ######################################################################
+AC_DEFUN(GP_SET_CARDINALITY, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_CARDINALITY_INIT)dnl
+gp_set_shfn_cardinality "_GP_SET_FILENAME($1)")dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_EMPTY_IFELSE(set_name, if-empty, if-not-empty)
+dnl   Run if-empty block or if-not-empty block, depending on whether
+dnl   the named set is empty or not.
+dnl ######################################################################
+AC_DEFUN(GP_SET_EMPTY_IFELSE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+_GP_SET_CHECK($1)dnl
+AS_IF(test "0" -eq "$(wc -l < "_GP_SET_FILENAME($1)")", m4_shift($@))
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_EQUAL_IFELSE(set_a, set_b, if-equal, if-not-equal)
+dnl   When set_a and set_b are equal, run the if-equal block. Otherwise,
+dnl   run the if-not-equal block.
+dnl ######################################################################
+AC_DEFUN(GP_SET_EQUAL_IFELSE, dnl
+gp_set_shfn_canonicalize "_GP_SET_FILENAME($1)"
+gp_set_shfn_canonicalize "_GP_SET_FILENAME($2)"
+AS_IF(${CMP} "_GP_SET_FILENAME($1)" "_GP_SET_FILENAME($2)" > /dev/null 2>&1,
+      m4_shift2($@))
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_CONTAINS_IFELSE(set_name, element, yes-block, no-block)
+dnl   If set_name contains element, run the yes-block. Otherwise,
+dnl   run the no-block.
+dnl ######################################################################
+AC_DEFUN(GP_SET_CONTAINS_IFELSE, dnl
+_GP_SET_CHECK($1)dnl
+AS_IF(test "0" -lt "$(${GREP} -c "^$2\$" < "_GP_SET_FILENAME($1)")",
+      m4_shift2($@))
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_DEBUG_VAR_INIT
+dnl   Define gp_set_shfn_debug_var() shell function which sets a shell
+dnl   variable to a string representing a human readable form for of
+dnl   the given set.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_DEBUG_VAR_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+gp_set_shfn_debug_var ()
+{
+  gp_set_shfn_check "$1"
+  gp_set_shfn_canonicalize "$1"
+  local element
+  local gp_set_is_first=:
+  local gp_set_saved_ifs="$IFS"
+  IFS=""
+  while read element
+  do
+    if "$gp_set_is_first"
+    then
+      eval "$2=\"{ \""
+      gp_set_is_first=false
+    else
+      eval "$2=\"\${$2}, \""
+    fi
+    if test "x$element" = "x"
+    then
+      eval "$2=\"\${$2}''\""
+    else
+      eval "$2=\"\${$2}'\$element'\""
+    fi
+  done < "$1"
+  IFS="$gp_set_saved_ifs"
+  if "$gp_set_is_first"
+  then
+    eval "$2=\"{ }\""
+  else
+    eval "$2=\"\${$2} }\""
+  fi
+} # gp_set_shfn_debug_var
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_DEBUG_VAR(set_name, shell_var_name)
+dnl   Set shell variable shell_var_name to a string representing a human
+dnl   readable for of the given set.
+dnl ######################################################################
+AC_DEFUN(GP_SET_DEBUG_VAR, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_DEBUG_VAR_INIT)dnl
+gp_set_shfn_debug_var "_GP_SET_FILENAME($1)" "$2"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_DEBUG_MSG(set-name)
+dnl   For a given set, expand to a simple pair of AC_MSG_CHECKING and
+dnl   AC_MSG_RESULT showing the GP_SET_DEBUG_VAR, mostly to help with
+dnl   debugging.
+dnl ######################################################################
+AC_DEFUN(GP_SET_DEBUG_MSG, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_MSG_CHECKING(value of set $1)
+GP_SET_MSG_DEBUG_RESULT($1)
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_SPACE_MSG(set-name)
+dnl   For a given set, expand to a simple pair of AC_MSG_CHECKING and
+dnl   AC_MSG_RESULT showing the GP_SET_SPACE_VAR, both to help with
+dnl   debugging gp-set.m4 and possibly for produnction use.
+dnl ######################################################################
+AC_DEFUN(GP_SET_MSG, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_MSG_CHECKING(value of set $1)
+GP_SET_MSG_RESULT($1)
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_SPACE_VAR(set-name, var-name)
+dnl ######################################################################
+AC_DEFUN(GP_SET_SPACE_VAR, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+$2=""
+GP_SET_FOREACH($1, element, dnl
+AS_IF(test "x$$2" = "x", dnl
+  $2="$element"
+, dnl
+  $2="$$2 $element"
+)
+)
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_MSG_RESULT(set-name)
+dnl   Shortcut for setting a shell variable to a space separated list of
+dnl   elements, and then expanding to AC_MSG_RESULT($shellvar).
+dnl ######################################################################
+AC_DEFUN(GP_SET_MSG_RESULT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+GP_SET_SPACE_VAR($1, gp_set_msg_result_var)dnl
+AC_MSG_RESULT(${gp_set_msg_result_var})
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_MSG_DEBUG_RESULT(set-name)
+dnl   Shortcut for setting a shell variable to a human readable list of
+dnl   elements, and then expanding to AC_MSG_RESULT($shellvar).
+dnl ######################################################################
+AC_DEFUN(GP_SET_MSG_DEBUG_RESULT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+GP_SET_DEBUG_VAR($1, gp_set_msg_result_var)dnl
+AC_MSG_RESULT(${gp_set_msg_result_var})
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl _GP_SET_CANONICALIZE_INIT
+dnl   Implement the gp_set_shfn_canonicalize() shell function.
+dnl ######################################################################
+AC_DEFUN_ONCE(_GP_SET_CANONICALIZE_INIT, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+gp_set_shfn_canonicalize ()
+{
+  gp_set_shfn_check "$1"
+  ( set -e
+    ${SORT} < "$1" | ${UNIQ} > "$1.tmp"
+    mv -f "$1.tmp" "$1"; )
+} # gp_set_shfn_canonicalize
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_CANONICALIZE(set_name)
+dnl   Convert the set file for set_name into a canonical form.
+dnl
+dnl   Implementation detail: Sorts the lines, and makes them unique.
+dnl ######################################################################
+AC_DEFUN(GP_SET_CANONICALIZE, dnl
+AC_REQUIRE(_GP_SET_INIT)dnl
+AC_REQUIRE(_GP_SET_CANONICALIZE_INIT)dnl
+gp_set_shfn_canonicalize "_GP_SET_FILENAME($1)"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_FOREACH(set_name, shell-var, shell-block)
+dnl   For each element in set_name, run the shell-block with the given
+dnl   shell variable set to every element in turn.
+dnl ######################################################################
+AC_DEFUN(GP_SET_FOREACH, dnl
+_GP_SET_CHECK($1)dnl
+gp_set_saved_ifs="$IFS"
+IFS=""
+while read $2
+do
+  IFS="$gp_set_saved_ifs"
+  $3
+done < "_GP_SET_FILENAME($1)"
+IFS="$gp_set_saved_ifs"
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_CLEAN_FILES
+dnl   Remove all the files used for storing sets. Invoke this macro near
+dnl   the end of configure.ac after you have finished doing anything with
+dnl   GP_SET_* sets.
+dnl ######################################################################
+AC_DEFUN(GP_SET_CLEAN_FILES, dnl
+AC_BEFORE(_GP_SET_INIT, $0)dnl
+AC_BEFORE(GP_SET_DEFINE, $0)dnl
+AC_BEFORE(GP_SET_UNDEFINE, $0)dnl
+AC_BEFORE(GP_SET_ADD, $0)dnl
+AC_BEFORE(GP_SET_ADD_ALL, $0)dnl
+AC_BEFORE(GP_SET_REMOVE, $0)dnl
+AC_BEFORE(GP_SET_EMPTY_IFELSE, $0)dnl
+AC_BEFORE(GP_SET_EQUAL_IFELSE, $0)dnl
+AC_BEFORE(GP_SET_CONTAINS_IFELSE, $0)dnl
+AC_BEFORE(GP_SET_DEBUG_VAR, $0)dnl
+AC_BEFORE(GP_SET_SPACE_VAR, $0)dnl
+dnl
+dnl GP_SET_DUMP_ALL()dnl
+dnl
+dnl m4_set_foreach(gp_set_all_sets, set_name, dnl
+dnl AS_ECHO("Set defined somewhere: set_name")
+dnl )dnl
+dnl
+rm -fm4_set_foreach(gp_set_all_sets, setname,
+                       "_GP_SET_FILENAME(setname)")dnl
+)dnl
+dnl
+dnl
+dnl ######################################################################
+dnl GP_SET_TESTSUITE()
+dnl   Does a number of tests for the GP_SET_* macros.
+dnl
+dnl   Should be mostly useful while debugging gp-set.m4 itself.
+dnl ######################################################################
+AC_DEFUN(GP_SET_TESTSUITE, dnl
+# BEGIN $0
+_GP_SET_INIT
+
+GP_SET_DEFINE(foo)
+GP_SET_DEFINE(bar)
+GP_SET_DEFINE(foobar)
+GP_SET_DEFINE(everything)
+
+GP_SET_DEBUG_MSG(foo)
+
+GP_SET_DEFINE(bax)
+GP_SET_UNDEFINE(bax)
+
+GP_SET_UNDEFINE(bar)
+GP_SET_DEFINE(bar)
+
+dnl GP_SET_ADD(moo, meh)
+GP_SET_ADD_ALL(everything, foo, bar, bar , bla)
+
+GP_SET_DUMP_ALL
+
+m4_set_add_all(m4testset, a, b c, d e, f, g)
+AC_MSG_CHECKING(for value of m4 testset)
+AC_MSG_RESULT(m4_set_contents(m4testset, , ))
+
+GP_SET_ADD_ALL(everythingm4_set_listc(m4testset))
+
+GP_SET_DUMP_ALL
+
+GP_SET_ADD(foo, barfoo)
+GP_SET_ADD(foo, foobar)
+GP_SET_ADD(foo, fox)
+GP_SET_ADD(foo, fux)
+GP_SET_ADD(foo, fox)
+GP_SET_ADD(foo, )
+GP_SET_ADD(foo, fox)
+GP_SET_ADD(foo, barfoo)
+GP_SET_ADD(foo,  barfoo)
+GP_SET_ADD(foo, "barfoo ")
+GP_SET_ADD(foo, )
+GP_SET_REMOVE(foo, fox)
+GP_SET_ADD(foo, barfoo)
+
+GP_SET_ADD(foobar, bar)
+GP_SET_ADD(foobar, foobar)
+GP_SET_ADD(foobar, barfoo)
+
+GP_SET_DEBUG_MSG(foo)
+
+GP_SET_MSG(bar)
+GP_SET_MSG(foo)
+GP_SET_MSG(foobar)
+GP_SET_MSG(everything)
+
+GP_SET_DEFINE(union)
+GP_SET_UNION(union, foo, bar, foobar)
+AC_MSG_CHECKING(value of union of foo bar foobar)
+GP_SET_MSG_RESULT(union)
+
+GP_SET_DEFINE(difference)
+GP_SET_DIFFERENCE(difference, foo, bar, foobar)
+GP_SET_MSG(difference)
+
+AC_MSG_CHECKING(whether sets foo and bar are equal)
+GP_SET_EQUAL_IFELSE(foo, bar, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether set foo is empty)
+GP_SET_EMPTY_IFELSE(foo, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether set bar is empty)
+GP_SET_EMPTY_IFELSE(bar, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether set foo contains element bar)
+GP_SET_CONTAINS_IFELSE(foo, bar, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether set foobar contains element bar)
+GP_SET_CONTAINS_IFELSE(foobar, bar, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+GP_SET_FOREACH(foobar, gp_set_var, dnl
+  AC_MSG_CHECKING(foobar element)
+  AC_MSG_RESULT(${gp_set_var})
+)dnl
+GP_SET_FOREACH(foobar, gp_set_var, dnl
+  AS_ECHO("  * element ${gp_set_var}")
+)dnl
+GP_SET_FOREACH(foobar, gp_set_var, echo "  * ELEMENT ${gp_set_var}")dnl
+AS_ECHO("Moo.")
+
+GP_SET_DUMP_ALL
+# END $0
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-sleep.m4 Added

@@ -0,0 +1,56 @@
+# gp-sleep.m4 - look for the sleep(1) tool                     -*- Autoconf -*-
+# serial 14
+dnl | Increment the above serial number every time you edit this file.
+dnl | When it finds multiple m4 files with the same name,
+dnl | aclocal will use the one with the highest serial.
+dnl
+dnl ####################################################################
+dnl GP_SLEEP(delay_in_whole_seconds)
+dnl   * If the SLEEP variable is set to "no" or empty or is unset,
+dnl     do not sleep.
+dnl   * If stdout (FD 1) is not a TTY (!isatty(1)), do not sleep.
+dnl   * Otherwise, run ${SLEEP} with the given delay value argument.
+dnl ####################################################################
+dnl
+dnl ####################################################################
+dnl GP_SLEEP_IF_TTY(delay_in_whole_seconds)
+dnl   * If the SLEEP variable is set to "no" or empty or is unset,
+dnl     do not sleep.
+dnl   * If stdout (FD 1) is not a TTY (!isatty(1)), do not sleep.
+dnl   * If tty -t is not present and therefore fails, we do not lose
+dnl     much: Just that interactive users do not benefit from seeing the
+dnl     warning a bit longer.
+dnl   * Otherwise, run ${SLEEP} with the given delay value argument.
+dnl ####################################################################
+dnl
+AC_DEFUN_ONCE(_GP_SLEEP_INIT, dnl
+AC_REQUIRE(GP_PROG_SLEEP)dnl
+AC_MSG_CHECKING(whether configure script should sleep)
+AS_IF(test "x$SLEEP" != x && test "x$SLEEP" != xno, dnl
+  AC_MSG_RESULT(yes)
+  gp_sleep=$SLEEP
+, dnl
+  AC_MSG_RESULT(no)
+  gp_sleep=:
+)
+)dnl
+dnl
+dnl
+AC_DEFUN(GP_SLEEP, dnl
+AC_REQUIRE(_GP_SLEEP_INIT)dnl
+$gp_sleep $1
+)dnl
+dnl
+AC_DEFUN(GP_SLEEP_IF_TTY, dnl
+AC_REQUIRE(_GP_SLEEP_INIT)dnl
+AS_IF(test -t 1, dnl
+$gp_sleep $1
+)
+)dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-subpackage.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-subpackage.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-udev.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-udev.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto-m4/gp-va-copy.m4 -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto-m4/gp-va-copy.m4 Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-info-list.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-info-list.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-library.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-library.h Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-locking.h Added

@@ -0,0 +1,40 @@
+/** \file
+ * \brief internal header to help with locking e.g. MT-unsafe libltdl
+ *
+ * \author Copyright 2017 Kris Adler <spurfan15@gmail.com>
+ * \author Copyright 2022 Marcus Meissner
+ * \author Copyright 2022 Hans Ulrich Niedermann
+ *
+ * \par License
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * \par
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * \par
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef LIBGPHOTO2_GPHOTO2_PORT_LOCKING_H
+#define LIBGPHOTO2_GPHOTO2_PORT_LOCKING_H
+
+#ifdef _GPHOTO2_INTERNAL_CODE
+
+/** lock libltdl before calling lt_*() (libltdl is not thread safe) */
+extern void gpi_libltdl_lock(void);
+
+/** unlock libltdl after calling lt_*() (libltdl is not thread safe) */
+extern void gpi_libltdl_unlock(void);
+
+#endif /* defined(_GPHOTO2_INTERNAL_CODE) */
+
+#endif /* defined(LIBGPHOTO2_GPHOTO2_PORT_LOCKING_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-log.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-log.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-portability.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-portability.h Changed

@@ -7,18 +7,19 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#ifndef __GPHOTO2_PORT_PORTABILITY_H__
-#define __GPHOTO2_PORT_PORTABILITY_H__
+
+#ifndef LIBGPHOTO2_GPHOTO2_PORT_PORTABILITY_H
+#define LIBGPHOTO2_GPHOTO2_PORT_PORTABILITY_H
 
 #ifdef _GPHOTO2_INTERNAL_CODE
 
@@ -36,6 +37,7 @@
 # include <string.h>
 # include <stdio.h>
 # include <direct.h>
+# include <unistd.h>
 
 # ifndef IOLIBS
 #  define IOLIBS			"."
@@ -47,7 +49,9 @@
 
 #define __func__ __FUNCTION__
 
+#ifndef _SSIZE_T_DEFINED
 typedef SSIZE_T ssize_t;
+#endif
 
 /* Work-around for readdir() */
 typedef struct {
@@ -74,104 +78,7 @@
  * End WIN32 definitions
  ************************************************************************/
 
-#elif defined(__SOME_OS2_MAGIC_HERE__)
-
-/************************************************************************
- * Begin OS/2 definitions
- ************************************************************************/
-
-# define strcasecmp(foo,bar) stricmp(foo,bar)
-# define gp_system_dir_delim		'\\'
-
-# ifndef GPIO_OS2_INCLUDED
-#  define GPIO_OS2_INCLUDED
-#  define IOLIBS getenv("IOLIBS")
-/*#define IOLIBS "./libgphoto2_port"*/
-#  define RTLD_LAZY       0x001
-
-
-#  ifndef HAVE_TERMIOS_H
-#   define  INCL_DOSDEVIOCTL   /* DosDevIOCtl values */
-#   define IOCTL_ASYNC                        0x0001
-#   define ASYNC_SETBAUDRATE                  0x0041
-/* c_cflag bit meaning */
-#   define CBAUD   0x0000100f
-#   define  B0     0x00000000      /* hang up */
-#   define  B50    0x00000001
-#   define  B75    0x00000002
-#   define  B110   0x00000003
-#   define  B134   0x00000004
-#   define  B150   0x00000005
-#   define  B200   0x00000006
-#   define  B300   0x00000007
-#   define  B600   0x00000008
-#   define  B1200  0x00000009
-#   define  B1800  0x0000000a
-#   define  B2400  0x0000000b
-#   define  B4800  0x0000000c
-#   define  B9600  0x0000000d
-#   define  B19200 0x0000000e
-#   define  B38400 0x0000000f
-#   define EXTA    B19200
-#   define EXTB    B38400
-#   define  CSIZE  0x00000030
-#   define   CS5   0x00000000
-#   define   CS6   0x00000010
-#   define   CS7   0x00000020
-#   define   CS8   0x00000030
-#   define CSTOPB  0x00000040
-#   define CREAD   0x00000080
-#   define PARENB  0x00000100
-#   define PARODD  0x00000200
-#   define HUPCL   0x00000400
-#   define CLOCAL  0x00000800
-#   define CBAUDEX 0x00001000
-#   define  B57600  0x00001001
-#   define  B115200 0x00001002
-#   define  B230400 0x00001003
-#   define  B460800 0x00001004
-#   define  B76800  0x00001005
-#   define  B153600 0x00001006
-#   define  B307200 0x00001007
-#   define  B614400 0x00001008
-#   define  B921600 0x00001009
-#   define  B500000 0x0000100a
-#   define  B576000 0x0000100b
-#   define B1000000 0x0000100c
-#   define B1152000 0x0000100d
-#   define B1500000 0x0000100e
-#   define B2000000 0x0000100f
-
-#  endif /* HAVE_TERMIOS_H */
-
-#  define CIBAUD  0x100f0000      /* input baud rate (not used) */
-#  define CMSPAR  0x40000000      /* mark or space (stick) parity */
-/* #define CRTSCTS 0x80000000  */    /* flow control */
-
-/* modem lines */
-#  define TIOCM_LE        0x001
-#  define TIOCM_DTR       0x002
-#  define TIOCM_RTS       0x004
-#  define TIOCM_ST        0x008
-#  define TIOCM_SR        0x010
-#  define TIOCM_CTS       0x020
-#  define TIOCM_CAR       0x040
-#  define TIOCM_RNG       0x080
-#  define TIOCM_DSR       0x100
-#  define TIOCM_CD        TIOCM_CAR
-#  define TIOCM_RI        TIOCM_RNG
-
-#  define TIOCMBIC        0x06C
-#  define TIOCMBIS        0x06B
-#  define TIOCMGET        0x06E
-
-# endif /* GPIO_OS2_INCLUDED */
-
-/************************************************************************
- * End OS/2 definitions
- ************************************************************************/
-
-#else 
+#else
 
 /************************************************************************
  * Begin POSIX/XOPEN definitions
@@ -238,5 +145,6 @@
  ************************************************************************/
 #endif /* _GPHOTO2_INTERNAL_CODE */
 
-#endif /* ifndef __GPHOTO2_PORT_PORTABILITY_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_PORT_PORTABILITY_H) */
+
 /* end of file */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-result.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-result.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-version.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port-version.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/gphoto2/gphoto2-port.h Changed

@@ -1,4 +1,4 @@
-/** \file 
+/** \file
  *
  * \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
  *
@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -21,17 +21,13 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GPHOTO2_PORT_H__
-#define __GPHOTO2_PORT_H__
+#ifndef LIBGPHOTO2_GPHOTO2_PORT_H
+#define LIBGPHOTO2_GPHOTO2_PORT_H
 
 #include <gphoto2/gphoto2-port-info-list.h>
 
 /* For portability */
 #include <gphoto2/gphoto2-port-portability.h>
-#ifdef OS2
-#include <gphoto2/gphoto2-port-portability-os2.h>
-#include <os2.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,7 +43,7 @@
 
 /**
  * \brief Serial parity
- * 
+ *
  * Parity of the serial port.
  */
 typedef enum _GPPortSerialParity
@@ -58,7 +54,7 @@
 } GPPortSerialParity;
 
 /** \brief Maximum length of receive buffer */
-#define GP_PORT_MAX_BUF_LEN 4096             
+#define GP_PORT_MAX_BUF_LEN 4096
 
 /**
  * \brief Port settings for serial ports.
@@ -67,7 +63,7 @@
 	char port128;		/**< The portname (/dev/ttyX)*/
 	int speed;		/**< The baudrate of the device. */
 	int bits;		/**< How many bits data. */
-	GPPortSerialParity parity;	/**< parity data, see GP_PORT_SERIAL_PARITY_ 
+	GPPortSerialParity parity;	/**< parity data, see GP_PORT_SERIAL_PARITY_
 				  defines */
 	int stopbits;		/**< How many stop bits are used. */
 } GPPortSettingsSerial;
@@ -86,7 +82,7 @@
 	int maxpacketsize;	/**< \brief Maximum USB packetsize of the IN endpoint. (r/o) */
 
 	/* must be last to avoid binary incompatibility.
-	 * luckily we just need to make sure this struct does not 
+	 * luckily we just need to make sure this struct does not
 	 * get larger than _GPPortSettingsSerial. */
 	char port64;		/**< \brief USB Portname. Specific to lowlevel USB. */
 } GPPortSettingsUSB;
@@ -177,7 +173,7 @@
 
 /**
  * \brief Serial pins.
- * 
+ *
  * A number of serial pins to trigger and pull. This is necessary
  * for some devices that have more than just the regular 3 or 4 wires.
  */
@@ -192,7 +188,7 @@
 
 /**
  * \brief Level to pull specific lines.
- * 
+ *
  * The level on which to pull some of the serial lines.
  */
 typedef enum _GPLevel {
@@ -213,13 +209,13 @@
 			     int index, char *bytes, int size);
 int gp_port_usb_msg_read    (GPPort *port, int request, int value,
 			     int index, char *bytes, int size);
-int gp_port_usb_msg_interface_write    (GPPort *port, int request, 
+int gp_port_usb_msg_interface_write    (GPPort *port, int request,
 			    int value, int index, char *bytes, int size);
-int gp_port_usb_msg_interface_read    (GPPort *port, int request, 
+int gp_port_usb_msg_interface_read    (GPPort *port, int request,
 			    int value, int index, char *bytes, int size);
-int gp_port_usb_msg_class_write    (GPPort *port, int request, 
+int gp_port_usb_msg_class_write    (GPPort *port, int request,
 			    int value, int index, char *bytes, int size);
-int gp_port_usb_msg_class_read    (GPPort *port, int request, 
+int gp_port_usb_msg_class_read    (GPPort *port, int request,
 			    int value, int index, char *bytes, int size);
 
 int gp_port_seek (GPPort *port, int offset, int whence);
@@ -249,4 +245,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* __GPHOTO2_PORT_H__ */
+#endif /* !defined(LIBGPHOTO2_GPHOTO2_PORT_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port.pc.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port.pc.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/Makefile.am Changed

@@ -1,9 +1,27 @@
-lib_LTLIBRARIES = libgphoto2_port.la
+EXTRA_DIST =
 
-libgphoto2_port_la_CPPFLAGS = 		\
-	-I$(srcdir) -I$(top_srcdir)	\
-	$(AM_CPPFLAGS) $(CPPFLAGS)	\
-	$(LTDLINCL)					
+
+# included by all *.c files containing translated string literals as
+# libgphoto2_port/i18n.h
+EXTRA_DIST += i18n.h
+
+
+EXTRA_DIST += compiletime-assert.h
+
+
+lib_LTLIBRARIES                  = libgphoto2_port.la
+libgphoto2_port_la_CFLAGS        =
+libgphoto2_port_la_CPPFLAGS      =
+libgphoto2_port_la_DEPENDENCIES  =
+libgphoto2_port_la_LDFLAGS       =
+libgphoto2_port_la_LIBADD        =
+libgphoto2_port_la_SOURCES       =
+
+libgphoto2_port_la_CPPFLAGS     += -I$(top_srcdir)
+libgphoto2_port_la_CPPFLAGS     += -I$(top_srcdir)/libgphoto2_port
+libgphoto2_port_la_CPPFLAGS     += $(AM_CPPFLAGS)
+
+libgphoto2_port_la_LDFLAGS      += -no-undefined
 
 # Notes about the list of exported symbols:
 #    gp_* also contains internal symbols which are intended for
@@ -24,40 +42,37 @@
 #
 # Yes, this is messy, but we are going to clean this up.
 
-libgphoto2_port_la_LDFLAGS = \
-	-no-undefined \
-	@VERSIONMAPLDFLAGS@ \
-	-version-info @LIBGPHOTO2_PORT_VERSION_INFO@
+# EXTRA_DIST                      += libgphoto2_port.sym
+EXTRA_DIST                      += libgphoto2_port.ver
+if HAVE_ASM_SYMVER
+libgphoto2_port_la_DEPENDENCIES += $(srcdir)/libgphoto2_port.ver
+libgphoto2_port_la_LDFLAGS      += -Wl,--version-script=$(srcdir)/libgphoto2_port.ver
+# else
+# libgphoto2_port_la_DEPENDENCIES += $(srcdir)/libgphoto2_port.sym
+# libgphoto2_port_la_LDFLAGS      += -export-symbols $(srcdir)/libgphoto2_port.sym
+endif
+
+libgphoto2_port_la_LDFLAGS      += -version-info @LIBGPHOTO2_PORT_VERSION_INFO@
 
-libgphoto2_port_la_LIBADD = \
-	$(LIBLTDL) 			\
-	$(INTLLIBS)
 # The libtool docs describe these params, but they don't build.
 #	"-dlopen" self \
 #	"-dlopen" $(top_builddir)/serial/....la \
 #	"-dlopen" $(top_builddir)/usb/....la
 
-libgphoto2_port_la_SOURCES =		\
-	gphoto2-port-info-list.c	\
-	gphoto2-port-info.h		\
-	gphoto2-port-log.c		\
-	gphoto2-port-version.c		\
-	gphoto2-port.c 			\
-	gphoto2-port-portability.c	\
-	gphoto2-port-result.c
-
-libgphoto2_port_la_DEPENDENCIES = \
-	$(top_srcdir)/gphoto2/gphoto2-port-version.h		\
-	$(top_srcdir)/gphoto2/gphoto2-port-library.h		\
-	$(srcdir)/libgphoto2_port.ver
-
-# Note: If you have problem with this file not being put into
-#       the source tarball correctly at "make dist", this may
-#       be the result of tar not creating archives with >99
-#       characters of path length.
-EXTRA_DIST = \
-	libgphoto2_port.ver
-
-../libltdl/libltdlc.la:
-	cd ../libltdl && $(MAKE) libltdlc.la
+libgphoto2_port_la_CPPFLAGS     += $(LTDLINCL)
+libgphoto2_port_la_LIBADD       += $(LIBLTDL)
+
+libgphoto2_port_la_LIBADD       += $(INTLLIBS)
+
+libgphoto2_port_la_SOURCES      += gphoto2-port-info-list.c
+libgphoto2_port_la_SOURCES      += gphoto2-port-info.h
+libgphoto2_port_la_SOURCES      += gphoto2-port-locking.c
+libgphoto2_port_la_SOURCES      += gphoto2-port-log.c
+libgphoto2_port_la_SOURCES      += gphoto2-port-version.c
+libgphoto2_port_la_SOURCES      += gphoto2-port.c
+libgphoto2_port_la_SOURCES      += gphoto2-port-portability.c
+libgphoto2_port_la_SOURCES      += gphoto2-port-result.c
 
+libgphoto2_port_la_DEPENDENCIES += $(top_srcdir)/gphoto2/gphoto2-port-locking.h
+libgphoto2_port_la_DEPENDENCIES += $(top_srcdir)/gphoto2/gphoto2-port-version.h
+libgphoto2_port_la_DEPENDENCIES += $(top_srcdir)/gphoto2/gphoto2-port-library.h

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/compiletime-assert.h Added

@@ -0,0 +1,92 @@
+/** \file libgphoto2_port/compiletime-assert.h
+ * \brief Allow compile time assertions with or without C11.
+ *
+ * C11 has added static_assert(EXPR, MSG) to assert.h, but C99 only
+ * knows runtime assertions using assert(EXPR). This defines
+ * COMPILETIME_ASSERT(EXPR) which works with both C99 and C11 and
+ * later.
+ *
+ * \author Copyright (C) 2010-2021 Hans Ulrich Niedermann <hun@n-dimensional.de>
+ *
+ * \copyright GNU Lesser General Public License 2 or later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef LIBGPHOTO2_PORT_COMPILETIME_ASSERT_H
+#define LIBGPHOTO2_PORT_COMPILETIME_ASSERT_H
+
+
+#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L))
+/* C11 or later */
+
+#include <assert.h>
+
+/** Compiletime assertion for use inside a function. */
+#define COMPILETIME_ASSERT(CONDITION) \
+	static_assert((CONDITION), #CONDITION)
+
+/** Compiletime assertion for use outside a function. */
+#define BARE_COMPILETIME_ASSERT(CONDITION) \
+	static_assert((CONDITION), #CONDITION)
+
+#else
+/* before C11 */
+
+/** Compiletime assertion for use inside a function. */
+#define COMPILETIME_ASSERT(CONDITION)				      \
+	switch (0) {      /* error here means assertion has failed */ \
+	case 0:           /* error here means assertion has failed */ \
+	case (CONDITION): /* error here means assertion has failed */ \
+		break;						      \
+	}
+
+
+/** \internal used by BARE_COMPILETIME_ASSERT() macro */
+#define MAKE_BARE_COMPILETIME_ASSERT_NAME				\
+	MAKE_BARE_COMPILETIME_ASSERT_NAME1(COMPILETIME_ASSERT_fails_in_line, \
+					   __LINE__)
+
+
+/** \internal used by BARE_COMPILETIME_ASSERT() macro */
+#define MAKE_BARE_COMPILETIME_ASSERT_NAME1(BASE, PARAM) \
+	MAKE_BARE_COMPILETIME_ASSERT_NAME2(BASE, PARAM)
+
+
+/** \internal used by BARE_COMPILETIME_ASSERT() macro */
+#define MAKE_BARE_COMPILETIME_ASSERT_NAME2(BASE, PARAM) \
+	BASE ## _ ## PARAM
+
+
+/** Compiletime assertion for use outside a function. */
+#define BARE_COMPILETIME_ASSERT(CONDITION)		\
+	void MAKE_BARE_COMPILETIME_ASSERT_NAME(void);	\
+	void MAKE_BARE_COMPILETIME_ASSERT_NAME(void)	\
+	{						\
+		COMPILETIME_ASSERT(CONDITION);		\
+	}
+
+#endif /* after/before C11 */
+
+
+#endif /* !defined(LIBGPHOTO2_PORT_COMPILETIME_ASSERT_H) */
+
+/*
+ * Local Variables:
+ * c-file-style:"linux"
+ * indent-tabs-mode:t
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c Changed

@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -21,16 +21,20 @@
  * Boston, MA  02110-1301  USA
  */
 #define _GNU_SOURCE
+#define _DARWIN_C_SOURCE
 
 #include "config.h"
 
 #include <gphoto2/gphoto2-port-info-list.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #ifdef HAVE_REGEX
 #include <regex.h>
+#elif defined(_MSC_VER)
+#pragma message("We need regex.h, but it has not been detected.")
 #else
 #warning We need regex.h, but it has not been detected.
 #endif
@@ -40,29 +44,11 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-library.h>
 #include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-port-locking.h>
+
+#include "libgphoto2_port/gphoto2-port-info.h"
+#include "libgphoto2_port/i18n.h"
 
-#include "gphoto2-port-info.h"
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif 
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define bind_textdomain_codeset(Domain,codeset) (codeset)
-#  define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 /**
  * \internal GPPortInfoList:
@@ -79,20 +65,72 @@
 
 
 /**
+ * \brief Initialize the localedir directory for the libgphoto2_port gettext domain
+ *
+ * Override the localedir directory libgphoto2_port uses for its message
+ * translations.
+ *
+ * This function is called by the gp_init_localedir() function, so if
+ * you are calling that already, there is no need to call
+ * gp_port_init_localedir() yourself.
+ *
+ * You only need to call this if you have a non-standard installation
+ * where the locale files are at a location which differs from the
+ * compiled in default location.
+ *
+ * If you need to call this function, call it before calling any
+ * non-initialization function.
+ *
+ * Internally, this will make sure bindtextdomain() is called for the
+ * relevant gettext text domain(s).
+ *
+ * \param localedir Root directory of libgphoto2_port's localization files.
+ *                  If NULL, use the compiled in default value, which
+ *                  will be something like "/usr/share/locale".
+ * \return gphoto2 error code.
+ */
+int
+gp_port_init_localedir (const char *localedir)
+{
+	static int locale_initialized = 0;
+	if (locale_initialized) {
+		gp_log(GP_LOG_DEBUG, "gp_port_init_localedir",
+		       "ignoring late call (localedir value %s)",
+		       localedir?localedir:"NULL");
+		return GP_OK;
+	}
+	const char *const actual_localedir = (localedir?localedir:LOCALEDIR);
+	const char *const gettext_domain = GETTEXT_PACKAGE_LIBGPHOTO2_PORT;
+	if (bindtextdomain (gettext_domain, actual_localedir) == NULL) {
+		if (errno == ENOMEM)
+			return GP_ERROR_NO_MEMORY;
+		return GP_ERROR;
+	}
+	gp_log(GP_LOG_DEBUG, "gp_port_init_localedir",
+	       "localedir has been set to %s%s",
+	       actual_localedir,
+	       localedir?"":" (compile-time default)");
+	locale_initialized = 1;
+	return GP_OK;
+}
+
+
+/**
  * \brief Specify codeset for translations
  *
- * This function specifies the codeset that are used for the translated
+ * This function specifies the codeset that is used for the translated
  * strings that are passed back by the libgphoto2_port functions.
  *
- * This function is called by the gp_message_codeset() function, there is
- * no need to call it yourself.
- * 
+ * This function is called by the gp_message_codeset() function, so
+ * there is no need to call it yourself.
+ *
  * \param codeset new codeset to use
  * \return the previous codeset
  */
 const char*
 gp_port_message_codeset (const char *codeset) {
-	return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset);
+	return bind_textdomain_codeset (GETTEXT_PACKAGE_LIBGPHOTO2_PORT,
+					codeset);
 }
 
 /**
@@ -114,7 +152,7 @@
 	 * We put this in here because everybody needs to call this function
 	 * before accessing ports...
 	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	gp_port_init_localedir (NULL);
 
 	C_MEM (*list = calloc (1, sizeof (GPPortInfoList)));
 
@@ -165,7 +203,7 @@
  * Appends an entry to the list. This function is typically called by
  * an io-driver during #gp_port_library_list. If you leave info.name blank,
  * #gp_port_info_list_lookup_path will try to match non-existent paths
- * against info.path and - if successfull - will append this entry to the 
+ * against info.path and - if successful - will append this entry to the
  * list.
  *
  * \return A gphoto2 error code, or an index into the port list (excluding generic entries).
@@ -174,7 +212,7 @@
 int
 gp_port_info_list_append (GPPortInfoList *list, GPPortInfo info)
 {
-	int generic, i;
+	unsigned int generic, i;
 
 	C_PARAMS (list);
 
@@ -258,7 +296,7 @@
 
 /**
  * \brief Load system ports
- * 
+ *
  * \param list a #GPPortInfoList
  *
  * Searches the system for io-drivers and appends them to the list. You would
@@ -278,10 +316,12 @@
 	C_PARAMS (list);
 
 	GP_LOG_D ("Using ltdl to load io-drivers from '%s'...", iolibs);
+	gpi_libltdl_lock();
 	lt_dlinit ();
 	lt_dladdsearchdir (iolibs);
 	result = lt_dlforeachfile (iolibs, foreach_func, list);
 	lt_dlexit ();
+	gpi_libltdl_unlock();
 	if (result < 0)
 		return (result);
 	if (list->iolib_count == 0) {
@@ -463,13 +503,13 @@
 
 	GP_LOG_D ("Getting info of entry %i (%i available)...", n, list->count);
 
-	C_PARAMS (n >= 0 && n < list->count);
+	C_PARAMS ((n >= 0) && (unsigned int)n < list->count);
 
 	/* Ignore generic entries */
 	for (i = 0; i <= n; i++)
 		if (!strlen (list->infoi->name)) {
 			n++;
-			C_PARAMS (n < list->count);
+			C_PARAMS ((unsigned int)n < list->count);
 		}
 
 	*info = list->infon;
@@ -584,3 +624,11 @@
 	C_MEM (*info = calloc (1, sizeof(struct _GPPortInfo)));
 	return GP_OK;
 }
+
+
+/*
+ * Local Variables:
+ * c-file-style:"linux"
+ * indent-tabs-mode:t
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-locking.c Added

@@ -0,0 +1,42 @@
+/** \file
+ * \brief internal header to help with locking e.g. MT-unsafe libltdl
+ *
+ * \author Copyright 2017 kadler15 <spurfan15@gmail.com>
+ * \author Copyright 2022 Marcus Meissner
+ * \author Copyright 2022 Hans Ulrich Niedermann
+ *
+ * \par License
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * \par
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * \par
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#include <pthread.h>
+
+#include <gphoto2/gphoto2-port-locking.h>
+
+static
+pthread_mutex_t gpi_libltdl_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void gpi_libltdl_lock(void)
+{
+  pthread_mutex_lock(&gpi_libltdl_mutex);
+}
+
+void gpi_libltdl_unlock(void)
+{
+  pthread_mutex_unlock(&gpi_libltdl_mutex);
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c Changed

@@ -9,10 +9,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 #include <gphoto2/gphoto2-port-log.h>
@@ -33,29 +33,46 @@
 
 #include <gphoto2/gphoto2-port-result.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#      define N_(String) gettext_noop (String)
-#  else
-#      define N_(String) (String)
-#  endif
+#include "libgphoto2_port/i18n.h"
+
+char*
+gpi_vsnprintf (const char* format, va_list args)
+{
+	va_list xargs;
+	int strsize;
+	char *str;
+
+#ifdef HAVE_VA_COPY
+	va_copy (xargs, args);
 #else
-#  define _(String) (String)
-#  define N_(String) (String)
+	/* according to 'the web', the only interesting compiler without va_copy is MSVC
+	 * and there a simple assignment is the way to go */
+	xargs = args;
 #endif
 
+	/* query the size necessary for the string, add the terminating '\0' */
+	strsize = vsnprintf (NULL, 0, format, xargs) + 1;
+	va_end (xargs);
+
+	str = malloc(strsize);
+	if (!str)
+		return NULL;
+
+	/* actually print the string into the buffer */
+	vsnprintf (str, strsize, format, args);
+
+	return str;
+}
+
 #ifndef DISABLE_DEBUGGING
-/** 
+/**
  * \brief Internal logging function entry.
- * 
+ *
  * Internal structure to remember the logging functions.
  * Use gp_log_add_func() and gp_log_remove_func() to access it.
  */
 typedef struct {
-	unsigned int id;	/**< Internal id */
+	int id;			/**< Internal id */
 	GPLogLevel   level;	/**< Internal loglevel */
 	GPLogFunc    func;	/**< Internal function pointer to call */
 	void        *data;	/**< Private data supplied by caller */
@@ -63,6 +80,7 @@
 
 static LogFunc *log_funcs = NULL;
 static unsigned int log_funcs_count = 0;
+static GPLogLevel log_max_level = 0;
 
 /**
  * \brief Add a function to get logging information
@@ -93,39 +111,13 @@
 	log_funcslog_funcs_count - 1.func = func;
 	log_funcslog_funcs_count - 1.data = data;
 
+	if (level > log_max_level)
+		log_max_level = level;
+
 	return logfuncid;
 }
 
 
-char*
-gpi_vsnprintf (const char* format, va_list args)
-{
-	va_list xargs;
-	int strsize;
-	char *str;
-
-#ifdef HAVE_VA_COPY
-	va_copy (xargs, args);
-#else
-	/* according to 'the web', the only interesting compiler without va_copy is MSVC
-	 * and there a simple assignment is the way to go */
-	xargs = args;
-#endif
-
-	/* query the size necessary for the string, add the terminating '\0' */
-	strsize = vsnprintf (NULL, 0, format, xargs) + 1;
-	va_end (xargs);
-
-	str = malloc(strsize);
-	if (!str)
-		return NULL;
-
-	/* actually print the string into the buffer */
-	vsnprintf (str, strsize, format, args);
-
-	return str;
-}
-
 /**
  * \brief Remove a logging receiving function
  * \param id an id (return value of #gp_log_add_func)
@@ -137,20 +129,26 @@
 int
 gp_log_remove_func (int id)
 {
-	int i;
+	unsigned int i;
+	GPLogLevel new_max_log_level = 0;
+	int status = GP_ERROR_BAD_PARAMETERS;
 
+	/* Remove log function from list and recalculate current most detailed log level needed */
 	for (i=0;i<log_funcs_count;i++) {
 		if (log_funcsi.id == id) {
 			memmove (log_funcs + i, log_funcs + i + 1, sizeof(LogFunc) * (log_funcs_count - i - 1));
 			log_funcs_count--;
-			return GP_OK;
+			status = GP_OK;
 		}
+		if (new_max_log_level < log_funcsi.level)
+			new_max_log_level = log_funcsi.level;
 	}
-	return GP_ERROR_BAD_PARAMETERS;
+	log_max_level = new_max_log_level;
+	return status;
 }
 
 /**
- * Width of offset field in characters. Note that HEXDUMP_COMPLETE_LINE 
+ * Width of offset field in characters. Note that HEXDUMP_COMPLETE_LINE
  * needs to be changed when this value is changed.
  */
 #define HEXDUMP_OFFSET_WIDTH 4
@@ -175,7 +173,7 @@
 
 /**
  * We are lazy and do our typing only once. Please note that you have
- * to add/remove some lines when increasing/decreasing the values of 
+ * to add/remove some lines when increasing/decreasing the values of
  * HEXDUMP_BLOCK_DISTANCE and/or HEXDUMP_OFFSET_WIDTH.
  */
 #define HEXDUMP_COMPLETE_LINE {\
@@ -212,6 +210,10 @@
 	unsigned int index, original_size = size;
 	unsigned char value;
 
+	/* No logger currently at the data log level */
+	if (log_max_level < GP_LOG_DATA)
+		return;
+
 	va_start (args, format);
 	msg = gpi_vsnprintf(format, args);
 	va_end (args);
@@ -293,7 +295,7 @@
  * \param args the va_list corresponding to format
  *
  * Logs a message at the given log level. You would normally use this
- * function to log as yet unformatted strings. 
+ * function to log as yet unformatted strings.
  **/
 void
 gp_logv (GPLogLevel level, const char *domain, const char *format,
@@ -302,7 +304,7 @@
 	unsigned int i;
 	char *str = 0;
 
-	if (!log_funcs_count)
+	if (!log_funcs_count || level > log_max_level)
 		return;
 
 	str = gpi_vsnprintf(format, args);
@@ -332,6 +334,9 @@
 {
 	va_list args;
 
+	if (!log_funcs_count || level > log_max_level)
+		return;
+
 	va_start (args, format);
 	gp_logv (level, domain, format, args);
 	va_end (args);
@@ -341,11 +346,14 @@
 gp_log_with_source_location(GPLogLevel level, const char *file, int line, const char *func, const char *format, ...)
 {
 	va_list args;
-        char domain100;
+	char domain100;
 
-        /* Only display filename without any path/directory part */
-        file = strrchr(file, '/') ? strrchr(file, '/') + 1 : file;
-        snprintf(domain, sizeof(domain), "%s %s:%d", func, file, line);
+	if (!log_funcs_count || level > log_max_level)
+		return;
+
+	/* Only display filename without any path/directory part */
+	file = strrchr(file, '/') ? strrchr(file, '/') + 1 : file;
+	snprintf(domain, sizeof(domain), "%s %s:%d", func, file, line);
 
 	va_start (args, format);
 	gp_logv (level, domain, format, args);
@@ -416,11 +424,11 @@
 
 #ifdef _GPHOTO2_INTERNAL_CODE
 
-/** 
+/**
  * \brief (Internal) translate a enumeration code to a string
  */
 const char *
-gpi_enum_to_string(unsigned int _enum, 
+gpi_enum_to_string(unsigned int _enum,
 		   const StringFlagItem *map)
 {
 	int i;
@@ -433,7 +441,7 @@
 	return NULL;
 }
 
-/** 
+/**
  * \brief (Internal) translate a string to an enumeration code
  */
 int
@@ -452,7 +460,7 @@
 }
 
 void
-gpi_flags_to_string_list(unsigned int flags, 
+gpi_flags_to_string_list(unsigned int flags,
 			 const StringFlagItem *map,
 			 string_item_func func, void *data)
 {
@@ -462,13 +470,13 @@
 			func(mapi.str, data);
 			break;
 		} else if (0 != (flags & mapi.flag)) {
-			func(mapi.str, data);      
+			func(mapi.str, data);
 		}
 	}
 }
 
-unsigned int 
-gpi_string_to_flag(const char *str, 
+unsigned int
+gpi_string_to_flag(const char *str,
 	       const StringFlagItem *map)
 {
 	int i;
@@ -480,8 +488,8 @@
   return 0;
 }
 
-int 
-gpi_string_or_to_flags(const char *str, 
+int
+gpi_string_or_to_flags(const char *str,
 		       unsigned int *flags,
 		       const StringFlagItem *map)
 {
@@ -501,7 +509,7 @@
 }
 
 unsigned int
-gpi_string_list_to_flags(const char *str, 
+gpi_string_list_to_flags(const char *str,
 		     const StringFlagItem *map)
 {
 	int i;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c Changed

@@ -1,5 +1,5 @@
 /** \file
- * 
+ *
  * \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
  * \author Copyright 1999 Scott Fritzinger <scottf@unr.edu>
  *
@@ -10,10 +10,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -75,7 +75,6 @@
         GPPORTWINDIR *d;
         DWORD dr;
         int x;
-        printf("blah2\n");
         d = (GPPORTWINDIR*)malloc(sizeof(GPPORTWINDIR));
         d->handle = INVALID_HANDLE_VALUE;
         d->got_first = 0;
@@ -169,10 +168,10 @@
 
 #else
 
-/** 
+/**
  * \brief mkdir UNIX functionality
  * \param dirname directory to create
- * 
+ *
  * Creates a new directory.
  *
  * \return a gphoto error code
@@ -186,7 +185,7 @@
 /**
  * \brief rmdir UNIX functionality
  * \param dirname directory to remove
- * 
+ *
  * Removes a empty directory.
  *
  * \return a gphoto error code
@@ -202,8 +201,8 @@
 /**
  * \brief opendir UNIX functionality
  * \param dirname directory to open
- * 
- * Opens a directory for readdir and later closedir operations, 
+ *
+ * Opens a directory for readdir and later closedir operations,
  * to enumerate its contents.
  *
  * \return a directory handle for use in gp_system_readdir() and gp_system_closedir()
@@ -215,7 +214,7 @@
 /**
  * \brief readdir UNIX functionality
  * \param d directory to enumerate
- * 
+ *
  * Reads one directory entry from the specified directory handle
  * as returned from gp_system_opendir(). Use gp_system_filename()
  * to extract the filename from the returned value.
@@ -229,7 +228,7 @@
 /**
  * \brief retrieve UNIX filename out of a directory entry
  * \param de directory entry as returned from gp_system_readdir()
- * 
+ *
  * Extracts a filename out of the passed directory entry.
  *
  * \return the filename of the directory entry
@@ -241,8 +240,8 @@
 /**
  * \brief closedir UNIX functionality
  * \param dir directory to close
- * 
- * Closes a directory after readdir operations. 
+ *
+ * Closes a directory after readdir operations.
  *
  * \return a gphoto error code
  */
@@ -254,7 +253,7 @@
 /**
  * \brief check if passed filename is a file
  * \param filename file name to check
- * 
+ *
  * Checks whether the passed in filename is
  * a file and returns this as boolean.
  *
@@ -271,7 +270,7 @@
 /**
  * \brief check if passed filename is a directory
  * \param dirname file name to check
- * 
+ *
  * Checks whether the passed in dirname is
  * a directory and returns this as boolean.
  *

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/gphoto2-port.c Changed

@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /** \file
- * 
+ *
  * \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
  * \author Copyright 1999 Scott Fritzinger <scottf@unr.edu>
  *
@@ -11,10 +11,10 @@
  * version 2 of the License, or (at your option) any later version.
  *
  * \par
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * \par
  * You should have received a copy of the GNU Lesser General Public
@@ -23,7 +23,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 
@@ -37,23 +37,11 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-library.h>
 #include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-port-locking.h>
 
-#include "gphoto2-port-info.h"
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#      define N_(String) gettext_noop (String)
-#  else
-#      define N_(String) (String)
-#  endif
-#else
-#  define _(String) (String)
-#  define N_(String) (String)
-#  define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
-#endif
+#include "libgphoto2_port/gphoto2-port-info.h"
+
+#include "libgphoto2_port/i18n.h"
 
 #define CHECK_RESULT(result) {int r=(result); if (r<0) return (r);}
 #define CHECK_SUPP(p,t,o) {if (!(o)) {gp_port_set_error ((p), _("The operation '%s' is not supported by this device"), (t)); return (GP_ERROR_NOT_SUPPORTED);}}
@@ -83,7 +71,7 @@
  *
  * Allocate and initialize the memory for a new #GPPort.
  *
- * After you called this function, 
+ * After you called this function,
  * you probably want to call #gp_port_set_info in order to make the newly
  * created port functional.
  *
@@ -139,7 +127,7 @@
  * information (from the serial:/dev/ttyS0 or similar variables).
  * After calling this function, you can access the port using for
  * example gp_port_open().
- * 
+ *
  * \param port a GPPort
  * \param info the GPPortInfo to set
  *
@@ -172,26 +160,36 @@
 	}
 	if (port->pc->lh) {
 #if !defined(VALGRIND)
+		gpi_libltdl_lock();
 		lt_dlclose (port->pc->lh);
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 #endif
 	}
 
+	gpi_libltdl_lock();
 	lt_dlinit ();
 	port->pc->lh = lt_dlopenext (info->library_filename);
+	gpi_libltdl_unlock();
 	if (!port->pc->lh) {
+		gpi_libltdl_lock();
 		GP_LOG_E ("Could not load '%s' ('%s').", info->library_filename, lt_dlerror ());
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 		return (GP_ERROR_LIBRARY);
 	}
 
 	/* Load the operations */
+	gpi_libltdl_lock();
 	ops_func = lt_dlsym (port->pc->lh, "gp_port_library_operations");
+	gpi_libltdl_unlock();
 	if (!ops_func) {
+		gpi_libltdl_lock();
 		GP_LOG_E ("Could not find 'gp_port_library_operations' in '%s' ('%s')",
 			  info->library_filename, lt_dlerror ());
 		lt_dlclose (port->pc->lh);
 		lt_dlexit ();
+		gpi_libltdl_unlock();
 		port->pc->lh = NULL;
 		return (GP_ERROR_LIBRARY);
 	}
@@ -264,7 +262,7 @@
  * \brief Open a port.
  * \param port a #GPPort
  *
- * Opens a port which should have been created with #gp_port_new and 
+ * Opens a port which should have been created with #gp_port_new and
  * configured with #gp_port_set_info and #gp_port_set_settings
  *
  * \return a gphoto2 error code
@@ -357,8 +355,10 @@
 
 		if (port->pc->lh) {
 #if !defined(VALGRIND)
+			gpi_libltdl_lock();
 			lt_dlclose (port->pc->lh);
 			lt_dlexit ();
+			gpi_libltdl_unlock();
 #endif
 			port->pc->lh = NULL;
 		}
@@ -520,7 +520,7 @@
 
 
 /**
- * \brief Set timeout of port 
+ * \brief Set timeout of port
  * \param port a #GPPort
  * \param timeout the timeout
  *
@@ -595,7 +595,7 @@
 	CHECK_INIT (port);
 
         /*
-	 * We copy the settings to settings_pending and call update on the 
+	 * We copy the settings to settings_pending and call update on the
 	 * port.
 	 */
         memcpy (&port->settings_pending, &settings,
@@ -644,7 +644,7 @@
  * \param port a GPPort
  * \param pin the serial pin to be retrieved
  * \param level the setting of the pin
- * 
+ *
  * \return a gphoto2 error code
  */
 int
@@ -915,8 +915,8 @@
         return (retval);
 }
 
-/* 
- * The next two functions handle the request types 0x41 for write 
+/*
+ * The next two functions handle the request types 0x41 for write
  * and 0xc1 for read.
  */
 /**
@@ -934,7 +934,7 @@
  * \return a gphoto2 error code
  */
 int
-gp_port_usb_msg_interface_write (GPPort *port, int request, 
+gp_port_usb_msg_interface_write (GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
         int retval;
@@ -946,7 +946,7 @@
 	CHECK_INIT (port);
 
 	CHECK_SUPP (port, "msg_build", port->pc->ops->msg_interface_write);
-        retval = port->pc->ops->msg_interface_write(port, request, 
+        retval = port->pc->ops->msg_interface_write(port, request,
         		value, index, bytes, size);
 	CHECK_RESULT (retval);
 
@@ -981,7 +981,7 @@
 	CHECK_INIT (port);
 
 	CHECK_SUPP (port, "msg_read", port->pc->ops->msg_interface_read);
-        retval = port->pc->ops->msg_interface_read (port, request, 
+        retval = port->pc->ops->msg_interface_read (port, request,
         		value, index, bytes, size);
 	CHECK_RESULT (retval);
 
@@ -992,8 +992,8 @@
 }
 
 
-/* 
- * The next two functions handle the request types 0x21 for write 
+/*
+ * The next two functions handle the request types 0x21 for write
  * and 0xa1 for read.
  */
 
@@ -1012,7 +1012,7 @@
  * \return a gphoto2 error code
  */
 int
-gp_port_usb_msg_class_write (GPPort *port, int request, 
+gp_port_usb_msg_class_write (GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
         int retval;
@@ -1024,7 +1024,7 @@
 	CHECK_INIT (port);
 
 	CHECK_SUPP (port, "msg_build", port->pc->ops->msg_class_write);
-        retval = port->pc->ops->msg_class_write(port, request, 
+        retval = port->pc->ops->msg_class_write(port, request,
         		value, index, bytes, size);
 	CHECK_RESULT (retval);
 
@@ -1059,7 +1059,7 @@
 	CHECK_INIT (port);
 
 	CHECK_SUPP (port, "msg_read", port->pc->ops->msg_class_read);
-        retval = port->pc->ops->msg_class_read (port, request, 
+        retval = port->pc->ops->msg_class_read (port, request,
         		value, index, bytes, size);
 	CHECK_RESULT (retval);

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/i18n.h Added

@@ -0,0 +1,33 @@
+/** \file libgphoto2_port/i18n.h
+ * \brief Common include header for all C sources containing translated strings
+ *
+ * \todo Replace this file by the gettext.h file from gettext?
+ */
+
+#ifndef LIBGPHOTO2_PORT_I18N_H
+#define LIBGPHOTO2_PORT_I18N_H
+
+#include "config.h"
+
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (GETTEXT_PACKAGE_LIBGPHOTO2_PORT, String)
+#  ifdef gettext_noop
+#      define N_(String) gettext_noop (String)
+#  else
+#      define N_(String) (String)
+#  endif
+#else
+#  define N_(String) (String)
+#  define _(String) (String)
+#  define bind_textdomain_codeset(Domain, codeset) (codeset)
+#  define bindtextdomain(Domain, Directory) (Domain)
+#  define dcgettext(Domain, Message, Type) (Message)
+#  define dgettext(Domain, Message) (Message)
+#  define gettext(String) (String)
+#  define ngettext(String1, String2, Count) ((Count==1)?String1:String2)
+#  define textdomain(String) (String)
+#endif
+
+#endif /* !defined(LIBGPHOTO2_PORT_I18N_H) */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver Changed

@@ -27,6 +27,7 @@
 	gp_port_info_list_lookup_name;
 	gp_port_info_list_lookup_path;
 	gp_port_info_list_new;
+	gp_port_init_localedir;
 	gp_port_library_version;
 	gp_port_message_codeset;
 	gp_port_new;
@@ -66,7 +67,7 @@
 	gp_system_rmdir;
     local:
 	*;
-};
+}; # LIBGPHOTO2_5_0
 
 # These are only supposed to be used by libgphoto2 internally.
 LIBGPHOTO2_INTERNAL {
@@ -78,22 +79,24 @@
 	gpi_string_list_to_flags;
 	gpi_flags_to_string_list;
 	gpi_vsnprintf;
+	gpi_libltdl_lock;
+	gpi_libltdl_unlock;
 
 	gp_port_info_new;
 	gp_port_info_set_name;
 	gp_port_info_set_path;
 	gp_port_info_set_type;
-};
+}; # LIBGPHOTO2_INTERNAL
 
 #LIBGPHOTO2_6_0 {
 #    global:
 #	# The asm(".symver ...") constructs will put stuff into this node,
 #	# it needs to stay.
 #	# Currently used by:
-#	#	gp_port_set_info, gp_port_get_info, 
+#	#	gp_port_set_info, gp_port_get_info,
 #	#	gp_port_info_list_append, gp_port_info_list_get_info
 #
 #	# Add new exported functions here too!
-#} LIBGPHOTO2_5_0;
+#}; # LIBGPHOTO2_6_0
 
 # here comes the next version...

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/libusb1/libusb1.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/libusb1/libusb1.c Changed

@@ -10,16 +10,17 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
+#define _DARWIN_C_SOURCE
 #include "config.h"
 #include <gphoto2/gphoto2-port-library.h>
 
@@ -35,24 +36,8 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 #define C_GP(RESULT) do {\
 	int _r=(RESULT);\
@@ -213,6 +198,11 @@
 	gp_port_info_list_append (list, info); /* do not check return value, it might be -1 */
 
 	nrofdevs = libusb_get_device_list (ctx, &devs);
+	if (!nrofdevs) {
+		libusb_exit (ctx); /* should free all stuff above */
+		goto nodevices;
+	}
+
 	C_MEM (descs = calloc (nrofdevs, sizeof(descs0)));
 	for (i=0;i<nrofdevs;i++)
 		LOG_ON_LIBUSB_E (libusb_get_device_descriptor(devsi, &descsi));
@@ -238,7 +228,7 @@
 			}
 			for (i1 = 0; i1 < config->bNumInterfaces; i1++)
 				for (i2 = 0; i2 < config->interfacei1.num_altsetting; i2++) {
-					const struct libusb_interface_descriptor *intf = &config->interfacei1.altsettingi2; 
+					const struct libusb_interface_descriptor *intf = &config->interfacei1.altsettingi2;
 					if (	(intf->bInterfaceClass == LIBUSB_CLASS_HID)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_PRINTER)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_COMM)	||
@@ -254,7 +244,7 @@
 			continue;
 		/* Note: We do not skip USB storage. Some devices can support both,
 		 * and the Ricoh erronously reports it.
-		 */ 
+		 */
 		nrofdevices++;
 	}
 
@@ -264,7 +254,7 @@
 	 */
 	/* We never want to return just "usb:" ... also return "usb:XXX,YYY", and
 	 * let upper layers filter out the usb: */
-	if (nrofdevices <= 1) 
+	if (nrofdevices <= 1)
 		return (GP_OK);
 #endif
 
@@ -293,7 +283,7 @@
 			}
 			for (i1 = 0; i1 < config->bNumInterfaces; i1++)
 				for (i2 = 0; i2 < config->interfacei1.num_altsetting; i2++) {
-					const struct libusb_interface_descriptor *intf = &config->interfacei1.altsettingi2; 
+					const struct libusb_interface_descriptor *intf = &config->interfacei1.altsettingi2;
 					if (	(intf->bInterfaceClass == LIBUSB_CLASS_HID)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_PRINTER)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_COMM))
@@ -307,7 +297,7 @@
 			continue;
 		/* Note: We do not skip USB storage. Some devices can support both,
 		 * and the Ricoh erronously reports it.
-		 */ 
+		 */
 		C_GP (gp_port_info_new (&info));
 		gp_port_info_set_type (info, GP_PORT_USB);
 		gp_port_info_set_name (info, "Universal Serial Bus");
@@ -323,6 +313,7 @@
 	libusb_exit (ctx); /* should free all stuff above */
 	free (descs);
 
+nodevices:
 	/* This will only be added if no other device was ever added.
 	 * Users doing "usb:" usage will enter the regular expression matcher case. */
 	if (nrofdevices == 0) {
@@ -453,7 +444,7 @@
 static int
 _close_async_interrupts(GPPort *port)
 {
-	int i, haveone;
+	unsigned int i, haveone;
 	struct timeval tv;
 
 	C_PARAMS (port);
@@ -626,7 +617,7 @@
 {
 	struct _PrivateIrqCompleted *irq_new = NULL;
 	struct _GPPortPrivateLibrary *pl = transfer->user_data;
-	int i;
+	unsigned int i;
 	int ret;
 
 	GP_LOG_D("%p with status %d", transfer, transfer->status);
@@ -842,12 +833,12 @@
 					GP_ERROR_IO_READ);
 }
 
-/* The next two functions support the nonstandard request types 0x41 (write) 
- * and 0xc1 (read), which are occasionally needed. 
+/* The next two functions support the nonstandard request types 0x41 (write)
+ * and 0xc1 (read), which are occasionally needed.
  */
 
 static int
-gp_libusb1_msg_interface_write_lib(GPPort *port, int request, 
+gp_libusb1_msg_interface_write_lib(GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
 	return gp_libusb1_msg (port, request, value, index, bytes, size,
@@ -857,7 +848,7 @@
 
 
 static int
-gp_libusb1_msg_interface_read_lib(GPPort *port, int request, 
+gp_libusb1_msg_interface_read_lib(GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
 	return gp_libusb1_msg (port, request, value, index, bytes, size,
@@ -866,12 +857,12 @@
 }
 
 
-/* The next two functions support the nonstandard request types 0x21 (write) 
- * and 0xa1 (read), which are occasionally needed. 
+/* The next two functions support the nonstandard request types 0x21 (write)
+ * and 0xa1 (read), which are occasionally needed.
  */
 
 static int
-gp_libusb1_msg_class_write_lib(GPPort *port, int request, 
+gp_libusb1_msg_class_write_lib(GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
 	return gp_libusb1_msg (port, request, value, index, bytes, size,
@@ -881,7 +872,7 @@
 
 
 static int
-gp_libusb1_msg_class_read_lib(GPPort *port, int request, 
+gp_libusb1_msg_class_read_lib(GPPort *port, int request,
 	int value, int index, char *bytes, int size)
 {
 	return gp_libusb1_msg (port, request, value, index, bytes, size,
@@ -938,7 +929,7 @@
 	/* The interface changed. release the old, claim the new ... */
 	if (port->settings.usb.interface != port->pl->interface) {
 		GP_LOG_D ("changing interface %d -> %d", port->pl->interface, port->settings.usb.interface);
-		if (LOG_ON_LIBUSB_E (libusb_release_interface (port->pl->dh, port->pl->interface))) {
+		if ((port->pl->interface != -1) && (LOG_ON_LIBUSB_E (libusb_release_interface (port->pl->dh, port->pl->interface)))) {
 			/* Not a hard error for now. -Marcus */
 		} else {
 			GP_LOG_D ("claiming interface %d", port->settings.usb.interface);
@@ -950,10 +941,10 @@
 	}
 	if (port->settings.usb.config != port->pl->config) {
 		GP_LOG_D ("changing config %d -> %d", port->pl->config, port->settings.usb.config);
-		/* This can only be changed with the interface released. 
+		/* This can only be changed with the interface released.
 		 * This is a hard requirement since 2.6.12.
 		 */
-		if (LOG_ON_LIBUSB_E (libusb_release_interface (port->pl->dh, port->settings.usb.interface))) {
+		if ((port->pl->config != -1) && (LOG_ON_LIBUSB_E (libusb_release_interface (port->pl->dh, port->settings.usb.interface)))) {
 			ifacereleased = FALSE;
 		} else {
 			ifacereleased = TRUE;
@@ -966,7 +957,7 @@
 					   port->settings.usb.interface,
 					   port->settings.usb.config,
 					   strerror(saved_errno));
-			return GP_ERROR_IO_UPDATE;	
+			return GP_ERROR_IO_UPDATE;
 #endif
 			GP_LOG_E ("setting configuration from %d to %d failed, but continuing...", port->pl->config, port->settings.usb.config);
 		}
@@ -1255,7 +1246,7 @@
 				xifaces++;
 
 				for (k = 0; k < dev->configi.interfacej.num_altsetting; k++) {
-					struct usb_interface_descriptor *intf = &dev->configi.interfacej.altsettingk; 
+					struct usb_interface_descriptor *intf = &dev->configi.interfacej.altsettingk;
 					if (	(intf->bInterfaceClass == LIBUSB_CLASS_HID)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_PRINTER)	||
 						(intf->bInterfaceClass == LIBUSB_CLASS_AUDIO)	||
@@ -1276,8 +1267,8 @@
 		return 0;
 
 	/*
-	 * Loop over the device configurations and interfaces. Nokia MTP-capable 
-	 * handsets (possibly others) typically have the string "MTP" in their 
+	 * Loop over the device configurations and interfaces. Nokia MTP-capable
+	 * handsets (possibly others) typically have the string "MTP" in their
 	 * MTP interface descriptions, that's how they can be detected, before
 	 * we try the more esoteric "OS descriptors" (below).
 	 */
@@ -1289,9 +1280,9 @@
 				int k;
 				for (k = 0; k < dev->configi.interfacej.num_altsetting; k++) {
 					buf0 = '\0';
-					ret = usb_get_string_simple(devh, 
-						dev->configi.interfacej.altsettingk.iInterface, 
-						(char *) buf, 
+					ret = usb_get_string_simple(devh,
+						dev->configi.interfacej.altsettingk.iInterface,
+						(char *) buf,
 						1024);
 					if (ret < 3)
 						continue;

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/LINGUAS Added

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/Makefile.in.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/Makefile.in.in Changed

@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,11 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.14
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -22,18 +25,38 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -46,7 +69,7 @@
 DUMMYPOFILES = @DUMMYPOFILES@
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -54,6 +77,16 @@
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -66,8 +99,8 @@
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 .sin.sed:
 	sed -e '/^#/d' $< > t-$@
@@ -79,6 +112,19 @@
 all-yes: stamp-po
 all-no:
 
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
 # stamp-po is a timestamp denoting the last time at which the CATALOGS have
 # been loosely updated. Its purpose is that when a developer or translator
 # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
@@ -88,10 +134,14 @@
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@echo "touch stamp-po"
-	@echo timestamp > stamp-poT
-	@mv stamp-poT stamp-po
+	@$(CHECK_MACRO_VERSION)
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
 
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
@@ -99,12 +149,53 @@
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
+	else \
+	  package_prefix=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
+	  '' | 0.0-9 | 0.0-9.* | 0.10-5 | 0.10-5.* | 0.16 | 0.16.0-1*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_prefix}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -128,12 +219,20 @@
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
+	           '' | 0.0-9 | 0.0-9.* | 0.10-7 | 0.10-7.*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
 	else \
 	  $(MAKE) $${lang}.po-create; \
 	fi
@@ -143,7 +242,7 @@
 install-exec:
 install-data: install-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -156,13 +255,12 @@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -202,19 +300,18 @@
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -286,14 +383,17 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	$(MAKE) update-po
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  dists="$$dists Makevars.template"; \
 	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
 	if test -f $(srcdir)/ChangeLog; then \
 	  dists="$$dists ChangeLog"; \
 	fi; \
@@ -305,9 +405,9 @@
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
+	    cp -p $$file $(distdir) || exit 1; \
 	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
 	  fi; \
 	done
 
@@ -331,9 +431,15 @@
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
+	       '' | 0.0-9 | 0.0-9.* | 0.10-7 | 0.10-7.*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
@@ -354,10 +460,13 @@
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
 
 force:

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/Makevars -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/Makevars Changed

@@ -20,6 +20,13 @@
 # their copyright.
 COPYRIGHT_HOLDER = Lutz Mueller and others
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -34,8 +41,32 @@
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = gphoto-devel@lists.sourceforge.net
+MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/POTFILES.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/POTFILES.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/Rules-quot -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/Rules-quot Changed

@@ -1,3 +1,4 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -14,13 +15,23 @@
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
+	     '' | 0.0-9 | 0.0-9.* | 0.10-8 | 0.10-8.*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+	     ; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/cs.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/cs.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/cs.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/cs.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.3\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2014-03-09 13:57+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,108 +19,108 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Obecný port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Žádná chyba"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Neurčená chyba"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problém V/V"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Špatné parametry"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operace"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Bylo dosaženo pevného omezení"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Při čtení z nebo zápisu na port vypršelo časové omezení"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Sériový port není podporován"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Port USB není podporován"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Neznámý port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Chyba při načítání knihovny"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Chyba při inicializaci portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Chyba při čtení z portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Chyba při zápisu na port"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Chyba při aktualizaci nastavení portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Chyba při nastavování rychlosti sériového portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Chyba při nulování stavu zastavení na portu USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Nelze najít požadované zařízení na portu USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Nelze přidělit USB zařízení"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Nelze zamknout zařízení"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "Chyba knihovny libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Operace „%s“ není tímto zařízením podporována"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Port ještě nebyl inicializován"
 
@@ -136,305 +136,328 @@
 msgid "No error description available"
 msgstr "Není k dispozici popis chyby"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Média „%s“"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Nelze otevřít zařízení USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Fotoaparát je již používán."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Nelze odpojit jaderný ovladač zařízení fotoaparátu."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Nelze se dotázat jaderného ovladače zařízení."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Nelze přidělit rozhraní %d (%s). Zkontrolujte, že žádný jiný program (%s) "
+"nebo jaderný modul (např. %s) zařízení nepoužívá a že máte k zařízení "
+"přístup pro čtení a pro zápis."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Služba MacOS PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "neznámý program používaný libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Nelze uvolnit rozhraní %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Nelze resetovat port USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Nelze odpojit jaderný ovladač zařízení fotoaparátu."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Nelze provést nastavení %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Nelze provést změnu nastavení %d na %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Nelze najít zařízení USB (dodavatel 0x%x, produkt 0x%x). Zkontrolujte, že je "
+"toto zařízení připojeno k počítači."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Poskytnuté ID dodavatele nebo produktu (0x%x,0x%x) není platné."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Nelze najít zařízení USB (třída 0x%x, podtřída 0x%x, protokol 0x%x). "
+"Zkontrolujte, že je toto zařízení připojeno k počítači."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Nelze zamknout zařízení „%s“"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Zařízení „%s“ je zamčeno od pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Zařízení „%s“ nemohlo být zamčeno (funkce dev_lock vrátila %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Zařízení „%s“ nemohlo být odemčeno."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Zařízení „%s“ nemohlo být odemčeno, protože je zamčeno od pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Zařízení „%s“ nemohlo být odemčeno (funkce dev_unlock vrátila %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Sériový port %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 #, fuzzy
 msgid "Serial Port Device"
 msgstr "Sériový port %i"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Nelze otevřít „%s“ (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Nelze zavřít „%s“ (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Nelze zapisovat na port (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Chyba parity."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Neočekávaná sekvence odpovědi na paritu 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Neznámý vývod %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Nelze získat úroveň vývodu %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Nelze nastavit úroveň vývodu %i na %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Nelze vyprázdnit „%s“ (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Nelze nastavit rychlost přenosu na %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Nelze odpojit jaderný ovladač „%s“ zařízení fotoaparátu."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Nelze zavřít port USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB rozhraní typu „Mass Storage direct IO“"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Nelze otevřít „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Nelze zavřít „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Nelze se přesunout na pozici: %x na „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Nelze zapisovat do „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Nelze číst z „%s“ (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Nelze otevřít zařízení USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Fotoaparát je již používán."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Nelze odpojit jaderný ovladač „%s“ zařízení fotoaparátu."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Nelze se dotázat jaderného ovladače zařízení."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Nelze přidělit rozhraní %d (%s). Zkontrolujte, že žádný jiný program (%s) "
-"nebo jaderný modul (např. %s) zařízení nepoužívá a že máte k zařízení "
-"přístup pro čtení a pro zápis."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Služba MacOS PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "neznámý program používaný libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Nelze uvolnit rozhraní %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Nelze resetovat port USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Nelze zavřít port USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Nelze provést nastavení %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Nelze provést změnu nastavení %d na %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Poskytnuté ID dodavatele nebo produktu (0x%x,0x%x) není platné."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Nelze najít zařízení USB (dodavatel 0x%x, produkt 0x%x). Zkontrolujte, že je "
-"toto zařízení připojeno k počítači."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Nelze najít zařízení USB (třída 0x%x, podtřída 0x%x, protokol 0x%x). "
-"Zkontrolujte, že je toto zařízení připojeno k počítači."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Nelze odpojit jaderný ovladač zařízení fotoaparátu."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Nelze odpojit jaderný ovladač zařízení fotoaparátu."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Zařízení „%s“ je zamčeno jinou aplikací."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Nelze zamknout „%s“ (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Nelze odemknout „%s“ (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB rozhraní typu „Mass Storage raw SCSI“"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Nelze odeslat příkaz SCSI na: „%s“ (%m)."
 
+#, c-format
 #~ msgid "Called for filename '%s'."
 #~ msgstr "Požadován soubor „%s“."
 
+#, c-format
 #~ msgid "Could not load '%s': '%s'."
 #~ msgstr "Nelze načíst „%s“: „%s“"
 
+#, c-format
 #~ msgid "Could not find some functions in '%s': '%s'."
 #~ msgstr "Nelze najít některé funkce v „%s“: „%s“."
 
+#, c-format
 #~ msgid "'%s' already loaded"
 #~ msgstr "Soubor „%s“ je již načten"
 
+#, c-format
 #~ msgid "Could not load port driver list: '%s'."
 #~ msgstr "Nelze načíst seznam ovladačů portů: „%s“."
 
+#, c-format
 #~ msgid "Loaded '%s' ('%s') from '%s'."
 #~ msgstr "Načten „%s“ („%s“) ze souboru „%s“."
 
+#, c-format
 #~ msgid "Using ltdl to load io-drivers from '%s'..."
 #~ msgstr "Používá se ltdl k načtení V/V ovladačů z „%s“…"
 
+#, c-format
 #~ msgid "Counting entries (%i available)..."
 #~ msgid_plural "Counting entries (%i available)..."
 #~ msgstr0 "Počítají se záznamy (%i dostupný)…"
 #~ msgstr1 "Počítají se záznamy (%i dostupné)…"
 #~ msgstr2 "Počítají se záznamy (%i dostupných)…"
 
+#, c-format
 #~ msgid "%i regular entry available."
 #~ msgid_plural "%i regular entries available."
 #~ msgstr0 "Dostupný je %i běžný záznam."
 #~ msgstr1 "Dostupné jsou %i běžné záznamy."
 #~ msgstr2 "Dostupných je %i běžných záznamů."
 
+#, c-format
 #~ msgid "Looking for path '%s' (%i entry available)..."
 #~ msgid_plural "Looking for path '%s' (%i entries available)..."
 #~ msgstr0 "Hledá se cesta „%s“ (%i dostupný záznam)…"
 #~ msgstr1 "Hledá se cesta „%s“ (%i dostupné záznamy)…"
 #~ msgstr2 "Hledá se cesta „%s“ (%i dostupných záznamů)…"
 
+#, c-format
 #~ msgid "Starting regex search for '%s'..."
 #~ msgstr "Začíná se vyhledávat „%s“ pomocí regulárního výrazu…"
 
+#, c-format
 #~ msgid "Trying '%s'..."
 #~ msgstr "Zkouší se „%s“…"
 
 #~ msgid "regcomp failed"
 #~ msgstr "kompilace regulárního výrazu selhala"
 
+#, c-format
 #~ msgid "re_match failed (%i)"
 #~ msgstr "porovnání regulárním výrazem selhalo (%i)"
 
 #~ msgid "regexec failed"
 #~ msgstr "spuštění regulárního výrazu selhalo"
 
+#, c-format
 #~ msgid "Looking up entry '%s'..."
 #~ msgstr "Vyhledává se záznam „%s“…"
 
+#, c-format
 #~ msgid "Getting info of entry %i (%i available)..."
 #~ msgid_plural "Getting info of entry %i (%i available)..."
 #~ msgstr0 "Získávají se informace o záznamu %i (k dispozici je %i)…"
@@ -444,12 +467,15 @@
 #~ msgid "Creating new device..."
 #~ msgstr "Vytváří se nové zařízení…"
 
+#, c-format
 #~ msgid "Could not load '%s' ('%s')."
 #~ msgstr "Nelze načíst „%s“ („%s“)."
 
+#, c-format
 #~ msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
 #~ msgstr "Nelze najít funkci „gp_port_library_operation“ v „%s“ („%s“)"
 
+#, c-format
 #~ msgid "Opening %s port..."
 #~ msgstr "Otevírá se port %s…"
 
@@ -462,63 +488,76 @@
 #~ msgid "Freeing port..."
 #~ msgstr "Uvolňuje se port…"
 
+#, c-format
 #~ msgid "Writing %i=0x%x byte(s) to port..."
 #~ msgstr "Zapisuje se %i=0x%x bajtů na port…"
 
+#, c-format
 #~ msgid "Could only write %i out of %i byte"
 #~ msgid_plural "Could only write %i out of %i bytes"
 #~ msgstr0 "Je možné zapsat pouze %i z %i bajtu"
 #~ msgstr1 "Je možné zapsat pouze %i z %i bajtů"
 #~ msgstr2 "Je možné zapsat pouze %i z %i bajtů"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from port..."
 #~ msgid_plural "Reading %i=0x%x bytes from port..."
 #~ msgstr0 "Čte se %i=0x%x bajt z portu…"
 #~ msgstr1 "Čtou se %i=0x%x bajty z portu…"
 #~ msgstr2 "Čte se %i=0x%x bajtů z portu…"
 
+#, c-format
 #~ msgid "Could only read %i out of %i byte"
 #~ msgid_plural "Could only read %i out of %i byte(s)"
 #~ msgstr0 "Je možné přečíst pouze %i z %i bajtu"
 #~ msgstr1 "Je možné přečíst pouze %i z %i bajtů"
 #~ msgstr2 "Je možné přečíst pouze %i z %i bajtů"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from interrupt endpoint..."
 #~ msgid_plural "Reading %i=0x%x bytes from interrupt endpoint..."
 #~ msgstr0 "Čte se %i=0x%x bajt z koncového bodu přerušení…"
 #~ msgstr1 "Čtou se %i=0x%x bajty z koncového bodu přerušení…"
 #~ msgstr2 "Čte se %i=0x%x bajtů z koncového bodu přerušení…"
 
+#, c-format
 #~ msgid "Could only read %i out of %i byte(s)"
 #~ msgstr "Je možné přečíst pouze %i z %i bajtů"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from interrupt endpoint (fast)..."
 #~ msgid_plural "Reading %i=0x%x bytes from interrupt endpoint (fast)..."
 #~ msgstr0 "Čte se %i=0x%x bajt z koncového bodu přerušení (zrychleně)…"
 #~ msgstr1 "Čtou se %i=0x%x bajty z koncového bodu přerušení (zrychleně)…"
 #~ msgstr2 "Čte se %i=0x%x bajtů z koncového bodu přerušení (zrychleně)…"
 
+#, c-format
 #~ msgid "Setting timeout to %i millisecond(s)..."
 #~ msgstr "Nastavuje se časové omezení na %i ms…"
 
 #~ msgid "Getting timeout..."
 #~ msgstr "Zjišťuje se časové omezení…"
 
+#, c-format
 #~ msgid "Current timeout: %i milliseconds"
 #~ msgstr "Současné časové omezení: %i milisekund"
 
 #~ msgid "Setting settings..."
 #~ msgstr "Nastavuje se nastavení…"
 
+#, c-format
 #~ msgid "Getting level of pin %i..."
 #~ msgstr "Získává se úroveň vývodu %i…"
 
+#, c-format
 #~ msgid "Level of pin %i: %i"
 #~ msgstr "Úroveň vývodu %i: %i"
 
+#, c-format
 #~ msgid "Setting pin %i (%s: '%s') to '%s'..."
 #~ msgstr "Nastavuje se vývod %i (%s: „%s“) na „%s“…"
 
+#, c-format
 #~ msgid "Sending break (%i milliseconds)..."
 #~ msgstr "Posílá se přerušení (%i ms)…"
 
@@ -528,21 +567,26 @@
 #~ msgid "Clear halt..."
 #~ msgstr "Nulování stavu zastavení…"
 
+#, c-format
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Zapisuje se zpráva (požadavek=0x%x hodnota=0x%x index=0x%x velikost=%i=0x"
-#~ "%x)…"
+#~ "Zapisuje se zpráva (požadavek=0x%x hodnota=0x%x index=0x%x "
+#~ "velikost=%i=0x%x)…"
 
+#, c-format
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
 #~ "Čte se zpráva (požadavek=0x%x hodnota=0x%x index=0x%x velikost=%i=0x%x)…"
 
+#, c-format
 #~ msgid "Device has driver '%s' attached."
 #~ msgstr "Zařízení má připojeno ovladač „%s“."
 
+#, c-format
 #~ msgid "Device has driver '%s' attached, detaching it now."
 #~ msgstr "Zařízení má připojeno ovladač „%s“, nyní se odpojuje."
 
+#, c-format
 #~ msgid ""
 #~ "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and "
 #~ "might not function with gphoto2. Reference: %s"
@@ -550,5 +594,6 @@
 #~ "Zařízení USB (výrobce 0x%x, výrobek 0x%x) je zařízení typu „master "
 #~ "storage“ a možná nebude s gphoto2 fungovat. Příručka: %s"
 
+#, c-format
 #~ msgid "Device has a kernel driver attached (%d), detaching it now."
 #~ msgstr "Zařízení má připojeno jaderný ovladač (%d), nyní se odpojuje."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/da.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/da.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/da.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/da.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.10\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2016-04-28 15:15+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -20,108 +20,108 @@
 "X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Almindelig port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Ikke-specificeret fejl"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "I/O problem"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Forkerte parametre"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Ikke understøttet proces"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Fast grænseværdi overskredet"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Tidsudløb ved læsning/skrivning til porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Seriel-port ikke understøttet"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB-port ikke understøttet"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Ukendt port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Fejl ved indlæsning af bibliotek"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Fejl ved initialisering af porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Fejl ved læsning fra porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Fejl ved skrivning til porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Fejl ved opdatering af portindstillinger"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Fejl ved indstilling af den serielle porthastighed"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Fejl ved nulstilling af en stop-tilstand på USB-porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Kunne ikke finde den efterspurgte enhed på USB-porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Kunne ikke kræve USB enheden"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Kunne ikke låse enheden"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal fejl"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Processen '%s' er ikke understøttet af denne enhed"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Porten er endnu ikke blevet initialiseret"
 
@@ -137,244 +137,252 @@
 msgid "No error description available"
 msgstr "Ingen fejlbeskrivelse tilgængelig"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Medie '%s'"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Kunne ikke åbne USB enheden (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kameraet er allerede i brug."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Kunne ikke frigøre kernedriver fra kameraenheden."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Kunne ikke forespørge kernedriver fra enheden."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Kunne ikke kræve grænseflade %d (%s). Sikr dig at ingen andre programmer "
+"(%s) eller kernemoduler (som f.eks. %s) bruger enheden, og at du har læse/"
+"skrive adgang til enheden."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTPCamera-tjeneste"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "andet ukendt program bruger enheden"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Kunne ikke frigøre grænseflade %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Kunne ikke nulstille USB-port (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Kunne ikke frigøre kernedriver fra kameraenheden."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Kunne ikke sætte konfiguration %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Kunne ikke sætte alt-indstillinger %d til /%d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Kunne ikke finde USB-enheden (fremstiller 0x%x, produkt 0x%x). Sikr dig at "
+"enheden er tilsluttet computeren."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"Det leverede fremstiller- eller produkt-id (0x%x,0x%x) er ikke gyldigt."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Kunne ikke finde USB-enheden (class 0x%x, subclass 0x%x, protokol0x%x). Sikr "
+"dig at enheden er tilsluttet computeren."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Kunne ikke låse enhed '%s'"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Enheden '%s' er låst af pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Enheden '%s' kunne ikke låses (dev_lock returnerede %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Enheden '%s' kunne ikke låses op."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Enheden '%s' kunne ikke låses op da den er låst af pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Enheden '%s' kunne ikke låses op (dev_unlock returnerede %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Seriel-port %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Enhed for serielport"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Åbning af '%s' (%s) fejlede."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Kunne ikke lukke '%s' (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Kunne ikke skrive til port (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Paritetsfejl."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Uventet paritetssvar-sekvens 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Ukendt pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Kunne ikke hente niveau af pin %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Kunne ikke sætte niveau af pin %i til %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Kunne ikke tømme '%s' (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Kunne ikke sætte baudrate til %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Kunne ikke frigøre kernedriver '%s' fra kameraenheden."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Kunne ikke lukke USB-port (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB masselagerenhed direkte IO"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Åbning af '%s' (%m) fejlede."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Kunne ikke lukke '%s' (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Kunne ikke søge efter offset: %x på '%s' (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Kunne ikke skrive til '%s' (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Kunne ikke læse fra '%s' (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Kunne ikke åbne USB enheden (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kameraet er allerede i brug."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Kunne ikke frigøre kernedriver '%s' fra kameraenheden."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Kunne ikke forespørge kernedriver fra enheden."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Kunne ikke kræve grænseflade %d (%s). Sikr dig at ingen andre programmer "
-"(%s) eller kernemoduler (som f.eks. %s) bruger enheden, og at du har læse/"
-"skrive adgang til enheden."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTPCamera-tjeneste"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "andet ukendt program bruger enheden"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Kunne ikke frigøre grænseflade %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Kunne ikke nulstille USB-port (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Kunne ikke lukke USB-port (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Kunne ikke sætte konfiguration %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Kunne ikke sætte alt-indstillinger %d til /%d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"Det leverede fremstiller- eller produkt-id (0x%x,0x%x) er ikke gyldigt."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Kunne ikke finde USB-enheden (fremstiller 0x%x, produkt 0x%x). Sikr dig at "
-"enheden er tilsluttet computeren."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Kunne ikke finde USB-enheden (class 0x%x, subclass 0x%x, protokol0x%x). Sikr "
-"dig at enheden er tilsluttet computeren."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Kunne ikke frigøre kernedriver fra kameraenheden."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Kunne ikke frigøre kernedriver fra kameraenheden."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Enheden '%s' er låst af en anden app."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Låsning af '%s' (%m) fejlede."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Oplåsning af '%s' (%m) fejlede."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB masselagerenhed rå SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Kunne ikke sende SCSI kommando til: '%s' (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/de.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/de.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/de.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/de.po Changed

@@ -1,8 +1,8 @@
 # translation of de.po to
 # German Translation.
-# Copyright © 2000-2002 Scott Fritzinger <scottf@unr.edu> et al.
+# Copyright Â© 2000-2002 Scott Fritzinger <scottf@unr.edu> et al.
 #
-# Please leave these here: öäüßÖÄÜ
+# Please leave these here: Ã¶Ã¤Ã¼ÃÃÃÃ
 # Colin Marquardt <colin@marquardt-home.de>, 2001, 2002.
 # Marcus Meissner <marcus@jet.franken.de>, 2003, 2005, 2013
 #
@@ -10,119 +10,119 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2007-05-10 11:07+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Generischer Port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Unspezifizierter Fehler"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "I/O-Problem"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Falsche Parameter"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
-msgstr "Nicht unterstützte Funktion"
+msgstr "Nicht unterstÃ¼tzte Funktion"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
-msgstr "Festes Limit überschritten."
+msgstr "Festes Limit Ã¼berschritten."
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
-msgstr "Zeitüberschreitung beim Lesen oder Schreiben des Ports"
+msgstr "ZeitÃ¼berschreitung beim Lesen oder Schreiben des Ports"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
-msgstr "Serieller Port nicht unterstützt"
+msgstr "Serieller Port nicht unterstÃ¼tzt"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
-msgstr "USB-Port nicht unterstützt"
+msgstr "USB-Port nicht unterstÃ¼tzt"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Unbekannter Port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Speicher voll"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Fehler beim Laden einer Bibliothek"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Fehler beim Initialisieren des Ports"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Fehler beim Lesen des Ports"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Fehler beim Schreiben des Ports"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Fehler beim Aktualisieren der Port-Einstellungen"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Fehler beim Setzen der Port-Geschwindigkeit"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
-msgstr "Fehler beim Löschen einer »halt condition« auf dem USB-Port"
+msgstr "Fehler beim LÃ¶schen einer Â»halt conditionÂ« auf dem USB-Port"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
-msgstr "Konnte das angeforderte Gerät nicht am USB-Port finden"
+msgstr "Konnte das angeforderte GerÃ¤t nicht am USB-Port finden"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
-msgstr "Konnte das USB-Gerät nicht beanspruchen"
+msgstr "Konnte das USB-GerÃ¤t nicht beanspruchen"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
-msgstr "Konnte das Gerät nicht alleinig reservieren"
+msgstr "Konnte das GerÃ¤t nicht alleinig reservieren"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "Fehler in libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
-msgstr "Die Funktion »%s« wird von diesem Gerät nicht unterstützt."
+msgstr "Die Funktion Â»%sÂ« wird von diesem GerÃ¤t nicht unterstÃ¼tzt."
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Der Port wurde noch nicht initialisiert."
 
@@ -136,265 +136,272 @@
 
 #: libgphoto2_port/gphoto2-port.c:1215
 msgid "No error description available"
-msgstr "Keine Fehlerbeschreibung verfügbar."
+msgstr "Keine Fehlerbeschreibung verfÃ¼gbar."
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
-msgstr "Medium »%s«"
+msgstr "Medium Â»%sÂ«"
+
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Konnte USB-GerÃ¤t nicht Ã¶ffnen (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kamera ist bereits in Benutzung."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Konnte Kerneltreiber nicht vom Kamera Device lÃ¶sen."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Konnte den Kerneltreiber des GerÃ¤tes nicht abfragen."
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Konnte Schnittstelle %d nicht reservieren (%s). Stellen Sie sicher, dass "
+"kein\n"
+"anderes Programm (%s) oder Kernelmodul (z.B. %s) das GerÃ¤t verwendet und "
+"Sie \n"
+"Lese- und Schreibrechte fÃ¼r das GerÃ¤t haben."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTPCamera Dienst"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "unbekanntes anderes libgphoto2 Programm"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Konnte Schnittstelle %d nicht freigeben (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Konnte USB-Port nicht resetten (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Konnte Kerneltreiber nicht an Kamera Device reattachen."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Konnte Konfiguration %d/%d nicht setzen (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Konnte Alternativ-Setting %d/%d nicht setzen (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Konnte USB-GerÃ¤t (Hersteller 0x%x, Produkt 0x%x) nicht finden. \n"
+"Stellen Sie sicher, dass das GerÃ¤t ordnungsgemÃ¤Ã an den Computer "
+"angeschlossen ist."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"Die angegebene Hersteller- oder Produkt-ID (0x%x,0x%x) ist nicht gÃ¼ltig."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Konnte USB-GerÃ¤t (Klasse 0x%x, Subklasse 0x%x, Protokoll 0x%x) nicht "
+"finden. \n"
+"Stellen Sie sicher, dass das GerÃ¤t ordnungsgemÃ¤Ã an den Computer "
+"angeschlossen ist."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
-msgstr "Konnte Gerät »%s« nicht reservieren"
+msgstr "Konnte GerÃ¤t Â»%sÂ« nicht reservieren"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
-msgstr "Gerät »%s« ist von PID %d reserviert"
+msgstr "GerÃ¤t Â»%sÂ« ist von PID %d reserviert"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
-msgstr "Gerät »%s« konnte nicht reserviert werden (dev_lock lieferte %d)"
+msgstr "GerÃ¤t Â»%sÂ« konnte nicht reserviert werden (dev_lock lieferte %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
-msgstr "Reservierung von Gerät »%s« konnte nicht freigegeben werden"
+msgstr "Reservierung von GerÃ¤t Â»%sÂ« konnte nicht freigegeben werden"
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
-"Reservierung von Gerät »%s« konnte nicht freigegeben werden, da es von PID "
+"Reservierung von GerÃ¤t Â»%sÂ« konnte nicht freigegeben werden, da es von PID "
 "%d reserviert ist."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
-"Reservierung von Gerät »%s« konnte nicht freigegeben werden (dev_unlock "
+"Reservierung von GerÃ¤t Â»%sÂ« konnte nicht freigegeben werden (dev_unlock "
 "lieferte %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Serieller Port %i"
 
-#: serial/unix.c:352
-#, fuzzy
+#: serial/unix.c:326
 msgid "Serial Port Device"
-msgstr "Serieller Port %i"
+msgstr "Serieller Port Device"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
-msgstr "Konnte »%s« nicht öffnen (%s)."
+msgstr "Konnte Â»%sÂ« nicht Ã¶ffnen (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
-msgstr "Konnte »%s« nicht schließen (%s)."
+msgstr "Konnte Â»%sÂ« nicht schlieÃen (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Konnte nicht auf Port schreiben (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
-msgstr "Paritätsfehler."
+msgstr "ParitÃ¤tsfehler."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
-msgstr "Unerwartete Paritätsantwort, Sequenz 0xff 0x%02x."
+msgstr "Unerwartete ParitÃ¤tsantwort, Sequenz 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Unbekannter Pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Konnte Level von Pin %i nicht holen (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Konnte Level von Pin %i nicht auf %i setzen (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
-msgstr "Konnte »%s« nicht leeren (%s)."
+msgstr "Konnte Â»%sÂ« nicht leeren (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Konnte Baudrate nicht auf %d setzen"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Konnte Kerneltreiber '%s' nicht vom Kamera Device lÃ¶sen."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Konnte USB-Port nicht schlieÃen (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB Mass Storage direkter IO"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
-msgstr "Konnte »%s« nicht öffnen (%m)."
+msgstr "Konnte Â»%sÂ« nicht Ã¶ffnen (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
-msgstr "Konnte »%s« nicht schließen (%m)."
+msgstr "Konnte Â»%sÂ« nicht schlieÃen (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
-msgstr "Konnte nicht auf Offset %x auf »%s« vorspulen (%m)."
+msgstr "Konnte nicht auf Offset %x auf Â»%sÂ« vorspulen (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
-msgstr "Konnte nicht auf »%s« schreiben (%m)."
+msgstr "Konnte nicht auf Â»%sÂ« schreiben (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
-msgstr "Konnte nicht von »%s« lesen (%m)."
-
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Konnte USB-Gerät nicht öffnen (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kamera ist bereits in Benutzung."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Konnte Kerneltreiber '%s' nicht vom Kamera Device lösen."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Konnte den Kerneltreiber des Gerätes nicht abfragen."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Konnte Schnittstelle %d nicht reservieren (%s). Stellen Sie sicher, dass "
-"kein\n"
-"anderes Programm (%s) oder Kernelmodul (z.B. %s) das Gerät verwendet und "
-"Sie \n"
-"Lese- und Schreibrechte für das Gerät haben."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTPCamera Dienst"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "unbekanntes anderes libgphoto2 Programm"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Konnte Schnittstelle %d nicht freigeben (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Konnte USB-Port nicht resetten (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Konnte USB-Port nicht schließen (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Konnte Konfiguration %d/%d nicht setzen (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Konnte Alternativ-Setting %d/%d nicht setzen (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"Die angegebene Hersteller- oder Produkt-ID (0x%x,0x%x) ist nicht gültig."
+msgstr "Konnte nicht von Â»%sÂ« lesen (%m)."
 
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Konnte USB-Gerät (Hersteller 0x%x, Produkt 0x%x) nicht finden. \n"
-"Stellen Sie sicher, dass das Gerät ordnungsgemäß an den Computer "
-"angeschlossen ist."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Konnte USB-Gerät (Klasse 0x%x, Subklasse 0x%x, Protokoll 0x%x) nicht "
-"finden. \n"
-"Stellen Sie sicher, dass das Gerät ordnungsgemäß an den Computer "
-"angeschlossen ist."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Konnte Kerneltreiber nicht vom Kamera Device lösen."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Konnte Kerneltreiber nicht an Kamera Device reattachen."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
-msgstr "Gerät »%s« ist von einer anderen app reserviert."
+msgstr "GerÃ¤t Â»%sÂ« ist von einer anderen app reserviert."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
-msgstr "Konnte »%s« nicht reservieren (%m)."
+msgstr "Konnte Â»%sÂ« nicht reservieren (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
-msgstr "Konnte »%s« nicht freigeben (%m)."
+msgstr "Konnte Â»%sÂ« nicht freigeben (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB Mass Storage raw SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
-msgstr "Konnte SCSI Kommando nicht an »%s« senden (%m)"
+msgstr "Konnte SCSI Kommando nicht an Â»%sÂ« senden (%m)"
 
 #~ msgid "Called for filename '%s'."
-#~ msgstr "Aufgerufen für »%s«."
+#~ msgstr "Aufgerufen fÃ¼r Â»%sÂ«."
 
 #~ msgid "Could not load '%s': '%s'."
-#~ msgstr "Konnte »%s« nicht laden (%s)."
+#~ msgstr "Konnte Â»%sÂ« nicht laden (%s)."
 
 #~ msgid "Could not find some functions in '%s': '%s'."
 #~ msgstr "Konnte einige Funktionen nicht in '%s' finden: '%s'."
@@ -403,7 +410,7 @@
 #~ msgstr "'%s' bereits geladen"
 
 #~ msgid "Could not load port driver list: '%s'."
-#~ msgstr "Konnte Port Treiberliste»%s« nicht laden."
+#~ msgstr "Konnte Port TreiberlisteÂ»%sÂ« nicht laden."
 
 #~ msgid "Loaded '%s' ('%s') from '%s'."
 #~ msgstr "Habe '%s' ('%s') von '%s' geladen."
@@ -413,21 +420,21 @@
 
 #~ msgid "Counting entries (%i available)..."
 #~ msgid_plural "Counting entries (%i available)..."
-#~ msgstr0 "Zähle Eintrage (%i vorhanden)..."
-#~ msgstr1 "Zähle Eintrage (%i vorhanden)..."
+#~ msgstr0 "ZÃ¤hle Eintrage (%i vorhanden)..."
+#~ msgstr1 "ZÃ¤hle Eintrage (%i vorhanden)..."
 
 #~ msgid "%i regular entry available."
 #~ msgid_plural "%i regular entries available."
-#~ msgstr0 "%i regulärer Eintrag verfügbar."
-#~ msgstr1 "%i reguläre Einträge verfügbar."
+#~ msgstr0 "%i regulÃ¤rer Eintrag verfÃ¼gbar."
+#~ msgstr1 "%i regulÃ¤re EintrÃ¤ge verfÃ¼gbar."
 
 #~ msgid "Looking for path '%s' (%i entry available)..."
 #~ msgid_plural "Looking for path '%s' (%i entries available)..."
 #~ msgstr0 "Suche Pfad '%s' (%i Eintrag vorhanden)..."
-#~ msgstr1 "Suche Pfad '%s' (%i Einträge vorhanden)..."
+#~ msgstr1 "Suche Pfad '%s' (%i EintrÃ¤ge vorhanden)..."
 
 #~ msgid "Starting regex search for '%s'..."
-#~ msgstr "Starte Suche mit regulärem Ausdruck '%s'..."
+#~ msgstr "Starte Suche mit regulÃ¤rem Ausdruck '%s'..."
 
 #~ msgid "Trying '%s'..."
 #~ msgstr "Versuche '%s'..."
@@ -450,25 +457,25 @@
 #~ msgstr1 "Hole Informationen von Eintrag %i (%i vorhanden)..."
 
 #~ msgid "Creating new device..."
-#~ msgstr "Lege neues Gerät an..."
+#~ msgstr "Lege neues GerÃ¤t an..."
 
 #~ msgid "Could not load '%s' ('%s')."
-#~ msgstr "Konnte »%s« nicht laden (%s)."
+#~ msgstr "Konnte Â»%sÂ« nicht laden (%s)."
 
 #~ msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
 #~ msgstr "Konnte 'gp_port_library_operations' in '%s' nicht finden ('%s')"
 
 #~ msgid "Opening %s port..."
-#~ msgstr "Öffne Port %s..."
+#~ msgstr "Ãffne Port %s..."
 
 #~ msgid "Closing port..."
-#~ msgstr "Schließe Port..."
+#~ msgstr "SchlieÃe Port..."
 
 #~ msgid "Resetting port..."
 #~ msgstr "Resette Port..."
 
 #~ msgid "Freeing port..."
-#~ msgstr "Lösche Port..."
+#~ msgstr "LÃ¶sche Port..."
 
 #~ msgid "Writing %i=0x%x byte(s) to port..."
 #~ msgstr "Schreibe %i=0x%x Byte(s) auf den Port..."
@@ -529,32 +536,32 @@
 #~ msgstr "Leere Port..."
 
 #~ msgid "Clear halt..."
-#~ msgstr "Lösche Halt..."
+#~ msgstr "LÃ¶sche Halt..."
 
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Schreibe Nachricht (request=0x%x, Wert=0x%x, Index=0x%x, Größe=%i=0x%x)..."
+#~ "Schreibe Nachricht (request=0x%x, Wert=0x%x, Index=0x%x, GrÃ¶Ãe=%i=0x%x)..."
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Lese Nachricht (request=0x%x, Wert=0x%x, Index=0x%x, Größe=%i=0x%x)..."
+#~ "Lese Nachricht (request=0x%x, Wert=0x%x, Index=0x%x, GrÃ¶Ãe=%i=0x%x)..."
 
 #~ msgid "Device has driver '%s' attached."
-#~ msgstr "Gerät hat Kerneltreiber »%s« zugewiesen."
+#~ msgstr "GerÃ¤t hat Kerneltreiber Â»%sÂ« zugewiesen."
 
 #~ msgid "Device has driver '%s' attached, detaching it now."
-#~ msgstr "Gerät hat Kerneltreiber '%s' zugewiesen, löse Treiber jetzt."
+#~ msgstr "GerÃ¤t hat Kerneltreiber '%s' zugewiesen, lÃ¶se Treiber jetzt."
 
 #~ msgid ""
 #~ "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and "
 #~ "might not function with gphoto2. Reference: %s"
 #~ msgstr ""
-#~ "Das USB-Gerät (Hersteller 0x%x, Produkt 0x%x) ist ein USB Mass Storage "
-#~ "Gerät und wird von System direkt unterstützt (und deshalb nicht von "
+#~ "Das USB-GerÃ¤t (Hersteller 0x%x, Produkt 0x%x) ist ein USB Mass Storage "
+#~ "GerÃ¤t und wird von System direkt unterstÃ¼tzt (und deshalb nicht von "
 #~ "gphoto2). Lesen Sie hierzu bitte %s"
 
 #~ msgid "Device has a kernel driver attached (%d), detaching it now."
-#~ msgstr "Gerät hat Kerneltreiber »%d« zugewiesen, löse Treiber jetzt."
+#~ msgstr "GerÃ¤t hat Kerneltreiber Â»%dÂ« zugewiesen, lÃ¶se Treiber jetzt."
 
 #~ msgid "msg_read"
 #~ msgstr "msg_read"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/es.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/es.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/es.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/es.po Changed

@@ -1,15 +1,16 @@
-# Spanish Translation for libgphoto2_port 2.5.13
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Spanish Translation for libgphoto2_port
+# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
 # Fabian Mandelbaum <fabman@mandrakesoft.com>, 2002.
 # Francisco Javier Serrador <fserrador@gmail.com>, 2018.
+# Antonio Ceballos Roa <aceballos@gmail.com>, 2019, 2023.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.13\n"
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2018-04-07 14:29+0200\n"
-"Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2023-07-30 18:23+0200\n"
+"Last-Translator: Antonio Ceballos Roa <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -20,108 +21,108 @@
 "X-Generator: Poedit 2.0.4\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Puerto Genérico"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Sin error"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Error no especificado"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problema de E/S"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Parámetros incorrectos"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
-msgstr "Límite excedido fijado"
+msgstr "Límite fijado excedido"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Tiempo de espera agotado leyendo de, o escribiendo en, el puerto"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Puerto serie no soportado"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Puerto USB no soportado"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Puerto desconocido"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Error cargando una biblioteca"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Error inicializando el puerto"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Error leyendo desde el puerto"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Error escribiendo en el puerto"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Error actualizando las configuraciones del puerto"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Error configurando la velocidad del puerto serie"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Error borrando una condición de parada en el puerto USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "No se pudo encontrar el dispositivo pedido en el puerto USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "No se pudo reclamar el dispositivo USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "No se pudo bloquear el dispositivo"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "error libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Esta operación '%s' no está soportada por este dispositivo"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Todavía no se ha inicializado el puerto"
 
@@ -137,246 +138,255 @@
 msgid "No error description available"
 msgstr "No está disponible la descripción del error"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Medio «%s»"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "No se pudo abrir el dispositivo USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "La cámara está ya en uso."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "No se pudo desconectar el controlador del dispositivo de cámara."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "No se pudo consultar el controlador del dispositivo."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"No se pudo reclamar la interfaz %d (%s). Debe asegurarse de que ningún otro "
+"programa (%s) o módulo del núcleo (como %s) esté utilizando el dispositivo y "
+"de que usted tenga acceso de lectura/escritura al dispositivo."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Servicio PTPCamara de MacOS"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "programa usando libgphoto2 desconocido"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "No se pudo liberar la interfaz %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "No se pudo reiniciar el puerto USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "No se pudo volver a conectar controlador del dispositivo de cámara."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "No se pudo establecer la configuración %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "No se pudo establecer configuración alternativa desde %d a %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"No se pudo encontrar el dispositivo USB (fabricante 0x%x, producto 0x%x). "
+"Debe asegurarse de que este dispositivo esté conectado a la computadora."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"El ID de fabricante o de producto que se ha especificado (0x%x, 0x%x) no es "
+"válido."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"No se pudo encontrar el dispositivo USB (clase 0x%x, subclase 0x%x, "
+"protocolo 0x%x). Debe asegurarse de que este dispositivo esté conectado a la "
+"computadora."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "Conexión PTP/IP"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "Conexión IP"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "No se pudo bloquear el dispositivo '%s'"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "El dispositivo '%s' está bloqueado por el pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "No se pudo bloquear el dispositivo '%s' (dev_lock devolvió %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "No se pudo desbloquear el dispositivo '%s'."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "No se pudo desbloquear el dispositivo '%s' ya que está trabado por el pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "No se pudo desbloquear el dispositivo '%s' (dev_unlock devolvió %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Puerto serie %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Dispositivo de Puerto Serie"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
-msgstr "Falló al abrir '%s' (%s)."
+msgstr "Fallo al abrir '%s' (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "No se pudo cerrar '%s' (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "No se pudo escribir al puerto (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Error de paridad."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Secuencia de respuesta de paridad 0xff, 0x%02x no esperada."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Pin %i desconocido."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "No se pudo obtener el nivel de pin %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "No se pudo establecer el nivel de pin %i como %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "No se pudo vaciar '%s' (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "No se pudo configurar la tasa de baudio en %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "No se pudo desconectar el controlador «%s» del dispositivo de cámara."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "No se pudo cerrar el puerto USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Almacenamiento Masivo USB directo E/S"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "No se pudo abrir '%s' (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "No se pudo cerrar '%s' (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "No se pudo continuar al desplazamiento: %x en '%s' (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "No se pudo escribir al «%s» (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "No se pudo leer '%s' (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "No se pudo abrir el dispositivo USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Cámara está ya en uso."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "No pudo desenlazar controlador núemro «%s» de dispositivo de cámara."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "No se pudo bloquear el dispositivo."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"No se pudo reclamar la interfaz %d (%s). Debe asegurarse que ningún otro "
-"programa (%s) o módulo del núcleo (como un %s) esté utilizando el "
-"dispositivo y que Usted tiene acceso de lectura/escritura al dispositivo."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Servicio MacOS PTPCamara"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "libgphoto2 desconocido utilizando programa"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "No se pudo desbloquear la interfaz %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "No se pudo reiniciar puerto USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "No se pudo cerrar el puerto USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "No se pudo establecer la configuración %d%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "No se pudo establecer configuración alternativa %d a %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"El fabricante o ID de producto proporcionado (0x%x, 0x%x) no es válido."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"No se pudo encontrar el dispositivo USB (fabricante 0x%x, producto 0x%x). "
-"Debe asegurarse que este dispositivo está conectado a la computadora."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"No se pudo encontrar el dispositivo USB (clase 0x%x, subclase 0x%x, "
-"protocolo 0x%x). Debe asegurarse que este dispositivo está conectado a la "
-"computadora."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "No se pudo desbloquear controlador kernel del dispositivo de cámara."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "No se pudo readjuntar controlador número de dispositivo de cámara."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
-msgstr "Dispositivo '%s' está trabado por app."
+msgstr "El dispositivo '%s' está trabado por otra app."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
-msgstr "Falló al bloquear '%s' (%m)."
+msgstr "Fallo al bloquear '%s' (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
-msgstr "Falló al desbloquear '%s' (%m)."
+msgstr "Fallo al desbloquear '%s' (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Almacenamiento USB Masivo Crudo SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "No se pudo enviar orden scsi a: '%s' (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/eu.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/eu.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/eu.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/eu.po Changed

@@ -7,119 +7,119 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2005-05-14 13:32+0200\n"
 "Last-Translator: Iñaki Larrañaga  <dooteo@euskalgnu.org>\n"
 "Language-Team:  <itzulpena@euskalgnu.org>\n"
-"Language: \n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Ataka generikoa"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Errorerik gabe"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Zehaztu gabeko errorea"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "S/I-ko arazoa"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Parametro okerrak"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Eragiketa ez dago onartuta"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Denbora-muga irungitu da atakan irakurtzean/idaztean"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Serieko ataka ez dago onartuta"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB ataka ez dago onartuta"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Ataka ezezaguna"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Memoriarik gabe"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Errorea liburutegia kargatzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Errorea ataka hasieratzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Errorea atakatik irakurtzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Errorea atakan idaztean"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Errorea atakako konfigurazioa eguneratzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Errorea serieko atakaren abiadura ezartzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Errorea USB atakako itzaltze-baldintza ezabatzean"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Ezin izan da eskatutako gailua USB atakan aurkitu"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Ezin izan da USB gailua aldarrikatu"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Ezin izan da gailua blokeatu"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Gailu honek ez du '%s' eragiketa onartzen"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Ez da ataka hasieratu oraindik"
 
@@ -135,276 +135,284 @@
 msgid "No error description available"
 msgstr "Errorearen azalpena ez dago eskuragarri"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr ""
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, fuzzy, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Ezin izan da USB gailua ireki (%m)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kamera jadanik erabiltzen ari da"
+
+#: libusb1/libusb1.c:404
+#, fuzzy
+msgid "Could not detach kernel driver of camera device."
+msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Ezin izan da gailuaren kontrolatzailea kernelari eskatu"
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, fuzzy, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Ezin izan da %d interfazea aldarrikatu (%m). Ziurta zaitez beste programa "
+"batek edo kerneleko modulo batek (%s bezalakoak) gailua erabiltzen ari ez "
+"dela, eta gailuan irakurtzeko/idazteko baimenak dituzula."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr ""
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr ""
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, fuzzy, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Ezin izan da %d interfazea askatu (%m)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, fuzzy, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Ezin izan da USB ataka itxi (%m)."
+
+#: libusb1/libusb1.c:522
+#, fuzzy
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, fuzzy, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Ezin izan da %d/%d konfigurazioa ezarri (%m)."
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, fuzzy, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Ezin izan da %d/%d aukerazko konfigurazioa ezarri (%m)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Ezin izan da USB gailua (0x%x hornitzailea, 0x%x produktua) aurkitu. Ziurta "
+"zaitez gailua ordenagailuari konektatuta dagoela."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"Zehaztutako hornitzailearen edo produktuaren IDa (0x%x,0x%x) ez da baliozkoa."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Ezin izan da USB gailua aurkitu (0x%x klasea, 0x%x azpiklasea, 0x%x "
+"protokoloa). Ziurta zaitez gailua ordenagailura konektatuta dagoela."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Ezin izan da '%s' gailua blokeatu"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "'%s' gailua %d pid-ek blokeatuta dauka"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Ezin izan da '%s' gailua blokeatu (dev_lock-ek %d itzuli du)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Ezin izan da '%s' gailua desblokeatu."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Ezin izan da '%s' gailua desblokeatu, %d pid-ak blokeatuta baitauka."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Ezin izan da '%s' desblokeatu (dev_unlock-ek %d itzuli du)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Serieko ataka: %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 #, fuzzy
 msgid "Serial Port Device"
 msgstr "Serieko ataka: %i"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, fuzzy, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Huts egin du '%s' irekitzean (%m)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, fuzzy, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Ezin izan da '%s' itxi (%m)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, fuzzy, c-format
 msgid "Could not write to port (%s)"
 msgstr "Ezin izan da atakan idatzi (%m)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Paritate-errorea."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Ustegabeko 0xff 0x%02x paritate-erantzuna sekuentzia."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "%i PIN ezezaguna."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, fuzzy, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Ezin izan da %i pin-aren maila lortu (%m)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, fuzzy, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Ezin izan da %i pin-aren maila %i gisa ezarri (%m)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, fuzzy, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Ezin izan da '%s' hustu (%m)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Ezin izan da %d(r)en baudio-tasa ezarri"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
+
+#: usb/libusb.c:359
+#, fuzzy, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Ezin izan da USB ataka itxi (%m)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr ""
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Huts egin du '%s' irekitzean (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Ezin izan da '%s' itxi (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, fuzzy, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Ezin izan da '%s' itxi (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, fuzzy, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Ezin izan da atakan idatzi (%m)"
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, fuzzy, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Ezin izan da '%s' itxi (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, fuzzy, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Ezin izan da USB gailua ireki (%m)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kamera jadanik erabiltzen ari da"
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Ezin izan da gailuaren kontrolatzailea kernelari eskatu"
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, fuzzy, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Ezin izan da %d interfazea aldarrikatu (%m). Ziurta zaitez beste programa "
-"batek edo kerneleko modulo batek (%s bezalakoak) gailua erabiltzen ari ez "
-"dela, eta gailuan irakurtzeko/idazteko baimenak dituzula."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr ""
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr ""
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, fuzzy, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Ezin izan da %d interfazea askatu (%m)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, fuzzy, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Ezin izan da USB ataka itxi (%m)."
-
-#: usb/libusb.c:375
-#, fuzzy, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Ezin izan da USB ataka itxi (%m)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, fuzzy, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Ezin izan da %d/%d konfigurazioa ezarri (%m)."
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, fuzzy, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Ezin izan da %d/%d aukerazko konfigurazioa ezarri (%m)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"Zehaztutako hornitzailearen edo produktuaren IDa (0x%x,0x%x) ez da baliozkoa."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Ezin izan da USB gailua (0x%x hornitzailea, 0x%x produktua) aurkitu. Ziurta "
-"zaitez gailua ordenagailuari konektatuta dagoela."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Ezin izan da USB gailua aurkitu (0x%x klasea, 0x%x azpiklasea, 0x%x "
-"protokoloa). Ziurta zaitez gailua ordenagailura konektatuta dagoela."
-
-#: libusb1/libusb1.c:413
-#, fuzzy
-msgid "Could not detach kernel driver of camera device."
-msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
-
-#: libusb1/libusb1.c:531
-#, fuzzy
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Ezin izan da kamera gailuaren kerneleko '%s' kontrolatzailea askatu"
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, fuzzy, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "'%s' gailua %d pid-ek blokeatuta dauka"
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, fuzzy, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Huts egin du '%s' irekitzean (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, fuzzy, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Huts egin du '%s' irekitzean (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr ""
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, fuzzy, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Ezin izan da %d/%d aukerazko konfigurazioa ezarri (%m)"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Called for filename '%s'."
 #~ msgstr "Huts egin du '%s' irekitzean (%m)."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could not load '%s': '%s'."
 #~ msgstr "Ezin izan da '%s' itxi (%m)."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could not find some functions in '%s': '%s'."
 #~ msgstr "Ezin izan da '%s' hustu (%m)."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could not load port driver list: '%s'."
 #~ msgstr "Ezin izan da '%s' gailua blokeatu"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could not load '%s' ('%s')."
 #~ msgstr "Ezin izan da '%s' itxi (%m)."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could only write %i out of %i byte(s)"
 #~ msgstr "Ezin izan da atakan idatzi (%m)"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Getting level of pin %i..."
 #~ msgstr "Ezin izan da %i pin-aren maila lortu (%m)."
 
@@ -415,9 +423,11 @@
 #~ msgid "msg_read"
 #~ msgstr "msg_read"
 
+#, c-format
 #~ msgid "Device has driver '%s' attached, detaching it now."
 #~ msgstr "Gailuak '%s' kontrolatzailea erantsita du, askatu orain."
 
+#, c-format
 #~ msgid ""
 #~ "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and "
 #~ "might not function with gphoto2. Reference: %s"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/fi.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/fi.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/fi.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/fi.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.10\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2016-03-25 16:35+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -19,108 +19,108 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Geneerinen portti"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Määrittelemätön virhe"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Siirräntäpulma"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Virheelliset parametrit"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Tukematon toiminto"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Kiinteä raja ylitetty"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Aikakatkaisu portin lukemisessa tai kirjoittamisessa"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Sarjaporttia ei tueta"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB-porttia  ei  tueta"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Tuntematon portti"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Muisti loppui"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Virhe ladattaessa kirjastoa"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Virhe alustettaessa porttia"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Virhe luettaessa portista"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Virhe kirjoitettaessa porttiin"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Virhe päivitettäessä portin asetuksia"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Virhe asetettaessa sarjaportin nopeutta"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Virhe nollatessa halt-tilaa USB-portissa"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Pyydetyn laitteen löytäminen USB-portista epäonnistui"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "USB-laitteen vaatiminen omaan käyttöön epäonnistui"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Laitteen lukitus epäonnistui"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal-virhe"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Tämä laite ei tue ’%s’-toimintoa"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Porttia ei ole vielä alustettu"
 
@@ -146,253 +146,261 @@
 msgid "No error description available"
 msgstr "Virhekuvausta ei ole saatavilla"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Media ’%s’"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "USB-laitteen (%s) avaaminen epäonnistui."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kamera on jo käytössä."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Kameralaitteen käyttöjärjestelmäajurin irrottaminen epäonnistui."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Laitteen käyttöjärjestelmäajurin kyseleminen epäonnistui."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Liitännän %d (%s) vaatiminen epäonnistui. Varmista, että mikään toinen "
+"ohjelma (%s) tai käyttöjärjestelmämoduuli (sellainen kuin %s) ei käytä "
+"laitetta ja sinulla on laitteeseen luku- tai kirjoitusoikeus."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTPCamera-palvelu"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "tuntematon libgphoto2-kirjastoa käyttävä ohjelma"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Liitännän %d (%s) vapauttaminen epäonnistui."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "USB-portin (%s) nollaus epäonnistui."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr ""
+"Kameralaitteen käyttöjärjestelmäajurin liittäminen uudelleen epäonnistui."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Asetuksen %d/%d (%s) asettaminen epäonnistui"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Asetuksen altsetting asetus arvosta %d arvoon %d (%s) epäonnistui"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"USB-laitetta (toimittaja 0x%x, tuote 0x%x) ei löydetty. Varmista, että laite "
+"on liitetty tietokoneeseen."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Tarjottu toimittaja- tai tuotetunniste (0x%x,0x%x) ei ole kelvollinen."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"USB-laitetta (luokka 0x%x, aliluokka 0x%x, yhteyskäytäntö 0x%x) ei löydetty. "
+"Varmista, että laite on liitetty tietokoneeseen."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Laitteen ’%s’ lukitus epäonnistui"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Laitteen ’%s’ on lukinnut pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Laitteen ’%s’ lukitus epäonnistui (dev_lock palautti %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Laitteen ’%s’ lukituksen avaus epäonnistui."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Laitteen ’%s’ lukituksen avaus epäonnistui, koska sen on lukinnut pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Laitteen ’%s’ lukituksen avaus epäonnistui (dev_unlock palautti %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Sarjaportti %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Sarjaporttilaite"
 
 #  Ensimmäinen parametri on portti
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Portin ’%s’ avaaminen epäonnistui (%s)."
 
 #  Ensimmäinen parametri on sarjaportti
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Sarjaportin ’%s’ (%s) sulkeminen epäonnistui."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Kirjoittaminen porttiin (%s) epäonnistui"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Pariteettivirhe."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Odottamaton pariteettivastaussekvenssi 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Tuntematon nasta %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Nastan %i (%s) tason hakeminen epäonnistui."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Nastan %i tason asettaminen arvoon %i (%s) epäonnistui."
 
 #  Ensimmäinen parametri on sarjaportti
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Sarjaportin ’%s’ (%s) puhdistaminen epäonnistui."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Siirtonopeuden asettaminen arvoon %d epäonnistui"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Kameralaitteen käyttöjärjestelmäajuria ’%s’ ei voitu irrottaa."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "USB-portin (%s) sulkeminen epäonnistui."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB-massatallennuksen suora liitäntä"
 
 #  Ensimmäinen parametri on polku
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Polun ’%s’ avaaminen epäonnistui (%m)."
 
 #  Ensimmäinen parametri on polku
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Polun ’%s’ (%m) sulkeminen epäonnistui."
 
 #  Toinen parametri on polku
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Siirrososoitteen: %x etsintä polussa ’%s’ (%m) epäonnistui."
 
 #  Ensimmäinen parametri on polku
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Polkuun ’%s’ (%m) kirjoittaminen epäonnistui."
 
 #  Ensimmäinen parametri on polku
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Polusta ’%s’ (%m) lukeminen epäonnistui."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "USB-laitteen (%s) avaaminen epäonnistui."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kamera on jo käytössä."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Kameralaitteen käyttöjärjestelmäajuria ’%s’ ei voitu irrottaa."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Laitteen käyttöjärjestelmäajurin kyseleminen epäonnistui."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Liitännän %d (%s) vaatiminen epäonnistui. Varmista, että mikään toinen "
-"ohjelma (%s) tai käyttöjärjestelmämoduuli (sellainen kuin %s) ei käytä "
-"laitetta ja sinulla on laitteeseen luku- tai kirjoitusoikeus."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTPCamera-palvelu"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "tuntematon libgphoto2-kirjastoa käyttävä ohjelma"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Liitännän %d (%s) vapauttaminen epäonnistui."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "USB-portin (%s) nollaus epäonnistui."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "USB-portin (%s) sulkeminen epäonnistui."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Asetuksen %d/%d (%s) asettaminen epäonnistui"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Asetuksen altsetting asetus arvosta %d arvoon %d (%s) epäonnistui"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Tarjottu toimittaja- tai tuotetunniste (0x%x,0x%x) ei ole kelvollinen."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"USB-laitetta (toimittaja 0x%x, tuote 0x%x) ei löydetty. Varmista, että laite "
-"on liitetty tietokoneeseen."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"USB-laitetta (luokka 0x%x, aliluokka 0x%x, yhteyskäytäntö 0x%x) ei löydetty. "
-"Varmista, että laite on liitetty tietokoneeseen."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Kameralaitteen käyttöjärjestelmäajurin irrottaminen epäonnistui."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr ""
-"Kameralaitteen käyttöjärjestelmäajurin liittäminen uudelleen epäonnistui."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Toinen sovellus on lukinnut laitteen ’%s’."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Kohteen ’%s’ lukitseminen epäonnistui (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Toiminto unlock ’%s’ epäonnistui (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB-massatallennuksen raaka-SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Scsi-komennon lähettäminen kohteeseen: ’%s’ (%m) epäonnistui."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/fr.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/fr.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/fr.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/fr.po Changed

@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.10\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2016-12-23 22:19+0100\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,108 +24,108 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Port générique"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Erreur indéfinie"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problème d'E/S"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Mauvais paramètres"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Opération non prise en charge"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Limite déterminée dépassée"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Délai d'attente dépassé en lecture ou écriture sur le port"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Port série non pris en charge"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Port USB non pris en charge"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Port inconnu"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Mémoire épuisée"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Erreur au chargement de la bibliothèque"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Erreur d'initialisation du port"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Erreur de lecture du port"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Erreur d'écriture sur le port"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Erreur de modification de la configuration du port"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Erreur de configuration de la vitesse du port série"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Erreur de réinitialisation d'une condition d'arrêt sur le port USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Impossible de trouver l'appareil demandé sur le port USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Impossible de communiquer avec le périphérique USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Impossible de verrouiller le périphérique"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "Erreur de libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "L'opération « %s » n'est pas possible avec ce périphérique"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Le port n'a pas encore été initialisé"
 
@@ -141,250 +141,258 @@
 msgid "No error description available"
 msgstr "Description d'erreur non disponible"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Media « %s »"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Impossible d'ouvrir le périphérique USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "L'appareil photographique est déjà utilisé."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Impossible de détacher le pilote de noyau de l'appareil."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Impossible de recevoir le pilote pour ce périphérique."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Impossible d'utiliser l'interface %d (%s). Assurez-vous qu'aucun autre "
+"programme (%s) ou module du noyau (comme %s) n'utilisent le périphérique et "
+"que vous y avez accès en lecture et écriture."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "service PTPCamera de MacOS"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "programme utilisant libgphoto2 inconnu"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Impossible de libérer l'interface %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Impossible de réinitialiser le port USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Impossible de rattacher le pilote de noyau de l'appareil."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Impossible de configurer %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr ""
+"Impossible de définir un paramètre alternatif (altsetting) de %d à %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Impossible de trouver le périphérique USB (fabricant 0x%x, produit 0x%x). "
+"Assurez-vous qu'il est bien connecté à l'ordinateur."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "L'identifiant de fabricant ou produit (0x%x,0x%x) est incorrect."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Impossible de trouver le périphérique USB (fabricant 0x%x, sous-classe 0x%x, "
+"produit 0x%x). Assurez-vous qu'il est bien connecté à l'ordinateur."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Impossible de verrouiller le périphérique « %s »"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Le périphérique « %s » est verrouillé par le processus %d."
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr ""
 "Le périphérique « %s » n'a pas pu être verrouillé (dev_lock a renvoyé %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Le périphérique « %s » n'a pas pu être déverrouillé."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Le périphérique « %s » n'a pas pu être déverrouillé car il est verrouillé "
 "par le processus %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "Le périphérique « %s » n'a pas pu être déverrouillé (dev_unlock a renvoyé %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Port série %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Port série"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Échec d'ouverture de « %s » (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Impossible de fermer « %s » (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Impossible d'écrire sur le port (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Erreur de parité."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Séquence de réponse de parité 0xff 0x%02x inattendue."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Broche %i inconnue."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Impossible d'obtenir le niveau de la broche %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Impossible de configurer le niveau de la broche %i à %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Impossible de vider « %s » (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Impossible de configurer le débit à %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr ""
+"Impossible de détacher le pilote « %s » du noyau pour l'appareil "
+"photographique."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Impossible de fermer le port USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "E/S directes de stockage de masse USB"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Impossible d'ouvrir « %s » (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Impossible de fermer « %s » (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Impossible de rechercher une position : %x dans « %s » (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Impossible d'écrire dans « %s » (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Impossible de lire dans « %s » (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Impossible d'ouvrir le périphérique USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "L'appareil photographique est déjà utilisé."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr ""
-"Impossible de détacher le pilote « %s » du noyau pour l'appareil "
-"photographique."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Impossible de recevoir le pilote pour ce périphérique."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Impossible d'utiliser l'interface %d (%s). Assurez-vous qu'aucun autre "
-"programme (%s) ou module du noyau (comme %s) n'utilisent le périphérique et "
-"que vous y avez accès en lecture et écriture."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "service PTPCamera de MacOS"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "programme utilisant libgphoto2 inconnu"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Impossible de libérer l'interface %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Impossible de réinitialiser le port USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Impossible de fermer le port USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Impossible de configurer %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr ""
-"Impossible de définir un paramètre alternatif (altsetting) de %d à %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "L'identifiant de fabricant ou produit (0x%x,0x%x) est incorrect."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Impossible de trouver le périphérique USB (fabricant 0x%x, produit 0x%x). "
-"Assurez-vous qu'il est bien connecté à l'ordinateur."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Impossible de trouver le périphérique USB (fabricant 0x%x, sous-classe 0x%x, "
-"produit 0x%x). Assurez-vous qu'il est bien connecté à l'ordinateur."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Impossible de détacher le pilote de noyau de l'appareil."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Impossible de rattacher le pilote de noyau de l'appareil."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Le périphérique « %s » est verrouillé par une autre application."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Impossible de verrouiller « %s » (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Impossible de déverrouiller « %s » (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Stockage de masse USB contenant des données brutes SCSI "
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Impossible d'envoyer une commande scsi à : « %s » (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/it.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/it.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/it.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/it.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.8\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2015-08-05 13:07+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,109 +18,109 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Porta generica"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Nessun errore"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Errore non specificato"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problema di I/O"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Parametri non corretti"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Operazione non gestita"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Limite fisso superato"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Timeout durante la lettura o la scrittura sulla porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Porta seriale non gestita"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Porta USB non gestita"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Porta sconosciuta"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Errore durante il caricamento di una libreria"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Errore durante l'inizializzazione della porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Errore durante la lettura dalla porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Errore durante la scrittura sulla porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Errore durante l'aggiornamento delle impostazioni della porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Errore durante l'impostazione della velocità della porta seriale"
 
 # FIXME
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Errore nella rimozione di una condizione di halt sulla porta USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Impossibile trovare il dispositivo richiesto sulla porta USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Impossibile reclamare il dispositivo USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Impossibile bloccare il dispositivo"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "errore in libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "L'operazione \"%s\" non è gestita da questo dispositivo"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "La porta non è ancora stata inizializzata"
 
@@ -136,251 +136,259 @@
 msgid "No error description available"
 msgstr "Nessuna descrizione dell'errore disponibile"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Media \"%s\""
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Impossibile aprire il dispositivo USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "La fotocamera è già in uso."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Impossibile scollegare il driver del kernel per il dispositivo."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Impossibile interrogare il driver del kernel per il dispositivo."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Impossibile reclamare l'interfaccia %d (%s). Assicurarsi che nessun altro "
+"programma (%s) o un modulo del kernel (come %s) stia usando il device e che "
+"si abbia accesso in lettura e scrittura al device."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "servizio MacOS PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "programma sconosciuto che usa libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Impossibile rilasciare l'interfaccia %d (%s)."
+
+# FIXME
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Impossibile reimpostare la porta USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Impossibile riattaccare il driver del kernel per il dispositivo."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Impossibile impostare la configurazione %d/%d (%s)"
+
+# FIXME
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Impossibile impostare altsetting da %d a %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Impossibile trovare il dispositivo USB (vendor 0x%x, prodotto 0x%x). "
+"Assicurarsi che il dispositivo sia connesso al computer."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "L'id del vendor o del prodotto (0x%x,0x%x) fornito non è valido."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Impossibile trovare il dispositivo USB (classe 0x%x, sottoclasse 0x%x, "
+"protocollo 0x%x). Assicurarsi che il dispositivo sia connesso al computer."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Impossibile bloccare il device \"%s\""
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Il device \"%s\" è bloccato dal pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr ""
 "Non è stato possibile bloccare il device \"%s\" (dev_lock ha restituito %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Non è stato possibile sbloccare il device \"%s\"."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Non è stato possibile sbloccare il device \"%s\" perché bloccato dal pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "Non è stato possibile sbloccare il device \"%s\" (dev_unlock ha restituito "
 "%d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Porta seriale %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 #, fuzzy
 msgid "Serial Port Device"
 msgstr "Porta seriale %i"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Impossibile aprire \"%s\" (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Impossibile chiudere \"%s\" (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Impossibile scrivere sulla porta (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Errore di parità."
 
 # FIXME
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Sequenza di risposta di parità 0xff 0x%02x inattesa."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Pin %i sconosciuto."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Impossibile ottenere il livello del pin %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Impossibile impostare il livello del pin %i a %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Impossibile svuotare \"%s\" (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Impossibile impostare la velocità di trasmissione a %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Impossibile scollegare il driver \"%s\" del kernel per il dispositivo."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Impossibile chiudere la porta USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Archiviazione di massa USB con IO direct"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Impossibile aprire \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Impossibile chiudere \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Impossibile fare il seek all'offset: %x su \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Impossibile scrivere sul \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Impossibile leggere da \"%s\" (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Impossibile aprire il dispositivo USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "La fotocamera è già in uso."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Impossibile scollegare il driver \"%s\" del kernel per il dispositivo."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Impossibile interrogare il driver del kernel per il dispositivo."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Impossibile reclamare l'interfaccia %d (%s). Assicurarsi che nessun altro "
-"programma (%s) o un modulo del kernel (come %s) stia usando il device e che "
-"si abbia accesso in lettura e scrittura al device."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "servizio MacOS PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "programma sconosciuto che usa libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Impossibile rilasciare l'interfaccia %d (%s)."
-
-# FIXME
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Impossibile reimpostare la porta USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Impossibile chiudere la porta USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Impossibile impostare la configurazione %d/%d (%s)"
-
-# FIXME
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Impossibile impostare altsetting da %d a %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "L'id del vendor o del prodotto (0x%x,0x%x) fornito non è valido."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Impossibile trovare il dispositivo USB (vendor 0x%x, prodotto 0x%x). "
-"Assicurarsi che il dispositivo sia connesso al computer."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Impossibile trovare il dispositivo USB (classe 0x%x, sottoclasse 0x%x, "
-"protocollo 0x%x). Assicurarsi che il dispositivo sia connesso al computer."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Impossibile scollegare il driver del kernel per il dispositivo."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Impossibile riattaccare il driver del kernel per il dispositivo."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Il dispositivo \"%s\" è bloccato da un'altra applicazione."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Impossibile fare il lock di \"%s\" (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Impossibile fare l'unlock di \"%s\" (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Archiviazione di massa USB con raw SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Impossibile mandare il comando scsi a: \"%s\" (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/ja.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ja.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/ja.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ja.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.4.7\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2009-09-23 04:04+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -19,108 +19,108 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Generic ポート"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "エラーなし"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "不明なエラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "I/O 問題"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "おかしなパラメータ"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "サポートしていない操作"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "ポートからの読み込み/書き込みでタイムアウト"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "シリアルポートはサポートしていません"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB ポートはサポートしていません"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "不明なポート"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "ライブラリの読み込みエラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "ポートの初期化エラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "ポートの読み込みエラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "ポートへの書き込みエラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "ポート設定の更新エラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "シリアルポートのスピードの設定エラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "USB ポート上で Halt 状態のクリアエラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "USB ポート上に指定したデバイスが見つかりませんでした"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "USB デバイスと断定できませんでした"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "デバイスをロックすることが出来ませんでした"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal エラー"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "その操作 '%s' はこのデバイスではサポートしていません"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "ポートが未だ初期化されていません"
 
@@ -136,292 +136,310 @@
 msgid "No error description available"
 msgstr "有効なエラーメッセージがありません"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "メディア「%s」"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, fuzzy, c-format
+msgid "Could not open USB device (%s)."
+msgstr "USB デバイスを開くことが出来ませんでした (%m)。"
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "既にカメラは使用中です。"
+
+#: libusb1/libusb1.c:404
+#, fuzzy
+msgid "Could not detach kernel driver of camera device."
+msgstr "Kernel ドライバ '%s' を解放できませんでした。"
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Kernel のデバイス・ドライバを照会できませんでした。"
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, fuzzy, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"インタフェース %d (%m) と断定できませんでした。他のプログラムまたは (接頭子"
+"が %s のような)  Kernel モジュールがこのデバイスを使用していないか確認して、"
+"そのデバイスの読み込み/書き込みをしてみて下さい。"
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr ""
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr ""
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, fuzzy, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "インタフェース %d を解放することが出来ませんでした (%m)。"
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, fuzzy, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "USB ポートをリセットすることが出来ませんでした (%m)。"
+
+#: libusb1/libusb1.c:522
+#, fuzzy
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Kernel ドライバ '%s' を解放できませんでした。"
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, fuzzy, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "設定 %d/%d を反映することが出来ませんでした (%m)。"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, fuzzy, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "設定 %d/%d を反映することが出来ませんでした (%m)。"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"USB デバイス (ベンダー:0x%x 製品: 0x%x) が見つかりませんでした。このデバイス"
+"がコンピュータに接続されているか確認して下さい。"
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "提供ベンダーまたは製品 ID (0x%x,0x%x) は正しくありません。"
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"USB デバイス (Class: 0x%x, SubClass: 0x%x, プロトコル: 0x%x) が見つかりません"
+"でした。このデバイスがコンピュータに接続されているか確認して下さい。"
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "デバイス '%s' をロックすることが出来ませんでした"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "デバイス '%s' は他のプロセス (PID:%d) がロックしています"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "デバイス '%s' がロックできません (dev_lock の返り値 %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "デバイス '%s' のロックを解放することが出来ませんでした。"
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "デバイス '%s' が他のプロセス (PID:%d) がロックしているので解放することが出来"
 "ませんでした。"
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "デバイス '%s' のロックを解放することが出来ませんでした (dev_unlock の返り値 "
 "%d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "シリアルポート %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 #, fuzzy
 msgid "Serial Port Device"
 msgstr "シリアルポート %i"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, fuzzy, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "'%s' のオープンに失敗しました (%m)。"
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, fuzzy, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "'%s' を閉じることが出来ませんでした (%m)。"
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, fuzzy, c-format
 msgid "Could not write to port (%s)"
 msgstr "ポートへ書き込めませんでした (%m)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "パリティ・エラーです。"
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "予期しないパリティ応答シーケンス 0xff 0x%02x です。"
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "不明なピン %i"
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, fuzzy, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "ピン %i のレベルを取得することが出来ませんでした (%m)。"
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, fuzzy, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "ピン %i から %i のレベルを設定することが出来ませんでした (%m)。"
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, fuzzy, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "フラッシュ '%s' できませんでした (%m)。"
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "ボーレートを %d にセットできませんでした。"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Kernel ドライバ '%s' を解放できませんでした。"
+
+#: usb/libusb.c:359
+#, fuzzy, c-format
+msgid "Could not close USB port (%s)."
+msgstr "USB ポートを閉じることが出来ませんでした (%m)。"
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr ""
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "'%s' のオープンに失敗しました (%m)。"
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "'%s' を閉じることが出来ませんでした (%m)。"
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, fuzzy, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "'%s' を閉じることが出来ませんでした (%m)。"
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, fuzzy, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "ポートへ書き込めませんでした (%m)"
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, fuzzy, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "'%s' を閉じることが出来ませんでした (%m)。"
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, fuzzy, c-format
-msgid "Could not open USB device (%s)."
-msgstr "USB デバイスを開くことが出来ませんでした (%m)。"
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "既にカメラは使用中です。"
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Kernel ドライバ '%s' を解放できませんでした。"
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Kernel のデバイス・ドライバを照会できませんでした。"
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, fuzzy, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"インタフェース %d (%m) と断定できませんでした。他のプログラムまたは (接頭子"
-"が %s のような)  Kernel モジュールがこのデバイスを使用していないか確認して、"
-"そのデバイスの読み込み/書き込みをしてみて下さい。"
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr ""
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr ""
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, fuzzy, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "インタフェース %d を解放することが出来ませんでした (%m)。"
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, fuzzy, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "USB ポートをリセットすることが出来ませんでした (%m)。"
-
-#: usb/libusb.c:375
-#, fuzzy, c-format
-msgid "Could not close USB port (%s)."
-msgstr "USB ポートを閉じることが出来ませんでした (%m)。"
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, fuzzy, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "設定 %d/%d を反映することが出来ませんでした (%m)。"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, fuzzy, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "設定 %d/%d を反映することが出来ませんでした (%m)。"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "提供ベンダーまたは製品 ID (0x%x,0x%x) は正しくありません。"
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"USB デバイス (ベンダー:0x%x 製品: 0x%x) が見つかりませんでした。このデバイス"
-"がコンピュータに接続されているか確認して下さい。"
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"USB デバイス (Class: 0x%x, SubClass: 0x%x, プロトコル: 0x%x) が見つかりません"
-"でした。このデバイスがコンピュータに接続されているか確認して下さい。"
-
-#: libusb1/libusb1.c:413
-#, fuzzy
-msgid "Could not detach kernel driver of camera device."
-msgstr "Kernel ドライバ '%s' を解放できませんでした。"
-
-#: libusb1/libusb1.c:531
-#, fuzzy
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Kernel ドライバ '%s' を解放できませんでした。"
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, fuzzy, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "デバイス '%s' は他のプロセス (PID:%d) がロックしています"
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, fuzzy, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "'%s' のオープンに失敗しました (%m)。"
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, fuzzy, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "'%s' のオープンに失敗しました (%m)。"
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr ""
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, fuzzy, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "設定 %d/%d を反映することが出来ませんでした (%m)。"
 
+#, c-format
 #~ msgid "Called for filename '%s'."
 #~ msgstr "ファイル「%s」を呼び出せませんでした。"
 
+#, c-format
 #~ msgid "Could not load '%s': '%s'."
 #~ msgstr "「%s」を読み込むことができません: '%s'。"
 
+#, c-format
 #~ msgid "Could not find some functions in '%s': '%s'."
 #~ msgstr "'%s' のいくつかの機能を見つけることができません: '%s'"
 
+#, c-format
 #~ msgid "'%s' already loaded"
 #~ msgstr "「%s」はすでに読み込まれました"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Could not load port driver list: '%s'."
 #~ msgstr "デバイス '%s' をロックすることが出来ませんでした"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Using ltdl to load io-drivers from '%s'..."
 #~ msgstr "デバイス '%s' をロックすることが出来ませんでした"
 
+#, c-format
 #~ msgid "Counting entries (%i available)..."
 #~ msgstr "エントリの算出中 (%i 件利用可能)..."
 
+#, c-format
 #~ msgid "Starting regex search for '%s'..."
 #~ msgstr "「%s」の正規表現検索を開始しています..."
 
+#, c-format
 #~ msgid "Trying '%s'..."
 #~ msgstr "「%s」を試しています..."
 
+#, c-format
 #~ msgid "Looking up entry '%s'..."
 #~ msgstr "エントリ「%s」を検索しています..."
 
 #~ msgid "Creating new device..."
 #~ msgstr "新しいデバイスを作成しています..."
 
+#, c-format
 #~ msgid "Could not load '%s' ('%s')."
 #~ msgstr "'%s' ('%s')を読み込むことができませんでした。"
 
+#, c-format
 #~ msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
 #~ msgstr ""
 #~ "'%s' ('%s') で 'gp_port_library_operations' を見つけることができません"
@@ -432,35 +450,42 @@
 #~ msgid "Freeing port..."
 #~ msgstr "ポートを開放しています..."
 
+#, c-format
 #~ msgid "Setting timeout to %i millisecond(s)..."
 #~ msgstr "タイムアウトを %i ミリ秒に設定しています..."
 
 #~ msgid "Getting timeout..."
 #~ msgstr "タイムアウトを取得しています..."
 
+#, c-format
 #~ msgid "Current timeout: %i milliseconds"
 #~ msgstr "現在のタイムアウト: %i ミリ秒"
 
 #~ msgid "Setting settings..."
 #~ msgstr "設定のセッティングをしています..."
 
+#, c-format
 #~ msgid "Getting level of pin %i..."
 #~ msgstr "ピン %i のレベルを取得しています..."
 
+#, c-format
 #~ msgid "Level of pin %i: %i"
 #~ msgstr "ピン %i のレベル: %i"
 
+#, c-format
 #~ msgid "Setting pin %i (%s: '%s') to '%s'..."
 #~ msgstr "ピン %i (%s: 「%s」) を「%s」に設定しています..."
 
 #~ msgid "Flushing port..."
 #~ msgstr "ポートをフラッシュしています..."
 
+#, c-format
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
 #~ "メッセージを書き込んでいます (リクエスト=0x%x 値=0x%x インデックス=0x%x サ"
 #~ "イズ=%i=0x%x)..."
 
+#, c-format
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
 #~ "メッセージを読み込んでいます (リクエスト=0x%x 値=0x%x インデックス=0x%x サ"
@@ -469,9 +494,11 @@
 #~ msgid "msg_read"
 #~ msgstr "msg_read"
 
+#, c-format
 #~ msgid "Device has driver '%s' attached, detaching it now."
 #~ msgstr "ドライバ '%s' がデバイスを使用しています。今すぐ解放します。"
 
+#, c-format
 #~ msgid ""
 #~ "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and "
 #~ "might not function with gphoto2. Reference: %s"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/libgphoto2_port-12.pot -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/libgphoto2_port-12.pot Changed

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lutz Mueller and others
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the libgphoto2_port package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: libgphoto2_port 0.12.2\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,108 +17,108 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr ""
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr ""
 
@@ -134,236 +134,244 @@
 msgid "No error description available"
 msgstr ""
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr ""
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
 #, c-format
-msgid "Could not lock device '%s'"
+msgid "Could not open USB device (%s)."
 msgstr ""
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
-#, c-format
-msgid "Device '%s' is locked by pid %d"
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
 msgstr ""
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
-#, c-format
-msgid "Device '%s' could not be locked (dev_lock returned %d)"
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
 msgstr ""
 
-#: serial/unix.c:265
-#, c-format
-msgid "Device '%s' could not be unlocked."
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
 msgstr ""
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: libusb1/libusb1.c:417 usb/libusb.c:283
 #, c-format
-msgid "Device '%s' could not be unlocked as it is locked by pid %d."
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
 msgstr ""
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr ""
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr ""
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
 #, c-format
-msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
+msgid "Could not release interface %d (%s)."
 msgstr ""
 
-#: serial/unix.c:339
+#: libusb1/libusb1.c:513 usb/libusb.c:329
 #, c-format
-msgid "Serial Port %i"
+msgid "Could not reset USB port (%s)."
 msgstr ""
 
-#: serial/unix.c:352
-msgid "Serial Port Device"
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
 msgstr ""
 
-#: serial/unix.c:434
+#: libusb1/libusb1.c:956 usb/libusb.c:621
 #, c-format
-msgid "Failed to open '%s' (%s)."
+msgid "Could not set config %d/%d (%s)"
 msgstr ""
 
-#: serial/unix.c:454
+#: libusb1/libusb1.c:985 usb/libusb.c:652
 #, c-format
-msgid "Could not close '%s' (%s)."
+msgid "Could not set altsetting from %d to %d (%s)"
 msgstr ""
 
-#: serial/unix.c:510
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
 #, c-format
-msgid "Could not write to port (%s)"
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
 msgstr ""
 
-#: serial/unix.c:587
-msgid "Parity error."
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
 msgstr ""
 
-#: serial/unix.c:591
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
 #, c-format
-msgid "Unexpected parity response sequence 0xff 0x%02x."
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
 msgstr ""
 
-#: serial/unix.c:634
-#, c-format
-msgid "Unknown pin %i."
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
 msgstr ""
 
-#: serial/unix.c:656
-#, c-format
-msgid "Could not get level of pin %i (%s)."
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
 msgstr ""
 
-#: serial/unix.c:692
+#: serial/unix.c:209
 #, c-format
-msgid "Could not set level of pin %i to %i (%s)."
+msgid "Could not lock device '%s'"
 msgstr ""
 
-#: serial/unix.c:719
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
-msgid "Could not flush '%s' (%s)."
+msgid "Device '%s' is locked by pid %d"
 msgstr ""
 
-#: serial/unix.c:831
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
-msgid "Could not set the baudrate to %d"
+msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr ""
 
-#: usbdiskdirect/linux.c:234
-msgid "USB Mass Storage direct IO"
+#: serial/unix.c:251
+#, c-format
+msgid "Device '%s' could not be unlocked."
 msgstr ""
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
-msgid "Failed to open '%s' (%m)."
+msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
-msgid "Could not close '%s' (%m)."
+msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 
-#: usbdiskdirect/linux.c:323
+#: serial/unix.c:313
 #, c-format
-msgid "Could not seek to offset: %x on '%s' (%m)."
+msgid "Serial Port %i"
 msgstr ""
 
-#: usbdiskdirect/linux.c:345
+#: serial/unix.c:326
+msgid "Serial Port Device"
+msgstr ""
+
+#: serial/unix.c:401
 #, c-format
-msgid "Could not write to '%s' (%m)."
+msgid "Failed to open '%s' (%s)."
 msgstr ""
 
-#: usbdiskdirect/linux.c:366
+#: serial/unix.c:421
 #, c-format
-msgid "Could not read from '%s' (%m)."
+msgid "Could not close '%s' (%s)."
 msgstr ""
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
+#: serial/unix.c:477
 #, c-format
-msgid "Could not open USB device (%s)."
+msgid "Could not write to port (%s)"
 msgstr ""
 
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
+#: serial/unix.c:552
+msgid "Parity error."
 msgstr ""
 
-#: usb/libusb.c:285
+#: serial/unix.c:556
 #, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
+msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr ""
 
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
+#: serial/unix.c:599
+#, c-format
+msgid "Unknown pin %i."
 msgstr ""
 
-#: usb/libusb.c:299 libusb1/libusb1.c:426
+#: serial/unix.c:621
 #, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
+msgid "Could not get level of pin %i (%s)."
 msgstr ""
 
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
+#: serial/unix.c:657
+#, c-format
+msgid "Could not set level of pin %i to %i (%s)."
 msgstr ""
 
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
+#: serial/unix.c:684
+#, c-format
+msgid "Could not flush '%s' (%s)."
 msgstr ""
 
-#: usb/libusb.c:330 libusb1/libusb1.c:508
+#: serial/unix.c:778
 #, c-format
-msgid "Could not release interface %d (%s)."
+msgid "Could not set the baudrate to %d"
 msgstr ""
 
-#: usb/libusb.c:345 libusb1/libusb1.c:522
+#: usb/libusb.c:269
 #, c-format
-msgid "Could not reset USB port (%s)."
+msgid "Could not detach kernel driver '%s' of camera device."
 msgstr ""
 
-#: usb/libusb.c:375
+#: usb/libusb.c:359
 #, c-format
 msgid "Could not close USB port (%s)."
 msgstr ""
 
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
+#: usbdiskdirect/linux.c:218
+msgid "USB Mass Storage direct IO"
 msgstr ""
 
-#: usb/libusb.c:668 libusb1/libusb1.c:994
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
+msgid "Failed to open '%s' (%m)."
 msgstr ""
 
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgid "Could not close '%s' (%m)."
 msgstr ""
 
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
+#: usbdiskdirect/linux.c:307
 #, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
+msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr ""
 
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
+#: usbdiskdirect/linux.c:329
 #, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
+msgid "Could not write to '%s' (%m)."
 msgstr ""
 
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
+#: usbdiskdirect/linux.c:350
+#, c-format
+msgid "Could not read from '%s' (%m)."
 msgstr ""
 
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr ""
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr ""
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr ""
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr ""
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr ""

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/nl.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/nl.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/nl.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/nl.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port-2.5.10\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2016-09-05 11:35+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -21,108 +21,108 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Algemene poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Geen fout"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Ongespecificeerde fout"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Invoer-/uitvoerprobleem"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Ongeldige parameters"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Niet-ondersteunde actie"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Vaste limiet is overschreden"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Tijdsoverschrijding tijdens lezen van of schrijven naar de poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Seriële poort wordt niet ondersteund"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB-poort wordt niet ondersteund"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Onbekende poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Fout bij het laden van een bibliotheek"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Fout bij het initialiseren van de poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Fout bij het lezen van de poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Fout bij het schrijven naar de poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Fout tijdens het bijwerken van de poortinstellingen"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Fout tijdens het instellen van de poortsnelheid"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Fout tijdens het wissen van de 'halt'-toestand op de USB-poort"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Kan op de USB-poort het gevraagde apparaat niet vinden"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Kan het USB-apparaat niet claimen"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Kan het apparaat niet vergrendelen"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "'libhal'-fout"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Actie '%s' wordt niet ondersteund door dit apparaat"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "De poort is nog niet geïnitialiseerd"
 
@@ -138,247 +138,255 @@
 msgid "No error description available"
 msgstr "Geen foutbeschrijving beschikbaar"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Media '%s'"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Kan USB-apparaat niet openen (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Camera is reeds in gebruik."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Kan het kernelstuurprogramma van het camera-apparaat niet onthechten."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Kan het kernelstuurprogramma van het apparaat niet ondervragen."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Kan interface %d niet claimen (%s).  Zorg ervoor dat geen ander programma "
+"(%s) of kernelmodule (zoals %s) het apparaat gebruikt en dat u lees- en "
+"schrijfrechten voor dit apparaat hebt."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTP-camera-service"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "onbekende 'libgphoto2' gebruikt programma"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Kan interface %d niet vrijgeven (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Kan USB-poort niet resetten (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr ""
+"Kan het kernelstuurprogramma van het camera-apparaat niet opnieuw aanhechten."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Kan configuratie %d/%d niet instellen (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Kan 'alt'-instelling niet wijzigen van %d naar %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Kan USB-apparaat (leverancier 0x%x, product 0x%x) niet vinden.  Zorg ervoor "
+"dat het apparaat aan de computer aangesloten is."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Het opgegeven leveranciers- of product-ID (0x%x,0x%x) is ongeldig."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Kan USB-apparaat (klasse 0x%x, subklasse 0x%x, protocol 0x%x) niet vinden.  "
+"Zorg ervoor dat het apparaat aan de computer aangesloten is."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Kan apparaat '%s' niet vergrendelen"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Apparaat '%s' is vergrendeld door PID %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Apparaat '%s' kan niet worden vergrendeld (dev_lock gaf %d terug)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Apparaat '%s' kan niet worden ontgrendeld."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Apparaat '%s' kan niet worden ontgrendeld aangezien het vergrendeld is door "
 "PID %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Apparaat '%s' kan niet worden ontgrendeld (dev_unlock gaf %d terug)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Seriële poort %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Seriëlepoortapparaat"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Kan '%s' niet openen (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Kan '%s' niet sluiten (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Kan niet naar poort schrijven (%s)."
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Pariteitsfout."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Onverwachte pariteitsantwoordvolgorde  0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Onbekende pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Kan het niveau van pin %i niet bepalen (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Kan het niveau van pin %i niet op %i instellen (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Kan '%s' niet leegmaken (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Kan de baudrate niet instellen op %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr ""
+"Kan het kernelstuurprogramma '%s' van het camera-apparaat niet onthechten."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Kan USB-poort niet sluiten (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB-massaopslag, directe invoer/uitvoer"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Kan '%s' niet openen (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Kan '%s' niet sluiten (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Kan niet springen naar positie %x in '%s' (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Kan niet naar '%s' schrijven (%m)"
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Kan niet uit '%s' lezen (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Kan USB-apparaat niet openen (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Camera is reeds in gebruik."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr ""
-"Kan het kernelstuurprogramma '%s' van het camera-apparaat niet onthechten."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Kan het kernelstuurprogramma van het apparaat niet ondervragen."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Kan interface %d niet claimen (%s).  Zorg ervoor dat geen ander programma "
-"(%s) of kernelmodule (zoals %s) het apparaat gebruikt en dat u lees- en "
-"schrijfrechten voor dit apparaat hebt."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTP-camera-service"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "onbekende 'libgphoto2' gebruikt programma"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Kan interface %d niet vrijgeven (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Kan USB-poort niet resetten (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Kan USB-poort niet sluiten (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Kan configuratie %d/%d niet instellen (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Kan 'alt'-instelling niet wijzigen van %d naar %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Het opgegeven leveranciers- of product-ID (0x%x,0x%x) is ongeldig."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Kan USB-apparaat (leverancier 0x%x, product 0x%x) niet vinden.  Zorg ervoor "
-"dat het apparaat aan de computer aangesloten is."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Kan USB-apparaat (klasse 0x%x, subklasse 0x%x, protocol 0x%x) niet vinden.  "
-"Zorg ervoor dat het apparaat aan de computer aangesloten is."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Kan het kernelstuurprogramma van het camera-apparaat niet onthechten."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr ""
-"Kan het kernelstuurprogramma van het camera-apparaat niet opnieuw aanhechten."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Apparaat '%s' is vergrendeld door een ander programma."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Kan '%s' niet vergrendelen (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Kan '%s' niet ontgrendelen (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB-massaopslag, rauwe SCSI-toegang"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Kan SCSI-commando niet verzenden naar '%s' (%m)."
@@ -526,8 +534,8 @@
 
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Schrijven van bericht (verzoek=0x%x waarde=0x%x index=0x%x omvang=%i=0x"
-#~ "%x)..."
+#~ "Schrijven van bericht (verzoek=0x%x waarde=0x%x index=0x%x "
+#~ "omvang=%i=0x%x)..."
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/pl.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/pl.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/pl.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/pl.po Changed

@@ -1,14 +1,14 @@
 # Polish translation for libgphoto2_port.
-# Copyright (C) 2005, 2006, 2007, 2010, 2012, 2013, 2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2010, 2012, 2013, 2014, 2016, 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2016.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2005-2021.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.10\n"
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-03-24 22:19+0100\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-01-04 21:02+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -19,108 +19,108 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Ogólny port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Brak błędu"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Nieokreślony błąd"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problem we/wy"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Złe parametry"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Nieobsługiwana operacja"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Przekroczony ustalony limit"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Przekroczony limit czasu przy odczycie lub zapisie do portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Port szeregowy nie jest obsługiwany"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Port USB nie jest obsługiwany"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Nieznany port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Błąd podczas ładowania biblioteki"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Błąd podczas inicjalizacji portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Błąd podczas odczytu z portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Błąd podczas zapisu do portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Błąd podczas uaktualniania ustawień portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Błąd podczas ustawiania prędkości portu szeregowego"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Błąd podczas zerowania warunku stopu na pocie USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Nie udało się odnaleźć żądanego urządzenia na porcie USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Nie udało się zawłaszczyć urządzenia USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Nie udało się zablokować urządzenia"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "Błąd libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Operacja '%s' nie jest obsługiwana przez to urządzenie"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Port nie został jeszcze zainicjowany"
 
@@ -136,246 +136,254 @@
 msgid "No error description available"
 msgstr "Opis błędu niedostępny"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Nośnik '%s'"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Nie udało się otworzyć urządzenia USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Aparat jest już w użyciu."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Nie udało się odłączyć sterownika jądra od aparatu."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Nie udało się zapytać jądra o sterownik urządzenia."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Nie udało się zawłaszczyć interfejsu %d (%s). Należy upewnić się, czy żaden "
+"inny program (%s) lub moduł jądra (taki jak %s) nie używa tego urządzenia i "
+"mamy prawa odczytu/zapisu do urządzenia."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Usługa MacOS PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "nieznany program korzystający z libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Nie udało się oddać interfejsu %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Nie udało się zresetować portu USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Nie udało się ponownie podłączyć sterownika jądra do aparatu."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Nie udało się ustawić konfiguracji %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Nie udało się przestawić altsetting z %d na %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Nie udało się odnaleźć urządzenia USB (producent 0x%x, produkt 0x%x). Należy "
+"upewnić się, że to urządzenie jest podłączone do komputera."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"Podany identyfikator producenta lub produktu (0x%x,0x%x) nie jest poprawny."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Nie udało się odnaleźć urządzenia USB (klasa 0x%x, podklasa 0x%x, protokół "
+"0x%x). Należy upewnić się, że to urządzenie jest podłączone do komputera)."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "Połączenie PTP/IP"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "Połączenie IP"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Nie udało się zablokować urządzenia '%s'"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Urządzenie '%s' jest zablokowane przez pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Urządzenie '%s' nie może zostać zablokowane (dev_lock zwróciło %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Urządzenie '%s' nie może zostać odblokowane."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Urządzenie '%s' nie może zostać odblokowane, bo jest zablokowane przez pid "
 "%d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Urządzenie '%s' nie może zostać odblokowane (dev_unlock zwróciło %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Port szeregowy %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Urządzenei portu szeregowego"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Nie udało się otworzyć '%s' (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Nie udało się zamknąć '%s' (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Nie udał się zapis do portu (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Błąd parzystości."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Nieoczekiwana sekwencja odpowiedzi parzystości 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Nieznany pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Nie udało się pobrać poziomu pinu %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Nie udało się ustawić poziomu pinu %i na %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Nie udało się opróżnić '%s' (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Nie udało się ustawić liczby bodów na %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Nie udało się odłączyć sterownika jądra '%s' od aparatu."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Nie udało się zamknąć portu USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Bezpośrednie we/wy urządzeń USB Mass Storage"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Nie udało się otworzyć '%s' (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Nie udało się zamknąć '%s' (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Nie udało się zmienić położenia na %x w '%s' (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Nie udał się zapis do '%s' (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Nie udał się odczyt z '%s' (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Nie udało się otworzyć urządzenia USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Aparat jest już w użyciu."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Nie udało się odłączyć sterownika jądra '%s' od aparatu."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Nie udało się zapytać jądra o sterownik urządzenia."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Nie udało się zawłaszczyć interfejsu %d (%s). Należy upewnić się, czy żaden "
-"inny program (%s) lub moduł jądra (taki jak %s) nie używa tego urządzenia i "
-"mamy prawa odczytu/zapisu do urządzenia."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Usługa MacOS PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "nieznany program korzystający z libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Nie udało się oddać interfejsu %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Nie udało się zresetować portu USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Nie udało się zamknąć portu USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Nie udało się ustawić konfiguracji %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Nie udało się przestawić altsetting z %d na %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"Podany identyfikator producenta lub produktu (0x%x,0x%x) nie jest poprawny."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Nie udało się odnaleźć urządzenia USB (producent 0x%x, produkt 0x%x). Należy "
-"upewnić się, że to urządzenie jest podłączone do komputera."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Nie udało się odnaleźć urządzenia USB (klasa 0x%x, podklasa 0x%x, protokół 0x"
-"%x). Należy upewnić się, że to urządzenie jest podłączone do komputera)."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Nie udało się odłączyć sterownika jądra od aparatu."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Nie udało się ponownie podłączyć sterownika jądra do aparatu."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Urządzenie '%s' jest zablokowane przez inną aplikację."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Nie udało się zablokować '%s' (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Nie udało się odblokować '%s' (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Bezpośrednie operacje SCSI urządzeń USB Mass Storage"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Nie udało się wysłać polecenia SCSI do '%s' (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/pt_BR.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/pt_BR.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/pt_BR.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/pt_BR.po Changed

@@ -1,15 +1,15 @@
 # Brazilian Portuguese translation of libgphoto2.
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
 # Evandro Gardenali <evandro@fasternet.com.br>, 2002.
-# Fabrício Godoy <skarllot@gmail.com>, 2010, 2016.
+# Fabrício Godoy <skarllot@gmail.com>, 2010, 2016, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.10\n"
+"Project-Id-Version: libgphoto2_port 2.5.23\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-05-06 18:36-0300\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2019-12-24 20:20-0300\n"
 "Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
 "net>\n"
@@ -20,108 +20,108 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Porta genérica"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Sem erro"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Erro não especificado"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Problema de E/S"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Parâmetros incorretos"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Operação sem suporte"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "O limite definido foi excedido"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Tempo esgotado ao ler ou gravar da/para a porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Porta serial sem suporte"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Porta USB sem suporte"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Porta desconhecida"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Memória cheia"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Erro ao carregar uma biblioteca"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Erro ao inicializar a porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Erro ao ler da porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Erro ao escrever na porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Erro ao atualizar as configurações da porta"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Erro ao ajustar a velocidade da porta serial"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Erro ao apagar uma condição de desligamento na porta USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Não foi possível localizar o dispositivo especificado na porta USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Não foi possível contactar o dispositivo USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Não foi possível travar o dispositivo"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "erro no libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Não há suporte a operação \"%s\" por esse dispositivo"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "A porta ainda não foi inicializada"
 
@@ -137,248 +137,256 @@
 msgid "No error description available"
 msgstr "Descrição do erro não disponível"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Mídia \"%s\""
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Não foi possível abrir o dispositivo USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "A câmera já está em uso."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr ""
+"Não foi possível desanexar o driver de kernel do dispositivo de câmera."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Não foi possível examinar o driver de kernel do dispositivo."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Não foi possível chamar a interface %d (%s). Tenha certeza de que nenhum "
+"outro programa (%s) ou módulo do kernel (como %s) está usando o dispositivo, "
+"e que você tem acesso de leitura e escrita para o dispositivo."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Serviço PTPCamera MacOS"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "O programa está usando uma libgphoto2 desconhecida"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Não foi possível liberar a interface %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Não foi possível reiniciar a porta USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Não foi possível reanexar o driver de kernel do dispositivo de câmera."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Não foi possível definir a configuração %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Não foi possível definir a configuração alternativa de %d para %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Não foi possível localizar o dispositivo USB (fabricante 0x%x, produto "
+"0x%x). Tenha certeza de que esse dispositivo está conectado ao computador."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "O fabricante ou o ID do produto (0x%x,0x%x) não é válido."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Não foi possível localizar o dispositivo USB (classe 0x%x, subclasse 0x%x, "
+"protocolo 0x%x). Tenha certeza de que esse dispositivo está conectado ao "
+"computador."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Não foi possível travar o dispositivo \"%s\""
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "O dispositivo \"%s\" está travado pelo PID %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "O dispositivo \"%s\" não pôde ser travado (dev_lock retornou %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "O dispositivo \"%s\" não pôde ser destravado."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "O dispositivo \"%s\" não pôde ser destravado pois está travado pelo PID %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "O dispositivo \"%s\" não pôde ser destravado (dev_unlock retornou %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Porta serial %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Dispositivo de porta serial"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Falha ao abrir \"%s\" (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Não foi possível fechar \"%s\" (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Não foi possível gravar na porta (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Erro de paridade."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Sequência de resposta de paridade inesperada 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Pino desconhecido %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Não foi possível obter o nível do pino %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Não foi possível ajustar o nível do pino %i para %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Não foi possível descarregar \"%s\" (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Não foi possível ajustar a taxa de baud para %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr ""
+"Não foi possível desanexar o driver de kernel \"%s\" do dispositivo de "
+"câmera."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Não foi possível fechar a porta USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "E/S direta para armazenamento em massa USB"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Falhou ao abrir \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Não foi possível fechar \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Não foi possível buscar até a posição %x em \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Não foi possível escrever para \"%s\" (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Não foi possível ler de \"%s\" (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Não foi possível abrir o dispositivo USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "A câmera já está em uso."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr ""
-"Não foi possível desanexar o driver de kernel \"%s\" do dispositivo de "
-"câmera."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Não foi possível examinar o driver de kernel do dispositivo."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Não foi possível chamar a interface %d (%s). Tenha certeza de que nenhum "
-"outro programa (%s) ou módulo do kernel (como %s) está usando o dispositivo, "
-"e que você tem acesso de leitura e escrita para o dispositivo."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Serviço PTPCamera MacOS"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "O programa está usando uma libgphoto2 desconhecida"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Não foi possível liberar a interface %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Não foi possível reiniciar a porta USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Não foi possível fechar a porta USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Não foi possível definir a configuração %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Não foi possível definir a configuração alternativa de %d para %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "O fabricante ou o ID do produto (0x%x,0x%x) não é válido."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Não foi possível localizar o dispositivo USB (fabricante 0x%x, produto 0x"
-"%x). Tenha certeza de que esse dispositivo está conectado ao computador."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Não foi possível localizar o dispositivo USB (classe 0x%x, subclasse 0x%x, "
-"protocolo 0x%x). Tenha certeza de que esse dispositivo está conectado ao "
-"computador."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr ""
-"Não foi possível desanexar o driver de kernel do dispositivo de câmera."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Não foi possível reanexar o driver de kernel do dispositivo de câmera."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "O dispositivo \"%s\" está bloqueado por outro aplicativo."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Falha ao bloquear \"%s\" (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Falha ao desbloquear \"%s\" (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Armazenamento em massa USB bruto SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Não foi possível enviar um comando SCSI para \"%s\" (%m)."
@@ -442,8 +450,8 @@
 
 #~ msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
 #~ msgstr ""
-#~ "Não foi possível localizar \"gp_port_library_operations\" em \"%s\" (\"%s"
-#~ "\")"
+#~ "Não foi possível localizar \"gp_port_library_operations\" em "
+#~ "\"%s\" (\"%s\")"
 
 #~ msgid "Opening %s port..."
 #~ msgstr "Abrindo a porta %s..."
@@ -504,8 +512,8 @@
 
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Escrevendo mensagem (requisição=0x%x valor=0x%x índice=0x%x tamanho=%i=0x"
-#~ "%x)..."
+#~ "Escrevendo mensagem (requisição=0x%x valor=0x%x índice=0x%x "
+#~ "tamanho=%i=0x%x)..."
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ro.gmo Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ro.po Added

@@ -0,0 +1,406 @@
+# Traducerea mesajelor din libgphoto2_port, în limba română.
+# This file is distributed under the same license as the libgphoto2 package.
+#
+# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
+"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-01-07 15:44+0100\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
+"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Lokalize 21.12.0\n"
+
+#: libgphoto2_port/gphoto2-port-info-list.c:449
+msgid "Generic Port"
+msgstr "Port generic"
+
+#: libgphoto2_port/gphoto2-port-result.c:42
+msgid "No error"
+msgstr "Fără erori"
+
+#: libgphoto2_port/gphoto2-port-result.c:44
+msgid "Unspecified error"
+msgstr "Eroare nespecificată"
+
+#: libgphoto2_port/gphoto2-port-result.c:46
+msgid "I/O problem"
+msgstr "Problemă de In/Ieș(I/O)"
+
+#: libgphoto2_port/gphoto2-port-result.c:48
+msgid "Bad parameters"
+msgstr "Parametri greșiți"
+
+#: libgphoto2_port/gphoto2-port-result.c:50
+msgid "Unsupported operation"
+msgstr "Operație neacceptată"
+
+#: libgphoto2_port/gphoto2-port-result.c:52
+msgid "Fixed limit exceeded"
+msgstr "Limita stabilită a fost depășită"
+
+#: libgphoto2_port/gphoto2-port-result.c:54
+msgid "Timeout reading from or writing to the port"
+msgstr "S-a depășit limita de timp pentru citirea sau scrierea în port"
+
+#: libgphoto2_port/gphoto2-port-result.c:56
+msgid "Serial port not supported"
+msgstr "Portul serial nu este acceptat"
+
+#: libgphoto2_port/gphoto2-port-result.c:58
+msgid "USB port not supported"
+msgstr "Portul USB nu este acceptat"
+
+#: libgphoto2_port/gphoto2-port-result.c:60
+msgid "Unknown port"
+msgstr "Port necunoscut"
+
+#: libgphoto2_port/gphoto2-port-result.c:62
+msgid "Out of memory"
+msgstr "Fără memorie"
+
+#: libgphoto2_port/gphoto2-port-result.c:64
+msgid "Error loading a library"
+msgstr "Eroare la încărcarea unei biblioteci"
+
+#: libgphoto2_port/gphoto2-port-result.c:66
+msgid "Error initializing the port"
+msgstr "Eroare la inițializarea portului"
+
+# Notă: Ar fi mai corect tradus mesajul, ca:
+# „Eroare la citirea portului”?
+#: libgphoto2_port/gphoto2-port-result.c:68
+msgid "Error reading from the port"
+msgstr "Eroare la citirea din port"
+
+#: libgphoto2_port/gphoto2-port-result.c:70
+msgid "Error writing to the port"
+msgstr "Eroare la scrierea în port"
+
+#: libgphoto2_port/gphoto2-port-result.c:72
+msgid "Error updating the port settings"
+msgstr "Eroare la actualizarea configurării portului"
+
+#: libgphoto2_port/gphoto2-port-result.c:74
+msgid "Error setting the serial port speed"
+msgstr "Eroare la configurarea vitezei portului serial"
+
+#: libgphoto2_port/gphoto2-port-result.c:76
+msgid "Error clearing a halt condition on the USB port"
+msgstr "Eroare la ștergerea unei condiții de oprire a portului USB"
+
+#: libgphoto2_port/gphoto2-port-result.c:78
+msgid "Could not find the requested device on the USB port"
+msgstr "Nu s-a putut găsi dispozitivul solicitat, în portul USB"
+
+#: libgphoto2_port/gphoto2-port-result.c:80
+msgid "Could not claim the USB device"
+msgstr "Nu s-a putut obține comunicarea cu dispozitivul USB"
+
+#: libgphoto2_port/gphoto2-port-result.c:82
+msgid "Could not lock the device"
+msgstr "Nu s-a putut bloca dispozitivul"
+
+#: libgphoto2_port/gphoto2-port-result.c:84
+msgid "libhal error"
+msgstr "eroare în «libhal»"
+
+#: libgphoto2_port/gphoto2-port-result.c:86
+msgid "Unknown error"
+msgstr "Eroare necunoscută"
+
+#: libgphoto2_port/gphoto2-port.c:47
+#, c-format
+msgid "The operation '%s' is not supported by this device"
+msgstr "Operația „%s” nu este acceptată de acest dispozitiv"
+
+#: libgphoto2_port/gphoto2-port.c:48
+msgid "The port has not yet been initialized"
+msgstr "Portul nu a fost încă inițializat"
+
+#: libgphoto2_port/gphoto2-port.c:686
+msgid "low"
+msgstr "redus"
+
+#: libgphoto2_port/gphoto2-port.c:687
+msgid "high"
+msgstr "ridicat"
+
+#: libgphoto2_port/gphoto2-port.c:1215
+msgid "No error description available"
+msgstr "Nu este disponibilă nicio descriere a erorii"
+
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
+#, c-format
+msgid "Media '%s'"
+msgstr "Media „%s”"
+
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Nu s-a putut deschide dispozitivul USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Camera este deja în uz."
+
+# Notă:
+# mi-ar plăcea să traduc „împuțitul de driver” ca controlator,
+# controlator de/al dispozivtivului
+# adevărul este că sunt mai mult decît sătul, să găsesc acest
+# englezism, în textele românești;
+# dar, normal, asta e opinia mea...
+# Și a ta?
+# Tu ce zici, Daniel?
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Nu s-a putut detașa driverul din nucleu al dispozitivului «cameră»."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Nu s-a putut apela driverul din nucleu, al dispozitivului."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Nu s-a putut apela interfața %d (%s). Asigurați-vă că niciun alt program "
+"(%s) sau modul kernel (cum ar fi %s) nu utilizează dispozitivul și că aveți "
+"acces de citire/scriere la dispozitiv."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Serviciu MacOS pentru PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "program necunoscut ce utilizează biblioteca „libgphoto2”"
+
+# lansa cu sensul de-a pornii(direct), și de-a afișa(indirect)
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Nu s-a putut lansa interfața %d (%s)."
+
+# Întrebare:
+# este mai potrivit termenul „reiniția”, pentru a traduce «reset»?
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Nu s-a putut repornii portul USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Nu s-a putut reatașa driverul din nucleu, al dispozitivului «cameră»."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Nu s-a putut definii configurația %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Nu s-a putut schimba configurarea alternativă de la %d la %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Nu s-a putut găsi dispozitivul USB (fabricant 0x%x, produs 0x%x). Asigurați-"
+"vă că acest dispozitiv este conectat la calculator."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"id-ul fabricantului sau al produsului furnizat (0x%x,0x%x), nu este valid."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Nu s-a putut găsi dispozitivul USB (clasa 0x%x, subclasa 0x%x, protocol "
+"0x%x). Asigurați-vă că acest dispozitiv este conectat la calculator."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "Conexiune PTP/IP"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "Conexiune IP"
+
+#: serial/unix.c:209
+#, c-format
+msgid "Could not lock device '%s'"
+msgstr "Nu s-a putut bloca dispozitivul „%s”"
+
+# Notă:
+# sunt din ce în ce, mai tentat, de-a traduce «pid», ca:
+# „proces(ul) cu id-ul”; cel puțin în mesaje ca acesta, nu în cele ce apar la utilizarea opțiunii „--help” cu numele software-ului, din
+# cauza lipsei de spațiu...
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
+#, c-format
+msgid "Device '%s' is locked by pid %d"
+msgstr "Dispozitivul „%s” este blocat de pid-ul %d"
+
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
+#, c-format
+msgid "Device '%s' could not be locked (dev_lock returned %d)"
+msgstr "Dispozitivul „%s” nu a putut fi blocat (dev_lock a returnat %d)"
+
+#: serial/unix.c:251
+#, c-format
+msgid "Device '%s' could not be unlocked."
+msgstr "Dispozitivul „%s” nu a putut fi deblocat."
+
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
+#, c-format
+msgid "Device '%s' could not be unlocked as it is locked by pid %d."
+msgstr ""
+"Dispozitivul „%s” nu a putut fi deblocat deoarece este blocat de pid-ul %d."
+
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
+#, c-format
+msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
+msgstr "Dispozitivul „%s” nu a putut fi deblocat (dev_unlock a returnat %d)"
+
+#: serial/unix.c:313
+#, c-format
+msgid "Serial Port %i"
+msgstr "Port serial %i"
+
+#: serial/unix.c:326
+msgid "Serial Port Device"
+msgstr "Dispozitiv cu port serial"
+
+#: serial/unix.c:401
+#, c-format
+msgid "Failed to open '%s' (%s)."
+msgstr "Nu s-a putut deschide „%s” (%s)."
+
+#: serial/unix.c:421
+#, c-format
+msgid "Could not close '%s' (%s)."
+msgstr "Nu s-a putut închide „%s” (%s)."
+
+#: serial/unix.c:477
+#, c-format
+msgid "Could not write to port (%s)"
+msgstr "Nu s-a putut scrie în portul (%s)"
+
+#: serial/unix.c:552
+msgid "Parity error."
+msgstr "Eroare de paritate."
+
+#: serial/unix.c:556
+#, c-format
+msgid "Unexpected parity response sequence 0xff 0x%02x."
+msgstr "Secvență de răspuns de paritate 0xff 0x%02x, neașteptată."
+
+#: serial/unix.c:599
+#, c-format
+msgid "Unknown pin %i."
+msgstr "%i, pin necunoscut."
+
+#: serial/unix.c:621
+#, c-format
+msgid "Could not get level of pin %i (%s)."
+msgstr "Nu s-a putut obține nivelul pinului %i (%s)."
+
+#: serial/unix.c:657
+#, c-format
+msgid "Could not set level of pin %i to %i (%s)."
+msgstr "Nu s-a putut configura nivelul pinului %i la %i (%s)."
+
+#: serial/unix.c:684
+#, c-format
+msgid "Could not flush '%s' (%s)."
+msgstr "Nu s-a putut goli „%s” (%s)."
+
+#: serial/unix.c:778
+#, c-format
+msgid "Could not set the baudrate to %d"
+msgstr "Nu s-a putut configura viteza de transmitere a %d"
+
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr ""
+"Nu s-a putut detașa driverul din nucleu „%s”, al dispozitivului camerei."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Nu s-a putut închide portul USB (%s)."
+
+#: usbdiskdirect/linux.c:218
+msgid "USB Mass Storage direct IO"
+msgstr "In/Ieș(I/O) directă, pentru stocarea în masă USB"
+
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
+#, c-format
+msgid "Failed to open '%s' (%m)."
+msgstr "Nu s-a putut deschide „%s” (%m)."
+
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
+#, c-format
+msgid "Could not close '%s' (%m)."
+msgstr "Nu s-a putut închide „%s” (%m)."
+
+#: usbdiskdirect/linux.c:307
+#, c-format
+msgid "Could not seek to offset: %x on '%s' (%m)."
+msgstr "Nu s-a putut continua deplasarea: %x pe „%s” (%m)."
+
+#: usbdiskdirect/linux.c:329
+#, c-format
+msgid "Could not write to '%s' (%m)."
+msgstr "Nu s-a putut scrie în „%s” (%m)."
+
+#: usbdiskdirect/linux.c:350
+#, c-format
+msgid "Could not read from '%s' (%m)."
+msgstr "Nu s-a putut citi din „%s” (%m)."
+
+#: usbscsi/linux.c:92
+#, c-format
+msgid "Device '%s' is locked by another app."
+msgstr "Dispozitivul „%s” este blocat de o altă aplicație."
+
+#: usbscsi/linux.c:97
+#, c-format
+msgid "Failed to lock '%s' (%m)."
+msgstr "Nu s-a putut bloca „%s” (%m)."
+
+#: usbscsi/linux.c:113
+#, c-format
+msgid "Failed to unlock '%s' (%m)."
+msgstr "Nu s-a putut debloca „%s” (%m)."
+
+#: usbscsi/linux.c:214
+msgid "USB Mass Storage raw SCSI"
+msgstr "SCSI brut, pentru stocarea în masă USB"
+
+#: usbscsi/linux.c:325
+#, c-format
+msgid "Could not send scsi command to: '%s' (%m)."
+msgstr "Nu s-a putut trimite comanda scsi la: „%s” (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/ru.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ru.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/ru.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/ru.po Changed

@@ -4,13 +4,13 @@
 #
 # Valek Filippov <frob@df.ru>, 2005.
 # Вячеслав Диконов (Vyacheslav Dikonov) <slava@altlinux.ru>, 2005.
-# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2012, 2013, 2014, 2016.
+# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2012, 2013, 2014, 2016, 2022.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.10\n"
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-03-25 18:26+0300\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-01-21 17:41+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@d07.ru>\n"
 "Language: ru\n"
@@ -18,112 +18,112 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 20.12.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Обычный порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Ошибок нет"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Неуказанная ошибка"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Проблема ввода/вывода"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Неверные аргументы"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Неподдерживаемое действие"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Превышен фиксированный предел"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Истекло время ожидания ответа при чтении или записи данных в порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Нет поддержки последовательного порта"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Нет поддержки порта USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Неизвестный порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Ошибка загрузки библиотеки функций"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Ошибка инициализации порта"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Ошибка чтения из порта"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Ошибка записи в порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Ошибка обновления настроек порта"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Ошибка установки скорости передачи через последовательный порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Ошибка устранения halt-условия на порту USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Не найдено запрошенное устройство на порту USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Невозможно получить контроль над устройством USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Невозможно заблокировать устройство"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "ошибка libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Действие «%s» не поддерживается этим устройством"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Порт ещё не был инициализирован"
 
@@ -139,249 +139,257 @@
 msgid "No error description available"
 msgstr "Описание ошибки недоступно"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Носитель «%s»"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Невозможно открыть USB-устройство (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Фотоаппарат уже занят."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Невозможно отключить драйвер ядра устройства фотоаппарата."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Невозможно опросить драйвер ядра для устройства."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Невозможно захватить интерфейс %d (%s). Убедитесь, что устройство не занято "
+"другой программой (%s) или модулем ядра (таким как %s), и что у вас есть "
+"право на чтение/запись устройства."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Служба MacOS PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "неизвестная программа, использующая libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Невозможно освободить интерфейс %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Невозможно вернуть в исходное состояние порт USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Невозможно отключить драйвер ядра устройства фотоаппарата."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Невозможно изменить конфигурацию %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Невозможно установить альтернативную конфигурацию из %d в %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Не найдено устройство USB (производитель 0x%x, продукт 0x%x). Убедитесь, что "
+"устройство подключено к компьютеру."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Неверный идентификатор производителя или продукта (0x%x,0x%x)."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Не найдено устройство USB (класс 0x%x, подкласс 0x%x, протокол 0x%x). "
+"Убедитесь, что устройство подключено к компьютеру."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "Подключение по PTP/IP"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "Подключение по IP"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Невозможно заблокировать устройство «%s»"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Устройство «%s» заблокировано процессом с pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr ""
 "Устройство «%s» невозможно заблокировать (функция dev_lock вернула значение "
 "%d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Устройство «%s» невозможно разблокировать."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Устройство «%s» невозможно разблокировать, так как оно заблокировано "
 "процессом с pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "Устройство «%s» невозможно разблокировать (функция dev_unlock вернула "
 "значение %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Последовательный порт %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Устройство последовательного порта"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Не удалось открыть «%s» (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Не удалось закрыть «%s» (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Не удалось записать в порт (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Ошибка чётности."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Неверная последовательность контроля чётности — 0xff 0x%02x"
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Неизвестный pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Невозможно получить уровень pin %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Невозможно установить уровень pin %i в %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Невозможно сбросить буферы устройства «%s» (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Невозможно установить скорость %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Невозможно отключить драйвер ядра «%s» для устройства фотоаппарата."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Невозможно закрыть порт USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Прямой ввод-вывод USB Mass Storage"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Не удалось открыть «%s» (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Не удалось закрыть «%s» (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Не удалось перейти к смещению: %x на «%s» (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Не удалось записать в «%s» (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Не удалось прочитать «%s» (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Невозможно открыть USB-устройство (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Фотоаппарат уже занят."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Невозможно отключить драйвер ядра «%s» для устройства фотоаппарата."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Невозможно опросить драйвер ядра для устройства."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Невозможно захватить интерфейс %d (%s). Убедитесь, что устройство не занято "
-"другой программой (%s) или модулем ядра (таким как %s), и что у вас есть "
-"право на чтение/запись устройства."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Служба MacOS PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "неизвестная программа, использующая libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Невозможно освободить интерфейс %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Невозможно вернуть в исходное состояние порт USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Невозможно закрыть порт USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Невозможно изменить конфигурацию %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Невозможно установить альтернативную конфигурацию из %d в %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Неверный идентификатор производителя или продукта (0x%x,0x%x)."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Не найдено устройство USB (производитель 0x%x, продукт 0x%x). Убедитесь, что "
-"устройство подключено к компьютеру."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Не найдено устройство USB (класс 0x%x, подкласс 0x%x, протокол 0x%x). "
-"Убедитесь, что устройство подключено к компьютеру."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Невозможно отключить драйвер ядра устройства фотоаппарата."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Невозможно отключить драйвер ядра устройства фотоаппарата."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Устройство «%s» заблокировано другим приложением."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Не удалось заблокировать «%s» (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Не удалось разблокировать «%s» (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB Mass Storage raw SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Не удалось послать команду scsi: «%s» (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sk.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sk.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sk.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sk.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.0\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2012-07-31 00:34+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,109 +18,109 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Všeobecný port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Žiadna chyba"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Neurčená chyba"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "V/V problém"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Chybné parametre"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operácia"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Pevný limit bol prekročený"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr ""
 "Vyhradený časový interval vypšal počas čítania alebo zapisovania do portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Sériový port nie je podporovaný"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB port nie je podporovaný"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Neznámy port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Nedostatok pamäte"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Chyba pri načítavaná knižnice"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Chyba pri inicializácii portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Chyba pri čítaní z portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Chyba pri zapisovaní do portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Chyba pri aktualizácii nastavení portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Chyba pri nastavovaní rýchlosti sériového portu"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Chyba pri rušení stavu blokovania portu USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Nebolo možné nájsť požadované zariadenie na porte USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Nebolo možné prevziať kontrolu nad USB zariadením"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Nebolo možné zamknúť zariadenie"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "chyba libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Toto zariadenie nepodporuje operáciu „%s“"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Port zatiaľ nebol inicializovaný"
 
@@ -136,306 +136,329 @@
 msgid "No error description available"
 msgstr "Nie je dostupný popis chyby"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Nosič „%s“"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Nebolo možné otvoriť zariadenie USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kamera sa už používa."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Nepodarilo sa spojiť s ovládačom zariadenia v jadre."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, fuzzy, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Nepodarilo sa prevziať kontrolu nad rozhraním %d (%s). Uistite sa, že žiadny "
+"iný program alebo modul jadra (ako %s) nepoužíva zariadenie a že k "
+"zariadeniu máte prístup na čítanie aj zápis."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr ""
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr ""
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Nebolo možné uvoľniť rozhranie %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Nebolo možné reštartovať port USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Nebolo možné nastaviť konfiguráciu %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Nebolo možné nastaviť alternatívne nastavenie z %d na %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Nebolo možné nájsť USB zariadenie (dodávateľ 0x%x, produkt 0x%x). Uistite "
+"sa, že je toto zariadenie pripojené k počítaču."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Zadaný ID dodávateľa alebo produktu (0x%x,0x%x) nie je platný."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Nebolo možné nájsť USB zariadenie (trieda 0x%x, podtrieda 0x%x, protocol "
+"0x%x). Uistite sa, že je toto zariadenie pripojené k počítaču."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Nebolo možné zamknúť zariadenie „%s“"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Zariadenie „%s“ zamkol proces s PID %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Zariadenie „%s“ nebolo možné zamknúť (dev_lock returned %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Zariadenie „%s“ nebolo možné odomknúť."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Zariadenie „%s“ nebolo možné odomknúť, pretože ho zamkol proces s PID %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Zariadenie „%s“ nebolo možné odomknúť (dev_unlock vrátil %d)."
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Sériový port %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 #, fuzzy
 msgid "Serial Port Device"
 msgstr "Sériový port %i"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Nebolo možné otvoriť „%s“ (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Nebolo možné zatvoriť „%s“ (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Nebolo možné zapísať do portu (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Chyba parity."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Neočakávaná odpoveď parity 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Neznámy kolík %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Nebolo možné zistiť úroveň kontaktu %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Nebolo možné nastaviť úroveň kontaktu %i na %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "nebolo možné vyčistiť „%s“ (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Nebolo možné nastaviť rýchlosť na %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu „%s“."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Nebolo možné zatvoriť port USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Hromadné úložisko USB priamy V/V"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Nepodarilo sa otvoriť „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Nebolo možné zatvoriť „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Nebolo možné presunúť sa na pozíciu %x v „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Nebolo možné zapísať do „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Nebolo možné čítať z „%s“ (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Nebolo možné otvoriť zariadenie USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kamera sa už používa."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu „%s“."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Nepodarilo sa spojiť s ovládačom zariadenia v jadre."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, fuzzy, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Nepodarilo sa prevziať kontrolu nad rozhraním %d (%s). Uistite sa, že žiadny "
-"iný program alebo modul jadra (ako %s) nepoužíva zariadenie a že k "
-"zariadeniu máte prístup na čítanie aj zápis."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr ""
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr ""
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Nebolo možné uvoľniť rozhranie %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Nebolo možné reštartovať port USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Nebolo možné zatvoriť port USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Nebolo možné nastaviť konfiguráciu %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Nebolo možné nastaviť alternatívne nastavenie z %d na %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Zadaný ID dodávateľa alebo produktu (0x%x,0x%x) nie je platný."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Nebolo možné nájsť USB zariadenie (dodávateľ 0x%x, produkt 0x%x). Uistite "
-"sa, že je toto zariadenie pripojené k počítaču."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Nebolo možné nájsť USB zariadenie (trieda 0x%x, podtrieda 0x%x, protocol 0x"
-"%x). Uistite sa, že je toto zariadenie pripojené k počítaču."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Nebolo možné odpojiť ovládač zariadenia fotoaparátu."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, fuzzy, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Zariadenie „%s“ zamkol proces s PID %d"
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, fuzzy, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Nepodarilo sa otvoriť „%s“ (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, fuzzy, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Nepodarilo sa otvoriť „%s“ (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Hromadné úložisko USB pomocou SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Nebolo možné poslať príkaz SCSI pre „%s“ (%m)."
 
+#, c-format
 #~ msgid "Called for filename '%s'."
 #~ msgstr "Bol požadovaný názov súboru „%s“."
 
+#, c-format
 #~ msgid "Could not load '%s': '%s'."
 #~ msgstr "Nebolo možné načítať „%s“: „%s“."
 
+#, c-format
 #~ msgid "Could not find some functions in '%s': '%s'."
 #~ msgstr "Nebolo možné nájsť niektoré funkcie v „%s“: „%s“."
 
+#, c-format
 #~ msgid "'%s' already loaded"
 #~ msgstr "„%s“ je už načítané"
 
+#, c-format
 #~ msgid "Could not load port driver list: '%s'."
 #~ msgstr "Nebolo možné načítať zoznam ovládačov portov: „%s“."
 
+#, c-format
 #~ msgid "Loaded '%s' ('%s') from '%s'."
 #~ msgstr "Bol načítaný „%s“ („%s“) z „%s“."
 
+#, c-format
 #~ msgid "Using ltdl to load io-drivers from '%s'..."
 #~ msgstr "Na načítanie io-drivers „%s“ sa používa ltdl..."
 
+#, c-format
 #~ msgid "Counting entries (%i available)..."
 #~ msgid_plural "Counting entries (%i available)..."
 #~ msgstr0 "Počítajú sa položky (%i dostupná)..."
 #~ msgstr1 "Počítajú sa položky (%i dostupné)..."
 #~ msgstr2 "Počítajú sa položky (%i dostupných)..."
 
+#, c-format
 #~ msgid "%i regular entry available."
 #~ msgid_plural "%i regular entries available."
 #~ msgstr0 "%i dostupná obyčajná položka."
 #~ msgstr1 "%i dostupné obyčajné položky."
 #~ msgstr2 "%i dostupných obyčajných položiek."
 
+#, c-format
 #~ msgid "Looking for path '%s' (%i entry available)..."
 #~ msgid_plural "Looking for path '%s' (%i entries available)..."
 #~ msgstr0 "Hľadá sa cesta „%s“ (%i dostupná položka)..."
 #~ msgstr1 "Hľadá sa cesta „%s“ (%i dostupné položky)..."
 #~ msgstr2 "Hľadá sa cesta „%s“ (%i dostupných položiek)..."
 
+#, c-format
 #~ msgid "Starting regex search for '%s'..."
 #~ msgstr "Začína sa hľadanie regulárneho výrazu „%s“..."
 
+#, c-format
 #~ msgid "Trying '%s'..."
 #~ msgstr "Skúša sa „%s“..."
 
 #~ msgid "regcomp failed"
 #~ msgstr "regcomp zlyhal"
 
+#, c-format
 #~ msgid "re_match failed (%i)"
 #~ msgstr "re_match zlyhal (%i)"
 
 #~ msgid "regexec failed"
 #~ msgstr "regexec zlyhal"
 
+#, c-format
 #~ msgid "Looking up entry '%s'..."
 #~ msgstr "Vyhľadáva sa položka „%s“..."
 
+#, c-format
 #~ msgid "Getting info of entry %i (%i available)..."
 #~ msgid_plural "Getting info of entry %i (%i available)..."
 #~ msgstr0 "Získavajú sa informácie o položke %i (%i dostupná)..."
@@ -445,12 +468,15 @@
 #~ msgid "Creating new device..."
 #~ msgstr "Vytvára sa nové zariadenie..."
 
+#, c-format
 #~ msgid "Could not load '%s' ('%s')."
 #~ msgstr "Nebolo možné načítať „%s“ („%s“)."
 
+#, c-format
 #~ msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
 #~ msgstr "Nebolo možné nájsť 'gp_port_library_operations' v „%s“ („%s“)"
 
+#, c-format
 #~ msgid "Opening %s port..."
 #~ msgstr "Otvára sa port %s..."
 
@@ -460,63 +486,76 @@
 #~ msgid "Freeing port..."
 #~ msgstr "Uvoľnuje sa port..."
 
+#, c-format
 #~ msgid "Writing %i=0x%x byte(s) to port..."
 #~ msgstr "Zapisujú sa bajty %i=0x%x do portu..."
 
+#, c-format
 #~ msgid "Could only write %i out of %i byte"
 #~ msgid_plural "Could only write %i out of %i bytes"
 #~ msgstr0 "Bolo možné zapísať iba %i z %i bajtu"
 #~ msgstr1 "Bolo možné zapísať iba %i z %i bajtov"
 #~ msgstr2 "Bolo možné zapísať iba %i z %i bajtov"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from port..."
 #~ msgid_plural "Reading %i=0x%x bytes from port..."
 #~ msgstr0 "Číta sa %i=0x%x bajt z portu..."
 #~ msgstr1 "Číta sa %i=0x%x bajty z portu..."
 #~ msgstr2 "Číta sa %i=0x%x bajtov z portu..."
 
+#, c-format
 #~ msgid "Could only read %i out of %i byte"
 #~ msgid_plural "Could only read %i out of %i byte(s)"
 #~ msgstr0 "Bolo možné prečítať iba %i z %i bajtu"
 #~ msgstr1 "Bolo možné prečítať iba %i z %i bajtov"
 #~ msgstr2 "Bolo možné prečítať iba %i z %i bajtov"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from interrupt endpoint..."
 #~ msgid_plural "Reading %i=0x%x bytes from interrupt endpoint..."
 #~ msgstr0 "Číta sa %i=0x%x bajt z konca prerušenia..."
 #~ msgstr1 "Číta sa %i=0x%x bajty z konca prerušenia..."
 #~ msgstr2 "Číta sa %i=0x%x bajtov z konca prerušenia..."
 
+#, c-format
 #~ msgid "Could only read %i out of %i byte(s)"
 #~ msgstr "Bolo možné prečítať iba %i z %i bajtov"
 
+#, c-format
 #~ msgid "Reading %i=0x%x byte from interrupt endpoint (fast)..."
 #~ msgid_plural "Reading %i=0x%x bytes from interrupt endpoint (fast)..."
 #~ msgstr0 "Číta sa %i=0x%x bajt z konca prerušenia (rýchlo)..."
 #~ msgstr1 "Číta sa %i=0x%x bajty z konca prerušenia (rýchlo)..."
 #~ msgstr2 "Číta sa %i=0x%x bajtov z konca prerušenia (rýchlo)..."
 
+#, c-format
 #~ msgid "Setting timeout to %i millisecond(s)..."
 #~ msgstr "Nastavuje sa interval expirácie na %i millisekúnd..."
 
 #~ msgid "Getting timeout..."
 #~ msgstr "Zisťuje sa interval expirácie..."
 
+#, c-format
 #~ msgid "Current timeout: %i milliseconds"
 #~ msgstr "Aktuálny interval expirácie: %i millisekúnd"
 
 #~ msgid "Setting settings..."
 #~ msgstr "Nastavuje sa..."
 
+#, c-format
 #~ msgid "Getting level of pin %i..."
 #~ msgstr "Zisťuje sa úroveň kolíka %i..."
 
+#, c-format
 #~ msgid "Level of pin %i: %i"
 #~ msgstr "Úroveň kolíka %i: %i"
 
+#, c-format
 #~ msgid "Setting pin %i (%s: '%s') to '%s'..."
 #~ msgstr "Nastavuje sa kolík %i (%s: „%s“) na „%s“..."
 
+#, c-format
 #~ msgid "Sending break (%i milliseconds)..."
 #~ msgstr "Posiela sa prerušenie (%i millisekúnd)..."
 
@@ -526,22 +565,27 @@
 #~ msgid "Clear halt..."
 #~ msgstr "Čistí sa blokovanie..."
 
+#, c-format
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Zapisuje sa správa (požiadavka=0x%x hodnota=0x%x index=0x%x veľkosť=%i=0x"
-#~ "%x)..."
+#~ "Zapisuje sa správa (požiadavka=0x%x hodnota=0x%x index=0x%x "
+#~ "veľkosť=%i=0x%x)..."
 
+#, c-format
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Číta sa správa (požiadavka=0x%x hodnota=0x%x index=0x%x veľkosť=%i=0x"
-#~ "%x)..."
+#~ "Číta sa správa (požiadavka=0x%x hodnota=0x%x index=0x%x "
+#~ "veľkosť=%i=0x%x)..."
 
+#, c-format
 #~ msgid "Device has driver '%s' attached."
 #~ msgstr "Zariadenie má pripojený ovládač „%s“."
 
+#, c-format
 #~ msgid "Device has driver '%s' attached, detaching it now."
 #~ msgstr "Zariadenie má pripojený ovládač „%s“, teraz sa odpája."
 
+#, c-format
 #~ msgid ""
 #~ "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and "
 #~ "might not function with gphoto2. Reference: %s"
@@ -549,6 +593,7 @@
 #~ "Zariadenie USB (dodávateľ 0x%x, produkt 0x%x) je hromadné úložné "
 #~ "zariadenie a nemusí s gphoto2 fungovať. Odkaz: %s"
 
+#, c-format
 #~ msgid "Device has a kernel driver attached (%d), detaching it now."
 #~ msgstr "Zariadenie má pripojený ovládač jadra (%d), teraz sa odpája."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sr.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sr.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sr.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sr.po Changed

@@ -1,125 +1,125 @@
 # Serbian translation of libgphoto2_port.
-# Copyright (C) 2012 Lutz Mueller and others
+# Copyright © 2012 Lutz Mueller and others
 # This file is distributed under the same license as the libgphoto2 package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012—2016.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012–2022.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port-2.5.10\n"
+"Project-Id-Version: libgphoto2_port-2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-05-29 20:27+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-02-15 20:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
-msgstr "Општи прикључак"
+msgstr "Општи прикључник"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Нема грешке"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Непозната грешка"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "У/И проблем"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Лоши параметри"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Неподржана радња"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Премашено је стално ограничење"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Истекло је време за читање или уписивање на прикључак"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Серијски прикључак није подржан"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "УСБ прикључак није подржан"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Непознат прикључак"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Нема више меморије"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Грешка учитавања библиотеке"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Грешка покретања прикључка"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Грешка читања са прикључка"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Грешка писања на прикључак"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Грешка освежавања подешавања прикључка"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Грешка подешавања брзине серијског прикључка"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Грешка чишћења услова заустављања на УСБ прикључку"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Не могу да пронађем захтевани уређај на УСБ прикључку"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Не могу да остварим право на УСБ уређај"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Не могу да закључам уређај"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "грешка хал библиотеке"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Радња „%s“ није подржана овим уређајем"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Прикључак још увек није покренут"
 
@@ -135,243 +135,251 @@
 msgid "No error description available"
 msgstr "Опис грешке није доступан"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Медиј „%s“"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Не могу да отворим УСБ уређај (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Фото-апарат је већ у употреби."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Не могу да откачим управљачки програм језгра фото-апарата."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Не могу да пропитам управљачки програм језгра за уређај."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Не могу да придобијем сучеље %d (%s). Уверите се да ниједан други програм "
+"(%s) или модул језгра (као што је %s) не користи уређај и да ви имате право "
+"на читање/писање на уређају."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Услуга ПТП фото-апарата МекОС-а"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "непозната библгфото2 користи програм"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Не могу да отпустим сучеље %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Не могу поново да подесим УСБ прикључак (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Не могу поново да прикачим управљачки програм језгра фото-апарата."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Не могу да подесим подешавања %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Не могу да подесим подешавање заустављања са %d на %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Не могу да пронађем УСБ уређај (продавац 0x%x, производ 0x%x). Уверите се да "
+"је тај уређај прикључен на рачунар."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Достављени ид продавца или производа (0x%x,0x%x) није исправан."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Не могу да пронађем УСБ уређај (разред 0x%x, подразред 0x%x, протокол 0x%x). "
+"Уверите се да је тај уређај прикључен на рачунар."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "ПТП/ИП веза"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "ИП веза"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Не могу да закључам уређај „%s“"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Уређај „%s“ је закључан пидом %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Уређај „%s“ не може бити закључан (закљ_уређ је вратио %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Уређај „%s“ не може бити откључан."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Уређај „%s“ не може бити откључан јер је закључан пидом %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "Уређај „%s“ не може бити откључан (откљ_уређ је вратио %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Серијски прикључак %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Уређај серијског прикључка"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Нисам успео да отворим „%s“ (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Не могу да затворим „%s“ (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Не могу да пишем на прикључку (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Грешка једнакости."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Неочекиван низ одговора једнакости 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Непознат пин %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Не могу да добавим ниво пина %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Не могу да подесим ниво пина %i на %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Не могу да преточим „%s“ (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Не могу да подесим брзину преноса података на %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Не могу да откачим управљачки програм језгра „%s“ фото-апарата."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Не могу да затворим УСБ прикључак (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Непосредни УИ УСБ масовног складишта"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Нисам успео да отворим „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Не могу да затворим „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Не могу да премотам на померај: %x на „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Не могу да запишем у „%s“ (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Не могу да читам са „%s“ (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Не могу да отворим УСБ уређај (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Фото-апарат је већ у употреби."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Не могу да откачим управљачки програм језгра „%s“ фото-апарата."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Не могу да пропитам управљачки програм језгра за уређај."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Не могу да придобијем сучеље %d (%s). Уверите се да ниједан други програм "
-"(%s) или модул језгра (као што је %s) не користи уређај и да ви имате право "
-"на читање/писање на уређају."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Услуга ПТП фото-апарата МекОС-а"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "непозната библгфото2 користи програм"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Не могу да отпустим сучеље %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Не могу поново да подесим УСБ прикључак (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Не могу да затворим УСБ прикључак (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Не могу да подесим подешавања %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Не могу да подесим подешавање заустављања са %d на %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Достављени ид продавца или производа (0x%x,0x%x) није исправан."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Не могу да пронађем УСБ уређај (продавац 0x%x, производ 0x%x). Уверите се да "
-"је тај уређај прикључен на рачунар."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Не могу да пронађем УСБ уређај (разред 0x%x, подразред 0x%x, протокол 0x%x). "
-"Уверите се да је тај уређај прикључен на рачунар."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Не могу да откачим управљачки програм језгра фото-апарата."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Не могу поново да прикачим управљачки програм језгра фото-апарата."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Уређај „%s“ је закључан неким другим програмом."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Нисам успео да закључам „%s“ (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Нисам успео да откључам „%s“ (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "Сирови СЦСИ УСБ масовног складишта"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Не могу да пошаљем сцси наредбу на: „%s“ (%m)."
@@ -528,8 +536,8 @@
 
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Порука записивања (захтев=0x%x вредност=0x%x индекс=0x%x величина=%i=0x"
-#~ "%x)..."
+#~ "Порука записивања (захтев=0x%x вредност=0x%x индекс=0x%x "
+#~ "величина=%i=0x%x)..."
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sv.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sv.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/sv.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/sv.po Changed

@@ -1,18 +1,18 @@
 # Swedish translation of libgphoto2_port
-# Copyright © 2000-2016 Free Software Foundation, Inc.
+# Copyright © 2000, 2002, 2006, 2007, 2015, 2016, 2020, 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007.
 # Andreas Hyden <a.hyden@cyberpoint.se> 2000.
 # Stefan Björnelund <stefanb@Update.UU.SE>, 2002.
 # Sverker Wiberg <sverkerw@update.uu.se>, 2002.
-# Sebastian Rasmussen <sebras@gmail.com>, 2015, 2016.
+# Sebastian Rasmussen <sebras@gmail.com>, 2015, 2016, 2020, 2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.10\n"
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-03-24 19:38+0100\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-10-24 15:29+0200\n"
 "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -20,110 +20,110 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Allmän port"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Inget fel"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Ospecificerat fel"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "In-/ut-problem"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Felaktiga parametrar"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Operationen stöds inte"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Fast gräns överstigen"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Timeout vid läsning från eller skrivning till porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Serieporten stöds inte"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "USB-porten stöds inte"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Okänd port"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Fel vid inläsning av ett bibliotek"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Fel vid initiering av porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Fel vid läsning från porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Fel vid skrivning till porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Fel vid uppdatering av portinställningarna"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Fel vid inställning av serieportens hastighet"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Fel vid rensning av stopptillstånd på USB-porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Kunde inte finna den begärda enheten på USB-porten"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Kunde inte göra anspråk på USB-enheten"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Kunde inte låsa enheten"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal-fel"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Operationen ”%s” stöds inte av denna enhet"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Porten har ännu inte blivit initierad"
 
@@ -139,245 +139,253 @@
 msgid "No error description available"
 msgstr "Ingen felbeskrivning tillgänglig"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Media ”%s”"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Kunde inte öppna USB-enhet (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Kameran används redan."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Kunde inte koppla loss kärndrivrutinen från kameraenhet."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Kunde inte fråga kärndrivrutinen efter enheten."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Kunde inte göra anspråk på gränssnittet %d (%s). Kontrollera att inget annat "
+"program (%s) eller kärnmodul (såsom %s) använder enheten och att du har "
+"skriv-/läsrättigheter för enheten."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS-tjänst för PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "okänt program som använder libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Kunde inte släppa gränssnittet %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Kunde inte återställa USB-porten (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Kunde inte återkoppla kärndrivrutinen från kameraenhet."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Kunde inte ställa in konfiguration %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Kunde inte ställa in alternativinställning från %d till %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Kunde inte finna USB-enheten (tillverkare 0x%x, produkt 0x%x). Kontrollera "
+"att enheten är ansluten till datorn."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr ""
+"Den angivna tillverkar- eller produktidentiteten (0x%x,0x%x) är inte giltig."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Kunde inte finna USB-enheten (klass 0x%x, underklass 0x%x, protokoll 0x%x). "
+"Kontrollera att enheten är ansluten till datorn."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "PTP/IP-anslutning"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "IP-anslutning"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Kunde inte låsa enheten ”%s”"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Enheten ”%s” är låst av pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
-msgstr "Enheten ”%s” kunde inte låsas (dev_unlock returnerade %d)"
+msgstr "Enheten ”%s” kunde inte låsas (dev_lock returnerade %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Enheten ”%s” kunde inte låsas upp."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Enheten ”%s” kunde inte låsas upp eftersom den är låst av pid %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
-msgstr "Enheten ”%s” kunde inte låsas upp (dev_lock returnerade %d)"
+msgstr "Enheten ”%s” kunde inte låsas upp (dev_unlock returnerade %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Serieport %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Serieportsenhet"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Misslyckades med att öppna ”%s” (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Kunde inte stänga ”%s” (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Kunde inte skriva till porten (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Paritetsfel."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Oväntad paritetsvarsekvens 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Okänd pinne %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Kunde inte hämta nivån för pinne %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Kunde inte ställa in nivån för pinne %i till %i (%s)."
 
 # Hmm
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Kunde inte tömma ut ”%s” (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Kunde inte ställa in bithastigheten till %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Kunde inte koppla loss kärndrivrutinen ”%s” från kameraenhet."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Kunde inte stänga USB-porten (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB-masslagring direkt I/O"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Misslyckades med att öppna ”%s” (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Kunde inte stänga ”%s” (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Kunde inte söka till position: %x på ”%s” (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Kunde inte skriva till ”%s” (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Kunde inte läsa från ”%s” (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Kunde inte öppna USB-enhet (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Kameran används redan."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Kunde inte koppla loss kärndrivrutinen ”%s” från kameraenhet."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Kunde inte fråga kärndrivrutinen efter enheten."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Kunde inte göra anspråk på gränssnittet %d (%s). Kontrollera att inget annat "
-"program (%s) eller kärnmodul (såsom %s) använder enheten och att du har "
-"skriv-/läsrättigheter för enheten."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS-tjänst för PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "okänt program som använder libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Kunde inte släppa gränssnittet %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Kunde inte återställa USB-porten (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Kunde inte stänga USB-porten (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Kunde inte ställa in konfiguration %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Kunde inte ställa in alternativinställning från %d till %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr ""
-"Den angivna tillverkar- eller produktidentiteten (0x%x,0x%x) är inte giltig."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Kunde inte finna USB-enheten (tillverkare 0x%x, produkt 0x%x). Kontrollera "
-"att enheten är ansluten till datorn."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Kunde inte finna USB-enheten (klass 0x%x, underklass 0x%x, protokoll 0x%x). "
-"Kontrollera att enheten är ansluten till datorn."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Kunde inte koppla loss kärndrivrutinen från kameraenhet."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Kunde inte återkoppla kärndrivrutinen från kameraenhet."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Enheten ”%s” är låst av ett annat program."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Misslyckades med att låsa ”%s” (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Misslyckades med att låsa upp ”%s” (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB-masslagring rå SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Kunde inte skicka scsi-kommando till: ”%s” (%m)."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/uk.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/uk.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/uk.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/uk.po Changed

@@ -3,126 +3,126 @@
 # This file is distributed under the same license as the libgphoto2 package.
 #
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2006-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2016, 2022.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port-2.5.10\n"
+"Project-Id-Version: libgphoto2_port-2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2016-03-24 21:19+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-01-04 15:39+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 20.12.0\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Звичайний порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Помилок немає"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Невизначена помилка"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Помилка вводу/виводу"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Неправильні аргументи"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Непідтримувана дія"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Перевищено визначене обмеження"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Вийшов час очікування відповіді при читанні або записі у порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Немає підтримки послідовного порту"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Немає підтримки порту USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Невідомий порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Помилка завантаження бібліотеки"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Помилка ініціалізації порту"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Помилка читання з порту"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Помилка запису у порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Помилка оновлення параметрів порту"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Помилка встановлення швидкості передачі через послідовний порт"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Помилка усунення halt-умови на порту USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Не вдалося знайти запитаний пристрій на порту USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Не вдалося отримати контроль на д пристроєм USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Не вдалося заблокувати пристрій"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "помилка libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Цей пристрій не підтримує операцію «%s»"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "порт ще не був ініціалізований"
 
@@ -138,246 +138,254 @@
 msgid "No error description available"
 msgstr "Опис помилки недоступний"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Носій «%s»"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Не вдалося відкрити пристрій USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Фотоапарат вже зайнятий."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Не вдалося відключити драйвера ядра для пристрою фотоапарата."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Не вдалося опитати драйвер ядра для пристрою."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Не вдалося захопити інтерфейс %d (%s). Перевірте, що пристрій не зайнятий "
+"іншою програмою (%s) або модулем ядра (таким як %s), та що у вас є доступ "
+"читання та запису до пристрою."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Служба PTPCamera MacOS"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "невідома програма, що використовує libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Не вдалося звільнити інтерфейс %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Не вдалося відновити початковий стан порту USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "Не вдалося повторно з’єднати драйвер ядра для пристрою фотоапарата."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Не вдалося встановити налаштування %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Не вдалося встановити альтернативне значення з %d на %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Не вдалося знайти пристрій USB (виробник 0x%x, продукт 0x%x). Перевірте, що "
+"пристрій з'єднаний з комп'ютером."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "неправильний ідентифікатор виробника та продукту (0x%x,0x%x)."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Не вдалося знайти пристрій USB (клас 0x%x, підклас 0x%x, протокол 0x%x). "
+"Перевірте, що пристрій з'єднаний з комп'ютером."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "З'єднання PTP/IP"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "З'єднання IP"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Не вдалося заблокувати пристрій «%s»"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Пристрій «%s» заблоковано процесом з pid %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Неможливо заблокувати пристрій «%s» (функція dev_lock повернула %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Пристрій «%s» неможливо розблокувати."
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr ""
 "Пристрій «%s» неможливо розблокувати, оскільки він заблокований процесом %d."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "пристрій «%s» неможливо розблокувати (функція dev_unlock повернула значення "
 "%d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Послідовний порт %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Пристрій послідовного порту"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Не вдалося відкрити «%s» (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Не вдалося закрити «%s» (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Не вдалося записати у порт (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Помилка парності"
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Неочікувана послідовність контролю парності 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Невідомий pin %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Не вдалося отримати рівень pin %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Не вдалося встановити рівень pin %i у %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Не вдалося скинути буфери пристрою «%s» (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Неможливо встановити швидкість %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Не вдалося відключити драйвера ядра «%s» для пристрою фотоапарата."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Не вдалося зарити порт USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "Безпосереднє введення-виведення на пристрої USB"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Не вдалося відкрити «%s» (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Не вдалося закрити «%s» (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Не вдалося встановити позицію з відступом %x на «%s» (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Не вдалося виконати запис до «%s» (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Не вдалося виконати читання з «%s» (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Не вдалося відкрити пристрій USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Фотоапарат вже зайнятий."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Не вдалося відключити драйвера ядра «%s» для пристрою фотоапарата."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Не вдалося опитати драйвер ядра для пристрою."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Не вдалося захопити інтерфейс %d (%s). Перевірте, що пристрій не зайнятий "
-"іншою програмою (%s) або модулем ядра (таким як %s), та що у вас є доступ "
-"читання та запису до пристрою."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Служба PTPCamera MacOS"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "невідома програма, що використовує libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Не вдалося звільнити інтерфейс %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Не вдалося відновити початковий стан порту USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Не вдалося зарити порт USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Не вдалося встановити налаштування %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Не вдалося встановити альтернативне значення з %d на %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "неправильний ідентифікатор виробника та продукту (0x%x,0x%x)."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Не вдалося знайти пристрій USB (виробник 0x%x, продукт 0x%x). Перевірте, що "
-"пристрій з'єднаний з комп'ютером."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Не вдалося знайти пристрій USB (клас 0x%x, підклас 0x%x, протокол 0x%x). "
-"Перевірте, що пристрій з'єднаний з комп'ютером."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Не вдалося відключити драйвера ядра для пристрою фотоапарата."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "Не вдалося повторно з’єднати драйвер ядра для пристрою фотоапарата."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Пристрій «%s» заблоковано іншою програмою."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Не вдалося заблокувати «%s» (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Не вдалося розблокувати «%s» (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "SCSI без обробки для пристроїв USB"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Не вдалося надіслати команду scsi до «%s» (%m)."
@@ -549,8 +557,8 @@
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Читання повідомлення (запит=0x%x значення=0x%x індекс=0x%x розмір=%i=0x%x)"
-#~ "…"
+#~ "Читання повідомлення (запит=0x%x значення=0x%x індекс=0x%x "
+#~ "розмір=%i=0x%x)…"
 
 #~ msgid "Device has driver '%s' attached."
 #~ msgstr "З пристроєм з’єднано драйвер «%s»."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/vi.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/vi.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/vi.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/vi.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.13\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2017-04-11 08:02+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -24,108 +24,108 @@
 "X-Generator: Gtranslator 2.91.7\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "Cổng chung"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "Lỗi không xác định"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "Vấn đề V/R"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "Tham số sai"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "Thao tác không được hỗ trợ"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "Giới hạn cứng đã bị vượt quá"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "Quá hạn khi đọc từ hoặc khi ghi vào cổng đó"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "Cổng song song không được hỗ trợ"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "Cổng USB không được hỗ trợ"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "Không rõ cổng"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "Hết bộ nhớ"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "Gặp lỗi khi tải thư viện"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "Gặp lỗi khi khởi tạo cổng"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "Gặp lỗi khi đọc từ cổng"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "Gặp lỗi khi ghi vào cổng"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "Gặp lỗi khi cập nhật các cài đặt cổng"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "Gặp lỗi khi đặt tốc độ của cổng song song"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "Gặp lỗi khi thoát khỏi trạng thái bị ngừng của cổng USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "Không tìm thấy thiết bị yêu cầu trên cổng USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "Không thể quyền đòi thiết bị USB"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "Không thể khóa thiết bị"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "Lỗi libhal"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "Thao tác “%s” không được hỗ trợ bởi thiết bị này"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "Cổng còn chưa được khởi tạo"
 
@@ -141,245 +141,253 @@
 msgid "No error description available"
 msgstr "Không có sẵn mô tả lỗi"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "Đa phương tiện “%s”"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "Không thể mở thiết bị USB (%s)."
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "Máy ảnh đã được được dùng rồi."
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "Không thể gỡ ra trình điều khiển hạt nhân của thiết bị máy ảnh."
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "Không thể truy vấn trình điều khiển hạt nhân của thiết bị."
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"Không thể yêu cầu giao diện %d (%s). Kiểm tra xem không có chương trình khác "
+"(%s) hoặc mô-đun hạt nhân (v.d. %s) đang sử dụng thiết bị và bạn có quyền "
+"đọc/ghi vào thiết bị này."
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "Dịch vụ MacOS PTPCamera"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "không hiểu chương trình dùng libgphoto2"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "Không thể thả giao diện %d (%s)."
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "Không thể đặt lại cổng USB (%s)."
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr ""
+"Không thể gỡ kết nối lại trình điều khiển hạt nhân của thiết bị máy ảnh."
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "Không thể đặt cấu hình %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "Không thể đặt altsetting (cài đặt xen kẽ) từ %d thành %d (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+"Không tìm thấy thiết bị USB (nhà sản xuất 0x%x, sản phẩm 0x%x). Kiểm tra xem "
+"thiết bị này được kết nối đến máy tính."
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "Mã sản phẩm hay mã nhà sản xuất (0x%x, 0x%x) không phải hợp lệ."
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"Không tìm thấy thiết bị USB (hạng 0x%x, lớp con 0x%x, giao thức 0x%x). Kiểm "
+"tra xem thiết bị này được kết nối đến máy tính."
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "Không thể khóa thiết bị “%s”"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "Thiết bị “%s” bị khóa bởi tiến trình có mã số (PID) %d"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "Không thể khóa thiết bị “%s” (dev_lock khóa thiết bị đã trả về %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "Không thể mở khóa thiết bị “%s”"
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "Không thể mở khóa thiết bị “%s” bởi vì nó bị PID %d khóa."
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr ""
 "Không thể mở khóa thiết bị “%s” (dev_unlock mở khóa thiết bị đã trả về %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "Cổng nối tiếp %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "Thiết bị cổng nối tiếp"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "Gặp lỗi khi mở “%s” (%s)."
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "Không thể đóng “%s” (%s)."
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "Không thể ghi vào cổng (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "Lỗi chẵn lẻ."
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "Gặp dãy đáp ứng chẵn lẻ bất thường 0xff 0x%02x."
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "Không hiểu chân %i."
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "Không thể lấy được mức chân %i (%s)."
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "Không thể đặt mức chân từ %i thành %i (%s)."
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "Không thể đẩy dữ liệu lên đĩa (flush) “%s” (%s)."
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "Không thể đặt tốc độ truyền thành %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "Không thể gỡ ra trình điều khiển hạt nhân “%s” của thiết bị máy ảnh."
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "Không thể đóng cổng USB (%s)."
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "V/R trực tiếp Lưu trữ Hàng loạt USB"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "Gặp lỗi khi mở “%s” (%m)."
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "Không thể đóng “%s” (%m)."
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "Không thể di chuyển vị trí đọc đến vị trí bù: %x trên “%s” (%m)."
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "Không thể ghi vào “%s” (%m)."
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "Không thể đọc từ “%s” (%m)."
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "Không thể mở thiết bị USB (%s)."
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "Máy ảnh đã được được dùng rồi."
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "Không thể gỡ ra trình điều khiển hạt nhân “%s” của thiết bị máy ảnh."
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "Không thể truy vấn trình điều khiển hạt nhân của thiết bị."
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"Không thể yêu cầu giao diện %d (%s). Kiểm tra xem không có chương trình khác "
-"(%s) hoặc mô-đun hạt nhân (v.d. %s) đang sử dụng thiết bị và bạn có quyền "
-"đọc/ghi vào thiết bị này."
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "Dịch vụ MacOS PTPCamera"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "không hiểu chương trình dùng libgphoto2"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "Không thể thả giao diện %d (%s)."
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "Không thể đặt lại cổng USB (%s)."
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "Không thể đóng cổng USB (%s)."
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "Không thể đặt cấu hình %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "Không thể đặt altsetting (cài đặt xen kẽ) từ %d thành %d (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "Mã sản phẩm hay mã nhà sản xuất (0x%x, 0x%x) không phải hợp lệ."
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr ""
-"Không tìm thấy thiết bị USB (nhà sản xuất 0x%x, sản phẩm 0x%x). Kiểm tra xem "
-"thiết bị này được kết nối đến máy tính."
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"Không tìm thấy thiết bị USB (hạng 0x%x, lớp con 0x%x, giao thức 0x%x). Kiểm "
-"tra xem thiết bị này được kết nối đến máy tính."
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "Không thể gỡ ra trình điều khiển hạt nhân của thiết bị máy ảnh."
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr ""
-"Không thể gỡ kết nối lại trình điều khiển hạt nhân của thiết bị máy ảnh."
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "Thiết bị “%s” bị khóa bởi ứng dụng khác."
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "Gặp lỗi khi khóa “%s” (%m)."
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "Gặp lỗi khi mở khóa “%s” (%m)."
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "SCSI thô Lưu trữ Hàng loạt USB"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "Không thể gửi câu lệnh scsi đến: “%s” (%m)."
@@ -520,13 +528,13 @@
 
 #~ msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Đang ghi thông điệp (yêu cầu=0x%x giá trị=0x%x chỉ mục=0x%x kích cỡ=%i=0x"
-#~ "%x)…"
+#~ "Đang ghi thông điệp (yêu cầu=0x%x giá trị=0x%x chỉ mục=0x%x kích "
+#~ "cỡ=%i=0x%x)…"
 
 #~ msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
 #~ msgstr ""
-#~ "Đang đọc thông điệp (yêu cầu=0x%x giá trị=0x%x chỉ mục=0x%x kích cỡ=%i=0x"
-#~ "%x)…"
+#~ "Đang đọc thông điệp (yêu cầu=0x%x giá trị=0x%x chỉ mục=0x%x kích "
+#~ "cỡ=%i=0x%x)…"
 
 #~ msgid "Device has driver '%s' attached."
 #~ msgstr "Trình điều khiển “%s” được gắn nối."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/zh_CN.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/zh_CN.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/zh_CN.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/zh_CN.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2_port 2.5.10\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
 "PO-Revision-Date: 2016-10-16 16:31-0400\n"
 "Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -19,108 +19,108 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "通用端口"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "无错误"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "未指明的错误"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "I/O 问题"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "错误的参数"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "超出了固定限制"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "读取或写入端口超时"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "不支持串口"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "不支持 USB 接口"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "未知端口"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "装入库出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "初始化端口出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "读端口出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "写端口出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "更新端口设置出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "设置串口速度出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "清除 USB 端口的一个中止条件出错"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "无法在 USB 端口找到请求的设备"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "无法请求 USB 设备"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "无法锁定设备"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal 错误"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "该设备不支持操作‘%s’"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "端口尚未初始化"
 
@@ -136,239 +136,247 @@
 msgid "No error description available"
 msgstr "没有可用的错误描述"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "介质 %s"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "无法打开 USB 设备 (%s)。"
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "照相机在使用中。"
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "无法卸除照相机设备的内核驱动程序。"
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "无法查询设备的内核驱动程序。"
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"无法请求接口 %d (%s)。请确认没有其它程序 (%s) 或内核模块 (例如 %s) 正在使用这"
+"个设备，并且您有对这个设备的读/写权。"
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTPCamera 服务"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "未知的 libgphoto2 正使用程序"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "无法释放接口 %d (%s)。"
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "无法重置 USB 端口 (%s)。"
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "无法重新装载照相机设备的内核驱动程序。"
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "无法设置配置 %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "无法设置从 %d 到 %d 的替代设置 (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr "无法找到 USB 设备 (供应商 0x%x、产品 0x%x)。确信该设备已连接到计算机。"
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "给出的供应商或产品 id (0x%x、0x%x) 不合法。"
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"无法找到 USB 设备 (类 0x%x、子类 0x%x、协议 0x%x)。确信该设备已连接到计算机。"
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr ""
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr ""
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "无法锁定设备‘%s’"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "设备‘%s’已经被进行号为 %d 的进程锁定"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "无法锁定设备‘%s’(dev_lock 返回 %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "无法解锁设备‘%s’。"
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "由于设备‘%s’已被进程号为 %d 的进程锁定，所以无法锁定。"
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "无法解锁设备‘%s’(dev_unlock 返回 %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "串口 %i"
 
-#: serial/unix.c:352
+#: serial/unix.c:326
 msgid "Serial Port Device"
 msgstr "串口设备"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "打开 %s 时失败 (%s)。"
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "无法关闭 %s (%s)。"
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "无法写入端口 (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "奇偶错误。"
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "意外的奇偶应答序列 0xff 0x%02x。"
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "未知插脚 %i。"
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "无法获取针脚 %i 的级别 (%s)。"
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "无法将针脚 %i 的级别设置为 %i (%s)。"
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "无法刷新 %s (%s)。"
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "无法设置将波特率设置为 %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "无法卸除照相机设备的内核驱动程序 %s。"
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "无法关闭 USB 端口 (%s)。"
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB 大容量存储器直接 IO"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "打开‘%s’(%m)失败。"
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "无法关闭‘%s’(%m)。"
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "无法寻址到偏移：%x 于 %s (%m)。"
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "无法写入 %s (%m)。"
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "无法读取 %s (%m)。"
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "无法打开 USB 设备 (%s)。"
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "照相机在使用中。"
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "无法卸除照相机设备的内核驱动程序 %s。"
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "无法查询设备的内核驱动程序。"
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"无法请求接口 %d (%s)。请确认没有其它程序 (%s) 或内核模块 (例如 %s) 正在使用这"
-"个设备，并且您有对这个设备的读/写权。"
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTPCamera 服务"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "未知的 libgphoto2 正使用程序"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "无法释放接口 %d (%s)。"
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "无法重置 USB 端口 (%s)。"
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "无法关闭 USB 端口 (%s)。"
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "无法设置配置 %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "无法设置从 %d 到 %d 的替代设置 (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "给出的供应商或产品 id (0x%x、0x%x) 不合法。"
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr "无法找到 USB 设备 (供应商 0x%x、产品 0x%x)。确信该设备已连接到计算机。"
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"无法找到 USB 设备 (类 0x%x、子类 0x%x、协议 0x%x)。确信该设备已连接到计算机。"
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "无法卸除照相机设备的内核驱动程序。"
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "无法重新装载照相机设备的内核驱动程序。"
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "设备 %s 已被另一个应用程序锁定。"
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "锁定 %s 时失败 (%m)。"
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "解锁 %s 时失败 (%m)。"
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB 大容量存储器原始 SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "无法发送 scsi 命令给：%s (%m)。"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/zh_TW.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/zh_TW.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/po/zh_TW.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/po/zh_TW.po Changed

@@ -6,121 +6,122 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2_port 2.5.8\n"
+"Project-Id-Version: libgphoto2_port 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-04-08 15:51+0200\n"
-"PO-Revision-Date: 2015-10-08 12:39+0800\n"
-"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"POT-Creation-Date: 2022-12-20 16:18+0100\n"
+"PO-Revision-Date: 2022-04-07 12:30+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
+"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.0.1\n"
 
-#: libgphoto2_port/gphoto2-port-info-list.c:409
+#: libgphoto2_port/gphoto2-port-info-list.c:449
 msgid "Generic Port"
 msgstr "通用通訊埠"
 
-#: libgphoto2_port/gphoto2-port-result.c:58
+#: libgphoto2_port/gphoto2-port-result.c:42
 msgid "No error"
 msgstr "無錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:60
+#: libgphoto2_port/gphoto2-port-result.c:44
 msgid "Unspecified error"
 msgstr "未指明的錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:62
+#: libgphoto2_port/gphoto2-port-result.c:46
 msgid "I/O problem"
 msgstr "I/O 問題"
 
-#: libgphoto2_port/gphoto2-port-result.c:64
+#: libgphoto2_port/gphoto2-port-result.c:48
 msgid "Bad parameters"
 msgstr "不當的參數"
 
-#: libgphoto2_port/gphoto2-port-result.c:66
+#: libgphoto2_port/gphoto2-port-result.c:50
 msgid "Unsupported operation"
 msgstr "不支援的操作"
 
-#: libgphoto2_port/gphoto2-port-result.c:68
+#: libgphoto2_port/gphoto2-port-result.c:52
 msgid "Fixed limit exceeded"
 msgstr "超出了固定限制"
 
-#: libgphoto2_port/gphoto2-port-result.c:70
+#: libgphoto2_port/gphoto2-port-result.c:54
 msgid "Timeout reading from or writing to the port"
 msgstr "讀取或寫入通訊埠逾時"
 
-#: libgphoto2_port/gphoto2-port-result.c:72
+#: libgphoto2_port/gphoto2-port-result.c:56
 msgid "Serial port not supported"
 msgstr "不支援序列埠"
 
-#: libgphoto2_port/gphoto2-port-result.c:74
+#: libgphoto2_port/gphoto2-port-result.c:58
 msgid "USB port not supported"
 msgstr "不支援 USB 介面"
 
-#: libgphoto2_port/gphoto2-port-result.c:76
+#: libgphoto2_port/gphoto2-port-result.c:60
 msgid "Unknown port"
 msgstr "不明通訊埠"
 
-#: libgphoto2_port/gphoto2-port-result.c:78
+#: libgphoto2_port/gphoto2-port-result.c:62
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: libgphoto2_port/gphoto2-port-result.c:80
+#: libgphoto2_port/gphoto2-port-result.c:64
 msgid "Error loading a library"
 msgstr "載入函式庫時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:82
+#: libgphoto2_port/gphoto2-port-result.c:66
 msgid "Error initializing the port"
 msgstr "初始化通訊埠時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:84
+#: libgphoto2_port/gphoto2-port-result.c:68
 msgid "Error reading from the port"
 msgstr "讀取通訊埠時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:86
+#: libgphoto2_port/gphoto2-port-result.c:70
 msgid "Error writing to the port"
 msgstr "寫入通訊埠時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:88
+#: libgphoto2_port/gphoto2-port-result.c:72
 msgid "Error updating the port settings"
 msgstr "更新通訊埠設定時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:90
+#: libgphoto2_port/gphoto2-port-result.c:74
 msgid "Error setting the serial port speed"
 msgstr "設定序列埠速度時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:92
+#: libgphoto2_port/gphoto2-port-result.c:76
 msgid "Error clearing a halt condition on the USB port"
 msgstr "清除 USB 通訊埠的一個中止條件時錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:94
+#: libgphoto2_port/gphoto2-port-result.c:78
 msgid "Could not find the requested device on the USB port"
 msgstr "無法在 USB 通訊埠找到要求的裝置"
 
-#: libgphoto2_port/gphoto2-port-result.c:96
+#: libgphoto2_port/gphoto2-port-result.c:80
 msgid "Could not claim the USB device"
 msgstr "無法要求 USB 裝置"
 
-#: libgphoto2_port/gphoto2-port-result.c:98
+#: libgphoto2_port/gphoto2-port-result.c:82
 msgid "Could not lock the device"
 msgstr "無法鎖定裝置"
 
-#: libgphoto2_port/gphoto2-port-result.c:100
+#: libgphoto2_port/gphoto2-port-result.c:84
 msgid "libhal error"
 msgstr "libhal 錯誤"
 
-#: libgphoto2_port/gphoto2-port-result.c:102
+#: libgphoto2_port/gphoto2-port-result.c:86
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: libgphoto2_port/gphoto2-port.c:59
+#: libgphoto2_port/gphoto2-port.c:47
 #, c-format
 msgid "The operation '%s' is not supported by this device"
 msgstr "這個裝置不支援 %s 操作"
 
-#: libgphoto2_port/gphoto2-port.c:60
+#: libgphoto2_port/gphoto2-port.c:48
 msgid "The port has not yet been initialized"
 msgstr "通訊埠尚未初始化"
 
@@ -136,241 +137,248 @@
 msgid "No error description available"
 msgstr "沒有可用的錯誤描述"
 
-#: disk/disk.c:149 disk/disk.c:150 disk/disk.c:228 disk/disk.c:229
-#: disk/disk.c:269 disk/disk.c:292
+#: disk/disk.c:133 disk/disk.c:134 disk/disk.c:212 disk/disk.c:213
+#: disk/disk.c:253 disk/disk.c:276
 #, c-format
 msgid "Media '%s'"
 msgstr "媒體 %s"
 
-#: serial/unix.c:223
+#: libusb1/libusb1.c:386 usb/libusb.c:248
+#, c-format
+msgid "Could not open USB device (%s)."
+msgstr "無法開啟 USB 裝置 (%s)。"
+
+#: libusb1/libusb1.c:395 usb/libusb.c:261
+msgid "Camera is already in use."
+msgstr "照相機在使用中。"
+
+#: libusb1/libusb1.c:404
+msgid "Could not detach kernel driver of camera device."
+msgstr "無法卸離照相機裝置的內核驅動程式。"
+
+#: libusb1/libusb1.c:410 usb/libusb.c:274
+msgid "Could not query kernel driver of device."
+msgstr "無法查詢裝置的核心驅動程式。"
+
+#: libusb1/libusb1.c:417 usb/libusb.c:283
+#, c-format
+msgid ""
+"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
+"module (such as %s) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+"無法請求介面 %d (%s)。請確認沒有其它程式 (%s) 或核心模組 (例如 %s) 正在使用這"
+"個裝置，並且您有對這個裝置的讀/寫權。"
+
+#: libusb1/libusb1.c:428 usb/libusb.c:295
+msgid "MacOS PTPCamera service"
+msgstr "MacOS PTPCamera 服務"
+
+#: libusb1/libusb1.c:430 usb/libusb.c:297
+msgid "unknown libgphoto2 using program"
+msgstr "不明的 libgphoto2 正使用程式"
+
+#: libusb1/libusb1.c:499 usb/libusb.c:314
+#, c-format
+msgid "Could not release interface %d (%s)."
+msgstr "無法釋放介面 %d (%s)。"
+
+#: libusb1/libusb1.c:513 usb/libusb.c:329
+#, c-format
+msgid "Could not reset USB port (%s)."
+msgstr "無法重置 USB 通訊埠 (%s)。"
+
+#: libusb1/libusb1.c:522
+msgid "Could not reattach kernel driver of camera device."
+msgstr "無法重新附接照相機裝置的內核驅動程式。"
+
+#: libusb1/libusb1.c:956 usb/libusb.c:621
+#, c-format
+msgid "Could not set config %d/%d (%s)"
+msgstr "無法設定配置 %d/%d (%s)"
+
+#: libusb1/libusb1.c:985 usb/libusb.c:652
+#, c-format
+msgid "Could not set altsetting from %d to %d (%s)"
+msgstr "無法設定從 %d 到 %d 的補充設定 (%s)"
+
+#: libusb1/libusb1.c:1119 libusb1/libusb1.c:1211 usb/libusb.c:812
+#: usb/libusb.c:898
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr "無法找到 USB 裝置 (廠商 0x%x、產品 0x%x)。請確認這個裝置已連接到電腦。"
+
+#: libusb1/libusb1.c:1150 usb/libusb.c:741
+#, c-format
+msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
+msgstr "提供的廠商或產品 id (0x%x、0x%x) 不正確。"
+
+#: libusb1/libusb1.c:1500 usb/libusb.c:1191
+#, c-format
+msgid ""
+"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
+"sure this device is connected to the computer."
+msgstr ""
+"無法找到 USB 裝置 (類別 0x%x、子類 0x%x、協定 0x%x)。請確認這個裝置已連接到電"
+"腦。"
+
+#: ptpip/ptpip.c:161
+msgid "PTP/IP Connection"
+msgstr "PTP/IP 連線"
+
+#: ptpip/ptpip.c:174
+msgid "IP Connection"
+msgstr "IP 連線"
+
+#: serial/unix.c:209
 #, c-format
 msgid "Could not lock device '%s'"
 msgstr "無法鎖定裝置 %s"
 
-#: serial/unix.c:233 usbdiskdirect/linux.c:95
+#: serial/unix.c:219 usbdiskdirect/linux.c:79
 #, c-format
 msgid "Device '%s' is locked by pid %d"
 msgstr "裝置 %s 已經被行程編號為 %d 的行程鎖定"
 
-#: serial/unix.c:236 usbdiskdirect/linux.c:98
+#: serial/unix.c:222 usbdiskdirect/linux.c:82
 #, c-format
 msgid "Device '%s' could not be locked (dev_lock returned %d)"
 msgstr "無法鎖定裝置 %s (dev_lock 回傳 %d)"
 
-#: serial/unix.c:265
+#: serial/unix.c:251
 #, c-format
 msgid "Device '%s' could not be unlocked."
 msgstr "無法解鎖裝置 %s。"
 
-#: serial/unix.c:277 usbdiskdirect/linux.c:127
+#: serial/unix.c:263 usbdiskdirect/linux.c:111
 #, c-format
 msgid "Device '%s' could not be unlocked as it is locked by pid %d."
 msgstr "由於裝置 %s 已被行程編號為 %d 的行程鎖定，所以無法解鎖。"
 
-#: serial/unix.c:281 usbdiskdirect/linux.c:131
+#: serial/unix.c:267 usbdiskdirect/linux.c:115
 #, c-format
 msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
 msgstr "無法解鎖裝置 %s (dev_unlock 回傳 %d)"
 
-#: serial/unix.c:339
+#: serial/unix.c:313
 #, c-format
 msgid "Serial Port %i"
 msgstr "序列埠 %i"
 
-#: serial/unix.c:352
-#, fuzzy
+#: serial/unix.c:326
 msgid "Serial Port Device"
-msgstr "序列埠 %i"
+msgstr "序列埠裝置"
 
-#: serial/unix.c:434
+#: serial/unix.c:401
 #, c-format
 msgid "Failed to open '%s' (%s)."
 msgstr "開啟 %s (%s) 時失敗。"
 
-#: serial/unix.c:454
+#: serial/unix.c:421
 #, c-format
 msgid "Could not close '%s' (%s)."
 msgstr "無法關閉 %s (%s)。"
 
-#: serial/unix.c:510
+#: serial/unix.c:477
 #, c-format
 msgid "Could not write to port (%s)"
 msgstr "無法寫入通訊埠 (%s)"
 
-#: serial/unix.c:587
+#: serial/unix.c:552
 msgid "Parity error."
 msgstr "奇偶檢查錯誤。"
 
-#: serial/unix.c:591
+#: serial/unix.c:556
 #, c-format
 msgid "Unexpected parity response sequence 0xff 0x%02x."
 msgstr "意外的奇偶應答序列 0xff 0x%02x。"
 
-#: serial/unix.c:634
+#: serial/unix.c:599
 #, c-format
 msgid "Unknown pin %i."
 msgstr "不明針腳 %i。"
 
-#: serial/unix.c:656
+#: serial/unix.c:621
 #, c-format
 msgid "Could not get level of pin %i (%s)."
 msgstr "無法獲取針腳 %i 的層級 (%s)。"
 
-#: serial/unix.c:692
+#: serial/unix.c:657
 #, c-format
 msgid "Could not set level of pin %i to %i (%s)."
 msgstr "無法將針腳 %i 的層級設定為 %i (%s)。"
 
-#: serial/unix.c:719
+#: serial/unix.c:684
 #, c-format
 msgid "Could not flush '%s' (%s)."
 msgstr "無法清理 %s (%s)。"
 
-#: serial/unix.c:831
+#: serial/unix.c:778
 #, c-format
 msgid "Could not set the baudrate to %d"
 msgstr "無法將鮑率設定為 %d"
 
-#: usbdiskdirect/linux.c:234
+#: usb/libusb.c:269
+#, c-format
+msgid "Could not detach kernel driver '%s' of camera device."
+msgstr "無法卸掛照相機裝置的核心驅動程式 %s。"
+
+#: usb/libusb.c:359
+#, c-format
+msgid "Could not close USB port (%s)."
+msgstr "無法關閉 USB 通訊埠 (%s)。"
+
+#: usbdiskdirect/linux.c:218
 msgid "USB Mass Storage direct IO"
 msgstr "USB 大量貯藏體直接 IO"
 
-#: usbdiskdirect/linux.c:285 usbscsi/linux.c:269
+#: usbdiskdirect/linux.c:269 usbscsi/linux.c:253
 #, c-format
 msgid "Failed to open '%s' (%m)."
 msgstr "開啟 %s (%m)失敗。"
 
-#: usbdiskdirect/linux.c:299 usbscsi/linux.c:297
+#: usbdiskdirect/linux.c:283 usbscsi/linux.c:281
 #, c-format
 msgid "Could not close '%s' (%m)."
 msgstr "無法關閉 %s (%m)。"
 
-#: usbdiskdirect/linux.c:323
+#: usbdiskdirect/linux.c:307
 #, c-format
 msgid "Could not seek to offset: %x on '%s' (%m)."
 msgstr "無法尋指到偏移：%x 於 %s (%m)。"
 
-#: usbdiskdirect/linux.c:345
+#: usbdiskdirect/linux.c:329
 #, c-format
 msgid "Could not write to '%s' (%m)."
 msgstr "無法寫入 %s (%m)。"
 
-#: usbdiskdirect/linux.c:366
+#: usbdiskdirect/linux.c:350
 #, c-format
 msgid "Could not read from '%s' (%m)."
 msgstr "無法讀取自 %s (%m)。"
 
-#: usb/libusb.c:264 libusb1/libusb1.c:395
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr "無法開啟 USB 裝置 (%s)。"
-
-#: usb/libusb.c:277 libusb1/libusb1.c:404
-msgid "Camera is already in use."
-msgstr "照相機在使用中。"
-
-#: usb/libusb.c:285
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr "無法卸掛照相機裝置的核心驅動程式 %s。"
-
-#: usb/libusb.c:290 libusb1/libusb1.c:419
-msgid "Could not query kernel driver of device."
-msgstr "無法查詢裝置的核心驅動程式。"
-
-#: usb/libusb.c:299 libusb1/libusb1.c:426
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program (%s) or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-"無法請求介面 %d (%s)。請確認沒有其它程式 (%s) 或核心模組 (例如 %s) 正在使用這"
-"個裝置，並且您有對這個裝置的讀/寫權。"
-
-#: usb/libusb.c:311 libusb1/libusb1.c:437
-msgid "MacOS PTPCamera service"
-msgstr "MacOS PTPCamera 服務"
-
-#: usb/libusb.c:313 libusb1/libusb1.c:439
-msgid "unknown libgphoto2 using program"
-msgstr "不明的 libgphoto2 正使用程式"
-
-#: usb/libusb.c:330 libusb1/libusb1.c:508
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr "無法釋放介面 %d (%s)。"
-
-#: usb/libusb.c:345 libusb1/libusb1.c:522
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr "無法重置 USB 通訊埠 (%s)。"
-
-#: usb/libusb.c:375
-#, c-format
-msgid "Could not close USB port (%s)."
-msgstr "無法關閉 USB 通訊埠 (%s)。"
-
-#: usb/libusb.c:637 libusb1/libusb1.c:965
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr "無法設定配置 %d/%d (%s)"
-
-#: usb/libusb.c:668 libusb1/libusb1.c:994
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr "無法設定從 %d 到 %d 的補充設定 (%s)"
-
-#: usb/libusb.c:757 libusb1/libusb1.c:1159
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "提供的廠商或產品 id (0x%x、0x%x) 不正確。"
-
-#: usb/libusb.c:828 usb/libusb.c:914 libusb1/libusb1.c:1128
-#: libusb1/libusb1.c:1220
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr "無法找到 USB 裝置 (廠商 0x%x、產品 0x%x)。請確認這個裝置已連接到電腦。"
-
-#: usb/libusb.c:1207 libusb1/libusb1.c:1509
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr ""
-"無法找到 USB 裝置 (類別 0x%x、子類 0x%x、協定 0x%x)。請確認這個裝置已連接到電"
-"腦。"
-
-#: libusb1/libusb1.c:413
-msgid "Could not detach kernel driver of camera device."
-msgstr "無法卸離照相機裝置的內核驅動程式。"
-
-#: libusb1/libusb1.c:531
-msgid "Could not reattach kernel driver of camera device."
-msgstr "無法重新附接照相機裝置的內核驅動程式。"
-
-#: usbscsi/linux.c:108
+#: usbscsi/linux.c:92
 #, c-format
 msgid "Device '%s' is locked by another app."
 msgstr "裝置 %s 已被另一個應用程式鎖定。"
 
-#: usbscsi/linux.c:113
+#: usbscsi/linux.c:97
 #, c-format
 msgid "Failed to lock '%s' (%m)."
 msgstr "鎖定 %s (%m) 時失敗。"
 
-#: usbscsi/linux.c:129
+#: usbscsi/linux.c:113
 #, c-format
 msgid "Failed to unlock '%s' (%m)."
 msgstr "解除鎖定 %s (%m) 時失敗。"
 
-#: usbscsi/linux.c:230
+#: usbscsi/linux.c:214
 msgid "USB Mass Storage raw SCSI"
 msgstr "USB 大量貯藏體原始 SCSI"
 
-#: usbscsi/linux.c:341
+#: usbscsi/linux.c:325
 #, c-format
 msgid "Could not send scsi command to: '%s' (%m)."
 msgstr "無法發送 scsi 命令給：%s (%m)。"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/ptpip/ptpip.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/ptpip/ptpip.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/serial/unix.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/serial/unix.c Changed

@@ -9,17 +9,17 @@
  * Based on work by:
  * Copyright 1999 Beat Christen <spiff@longstreet.ch>
  * 	for the toshiba gPhoto library.
- *                   
+ *
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -27,7 +27,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
 /* Solaris needs this */
 #define __EXTENSIONS__
 
@@ -76,24 +77,8 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif 
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 #define CHECK(result) {int r=(result); if (r<0) return (r);}
 
@@ -173,19 +158,20 @@
 #define GP_PORT_SERIAL_RANGE_HIGH       4
 #endif
 
-#ifdef OS2
-#define GP_PORT_SERIAL_PREFIX   "COM%i"
-#define GP_PORT_SERIAL_RANGE_LOW   1
-#define GP_PORT_SERIAL_RANGE_HIGH  4
-#endif
-
 /* IRIX */
 #if defined(__sgi)
 #define GP_PORT_SERIAL_PREFIX "/dev/ttyd%i"
-#define GP_PORT_SERIAL_RANGE_LOW       1 
+#define GP_PORT_SERIAL_RANGE_LOW       1
 #define GP_PORT_SERIAL_RANGE_HIGH     11
 #endif
 
+/* MidnightBSD */
+#ifdef __MidnightBSD__
+#define GP_PORT_SERIAL_PREFIX   "/dev/cuad%x"
+#define GP_PORT_SERIAL_RANGE_LOW        0
+#define GP_PORT_SERIAL_RANGE_HIGH       (0xf)
+#endif
+
 /* Others? */
 
 /* Default */
@@ -203,7 +189,7 @@
 static int gp_port_serial_check_speed (GPPort *dev);
 
 GPPortType
-gp_port_library_type () 
+gp_port_library_type ()
 {
         return (GP_PORT_SERIAL);
 }
@@ -224,7 +210,7 @@
 						  "'%s'"), path);
 		return (GP_ERROR_IO_LOCK);
 	}
-#define __HAVE_LOCKING	
+#define __HAVE_LOCKING
 #elif defined(HAVE_LOCKDEV)
 	pid = dev_lock (path);
 	if (pid) {
@@ -239,14 +225,14 @@
 		}
 		return (GP_ERROR_IO_LOCK);
 	}
-#define __HAVE_LOCKING	
+#define __HAVE_LOCKING
 #endif
 
 #ifndef __HAVE_LOCKING
 # ifdef __GCC__
-#  warning No locking library found. 
+#  warning No locking library found.
 #  warning You will run into problems if you use
-#  warning gphoto2 with a serial (RS232) camera in 
+#  warning gphoto2 with a serial (RS232) camera in
 #  warning combination with Konqueror (KDE) or Nautilus (GNOME).
 #  warning This will *not* concern USB cameras.
 # endif
@@ -296,9 +282,6 @@
 	char path1024, prefix1024;
 	int x;
 	struct stat s;
-#ifdef OS2
-	int r, fh, option;
-#endif
 
 	/* Copy in the serial port prefix */
 	strcpy (prefix, GP_PORT_SERIAL_PREFIX);
@@ -314,15 +297,6 @@
 
 		sprintf (path, prefix, x);
 
-		/* OS/2 seems to need an additional check */
-#ifdef OS2
-		r = DosOpen (path, &fh, &option, 0, 0, 1,
-			     OPEN_FLAGS_FAIL_ON_ERROR |
-			     OPEN_SHARE_DENYREADWRITE, 0);
-		DosClose(fh);
-		if (r)
-			continue;
-#endif
 		/* Very first of all, if the device node is not there,
 		 * there is no need to try locking. */
 		if ((stat (path, &s) == -1) && ((errno == ENOENT) || (errno == ENODEV)))
@@ -388,9 +362,6 @@
 gp_port_serial_open (GPPort *dev)
 {
 	int result, max_tries = 5, i;
-#ifdef OS2
-	int fd;
-#endif
 	char *port;
 	GPPortInfo	info;
 
@@ -419,12 +390,8 @@
 	}
 	dev->pl->fd = -1;
 
-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__MidnightBSD__)
 	dev->pl->fd = open (port, O_RDWR | O_NOCTTY | O_NONBLOCK);
-#elif OS2
-	fd = open (port, O_RDWR | O_BINARY);
-	dev->pl->fd = open (port, O_RDWR | O_BINARY);
-	close(fd);
 #else
 	if (dev->pl->fd == -1)
 		dev->pl->fd = open (port, O_RDWR | O_NOCTTY | O_SYNC | O_NONBLOCK);
@@ -493,7 +460,7 @@
 
 	len = 0;
         while (len < size) {
-		
+
 		/*
 		 * Make sure we write all data while handling
 		 * the harmless errors
@@ -517,13 +484,11 @@
         }
 
         /* wait till all bytes are really sent */
-#ifndef OS2
 #ifdef HAVE_TERMIOS_H
         tcdrain (dev->pl->fd);
 #else
         ioctl (dev->pl->fd, TCDRAIN, 0);
 #endif
-#endif
         return GP_OK;
 }
 
@@ -551,7 +516,7 @@
 
 		/* Set timeout value within input loop */
                 timeout.tv_usec = (dev->timeout % 1000) * 1000;
-                timeout.tv_sec = (dev->timeout / 1000); 
+                timeout.tv_sec = (dev->timeout / 1000);
 
 		/* Any data available? */
                 if (!select (dev->pl->fd + 1, &readfs, NULL, NULL, &timeout))
@@ -577,7 +542,7 @@
 			 * as 0xff 0x00 sequence.
 			 *
 			 * 0xff sent by the camera are escaped as
-			 * 0xff 0xff sequence. 
+			 * 0xff 0xff sequence.
 			 *
 			 * All other 0xff 0xXX sequences are errors.
 			 *
@@ -788,16 +753,11 @@
 gp_port_serial_check_speed (GPPort *dev)
 {
 	speed_t speed;
-#ifdef OS2
-	ULONG rc;
-	ULONG   ulParmLen = 2;     /* Maximum size of the parameter packet */
-#else
 #ifdef HAVE_TERMIOS_H
 	struct termios tio;
 #else
 	struct sgttyb ttyb;
 #endif
-#endif
 
 	/*
 	 * We need an open device in order to set the speed. If there is no
@@ -813,19 +773,6 @@
 	GP_LOG_D ("Setting baudrate to %d...", dev->settings.serial.speed);
 	speed = gp_port_serial_baudconv (dev->settings.serial.speed);
 
-#ifdef OS2
-	rc = DosDevIOCtl (dev->pl->fd,       /* Device handle               */
-			  0x0001,            /* Serial-device control       */
-			  0x0043,            /* Sets bit rate               */
-			  (PULONG) &(dev->settings.serial.speed),
-			  sizeof(baudrate),  /* Max. size of parameter list */
-			  &ulParmLen,        /* Size of parameter packet    */
-			  NULL,              /* No data packet              */
-			  0,                 /* Maximum size of data packet */
-			  NULL);             /* Size of data packet         */
-	if(rc != 0)
-		printf("DosDevIOCtl baudrate error:%d\n",rc);
-#else /* !OS2 */
 #ifdef HAVE_TERMIOS_H
         if (tcgetattr(dev->pl->fd, &tio) < 0) {
 		gp_port_set_error (dev, _("Could not set the baudrate to %d"),
@@ -906,7 +853,6 @@
                 return GP_ERROR_IO_SERIAL_SPEED;
         }
 #endif
-#endif
 
 	dev->pl->baudrate = dev->settings.serial.speed;
         return GP_OK;
@@ -953,7 +899,7 @@
         ops = malloc (sizeof (GPPortOperations));
 	if (!ops)
 		return (NULL);
-        memset (ops, 0, sizeof (GPPortOperations)); 
+        memset (ops, 0, sizeof (GPPortOperations));
 
         ops->init   = gp_port_serial_init;
         ops->exit   = gp_port_serial_exit;

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/tests Added

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/tests/Makefile.am Added

@@ -0,0 +1,33 @@
+TESTS =
+INSTALL_TESTS =
+check_PROGRAMS =
+noinst_PROGRAMS =
+
+# When we build all our iolibs in one directory, we can run our checks
+# with IOLIBS set to the iolib build directory.
+TESTS_ENVIRONMENT = env \
+	IOLIBS="$(top_builddir)"
+
+# After installation, this will be IOLIBS = $(DESTDIR)$(iolibdir)
+INSTALL_TESTS_ENVIRONMENT = env \
+	IOLIBS="$(DESTDIR)$(iolibdir)" \
+	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
+
+AM_CPPFLAGS += -I$(top_srcdir)
+
+noinst_PROGRAMS += test-gp-port
+test_gp_port_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
+test_gp_port_SOURCES = test-gp-port.c
+test_gp_port_LDADD = $(top_builddir)/libgphoto2_port/libgphoto2_port.la
+test_gp_port_LDADD += $(LIBLTDL) $(INTLLIBS)
+
+TESTS += test-port-list
+INSTALL_TESTS += test-port-list
+check_PROGRAMS += test-port-list
+noinst_PROGRAMS += test-port-list
+test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
+test_port_list_SOURCES = test-port-list.c
+test_port_list_LDADD = $(top_builddir)/libgphoto2_port/libgphoto2_port.la
+test_port_list_LDADD += $(LIBLTDL) $(INTLLIBS)
+
+include $(top_srcdir)/installcheck.mk

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/tests/Makefile.in Added

@@ -0,0 +1,1164 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 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@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+TESTS = test-port-list$(EXEEXT)
+check_PROGRAMS = test-port-list$(EXEEXT)
+noinst_PROGRAMS = test-gp-port$(EXEEXT) test-port-list$(EXEEXT)
+subdir = tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/gphoto-m4/gp-asm-symver-ifelse.m4 \
+	$(top_srcdir)/gphoto-m4/gp-asm-symver-support.m4 \
+	$(top_srcdir)/gphoto-m4/gp-check-library.m4 \
+	$(top_srcdir)/gphoto-m4/gp-check-shell-environment.m4 \
+	$(top_srcdir)/gphoto-m4/gp-config-msg.m4 \
+	$(top_srcdir)/gphoto-m4/gp-documentation.m4 \
+	$(top_srcdir)/gphoto-m4/gp-driverdir.m4 \
+	$(top_srcdir)/gphoto-m4/gp-gettext-setup.m4 \
+	$(top_srcdir)/gphoto-m4/gp-libltdl.m4 \
+	$(top_srcdir)/gphoto-m4/gp-references.m4 \
+	$(top_srcdir)/gphoto-m4/gp-udev.m4 \
+	$(top_srcdir)/gphoto-m4/gp-va-copy.m4 \
+	$(top_srcdir)/auto-m4/gettext.m4 \
+	$(top_srcdir)/auto-m4/iconv.m4 \
+	$(top_srcdir)/auto-m4/intlmacosx.m4 \
+	$(top_srcdir)/auto-m4/lib-ld.m4 \
+	$(top_srcdir)/auto-m4/lib-link.m4 \
+	$(top_srcdir)/auto-m4/lib-prefix.m4 \
+	$(top_srcdir)/auto-m4/libtool.m4 \
+	$(top_srcdir)/auto-m4/ltoptions.m4 \
+	$(top_srcdir)/auto-m4/ltsugar.m4 \
+	$(top_srcdir)/auto-m4/ltversion.m4 \
+	$(top_srcdir)/auto-m4/lt~obsolete.m4 \
+	$(top_srcdir)/auto-m4/nls.m4 $(top_srcdir)/auto-m4/po.m4 \
+	$(top_srcdir)/auto-m4/progtest.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(SHELL) $(top_srcdir)/auto-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_test_gp_port_OBJECTS = test_gp_port-test-gp-port.$(OBJEXT)
+test_gp_port_OBJECTS = $(am_test_gp_port_OBJECTS)
+am__DEPENDENCIES_1 =
+test_gp_port_DEPENDENCIES =  \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_test_port_list_OBJECTS = test_port_list-test-port-list.$(OBJEXT)
+test_port_list_OBJECTS = $(am_test_port_list_OBJECTS)
+test_port_list_DEPENDENCIES =  \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/auto-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/test_gp_port-test-gp-port.Po \
+	./$(DEPDIR)/test_port_list-test-port-list.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(test_gp_port_SOURCES) $(test_port_list_SOURCES)
+DIST_SOURCES = $(test_gp_port_SOURCES) $(test_port_list_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='&#x1b;0;31m'; \
+    grn='&#x1b;0;32m'; \
+    lgn='&#x1b;1;32m'; \
+    blu='&#x1b;1;34m'; \
+    mgn='&#x1b;0;35m'; \
+    brg='&#x1b;1m'; \
+    std='&#x1b;m'; \
+  fi; \
+}
+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__recheck_rx = ^ 	*:recheck: 	*
+am__global_test_result_rx = ^ 	*:global-test-result: 	*
+am__copy_in_global_log_rx = ^ 	*:copy-in-global-log: 	*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)nNOo/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)yYeEsS/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub(" 	*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)nNoO/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/^/*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *\ \	$$f\ \	* | *\ \	$$dir$$f\ \	*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/auto-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/auto-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/auto-aux/depcomp \
+	$(top_srcdir)/auto-aux/mkinstalldirs \
+	$(top_srcdir)/auto-aux/test-driver \
+	$(top_srcdir)/installcheck.mk
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFAULT_IOLIBS = @DEFAULT_IOLIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE_LIBGPHOTO2_PORT = @GETTEXT_PACKAGE_LIBGPHOTO2_PORT@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTKDOC = @GTKDOC@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+IOLIB_LIST = @IOLIB_LIST@
+IOLIB_LTLIST = @IOLIB_LTLIST@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
+LIBEXIF_CONFIG_PROG = @LIBEXIF_CONFIG_PROG@
+LIBEXIF_LIBS = @LIBEXIF_LIBS@
+LIBGPHOTO2_PORT_AGE = @LIBGPHOTO2_PORT_AGE@
+LIBGPHOTO2_PORT_CURRENT = @LIBGPHOTO2_PORT_CURRENT@
+LIBGPHOTO2_PORT_CURRENT_MIN = @LIBGPHOTO2_PORT_CURRENT_MIN@
+LIBGPHOTO2_PORT_REVISION = @LIBGPHOTO2_PORT_REVISION@
+LIBGPHOTO2_PORT_VERSION_INFO = @LIBGPHOTO2_PORT_VERSION_INFO@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUSB1_CFLAGS = @LIBUSB1_CFLAGS@
+LIBUSB1_CONFIG_PROG = @LIBUSB1_CONFIG_PROG@
+LIBUSB1_LIBS = @LIBUSB1_LIBS@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_CONFIG_PROG = @LIBUSB_CONFIG_PROG@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTDLINCL = @LTDLINCL@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAIL_GPHOTO_DEVEL = @MAIL_GPHOTO_DEVEL@
+MAIL_GPHOTO_TRANSLATION = @MAIL_GPHOTO_TRANSLATION@
+MAIL_GPHOTO_USER = @MAIL_GPHOTO_USER@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+REQUIREMENTS_FOR_LIBEXIF = @REQUIREMENTS_FOR_LIBEXIF@
+REQUIREMENTS_FOR_LIBUSB = @REQUIREMENTS_FOR_LIBUSB@
+REQUIREMENTS_FOR_LIBUSB1 = @REQUIREMENTS_FOR_LIBUSB1@
+SED = @SED@
+SERIAL_LIBS = @SERIAL_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+URL_DIGICAM_LIST = @URL_DIGICAM_LIST@
+URL_GPHOTO_HOME = @URL_GPHOTO_HOME@
+URL_GPHOTO_PROJECT = @URL_GPHOTO_PROJECT@
+URL_JPHOTO_HOME = @URL_JPHOTO_HOME@
+URL_USB_MASSSTORAGE = @URL_USB_MASSSTORAGE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+apidocdir = @apidocdir@
+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@
+iolibdir = @iolibdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+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@
+udevscriptdir = @udevscriptdir@
+INSTALL_TESTS = test-port-list
+
+# When we build all our iolibs in one directory, we can run our checks
+# with IOLIBS set to the iolib build directory.
+TESTS_ENVIRONMENT = env \
+	IOLIBS="$(top_builddir)"
+
+
+# After installation, this will be IOLIBS = $(DESTDIR)$(iolibdir)
+INSTALL_TESTS_ENVIRONMENT = env \
+	IOLIBS="$(DESTDIR)$(iolibdir)" \
+	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
+
+test_gp_port_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
+test_gp_port_SOURCES = test-gp-port.c
+test_gp_port_LDADD =  \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) \
+	$(INTLLIBS)
+test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS)
+test_port_list_SOURCES = test-port-list.c
+test_port_list_LDADD =  \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) \
+	$(INTLLIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/installcheck.mk $(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 tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tests/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__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+$(top_srcdir)/installcheck.mk $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+test-gp-port$(EXEEXT): $(test_gp_port_OBJECTS) $(test_gp_port_DEPENDENCIES) $(EXTRA_test_gp_port_DEPENDENCIES) 
+	@rm -f test-gp-port$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_gp_port_OBJECTS) $(test_gp_port_LDADD) $(LIBS)
+
+test-port-list$(EXEEXT): $(test_port_list_OBJECTS) $(test_port_list_DEPENDENCIES) $(EXTRA_test_port_list_DEPENDENCIES) 
+	@rm -f test-port-list$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_port_list_OBJECTS) $(test_port_list_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gp_port-test-gp-port.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_port_list-test-port-list.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|^/*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+test_gp_port-test-gp-port.o: test-gp-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_gp_port-test-gp-port.o -MD -MP -MF $(DEPDIR)/test_gp_port-test-gp-port.Tpo -c -o test_gp_port-test-gp-port.o `test -f 'test-gp-port.c' || echo '$(srcdir)/'`test-gp-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gp_port-test-gp-port.Tpo $(DEPDIR)/test_gp_port-test-gp-port.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-gp-port.c' object='test_gp_port-test-gp-port.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_gp_port-test-gp-port.o `test -f 'test-gp-port.c' || echo '$(srcdir)/'`test-gp-port.c
+
+test_gp_port-test-gp-port.obj: test-gp-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_gp_port-test-gp-port.obj -MD -MP -MF $(DEPDIR)/test_gp_port-test-gp-port.Tpo -c -o test_gp_port-test-gp-port.obj `if test -f 'test-gp-port.c'; then $(CYGPATH_W) 'test-gp-port.c'; else $(CYGPATH_W) '$(srcdir)/test-gp-port.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gp_port-test-gp-port.Tpo $(DEPDIR)/test_gp_port-test-gp-port.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-gp-port.c' object='test_gp_port-test-gp-port.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gp_port_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_gp_port-test-gp-port.obj `if test -f 'test-gp-port.c'; then $(CYGPATH_W) 'test-gp-port.c'; else $(CYGPATH_W) '$(srcdir)/test-gp-port.c'; fi`
+
+test_port_list-test-port-list.o: test-port-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_port_list-test-port-list.o -MD -MP -MF $(DEPDIR)/test_port_list-test-port-list.Tpo -c -o test_port_list-test-port-list.o `test -f 'test-port-list.c' || echo '$(srcdir)/'`test-port-list.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_port_list-test-port-list.Tpo $(DEPDIR)/test_port_list-test-port-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-port-list.c' object='test_port_list-test-port-list.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_port_list-test-port-list.o `test -f 'test-port-list.c' || echo '$(srcdir)/'`test-port-list.c
+
+test_port_list-test-port-list.obj: test-port-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_port_list-test-port-list.obj -MD -MP -MF $(DEPDIR)/test_port_list-test-port-list.Tpo -c -o test_port_list-test-port-list.obj `if test -f 'test-port-list.c'; then $(CYGPATH_W) 'test-port-list.c'; else $(CYGPATH_W) '$(srcdir)/test-port-list.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_port_list-test-port-list.Tpo $(DEPDIR)/test_port_list-test-port-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-port-list.c' object='test_port_list-test-port-list.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_port_list_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_port_list-test-port-list.obj `if test -f 'test-port-list.c'; then $(CYGPATH_W) 'test-port-list.c'; else $(CYGPATH_W) '$(srcdir)/test-port-list.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws=' 	'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS: $(check_PROGRAMS)
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-port-list.log: test-port-list$(EXEEXT)
+	@p='test-port-list$(EXEEXT)'; \
+	b='test-port-list'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(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
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+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:
+	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:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+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-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/test_gp_port-test-gp-port.Po
+	-rm -f ./$(DEPDIR)/test_port_list-test-port-list.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+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: installcheck-local
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/test_gp_port-test-gp-port.Po
+	-rm -f ./$(DEPDIR)/test_port_list-test-port-list.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags 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 installcheck-local \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# FIXME: Only run this if not cross-compiling
+installcheck-local: $(INSTALL_TESTS) $(INSTALLCHECK_DEPS)
+	@total=0; failed=0; success=0; ignored=0; \
+	echo "Running \"installcheck\" test cases..."; \
+	for script in $(INSTALL_TESTS); do \
+		echo "Test case: $$script"; \
+		total="$$(expr $$total + 1)"; \
+		if test -f "./$$script"; then dir="./"; \
+		elif test -f "$$script"; then dir=""; \
+		else dir="$(srcdir)/"; fi; \
+		if $(INSTALL_TESTS_ENVIRONMENT) "$$dir/$$script"; then \
+			echo "SUCCEEDED: $$script"; \
+			success="$$(expr $$success + 1)"; \
+		else \
+			s="$$?"; \
+			if test "$$s" = "77"; then \
+				echo "FAILURE IGNORED (return code $$s): $$script"; \
+				ignored="$$(expr $$ignored + 1)"; \
+			else \
+				echo "FAILED (return code $$s): $$script"; \
+				failed="$$(expr $$failed + 1)"; \
+			fi; \
+		fi; \
+	done; \
+	echo "Test summary: $$success succeeded, $$failed failed, $$ignored failures ignored, $$total tests in total."; \
+	if test "$$failed" -gt 0; then \
+		echo "Error: One or more \"installcheck\" testcases have failed."; \
+		exit 1; \
+	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:

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/tests/test-gp-port.c Added

@@ -0,0 +1,177 @@
+/* test-gp-port.c
+ *
+ * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gphoto2/gphoto2-port.h>
+#include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-port-result.h>
+#include <gphoto2/gphoto2-port-info-list.h>
+
+static void
+log_func (GPLogLevel level, const char *domain,
+	  const char *str, void *data)
+{
+	fprintf (stdout, "%s\n", str);
+}
+
+int
+main (int argc, char **argv)
+{
+	GPPort *dev;
+	GPPortSettings settings;
+	char buf32;
+	int ret;
+	GPPortInfoList *il;
+	GPPortInfo info;
+	GPLevel level;
+	unsigned int i;
+	int id1,id2,id3;
+
+	/* test https://github.com/gphoto/libgphoto2/issues/45 */
+	id1 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
+	id2 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
+	if (GP_OK != gp_log_remove_func (id1)) {
+		printf ("id1 not found?\n");
+		return 1;
+	}
+	id3 = gp_log_add_func (GP_LOG_DATA, log_func, NULL);
+	if (GP_OK != gp_log_remove_func (id2)) {
+		printf ("id2 not found?\n");
+		return 1;
+	}
+	if (GP_OK != gp_log_remove_func (id3)) {
+		printf ("id3 not found?\n");
+		return 1;
+	}
+	if (GP_ERROR_BAD_PARAMETERS != gp_log_remove_func (id3)) {
+		printf ("id3 was found?\n");
+		return 1;
+	}
+
+	gp_log_add_func (GP_LOG_DATA, log_func, NULL);
+
+	for (i = 0; i < 2; i++) {
+
+		ret = gp_port_info_list_new (&il);
+		if (ret < 0) {
+			printf ("Could not create list of ports: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		ret = gp_port_info_list_load (il);
+		if (ret < 0) {
+			printf ("Could not load list of ports: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		printf ("############\n");
+		printf ("############ There are %i IO-drivers "
+			"installed on your system.\n",
+			gp_port_info_list_count (il));
+		printf ("############\n");
+
+		ret = gp_port_info_list_get_info (il, 0, &info);
+		if (ret < 0) {
+			printf ("Could not get info of first port in "
+				"list: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		ret = gp_port_new (&dev);
+		if (ret < 0) {
+			printf ("Could not create device: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		ret = gp_port_set_info (dev, info);
+		if (ret < 0) {
+			printf ("Could not set port info: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		gp_port_info_list_free (il);
+
+		ret = gp_port_set_timeout (dev, 500);
+		if (ret < 0) {
+			printf ("Could not set timeout: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		strcpy (settings.serial.port, "serial:/dev/ttyS0");
+		settings.serial.speed = 19200;
+		settings.serial.bits = 8;
+		settings.serial.parity = 0;
+		settings.serial.stopbits = 1;
+
+		ret = gp_port_set_settings (dev, settings);
+		if (ret < 0) {
+			printf ("Could not set settings: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		ret = gp_port_open (dev);
+		if (ret < 0) {
+			printf ("Could not open device: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		gp_port_get_settings(dev, &settings);
+		settings.serial.speed = 57600;
+		gp_port_set_settings(dev, settings);
+
+		ret = gp_port_get_pin (dev, GP_PIN_DTR, &level);
+		if (ret < 0) {
+			printf ("Could not get level of pin DTR: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		ret = gp_port_set_pin (dev, GP_PIN_CTS, GP_LEVEL_HIGH);
+		if (ret < 0) {
+			printf ("Could not set level of pin CTS: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+
+		gp_port_write (dev, "AT\n", 3);
+
+		gp_port_read (dev, buf, 3);
+		buf3 = 0;
+		printf("recv: %s\n", buf);
+
+		gp_port_close (dev);
+
+		gp_port_free (dev);
+	}
+
+	return 0;
+}

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/tests/test-port-list.c Added

@@ -0,0 +1,135 @@
+/* test-port-list.c
+ *
+ * Copyright (C) 2002 Lutz Mueller <lutz@users.sourceforge.net>
+ * Copyright (C) 2007 Hans Ulrich Niedermann <gp@n-dimensional.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gphoto2/gphoto2-port.h>
+#include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-port-result.h>
+#include <gphoto2/gphoto2-port-info-list.h>
+
+
+#ifdef __GNUC__
+#define __unused__ __attribute__((unused))
+#else
+#define __unused__
+#endif
+
+
+static void
+log_func (GPLogLevel level, const char *domain __unused__,
+	  const char *str, void *data __unused__)
+{
+	if (level <= GP_LOG_ERROR) {
+		fprintf (stdout, "%s\n", str);
+		fflush (stdout);
+	}
+}
+
+
+static int
+run_test ()
+{
+	int i;
+	int ret;
+	GPPortInfoList *il;
+
+	int count;
+
+	ret = gp_port_info_list_new (&il);
+	if (ret < 0) {
+		printf ("Could not create list of ports: %s\n",
+			gp_port_result_as_string (ret));
+		return (1);
+	}
+
+	ret = gp_port_info_list_load (il);
+	if (ret < 0) {
+		printf ("Could not load list of ports: %s\n",
+			gp_port_result_as_string (ret));
+		return (2);
+	}
+
+	count = gp_port_info_list_count (il);
+	if (count < 0) {
+		printf("gp_port_info_list_count error: %d\n", count);
+		return 1;
+	} else if (count == 0) {
+		/* Unlike gphoto2-abilities-list,
+		 * gphoto2-port-info-list.c does not just load
+		 * the driver libs, but also scans for
+		 * ports. Thus 0 ports are a valid results.
+		 */
+	}
+	/* Non-empty list */
+	printf ("%i ports found on your system.\n", count);
+
+	for (i = 0; i < count; i++) {
+		const char *port_type_str;
+		char *name, *path;
+		GPPortInfo	info;
+		GPPortType	type;
+		ret = gp_port_info_list_get_info (il, i, &info);
+		if (ret < 0) {
+		  	printf ("ERROR getting iolib info: %s\n",
+				gp_port_result_as_string (ret));
+			return (1);
+		}
+		gp_port_info_get_type (info, &type);
+		gp_port_info_get_name (info, &name);
+		gp_port_info_get_path (info, &path);
+		switch (type) {
+		case GP_PORT_NONE:   port_type_str = "NONE"; break;
+		case GP_PORT_SERIAL: port_type_str = "SERIAL"; break;
+		case GP_PORT_USB:    port_type_str = "USB"; break;
+		case GP_PORT_USB_DISK_DIRECT:    port_type_str = "USBDISKDIRECT"; break;
+		case GP_PORT_USB_SCSI:    port_type_str = "USBSCSI"; break;
+		case GP_PORT_DISK:   port_type_str = "DISK"; break;
+		case GP_PORT_PTPIP:  port_type_str = "PTPIP"; break;
+		case GP_PORT_IP:     port_type_str = "IP"; break;
+		default:             port_type_str = "UNKNOWN"; return 3; break;
+		}
+		printf ("No:    %d\n"
+			"Type:  %s\n"
+			"Name:  %s\n"
+			"Path:  %s\n",
+			i,
+			port_type_str,
+			name,
+			path
+			);
+	}
+
+
+	gp_port_info_list_free (il);
+	return 0;
+}
+
+
+int
+main ()
+{
+	gp_log_add_func (GP_LOG_DATA, log_func, NULL);
+	return run_test();
+}

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/usb/Makefile-files -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/usb/Makefile-files Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/usb/libusb.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/usb/libusb.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/usbdiskdirect/linux.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/usbdiskdirect/linux.c Changed

@@ -1,5 +1,5 @@
 /* Direct IO to USB Mass storage devices port library for Linux
- * 
+ *
  *   Copyright (c) 2010 Hans de Goede <hdegoede@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include "config.h"
 #include <gphoto2/gphoto2-port-library.h>
@@ -44,24 +44,8 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif 
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 /* From Linux asm/fcntl.h */
 #ifndef O_DIRECT
@@ -75,7 +59,7 @@
 };
 
 GPPortType
-gp_port_library_type () 
+gp_port_library_type ()
 {
 	return GP_PORT_USB_DISK_DIRECT;
 }
@@ -103,9 +87,9 @@
 	}
 #else
 # ifdef __GCC__
-#  warning No locking library found. 
+#  warning No locking library found.
 #  warning You will run into problems if you use
-#  warning gphoto2 with a usbdiskdirect picframe in 
+#  warning gphoto2 with a usbdiskdirect picframe in
 #  warning combination with Konqueror (KDE) or Nautilus (GNOME).
 #  warning This will *not* concern USB cameras.
 # endif
@@ -172,7 +156,7 @@
 	return path;
 }
 
-static int 
+static int
 gp_port_usbdiskdirect_get_usb_id (const char *disk,
 	unsigned short *vendor_id, unsigned short *product_id)
 {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/usbscsi/linux.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/usbscsi/linux.c Changed

@@ -1,5 +1,5 @@
 /* SCSI commands to USB Mass storage devices port library for Linux
- * 
+ *
  *   Copyright (c) 2010-2012 Hans de Goede <hdegoede@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the 
+ * along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
@@ -64,24 +64,8 @@
 #include <gphoto2/gphoto2-port-log.h>
 #include <gphoto2/gphoto2-port.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif 
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 #define CHECK(result) {int r=(result); if (r<0) return (r);}
 
@@ -90,7 +74,7 @@
 };
 
 GPPortType
-gp_port_library_type () 
+gp_port_library_type ()
 {
 	return GP_PORT_USB_SCSI;
 }
@@ -116,7 +100,7 @@
 		}
 	}
 #else
-	GP_LOG_D ("Locking '%s' not possible, flock not availbale.", port->settings.usbscsi.path);
+	GP_LOG_D ("Locking '%s' not possible, flock not available.", port->settings.usbscsi.path);
 #endif
 	return GP_OK;
 }
@@ -167,7 +151,7 @@
 	return path;
 }
 
-static int 
+static int
 gp_port_usbscsi_get_usb_id (const char *sg,
 	unsigned short *vendor_id, unsigned short *product_id)
 {

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/vusb/vcamera.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/vusb/vcamera.c Changed

@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-
+#define _DARWIN_C_SOURCE
 #include "config.h"
 #include <gphoto2/gphoto2-port-library.h>
 #include <gphoto2/gphoto2-port-portability.h>
@@ -44,24 +44,8 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 #define CHECK(result) {int r=(result); if (r<0) return (r);}
 
@@ -118,14 +102,18 @@
 static int put_string(unsigned char *data, char *str) {
 	int i;
 
-	if (strlen(str)>255)
+	if (!str) {	/* empty string, just has length 0 */
+		data0 = 0;
+		return 1;
+	}
+	if (strlen(str)+1>255)
 		gp_log (GP_LOG_ERROR, "put_string", "string length is longer than 255 characters");
 
-	data0 = strlen (str);
+	data0 = strlen (str)+1;
 	for (i=0;i<data0;i++)
 		put_16bit_le(data+1+2*i,stri);
 
-	return 1+strlen(str)*2;
+	return 1+(strlen(str)+1)*2;
 }
 
 static char * get_string(unsigned char *data) {
@@ -217,6 +205,7 @@
 #define PTP_RC_InvalidObjectFormatCode			0x200B
 #define PTP_RC_StoreFull				0x200C
 #define PTP_RC_ObjectWriteProtected			0x200D
+#define PTP_RC_StoreReadOnly				0x200E
 #define PTP_RC_AccessDenied				0x200F
 #define PTP_RC_NoThumbnailPresent			0x2010
 #define PTP_RC_StoreNotAvailable			0x2013
@@ -351,6 +340,41 @@
 };
 typedef struct _PTPDevicePropDesc PTPDevicePropDesc;
 
+// We need these (modified) helpers from ptp.c.
+// Perhaps vcamera.c should be moved to camlibs/ptp2 for easier sharing
+// in the future.
+static void
+ptp_free_devicepropvalue(uint16_t dt, PTPPropertyValue* dpd)
+{
+	if (dt == /* PTP_DTC_STR */ 0xFFFF) {
+		free(dpd->str);
+	} else if (dt & /* PTP_DTC_ARRAY_MASK */ 0x4000) {
+		free(dpd->a.v);
+	}
+}
+
+static void
+ptp_free_devicepropdesc(PTPDevicePropDesc* dpd)
+{
+	uint16_t i;
+
+	ptp_free_devicepropvalue (dpd->DataType, &dpd->FactoryDefaultValue);
+	ptp_free_devicepropvalue (dpd->DataType, &dpd->CurrentValue);
+	switch (dpd->FormFlag) {
+	case /* PTP_DPFF_Range */ 0x01:
+		ptp_free_devicepropvalue (dpd->DataType, &dpd->FORM.Range.MinimumValue);
+		ptp_free_devicepropvalue (dpd->DataType, &dpd->FORM.Range.MaximumValue);
+		ptp_free_devicepropvalue (dpd->DataType, &dpd->FORM.Range.StepSize);
+		break;
+	case /* PTP_DPFF_Enumeration */ 0x02:
+		if (dpd->FORM.Enum.SupportedValue) {
+			for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++)
+				ptp_free_devicepropvalue (dpd->DataType, dpd->FORM.Enum.SupportedValue+i);
+			free (dpd->FORM.Enum.SupportedValue);
+		}
+	}
+}
+
 static int ptp_battery_getdesc(vcamera*,PTPDevicePropDesc*);
 static int ptp_battery_getvalue(vcamera*,PTPPropertyValue*);
 static int ptp_imagesize_getdesc(vcamera*,PTPDevicePropDesc*);
@@ -394,8 +418,28 @@
 static struct ptp_dirent *first_dirent = NULL;
 static uint32_t	ptp_objectid = 0;
 
+static void *read_file(struct ptp_dirent *cur) {
+	FILE *file = fopen(cur->fsname, "rb");
+	if (!file) {
+		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not open %s", cur->fsname);
+		return NULL;
+	}
+	void *data = malloc(cur->stbuf.st_size);
+	if (!data) {
+		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not allocate data for %s", cur->fsname);
+		return NULL;
+	}
+	if (!fread(data, cur->stbuf.st_size, 1, file)) {
+		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not read data of %s", cur->fsname);
+		free(data);
+		data = NULL;
+	}
+	fclose(file);
+	return data;
+}
+
 static void
-read_directories(char *path, struct ptp_dirent *parent) {
+read_directories(const char *path, struct ptp_dirent *parent) {
 	struct ptp_dirent	*cur;
 	gp_system_dir		dir;
 	gp_system_dirent	de;
@@ -433,7 +477,7 @@
 }
 
 static void
-read_tree(char *path) {
+read_tree(const char *path) {
 	struct	ptp_dirent *root = NULL, *dir, *dcim = NULL;
 
 	if (first_dirent)
@@ -457,7 +501,7 @@
 	}
 	if (!dcim) {
 		dcim = malloc(sizeof(struct ptp_dirent));
-		dcim->name = strdup("");
+		dcim->name = strdup("DCIM");
 		dcim->fsname = strdup(path);
 		dcim->id = ptp_objectid++;
 		dcim->next = first_dirent;
@@ -476,12 +520,6 @@
 		ptp_response (cam, PTP_RC_InvalidParameter, 0);
 		return 1;
 	}
-	if (cam->session) {
-		gp_log (GP_LOG_ERROR,__FUNCTION__,"session is already open");
-		ptp_response (cam, PTP_RC_SessionAlreadyOpened, 0);
-		return 1;
-	}
-	cam->session = ptp->params0;
 	ptp_response (cam,PTP_RC_OK,0);
 	return 1;
 }
@@ -888,27 +926,14 @@
 	if (ofc == 0x3801) {			/* We are jpeg ... look into the exif data */
 		ExifData	*ed;
 		ExifEntry	*e;
-		int		fd;
 		unsigned char	*filedata;
 
-		filedata = malloc(cur->stbuf.st_size);
-		fd =  open(cur->fsname,O_RDONLY);
-		if (fd == -1) {
-			free (filedata);
-			free (data);
-			gp_log (GP_LOG_ERROR,__FUNCTION__, "could not open %s", cur->fsname);
-			ptp_response(cam,PTP_RC_GeneralError,0);
-			return 1;
-		}
-		if (cur->stbuf.st_size != read(fd, filedata, cur->stbuf.st_size)) {
-			free (filedata);
+		filedata = read_file(cur);
+		if (!filedata) {
 			free (data);
-			close (fd);
-			gp_log (GP_LOG_ERROR,__FUNCTION__, "could not read data of %s", cur->fsname);
 			ptp_response(cam,PTP_RC_GeneralError,0);
 			return 1;
 		}
-		close (fd);
 
 		ed = exif_data_new_from_data ((unsigned char*)filedata, cur->stbuf.st_size);
 		if (ed) {
@@ -979,7 +1004,6 @@
 ptp_getobject_write(vcamera *cam, ptpcontainer *ptp) {
 	unsigned char 		*data;
 	struct ptp_dirent	*cur;
-	int fd;
 
 	CHECK_SEQUENCE_NUMBER();
 	CHECK_SESSION();
@@ -995,22 +1019,11 @@
 		ptp_response(cam,PTP_RC_InvalidObjectHandle,0);
 		return 1;
 	}
-	data = malloc(cur->stbuf.st_size);
-	fd =  open(cur->fsname,O_RDONLY);
-	if (fd == -1) {
-		free (data);
-		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not open %s", cur->fsname);
-		ptp_response(cam,PTP_RC_GeneralError,0);
-		return 1;
-	}
-	if (cur->stbuf.st_size != read(fd, data, cur->stbuf.st_size)) {
-		free (data);
-		close (fd);
-		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not read data of %s", cur->fsname);
+	data = read_file(cur);
+	if (!data) {
 		ptp_response(cam,PTP_RC_GeneralError,0);
 		return 1;
 	}
-	close (fd);
 
 	ptp_senddata (cam, 0x1009, data, cur->stbuf.st_size);
 	free (data);
@@ -1022,7 +1035,6 @@
 ptp_getthumb_write(vcamera *cam, ptpcontainer *ptp) {
 	unsigned char 		*data;
 	struct ptp_dirent	*cur;
-	int			fd;
 #ifdef HAVE_LIBEXIF
         ExifData		*ed;
 #endif
@@ -1041,22 +1053,11 @@
 		ptp_response(cam,PTP_RC_InvalidObjectHandle,0);
 		return 1;
 	}
-	data = malloc(cur->stbuf.st_size);
-	fd =  open(cur->fsname,O_RDONLY);
-	if (fd == -1) {
-		free (data);
-		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not open %s", cur->fsname);
-		ptp_response(cam,PTP_RC_GeneralError,0);
-		return 1;
-	}
-	if (cur->stbuf.st_size != read(fd, data, cur->stbuf.st_size)) {
-		free (data);
-		close (fd);
-		gp_log (GP_LOG_ERROR,__FUNCTION__, "could not read data of %s", cur->fsname);
+	data = read_file(cur);
+	if (!data) {
 		ptp_response(cam,PTP_RC_GeneralError,0);
 		return 1;
 	}
-	close (fd);
 
 #ifdef HAVE_LIBEXIF
 	ed = exif_data_new_from_data ((unsigned char*)data, cur->stbuf.st_size);
@@ -1115,6 +1116,7 @@
 		return 1;
 	}
 
+	/* just search for first jpeg we find in the tree, we will use this to send back as the captured image */
 	cur = first_dirent;
 	while (cur) {
 		if (strstr (cur->name, ".jpg") || strstr (cur->name, ".JPG"))
@@ -1123,34 +1125,17 @@
 	}
 	if (!cur) {
 		gp_log (GP_LOG_ERROR,__FUNCTION__, "I do not have a JPG file in the store, can not proceed");
-		ptp_response (cam, PTP_RC_GeneralError, 0);
-		return 1;
-	}
-	dir = first_dirent;
-	while (dir) {
-		if (!strcmp(dir->name,"DCIM") && dir->parent && !dir->parent->id)
-			dcim = dir;
-		dir = dir->next;
-	}
-
-	cur = first_dirent;
-	while (cur) {
-		if (strstr (cur->name, ".jpg") || strstr (cur->name, ".JPG"))
-			break;
-		cur = cur->next;
-	}
-	if (!cur) {
-		gp_log (GP_LOG_ERROR,__FUNCTION__, "I do not have a JPG file in the store, can not proceed");
-		ptp_response (cam, PTP_RC_GeneralError, 0);
+		ptp_response (cam, PTP_RC_StoreNotAvailable, 0);
 		return 1;
 	}
+	/* identify the DCIM dir, so we can attach a virtual xxxGPHOT directory to virtually store the new picture in */
 	dir = first_dirent;
 	while (dir) {
 		if (!strcmp(dir->name,"DCIM") && dir->parent && !dir->parent->id)
 			dcim = dir;
 		dir = dir->next;
 	}
-	/* nnnGPHOT directories, where nnn is 100-999. (See DCIM standard.) */
+	/* find the nnnGPHOT directories, where nnn is 100-999. (See DCIM standard.) */
 	sprintf(buf, "%03dGPHOT", 100 + ((capcnt / 100) % 900));
 	dir = first_dirent;
 	while (dir) {
@@ -1158,6 +1143,7 @@
 			break;
 		dir = dir->next;
 	}
+	/* if not yet found, create the virtual /DCIM/xxxGPHOT/ directory. */
 	if (!dir) {
 		dir 		= malloc (sizeof(struct ptp_dirent));
 		dir->id		= ++ptp_objectid;
@@ -1351,6 +1337,8 @@
 		break;
 	}
 
+	ptp_free_devicepropdesc(&desc);
+
 	ptp_senddata (cam, 0x1014, data, x);
 	free (data);
 	ptp_response (cam, PTP_RC_OK, 0);
@@ -1809,6 +1797,7 @@
 }
 
 static int vcam_open(vcamera* cam, const char *port) {
+#ifdef FUZZING
 	char *s = strchr(port,':');
 
 	if (s) {
@@ -1817,20 +1806,34 @@
 			cam->fuzzmode = FUZZMODE_PROTOCOL;
 		} else {
 			cam->fuzzf = fopen(s+1,"rb");
+#ifndef FUZZ_PTP
+			/* first 4 byte are vendor and product USB id */
+			if (cam->fuzzf)
+				fseek (cam->fuzzf, 4, SEEK_SET);
+#endif
 			cam->fuzzpending = 0;
 			cam->fuzzmode = FUZZMODE_NORMAL;
 		}
-		if (cam->fuzzf == NULL) perror(s+1);
+		/* in virtual camera mode we have no fuzzing
+		if (cam->fuzzf == NULL) {
+			perror(s+1);
+		}
+		*/
 	}
+#endif
 	return GP_OK;
 }
 
 static int vcam_close(vcamera* cam) {
+#ifdef FUZZING
 	if (cam->fuzzf) {
 		fclose (cam->fuzzf);
 		cam->fuzzf = NULL;
 		cam->fuzzpending = 0;
 	}
+#endif
+	free (cam->inbulk);
+	free (cam->outbulk);
 	return GP_OK;
 }
 
@@ -1936,6 +1939,8 @@
 vcam_read(vcamera*cam, int ep, unsigned char *data, int bytes) {
 	unsigned int	toread = bytes;
 
+#ifdef FUZZING
+	/* here we are not using the virtual ptp camera, but just read from a file, or write to it. */
 	if (cam->fuzzf) {
 		unsigned int hasread;
 
@@ -1944,6 +1949,7 @@
 			fwrite(cam->inbulk, 1, toread, cam->fuzzf);
 			/* fallthrough */
 		} else {
+#ifdef FUZZ_PTP
 			/* for reading fuzzer data */
 			if (cam->fuzzpending) {
 				toread = cam->fuzzpending;
@@ -1953,7 +1959,7 @@
 			} else {
 				hasread = fread (data, 1, 4, cam->fuzzf);
 				if (hasread != 4)
-					return 0;
+					return GP_ERROR_IO_READ;
 
 				toread = data0 | (data1<<8) | (data2<<16) | (data3<<24);
 
@@ -1970,6 +1976,12 @@
 
 				hasread += 4; /* readd size */
 			}
+#else
+			/* just return a blob of data in generic fuzzing */
+			hasread = fread (data, 1, bytes, cam->fuzzf);
+			if (!hasread && feof(cam->fuzzf))
+				return GP_ERROR_IO_READ;
+#endif
 #if 0
 			for (i=0;i<toread;i++)
 				datai ^= cam->inbulki;
@@ -1979,6 +1991,7 @@
 			return toread;
 		}
 	}
+#endif /* FUZZING */
 
 	/* Emulated PTP camera stuff */
 
@@ -2073,9 +2086,14 @@
 	struct ptp_interrupt	*pint;
 
 	if (!first_interrupt) {
+#ifdef FUZZING
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 		usleep (timeout*1000);
 #endif
+		/* this emulates plugged out devices during fuzzing */
+		if (cam->fuzzf && feof(cam->fuzzf))
+			return GP_ERROR_IO;
+#endif /* FUZZING */
 		return GP_ERROR_TIMEOUT;
 	}
 	gettimeofday (&now, NULL);
@@ -2121,7 +2139,8 @@
 	cam = calloc(1,sizeof(vcamera));
 	if (!cam) return NULL;
 
-	read_tree(VCAMERADIR);
+	const char *vcameradir_env = getenv("VCAMERADIR");
+	read_tree(vcameradir_env != NULL ? vcameradir_env : VCAMERADIR);
 
 	cam->init = vcam_init;
 	cam->exit = vcam_exit;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/vusb/vcamera.h -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/vusb/vcamera.h Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/libgphoto2_port/vusb/vusb.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/libgphoto2_port/vusb/vusb.c Changed

@@ -8,17 +8,17 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-
+#define _DARWIN_C_SOURCE
 #include "config.h"
 #include <gphoto2/gphoto2-port-library.h>
 
@@ -38,24 +38,8 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
+#include "libgphoto2_port/i18n.h"
+
 
 #define CHECK(result) {int r=(result); if (r<0) return (r);}
 
@@ -78,17 +62,35 @@
 
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
 
-        CHECK (gp_port_info_new (&info));
-        gp_port_info_set_type (info, GP_PORT_USB);
-        gp_port_info_set_name (info, "");
-        gp_port_info_set_path (info, "^usb:");
-        gp_port_info_list_append (list, info); /* do not check, might be -1 */
+	CHECK (gp_port_info_new (&info));
+	gp_port_info_set_type (info, GP_PORT_USB);
+	gp_port_info_set_name (info, "");
+	gp_port_info_set_path (info, "^usb:");
+	gp_port_info_list_append (list, info); /* do not check, might be -1 */
+
+	CHECK (gp_port_info_new (&info));
+	gp_port_info_set_type (info, GP_PORT_USB);
+	gp_port_info_set_name (info, "");
+	gp_port_info_set_path (info, "^vusb:");
+	gp_port_info_list_append (list, info); /* do not check, might be -1 */
 
 	gp_port_info_new (&info);
 	gp_port_info_set_type (info, GP_PORT_USB);
 	gp_port_info_set_name (info, "Universal Serial Bus");
 	gp_port_info_set_path (info, "usb:001,001");
 	CHECK (gp_port_info_list_append (list, info));
+
+	gp_port_info_new (&info);
+	gp_port_info_set_type (info, GP_PORT_USB_SCSI);
+	gp_port_info_set_name (info, "");
+	gp_port_info_set_path (info, "^usbscsi:");
+	CHECK (gp_port_info_list_append (list, info));
+
+	gp_port_info_new (&info);
+	gp_port_info_set_type (info, GP_PORT_USB_DISK_DIRECT);
+	gp_port_info_set_name (info, "");
+	gp_port_info_set_path (info, "^usbdiskdirect:");
+	CHECK (gp_port_info_list_append (list, info));
 	return GP_OK;
 }
 
@@ -156,6 +158,21 @@
 }
 
 static int
+gp_port_vusb_send_scsi_cmd (GPPort *port, int to_dev, char *cmd,
+	int cmd_size, char *sense, int sense_size, char *data, int data_size)
+{
+	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(dev=%d, cmdsize %d, sense_size %d, data_size %d)", to_dev, cmd_size, sense_size, data_size);
+	return port->pl->vcamera->read(port->pl->vcamera, 0x81, (unsigned char*)data, data_size);
+}
+
+static int
+gp_port_vusb_seek (GPPort *port, int offset, int whence)
+{
+	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(offset %d, whence %d)", offset, whence);
+	return GP_OK;
+}
+
+static int
 gp_port_vusb_reset(GPPort *port)
 {
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
@@ -207,11 +224,11 @@
         return GP_OK;
 }
 
-/* The next two functions support the nonstandard request types 0x41 (write) 
- * and 0xc1 (read), which are occasionally needed. 
+/* The next two functions support the nonstandard request types 0x41 (write)
+ * and 0xc1 (read), which are occasionally needed.
  */
 static int
-gp_port_vusb_msg_interface_write_lib(GPPort *port, int request, 
+gp_port_vusb_msg_interface_write_lib(GPPort *port, int request,
         int value, int index, char *bytes, int size)
 {
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
@@ -220,19 +237,19 @@
 
 
 static int
-gp_port_vusb_msg_interface_read_lib(GPPort *port, int request, 
+gp_port_vusb_msg_interface_read_lib(GPPort *port, int request,
         int value, int index, char *bytes, int size)
 {
-	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
-        return GP_OK;	/* or bytes */
+	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(req=%x, value=%x, index=%d, size=%d)", request, value, index, size);
+	return port->pl->vcamera->read(port->pl->vcamera, 0x81, (unsigned char*)bytes, size);
 }
 
 
-/* The next two functions support the nonstandard request types 0x21 (write) 
- * and 0xa1 (read), which are occasionally needed. 
+/* The next two functions support the nonstandard request types 0x21 (write)
+ * and 0xa1 (read), which are occasionally needed.
  */
 static int
-gp_port_vusb_msg_class_write_lib(GPPort *port, int request, 
+gp_port_vusb_msg_class_write_lib(GPPort *port, int request,
         int value, int index, char *bytes, int size)
 {
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
@@ -242,7 +259,7 @@
 
 
 static int
-gp_port_vusb_msg_class_read_lib(GPPort *port, int request, 
+gp_port_vusb_msg_class_read_lib(GPPort *port, int request,
         int value, int index, char *bytes, int size)
 {
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"()");
@@ -269,7 +286,41 @@
 static int
 gp_port_vusb_find_device_lib(GPPort *port, int idvendor, int idproduct)
 {
+#ifdef FUZZ_PTP
 	if ((idvendor == 0x04b0) && (idproduct == 0x0437)) { /* Nikon D750 */
+#else
+	GPPortInfo info;
+	char	*path, *s;
+	static unsigned short vendor = 0x04b0, product = 0x0437; /* defaults are the Nikon D750 */
+	int	fd;
+
+	static char *lastpath = NULL;
+
+	gp_port_get_info (port, &info);
+	gp_port_info_get_path (info, &path);
+
+	if (!lastpath || strcmp(path, lastpath)) {
+		gp_log(GP_LOG_DEBUG,__FUNCTION__,"(path=%s)", path);
+		if (lastpath) {
+			free(lastpath);
+		}
+		lastpath = strdup(path);
+
+		s = strchr(path, ':')+1;
+		fd = open(s, O_RDONLY);
+		/*vendor = product = 0; */
+		if (fd != -1) {
+			if (-1 == read( fd, &vendor, 2))
+				gp_log(GP_LOG_DEBUG,__FUNCTION__,"could not read vendor");
+			if (-1 == read( fd, &product, 2))
+				gp_log(GP_LOG_DEBUG,__FUNCTION__,"could not read product");
+			close(fd);
+		}
+	}
+	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(using vendor 0x%04x,0x%04x)", vendor, product);
+
+	if ((idvendor == vendor) && (idproduct == product)) {
+#endif
                 port->settings.usb.config	= 1;
                 port->settings.usb.interface	= 1;
                 port->settings.usb.altsetting	= 1;
@@ -280,7 +331,7 @@
                 port->settings.usb.maxpacketsize = 512;
 		return GP_OK;
 	}
-	/* gp_log(GP_LOG_DEBUG,__FUNCTION__,"(0x%04x,0x%04x)", idvendor, idproduct); */
+	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(0x%04x,0x%04x)", idvendor, idproduct);
         return GP_ERROR_IO_USB_FIND;
 }
 
@@ -289,6 +340,7 @@
 {
 	gp_log(GP_LOG_DEBUG,__FUNCTION__,"(0x%02x,0x%02x,0x%02x)", class, subclass, protocol);
 
+#ifdef FUZZ_PTP
 	if ((class == 6) && (subclass == 1) && (protocol == 1)) {
                 port->settings.usb.config	= 1;
                 port->settings.usb.interface	= 1;
@@ -300,6 +352,7 @@
                 port->settings.usb.maxpacketsize = 512;
 		return GP_OK;
 	}
+#endif
         return GP_ERROR_IO_USB_FIND;
 }
 
@@ -333,6 +386,9 @@
         ops->msg_interface_read		= gp_port_vusb_msg_interface_read_lib;
         ops->msg_class_write  		= gp_port_vusb_msg_class_write_lib;
         ops->msg_class_read   		= gp_port_vusb_msg_class_read_lib;
+        ops->send_scsi_cmd   		= gp_port_vusb_send_scsi_cmd;
+        ops->seek   			= gp_port_vusb_seek;
+
         ops->find_device 		= gp_port_vusb_find_device_lib;
         ops->find_device_by_class	= gp_port_vusb_find_device_by_class_lib;
 	return ops;

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/ChangeLog -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/ChangeLog Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/Makefile.am Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/generic/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/generic/Makefile.am Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/generic/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/generic/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/packaging/generic/print-camera-list.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/packaging/generic/print-camera-list.c Changed

@@ -9,10 +9,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -92,7 +92,7 @@
 			       void **data);
 typedef int (* middle_func_t)  (const func_params_t *params,
 			       void **data);
-typedef int (* camera_func_t) (const func_params_t *params, 
+typedef int (* camera_func_t) (const func_params_t *params,
 			       const int i,
 			       const int total,
 			       const CameraAbilities *ca,
@@ -204,7 +204,7 @@
 
 /* print_usb_usermap
  *
- * Print out lines that can be included into usb.usermap 
+ * Print out lines that can be included into usb.usermap
  * - for all cams supported by our instance of libgphoto2.
  *
  * usb.usermap is a file used by
@@ -212,7 +212,7 @@
  */
 
 static int
-hotplug_camera_func (const func_params_t *params, 
+hotplug_camera_func (const func_params_t *params,
 		     const int i,
 		     const int total,
 		     const CameraAbilities *a,
@@ -220,7 +220,7 @@
 {
 	int flags = 0;
 	int class = 0, subclass = 0, proto = 0;
-	const char *usermap_script = 
+	const char *usermap_script =
 		((*params->argv)0 != NULL)
 		?((*params->argv)0)
 		:(GP_USB_HOTPLUG_SCRIPT);
@@ -230,7 +230,7 @@
 			class = 0;
 			subclass = 0;
 			proto = 0;
-			flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID 
+			flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID
 				 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			class = a->usb_class;
@@ -252,7 +252,7 @@
 	}
 
 	if (params->add_comments) {
-		printf ("# %s\n", 
+		printf ("# %s\n",
 			a->model);
 	}
 	/* The first 3 lone bytes are the device class.
@@ -264,7 +264,7 @@
 		"0x0000      0x00         0x00            "
 		"0x00            0x%02x            0x%02x               "
 		"0x%02x               0x00000000\n",
-		usermap_script, flags, 
+		usermap_script, flags,
 		a->usb_vendor, a->usb_product,
 		class, subclass, proto);
 	return 0;
@@ -317,7 +317,7 @@
 	char *result, *tmp;
 	/* remove path part from camlib name */
 	for (result=tmp=(char *)pathname; (*tmp!='\0'); tmp++) {
-		if ((*tmp == gp_system_dir_delim) 
+		if ((*tmp == gp_system_dir_delim)
 		    && (*(tmp+1) != '\0')) {
 			result = tmp+1;
 		}
@@ -327,8 +327,8 @@
 
 
 static int
-human_camera_func (const func_params_t *params, 
-		   const int i, 
+human_camera_func (const func_params_t *params,
+		   const int i,
 		   const int total,
 		   const CameraAbilities *a,
 		   void *data)
@@ -336,7 +336,7 @@
 	const char *camlib_basename;
 	camlib_basename = path_basename(a->library);
 	printf("%3d|%-20s|%-20s|%s\n",
-	       i+1, 
+	       i+1,
 	       camlib_basename,
 	       a->id,
 	       a->model);
@@ -345,8 +345,8 @@
 
 
 static int
-idlist_camera_func (const func_params_t *params, 
-		    const int i, 
+idlist_camera_func (const func_params_t *params,
+		    const int i,
 		    const int total,
 		    const CameraAbilities *a,
 		    void *data)
@@ -399,13 +399,13 @@
 	 */
 	static const char * const begin_strings = {
 		/* UDEV_PRE_0_98 */
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n"
 		"BUS!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n",
 		/* UDEV_0_98 */
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n"
 		"SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n",
 		/* UDEV_136 */
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n"
 		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"
 		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n"
 		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n"
@@ -415,7 +415,7 @@
 		 * more rules . It will be completed in udev_begin_func() */
 		"ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", ",
 		/* UDEV_175 */
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n"
 		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"
 		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n"
 		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n"
@@ -426,7 +426,7 @@
 		"ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", ",
 
 		/* UDEV_201 ... regular stuff is done via hwdb, only scsi generic here. */
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n"
 		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"
 		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n"
 		/* shortcut the most common camera driver, ptp class, so we avoid parsing 1000
@@ -465,7 +465,7 @@
 	if (1) {
 		int i;
 		char *key = NULL, *val = NULL;
-		for (i=0; ((key=(*params->argv)i)   != NULL) && 
+		for (i=0; ((key=(*params->argv)i)   != NULL) &&
 			  ((val=(*params->argv)i+1) != NULL); i+=2) {
 			if (0) {
 				/* nothing */
@@ -499,8 +499,8 @@
 	    && (pdata->version <= UDEV_0_98)) {
 		FATAL("Either <script> or <mode,group,owner> parameters must be given.");
 	}
-	if ((pdata->script != NULL) && (pdata->mode != NULL 
-					|| pdata->group != NULL 
+	if ((pdata->script != NULL) && (pdata->mode != NULL
+					|| pdata->group != NULL
 					|| pdata->owner != NULL)) {
 		FATAL("The <script> parameter conflicts with the <mode,group,owner> parameters.");
 	}
@@ -577,7 +577,7 @@
 
 
 static int
-udev_camera_func (const func_params_t *params, 
+udev_camera_func (const func_params_t *params,
 		  const int i,
 		  const int total,
 		  const CameraAbilities *a,
@@ -598,7 +598,7 @@
 		class = 0;
 		subclass = 0;
 		proto = 0;
-		flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID 
+		flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID
 			 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 	} else {
 		if (a->usb_class) {
@@ -684,7 +684,7 @@
 
 
 static int
-udev_camera_func2 (const func_params_t *params, 
+udev_camera_func2 (const func_params_t *params,
 		   const int i,
 		   const int total,
 		   const CameraAbilities *a,
@@ -750,7 +750,7 @@
 
 
 static int
-hwdb_camera_func (const func_params_t *params, 
+hwdb_camera_func (const func_params_t *params,
 		  const int i,
 		  const int total,
 		  const CameraAbilities *a,
@@ -765,7 +765,7 @@
 		return 0;
 
 	if (a->usb_vendor) { /* usb product id may be zero! */
-		flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID 
+		flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID
 			 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 		usb_vendor = a->usb_vendor;
 		usb_product = a->usb_product;
@@ -836,173 +836,9 @@
 }
 
 
-
-#ifdef ENABLED_GP2DDB
-
-static int
-ddb_begin_func (const func_params_t *params, void **data)
-{
-	printf("# Beginning of gphoto2 device database (PRE-ALPHA format!)\n\n");
-	print_version_comment(stdout, "# ", "\n", NULL, "\n");
-	return 0;
-}
-
-
-static int
-ddb_end_func (const func_params_t *params, void *data)
-{
-	printf("# End of gphoto2 device database (PRE-ALPHA format!).\n");
-	return 0;
-}
-
-
-static void
-ddb_list_out_func(const char *str, void *data)
-{
-	int *first = (int *)data;
-	printf("%s %s", (*first)?"":",", str);
-	*first = 0;
-}
-
-
-static void
-ddb_delayed_head(const func_params_t *params, 
-		 const int i,
-		 const int total,
-		 const CameraAbilities *a,
-		 const char *camlib_basename)
-{
-	int first = 1;
-	printf("# This is a PRE-ALPHA data format. Do not use it.\n\n");
-
-	if (params->add_comments) {
-		printf ("# %s\n", a->model);
-	}
-
-	printf("# automatically generated camera record %d/%d\n", i+1, total);
-	printf("device \"%s\" {\n", a->model);
-
-	printf("    device_type");
-	printf(" %s;\n", gpi_enum_to_string(a->device_type,
-					    gpi_gphoto_device_type_map);
-
-	printf("    driver \"%s\";\n", camlib_basename);
-
-	printf("    driver_status");
-	printf(" %s;\n", gpi_enum_to_string(a->status,
-					    gpi_camera_driver_status_map);
-
-	printf("    operations");
-	first = 1;
-	gpi_flags_to_string_list(a->operations, 
-				 gpi_camera_operation_map,
-				 ddb_list_out_func,
-				 (void *) &first);
-	printf(";\n");
-
-	printf("    file_operations");
-	first = 1;
-	gpi_flags_to_string_list(a->file_operations, 
-				 gpi_file_operation_map,
-				 ddb_list_out_func,
-				 (void *) &first);
-	printf(";\n");
-
-	printf("    folder_operations");
-	first = 1;
-	gpi_flags_to_string_list(a->folder_operations, 
-				 gpi_folder_operation_map,
-				 ddb_list_out_func,
-				 (void *) &first);
-	printf(";\n");
-}
-
-
-static int
-ddb_camera_func (const func_params_t *params, 
-		 const int i,
-		 const int total,
-		 const CameraAbilities *a,
-		 void *data)
-{
-	const char *camlib_basename = path_basename(a->library);
-	int head_printed = 0;
-#define DELAYED_HEAD() \
-	do { \
-		if (!head_printed) {			      \
-			ddb_delayed_head(params, i, total,    \
-					 a, camlib_basename); \
-			head_printed = 1;		      \
-		} \
-	} while (0)
-
-	if ((a->port & GP_PORT_SERIAL)) {
-		int first = 1;
-		DELAYED_HEAD();
-		printf("    interface serial {\n");
-		if (a->speed0 != 0) {
-			unsigned int i;
-			printf("        speeds");
-			for (i=0; 
-			     ((i < (sizeof(a->speed)/sizeof(a->speed0))) &&
-			      (a->speedi != 0)); i++) {
-				printf("%s %d", (first)?"":",", a->speedi);
-				first = 0;
-			}
-			printf(";\n");
-		}
-		printf("    };\n");
-	}
-
-	if ((a->port & GP_PORT_USB)) {
-		if (a->usb_vendor) { 
-			/* usb product id may have the legal value zero! */
-			DELAYED_HEAD();
-			printf("    interface usb {\n");
-			printf("        vendor  0x%04x;\n", a->usb_vendor);
-			printf("        product 0x%04x;\n", a->usb_product);
-			printf("    };\n");
-		}
-		if ((a->usb_class) && (a->usb_class != 666)) {
-			DELAYED_HEAD();
-			printf("    interface usb {\n");
-			printf("        class 0x%02x;\n", a->usb_class);
-			if (a->usb_subclass != -1) {
-				printf("        subclass 0x%02x;\n", a->usb_subclass);
-			}
-			if (a->usb_protocol != -1) {
-				printf("        protocol 0x%02x;\n", a->usb_protocol);
-			}
-			printf("    };\n");
-		}
-	}
-	if ((a->port & GP_PORT_DISK)) {
-		DELAYED_HEAD();
-		printf("    interface disk;\n");
-	}
-	if ((a->port & GP_PORT_PTPIP)) {
-		DELAYED_HEAD();
-		printf("    interface ptpip;\n");
-	}
-#undef DELAYED_HEAD
-
-	if (head_printed) {
-		printf("    # driver_options {\n");
-		printf("    #      option \"foo\";\n");
-		printf("    #      option \"bar\" \"bla\";\n");
-		printf("    # };\n");
-
-		printf("}; # %s\n\n", a->model);
-	}
-	return 0;
-}
-
-#endif /* ENABLED_GP2DDB */
-
-
 /* print_fdi_map
  *
- * Print FDI Device Information file for HAL with information on 
+ * Print FDI Device Information file for HAL with information on
  * all cams supported by our instance of libgphoto2.
  *
  * For specs, look around on http://freedesktop.org/ and search
@@ -1012,7 +848,7 @@
 static int
 fdi_begin_func (const func_params_t *params, void **data)
 {
-	printf("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> \n");
+	printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n");
 	printf("\n",
 	       "libgphoto2 " ARGV0);
 	print_version_comment(stdout, "    | ", "\n", "\n");
@@ -1026,7 +862,7 @@
 
 
 static int
-fdi_camera_func (const func_params_t *params, 
+fdi_camera_func (const func_params_t *params,
 		 const int i,
 		 const int total,
 		 const CameraAbilities *a,
@@ -1072,7 +908,7 @@
 				printf("      <addset key=\"info.capabilities\" type=\"strlist\">portable_audio_player</addset>\n");
 				printf("      <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
 				printf("      <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
-				
+
 				/* FIXME: needs true formats ... But all of them can do MP3 */
 				printf("      <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
 			} else {
@@ -1095,7 +931,7 @@
 			}
 			printf("     </match>\n");
 			printf("    </match>\n");
-			
+
 		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
 			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
@@ -1134,7 +970,7 @@
 
 /* print_fdi_device_map
  *
- * Print FDI Device Information file for HAL with information on 
+ * Print FDI Device Information file for HAL with information on
  * all cams supported by our instance of libgphoto2.
  *
  * For specs, look around on http://freedesktop.org/ and search
@@ -1144,7 +980,7 @@
 static int
 fdi_device_begin_func (const func_params_t *params, void **data)
 {
-	printf("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> \n");
+	printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n");
 	printf("\n",
 	       "libgphoto2 " ARGV0);
 	print_version_comment(stdout, "    | ", "\n", "\n");
@@ -1158,7 +994,7 @@
 
 
 static int
-fdi_device_camera_func (const func_params_t *params, 
+fdi_device_camera_func (const func_params_t *params,
 		 	const int i,
 			const int total,
 		 	const CameraAbilities *a,
@@ -1322,7 +1158,7 @@
 
 static int
 html_camera_func (
-	const func_params_t *params, 
+	const func_params_t *params,
 	const int i,
 	const int total,
 	const CameraAbilities *a,
@@ -1400,7 +1236,7 @@
 
 static int
 html_camera2_func (
-	const func_params_t *params, 
+	const func_params_t *params,
 	const int i,
 	const int total,
 	const CameraAbilities *a,
@@ -1436,8 +1272,8 @@
 {
 	struct timeval tv;
 	gettimeofday (&tv,NULL);
-	fprintf (stderr, "%li.%06li %s(%i): %s\n", 
-		 (long) (tv.tv_sec - glob_tv_zero.tv_sec), 
+	fprintf (stderr, "%li.%06li %s(%i): %s\n",
+		 (long) (tv.tv_sec - glob_tv_zero.tv_sec),
 		 (1000000L + tv.tv_usec - glob_tv_zero.tv_usec) % 1000000L,
 		 domain, level, str);
 }
@@ -1457,8 +1293,8 @@
 
 
 static int
-iterate_camera_list (const int add_comments, 
-		     const output_format_t *format, 
+iterate_camera_list (const int add_comments,
+		     const output_format_t *format,
 		     string_array_p argv)
 {
 	int number_of_cameras;
@@ -1568,18 +1404,18 @@
 	},
 	{"udev-rules",
 	 "udev rules file",
-	 "For modes \"pre-0.98\" and \"0.98\" (and later), put it into\n"
+	 "For versions \"pre-0.98\" and \"0.98\" (and later), put it into\n"
 	 "        /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
-	 "        or add script to run. This rule files also uses the\n"
+	 "        or add script to run. This rules file also uses the\n"
 	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
 	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.\n"
 	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.\n"
-	 "        For mode \"136\" put it into /lib/udev/rules.d/40-libgphoto2.rules;\n"
+	 "        For version \"136\" put it into /lib/udev/rules.d/40-libgphoto2.rules;\n"
 	 "        you can still use mode/owner/group, but the preferred mode of operation\n"
 	 "        is to use udev-extras for dynamic access permissions.\n"
 	"	  Available versions of the rule generator: 0.98, 136, 175, 201.\n",
 	 "script <PATH_TO_SCRIPT>|version <version>|mode <mode>|owner <owner>|group <group>*",
-	 udev_begin_func, 
+	 udev_begin_func,
 	 udev_camera_func,
 	 udev_middle_func,
 	 udev_camera_func2,
@@ -1609,24 +1445,12 @@
 	 "list of IDs and names",
 	 "grep for an ID to find the device name",
 	 NULL,
-	 empty_begin_func, 
+	 empty_begin_func,
 	 idlist_camera_func,
 	 NULL,
 	 NULL,
 	 empty_end_func
 	},
-#ifdef ENABLED_GP2DDB
-	{"gp2ddb",
-	 "gphoto2 device database (PRE-ALPHA)",
-	 "PRE-ALPHA test stage, do not use for production! Machine parseable.",
-	 NULL,
-	 ddb_begin_func,
-	 ddb_camera_func,
-	 NULL,
-	 NULL,
-	 ddb_end_func
-	},
-#endif
 	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -1640,12 +1464,12 @@
 	printf("List of output formats:\n");
 	for (i=0; formatsi.name != NULL; ++i) {
 		if (formatsi.paramdescr != NULL) {
-			printf("    %s %s\n        %s\n", 
+			printf("    %s %s\n        %s\n",
 			       formatsi.name,
 			       formatsi.paramdescr,
 			       formatsi.descr);
 		} else {
-			printf("    %s\n        %s\n", 
+			printf("    %s\n        %s\n",
 			       formatsi.name, formatsi.descr);
 		}
 		if (formatsi.help != NULL) {
@@ -1721,14 +1545,14 @@
 		}
 		format_index++;
 	}
-	if ((formatsformat_index.name == NULL) || 
+	if ((formatsformat_index.name == NULL) ||
 	    (strcmp(formatsformat_index.name, format_name) != 0)) {
 		return print_help();
 	}
 
 	/* copy remaining arguments */
-	for (j=i; 
-	     (j<argc) && ((j-i)<(int)((sizeof(fmt_argv)/sizeof(fmt_argv0))-1)); 
+	for (j=i;
+	     (j<argc) && ((j-i)<(int)((sizeof(fmt_argv)/sizeof(fmt_argv0))-1));
 	     j++) {
 		fmt_argvj-i = argvj;
 	}

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/LINGUAS Added

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/Makefile.in.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/Makefile.in.in Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/Makevars -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/Makevars Changed

@@ -20,6 +20,13 @@
 # their copyright.
 COPYRIGHT_HOLDER = The gPhoto Team
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -34,8 +41,32 @@
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = gphoto-devel@lists.sourceforge.net
+MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/POTFILES.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/POTFILES.in Changed

@@ -1,3 +1,4 @@
+# List of source files which contain translatable strings.
 camlibs/adc65/adc65.c
 camlibs/agfa-cl20/agfa_cl20.c
 camlibs/aox/library.c
@@ -15,6 +16,7 @@
 camlibs/digita/digita.c
 camlibs/dimera/dimera3500.c
 camlibs/directory/directory.c
+camlibs/docupen/docupen.c
 camlibs/enigma13/enigma13.c
 camlibs/fuji/fuji.c
 camlibs/fuji/library.c
@@ -42,6 +44,7 @@
 camlibs/konica/qm150.c
 camlibs/largan/lmini/largan.c
 camlibs/lg_gsm/library.c
+camlibs/lumix/lumix.c
 camlibs/mars/library.c
 camlibs/minolta/dimagev/dimagev.c
 camlibs/mustek/core.c
@@ -54,12 +57,16 @@
 camlibs/pccam300/library.c
 camlibs/pccam600/library.c
 camlibs/pccam600/pccam600.c
+camlibs/pentax/library.c
 camlibs/polaroid/pdc320.c
 camlibs/polaroid/pdc640.c
 camlibs/polaroid/pdc700.c
+camlibs/ptp2/chdk.c
 camlibs/ptp2/config.c
+camlibs/ptp2/fujiptpip.c
 camlibs/ptp2/library.c
 camlibs/ptp2/ptp.c
+camlibs/ptp2/ptpip.c
 camlibs/ricoh/g3.c
 camlibs/ricoh/library.c
 camlibs/ricoh/ricoh.c
@@ -68,10 +75,10 @@
 camlibs/sierra/library.c
 camlibs/sierra/nikon-desc.c
 camlibs/sierra/olympus-desc.c
-camlibs/sierra/sierra.c
 camlibs/sierra/sierra-desc.c
-camlibs/sipix/blink2.c
+camlibs/sierra/sierra.c
 camlibs/sipix/blink.c
+camlibs/sipix/blink2.c
 camlibs/sipix/web2.c
 camlibs/smal/smal.c
 camlibs/smal/ultrapocket.c
@@ -80,14 +87,18 @@
 camlibs/sonydscf55/camera.c
 camlibs/soundvision/soundvision.c
 camlibs/spca50x/library.c
+camlibs/spca50x/spca50x-sdram.c
+camlibs/spca50x/spca50x.c
 camlibs/sq905/library.c
 camlibs/st2205/library.c
+camlibs/stv0674/library.c
 camlibs/stv0674/stv0674.c
 camlibs/stv0680/library.c
 camlibs/stv0680/stv0680.c
 camlibs/sx330z/library.c
 camlibs/topfield/puppy.c
 camlibs/toshiba/pdrm11/library.c
+camlibs/tp6801/library.c
 libgphoto2/gphoto2-abilities-list.c
 libgphoto2/gphoto2-camera.c
 libgphoto2/gphoto2-filesys.c

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/Rules-quot -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/Rules-quot Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/cs.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/cs.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/cs.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/cs.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.5.1\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2013-06-06 11:53+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -38,14 +38,14 @@
 "Zdá se, že v přístroji není vložena paměťová karta CompactFlash.\n"
 "Takový provoz ale není (alespoň prozatím) podporován.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 "Přístroj pořídil již %d snímků a je v něm vložena paměťová karta "
 "CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -78,12 +78,12 @@
 "Obecný ovladač pro Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Tento fotorámeček s USB obsahuje čip AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -93,7 +93,7 @@
 "Ovladač v gPhoto umí snímky z takových zařízení stahovat, nahrávat je\n"
 "do nich i je v nich mazat."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -105,16 +105,18 @@
 "Tento ovladač umí snímky z takových zařízení stahovat, nahrávat\n"
 "je do nich i je v nich mazat."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Nastavení zařízení (fotorámečku)"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Synchronizovat datum a čas ve fotorámečku s počítačem"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -123,7 +125,7 @@
 "Počet snímků: %i\n"
 "Verze firmware: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -147,26 +149,26 @@
 "Vytvořeno s pomocí informací z veřejně dostupných dokumentů (na Internetu).\n"
 "Se svolením od společnosti Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Nebylo možné vytvořit složku %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Nebylo možné odstranit složku %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "Uzamykací klíče selhaly."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*NEZNÁMÉ*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -175,7 +177,7 @@
 "canon_int_capture_image: úvodní volání canon_usb_list_all_dirs() selhalo se "
 "stavem %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -184,17 +186,17 @@
 "canon_int_capture_image: závěrečné volání canon_usb_list_all_dirs() selhalo "
 "se stavem %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Název „%s“ (%li znaků) je příliš dlouhý, možných je nanejvýš 30 znaků."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "V %s není možné použít malá písmena."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -202,7 +204,7 @@
 "canon_int_list_directory: Chyba: úvodní zpráva je příliš krátká (%i < "
 "nezbytné minimum %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -210,15 +212,15 @@
 "canon_int_list_directory: Při zkoumání první položky složky neočekávaně "
 "dosaženo konce paketu."
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: ve složce byla zjištěna oříznutá položka"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Soubor je chráněn."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, fuzzy, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -226,11 +228,11 @@
 "canon_int_list_directory: Chyba: úvodní zpráva je příliš krátká (%i < "
 "nezbytné minimum %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Z dat nelze získat náhled ve formátu JPEG: Není začátek ani konec"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Ze souboru JPEG nelze získat náhled: data nejsou ve formátu JIFF"
 
@@ -239,7 +241,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Prázdný parametr „%s“ v %s na řádku %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -247,18 +249,18 @@
 "Není známo jak se zachovat v případě, kdy je přístroj->port->typ nastaveno "
 "na hodnotu %i neboli 0x%x, v %s na řádku %i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 "Fatální chyba: úvodní hodnota kontrolního součtu pro délku %d není známa\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "Není možné odhadnout počáteční hodnotu kontrolního součtu.\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -267,293 +269,304 @@
 "varování: kontrolní součet nebyl ověřen (přid. délky %d, hodnota 0x%04x) "
 "##########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Kompatibilní režim"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Náhled snímku"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Snímek"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Exp. po dobu stisku spouště"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Automat. zaostř.: jednorázové při namáčknutí spouště"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Automat. zaostř.: průběžně"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Automat. zaostř.: automat. volba jednoráz. či průběž."
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Ruční zaostřování"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Vypnout zvuk. upozornění"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Zapnout zvuk. upozornění"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Blesk vypnut"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Blesk odpálen vždy"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Blesk odpálen dle potřeby"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "Plně automat. režim"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "část. nastavitelný automat. režim"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "exp. čas ručně, zaclonění automat."
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "zaclonění ručně, exp. čas automat."
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "plně ruční režim"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 "max. světla (min. zaclon.) při dost. hl. ostrosti (AUTOMAT. zvol. objekty)"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 "max. světla (min. zaclon.) při dost. hl. ostrosti (RUČNĚ zvol. nejbl. a "
 "nejvzd. objekt)"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Ruční „2“"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Vzdálená scéna"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Krátký exp. čas"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Dlouhý exp. čas"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Noční scéna"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Stupně šedé"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sépiový nádech"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portrét"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Bod"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "Černobílé"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Pevné ohnisko"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Zvýraznění barev"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutrální"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Dlouhý exp. čas"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Supermakro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Listí"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Interiér"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Ohňostroj"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Pláž"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Pod vodou"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Sníh"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Děti a domácí mazlíčci"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Noční momentka"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Digitální makro"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "různé barev. úpravy snímku"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Pořízování static. snímku v režimu videozáznamu"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "surová data ze snímače (RAW)"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "surová data ze snímače (RAW) „2“"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "JPEG – nízké rozl., více ztrát. kompr."
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "JPEG – nízké rozl., méně ztrát. kompr."
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "JPEG – střední rozl. a více ztrát. kompr."
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "JPEG – střední rozl. a méně ztrát. kompr."
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "JPEG – vysoké rozl. a více ztrát. kompr."
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "JPEG – vysoké rozl. a méně ztrát. kompr."
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + JPEG s nízkým rozl. a více ztrát. kompr."
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + JPEG s nízkým rozl. a méně ztrát. kompr."
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + JPEG se středním rozl. a více ztrát. kompr."
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + JPEG se středním rozl. a méně ztrát. kompr."
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + JPEG s vysokým rozl. a více ztrát. kompr."
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + JPEG s vysokým rozl. a méně ztrát. kompr."
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -586,44 +599,44 @@
 "svůj počítač při ovládání přístroje ponechat co nejméně zatížený\n"
 "(čtení/zápis na datové úložiště, atp.)\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Přístroj není k dispozici: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Probíhá vypínání přístroje"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Chyba při pořizování snímku"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Nelze získat název datového úložiště: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Důvod není znám"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Nelze získat informace o datovém úložišti: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Vnitřní chyba č. 1 v get_file_func() (%s řádek %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Pro %s nebyl nalezen žádný soubor se zvukovým záznamem"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -634,35 +647,35 @@
 " %11s bajtů celkem\n"
 " %11s bajtů volných"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Síťový napájecí zdroj"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "provoz na akumulátor"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "napájení je v pořádku"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "napájení není v pořádku"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "nedostupné: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (čas na počítači %s%i vteřin)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -689,7 +702,7 @@
 "\n"
 "Čas: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -711,24 +724,24 @@
 "Holger Klemm\n"
 "Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Chyba při mazání souboru"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Chyba při mazání souvisejícího souboru s náhledem"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Do tohoto přístroje není možné nahrávat rychlostí vyšší než 57600 b/s."
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Není možné získat označení datového úložiště."
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -736,375 +749,397 @@
 "Nelze nahrávat, protože jsou vyčerpána dostupná jména složek!\n"
 "Existuje již i složka 999CANON a v ní soubor AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Nelze vytvořit složku \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Cílovou složku nebylo možné vytvořit."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Nastavení přístroje a jeho ovladače"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Nastavení přístroje"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Jméno vlastníka"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Třída velikosti záznamu"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Citlivost na světlo (ISO)"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Režim pořizování snímků"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Expoziční čas"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Přiblížení"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Zaclonění"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Kompenzace chyby měření expozičních hodnot"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Formát obrazu"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Režim zaostřování"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Režim blesku"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Zvuková upozornění"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Akce pro přístroj"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Synchronizovat datum a čas na přístroji s počítačem"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Informace o stavu přístroje"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Model přístroje"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Datum a čas"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Chyba"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Verze firmware"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Napájení"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Ovladač"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Vypsat všechny soubory"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Při nahrávání do přístroje zachovat název souboru"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Přístroj není dostupný"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Jméno vlastníka bylo změněno"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "Jméno vlastníka nelze změnit"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Třída velikosti snímku byla změněna"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Neplatné nastavení třídy velikosti snímku"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Neplatné nastavení citlivosti (ISO)"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Nastavení citlivosti (ISO) změněno"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Nastavení citlivosti (ISO) nebylo možné změnit"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Neplatné nastavení režimu pořizování snímků"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Režim snímání změněn"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Režim snímání nelze změnit"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Neplatné nastavení expozičního času"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Expoziční čas změněn"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Nelze změnit expoziční čas"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Neplatné nastavení clony"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Nastavení zaclonění změněno"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Nelze změnit nastavení zaclonění"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Neplatné nastavení kompenzace expozičních hodnot"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Nastavení kompenzace expozice bylo změněno"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Nastavení kompenzace expozice nelze změnit."
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Neplatné nastavení datového formátu snímku"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Formát obrazových dat byl změněn"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Formát obrazových dat nebylo možné změnit"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Neplatný režim zaostřování"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Režim zaostřování byl změněn"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Režim zaostřování nelze změnit"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Neplatné nastavení zvukových upozornění"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Nastavení zvukových upozornění bylo změněno"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Nastavení zvukových upozornění nelze změnit"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Míra přiblížení byla změněna"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Míru přiblížení nelze změnit"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Neplatné nastavení blesku"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Režim blesku byl změněn"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Režim blesku nelze změnit"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "Nastavení času"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "Nastavení času nelze změnit"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Zadán nepodporovaný typ portu %i = 0x%x. Inicializace není možná."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Akumulátor je vybitý – přístroj se vypnul"
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "Chyba: neočekávané hlášení"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "Chyba: příliš dlouhá zpráva"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "Chyba: mimo pořadí."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "Chyba: neočekávaný typ paketu"
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "Chyba: chybný formát zprávy."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "Chyba: neočekávané hlášení 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Probíhá nahrávání souboru do přístroje…"
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Probíhá stahování souboru…"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1112,7 +1147,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue – nezdařilo se načíst "
 "položky ve složce"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1120,145 +1155,145 @@
 "canon_serial_get_dirents: úvodní paket s informacemi o položkách složky je "
 "příliš krátký (pouhých %i bajtů)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Nezdařilo se vyhradit %i bajtů paměti"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: Nepodařilo se načíst následující položku ve složce"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: obrženy oříznuté položky složky"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: Příliš mnoho položek ve složce – nejspíš došlo k "
 "zacyklení."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Nezdařila se změna velikosti vyrovnávací paměťi "
 "položek složky na %i bajtů"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Změna rychlosti komunikace se nezdařila."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Probíhá opětovné navázání komunikace…"
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Přístroj je připraven."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Probíhá hledání přístroje…"
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Probíhá pokus o spojení s přístrojem…"
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Chyba komunikace 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Přístroj neodpovídá"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Nerozpoznaná odpověď"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Zjištěno „%s“ neboli „%s“"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Neznámý typ „%s“"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Neplatný řídící znak „dokončení přenosu“ (EOT)"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Chyba komunikace 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Chyba komunikace 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Probíhá změna rychlosti… čekejte…"
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Změna rychlosti se nezdařila"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Vypršela lhůta potvrzující odpovědi (ACK) od přístroje – probíhá opětovný "
 "pokus"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Vypršela lhůta potvrzující odpovědi (ACK) od přístroje."
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Spojení s přístrojem je navázáno"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "Chyba: došlo k fatální chybě, není možné pokračovat"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "Chyba: %d je příliš velké"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Probíhá získávání náhledu…"
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "NEZNÁMÉ"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Nelze navázat prvotní kontakt s přístrojem"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Přístroj je již je aktivní"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Přístroj byl probuzen"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Nerozpoznaná úvodní odpověď od přístroje – „%c“"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1267,7 +1302,7 @@
 "Navazování spojení s přístrojem se nezdařilo v kroku 2: („%s“ při čtení z "
 "%i). Přístroj není připraven."
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1276,7 +1311,7 @@
 "Navazování spojení s přístrojem se nezdařilo v kroku 2! (přijato %i bajtů, "
 "očekáváno %i). Přístroj není připraven."
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1285,7 +1320,7 @@
 "Navazování spojení s přístrojem se nezdařilo v kroku 3: „%s“ při čtení %i. "
 "Přístroj není připraven"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1294,7 +1329,7 @@
 "Navazování spojení s přístrojem se nezdařilo v kroku 3! (přijato %i, "
 "očekáváno %i). Přístroj není připraven."
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1303,34 +1338,34 @@
 "Navazování spojení s přístrojem se nezdařilo v kroku 3: „%s“ při zápisu %i. "
 "Přístroj není připraven"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Krok číslo 4 se nezdařil: „%s“ při načítání %i. Přístroj není připraven"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Navazování spojení s přístrojem se nezdařilo v kroku 4: (přijato %i, "
 "očekáváno %i). Přístroj není připraven."
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Přístroj není připraven, nezdařilo se hned několik po sobě jdoucích "
 "požadavků na jeho identifikaci: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "Přístroj není  připraven, dotaz get_battery (získat stav akumulátoru) se "
 "nezdařil: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1339,14 +1374,14 @@
 "canon_usb_lock_keys: od této funkce obdrženo neočekávané množství dat (%i "
 "bajtů, očekáváno %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: obdrženo neočekávané množství dat (%i bajtů, očekáváno "
 "%i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1354,7 +1389,7 @@
 "canon_usb_unlock_keys: obdrženo neočekávané množství dat (%i bajtů, "
 "očekáváno %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1363,20 +1398,20 @@
 "canon_usb_get_body_id: obdržena neočekávané množství dat (%i bajtů, "
 "očekáváno %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Probíhá příjem dat…"
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Nedostatek paměti: je třeba %d bajtů."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: volání canon_usb_dialogue se nezdařilo"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1385,22 +1420,22 @@
 "Varování canon_usb_set_file_attributes: volání canon_usb_dialogue z "
 "přístroje vrátilo stav 0x%08x"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Ze souboru „%s“ nelze číst"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Nedostatek paměti: je třeba %ld bajtů."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Nahrání souboru se nezdařilo."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1408,7 +1443,7 @@
 "Soubor byl příliš velký. Před nahráváním dalších souborů bude přístroj "
 "nejspíš třeba vypnout a zapnout."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1417,7 +1452,7 @@
 "canon_usb_get_dirents: Data se nevejdou do vyrovnávací paměti – "
 "„%.96s“ (zkráceno) je příliš dlouhé."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1426,7 +1461,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue – nezdařilo se získat položky "
 "ve složce, obdržen stav %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1435,7 +1470,7 @@
 "canon_usb_list_all_dirs: Data se nevejdou do vyrovnávací paměti – "
 "„%.96s“ (zkráceno) je příliš dlouhé."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1444,27 +1479,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue – nezdařilo se získat "
 "položky ve složce, obdržen stav %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detekováno jako „%s“."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Název „%s“ neodpovídá žádnému ze známých přístrojů"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Typ obrazových dat %d není podporován."
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Snímek %s je chráněn proti smazání."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1476,37 +1511,37 @@
 "<xg2k-hys@asahi-net.or.jp> a Jun-ichiro „itojun“ Itoh <itojun@itojun.org>.\n"
 "QVplay začlenil Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Úroveň nabití akumulátoru: %1f Voltů. Revize: %08x"
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Nastavení přístroje"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Akumulátor"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Jas"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Příliš světlé"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Příliš tmavé"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "V pořádku"
 
@@ -1613,16 +1648,16 @@
 "Obecný ovladač pro sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Typ obrázku není podporován"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Počet obrázků: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1630,7 +1665,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1638,24 +1673,24 @@
 "Bylo vyžádáno vypsání souborů ve složce „%s“ – toto je ale možné pouze pro "
 "kořenovou složku."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Vyskytl se problém při získávání počtu obrázků"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Vyskytl se problém při získávání informací o obrázku"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Typ zachytávání není podporován"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (akumulátor je nabitý z %d %%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1672,82 +1707,83 @@
 "Rozlišení je nastaveno na %s.\n"
 "Přístroj byl %s zapnut %s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Blesk"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Bez blesku"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dvojitá clona ano"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Dvojitá clona ne"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Přepínač rozlišení"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Žádný přepínač rozlišení"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Žádná kontrolka napájení"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "Zapnuto"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "Vypnuto"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "Připraveno"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Nepřipraveno"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "je ve vyplňovacím režimu"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Není ve vyplňovacím režimu"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "nízké (320×240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "vysoké (640×480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "z vnějšku"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "z vnitřku"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1765,7 +1801,7 @@
 "* Expoziční hodnoty mohou být nastavovány ručně či automaticky.\n"
 "* Obrazová kvalita je v současnosti horší, než by měla být.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1794,116 +1830,232 @@
 "  Dan Fandrich <dan@coneharvesters.com>\n"
 "     Informace o protokolu, formátu snímků RAW, začlenění do gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Vyskytl se problém s načítáním obrázků z paměťové karty"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Probíhá stažení obrázku…"
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Vyskytl se problém při stahování obrázků"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Stahování obrázku bylo přerušeno uživatelem"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Vyskytl se problém se zobrazováním živého náhledu"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Expozice"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatická úroveň jasu náhledu"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Úroveň jasu pro náhledy"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Při pořízení snímku dle potřeby odpálen blesk"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Vyskytl se problém při otevírání portu"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Vyskytl se problém při restartování přístroje "
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Vyskytl se problém při nastavení rychlosti komunikace"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Zdá se, že přístroj není určen pro pořízování snímků (modem?)"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Výpis souborů v „%s“…"
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Výpis složek v „%s“…"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Nebylo možné získat informace o „%s“ (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Nebylo možné získat informace o „%s“ v „%s“ (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Nebylo možné změnit datum a čas souboru „%s“ v „%s“ (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Nelze otevřít „%s“."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Režim procházení „Fotoaparát“ slouží pro indexování snímků uložených na "
 "počítači."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Režim procházení složek – vytvořil Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Soubor „%s“ ve složce „%s“ nelze smazat (číslo chyby: %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Nastavení přístroje a jeho ovladače"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Režim pořizování snímků"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Rozlišení"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Rozlišení"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Režim barev či fungování"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Režim barev"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 #, fuzzy
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
@@ -1914,90 +2066,90 @@
 "ovladače pro spca50x vytvořil <olivier@aixmarseille.com>. Poděkování "
 "tvůrcům  spca50x – upravit ovladač pro tento přístroj bylo snadné!"
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Přístroj poslal pouze %i bajtů, ale potřeba je přinejmenším %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Spojení s přístrojem se nezdařilo."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Obdržena neočekávaná data (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Chybná řídící sekvence: očekáváno 0x%02x, obdrženo 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Špatná data – obdrženo 0x%02x, očekáváno 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Špatná data – obdrženo 0x%02x, očekáváno 0x%02x nebo 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Špatný kontrolní součet – obdrženo 0x%02x, očekáváno 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Přístroj tento povel odmítl."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Přístroj se sám restartoval."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Přístroj poslal neočekávaný bajt 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Probíhá stahování…"
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Nezdařila se rezervace %i bajtů pro stažení náhledu."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Nezdařila se rezervace %i bajtů pro stažení snímku."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Přístroj odmítá soubor pojmenovaný „%s“."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Nepodařilo se zahájit nahrávání (přístroj odpověděl s 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Přístroj neumí komunikovat rychlostí %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr ""
 "Nepodařilo se nastavit rychlost komunikace na %i (přístroj odpověděl s %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -2006,36 +2158,36 @@
 "Odvozeno od programu fujiplay, jehož tvůrcem je\n"
 "Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Rychlost přenosu dat %ld není podporována."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Nastavení přístroje FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Datum a čas"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "Identifikátor"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Verze: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Model: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Množství paměti k dispozici: "
 
@@ -2056,17 +2208,17 @@
 "modulů (knihoven) v gphoto2 a dokumentace ochotně poskytnuté společností "
 "Mustek.\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nepodporovaný typ portu: %d. Tento ovladač podporuje pouze USB zařízení.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Přístroj nebylo možné restartovat.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2075,7 +2227,7 @@
 "Tento přístroj umožňuje smazat vždy pouze poslední z uložených snímků. Což "
 "je momentálně soubor „%s“."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2090,7 +2242,7 @@
 "Počet snímků, které je ještě možné pořídit: %d\n"
 "Stav akumulátoru: %d %%"
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2140,25 +2292,25 @@
 "Ovladač pro iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Pořízeno snímků: %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "knihovna jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Probíhá stahování dat…"
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Probíhá stahování náhledu…"
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2174,7 +2326,7 @@
 "   - náhledy (64×48 pixelů ve formátu PGM)\n"
 "   - snímky (640×480 pixelů ve formátu PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2186,31 +2338,31 @@
 "Ovladač pro přístroj Jenoptik JD11.\n"
 "Komunikační protokol byl prozkoumán s použitím aplikací WINE a IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Nastavení JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Ostatní nastavení"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Exponování po dobu stisku spouště"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Nastavení barev"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Červená"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Zelená"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Modrá"
 
@@ -2283,11 +2435,11 @@
 "Ovladač pro přístroj jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Karta CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2298,7 +2450,7 @@
 "se snímky staženými z přístroje budete potřebovat převodní program "
 "„kdc2tiff“ (http://kdc2tiff.sourceforge.net)."
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2309,13 +2461,13 @@
 "Scott Fritzinger <scottf@gphoto.net>\n"
 "(na popud četných přání)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Získávají se data…"
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Čeká se na dokončení…"
 
@@ -2328,7 +2480,8 @@
 msgstr "Typ souboru"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2341,7 +2494,7 @@
 msgstr "Rozlišení obrázku"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 × 480"
 
@@ -2365,8 +2518,9 @@
 msgid "High (good quality)"
 msgstr "vysoká (dobrá obrazová kvalita)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Pořídit snímek"
 
@@ -2395,77 +2549,84 @@
 msgstr "Kompenzace hodnot z expozimetru"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automatické"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Vynucené"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Žádné"
 
@@ -2474,71 +2635,78 @@
 msgstr "Blesk – omezení jevu červených očí"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Zapnuto"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Vypnuto"
 
@@ -2554,7 +2722,7 @@
 msgid "Port speed"
 msgstr "Rychlost rozhraní"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Název alba"
 
@@ -2773,58 +2941,58 @@
 "Knihovna pro přístroj Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Čeká se…"
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parametr 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parametr 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parametr 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Model: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Verze firmware: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Stav akumulátoru: %s, síťový napájecí zdroj: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Počet snímků: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Zbývající místo (dle kvality): vysoká: %d, střední: %d, nízká: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Stav paměťové karty (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Celkově pořízeno obrázků: %d; odpáleno záblesků: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2837,45 +3005,46 @@
 "fr>\n"
 "Předěláno a upraveno pro gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Slabé"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Prázdné"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Neplatné"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Nepoužito"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Používá se"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Paměťová karta je otevřena"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Paměťová karta není otevřena"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Paměťová karta není naformátována"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Není vložena paměťová karta"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2883,14 +3052,14 @@
 "V současnosti v přístroji již probíhá operace. Protože umí zpracovávat jen "
 "jeden povel naráz, vyčkejte prosím, než bude tato operace dokončena."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr ""
 "Přístroj byl neaktivní po více než 9 vteřin – zahajuje se opětovná "
 "inicializace\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2906,7 +3075,7 @@
 "přístroj neodpovídá, jednoduše přístroj znovu vyberte. To spustí jeho "
 "opětovnou inicializaci."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2918,7 +3087,7 @@
 "\n"
 "Dotazy a komentáře jsou vítány."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2927,7 +3096,7 @@
 "Vaše USB zařízení je Kodak EZ200.\n"
 "Počet obrázků = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2935,107 +3104,107 @@
 "Ovladač pro Kodak EZ200\n"
 "Bucas Jean Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Chyba zaostřování."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Chyba závěrky."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Chyba stroboskopu."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Chyba v kontrolním součtu firmware."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Vnitřní chyba (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Vnitřní chyba (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Není přítomna žádná paměťová karta."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Paměťová karta není podporována."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Pamětová karta byla vyjmuta v průběhu operací s ní."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Neplatné číslo snímku."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Na paměťovou kartu není možné zapisovat."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Paměťová karta je uzamčena proti zápisu."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Na paměťové kartě došlo místo."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Snímek je chráněn proti smazání."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Nedostatek světla."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Chyba automatického ostření."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Systémová chyba."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Neplatný parametr."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Příkaz nelze zrušit."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Data národního prostředí jsou příliš objemná."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Data národního prostředí jsou poškozena."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Nepodporovaný příkaz."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Právě probíhá vykonávání jiného povelu."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Chyba pořadí příkazů."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3045,15 +3214,15 @@
 "Tento přístroj právě ohlásil chybu, která doposud nebyla známa. Prosím "
 "ohlaste to na %s s podrobnostmi, jak k tomu došlo (0x%x, 0x%x). Vřelé díky!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Probíhá získávání seznamu souborů…"
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Probíhá testování různých rychlostí…"
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3061,12 +3230,12 @@
 "S přístrojem se nebylo možné spojit. Prosím zkontrolujte, zda je propojen s "
 "počítačem a zapnutý."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i snímků nemohlo být smazáno, protože jsou proti smazání chráněny."
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3085,7 +3254,7 @@
 "Název: %s,\n"
 "Výrobce: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3095,402 +3264,411 @@
 "Lutz Müller <lutz@users.sourceforge.net>\n"
 "Určeno pro všechny přístroje od Konica a také některé od HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Probíhá zjišťování současného nastavení přístroje…"
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica – nastavení"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Trvalá nastavení"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Má přístroj při pořízení snímku vydat zvukové upozornění?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Prodleva samospouště"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Prodleva před automatickým vypnutím"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Prodleva střídání snímků"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Nízké (576 × 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Střední (1152 × 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Vysoké (1152 × 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Národní prostředí"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Jazyk"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Nezvoleno žádné"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Formát výstupu na televizor"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Nezobrazovat nabídku televizoru"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Formát data"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Měsíc/Den/Rok"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Den/Měsíc/Rok"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Rok/Měsíc/Den"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Nastavení platná pouze pro tuto relaci"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Odpálen vždy, omezení jevu červených očí"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Odpálen dle potřeby, omezení jevu červených očí"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Ohnisko"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Pevné"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Dočasná nastavení"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Samospoušť"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Samospoušť (pouze pro příští snímek)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Běžné"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Nezdařilo se nalézt data národního prostředí na „%s“"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Soubor s národním prostředím je příliš dlouhý!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Tento náhled neexistuje."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Data byla poškozena."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Obrázek typu %d není tímto přístrojem podporován!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Snímek %s nelze smazat."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Nelze smazat všechny snímky naráz."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Probíhá odesílání snímku…"
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Tento snímek se nepodařilo odeslat do přístroje. Vyskytla se chyba."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr ""
 "Pro pořízování snímků musí být přístroj přepnutý do příslušného režimu."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Pro pořizování dalších snímků již není místo. Je třeba smazat nějaké "
 "předchozí."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Nelze pořízovat další snímky. Neznámá chyba."
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Žádná odezva od zařízení."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "nízké"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "střední"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "vysoké"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD displej"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikony"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2,0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0,5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0,1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Vyvážení bílé"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Kancelář"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Denní světlo"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Ostrost"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Ostré"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Měkké"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Barva"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Světlo"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Hloubka"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Černá a bílá"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Jednotlivé"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "dávka po 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Zobrazení data"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Kdekoli"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Režim přehrávání"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Režim nahrávání"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Kdekoli"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "Elektrická síť"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Přehrávat"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Nahrávat"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/RRRR"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "RRRR/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/RRRR"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3511,7 +3689,7 @@
 "Zobrazení data: %s\n"
 "Datum a čas: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3526,7 +3704,7 @@
 "http://www.ap2c.com\n"
 "Podpora pro francouzskou verzi Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3543,7 +3721,7 @@
 "nastavení jsou, ale nelze je měnit. V případě problémů s ovladačem, pošlete "
 "prosím e-mail jeho tvůrcům.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3551,7 +3729,7 @@
 "Ovladač pro Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3562,7 +3740,7 @@
 "Firmware: %s\n"
 "Verze firmware: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3570,7 +3748,103 @@
 "Obecný ovladač pro LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Nastavení"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Uzamčení měření exp. hodnot"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Expoziční čas"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Kvalita"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Kvalita videonahrávky"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+#, fuzzy
+msgid "Movie"
+msgstr "Zvukový stopa k videu"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Režim automatického ostření"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "Režim živého náhledu"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Snadno zapamatovatelný název zařízení"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Pomocné přisvícení automatického ostření"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Pomocné přisvícení automatického ostření"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Identifikátor objektivu"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Kompatibilní režim"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Plně ruční"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Nabídka uživatelských nastavení"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3588,7 +3862,7 @@
 "Přístroj Mars MR97310.\n"
 "Uloženo %i snímků.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3609,7 +3883,7 @@
 "Videozáznamy jsou stahovány jako posloupnost snímků.\n"
 "Více podrobností je uvedeno v souboru libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3617,7 +3891,7 @@
 "Ovladač pro Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3628,7 +3902,7 @@
 "Verze hardwaru:\t%s\n"
 "Verze firmwaru:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3655,61 +3929,63 @@
 "ID paměťových karet:\t\t%d\n"
 "Režim blesku:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Vzdálené"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Místní"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Ano"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Ne"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Jemné"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standardní"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Dle potřeby\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Blesk odpálit vždy\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Blesk vypnut\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Neplatná hodnota ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3726,74 +4002,74 @@
 "Nabíjení blesku:\t\t%s\n"
 "Stav objektivu:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Prázdné"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Plné"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Zaneprázdněno"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Nečinné"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Probíhá nabíjení"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Připraveno"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Běžné\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Nasměrování objektivu se neshoduje s bleskem\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objektiv není připojen\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Špatná hodnota stavu objektivu %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Stav paměťové karty:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Chráněno proti zápisu"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Nepoužitelná paměťová karta"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Špatná hodnota pro stav paměťové karty %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3806,63 +4082,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Poděkování Minoltě za poskytnutí dokumentace."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Blesk: odpálení dle potřeby (s omezením jevu červených očí)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Blesk: odpálení dle potřeby"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Blesk: odpálení vždy (s omezením jevu červených očí)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Blesk: odpálení vždy"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Blesk: vypnut"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Blesk: neurčeno"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Souhrné informace pro zařízení Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "Nebylo obdrženo žádné hlášení o stavu."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Zjištěna paměťová karta typu Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Nebyla rozpoznána žádná paměťová karta typu Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Současný režim: fotografování\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Současný režim: přehrávání\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Akumulátory jsou nabité."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Akumulátory jsou vybité."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3874,25 +4150,25 @@
 "Do gphoto2 začlenil Marcus Meissner <marcus@jet.franken.de>\n"
 "Podporuje komunikaci přes sériové i USB rozhraní."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "Ovladač pro coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Probíhá odpojení přístroje."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Probíhá stahování snímku %s"
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Probíhá odesílání snímku: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3901,17 +4177,17 @@
 "Velikost souboru je %ld bajtů. Nahrávat je přitom možné soubory velké "
 "nanejvýš %i bajtů."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Probíhá odesílání…"
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Probíhá mazání snímku %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3926,12 +4202,12 @@
 "Založeno na programu dc1000, který vytvořili:\n"
 "Fredrik Roubert <roubert@df.lth.se> a Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Probíhá stahování „%s“."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3947,12 +4223,12 @@
 "Fredrik Roubert <roubert@df.lth.se> a\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Probíhá stahování „%s“…"
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3972,7 +4248,7 @@
 "JEMNÉM 640×480. Snímač CCD, který provádí snímání z optiky má pouze 300K a "
 "proto mají výsledné snímky nízkou kvalitu."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3987,7 +4263,7 @@
 "Ovladač se není schopen s takovými situacemi vypořádat, zvláště po "
 "nekorektním vypnutí přístroje při komunikaci rychlejší než 9600 b/s."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3995,7 +4271,7 @@
 "Ovladač pro zařízení Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -4006,7 +4282,7 @@
 "Volná kapacita: %8d bajtů.\n"
 "Počet souborů: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4018,11 +4294,11 @@
 "Tvůrci: Till Adam <till@adam-lilienthal.de> a Miah Gregory <mace@darksilence."
 "net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Probíhá stahování souboru…"
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4030,33 +4306,136 @@
 "Creative PC-CAM600\n"
 "Autor: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Očekáváno > %d bloků, obdrženo %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: získán index %d, ale očekáván index > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: byla vrácena hodnota %d namísto %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: očekáváno %d bloků, obdrženo %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600_init: neočekávaná chyba: funkce gp_port_read vrátila %d namísto %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Model: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Neznámý povel"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Velikost snímku"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Obrazová kvalita"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Nejvyšší možné zaclonění při nejkratší možné ohniskové vzdálenosti"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Nejvyšší možné zaclonění při nejdelší možné ohniskové vzdálenosti"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Režim focení"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "Exp. čas ručně, zaclonění automat."
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "Zaclonění ručně, exp. čas automat."
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "Exp. čas ručně, zaclonění automat."
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "Černobílé"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Neznámý typ přístroje"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4070,12 +4449,12 @@
 "Müller <lutz@users.sf.net>.\n"
 "Na přístroji Polaroid 640SE otestoval Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Model: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4091,110 +4470,98 @@
 "Michael Trawny <trawny99@users.sourceforge.net>.\n"
 "Chyby opravil Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Obrazová kvalita"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Velikost snímku"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Nastavení blesku"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automat. vypnutí (v minutách)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informace"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "obyčejné"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "jemné"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "superjemné"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "automatické"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "zapnuto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "vypnuto"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "přehrávání"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "záznam"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "nabídka"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "akumulátor"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "síť. napájecí zdroj"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Obdržena neočekávaná hlavička (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Obdržena neočekávaná odpověď"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Chyba v kontrolním součtu"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Přístroj povel nepřijal."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Přístroj zaslal více bajtů, než bylo očekáváno (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4203,7 +4570,7 @@
 "Byly požadovány informace o snímku %i (= 0x%x), namísto toho ale obdrženy "
 "informace o jiném snímku (%i)"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4212,7 +4579,7 @@
 "Bylo přijato %i bajtů neznámých obrazových dat. Napište prosím na %s a "
 "požádejte o součinnost."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4222,19 +4589,20 @@
 "Lantzer <rlantzer@umr.edu>, pro gphoto2 upravil Lutz Müller <lutz@users.sf."
 "net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Přístroj"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Jak dlouho potrvá, než se přístroj vypne?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Snímek"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4267,3644 +4635,5671 @@
 "Prodleva automat. vypnutí: %i minut\n"
 "Napájení: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Požadovaný typ portu (%i) není tímto ovladačem podporován."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Stav paměťové karty:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Režim zaostřování"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Přiblížení: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Režim blesku"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Přednastavené"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Uvolnit"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Režim pořizování statických snímků"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Uzamčení expozice"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Autom. zaostření uzamčeno"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Autom. zaostření uzamčeno"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Natočení"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Nastavení obrazu"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Tento typ přístroje Canon neumožňuje dálkově řízené snímání "
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Neznámá hodnota %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Neznámá hodnota %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "neočekávaný typ dat %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Ruční"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatické"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Jednorázové automatické"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Výbojkové"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Žárovka"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Zataženo"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Ve stínu"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Barevná teplota"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Přednastavené"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Výbojkové svítidlo 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Výbojkové svítidlo 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Výbojkové svítidlo 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Výbojkové svítidlo 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Výbojkové svítidlo 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Zvolte barevnou teplotu"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Přednastavené uživatelem 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Přednastavené uživatelem 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Přednastavené uživatelem 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Přednastavené uživatelem 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Přednastavené uživatelem 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "Výbojkové svítidlo 1"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "Výbojkové H"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "Výbojkové svítidlo 1"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "Výbojkové H"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "Přednastavené"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "Přednastavené"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "Přednastavené"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 #, fuzzy
 msgid "Underwater: Auto"
 msgstr "Pod vodou"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Žárovka"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "Výbojkové H"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "Výbojkové H"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Přednastavené"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Uživatelské"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "jemný JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "obyčejný JPEG"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + jemný JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + obyčejný JPEG"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+#, fuzzy
+msgid "Large Fine JPEG+RAW"
+msgstr "JPEG – vysoké rozl. a méně ztrát. kompr."
+
+#: camlibs/ptp2/config.c:1540
+#, fuzzy
+msgid "Large Normal JPEG+RAW"
+msgstr "JPEG – vysoké rozl. a více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:1541
+#, fuzzy
+msgid "Medium Normal JPEG+RAW"
+msgstr "JPEG – střední rozl. a více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:1542
+#, fuzzy
+msgid "Small Normal JPEG+RAW"
+msgstr "JPEG – nízké rozl., více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Jednotlivý snímek"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Nepřetržité snímání s delší prodl. mezi snímky"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Nepřetržité snímání s kratší prodl. mezi snímky"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Zdvihnutí zrcátka"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Standardní"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Černá a bílá"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Černá a bílá"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Černá a bílá"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Černá a bílá"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "neurčené"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "ekonomické"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "bezztrátové"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW (Canon RAW)"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "Exp. čas ručně, zaclonění automat."
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "Zaclonění ručně, exp. čas automat."
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 "Max. světla (min. zaclon.) při dost. hl. ostr. (pro AUTOMAT. zvol. objekty)"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 "Max. světla (min. zaclon.) při dost. hl. ostr. (pro RUČNĚ zvol. nejbl. a "
 "nejvzd. objekt)"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "Režim určování hloubky ostrosti"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Uživatelské"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Zámek"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Noční portrét"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sporty"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Krajina"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Zblízka"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Vypnout blesk"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Kreativní"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Noční scéna"
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Řízení výšky"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Jídlo"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Mimo ohnisko"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Rybí oko"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Efekt miniatury"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "standardní"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "Režim vysokého dyn. rozsahu (HDR)"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Portrét domác. mazlíčků"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr "Hladké"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "Omezení jevu červených očí"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "výplňový záblesk"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "Odpálen dle potřeby + omezení jevu červených očí"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "Odpálen vždy + omezení jevu červených očí"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "Intenzita záblesku dle pomoc. při vyklop. zrcátku"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Režim řídícího blesku"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Opakované"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "Měření skrze čočky objektivu"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Automat. nastavení zaclonění"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Plně ruční"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Akční"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Velké"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Malé"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "jednoráz. automat. zaostření při namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "průbežné automatické zaostřování"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "automat. volba jednorázového či průběžného zaostření"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (napevno)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (výběr)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "S důrazem na střed záběru"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Zprůměrované"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Vyhodnocující"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Částečné"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Zprůměrované s důrazem na střed záběru"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Bodové měření propojené s oblastí automatického zaostřování"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Vícebodové"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Věrné"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monochromatické"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Určené uživatelem 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Určené uživatelem 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Určené uživatelem 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Zaostření pouze na střed – ruční"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Zaostření pouze na střed – automat."
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Zaostření na více bodů (neurčeno), ruční"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Zaostření na více bodů – automat."
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Zostření na více bodů (vpravo)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Zostření na více bodů (střed)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Zostření na více bodů (vlevo)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Velké"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Střední 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Střední 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Střední 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Malé"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 vteřin"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 vteřiny"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "displej přístroje"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "monitor počítače"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "displej přístroje i monitor počítač"
 
-#: camlibs/ptp2/config.c:2244
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2530
 #, fuzzy
-msgid "Setting 4"
-msgstr "Typ ČB nastavení"
+msgid "TFT + MOBILE"
+msgstr "displej přístroje i monitor počítač"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2245
+#: camlibs/ptp2/config.c:2532
 #, fuzzy
-msgid "Setting 5"
-msgstr "Typ ČB nastavení"
+msgid "TFT + PC + MOBILE"
+msgstr "displej přístroje i monitor počítač"
 
-#: camlibs/ptp2/config.c:2246
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
 #, fuzzy
-msgid "Setting 6"
-msgstr "Typ ČB nastavení"
+msgid "TFT + PC + MOBILE2"
+msgstr "displej přístroje i monitor počítač"
 
-#: camlibs/ptp2/config.c:2247
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
 #, fuzzy
-msgid "Setting 7"
-msgstr "Typ ČB nastavení"
+msgid "LiveSpotAF"
+msgstr "Automat. zaostření na jediný bod"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "operační paměť"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "paměťová karta"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Videovýstup"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Neznámé %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Tovární nastavení"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Automat. nastavení citlivosti (ISO)"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Menší JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Drobný JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + JPEG s vysokým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + JPEG s vysokým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+#, fuzzy
+msgid "cRAW + Large Fine JPEG"
+msgstr "RAW + JPEG s vysokým rozl. a méně ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + JPEG se středním rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + JPEG se středním rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+#, fuzzy
+msgid "cRAW + Medium Fine JPEG"
+msgstr "RAW + JPEG se středním rozl. a méně ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + JPEG s nízkým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + JPEG s nízkým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+#, fuzzy
+msgid "cRAW + Small Fine JPEG"
+msgstr "RAW + JPEG s nízkým rozl. a méně ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + JPEG s vys. rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + JPEG s vys. rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "RAW + JPEG s vysokým rozl. a více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + JPEG se střed. rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + JPEG se střed. rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "RAW + JPEG se středním rozl. a více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "sRAW + JPEG s nízkým rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + JPEG s nízkým rozliš. a ztrátovější"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "RAW + JPEG s nízkým rozl. a více ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2743
 #, fuzzy
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + JPEG s nízkým rozl. a méně ztrát. kompr."
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 #, fuzzy
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + JPEG s nízkým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 #, fuzzy
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + JPEG s nízkým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+#, fuzzy
+msgid "cRAW + Smaller JPEG"
+msgstr "RAW + JPEG s nízkým rozl. a méně ztrát. kompr."
+
+#: camlibs/ptp2/config.c:2747
 #, fuzzy
 msgid "RAW + Tiny JPEG"
 msgstr "Drobný JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 #, fuzzy
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + JPEG s vysokým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 #, fuzzy
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + JPEG s vysokým rozliš. a ztrátový"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Malé"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Střední 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Střední 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Velké"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Střední 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Střední 2"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Střední 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Střední 2"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Střední 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Střední 2"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Průběžné"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Videovýstup"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "Jednotlivé snímky"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Nepřerušovaně tiše"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Samospoušť 10 vteřin"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Samospoušť 2 vteřiny"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "Dávkové snímání"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Jednotlivě tiše"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Nepřerušovaně tiše"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Automat. nastavení citlivosti (ISO)"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Průběžné"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Potlačení šumu při vysoké citlivosti (ISO)"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Průběžné"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "Omezení úrovně šumu při dlouhých expozičních časech"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Pro režim řízení expozičního času délkou stisku spouště (bulp), je třeba, "
+"aby otočný volič režimů byl přepnut do polohy „M“ (plně ruční režim) a "
+"„expoziční čas“ nastaven na „bulb“."
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2895
 #, fuzzy
+msgid "Bulb On"
+msgstr "Exp. po dobu stisku spouště"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Exp. po dobu stisku spouště"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "jednoráz. automat. zaostření při namáčknutí spouště"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+#, fuzzy
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+"Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není zaostřeno?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 bodů (třírozměrné)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 bodů (třírozměrné)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 bodů (třírozměrné)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 bodů (třírozměrné)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, fuzzy, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Potlačení šumu při vysoké citlivosti (ISO)"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+#, fuzzy
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Potlačení šumu při vysoké citlivosti (ISO)"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4f s"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Kreativní"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Akční"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Noční krajina"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Děti"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automat (bez blesku)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+#, fuzzy
+msgid "U1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+#, fuzzy
+msgid "U2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
+#: camlibs/ptp2/config.c:3840
 #, fuzzy
-msgid "Movie"
+msgid "Movie (P)"
 msgstr "Zvukový stopa k videu"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Zvukový stopa k videu"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "Zvukový stopa k videu"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Zvukový stopa k videu"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Rozlišení videonahrávky"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "Sporty"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Západ Slunce"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 #, fuzzy
 msgid "Night Scene"
 msgstr "Noční scéna"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 #, fuzzy
 msgid "Hand-held Twilight"
 msgstr "Svit svíček"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "Efekt miniatury"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Noční krajina"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Párty/interiér"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Pláž/sníh"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Stmívání/rozednění"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Portrét domác. mazlíčků"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Svit svíček"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Květy"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Podzimní barvy"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Jídlo"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 #, fuzzy
 msgid "Child"
 msgstr "Děti"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 #, fuzzy
 msgid "Close up"
 msgstr "Zblízka"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "Výbojkové"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Extra vysoké"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Snímek"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scéna"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Efekty"
 
-#: camlibs/ptp2/config.c:3256
-#, fuzzy
-msgid "U1"
-msgstr "1"
-
-#: camlibs/ptp2/config.c:3257
-#, fuzzy
-msgid "U2"
-msgstr "2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "Podsvícení displeje"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 #, fuzzy
 msgid "Smoothing"
 msgstr "HDR – vyhlazování"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 #, fuzzy
 msgid "Select Color"
 msgstr "Zvolená barva"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Jednotlivé snímky"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Dávka"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Časosběrné snímání"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Kontinuální snímání s delší prodlevou mezi snímky"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Zdvihnutí zrcátka"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Dálk. ovl. poříz. dalšího snímku bez opětovného ostření"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Pozdržené vzdálené"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Režim tiché závěrky"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+#, fuzzy
+msgid "Continuous Quiet Release"
+msgstr "Režim tiché závěrky"
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Samospoušť (pouze pro příští snímek)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Samospoušť (pouze pro příští snímek)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Samospoušť (pouze pro příští snímek)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Samospoušť (pouze pro příští snímek)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Kontinuální snímání s delší prodlevou mezi snímky"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Kontinuální snímání s delší prodlevou mezi snímky"
+
+#: camlibs/ptp2/config.c:4172
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 #, fuzzy
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 #, fuzzy
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 #, fuzzy
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 #, fuzzy
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 #, fuzzy
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 #, fuzzy
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 #, fuzzy
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 #, fuzzy
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Středový bod"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Vícebodové"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Jediná oblast"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Nejbližší objekt"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Kterýmkoli ze senzorů"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Automat. zaostření na jedinou oblast"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Automatické zaostření kterýmkoli ze senzorů"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 #, fuzzy
 msgid "Group-dynamic AF"
 msgstr "Automatické zaostření kterýmkoli ze skupiny vybraných senzorů"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 "Automat. zaostření kterýmkoli ze senzorů s upřednostněním nejbližšího objektu"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 #, fuzzy
 msgid "Dynamic Area (9)"
 msgstr "Proměnlivá oblast automatického ostření"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 #, fuzzy
 msgid "Dynamic Area (21)"
 msgstr "Proměnlivá oblast automatického ostření"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 #, fuzzy
 msgid "Dynamic Area (51)"
 msgstr "Proměnlivá oblast automatického ostření"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 #, fuzzy
 msgid "3D Tracking"
 msgstr "Více snímků s odstupňovaným projasněním stínů"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+#, fuzzy
+msgid "Dynamic-area AF (25 points)"
+msgstr "Automatické zaostření kterýmkoli ze senzorů"
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "Automat. zaostření pro běžný úhel záběru"
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "Více snímků s odstupňováním daného nastavení"
+
+#: camlibs/ptp2/config.c:4253
+#, fuzzy
+msgid "Dynamic-area AF (72 points)"
+msgstr "Automatické zaostření kterýmkoli ze senzorů"
+
+#: camlibs/ptp2/config.c:4254
+#, fuzzy
+msgid "Dynamic-area AF (153 points)"
+msgstr "Automatické zaostření kterýmkoli ze senzorů"
+
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "Automatické zaostření kterýmkoli ze skupiny vybraných senzorů"
+
+#: camlibs/ptp2/config.c:4256
+#, fuzzy
+msgid "Dynamic-area AF (9 points)"
+msgstr "Automatické zaostření kterýmkoli ze senzorů"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+#, fuzzy
+msgid "Wide-area AF (S)"
+msgstr "Automat. zaostření pro širokoúhlé záběry"
+
+#: camlibs/ptp2/config.c:4260
+#, fuzzy
+msgid "Wide-area AF (L)"
+msgstr "Automat. zaostření pro širokoúhlé záběry"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Automat. zaostření pro širokoúhlé záběry"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Automat. zaostření pro širokoúhlé záběry"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (optimální pro portréty)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (optimální pro přírodu)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Neznámá hodnota 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Uprostřed"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Nahoře"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Dole"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Vlevo"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Vpravo"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Širokoúhlé"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Uprostřed"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Přizpůsobivý program"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Přizpůsobivý program"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Přizpůsobivý program"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "S prioritou středu záběru"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Vícebodové"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Bod ve středu"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP – měření osvětl. scény z celé plochy záběru"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "Stín"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "Vícebodové"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Standardní"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Velké"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "vysoké"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Blesk dle potřeby"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Vyplňující blesk"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Odpálen dle potřeby s omezením jevu červených očí"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Vyplňující blesk s omezením jevu červených očí"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Vnější synchronizace"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Automatická pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Synchronizace s koncem exp. + pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Omezení jevu červenách očí + pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Synchronizace se začátkem expozice"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Omezení jevu červených očí"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Omezení jevu červenách očí + pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Pomalá synchronizace s koncem exp."
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Synchronizace s koncem exp."
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 #, fuzzy
 msgid "Rear Curtain Sync"
 msgstr "Synchronizace s koncem exp."
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Pomalá synchronizace"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Černá a bílá"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Noční vidění"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Barevný náčrtek"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Efekt miniatury"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Zvolená barva"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Obrys"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Světlé tóny, nízký kontrast"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Tmavé tóny, vysoký kontrast"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "nekonečno"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "nekonečno"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Komprimace"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "po dobu stisku spouště"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Pomalá synchronizace"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "Automat. zaostření s důrazem na obličeje"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Automat. zaostření pro širokoúhlé záběry"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Automat. zaostření pro běžný úhel záběru"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "Automat. zaostření na pohybující se objekt"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Automat. zaostření na jediný bod"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Stavový displej"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25 %"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50 %"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100 %"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "Průběžné automat. zaostřování"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Průběžné autom. zaostřování"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Ruční zaostření"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "MF (výběr)"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Zablok. zaostření i expozice"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Zablok. expozice"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Zablok. automatického zaostření"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Zablok. automat. zaostření bez držení tlačítka"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "Automat. zaostření zapnuto"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Zablok. intenzity záblesku"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 vteřin"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minut"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 vteřin"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "operační paměť"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 minut"
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "po dobu stisku spouště"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30 s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25 s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20 s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15 s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13 s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10 s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8 s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6 s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5 s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4 s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3 s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2,5 s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2 s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1,6 s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1,3 s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1 s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1,3 s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1,6 s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2 s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2,5 s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3 s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4 s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5 s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6 s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8 s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10 s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13 s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15 s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20 s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25 s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30 s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40 s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50 s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60 s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80 s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100 s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125 s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160 s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200 s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250 s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320 s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400 s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500 s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640 s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800 s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000 s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250 s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600 s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000 s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500 s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200 s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000 s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000 s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400 s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000 s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Ostřejší"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Měkčí"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Přímý tisk"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Střední nízké"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Střední vysoké"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Nízký kontrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Střední vysoké"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Řízení výšky"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zónové zaostřování (detail)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Zónové zaostřování (velmi blízko)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zónové zaostřování (blízko)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zónové zaostřování (střední)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zónové zaostřování (daleké)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zónové zaostřování (vyhrazeno 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zónové zaostřování (vyhrazeno 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Zónové zaostřování (vyhrazeno 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zónové zaostřování (vyhrazeno 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatický makrorežim"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Průběžné automat. zaostřování"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "Nepřetržité průběžné zaostřování"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "Jednoráz. / průběžné zaostřování – automat."
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 vteřiny"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 vteřin"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Držet"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Výbojkové H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Uživatelské nastavení vyvážení bílé PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Uživatelské nastavení vyvážení bílé PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Uživatelské nastavení vyvážení bílé PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Chybějící číslo"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Stín"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Uživatelské"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Uživatelské nastavení vyvážení bílé PC-1"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Uživatelské"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Uživatelské nastavení vyvážení bílé PC-2"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Uživatelské"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Uživatelské nastavení vyvážení bílé PC-3"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Uživatelské"
+msgid "Manual 3"
+msgstr "Ruční „2“"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Ruční „2“"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Ruční „2“"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Uživatelské nastavení vyvážení bílé PC-1"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Uživatelské nastavení vyvážení bílé PC-1"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Černá a bílá"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Mírné doostřování"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Černá a bílá"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Více snímků s odstupňovaným projasněním stínů"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Více snímků s odstupňovaným vyvážením bílé"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Více snímků s odstupňovaným vyvážením bílé"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Více snímků s odstupňovaným vyvážením bílé"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Režim více snímků s odstupňováním daného nastavení"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "expozimetr a blesk"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "pouze expozimetr"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Pouze blesk"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Více snímků s odstupňovaným vyvážením bílé"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "Více snímků s odstupňovaným projasněním stínů"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Spouštění"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Vypínání"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Spouštění a vypínání"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Rychlá odezva"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Vzdálené zdvihnutí zrcátka"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "Režim provozu přístroje"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "Režim provozu přístroje"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Střední"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Vylepšené"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > pod"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "nad > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Automatická citlivost"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Vysoká citlivost"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Střední citlivost"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Nízká citlivost"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Vypnout mikrofon"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Vysoké 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Vysoké 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Blesk/expoziční čas"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Blesk/expoziční čas/zaclonění"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Blesk/zaclonění"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG – základní kvalita"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF + vysoká kvalita"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF + základní kvalita"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF + normální kvalita"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG – základní kvalita"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "obyčejný JPEG"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "jemný JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "NEF + základní kvalita"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "NEF + normální kvalita"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "NEF + vysoká kvalita"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "Extra vysoké"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF + vysoká kvalita"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "RAW + jemný JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Jemné"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "plně ruční režim"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW + jemný JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "jemný JPEG"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "surová data ze snímače (RAW) „2“"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "Vícebodové"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 vteřin"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 vteřin"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 vteřin"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Bezeztrátová"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Ztrátová"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Světlé tóny, nízký kontrast"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Priority velikosti"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optimální kvalita"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250 s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 #, fuzzy
 msgid "1/320s (Auto FP)"
 msgstr "1/250 s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Uvolnit"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Uvolnit + zaostřit"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 bodů"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 bodů"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 bodů"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 bodů (třírozměrné)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (dlouhé)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (normální)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (krátké)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Závěrka / zap. automat. zaostření"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "automat. zaostření zapnuto"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Uzamčení expozice i ostření"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Uzamčení pouze expozice"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Uzamčení automatického ostření (resetovat při uvolnění)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Uzamčení automatického ostření (držet)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Uzamčení pouze ostření"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 snímky/s"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 snímky/s"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 snímky/s"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 snímek/s"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 snímků/s"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 snímků/s"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 snímků/s"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 snímků/s"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 snímků/s"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 snímků/s"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 snímků/s"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 #, fuzzy
 msgid "Preview"
 msgstr "Tlačítko náhledu"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 #, fuzzy
 msgid "FV lock"
 msgstr "Uzamčení expozice i ostření"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 #, fuzzy
 msgid "AE lock (hold)"
 msgstr "Uzamčení automatického ostření (držet)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 #, fuzzy
 msgid "Matrix metering"
 msgstr "Částečné měření"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 #, fuzzy
 msgid "Center-weighted metering"
 msgstr "Měření s důrazem na střed"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "Bodové měření"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "Rychlost přehrávání"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 #, fuzzy
 msgid "+NEF (RAW)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Projasnění stínů"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 #, fuzzy
 msgid "1 step spd/aperture"
 msgstr "Blesk/expoziční čas/zaclonění"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "Zobr. pomocné kompoz. mřížky v hledáčku"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 #, fuzzy
 msgid "Start movie recording"
 msgstr "Pořizování videonahrávky"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50 %"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Omez. vlivu blikání výbojkového osvětlení"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100 %"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75 %"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25 %"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Neznámá hodnota"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 #, fuzzy
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "U tohoto typu přístroje Nikon není režim živého náhledu k dispozici"
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Úplné stisknutí spouště"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Částečné uvolnění spouště"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Úplné uvolnění spouště"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Okamžité"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "Namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "Namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "Namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 #, fuzzy
 msgid "Release 1"
 msgstr "Uvolnit"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 #, fuzzy
 msgid "Release 2"
 msgstr "Uvolnit"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 #, fuzzy
 msgid "Release 3"
 msgstr "Uvolnit"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Blízko 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Blízko 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Blízko 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Daleko 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Daleko 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Daleko 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Blízko %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Daleko %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 #, fuzzy
 msgid "Nikon enable liveview failed"
 msgstr "Nikon – zapnutí živého náhledu se nezdařilo: %x"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+#, fuzzy
+msgid "Movie prohibit conditions: "
+msgstr "Důvod nedostupnosti živého náhledu"
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Není ve vyplňovacím režimu"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
 msgstr ""
-"Pro režim řízení expozičního času délkou stisku spouště (bulp), je třeba, "
-"aby otočný volič režimů byl přepnut do polohy „M“ (plně ruční režim) a "
-"„expoziční čas“ nastaven na „bulb“."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Zobrazení snímku po pořízení"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Paměťová karta je uzamčena proti zápisu."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+#, fuzzy
+msgid "Already in movie recording"
+msgstr "Pořizování videonahrávky"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "paměťová karta"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Paměťová karta není naformátována"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Chyba závěrky."
+
+#: camlibs/ptp2/config.c:8569
+#, fuzzy
+msgid "No movie prohibit conditions"
+msgstr "Důvod nedostupnosti živého náhledu"
+
+#: camlibs/ptp2/config.c:8587
+#, fuzzy
+msgid "Live View prohibit conditions: "
+msgstr "Důvod nedostupnosti živého náhledu"
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "dávka po 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Neplatné nastavení clony"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Akumulátor je vybitý – přístroj se vypnul"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "Vstupně/výstupní chyba PTP"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Nastavení clony"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Paměťová karta není naformátována"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Nastavení informačního displeje"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Režim expozičního programu"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "Výbojkové"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "Nastavení času"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Černá a bílá"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatické"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Automatický makrorežim"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Neznámé: 0x%04x\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Supermakro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "plně ruční režim"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Daleko 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Daleko 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Blízko 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Blízko 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "zaclonění ručně, exp. čas automat."
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standardní"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Nahrávat"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Přehrávat"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Ostatní nastavení"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Redukce šumu při vysokých hodnotách citlivosti (ISO)"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Nezobrazovat nabídku televizoru"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Velké"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Neznámá hodnota %04x"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Interní paměť"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Paměťová karta"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "Název bezdrátové sítě"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Zobrazit"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Datum pořízení: %s, naposledy použito: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Smazat"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "šifrování WEP – 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "šifrování WEP – 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "přístupový bod ‒ klient"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "přímá komunikace"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Název profilu"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "Název bezdrátové sítě (ESSID)"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP adresa (pro DHCP prázdné)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Síťová maska"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Výchozí brána"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Režim přístupu"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Kanál WiFi"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Šifrovací klíč (v hex. zápisu)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Zapsat"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Vypsat profily pro WiFi"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Vytvořit profil pro WiFi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Synchronizovat datum a čas na přístroji s počítačem"
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Mimo ohnisko"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Ruční zaostření"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "Dávkové snímání"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Uzamčení zaostření"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Režim exp. po dobu stisku spouště"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Uzamčení uživatelského rozhraní"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Bez blesku"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "dig. zrcadl. Nikon – ovl. automat. zaostření"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "dig. zrcadl. Canon – ovl. automat. zaostření"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr "dig. zrcadl. Nikon – ovl. automat. zaostření"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "dig. zrcadl. Nikon – ovl. ručn. zaostření"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 #, fuzzy
 msgid "Set Nikon Autofocus area"
 msgstr "dig. zrcadl. Nikon – ovl. automat. zaostření"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 #, fuzzy
 msgid "Set Nikon Control Mode"
 msgstr "Nikon – režim blesku"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "dig. zrcadl. Canon  – ovl. ručn. zaostření"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 #, fuzzy
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "dig. zrcadl. Canon – ovl. automat. zaostření"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+#, fuzzy
+msgid "Drive Olympus OMD Manual focus"
+msgstr "dig. zrcadl. Nikon – ovl. ručn. zaostření"
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "dig. zrcadl. Canon  – ovl. ručn. zaostření"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Přiblížení po skocích (Easy Zoom) – počáteční úroveň přiblížení"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "dig. zrcadl. Canon – přiblížení"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "dig. zrcadl. Canon – míra přiblížení"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "dig. zrcadl. Canon – hledáček"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+#, fuzzy
+msgid "Panasonic Viewfinder"
+msgstr "dig. zrcadl. Canon – hledáček"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon – hledáček"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "dig. zrcadl. Canon – dálkové ovl. spouště"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "Skript rozšiřujícího softwaru (CHDK)"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "Pořídit snímek"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Zvukový stopa k videu"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Režim zaostřování"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Oblast, kam automaticky zaostřovat"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Jas zaostřovacího bodu"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Sériové číslo"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Výrobce přístroje"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Verze přístroje"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Nadstavba přidaná výrobcem"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Verze protokolu pro přenos snímků (PTP)"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Verze formátu přímé objednávky tisku"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Napájení z elektrické sítě"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Externí blesk"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Stav nabití akumulátoru"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+#, fuzzy
+msgid "Mirror Up Status"
+msgstr "Zdvihnutí zrcátka"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Zdvihnutí zrcátka"
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+#, fuzzy
+msgid "Mirror Up Shooting Count"
+msgstr "Posloupnost zdvihnutí zrcátka"
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Dávkové snímání"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Poloha přístroje"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Vyklopení blesku"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Aktivní senzor automatického ostření"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Blesk je nabit"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Označení objektivu"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Počet proběhlých cyklů závěrky"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Zbývá cyklů"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Min. ohnisková vzdálenost"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Max. ohnisková vzdálenost"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Max. zaclonění, možné při nejkratším ohnisku"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Max. zaclonění, možné při nejdelším ohnisku"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Málo světla"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Expozimetr"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Autom. zaostření uzamčeno"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "Expozimetr uzamčen"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "Nevysílat měřící záblesky před každým snímkem"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Hlas videonahrávky"
+
+#: camlibs/ptp2/config.c:10771
+#, fuzzy
+msgid "Movie Prohibit Condition"
+msgstr "Důvod nedostupnosti živého náhledu"
+
+#: camlibs/ptp2/config.c:10772
+#, fuzzy
+msgid "Liveview Prohibit Condition"
+msgstr "Důvod nedostupnosti živého náhledu"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Datum a čas na přístroji"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Režim zvukového upozorňování"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Komentář k obrázku"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Povolit komentář k obrázku"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Prodl. před vypnutím displeje"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Záznamové médium"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Doba zobrazení snímku po vyfotografování"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Nabídka uživatelských nastavení"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Změna smyslu otáčení kruh. voliče"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Výstup z přístroje"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 #, fuzzy
 msgid "Recording Destination"
 msgstr "Záznamové médium"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Režim elektronického hledáčku"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Umělec"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Sériové číslo obrazového snímače"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Autorská práva"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Čištění snímače obrazu"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Omez. vlivu blikání výbojkového osvětlení"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "„Ex“ uživatelských funkcí"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "Režim zaostřování"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "Fokus Bereich"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Blesk je nabit"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "Automat. vypnutí (v minutách)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Nabídky a přehrávání"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Akce pro přístroj"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Priority velikosti"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Podporovaná velikost náhledového obrázku"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Rychlý souborový systém"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Kam zaznamenávat pořízené snímky"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Režim automatického ostření"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Režim dálkového ovládání"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Efektový režim"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Obraz. formát pro paměťovou kartu SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Obraz. formát pro paměťovou kartu CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Obraz. formát pro externí pevný disk"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Rozlišení obrázku"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Velikost snímku"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "Citlivost na světlo (ISO)"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "Citlivost (ISO) automaticky"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Vyvážení bílé"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Vyvážení bílé – přizpůsobení A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Vyvážení bílé – přizpůsobení B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Vyvážení bílé X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Vyvážení bílé X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Efekty"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Model barev"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Prostor barev"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Formát data"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Rozlišení obrázku"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Kontrast"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Jas"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Formát data"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Redukce šumu při dlouhých exp. časech"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Automat. zaostření – „režim 2“"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Prodleva mezi snímky v dávce"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Pomocné přisvětlení pro automat. zaostření"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Označovat k otočení"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Kompenzace chyby měření expozičních hodnot"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Vyvážení bílé"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+#, fuzzy
+msgid "Color temperature"
+msgstr "Barevná teplota"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Režim automatického ostření"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Úprava barevného tónu"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Kompenzace blesku"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "Krok odstupňování více snímků s různou exp."
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Nikon – režim blesku"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Ovládání podřízených záblesk. jednotek"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Řídící blesk – intenzita záblesku"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Řídící blesk – kanál pro ovl. podřízených jedn."
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Řídící blesk – režim pro řídící jednotku"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Řídící blesk – kompenzace pro řídící jednotku"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Řídící blesk – hodnota pro řídící jednotku"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Řídící blesk – režim pro skupinu A podřízených jedn."
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Řídící blesk – kompenz. pro skup. A podřízených jedn."
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Řídící blesk – hodnota pro skup. A podřízených jedn."
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Řídící blesk – režim pro skup. B podřízených jedn."
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Řídící blesk – kompenz. pro skup. B podřízených jedn."
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Řídící blesk – hodnota pro skup. A podřízených jedn."
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "Přisvícení pro automatické ostření"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "Zvuk. upozorňování automat. zaostř."
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Clonové číslo"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "Režim živého náhledu"
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "Clonové číslo"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Přizpůsobivý program"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kvalita"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Velikost snímku"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Formát obrazu"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Ohnisková vzdálenost"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Hloubka ostrosti"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Režim zaostřování „2“"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 #, fuzzy
 msgid "Continuous AF"
 msgstr "Průběžné"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Efektový režim"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Expoziční program"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Režim provozu přístroje"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Scénický řežim"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Režim automatického ostření"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr ""
 "\n"
 "Informace o datovém úložišti:\n"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Potlačení šumu při vysoké citlivosti (ISO)"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "Režim vysokého dyn. rozsahu (HDR)"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "HDR – vysoká dynamika"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "HDR – vyhlazování"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Režim pořizování statických snímků"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Canon – režim pořizování snímků"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Canon – režim automat. expozice"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Canon – režim automat. expozice"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Dávkový režim"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Styl snímku"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Režim měření zaostření"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Režim měření nasvětlení scény"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV Open"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "Nast. horní hranice automat. nast. zaclonění"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Zaclonění"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Ostřící bod"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Prodleva snímání"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Expoziční čas „2“"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Expoziční čas „2“"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Režim měření"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Vzdálenost automat. zaostření"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Obal oblasti zaostření"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Režim prodlevy expozice"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Uzamčení expozičních hodnot"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Zda tlačítko AE-L/AF-L blokuje exp. či zaostření"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Režim autom. zaostření v živém náhledu"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Automat. zaostření v živém náhledu"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "Dávkové snímání v režimu živého náhledu"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Přiblížení v živém náhledu"
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Vyvážení bílé"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Stav živého náhledu"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Číselná posloupnost souborů"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Výkon (směrné číslo) blesku"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Náhled vrhaných stínů sérií záblesků"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Zobr. pomocné kompoz. mřížky v hledáčku"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Zobrazení snímku po pořízení"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Označení snímku k otočení"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Pořizování snímků i bez paměťové karty"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Ruční režim nastavení intenzity záblesku"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Oblast pro automatické zaostřování"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Kompenzace vlivu blesku na exp."
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Režim více snímků s odstupňováním daného nastavení"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Velikost kroku změny expozice"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Nastavit pořízení několika snímků s různými úrovněmi daného nastavení"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 "Pořadí při pořizování několika snímků s různými úrovněmi daného nastavení"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Velikost rozdílu mezi expozicemi jednotlivých snímků dávky"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Více snímků s odstupňovaným vyvážením bílé"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Zapnout pořizování více snímků s různými hodnotami daného nastavení"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Více snímků s odstupňovaným vyvážením bílé"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Počet snímků, pořízených s různým stupněm expozice"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "Více snímků s odstupňovaným projasněním stínů"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Více snímků s odstupňovaným projasněním stínů"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Přednastavené uživatelem 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Přednastavené uživatelem 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Přednastavené uživatelem 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Přednastavené uživatelem 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Přednastavené uživatelem 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Přednastavené uživatelem 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Počet snímků v dávce"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Prodlevy mezi jednotlivými snímky dávky"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Kolik snímků nejvýše pořídit"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Jemné doladění automatického vyvážení bílé"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro žárovkové osvětlení"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro výbojkové osvětlení"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro denní světlo"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro osvětlení bleskem"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro zataženou oblohu"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Jemné doladění vyvážení bílé pro světlo v polostínu"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Jemné doladění vyvážení bílé pro denní světlo"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota č:"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Jemná úprava vyvážení bílé – přednastavená hodnota 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Prodleva samospouště"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "S důrazem na střed"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Exp. čas blesku"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Vzdálené vypršení časové prodlevy"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Režim dálkového ovládání"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "Režim provozu přístroje"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Optimalizace snímku"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Doostření"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Kompenzace barevného nádechu"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Sytost barev"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Úprava barevného tónu"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Více snímků s odstupňovanou expozicí"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Zvukový stopa k videu"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Ruční nastavení videa"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Otočené indikátory"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Automatická kompenzace deformací"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Omezení jevu vinětace"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Videorežim"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Smazání souboru – ano, "
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Jednoráz. automat. zaostření při namáčknutí spouště"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Časoměr"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 #, fuzzy
 msgid "Assign Func Button"
 msgstr "Přiřazení funkčního tlačítka"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 #, fuzzy
 msgid "Assign Preview Button"
 msgstr "Tlačítko náhledu"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Kvalita videonahrávky"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Nejnižší expoziční čas"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Kontinuální snímání s delší prodlevou mezi snímky"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Rozlišení obrázku"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Kontinuální snímání s delší prodlevou mezi snímky"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Nejnižší expoziční čas"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Kvalita videonahrávky"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Maximum pro ISO v automatickém režimu"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Synchronizace záblesku a exponování"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "Režim měření zaostření"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Kontinuální snímání s kratší prodlevou mezi snímky"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Strategie komprimace JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "Upřednostňovat průběžné autom. zaostřování"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "Upřednostňovat jednorázové autom. zaostření při namáčknutí spouště"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "Zapnutí automatického ostření"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Proměnlivá oblast automatického ostření"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Uzamčení automat. zaostření"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "Bod pro automat. zaostření"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "Tlačítko zapnutí automat. zostření"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Potlačení šumu při vysoké citlivosti (ISO)"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Nejvyšší počet po sobě jdoucích snímků"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Nejnižší ohnisková vzdálenost"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Komprimace dat RAW"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Obrazová kvalita"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Nastavení obrazu"
+#: camlibs/ptp2/config.c:11288
+#, fuzzy
+msgid "Live View Zoom Area"
+msgstr "Oblast zaostřování v režimu živého náhledu"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Nastavení snímání"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Profily pro sítě WiFi"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Ostatní vlastnosti zařízení ohledně PTP"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP vlastnost 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
-#, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
+#, fuzzy, c-format
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Vlastnost „%s“ / 0x%04x lze nyní pouze číst."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, fuzzy, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 "Vlastnost „%s“ / 0x%04x nebyla nastavena – číslo chyby PTP protokolu 0x%04x."
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, fuzzy, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 "Vlastnost „%s“ / 0x%04x nebyla nastavena – číslo chyby PTP protokolu 0x%04x."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, fuzzy, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr "Rozbor hodnoty widgetu „%s“ / 0x%04x selhal s %d!"
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "Složka nebyla nenalezena"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Je třeba zadat složku s názvem v podobě /store_xxxxxxxx/."
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7923,205 +10318,231 @@
 "\n"
 "Užijte si to!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "Tento přístroj Nikon neposkytuje snímky JPEG v režimu živého náhledu."
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 #, fuzzy
 msgid "Canon enable viewfinder failed"
 msgstr "Canon – zapnutí hledáčku se nezdařilo: %d"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 #, fuzzy
 msgid "Canon get viewfinder image failed"
 msgstr "Canon – nepodařilo se získat obraz z hledáčku: %d"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "U tohoto typu přístroje Canon není režim hledáčku k dispozici"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "U tohoto typu přístroje Nikon není režim živého náhledu k dispozici"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "Tento přístroj Nikon neposkytuje snímky JPEG v režimu živého náhledu."
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 #, fuzzy
 msgid "Nikon disable liveview failed"
 msgstr "Nikon – vypnutí živého náhledu se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Tento přístroj Nikon neposkytuje snímky JPEG v režimu živého náhledu."
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "Tento přístroj Nikon neposkytuje snímky JPEG v režimu živého náhledu."
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Spoušť tohoto přístroje Nikon nelze ovládat z počítače"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Spoušť tohoto přístroje Canon nelze ovládat z počítače"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 #, fuzzy
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon, řada EOS – načtení změn se nezdařilo: 0x%04x"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Spoušť tohoto přístroje Canon nelze ovládat z počítače."
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 #, fuzzy
 msgid "Canon disable viewfinder failed"
 msgstr "Canon – vypnutí hledáčku se nezdařilo: %d"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 #, fuzzy
 msgid "Canon Capture failed"
 msgstr "Canon – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Canon – pořízení snímku se nezdařilo: %x"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Spoušť tohoto přístroje nelze ovládat z počítače."
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 #, fuzzy
 msgid "Canon EOS Half-Press failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není zaostřeno?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 #, fuzzy
 msgid "Canon EOS Half-Release failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 #, fuzzy
 msgid "Canon EOS Full-Press failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 #, fuzzy
 msgid "Canon EOS Full-Release failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není zaostřeno?"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "dig. zrcadl. Canon – dálkové ovl. spouště"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 #, fuzzy
 msgid "Canon EOS Capture failed"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon, řada EOS – pořízení snímku se nezdařilo: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není zaostřeno?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není volné místo na "
 "paměťové kartě?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Nejspíš není zaostřeno?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Canon, řada EOS – pořízení snímku se nezdařilo: Neznámá chyba %d, prosíme "
 "ohlaste ji."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "Inicializace tohoto přístroje nefunguje. Prosím ohlaste to (v angličtině) "
 "vývojářům (gPhoto2)."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Výrobce: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Model: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Verze: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Sériové číslo: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Identifikátor rozšíření výrobce: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Popis rozšíření výrobce: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Verze standardu PTP: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Režim provozu: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -8129,20 +10550,30 @@
 "\n"
 "Formát snímků: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Formát displeje:"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Podporované vlastnosti protokolu pro přenos médií (MTP):\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr "Při dotazu došlo k chybě %04x protokolu pro přenos snímků (PTP)"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8150,95 +10581,95 @@
 "\n"
 "Funkce zařízení:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tStažení souboru, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Smazání souboru – ano, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Smazání souboru – ne, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Odeslání souboru – ano\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Odeslání souboru – ne\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tObecné zachycení snímku – ano, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tObecné zachycení snímku – ne, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Začít pořízovat snímky – ano, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Začít pořízovat snímky – ne, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Canon – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "Canon, řada EOS – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "Canon, řada EOS – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "Nikon – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "Nikon – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "Nikon – pořizování snímků\n"
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Začít pořízovat snímky – ano, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 #, fuzzy
 msgid "Olympus E XML Capture, "
 msgstr "Začít pořízovat snímky – ano, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Žádná metoda pořizování snímků specifická dle výrobce\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon – podpora WiFi\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon – podpora WiFi\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8246,93 +10677,93 @@
 "\n"
 "Informace o datovém úložišti:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tPopis datového úložiště: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tJmenovka svazku: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Věstavěná ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Vyjímatelná ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Vestavěná RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Vyjímatelné RAM (paměťová karta)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Neznámé: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tTyp datového úložiště: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Obecné ploché"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Obecné hierarchické"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Standardní rozvržení (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTyp souborového systému: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Čtení i zápis"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Jen pro čtení"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Jen pro čtení s mazáním objektů"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tMožnosti přístupu: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tNejvyšší možná kapacita: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tZbývající kapacita (v bajtech): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tZbývající kapacita (snímků): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8340,49 +10771,49 @@
 "\n"
 "Souhrn vlastností zařízení:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " nenačteno.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 #, fuzzy
 msgid "cannot be queried.\n"
 msgstr "Na paměťovou kartu není možné zapisovat."
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "pouze pro čtení"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "čtení i zápis"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr "chyba %x protokolu pro přenos obrázků (PTP) během dotazu."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Soubor „%s/%s“ neexistuje."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 "Metadata jsou podporována pouze u zařízení komunikujících protokolem MTP."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Přístroj nepodporuje nastavování ochrany objektu."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, fuzzy, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Přístroj nebyl schopen nastavit ochranu objektu na %d, chyba 0x%04x."
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8392,2286 +10823,2390 @@
 "pouze s přístroji připojenými přes rozhraní USB či síť TCP/IP – typ portu je "
 "%x."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "Neznámá chyba protokolu pro přenos snímků (PTP)"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP – v pořádku"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP – obecná chyba"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP – relace není otevřena"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP – neplatný identifikátor transakce"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP – operace není podporována"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP – parametr není podporován"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP – přenos nebyl dokončen"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP – neplatný identifikátor datového úložiště"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP – neplatný způsob zacházení s objektem"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP – vlastnost přístroje není podporována"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP – neplatný zápis formátu objektu"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP – datové úložiště je plné"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP – objekt je chráněn proti zápisu"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP – datové úložiště je pouze pro čtení"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP – přístup odepřen"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP – nejsou k dispozici žádné náhledy"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP – samotestování nedopadlo úspěšně"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP – částečné smazání"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP – datové úložiště není k dispozici"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP – určení dle formátu není podporováno"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP – informace o objektu nejsou platné"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP – neplatný formát instrukcí"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP – neznámé instrukce výrobce"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP – pořizování snímku již byl zrušeno"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP – zařízení je zaneprázdněné"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP – neplatný nadřazený objekt"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP – neplatný formát vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP – neplatná hodnota vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP – neplatný parametr"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP – relace je již otevřena"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP – transakce zrušena"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP – zadání cíle není podporováno"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP – neplatný způsob zacházení s objektem"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Důvod není znám"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Neplatný stav"
+
+#: camlibs/ptp2/ptp.c:6117
 #, fuzzy
 msgid "Filename Required"
 msgstr "PTP s rozšířením firmy Kodak – je vyžadován název souboru"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 #, fuzzy
 msgid "Filename Conflicts"
 msgstr "PTP s rozšířením firmy Kodak – soubor takového názvu již existuje"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "PTP s rozšířením firmy Kodak – neplatný název souboru"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Hardwarová chyba"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Mimo ohnisko"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Změna režimu přístroje se nezdařila"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Neplatný stav"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Nastavování vlastnosti není podporováno"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Chyba resetu vyvážení bílé"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 "Chyba při pořizování referen. snímku pro odstraňování následků prachu na "
 "snímači."
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Expozice po dobu stisku spouště"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Posloupnost zdvihnutí zrcátka"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Volba režimu neupraví zaclonění"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Není možné v režimu živého náhledu"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Konec kroku ručního zaostření"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Příliš malý krok ručního zaostření"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Přerušit pokročilý přenos"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP – nejsou k dispozici žádné náhledy"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Chyba stroboskopu."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Paměťová karta není naformátována"
+
+#: camlibs/ptp2/ptp.c:6138
+#, fuzzy
+msgid "Bulb Release Busy"
+msgstr "Uvolnit + zaostřit"
+
+#: camlibs/ptp2/ptp.c:6139
+#, fuzzy
+msgid "Silent Release Busy"
+msgstr "Režim tiché závěrky"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Expoziční čas „2“"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP – pořizování snímku již byl zrušeno"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Neplatný stav"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Neznámý povel"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "Operace zamítnuta"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 #, fuzzy
 msgid "Lens Cover Present"
 msgstr "Sejměte z objektivu krytku"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "Akumulátor je vybitý"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "Přístroj není připraven"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Sejměte z objektivu krytku"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Akumulátor"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Nepřipraveno"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Přehrávání objektu"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP – neplatný zápis formátu objektu"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP – neplatný zápis formátu objektu"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP – neplatná hodnota vlastnosti zařízení"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP – neplatný způsob zacházení s objektem"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Neplatný stav"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP – určení dle formátu není podporováno"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP – určení dle formátu není podporováno"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Nastavování vlastnosti není podporováno"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Otevřít mediální relaci"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Neplatný stav"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP – operace není podporována"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP – zařízení je zaneprázdněné"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "Vypršel časový limit PTP"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 #, fuzzy
 msgid "PTP Cancel Request"
 msgstr "Zrušit požadavek PTP"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "Chyba protokolu pro přenos obrázků (PTP): očekávána odpověď"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "Chyba protokolu pro přenos obrázků (PTP): očekávána data"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "Vstupně/výstupní chyba PTP"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Nedefinovaná vlastnost PTP"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Režim provozu"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Nastavení komprimace"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Vyvážení bílé"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB zisk"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Expoziční čas"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Režim expozičního programu"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Expoziční index (obdoba ISO u filmových svitků)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Kompenzace expozičního upřednostňování"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Prodleva před pořízením snímku"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digitální přiblížení"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Počet časosběrných snímků"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Prodleva mezi časosběrnými snímky"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL pro odesílání"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Informace o autorských právech"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "Podporovaná velikost náhledového obrázku"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 #, fuzzy
 msgid "Enabled Streams"
 msgstr "Neplatný stav"
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Formát data"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Rozlišení obrázku"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Kvalita videonahrávky"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Kontrast"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Jas"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Formát data"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Formát zápisu data a času do razítka"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Videovýstup"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Šetření energií"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Jazyk uživatelského rozhraní"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Typ akumulátoru"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Režim akumulátoru"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "Typ zámku uživatelského rozhraní"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Režim provozu přístroje"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Formát souboru s úplným zobrazením"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Samospoušť"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Režim focení"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Režim obrazu"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Nastavení dlouhého expozičního času"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Režim automatického ostření"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Stabilizace obrazu"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Zesílení barev"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Citlivost"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Nastavení parametru"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Av Open"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Nastavení omezení nejvyš. zaclon."
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Nejdelší ohnisková vzdálenost"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Nejkratší ohnisková vzdálenost"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Jmenovatel ohniskové vzdálenosti"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Režim přenosu snímání"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Předpona názvu"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Režimy velikosti a kvality"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Podporovaná velikost náhledového obrázku"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Velikost výstupních dat z přístroje"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Velikost vstupních dat do přístroje"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Verze API daného zařízení"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Vlastník přístroje"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIXový čas"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Identifikátor těla přístroje"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Zobr. Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av Open Apex"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Zvětšení digitálního přiblížení"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Pozice Ml bodu"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Zobr. Av Max"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av Max Apex"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "Přiblížení po skocích (Easy Zoom) – počáteční úroveň přiblížení"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "Přiblížení po skocích (Easy Zoom) – nejvyšší úroveň přiblížení"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Počet záblesků"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Úhel natočení"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Natočení scény"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Režim simulace události"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Typ prezentace"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Průměrná velikost souborů"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Identifikátor modelu"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Zásobník snímků"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Zásobník snímků A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Zásobník snímků B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Zásobník snímků C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Zásobník snímků D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Resetovat zásobník 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Barevná teplota vyvážení bílé"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Číslo přednastaveného vyvážení bílé"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Název přednastaveného vyvážení bílé 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Název přednastaveného vyvážení bílé 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Název přednastaveného vyvážení bílé 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Název přednastaveného vyvážení bílé 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Název přednastaveného vyvážení bílé 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Hodnota přednastaveného vyvážení bílé 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Hodnota přednastaveného vyvážení bílé 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Hodnota přednastaveného vyvážení bílé 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Hodnota přednastaveného vyvážení bílé 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Hodnota přednastaveného vyvážení bílé 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Ohnisk. vzdálenost (bez čipu)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Max. zaclonění objektivu (bez čipu)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Automat. ořezávání na formát „DX“"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Zásobník nabídky A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Zásobník nabídky B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Zásobník nabídky C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Zásobník nabídky D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Reset zásobníku nabídky"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Zapnout svislé automat. zaostření"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Oblast, kam automaticky zaostřovat"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Zapnout informace o autorských právech"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "míra změny hodnoty ISO"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "míra změny expoziční hodnoty"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Kompenzace expoziční hodnoty (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "S důrazem na střed"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Měření expoziční hodnoty z mřížky"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Měření expoziční hodnoty ze středu"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Měření expoziční hodnoty z jediného bodu"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Oblast zaostřování v režimu živého náhledu"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Prodleva automatického vypnutí senzoru"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Prodleva samospouště"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Img Conf Time"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Prodlevy automatického vypnutí"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Úhel náklonu"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Prodleva mezi snímky v dávce"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Režim prodlevy exponování"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Omezení úrovně šumu při dlouhých expozičních časech"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Podsvětlení LCD displeje"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Redukce šumu při vysokých hodnotách citlivosti (ISO)"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Zobrazovat rady"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Jméno umělce"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Informace o autorských právech"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr ""
 "Náhledové záblesky pro zjištění, kam budou vrhány stíny (Modeling Flash)"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Více snímků s různými hodnotami v ručním režimu"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Výběr automatického pořízení více snímků s různými hodnotami"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr ""
 "NIKON – nastavení automatického pořízení více snímků s různými hodnotami"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Režim středového tlačítka pro focení"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Režim středového tlačítka pro přehrávání"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Vícenásobný výběr"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Přehrávání informací o snímku"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Přiřazení funkčního tlačítka"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Upravit příkazové voliče"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Nastavení clony"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Tlačítka a kruhové voliče"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Bez paměťové karty CF nelze pořídit snímek"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Poměr přiblížení středového tlačítka"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Funkční tlačítko 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Zapnout obyčené automatické ostření"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Čištění snímače obrazu"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Text komentáře k obrázku"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Zapnout komentáře k obrázku"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Otočení obrázku"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Ruční nastavení čísla objektivu"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Rozlišení videonahrávky"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Hlas videonahrávky"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Mikrofon pro videonahrávku"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Slot paměťové karty pro videonahrávku"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Prodleva automatického vypnutí displeje"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Zapnout pořizování více snímků s různými hodnotami daného nastavení"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Velikost rozdílu mezi expozicemi jednotlivých snímků dávky"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Režim pořízení více snímků s různým stupněm expozice"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Počet snímků, pořízených s různým stupněm expozice"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Velikost rozdílu ve vyvážení bílé mezi jednotlivými snímky dávky"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Režim pořízení více snímků s různým vyvážením bílé"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Identifikátor objektivu"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Druh objektivu"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Typ objektivu"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Nejnižší ohnisková vzdálenost"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Nejvyšší ohnisková vzdálenost"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Nejvyšší možné zaclonění při nejkratší možné ohniskové vzdálenosti"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Nejvyšší možné zaclonění při nejdelší možné ohniskové vzdálenosti"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Zobrazovat hodnotu citlivosti (ISO) v hledáčku"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Doba zobrazení pořízeného snímku"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Doba zobrazení nabídky"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Doba zobrazení informací"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Počet snímků při použití samospouště"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Omezení jevu vinětace"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "NIKON – Expoziční čas"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Stav varování"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Top Mode 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Aktivní senzor automatického ostření"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Expozimetr"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Rychlost USB rozhraní"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Sériové číslo obrazového snímače"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Typ skupiny PTN"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Uzamčení hodnoty nastavení clony"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Uzamčení expozice a clony"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Nastavení uzamykání expozičního času"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "Nastavení uzamykání zaclonění"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Nastavení přisvětlení"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Jas zaostřovacího bodu"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Externí blesk připojen"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Stav externího blesku"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Druh externího blesku"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Režim externího blesku"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Kompenzace externího blesku"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "Efekty pro ČB snímky"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "ČB ostrost"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "ČB kontrast"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "Typ ČB nastavení"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Režim uložení pro slot 2"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Režim RAW"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Typ výbojkového osvětlení"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Nastavení barevné teploty"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Přednastavené 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Přednastavené 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Přednastavené 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Přednastavené 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Přednastavené 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Režim automatického ostření"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Pomocné přisvícení automatického ostření"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Nastavení automat. ISO v režimech P/A/DVP"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Zobrazení kompoziční mřížky v hledáčku"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Režim ovládajícího blesku – intenzita"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Auto FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Zobrazení varování"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Druh článků akumulátoru"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Nastavení horní hranice automat. ISO"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Průběžné s vysokou rychlostí"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Nastavení informačního displeje"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Tlačítko náhledu"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Tlačítko č. 2 náhledu"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "Tlačítko č. 2 uzamčení expozice/zaostření"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Stavový displej"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Priorita typu akumulátoru"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 "Více snímků s odstupňovanými hodnotami – počet snímků a velikosti kroků"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Režim živého náhledu"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Dávkové snímání v režimu živého náhledu"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Stav živého náhledu"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Přiblížení v živém náhledu"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Důvod nedostupnosti živého náhledu"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Stav zobrazení expozice"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Stav indikátoru expozice"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Chybový stav informačního displeje"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Rozsvícení indikátoru expozice"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Hodnota „M-opakováním“ blesku"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Počet „M-opakování“ blesku"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Prodleva mezi „M-opakováním“ blesku"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Aktivní položka nastavování obrazu"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Změnit položku nastavování obrazu"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr ""
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Výrobce přístroje"
+
+#: camlibs/ptp2/ptp.c:7090
+#, fuzzy
+msgid "Release without SD card"
+msgstr "Pořizování snímků i bez paměťové karty"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "Komprimace dat RAW"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Zabezpečený čas"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Certifikát zařízení"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Informace o zneplatněných certifikátech"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Protějšek pro synchronizaci"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Snadno zapamatovatelný název zařízení"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Hlasitost"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Ikona zařízení"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Informace o iniciátoru relace"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Typ zjištěného přístroje"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Rychlost přehrávání"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Přehrávání objektu"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Index přehrávacího kontejneru"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Pozice přehrávání"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "ID ochrany „autorských“ práv (DRM) (MS PlaysForSure)"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Kvalita"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Oblast pro zaostření"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Fokus Bereich"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Uzamčení expozice"
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Ostřící bod"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "Velikost snímku"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Expoziční čas"
 
-#: camlibs/ptp2/ptp.c:5436
-#, fuzzy
-msgid "Color temperature"
-msgstr "Barevná teplota"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Fokus Bereich"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Nedostatek paměti"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "Expoziční čas"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "Snímek"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Blízko 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "Bod pro automat. zaostření"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Datum a čas"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "krok po %.1f"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG běžné kvality"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG základní kvality"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Zataženo"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Ruční zaostření"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automat. makrorežim (blízké)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Průměr. s důrazem na střed záběru"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Bod ve středu záběru"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Blesk odpálen dle potřeby"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automat. omezení jevu červených očí"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Vyplňující blesk s omezením jevu červených očí"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Dávkové snímání"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Samospoušť + dálkové"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Uzamknout pouze automat. zaostření"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Uzamčení nastavení blesku"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Vrátit zaostřovací bod zpět na střed"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Zvýrazňovat aktivní zaostřovací bod"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Nepoužito"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "Operační paměť"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "Podsvícení displeje"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "Podsvícení displeje a stavového řádku"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 minuta"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 minut"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 minut"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 minut"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Tmavé na světlém pozadí"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Světlé na tmavém pozadí"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Lithium-iontové"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nikl-hydridové"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nikl-kadmiové"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkalické manganové"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Varování úrovně 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Nouzové"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Varování úrovně 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Ekonomické"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Superjemné"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Omezení jevu červených očí"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Pomalá synchronizace"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Odpálen dle potřeby + omezení jevu červených očí"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Odpálen vždy + omezení jevu červených očí"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Vzdálený pohled"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Krátký expoziční čas"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Dlouhý expoziční čas"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Noční vidění"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Stupně šedé"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Pevné ohnisko"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Jednotlivé snímky"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Dávkové snímání"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Časované pořízení jedn. snímku"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Nepřerušované snímání s delší prodlevou mezi jedn. snímky"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Nepřerušované snímání s kratší prodl. mezi jedn. snímky"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2×"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4×"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Hladké"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Měření s důrazem na střed"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Bodové měření"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Průměrující měření"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Vyhodnocující měření"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Částečné měření"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Průměr. měření s důrazem na střed záběru"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Bod. měření provázané s oblastí pro automat. zaostření"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Vícebodové měření"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Funkce pomalé závěrky není k dispozici"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Nízké 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Vysoké 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Vyšší 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Vyšší 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Běžné parametry pro vývojáře"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Parametry pro vývojáře 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Parametry pro vývojáře 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Parametry pro vývojáře 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "Střed umístění Ml bodu"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "Spojení pozice Ml bodu a automat. ostření"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Paměťová karta"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Skupina paměťových karet"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Obrazový formát Microsoft Windows"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Neurčený zvukový záznam"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Kodek Audible.com"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Seznam audiostop Samsung"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Neurčený videozáznam"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Neurčená sbírka"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Abstraktní multimediální album"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Abstraktní album snímků"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Abstraktní hudební album"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Abstraktní video album"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Abstraktní seznam audiostop a vidonahrávek"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Abstraktní skupina kontaktů"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Abstraktní složka zpráv"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Abstraktní produkce po kapitolách"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Astraktní seznam audiostop"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Astraktní seznam videonahrávek"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstraktní Mediacast"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "Seznam audiostop (formát WPL)"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "Seznam audiostop (formát M3U)"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "Seznam audiostop (formám MPL)"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "Seznam audiostop (formát ASX)"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "Seznam audiostop (formát PLS)"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Neurčený dokument"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstraktní dokument"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Dokument ve formátu XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Dokument Microsoft Word"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "Dokument MHT (zkompilované HTML)"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Tabulka Microsoft Excel (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Prezentace Microsoft PowerPoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Neurčená zpráva"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstraktní zpráva"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Neurčený kontakt"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstraktní kontakt"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Neurčená kalendářová položka"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstraktní kalendářová položka"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Neurčený spustitelný soubor pro Microsoft Windows"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Mediacast"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Oddíl"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Neznámé (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 #, fuzzy
 msgid "Get device info"
 msgstr "Načíst informace o zařízení"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Otevřít relaci"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Ukončit relaci"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Načíst identifikátory datového úložiště"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Načíst informace o datovém úložišti"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Získat počet objektů"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Načíst manipulaci s objektem"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Načíst informace o objektu"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Získat objekt"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Získat náhled"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Smazat objekt"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Odeslat informace o objektu"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Odeslat objekt"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Zahájit snímání"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Formátovat úložiště dat"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Restartovat zařízení"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Samotestování zařízení"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Nastavit ochranu objektu"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Vypnutí zařízení"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Načíst popis vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Načíst hodnotu vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Nastavit hodnotu vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Resetovat hodnotu vlastnosti zařízení"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Ukončit zahájení snímání"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Přesunout objekt"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Zkopírovat objekt"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Získat neúplný objekt"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Inicializovat zahájení snímání"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 #, fuzzy
 msgid "Get Vendor Extension Maps"
 msgstr "Nadstavba přidaná výrobcem"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 #, fuzzy
 msgid "Get Vendor Device Info"
 msgstr "Načíst informace o zařízení"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 #, fuzzy
 msgid "Get Filesystem Manifest"
 msgstr "Rychlý souborový systém"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 #, fuzzy
 msgid "Get Stream Info"
 msgstr "Načíst informace o datovém úložišti"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Načíst podporované vlastnosti objektu"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Načíst popis vlastnosti objektu"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Načíst hodnotu vlastnosti objektu"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Nastavit hodnotu vlastnosti objektu"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Načíst seznam vlastností objektu"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Nastavit seznam vlastností objektu"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Získat popis vzájemně závislých vlastností"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Odeslat seznam vlastností objektu"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Načíst reference objektu"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Nastavit reference objektu"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Aktualizovat firmware zařízení"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Přejít na další položku v seznamu audiostop"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Získat výzvu zabezpečeného času"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Získat odpověď zabezpečeného času"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Nastavit odpověď na licenci"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Získat synchronizační seznam"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Odeslat výzvu dotazu počítadla"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Odeslat výzvu počítadla"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Získat odezvu počítadla"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Vymazat datové úložiště"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Získat stav licence"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Odeslat příkaz WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Odeslat žádost WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Hlášení přidaných/smazaných položek"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Hlášení získaných položek"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Získat typy přenositelných seznamů stop"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Odeslat požadavek aplikace WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Získat odpověď aplikace WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Zapnout důvěryhodné souborové operace"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Vypnout důvěryhodné souborové operace"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Ukončit relaci důvěryhodné aplikace"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Otevřít mediální relaci"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Ukončit mediální relaci"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Získat následující datový blok"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Nastavit současnou pozici na časové ose"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Odeslat registrační požadavek"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Získat registrační odpověď"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Získat výzvu na přiblížení"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Odeslat odezvu na přiblížení"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Odeslat licenční žádost WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Získat licenční odpověď WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Zpracovat WFC objekt"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 #, fuzzy
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Získat neúplný objekt"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
 msgstr "Získat neúplný objekt"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 #, fuzzy
 msgid "Truncate Object"
 msgstr "Zpracovat WFC objekt"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 #, fuzzy
 msgid "Begin Edit Object"
 msgstr "Odeslat objekt"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 #, fuzzy
 msgid "End Edit Object"
 msgstr "Odeslat objekt"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Neznámé %d"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "Nadstavba přidaná výrobcem"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Neznámá hodnota"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Probíhá stahování videonahrávky…"
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Probíhá stahování zvukového nahrávky…"
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Probíhá stahování EXIF informací…"
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Pro %s nejsou k dispozici žádné EXIF informace."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Soubor nelze smazat."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Složku nelze smazat."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Složku nelze vytvořit."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Verze: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Stav hodin reálného času (RTC): %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Čas na přístroji: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Identifikátor přístroje: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Paměťová karta typu SD není vložena.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "Identifikátor paměťové karty SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Snímků v přístroji: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Paměťová karta SD: %d MB kapacity celkem, z toho %d MB volných.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Vestavěné datové úložiště: %d MB celkem, %d MB volných.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10684,7 +13219,7 @@
 "kvalifikovaného\n"
 "odhadu.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10696,12 +13231,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "založeno na ovladači od Boba Paauwese\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "neznámé (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10710,201 +13245,201 @@
 "Model: %s\n"
 "Datové úložiště: %d bajtů z %d volných"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2,0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1,5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1,0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0,5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0,0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0,5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1,0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1,5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2,0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 × 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Exteriér"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Nejvýše"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Nejméně"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Text"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Zvuk"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Zvuk a obraz"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Text a zvuk"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3×"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5×"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6×"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7×"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8×"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9×"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Obecné"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Informace o autorských právech (nejvýš 20 znaků)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Snímky"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Vyvážení bílé"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Režim nahrávání"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Komprimace"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Rychlost %i není podporována!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Očekáváno %i, %i obdrženo. Tuto chybu prosím ohlaste na %s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Očekáváno %i bajtů, namísto toho obdrženo %i. Nahlaste prosím tuto chybu na "
 "%s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Očekáváno 0x%x, namísto toho obdrženo 0x%x. Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Chybné znaky (0x%x, 0x%x). Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Přístroj je zaneprázdněný. Pokud problém přetrvává, kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "I po dvou pokusech vypršel časový limit. Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "I po dvou pokusech se komunikace stále nedaří. Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Přístroj se nachází ve špatném režimu. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Přístroj tento parametr nepřijímá. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Vyskytla se neznámá chyba. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "Délka názvu souboru nesmí překročit 12 znaků („%s“ jich obsahuje %i)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10916,109 +13451,109 @@
 "sourceforge.net>. Další úpravy a vylepšení provedl Marcus Meissner "
 "<marcus@jet.franken.de>."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Rozlišení a velikost"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Datum a čas (v GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Nastavení zaclonění"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Režim barev"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Omezení jevu červených očí"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Nastavení blesku"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Prodl. přechodu počítače do úspor. režimu (ve vteřinách)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Prodl. přechodu přístroje do úspor. režimu (ve vteřinách)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Režim objektivu"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Korejština (한국어)"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Angličtina (English)"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Francouzština (Français)"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Němčina (Deutsch)"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italština (Italiano)"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japonština (日本語)"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Španělština (Español)"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "Portugalština (Português)"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Nastavení obrazu"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -11039,35 +13574,35 @@
 "zašlete prosím zprávu do e-mailové konference vývojářů gphoto (v "
 "angličtině)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Paměťová karta není přítomna"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Nelze načíst informace o kapacitě akumulátoru"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "Úroveň nabití akumulátoru je příliš nízká (%d%%). Operace proto byla zrušena."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Nelze získat informaci o zbývající volné kapacitě datového úložiště"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Přístroj 3× po sobě odmítl ponechat spojení navázané."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "První obdržený bajt (0x%x) není platný."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -11075,54 +13610,54 @@
 "Přenos paketů se nezdařil ani po %i pokusech. Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Ani po několika pokusech se nepodařilo přenést paket."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Paket byl přístrojem odmítnut. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Nebylo možné přenést paket (kód chyby %i). Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "I na druhý pokus vypršel časový limit. Upouští se od dalších pokusů…"
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Získán neočekávaný výsledek (kód chyby 0x%x). Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Obdržena neočekávaná odpověď (kód chyby %i). Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Nezdařilo se získat registr %i. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Selhalo příliš mnoho pokusů."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Probíhá odesílání dat…"
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -11130,147 +13665,143 @@
 "Rekurzivní volání nejsou s ovladačem sierra možná! Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Nezdařilo se získat řetězcový registr %i. Kontaktujte prosím %s (v "
 "angličtině)."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Očekáváno 32 bajtů, obdrženo %i. Kontaktujte prosím %s (v angličtině)."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Exp. čas v mikrosekundách (0 = automat. nastavení)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Exp. čas (ve vteřinách)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Č/B"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Omezení jevu červených očí"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Pomalá synchronizace"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Přidat kontrast"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Ubrat kontrast"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Ubrat jas"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Přidat jas"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Seřízení obrazu"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Bliknutí"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Režim přisvětlující LED"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Nekonečno"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Náhledový obrázek"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Následující"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Předchozí"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Režim provozu přístroje"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Jas displeje"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Prodleva automatického vypnutí displeje (vteřiny)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "S důrazem na střed"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Mřížka"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Automat. zaostření na jediný bod"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Měření expozičních hodnot"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Přiblížení (v milimetrech)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "žádné"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Uzamčení měření exp. hodnot"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Rybí oko"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Širokoúhlé"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Různá nastavení pro exp. a objektiv"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Automat. uzamčení exp. času"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11298,7 +13829,7 @@
 "       Aby bylo možné nastavovat expoziční čas, musí být přístroj přepnutý "
 "do režimu „M“ (ruční).\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11316,67 +13847,63 @@
 "\n"
 "   Stahování snímků by mělo fungovat v pořádku.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Světlé pozadí"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Tmavé pozadí"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Režim barev či fungování"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Pomalé"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Výplň. záblesk s omezením jevu červených očí"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "výbojkové-1-domov-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "výbokové-2-stůl-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "výbojkové-3-kancelář-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Soumrak"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Režim displeje"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP – měření osvětl. scény z celé plochy záběru"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digitální přiblížení"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Pozice ohniska"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Formát zápisu času"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11415,7 +13942,7 @@
 "Pro nápravu stačí\n"
 "připojit jej zpět k počítači a provést zmíněné vypnutí displeje."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11449,7 +13976,7 @@
 "Pro nápravu stačí\n"
 "připojit jej zpět k počítači a provést zmíněné vypnutí displeje."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11476,105 +14003,110 @@
 "dejte o tom\n"
 " vědět na e-mailové konferenci vývojářů gPhoto2 (v angličtině).\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (neznámé)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Soubor, který má být nahrán, neobsahuje žádná data (nulová velikost)."
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Na paměťové kartě již není dostatek volného místa"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Nelze získat název složky s obrázky"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Nahrávání souborů do přístroje je možné pouze do složky „%s“"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Nejlepší"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (neznámé)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Expoziční čas v mikrosekundách (0 = nastavit automaticky)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Černá/bílá"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Světlé pozadí"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Tmavé pozadí"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Jas/Kontrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Přidat jas"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Ubrat jas"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Denní světlo"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Nekonečno/rybí oko"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Bodové měření"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1×"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1,6×"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2,5×"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Čas automat. vypnutí (s počítačem) (ve vteřinách)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11582,12 +14114,12 @@
 "Po jak dlouhé době nečinnosti během připojení k počítači se má přístroj "
 "vypnout?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Čas automat. vypnutí přístroje (mimo poč.) (ve vteřinách)?"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11595,116 +14127,116 @@
 "Po jak dlouhé době nečinnosti se má přístroj sám vypnout, když není připojen "
 "k počítači?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Čas automat. vypnutí displeje (ve vteřinách)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Nastavení snímání"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2,3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2,8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5,6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "standardní"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "Přepočítat na vyšší rozlišení (v přístroji)"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "barevné"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "černá a bílá"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Poznámka: není vložena žádná paměťová karta, některé hodnoty proto nemusí "
 "odpovídat skutečnosti\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Model přístroje: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Sériové číslo: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Verze firmware: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Pořízeno snímků: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Ještě je možné pořídit snímků: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Zbývající čas provozu na akumulátor: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Volné místo na paměťové kartě: %i bytes\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Datum: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr ""
 "Pro tento přístroj není k dispozici příručka o jeho používání z počítače.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11725,7 +14257,7 @@
 "Pokud se váš přístroj chová odlišně, prosím podejte o tom zprávu na %s (v "
 "angličtině).\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11764,7 +14296,7 @@
 "Pro nápravu stačí\n"
 "připojit jej zpět k počítači a provést zmíněné vypnutí displeje."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11785,12 +14317,7 @@
 "přístroje Olympus C-3030Z pro účely implementace\n"
 "podpory USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (neznámé)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11800,11 +14327,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Nastavení USB se nepodařilo použít."
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11823,7 +14350,7 @@
 "Lee Benfiel <lee@benf.org>\n"
 "Ovladač pro přístroje Smal Ultrapocket a jejich OEM verze (slimshot)."
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11841,7 +14368,7 @@
 "Přístroj Sonix.\n"
 "Nyní obsahuje %i snímků.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11870,7 +14397,7 @@
 "videozáznamu.\n"
 "Snímky není možné mazat jednotlivě – s vyjímkou posledního uloženého.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11878,7 +14405,7 @@
 "Ovladač pro přístroje Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11891,7 +14418,7 @@
 "Vychází z rozhraní pro příkazovou řádku chotplay od Ken-ichi Hayashi\n"
 "Pro Gphoto2 upravil Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11903,7 +14430,7 @@
 "Původně vytvořil Mark Davies <mdavies@dial.pipex.com>\n"
 "pro gPhoto2 upravil Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11916,12 +14443,12 @@
 "Velikost datového úložiště: %i kB\n"
 "Volné místo: %i kB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Verze firmwaru: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11929,7 +14456,7 @@
 "Ovladač pro Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11938,7 +14465,7 @@
 "Datové úložiště:\n"
 " Souborů: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11955,7 +14482,7 @@
 "Využitá kapacita: %8d\n"
 "Volná kapacita: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "ovladač spca50x v"
 
@@ -12021,12 +14548,12 @@
 "Obecný ovladač pro sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Tento fotorámeček obsahuje čip ST2205.\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -12036,7 +14563,7 @@
 "Ovladač v gPhoto umí z takových zařízení stahovat snímky, odesílat je do "
 "nich a mazat je v nich."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12048,11 +14575,7 @@
 "Ovladač v umí z takových zařízení stahovat snímky, odesílat je do nich a "
 "mazat je vnich."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Natočení"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12064,110 +14587,110 @@
 "Ovladač pro zařízení obsahující čip STV0674.\n"
 "Komunikační protokol byl prozkoumán s použitím SnoopyPro.\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Špatná expozice (nejspíš nedostatečné osvětlení)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informace o přístroji s čipem STV0680:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Verze firmwaru: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Verze čipu: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Identifikátor snímače: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Přístroj je nastaven na světla blikající na frekvenci %d Hz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Kapacita datového úložiště přístroje: %d Mb\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Přístroj poskytuje náhledové snímky.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Přístroj umí pořizovat videonahrávky.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Přístroj pořizuje monochromatické snímky.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Přístroj má datové úložiště.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Přístroj umí tyto formáty videonahrávek:"
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Identifikátor výrobce: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Identifikátor výrobku: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Počet uložených snímků: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Nanejvýš je možné pořídit snímků: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Šírka snímku v pixelech: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Výška snímku v pixelech: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Rozlišení snímku: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Šířka náhledu v pixelech: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Výška náhledu v pixelech: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Rozlišení náhledu: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12183,12 +14706,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Rozšířeno pro Aiptek PenCam a další USB přístroje STM s duálním režimem."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Probíhá získávání informací o %i souborech…"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12200,19 +14723,19 @@
 "Prosím posílejte hlášení o chybách a podněty (v angličtině).\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z umí pouze rozhraní USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Nastavení ovladače"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Turbo režim"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12224,12 +14747,12 @@
 "Ovladač pro stahování a nahrávání souborů pro videorekordér Topfield.\n"
 "Z puppy © předělal Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Probíhá stahování %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12239,43 +14762,72 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Ovladač pro Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Tento fotorámeček obsahuje čip ST2205.\n"
+
+#: camlibs/tp6801/library.c:93
+#, fuzzy
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Displeje fotorámečků, obsahujících čip ST2205 mívají různá rozlišení.\n"
+"Ovladač v gPhoto umí z takových zařízení stahovat snímky, odesílat je do "
+"nich a mazat je v nich."
+
+#: camlibs/tp6801/library.c:106
+#, fuzzy
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Ovladač pro USB fotorámečky obsahující čip ST2205\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Ovladač v umí z takových zařízení stahovat snímky, odesílat je do nich a "
+"mazat je vnich."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 "Vyskytla se vnitřní chyba při hledání ovladačů pro zařízení.\n"
 "Nejsou (souborové) cesty příliš dlouhé?"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Probíhá nahrávání ovladačů přístrojů z „%s“…"
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Vyskytla se chyba ve vstupně/výstupní knihovně („%s“): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Nebyl nalezen žádný přístroj"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Na portu %s nebyl nalezen žádný přístroj"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr ""
 "Nejdříve je třeba nastavit port, až poté je možné zahájit komunikaci s "
 "přístrojem."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Pro přístroj nelze načíst potřebný ovladač „%s“ (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Ovladač pro přístroj „%s“ postrádá funkci „camera_init“."
@@ -12315,12 +14867,12 @@
 msgid "This camera can not capture previews."
 msgstr "Tento přístroj neumí pořizovat náhledy."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "(souborová) cesta „%s“ není úplná (absolutní)."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12329,23 +14881,23 @@
 "Má být vymazáno „%s“ ze složky  „%s“, ale tento souborový systém mazání "
 "souborů neumožňuje."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Složku „%s/%s“ nelze smazat, neb není prázdná (vymažte z ní podsložky)."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Složku „%s/%s“ nelze smazat, neb není prázdná (vymažte z ní soubory)."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Tento souborový systém neumožňuje nahrávat soubory."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12353,120 +14905,128 @@
 "Složka „%s“ obsahuje pouze %i souborů, což je méně, než pořadové číslo %i "
 "souboru, který je vyžadován."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Soubor „%s“ nebyl ve složce „%s“ nalezen."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Soubor „%s“ nelze nalézt."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Souborový systém neposkytuje seznam přítomných souborů"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Neznámý typ souboru %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Tento souborový systém neposkytuje informace o souborech"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Tento souborový systém neumožňuje nastavovat informace o souboru"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Údaje o datech, jako např. vodorovné a svislé rozlišení slouží \n"
 "pouze pro informaci a proto je nelze měnit."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Tento souborový systém o sobě neposkytuje žádné informace"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Data jsou poškozená"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Soubor existuje"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Neznámý typ přístroje"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Složka nebyla nenalezena"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Soubor nebyl nenalezen"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Složka existuje"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Probíhá vstupně/výstupní operace"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Souborová cesta není absolutní"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operace byla zrušena"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Přístroj nebyl schopen dokončit operaci"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Nastala chyba při komunikaci s přístrojem"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Na datovém úložišti není dostatek volného místa"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Neznámá chyba ovladače pro přístroj"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
 #~ msgid "Unknown (some kind of error)"
 #~ msgstr "Neznámá odpověď (chyba přístroje)"
 
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Neznámá hodnota %04d"
+
 #~ msgid "CHDK Reboot"
 #~ msgstr "Restart rozšiřujícího softwaru (CHDK)"
 
 #~ msgid "PTP Error: bad parameter"
 #~ msgstr "Chyba protokolu pro přenos obrázků (PTP): špatný parametr"
 
+#, c-format
 #~ msgid "Canon Capture failed: 0x%04x"
 #~ msgstr "Canon – pořízení snímku se nezdařilo: 0x%04x"
 
+#, c-format
 #~ msgid "No event received, error %x."
 #~ msgstr "Nebyla zaznamenána žádná událost, chyba %x."
 
+#, c-format
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x (result 0x%x)"
 #~ msgstr ""
 #~ "Canon, řada EOS – pořízení snímku vyvolané pohybem v záběru se nezdařilo: "
 #~ "0x%x (výsledek 0x%x)"
 
+#, c-format
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x"
 #~ msgstr ""
 #~ "Canon, řada EOS – pořízení snímku vyvolané pohybem v záběru se nezdařilo: "
@@ -12484,6 +15044,7 @@
 #~ "Canon, řada EOS – pořízení snímku vyvolané pohybem v záběru se nezdařilo: "
 #~ "Nejspíš není volné místo na paměťové kartě?"
 
+#, c-format
 #~ msgid ""
 #~ "Canon EOS Trigger Capture failed to release: Unknown error %d, please "
 #~ "report."
@@ -12617,6 +15178,7 @@
 #~ msgid "ISO Auto Time"
 #~ msgstr "Automatický čas ISO"
 
+#, c-format
 #~ msgid "Unknown (%04x)"
 #~ msgstr "Neznámé (%04x)"
 
@@ -12629,14 +15191,17 @@
 #~ msgid "Flourescent-3-office-4200K"
 #~ msgstr "výbojkové-3-kancelář-4200K"
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "Pro „%s“ není k dispozici ovladač"
 
 #~ msgid "No additional information available."
 #~ msgstr "Nejsou k dispozici žádné další doplňující informace."
 
+#, c-format
 #~ msgid "Deleting '%s' from folder '%s'..."
 #~ msgstr "Probíhá mazání „%s“ ze složky „%s“…"
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "Probíhá stahování „%s“ ze složky „%s“…"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/da.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/da.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/da.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/da.po Changed

@@ -1,24 +1,23 @@
 # Danish translation for libgphoto2.
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
 # Keld Simonsen <keld@dkuug.dk>, 2000.
 # Mogens Jaeger <mogensjaeger@gmail.com>, 2008, 2009, 2012, 2013, 2014.
-# Joe Hansen <joedalton2@yahoo.dk>, 2016.
+# Joe Hansen <joedalton2@yahoo.dk>, 2016, 2018, 2019.
 #
 # til overvejelse: "mRå + Mindre JPEG" -> lille m i Mindre (der er rigtig mange af dem).
-# til overvejelse: failed -> mislykkeds (er fejlede i øjeblikket)
+# til overvejelse: failed -> mislykkedes (er fejlede i øjeblikket)
 # til overvejelse: enable -> aktiver (er tillad i øjeblikket)
-# optagning -> optagelse
-# Canon EOS-optagning fejlede udløsning: Er kortet skrivebeskyttet? -> Canon EOS-optagelse kunne ikke udløses: ... 
+# Canon EOS-optagning fejlede udløsning: Er kortet skrivebeskyttet? -> Canon EOS-optagelse kunne ikke udløses: ...
 #    (husk at ændre alle ved ændring)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.11\n"
+"Project-Id-Version: libgphoto2-2.5.23\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2016-12-18 11:56+0100\n"
-"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2019-06-03 19:16+0200\n"
+"Last-Translator: joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
@@ -26,6 +25,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -35,7 +35,7 @@
 "Adc65\n"
 "Benjamin Moos<benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -44,12 +44,12 @@
 "Kameraet bruger tilsyneladende ikke CF-kort\n"
 "Desværre understøtter vi ikke det p.t. ;-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "Kameraet har taget %d billeder, og bruger CF-kort.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -82,12 +82,12 @@
 "Aox almen driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Din USB billedramme har et AX203 chipsæt\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -97,7 +97,7 @@
 "Disse enhederes gphoto driver muliggør download,\n"
 "oplægning og sletning af billeder fra billedrammen."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -106,28 +106,30 @@
 msgstr ""
 "AX203 USB billedramme driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
-"Denne enhed muliggør download, upload\n"
-"og sletning af billeder fra billedrammen."
+"Denne enhed muliggør at hente, overføre\n"
+"slette billeder fra billedrammen."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Konfiguration af billedramme"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
-msgstr "Synkronisér rammedata og tid med PC"
+msgstr "Synkroniser rammedata og tid med PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
 "Firmware Version: %s"
 msgstr ""
 "Antal billeder: %i\n"
-"Firmware version: %s"
+"Firmwareversion: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -151,26 +153,26 @@
 "Implementeret ved brug af dokumenter\n"
 "fundet på nettet. Tilladelse givet af Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Kunne ikke oprette katalog %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunne ikke fjerne katalog %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "fejl ved låsning af nøgler."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*UKENDT*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -179,7 +181,7 @@
 "canon_int_capture_image: initiering af canon_usb_list_all_dirs() fejlede med "
 "status %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -188,17 +190,17 @@
 "canon_int_capture_image: afsluttende canon_usb_list_all_dirs() fejlede med "
 "status %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Navnet '%s' (%li tegn) for langt, der må højst bruges 30 tegn."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Det er ikke tilladt at bruge små bogstaver i %s."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -206,7 +208,7 @@
 "canon_int_list_directory: FEJL: begyndelsesbesked er for kort (%i < minimum "
 "%i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -214,15 +216,15 @@
 "canon_int_list_directory: Nåede ende af pakke under undersøgelse af den "
 "første katalogindgang"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: stødte på afkortet katalogindgang"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Fil beskyttet."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -230,11 +232,11 @@
 "canon_int_get_info_func: FEJL: begyndelsesbesked er for kort (%i < minimum "
 "%i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Kunne ikke danne JPEG miniature fra data: Ingen start/slut"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Kunne ikke danne JPEG miniature fra data: Data er ikke JFIF"
 
@@ -243,7 +245,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL parameter \"%s\" i %s ved linje %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -251,17 +253,17 @@
 "Ved ikke hvordan kamera->port->type værdi %i også kendt som 0x%x ved %s "
 "linje %i skal håndteres."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
-msgstr "FATAL FEJL: første CRC værdi for længden %d er ukendt\n"
+msgstr "FATAL FEJL: første CRC-værdi for længden %d er ukendt\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "ikke i stand til at gætte første CRC værdi\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -270,290 +272,301 @@
 "advarsel: CRC ikke kontrolleret (add len %d, value 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Kompatibilitetstilstand"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniature"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Helt billede"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Bulb"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Auto-fokus: enkeltbillede"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofokus: AI servo"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Auto-fokus: AI fokus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Manuel fokusering"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Bippelyd fra"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Bippelyd til"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Blitz slukket"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Blitz til"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Blitz auto"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manuel 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Langt-væk scene"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Hurtig lukker"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Langsom lukker"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Nat scene"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Gråskala"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portræt"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "S/H"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Panoreringsfokusering"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Intens"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Lang lukker"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Bladhang"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Indendørs"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Fyrværkeri"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Strand"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Undervands"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Sne"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Børn og kæledyr"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Nat snapshot"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Digital macro"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "Minefarver"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Foto i film"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "Rå"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "Rå 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Lille Normal JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Lille Fin JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Mellem Normal JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Mellem Fin JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Stor Normal JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Stor Fin JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "Rå + Lille Normal JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "Rå + Lille Fin JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "Rå + Mellem Normal JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "Rå + Mellem Fin JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "Rå + Stor Normal JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "Rå + Stor Fin JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -570,7 +583,7 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 "Dette er driveren til Canon PowerShot, Digital IXUS, IXY Digital,\n"
-" og EOS Digital kameraer i deres naturlige (af og til kaldet \"normal\")\n"
+" og EOS Digital-kameraer i deres naturlige (af og til kaldet \"normal\")\n"
 " tilstand Den understøtter også et mindre antal af Canon digital "
 "videooptagere\n"
 " med mulighed for fastbilleder.\n"
@@ -585,44 +598,44 @@
 "Hvis du oplever mange seriel-overførselsfejl, prøv at holde din computer\n"
 " så ledig som muligt (f.eks. ingen diskaktivitet)\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera ikke tilgængeligt: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Slukker kameraet"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Fejl under eksponering af billede"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kunne ikke finde disknavn: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Ingen begrundelse tilgængelig"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Kunne ikke finde diskinformation: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Intern fejl #1 i get_file_func() (%s linje %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Kunne ikke finde nogen lydfil til %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -633,35 +646,35 @@
 "  %11s byte total\n"
 "  %11s byte til rådighed"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Strømforsyning"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "på batteri"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "strøm O.k."
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "mangler strøm"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "ikke tilgængelig: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (vært tid %s%i sekunder)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -688,7 +701,7 @@
 "\n"
 "Tid: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -710,25 +723,25 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Fejl ved sletning af fil"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Fejl, tilknyttet miniaturefil slettet"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Højere overførselshastighed end 57600 bps er ikke understøttet i dette kamera"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Kunne ikke hente ram-kort drevbogstav"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -736,375 +749,397 @@
 "Kunne ikke oplægge, intet frit mappenavn til rådighed!\n"
 "999CANON katalognavn eksisterer, og et AUT_9999.JPG billede findes."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Kunne ikke oprette \\DCIM katalog."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Kunne ikke oprette mål-katalog."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguration af kamera og driver"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Kameraindstillinger"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Ejers navn"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Optagelsens størrelseklasse"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO hastighed"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Optagetilstand"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Blændeåbning"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Eksponeringskompensation"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Billedformat"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Fokuseringstilstand"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Blitz-tilstand"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Bippe"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Kamerahandlinger"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Synkroniser kameraets dato og tid med PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Kamera status information"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Kameramodel"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Fejl"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Firmware version"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Strøm"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Driver"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Vis alle filer"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Behold filnavn ved oplægning"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Kamera ikke tilgængeligt"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Ejernavn ændret"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "kunne ikke ændre ejernavn"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Klasse for optagelsesstørrelse ændret"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Ugyldig indstilling for klasse for optagelsesstørrelse"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Ugyldig ISO hastighedsindstilling"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "ISO hastighed ændret"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Kunne ikke ændre ISO hastighed"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Ugyldig optage-tilstand indstilling"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Optage-tilstand ændret"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Kunne ikke ændre optage-tilstand"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Ugyldig indstilling af lukkerhastighed"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Lukkerhastighed ændret"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Kunne ikke ændre lukkerhastighed"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Ugyldig blændeåbningsindstilling"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Blændeåbning ændret"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Kunne ikke ændre blændeåbning"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Ugyldig eksponerings-kompensations-indstilling"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Eksponeringskompensation ændret"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Kunne ikke ændre eksponerings-kompensation"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Ugyldig billedformat indstilling"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Billedformat ændret"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Kunne ikke ændre billedformat"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Ugyldig indstilling af fokuseringstilstand"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Fokuseringstilstand ændret"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Kunne ikke ændre fokuseringstilstand"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Ugyldig bippe-tilstand indstilling"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Bippe-tilstand ændret"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Kunne ikke ændre bippe-tilstand"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Zoom-niveau ændret"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Kunne ikke ændre zoom-niveau"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Ugyldig blitz-tilstand indstilling"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Blitz-tilstand ændret"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Kunne ikke ændre blitz-tilstand"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "indstil tid"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "kunne ikke indstille tid"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ikke understøttet port type anført %i = 0x%x. Initialisering umulig."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Batteri tømt, kamera slukket."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "FEJL: uventet meddelelse"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "FEJL: beskedoverløb"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "FEJL: ude af rækkefølge."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "FEJL: uventet pakketype."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
-msgstr "FEJL: beskedformat fejl."
+msgstr "FEJL: beskedformatfejl."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "FEJL: uventet besked 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
-msgstr "Oplægger fil..."
+msgstr "Oplægger fil ..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
-msgstr "Henter fil..."
+msgstr "Henter fil ..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1112,148 +1147,148 @@
 "canon_serial_get_dirents: canon_serial_dialogue fejlede ved hentning af "
 "katalogindgange"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 "canon_serial_get_dirents: Begyndelseskatalogindgang for kort (kun %i byte)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Kunne ikke allokere %i byte af hukommelsen"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Kunne ikke læse flere katalogindgange"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Modtog afkortet katalogindgang"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: For mange katalogindgange, det må køre i sløjfe."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Kunne ikke genskabe katalogindgangsstørrelse til "
 "%i byte"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Fejl under ændring af hastighed."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
-msgstr "Nulstiller protokol..."
+msgstr "Nulstiller protokol ..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Kamera O.k."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Søger efter kamera ..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
-msgstr "Prøver at kontakte kameraet..."
+msgstr "Prøver at kontakte kameraet ..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Kommunikationsfejl 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Intet svar fra kamera"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Svar ikke genkendt"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Fandt et \"%s\" også kendt som \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Ukendt model \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Forkert EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Kommunikationsfejl 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Kommunikationsfejl 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
-msgstr "Ændrer hastighed... vent..."
+msgstr "Ændrer hastighed ... vent ..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Fejl under ændring af hastighed"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Fejl under venten på ACK under initialisering, prøver igen"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Fejl under venten på ACK under initialisering"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Forbundet til kamera"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FEJL: fatal fejltilstand opdaget, kan ikke fortsætte "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FEJL: %d er for stor"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
-msgstr "Henter miniature..."
+msgstr "Henter miniaturebillede ..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "IKKE GENKENDT"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Kunne ikke etablere første kontakt med kameraet"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Kameraet var allerede aktivt"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Kameraet blev vækket"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Initieringssvar '%c' fra kamera blev ikke genkendt"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1262,7 +1297,7 @@
 "Trin #2 i initialiseringen fejlede: (\"%s\" ved læsning af %i). Kameraet er "
 "ikke driftsklart"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1271,7 +1306,7 @@
 "Trin #2 i initialiseringen fejlede! (returnerede %i byte, forventede %i). "
 "Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1280,7 +1315,7 @@
 "Trin #3 i initialiseringen fejlede: \"%s\" ved læsning af %i. Kameraet er "
 "ikke driftsklart"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1289,7 +1324,7 @@
 "Trin #3 i initialiseringen fejlede: (returnerede %i byte, forventede %i). "
 "Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1298,28 +1333,28 @@
 "Trin #3 i initialiseringen fejlede: \"%s\" ved læsning af %i. Kameraet er "
 "ikke driftsklart"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Trin 4 fejlede: \"%s\" ved læsning af %i Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Trin #4 fejlede (returnerede %i, forventede %i). Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr "Kameraet er ikke klart, flere 'Identificering af kamera' fejlede: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kameraet er ikke klart, get_battery fejlede: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1328,18 +1363,18 @@
 "canon_usb_lock_keys: Modtog uventet længde fra \"lock keys\" funktionen (%i "
 "byte, forventet %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr "canon_usb_lock_keys: Modtog uventet længde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr "canon_usb_unlock_keys: Modtog uventet længde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1347,20 +1382,20 @@
 msgstr ""
 "canon_usb_get_body_id: Modtog uventet datalængde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
-msgstr "Modtager data..."
+msgstr "Modtager data ..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Løb tør for hukommelse: %d byte nødvendigt."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fejlede"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1369,22 +1404,22 @@
 "Advarsel i canon_usb_set_file_attributes: canon_usb_dialogue returnerede "
 "fejlstatus 0x%08x fra kameraet"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunne ikke læse fra fil\"%s\""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Ikke mere hukommelse: %ld byte nødvendigt."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Filoplægning mislykkedes."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1392,7 +1427,7 @@
 "Filen var for stor. Du er nok nødt til at slukke og tænde for dit kamera, "
 "før du kan oplægge flere filer til det."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1401,7 +1436,7 @@
 "canon_usb_get_dirents: Kunne ikke passe pakkeindholdet ind i buffer, "
 "'%.96s' (afkortet) for lang."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1410,7 +1445,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue fejlede under hentning af "
 "katalogindgange, returnerede %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1419,7 +1454,7 @@
 "canon_usb_list_all_dirs: Kunne ikke passe pakkeindholdet ind i buffer, "
 "'%.96s' (afkortet) for lang."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1428,27 +1463,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue fejlede under hentning af "
 "katalogindgange, returnerede %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Fandt et '%s'."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Navnet \"%s\" fra kameraet, passer ikke med noget kendt kamera"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Billedtype %d er ikke understøttet"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Billedet %s er beskyttet mod sletning."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1460,37 +1495,37 @@
 "hys@asahi-net.or.jp> og Jun-ichiro \"itojun\" Itoh <itojun@itojun.org>.\n"
 "Integrering af QVplay ved Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Batteri niveau: %.1f volt. Revision: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Konfiguration af kamera"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batteri"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Lyshed"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "For lys"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "For mørk"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "O.k."
 
@@ -1524,23 +1559,23 @@
 "libgphoto2/camlibs/clicksmart310/README.clicksmart310.\n"
 msgstr ""
 "To opløsningsindstillinger, 352x288 og 176x144. Fotodata er i\n"
-"jpeg format når det nedhentes, og derfor har de ingen forud\n"
+"jpeg-format når det hentes, og derfor har de ingen forud\n"
 "fastsat størrelse. Derfor skal det annoncerede maksimale antal\n"
-"billeder der kan være i kameraet, forstås som en tilnærmelse.\n"
-"Alle gphoto2 indstillinger virker, med undtagelse af de følgende\n"
-"som hardware ikke understøtter:\n"
+"billeder, der kan være i kameraet, forstås som en tilnærmelse.\n"
+"Alle gphoto2-indstillinger virker, med undtagelse af de følgende\n"
+"som udstyret ikke understøtter:\n"
 "\tSletning af individuelle eller udvalgte billeder (gphoto2 -d)\n"
-"\tOptagning (gphoto2 --capture eller --capture-image)\n"
-"Dog er optagning mulig ved brug af webcam interface,\n"
-"understøttet af spca50x kernel modul.\n"
-"GUI tilgang med gtkam er blevet testet, og virker. Kameraet\n"
+"\tOptagelse (gphoto2 --capture eller --capture-image)\n"
+"Dog er optagelse mulig ved brug af webcam-grænseflade,\n"
+"understøttet af spca50x-kernemodulet.\n"
+"GUI-tilgang med gtkam er blevet testet, og virker. Kameraet\n"
 "danner dog ikke separate miniaturer. Idet billederne allerede\n"
-"er små og i lav opløsning, nedhenter driveren de aktuelle billeder,\n"
+"er små og i lav opløsning, henter driveren de aktuelle billeder,\n"
 "og bruger dem som miniaturer.\n"
-"Kameraet kan optage i 'video clip' tilstand. De resulterende\n"
+"Kameraet kan optage i »video clip«-tilstand. De resulterende\n"
 "rammer gemmes her som en serie af still-billeder. Brugeren\n"
-"kan animere dem med (f.eks.) ImageMagick's 'animeringsfunktion'.\n"
-"For flere detaljer om kameraets funktioner, se i\n"
+"kan animere dem med (f.eks.) ImageMagicks »animeringsfunktion«.\n"
+"For flere detaljer om kameraets funktioner, se \n"
 "libgphoto2/camlibs/clicksmart310/README.clicksmart310.\n"
 
 #: camlibs/clicksmart310/library.c:138
@@ -1589,16 +1624,16 @@
 "sq905C almen driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Billedtype er ikke understøttet"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Antal billeder: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1606,31 +1641,31 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
 msgstr ""
 "Kun root-mappe er understøttet - du ville have en filliste for katalog '%s'."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problemer ved hentning af antallet af billeder"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problemer med hentning af billedinformation"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Optagetype er ikke understøttet"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (batteri er %d%% fuldt)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1647,82 +1682,83 @@
 "Opløsning er sat til %s.\n"
 "Kamera er %s tændt %s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Blitz"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Ingen blitz"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dobbelt irisblænde"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Ingen dobbelt irisblænde"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Opløsningsomskifter"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Ingen opløsningsomskifter"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Intet strøm lys"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "Tændt"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "Slukket"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "klar"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Ikke klar"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "udfyldningstilstand"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Ikke i udfyldningstilstand"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "lav (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "høj (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "eksternt"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "internt"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1732,15 +1768,15 @@
 "  configured manually or set to automatic mode.\n"
 "* Image quality is currently lower than it could be.\n"
 msgstr ""
-"* Billeduheld eller problemer med kommunikation\n"
+"* Billedfejl eller problemer med kommunikation\n"
 "  skyldes ofte ringe batteriniveau.\n"
-"* Billeder optaget eksternt til kameraet, lagres i\n"
-"  midlertidig RAM, og ikke på hukommelses kortet.\n"
-"* Eksponeringskontrol ved optagning af billeder, kan\n"
-"  konfigureres manuelt, eller sat til automatisk tilstand.\n"
-"* Billedkvaliteten er for øjeblikket lavere end det er muligt.\n"
+"* Billeder optaget eksternt til kameraet lagres i\n"
+"  midlertidig RAM og ikke på hukommelseskortet.\n"
+"* Eksponeringskontrol ved optagelse af billeder kan\n"
+"  konfigureres manuelt, eller sættes til automatisk tilstand.\n"
+"* Billedkvaliteten er i øjeblikket lavere end den kunne være.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1770,210 +1806,325 @@
 "     Information om protokol, rå-billedformat,\n"
 "     gphoto2 port\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problem med læsning af billede fra kort"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Henter billede ..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problemer ved hjemhentning af billede"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Bruger afbrød hjemhentning"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problemer med at tage levende billeder"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Eksponering"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatisk eksponeringsjustering ved smugkigning"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Eksponeringsniveau ved forhåndsvisning"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
-msgstr "Automatisk blitz ved optagning"
+msgstr "Automatisk blitz ved optagelse"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problem med åbning af port"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problem ved nulstilling af kamera"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problem ved indstilling af kameraets kommunikationshastighed"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Ligner et modem, og ikke et kamera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Lister filer i '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Lister mapper i '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Kunne ikke finde information om '%s' (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Kunne ikke hente information om '%s' i '%s' (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Kunne ikke ændre tid for filen '%s' i '%s' (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kunne ikke åbne '%s'."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Katalog-gennemsøgning \"kamera\" lader dig indekserne fotografier på din "
 "harddisk."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Kataloggennemsøgningsmåde - skrevet af Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Kunne ikke slette filen '%s' i mappen '%s' (fejlkode %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
 #, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Konfiguration af kamera og driver"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Optagetilstand"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Opløsning"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Opløsning"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Farve- eller funktions-tilstand"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Farvetilstand"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
-"Hjemhent programmet til Digital Dream Enigma 1.3. by <olivier@aixmarseille."
-"com>, og tilpasset fra spca50x driver. Tak til spca50x teamet, det var let "
-"at overføre Jeres driver til dette kamera! "
+"Hent programmet til Digital Dream Enigma 1.3. af <olivier@aixmarseille.com> "
+"og tilpasset fra spca50x-driver. Tak til spca50x-holdet, det var let at "
+"overføre Jeres driver til dette kamera! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kameraet sendte kun %i byte, men vi skal bruge mindst %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Kunne ikke kontakte kamera."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Modtog uventede data (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Forkert undvigesekvens: forventede 0x%02x, fik 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Forkerte data - fik 0x%02x, forventede 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Forkerte data - fik 0x%02x, forventede 0x%02x eller 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Forkert checksum - fik 0x%02x, forventede 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Kameraet afviste kommandoen."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Kamera nulstiller sig selv."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kameraet sendte uventede byte 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
-msgstr "Hjemhenter..."
+msgstr "Henter ..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
-msgstr "Kunne ikke allokere %i byte til hjemhentning af miniature."
+msgstr "Kunne ikke allokere %i byte til at hente miniaturebilledet."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
-msgstr "Kunne ikke allokere %i byte til hjemhentning af billede."
+msgstr "Kunne ikke allokere %i byte til at hente billedet."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Kameraet accepterer ikke '%s' som filnavn."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Kunne ikke initialisere oplægning (kameraet svarede med 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Kameraet understøtter ikke hastigheden %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Kunne ikke sætte hastigheden til %i (kameraet svarede med %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1981,36 +2132,36 @@
 "Matthew G. Martin\n"
 "Baseret på fujiplay ved Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Bithastighed %ld er ikke understøttet."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Konfiguration for dit FUJI-kamera"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Dato og tid"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Version: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Model: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Ledig hukommelse: "
 
@@ -2032,18 +2183,18 @@
 "venligst leveret af Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Ikkeunderstøttet porttype: %d. Denne driver kan kun bruges med USB-"
 "kameraer.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke nulstille kameraet.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2052,7 +2203,7 @@
 "Kameraet understøtter kun sletning af den sidste fil i kameraet. I dette "
 "tilfælde er det filen '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2067,7 +2218,7 @@
 "Ledig plads (billeder): %d\n"
 "Batteri niveau: %d %%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2107,10 +2258,10 @@
 "Vi anbefaler ikke at bruge GUI-programmer sammen med\n"
 "dette kamera, med mindre du bare morer dig, eller prøver\n"
 "at se om du kan sprænge en sikring.\n"
-"Hvis du seriøst vil hente dine billeder, prøv med\n"
+"Til produktionsbrug kan du prøve\n"
 "gphoto2 -P\n"
-"fra en kommandolinie.\n"
-"Derudover - lad endelig være med at prøve at hjemhente videoklip.\n"
+"fra kommandolinjen.\n"
+"Bemærk: Det er ikke muligt at hente videoklip.\n"
 
 #: camlibs/iclick/library.c:134
 msgid ""
@@ -2120,25 +2271,25 @@
 "iClick 5X driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Frames taget     : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam bibliotek v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
-msgstr "Hjemhenter data..."
+msgstr "Henter data ..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
-msgstr "Hjemhenter miniature..."
+msgstr "Henter miniaturebillede ..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2147,14 +2298,14 @@
 "   - thumbnails (64x48 PGM format)\n"
 "   - full images (640x480 PPM format)\n"
 msgstr ""
-"JD11 kameraet virker ret godt med denne driver.\n"
-"Der skal bruges et RS232 interface @ 115 kbit til billedoverførsel.\n"
+"JD11-kameraet virker ret godt med denne driver.\n"
+"Der skal bruges en RS232-grænseflade @ 115-kbit til billedoverførsel.\n"
 "Driveren tillader dig at hente\n"
 "\n"
-"   - miniaturer (64x48 PGM format)\n"
-"   - hele billeder (640x480 PPM format)\n"
+"   - miniaturebilleder (64x48 PGM-format)\n"
+"   - hele billeder (640x480 PPM-format)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2166,31 +2317,31 @@
 "Driver til Jenoptik JD11 kameraet.\n"
 "Protokol omvendt-beregnet ved brug af WINE og IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "JD11 konfiguration"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Andre indstillinger"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Pæreeksponeringstid"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rød"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Grøn"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Blå"
 
@@ -2214,12 +2365,12 @@
 "as consecutive still photos.\n"
 "For further details please consult libgphoto2/camlibs/README.jl2005a\n"
 msgstr ""
-"Denne driver understøtter kameraer med en Jeilin jl2005a chip\n"
+"Denne driver understøtter kameraer med en Jeilin jl2005a-chip\n"
 "Kameraet understøtter ikke sletning af billeder, eller oplægning af data.\n"
 "Afkodning af komprimerede billeder virker måske/måske ikke\n"
 "og virker ikke lige godt for alle understøttede kameraer.\n"
-"Hvis der er videoklip på kameraet, kan disse hjemhentes som fortløbende "
-"still-billeder.\n"
+"Hvis der er videoklip på kameraet, kan disse hentes som fortløbende "
+"fastbilleder.\n"
 "For yderligere detaljer se libgphoto2/camlibs/README.jl2005a\n"
 
 #: camlibs/jl2005a/library.c:132
@@ -2227,7 +2378,7 @@
 "jl2005a camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"jl2005a kamera bibliotek\n"
+"jl2005a-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
 #: camlibs/jl2005c/library.c:135
@@ -2248,11 +2399,12 @@
 "as consecutive still photos.\n"
 "For more details please consult libgphoto2/camlibs/README.jl2005c\n"
 msgstr ""
-"Denne driver understøtter kameraer med en Jeilin jl2005B eller C og D chip\n"
+"Denne driver understøtter kameraer med en Jeilin jl2005B- eller C- og D-"
+"chip\n"
 "Disse kameraer understøtter hverken sletning af billeder, eller oplægning af "
 "data.\n"
-"Hvis der er videoklip på kameraet, kan disse hjemhentes som fortløbende "
-"still-billeder.\n"
+"Hvis der er videoklip på kameraet, kan disse hentes som fortløbende "
+"fastbilleder.\n"
 "For yderligere detaljer se libgphoto2/camlibs/README.jl2005c\n"
 
 #: camlibs/jl2005c/library.c:161
@@ -2260,14 +2412,14 @@
 "jl2005bcd camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"jl2005bcd kamera bibliotek\n"
+"jl2005bcd-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
-msgstr "CompactFlash kort"
+msgstr "CompactFlash-kort"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2278,7 +2430,7 @@
 "vil se de billeder, du henter fra kameraet, skal du hente programmet "
 "»kdc2tiff«. Det er til rådighed på adressen: http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2290,13 +2442,13 @@
 "Kamerabibliotek til Kodak DC210-kameraet.\n"
 "(efter ønske)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Henter data ..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Venter på færdiggørelse ..."
 
@@ -2309,7 +2461,8 @@
 msgstr "Filtype"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2322,7 +2475,7 @@
 msgstr "Filopløsning"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2346,8 +2499,9 @@
 msgid "High (good quality)"
 msgstr "Høj (god kvalitet)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Optag"
 
@@ -2376,77 +2530,84 @@
 msgstr "Eksponeringskompensation"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automatisk"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Gennemtving"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Ingen"
 
@@ -2455,71 +2616,78 @@
 msgstr "Rødøje blitz"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Tændt"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Slukket"
 
@@ -2535,7 +2703,7 @@
 msgid "Port speed"
 msgstr "Porthastighed"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Albumnavn"
 
@@ -2754,58 +2922,58 @@
 "Kamerabibliotek for Kodak DC215 Zoom-kamera.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parameter 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parameter 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parameter 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Model: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Firmware version: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Batteri status: %s, strømforsyning: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Antal af billeder: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Plads tilbage: Høj: %d, Mellem: %d, Lav: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Hukommelseskort status (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Totalt antal billeder optaget: %d, Antal blitz anvendt: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2819,45 +2987,46 @@
 "Kamerabibliotek for Kodak DC240, DC280, DC3400 og DC5000 kameraer.\n"
 "Genskrevet og opdateret til gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Svag"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Tom"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Ikke brugt"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "I brug"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Kortet er åbent"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Kortet er ikke åbent"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Kortet er ikke formatteret"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Intet kort"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2865,12 +3034,12 @@
 "Der er allerede en proces i gang. Dette kamera understøtter kun en proces af "
 "gangen. Vent til den igangværende proces er færdig."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "kamera inaktivt i mere end 9 sekunder, geninitialisering\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2886,7 +3055,7 @@
 "ikke svarer, skal du ganske enkelt genvælge det. Dette vil fremtvinge en "
 "geninitialisering."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2898,7 +3067,7 @@
 "\n"
 "Spørgsmål og kommentarer værdsættes."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2907,7 +3076,7 @@
 "Dit USB kamera er et Kodak EZ200.\n"
 "Antallet af billeder er %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2915,107 +3084,107 @@
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fokuseringsfejl."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Blændåbningsfejl."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Stroboskopfejl."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROM checksumfejl."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Intern fejl (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Intern fejl (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Intet kort tilstede."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Kortet er ikke understøttet."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Kort fjernet under tilgang."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Antal billeder ikke gyldigt."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Der kan ikke skrives til kortet."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Kort er skrivebeskyttet."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Ingen ledig plads på kortet."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Billede beskyttet."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Lys for mørkt."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Autofokusfejl."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Systemfejl."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Ugyldig parameter."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Kommando kan ikke afbrydes."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Oversættelsesdata for lange."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Oversættelsesdata ødelagte."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Ikke understøttet kommando."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Anden kommando kører."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Kommando rækkefølge fejl."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Ukendt fejl."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3026,26 +3195,26 @@
 "%s med information om, hvordan/hvorfor denne fejl opstod: (0x%x,0x%x). Mange "
 "tak!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Henter filliste..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Tester forskellige hastigheder..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
 msgstr "Kameraet kunne ikke kontaktes. Check at det er tilsluttet og tændt."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i billeder kunne ikke slettes, da de er beskyttet"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3064,7 +3233,7 @@
 "Navn: %s,\n"
 "Producent: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3074,401 +3243,410 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Understøttelse for alle Konica og adskillige HP kameraer."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Henter konfiguration..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica konfiguration"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Vedvarende indstillinger"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Skal kameraet bippe når det tager et billede?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Selvudløser tid"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Automatisk sluk tid"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Diasshow interval"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Lav (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Mellem (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Høj (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Oversættelse"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Sprog"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Ikke valgt"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV-uddata format"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Vis ikke TV-menu"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Datoformat"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Måned/dag/år"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Dag/måned/år"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "År/måned/dag"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Sessionsvedvarende opsætning"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Til, rødøje-reduktion"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatisk, rødøje-reduktion"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fokus"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fast"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Kortvarig opsætning"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Selvudløser"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Selvudløser (kun for næste billede)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Kunne ikke finde oversættelsesdata ved '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Oversættelsesfil for lang!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Denne forhåndsvisning eksisterer ikke."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Data er blevet ødelagt."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
-msgstr ""
+msgstr "Kompileret EXIF-understøttelse, ingen miniaturebilleder tilgængelige."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Billedtype %d er ikke understøttet af dette kamera!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Kan ikke slette billede %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Kan ikke slette alle billeder."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Oplægger billede ..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Kan ikke lægge dette billede op til kameraet. Der opstod en fejl."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Du skal være i filmetilstand for at kunne optage billeder."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Der er ikke ledig plads til at optage nye billeder. Du skal slette nogle "
 "billeder."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Kan ikke optage nye billeder. Ukendt fejl"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Intet svar fra kamera."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Lav"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Mellem"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Høj"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikoner"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Hvidbalance"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Kontor"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Dagslys"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Skarphed"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Skarp"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Blødt"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Farve"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Lys"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Dyb"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Sort/hvid"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Enkel"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Sekvens 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Datovisning"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Hvor som helst"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Afspilningstilstand"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Optagetilstand"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Overalt"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Afspil"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Optag"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/YYYY"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "YYYY/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/YYYY"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3489,7 +3667,7 @@
 "Datovisning: %s\n"
 "Dato og tid: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3504,7 +3682,7 @@
 "http://www.ap2c.com\n"
 "Understøttelse for den franske Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3522,7 +3700,7 @@
 "\n"
 "Hvis du har problemer med driveren, send en e-mail til dens forfattere.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3530,7 +3708,7 @@
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3541,7 +3719,7 @@
 "Firmware: %s\n"
 "Firmware version: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3549,7 +3727,101 @@
 "LG GSM almen driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Konfiguration"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "FV lås"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Lukkerhastighed"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Videokvalitet"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Film"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Auto-fokuseringstilstand"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "LiveView tilstand"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Enhedsvenligt navn"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "AF hjælpelys"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "AF hjælpelys"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Objektiv ID"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Kompatibilitetstilstand"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Fuld manuel"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "CSM-menu"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3564,7 +3836,7 @@
 "Mars MR97310 kamera.\n"
 "Der er %i billeder i det.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3577,25 +3849,25 @@
 "as consecutive still photos.\n"
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
-"Denne driver understøtter kameraer med en Mars MR97310 chip\n"
-"(og direkte sammenlignelige ?? Pixart PACx07??).\n"
+"Denne driver understøtter kameraer med en Mars MR97310-chip\n"
+"(og direkte sammenlignelige ??Pixart PACx07??).\n"
 "Kameraene understøtter ikke sletning af billeder, eller oplægning af data.\n"
 "Afkodning af komprimerede billeder virker måske/måske ikke\n"
 "og virker ikke lige godt for alle understøttede kameraer.\n"
 "Foto-databehandling for Argus QuickClix er IKKE UNDERSTØTTET.\n"
-"Hvis der er videoklip på kameraet, kan disse hjemhentes som fortløbende "
-"still-billeder.\n"
+"Hvis der er videoklip på kameraet, kan disse hentes som fortløbende "
+"fastbilleder.\n"
 "For yderligere detaljer se libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Mars MR97310 kamera bibliotek\n"
+"Mars MR97310-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3606,7 +3878,7 @@
 "Hardware revision:\t%s\n"
 "Firmware revision:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3633,61 +3905,63 @@
 "Kort ID:\t\t%d\n"
 "Blitztilstand:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Fjern"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokal"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nej"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisk\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Gennemtving blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Forhindr blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ugyldig værdi ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3704,74 +3978,74 @@
 "Opladning blitz:\t\t%s\n"
 "Objektivstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Ikke fuld"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Fuld"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Optaget"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Ledig"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Oplader"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Klar"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Objektivretning svarer ikke til blitzlys\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objektiv er ikke tilsluttet\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Forkert værdi for objektivstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kortstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Skrivebeskyttet"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Uegnet kort"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Forkert værdi for kortstatus %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3784,63 +4058,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Specielt tak til Minolta for specifikationer."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Blitzlys : Automatisk (rødøje-reduktion)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Blitzlys : Automatisk"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Blitzlys : Til (rødøje-reduktion)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Blitzlys : Til"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Blitzlys : Slukket"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Blitzlys : Ikke defineret"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Sammendrag for Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "ingen status rapporteret."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Fandt Compact Flash kort\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Fandt ikke noget Compact Flash kort\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Nuværende tilstand: Kameratilstand\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Nuværende tilstand: Afspilningstilstand\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Batterier er O.k."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Batteriniveau lav."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3852,25 +4126,25 @@
 "Porteret til gphoto2 af Marcus Meissner <marcus@jet.franken.de>\n"
 "Understøtter serielle og USB protokoller."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot bibliotek v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Fjerner tilslutning til kamera."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
-msgstr "Hjemhenter billede %s."
+msgstr "Henter billede %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
-msgstr "Oplægger billede: %s."
+msgstr "Overfører billede: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3878,17 +4152,17 @@
 msgstr ""
 "Filstørrelse er %ld byte. Størst mulige fil der kan oplægges er: %i byte."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Oplægger..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Sletter billede %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3897,19 +4171,19 @@
 "Fredrik Roubert <roubert@df.lth.se> and\n"
 "Galen Brooks <galen@nine.com>."
 msgstr ""
-"Panasonic DC1000 gphoto bibliotek\n"
+"Panasonic DC1000-gphotobibliotek\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
 "\n"
-"Baseret på dc1000 programmet skrevet af\n"
+"Baseret på dc1000-programmet skrevet af\n"
 "Fredrik Roubert <roubert@df.lth.se> og\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
-msgstr "Hjemhenter %s."
+msgstr "Henter %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3918,19 +4192,19 @@
 "Fredrik Roubert <roubert@df.lth.se> and\n"
 "Galen Brooks <galen@nine.com>."
 msgstr ""
-"Panasonic DC1580 gPhoto2 bibliotek\n"
+"Panasonic DC1580 gPhoto2-bibliotek\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
 "\n"
 "Baseret på dc1000 programmet skrevet af\n"
 "Fredrik Roubert <roubert@df.lth.se> og\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
-msgstr "Hjemhenter '%s'..."
+msgstr "Henter »%s« ..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3950,7 +4224,7 @@
 "640x480.  CCD-en der optager billederne er kun på 300K, og giver derfor kun "
 "lav-kvalitetsbilleder."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3966,15 +4240,15 @@
 "situationer, især hvis problemet opstår, og kameraet ikke slukkes korrekt "
 "ved hastigheder over 9600."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
-"Panasonic PV-L859-K/PV-L779-K Palmcorder driver\n"
+"Panasonic PV-L859-K/PV-L779-K Palmcorder-driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3985,7 +4259,7 @@
 " Fri hukommelse er %8d byte.\n"
 " Filtælling: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3999,11 +4273,11 @@
 "og: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
-msgstr "Hjemhenter fil..."
+msgstr "Henter fil ..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4011,33 +4285,136 @@
 "Creative PC-CAM600\n"
 "Forfatter: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Forventede > %d blokke, fik %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file:fik indeks %d men forventede indeks > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: returværdi var %d i stedet for %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Forventede %d blokke, fik %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: Uventet fejl: gp_port_read returnerede %d i stedet for %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Model: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Ukendt kommando"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Billedstørrelse"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Billedkvalitet"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Maks. blændeåbning ved min. brændvidde"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Maks. blændeåbning ved max. brændvidde"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Optagetilstand"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "S/H"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Ukendt model"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4045,18 +4422,18 @@
 "sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
-"Hjemhent program for flere Polaroid kameraer. Oprindeligt skrevet af Peter "
-"Desnoyers <pjd@fred.cambridge.ma.us>, og tilpasset til gphoto2 af Nathan "
+"Hent program for flere Polaroidkameraer. Oprindeligt skrevet af Peter "
+"Desnoyers <pjd@fred.cambridge.ma.us> og tilpasset til gphoto2 af Nathan "
 "Stenzel <nathanstenzel@users.sourceforge.net> og Lutz Mueller <lutz@users.sf."
 "net>.\n"
-"Polaroid 640SE testning blev udført af Michael Golden <naugrim@juno.com>."
+"Polaroid 640SE-test blev udført af Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Model: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4070,110 +4447,98 @@
 "JD350e ved Michael Trawny <trawny99@users.sourceforge.net>.Fejlrettelser ved "
 "Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Billede kvalitet"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Billede størrelse"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Blitzindstillinger"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automatisk sluk efter (minutter)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "superfin"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "tændt"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "slukket"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "afspil"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "optag"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menu"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "batteri"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "a/c adapter"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Modtog uventet overskrift (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Modtog uventet svar"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Checksumfejl"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Kameraet accepterede ikke kommandoen."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Kameraet sendte flere byte end forventet (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4182,36 +4547,37 @@
 "Forespurgte om information om billede %i (= 0x%x), men fik information om "
 "billede %i tilbage"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
 "and ask for assistance."
 msgstr "Modtog %i byte i et ukendt billedformat. Skriv til %s og bed om hjælp."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
 "Mueller <lutz@users.sf.net>."
 msgstr ""
-"Hjemhent program for Polaroid DC700 kamera. Oprindeligt skrevet af Ryan "
+"Hent programmet for Polaroid DC700-kamera. Oprindeligt skrevet af Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Tilpasset til gphoto2 af Lutz "
 "Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Hvor lang tid går der før kameraet slukker?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Billede"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4232,3539 +4598,5476 @@
 "Dato: %i/%02i/%02i %02i:%02i:%02i\n"
 "Antal billeder taget: %i\n"
 "Billeder tilbage: %i\n"
-"Software version: %s\n"
+"Programversion: %s\n"
 "Baudrate: %s\n"
 "Hukommelse: %i megabyte\n"
 "Kameratilstand: %s\n"
 "Billedkvalitet: %s\n"
-"Blitz indstilling: %s\n"
+"Blitzindstilling: %s\n"
 "Information: %s\n"
 "Selvudløser: %s\n"
 "LCD: %s\n"
 "Automatisk sluk: %i minutter\n"
 "Strømkilde: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den efterspurgte porttype (%i) er ikke understøttet af denne driver."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Kortstatus:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Lukkerhastighed"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Fokuseringstilstand"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Blitz-tilstand"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Tryk 1"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Udløs"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Stilbilledeoptagetilstand"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "AE lås"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "AF låst"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "AF låst"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientering"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Billedindstillinger"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK forlod ikke optagetilstanden."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Beklager, dit Canonkamera understøtter ikke Canonoptagelse"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Ukendt værdi %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Ukendt værdi %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "uventet datatype %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Målværdi er ikke i optællingen."
 
-#: camlibs/ptp2/config.c:1483
-#, fuzzy
-msgid "Now value is not in enumeration."
-msgstr "Målværdi er ikke i optællingen."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
-msgstr ""
+msgstr "Sony kunne ikke angive den nye værdi, er den gyldig?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "En-knaps automatik"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluorescerende"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Wolfram"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Skyet"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Skygge"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Farvetemperatur"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Forvalgt"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Naturligt lys, auto"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Fluorescerende lampe 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Fluorescerende lampe 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Fluorescerende lampe 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Fluorescerende lampe 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Fluorescerende lampe 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Vælg farvetemperatur"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Forvalgt bruger 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Forvalgt bruger 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Forvalgt bruger 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Forvalgt bruger 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Forvalgt bruger 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluorescerende: Varm hvid"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluorescerende: Kold hvid"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Fluorescerende: Dag hvid"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluorescerende: Dagslys"
 
-#: camlibs/ptp2/config.c:1555
-#, fuzzy
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
-msgstr "Forvalgt"
+msgstr "Forvalgt 1"
 
-#: camlibs/ptp2/config.c:1556
-#, fuzzy
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
-msgstr "Forvalgt"
+msgstr "Forvalgt 2"
 
-#: camlibs/ptp2/config.c:1557
-#, fuzzy
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
-msgstr "Forvalgt"
+msgstr "Forvalgt 3"
 
-#: camlibs/ptp2/config.c:1559
-#, fuzzy
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
-msgstr "Undervands"
+msgstr "Undervands: Auto"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Wolfram 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Fluorescerende: Hvid"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Fluorescerende: Wolfram"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Forvalgt 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG fin"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG normal"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "Rå + JPEG fin"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "Rå + JPEG normal"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Stor Fin JPEG+rå"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Stor Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Mellem Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Lille Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Enkeltramme"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Kontinuerlig lav hastighed"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Kontinuerlig høj hastighed"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Selvudløser"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Mup Spejl op"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Sort/hvid"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Sort/hvid"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Sort/hvid"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Sort/hvid"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+#, fuzzy
+msgid "ACROS+Ye Filter"
+msgstr "AB-filter"
+
+#: camlibs/ptp2/config.c:1569
+#, fuzzy
+msgid "ACROS+R Filter,"
+msgstr "AB-filter"
+
+#: camlibs/ptp2/config.c:1570
+#, fuzzy
+msgid "ACROS+G Filter"
+msgstr "AB-filter"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "ikke defineret"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "økonomi"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "tabsfri"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Ikke defineret"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Tilpasset"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Lås"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Nat-portræt"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Landskab"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Nærbillede"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Blitz slukket"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Kreativ"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Natscene"
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Høj kontrol"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Mad"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Ude af fokus"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Fiskeøje"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Miniature effekt"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "standard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "HDR-tilstand"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Kæledyr Portræt"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr "Udjævning"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Standard (deaktiveret i manuel eksponering)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Lav (deaktiveret i manuel eksponering)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Deaktiveret (deaktiveret i manuel eksponering)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Høj (deaktiveret i manuel eksponering)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "rødøje-reduktion"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "udfyldning"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "auto + rødøje-reduktion"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "til + rødøje-reduktion"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Fjernbetjener"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Gentager"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Auto blændeåbning"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Fuld manuel"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Programtilstand"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Stor"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Lille"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (fast)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (det valgte)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Centervægtet"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Gennemsnit"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Evaluerende"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Delvist"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Centervægtet gennemsnit"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Spotmåling låst med AF-ramme"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Flerpunktsspot"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Tro"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monokrom"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Fin detalje"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Bruger defineret 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Bruger defineret 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Bruger defineret 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Fokuspunkt kun i centeret, Manuel"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Fokuspunkt kun i centeret, Auto"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Multi-fokuspunkter (ikke specificeret), Manuel"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Multi-fokuspunkter, Auto"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Multi-fokuspunkter (højre)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Multi-fokuspunkter (center)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Multi-fokuspunkter (venstre)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Stor"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Middel 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Middel 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Middel 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Lille"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 sekunder"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 sekunder"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Indstilling 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Indstilling 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Indstilling 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Indstilling 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "MOBIL"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT + MOBIL"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC + MOBIL"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC + MOBIL"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "MOBIL2"
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT + MOBIL2"
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC + MOBIL2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC + MOBIL2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Spot-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Kort"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Video UD"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Ukendt %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Fabriksstandard"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Automatisk ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRå"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRå"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRå"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Mindre JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Meget lille JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRå + Stor Fin JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRå + Stor Fin JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRå + Stor Fin JPEG"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRå + Mellem Fin JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRå + Mellem Fin JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRå + Mellem Fin JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRå + Lille Fin JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRå + Lille Fin JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRå + Lille Fin JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRå + Stor Normal JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRå + Stor Normal JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRå + Stor Normal JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRå + Mellem Normal JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRå + Mellem Normal JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRå + Mellem Normal JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRå + Lille Normal JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRå + Lille Normal JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRå + Lille Normal JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "Rå + Mindre JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRå + Mindre JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRå + Mindre JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "cRå + Mindre JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "Rå + Meget lille JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRå + Meget lille JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRå + Meget lille JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Lille Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Middel 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Middel 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Stor Fin JPEG+rå"
+
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Lille Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Middel 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Middel 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Stor Fin JPEG+rå"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Stor Fin JPEG+rå"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Middel 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Middel 2"
+
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Lille Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Stor Fin JPEG+rå"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Middel 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Middel 2"
+
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Lille Normal JPEG+rå"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Kontinuerlig"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
 #, fuzzy
+msgid "Video"
+msgstr "Video UD"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
-msgstr "Enkelt-billedsfotografering"
+msgstr "Enkelt: Stille fotografering"
+
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Kontinuerlig selvudløser"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Timer 10 sek"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Timer 2 sek"
 
-#: camlibs/ptp2/config.c:2470
-#, fuzzy
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
-msgstr "Kontinuerlig fotografering"
+msgstr "Kontinuerlig fotografering i superhøj hastighed"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Enkelt lydløs"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Kontinuerlig lydløs"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Automatisk ISO"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Kontinuerlig"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Auto ISO mange-rammers støjreduktion"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Kontinuerlig"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "%d mange-rammers støjreduktion"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"For at »bulb-optagelse« kan fungere, skal funktionsvælgeren sættes til »M« "
+"og lukkerhastigheden til »bulb«."
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AF-S"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Fuji-optagelse mislykkedes: Måske ikke i auto-fokus?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Mange-rammers støjreduktion"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Auto ISO mange-rammers støjreduktion"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Kreativ"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Bevægelse"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Nat-landskab"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Børn"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatisk (ingen blitz)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Intelligent auto"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Superior auto"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "Film"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Film"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
 msgstr "Film"
 
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Film"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Filmskærm størrelse"
+
 # uafklaret (hvad sker der her?) xxx
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Tele-zoom Cont. Prioritet AE"
 
 # Mon det er et panorama optaget ved at bevæge kontinuerligt (som man
 # ofte kan på mobiltelefoner f.eks.)?
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Sweep panorama"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Intelligent automatisk blitz slukket"
 
 # nok bare Sport.  Det er nok en kameratilstand
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Solnedgang"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Natscene"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Håndholdt tusmørke"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Billedeffekt"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Nat-landskab"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Fest/indendørs"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Strand/Sne"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Skumring/Daggry"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Kæledyr Portræt"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Stearinlys"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Blomsterflor"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Efterårsfarver"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Mad"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Barn"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Nærbillede"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Fluorescerende"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Vand"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Ekstra høj"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Billede"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scene"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effekter"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Baglys"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Udjævning"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Tilt-skift"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Vælg farve"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Enkelt-skud"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Serie"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Tidsforkortelse"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Kontinuerlig lav hastighed"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Timer"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Spejl op"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Hurtigtvirkende fjernbetjening"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
-msgstr "Forsinket Fjernbetjening"
+msgstr "Forsinket fjernbetjening"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
-msgstr "Lydløs Fjernbetjening"
+msgstr "Lydløs udløser"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Løbende lydløs udløser"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Selvudløser 2s"
 
-#: camlibs/ptp2/config.c:3307
-#, fuzzy
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
-msgstr "Selvudløser 2s"
+msgstr "Selvudløser 5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Selvudløser 10s"
 
-#: camlibs/ptp2/config.c:3309
-#, fuzzy
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
-msgstr "Selvudløser 10s"
+msgstr "Selvudløser 10s 3 billeder"
 
-#: camlibs/ptp2/config.c:3310
-#, fuzzy
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
-msgstr "Selvudløser 10s"
+msgstr "Selvudløser 10s 5 billeder"
 
-#: camlibs/ptp2/config.c:3311
-#, fuzzy
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
-msgstr "Selvudløser 2s"
+msgstr "Selvudløser 5s 3 billeder"
 
-#: camlibs/ptp2/config.c:3312
-#, fuzzy
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
-msgstr "Selvudløser 2s"
+msgstr "Selvudløser 5s 5 billeder"
 
-#: camlibs/ptp2/config.c:3313
-#, fuzzy
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
-msgstr "Selvudløser 2s"
+msgstr "Selvudløser 2s 3 billeder"
 
-#: camlibs/ptp2/config.c:3314
-#, fuzzy
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
-msgstr "Selvudløser 2s"
+msgstr "Selvudløser 2s 5 billeder"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
 #, fuzzy
-msgid "Bracketing C 0.3 Steps 3 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgid "Continuous Hi+ Speed"
+msgstr "Kontinuerlig lav hastighed"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4170
 #, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Kontinuerlig lav hastighed"
+
+#: camlibs/ptp2/config.c:4172
+msgid "Bracketing C 0.3 Steps 3 Pictures"
+msgstr "Bracketing C 0.3 skridt 3 billeder"
+
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgstr "Bracketing C 0.3 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3318
-#, fuzzy
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgstr "Bracketing C 0.3 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3320
-#, fuzzy
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgstr "Bracketing C 0.5 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3321
-#, fuzzy
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgstr "Bracketing C 0.5 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3322
-#, fuzzy
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
-msgstr "Bracketing C 0.3 skridt"
+msgstr "Bracketing C 0.5 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3324
-#, fuzzy
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
-msgstr "Bracketing C 0.7 skridt"
+msgstr "Bracketing C 0.7 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3325
-#, fuzzy
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
-msgstr "Bracketing C 0.7 skridt"
+msgstr "Bracketing C 0.7 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3326
-#, fuzzy
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
-msgstr "Bracketing C 0.7 skridt"
+msgstr "Bracketing C 0.7 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3328
-#, fuzzy
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
-msgstr "Bracketing C 1.0 skridt"
+msgstr "Bracketing C 1.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3329
-#, fuzzy
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
-msgstr "Bracketing C 1.0 skridt"
+msgstr "Bracketing C 1.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3330
-#, fuzzy
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
-msgstr "Bracketing C 1.0 skridt"
+msgstr "Bracketing C 1.0 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3332
-#, fuzzy
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
-msgstr "Bracketing C 2.0 skridt"
+msgstr "Bracketing C 2.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3333
-#, fuzzy
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
-msgstr "Bracketing C 2.0 skridt"
+msgstr "Bracketing C 2.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3335
-#, fuzzy
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
-msgstr "Bracketing C 3.0 skridt"
+msgstr "Bracketing C 3.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3336
-#, fuzzy
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
-msgstr "Bracketing C 3.0 skridt"
+msgstr "Bracketing C 3.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3338
-#, fuzzy
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.3 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3339
-#, fuzzy
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.3 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3340
-#, fuzzy
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.3 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3342
-#, fuzzy
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.5 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3343
-#, fuzzy
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.5 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3344
-#, fuzzy
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
-msgstr "Bracketing S 0.3 skridt"
+msgstr "Bracketing S 0.5 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3346
-#, fuzzy
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
-msgstr "Bracketing S 0.7 skridt"
+msgstr "Bracketing S 0.7 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3347
-#, fuzzy
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
-msgstr "Bracketing S 0.7 skridt"
+msgstr "Bracketing S 0.7 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3348
-#, fuzzy
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
-msgstr "Bracketing S 0.7 skridt"
+msgstr "Bracketing S 0.7 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3350
-#, fuzzy
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
-msgstr "Bracketing S 1.0 skridt"
+msgstr "Bracketing S 1.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3351
-#, fuzzy
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
-msgstr "Bracketing S 1.0 skridt"
+msgstr "Bracketing S 1.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3352
-#, fuzzy
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
-msgstr "Bracketing S 1.0 skridt"
+msgstr "Bracketing S 1.0 skridt 9 billeder"
 
-#: camlibs/ptp2/config.c:3354
-#, fuzzy
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
-msgstr "Bracketing S 2.0 skridt"
+msgstr "Bracketing S 2.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3355
-#, fuzzy
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
-msgstr "Bracketing S 2.0 skridt"
+msgstr "Bracketing S 2.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3356
-#, fuzzy
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
-msgstr "Bracketing S 3.0 skridt"
+msgstr "Bracketing S 3.0 skridt 3 billeder"
 
-#: camlibs/ptp2/config.c:3357
-#, fuzzy
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
-msgstr "Bracketing S 3.0 skridt"
+msgstr "Bracketing S 3.0 skridt 5 billeder"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Bracketing WB Lo"
 
-#: camlibs/ptp2/config.c:3359
-#, fuzzy
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
-msgstr "Bracketing WB Lo"
+msgstr "Bracketing DRO Lo"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Bracketing WB Hi"
 
-#: camlibs/ptp2/config.c:3361
-#, fuzzy
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
-msgstr "Bracketing WB Hi"
+msgstr "Bracketing DRO Hi"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Centerspot"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Flerpunkts spot"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Enkelt område"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Nærmeste emne"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Gruppedynamisk"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Enkeltpunkts AF"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Dynamisk område AF"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "Gruppedynamisk AF"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "Gruppedynamisk AF med nærmeste genstand prioritet"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Dynamisk område (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Dynamisk område (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Dynamisk område (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "3D-registrering"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "Dynamisk område AF (25 punkter)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "Single-point AF"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "Auto-område AF"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "3D-registrering"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "Dynamisk område AF (72 punkter)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "Dynamisk område AF (153 punkter)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "Gruppeområde AF"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "Dynamisk område AF (9 punkter)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "Pinpoint AF"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "Bredt-område AF (S)"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "Bredt-område AF (L)"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Bredt-område AF (S)"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Bredt-område AF (S)"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (portræt)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (naturlig)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Ukendt værdi 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centrum"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Top"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Bund"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Venstre"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Højre"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Vidvinkel"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Centrum"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Fleksibel program"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Fleksibel program"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Fleksibel program"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Centervægtet"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Flerpunkts spot"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Centerspot"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Spot+Fremhævelser"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Spot+Skygger"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "Flerpunktsspot"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Stor"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Spot+Fremhævelser"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Automatisk blitz"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Udfyldningsblitz"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Rødøje automatik"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Rødøje udfyldning"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Ekstern synkronisering"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Automatisk Langsom Synkronisering"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Bagestegardin synkronisering + langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Rødøjereduktion + langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Forreste gardin synkronisering"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Rødøjereduktion"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Rødøjereduktion med langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Bageste gardin med langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Bageste gardin-synkronisering"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Bageste gardin-synkronisering"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Trådløs synkronisering"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Langsom synkronisering"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Sort/hvid"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Natsyn"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Farve skitse"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Miniature effekt"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Selektive farver"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Silhuet"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "High key"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Low key"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "uendelig"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "uendelig"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Sammensat"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "bulb"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Langsom synkronisering"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "Ansigts-prioritet AF"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Bredt-område AF"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Normal-område AF"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "Følg-motiv AF"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Auto-område AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Indikator skærm"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Single-servo AF"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "Continuous-Servo AF"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Full-time-servo AF"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Manuel fokusering"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "MF (det valgte)"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "AE/AF lås"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Kun AE lås"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Kun AF lås"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "AF lås hold"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF til"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Blitzniveau lås"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 sekunder"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minut"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minutter"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 sekunder"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 mm"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "bulb"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1.6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1.3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1.3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1.6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Skarpere"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Blødere"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Direkte udskrift"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Mellem lav"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Mellem høj"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Lav kontrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Mellem høj"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Høj kontrol"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zone Focus (Tæt-på)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Zone Focus (Meget tæt)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zone Focus (Tæt)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zone Focus (Mellem)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zone Focus (Fjern)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zone Focus (Reserveret 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zone Focus (Reserveret 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Zone Focus (Reserveret 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zone Focus (Reserveret 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatisk makro"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Single-Servo AF"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Continuous-Servo AF"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
-msgstr ""
+msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Enkelt-skud"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "AI servo"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "AI fokus"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 sekunder"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 sekunder"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Hold"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Fluorescerende H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Bruger hvidbalance PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Bruger hvidbalance PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Bruger hvidbalance PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Manglende nummer"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Skygge"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Tilpasset"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Bruger hvidbalance PC-1"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Tilpasset"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Bruger hvidbalance PC-2"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Tilpasset"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Bruger hvidbalance PC-3"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Tilpasset"
+msgid "Manual 3"
+msgstr "Manuel 2"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Manuel 2"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Manuel 2"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Bruger hvidbalance PC-1"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Bruger hvidbalance PC-1"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "AWB hvid"
+
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Lidt gør-skarp"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Sort/hvid"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "ADL bracketing"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Hvidbalance bracketing"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Hvidbalance bracketing"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Hvidbalance bracketing"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Bracket tilstand"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
-msgstr ""
+msgstr "implicit auto"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE & blitz"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "Kun AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Kun blitz"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Hvidbalance bracketing"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "ADL bracketing"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Opstart"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Luk ned"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Opstart og nedlukning"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Hurtig tilbagemelding"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Fjernt Spejl Op"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Programtilstand 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Programtilstand 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Moderat"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Forbedret"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > Under"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Under > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Automatisk følsomhed"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Høj følsomhed"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Mellem følsomhed"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Lav følsomhed"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Mikrofon slukket"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hi 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hi 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Blitz/lukker"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Blitz/lukker/blænde"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Blitz/blænde"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG basis"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+fin"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (rå)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+basis"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+normal"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
-#, fuzzy
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "JPEG basis*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "JPEG normal*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "JPEG fin*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF+basis*"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF+normal*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF+fin*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
-msgstr "Ekstra høj"
+msgstr "Ekstra fin"
+
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RÅ+JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "RÅ+JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "Rå + JPEG fin"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "Rå + JPEG fin"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+fin"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "Rå + JPEG fin"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "Rå + JPEG fin"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RÅ+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
 #, fuzzy
+msgid "X.Fine"
+msgstr "Fin"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RÅ+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG fin"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "Rå 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
-msgstr "Flerpunkts spot"
+msgstr "Flere billeder"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 sekunder"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 sekunder"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Tabsfri"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Tabsgivende"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "High key"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Størrelsesprioritet"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optimal kvalitet"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Udløs"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Udløs + fokusér"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 points"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 points"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 points"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 points (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (Lang)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Normal)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (Kort)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Lukker/AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "AE/AF lås"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Kun AE lås"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "AE lås (nulstil ved afbrydelse)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "AF lås (hold)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Kun AF lås"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Ikke-tildelt"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Smugkig"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "FV lås"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "AE lås (hold)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Bracketing-burst"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Matriksmåling"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Centervægtet måling"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Spotmåling"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Afspilning"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Tilgå toppunkt i MY MENU"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (rå)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Billedbegrænsningsgitter"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Aktiv D-belysning"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 trin hastighed/blænde"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Vælg ikke-CPU objektivnummer"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Søger virtuel horisont"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Start filmoptagelse"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Til (billedvisning udelukket)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Rystelsesreduktion"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Ukendt værdi"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Nikons skift-fokusområde virker kun i LiveView tilstand."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Nikons autofokusmotor fokuserede ikke."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Nikons manuel-fokusering virker kun i LiveView tilstand."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Nikon manuel-fokusering ved grænse."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Nikon manuel-fokuserinsskridt er for små."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Halvt tryk"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Helt tryk"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Udløs halvt"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Udløs helt"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Omgående"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Tryk 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Tryk 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Tryk 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Udløs 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Udløs 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Udløs 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Nært 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Nært 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Nært 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Fjernt 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Fjernt 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Fjernt 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Nært %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Fjern %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Nikon tillad-liveview fejlede"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+#, fuzzy
+msgid "Movie prohibit conditions: "
+msgstr "LiveView forhindret tilstand"
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Programtilstand"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Nikon tillad-liveview fejlede"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Kort er skrivebeskyttet."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+#, fuzzy
+msgid "Already in movie recording"
+msgstr "Start filmoptagelse"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "Kort"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Kortet er ikke formatteret"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Blændåbningsfejl."
+
+#: camlibs/ptp2/config.c:8569
+#, fuzzy
+msgid "No movie prohibit conditions"
+msgstr "LiveView forhindret tilstand"
+
+#: camlibs/ptp2/config.c:8587
+#, fuzzy
+msgid "Live View prohibit conditions: "
+msgstr "LiveView forhindret tilstand"
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Sekvens 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Ugyldig blændeåbningsindstilling"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Batteri tømt, kamera slukket."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "Blændåbningsfejl."
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Kortet er ikke formatteret"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Information Disp. indstilling"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Eksponeringsprogramtilstand"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Fluorescerende"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "indstil tid"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Sort/hvid"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Temperatur 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Temperatur 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Temperatur 4"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatisk C"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Automatisk makro"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Ukendt: 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Fjernt 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Fjernt 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Nært 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Nært 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
 msgstr ""
-"For at 'bulb' optagelse kan fungere, skal funktionsvælgeren sættes til 'M' "
-"og lukkerhastigheden til 'bulb'."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Optag"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Afspil"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Andre indstillinger"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Høj ISO støjreduktion"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Vis ikke TV-menu"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr "Hent strøm"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Stor"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Ukendt værdi %04x"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Intern ram"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Hukommelseskort"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Skærm"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Oprettelsesdato: %s, Sidst brugt den: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Slet"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Håndteret"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Profilnavn"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP adresse (tomt for DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Netværksmaske"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Standard adgangspunkt"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Tilgangstilstand"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "WIFI kanal"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Krypteringsnøgle (hex)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Skriv"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Vis Wifi profiler"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Dan Wifi profil"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Synkroniser kameraets dato og tid med PC"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Auto-fokus"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Manuel-fokusering"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Luk ned"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Afstandslås"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Bulb tilstand"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "UI Lås"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Pop op-blitz"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Nikon DSLR auto fokusmotor"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Drive Canon DSLR Autofokus"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr "Nikon DSLR auto fokusmotor"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Nikon DSLR manuel fokusmotor"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Indstil Nikon autofokus område"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Sæt Nikon kontroltilstand"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
-msgstr "Drive Canon DSLR Manuel fokus"
+msgstr "Drive Canon DSLR - manuel fokus"
 
 # (DSLR = digital single-lens-camera ~ digitalt spejlreflekskamera)
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Afbryd autofokus for Canon-DSLR"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Drive Olympus OMD - manuel fokus"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Drive Panasonic - manuel fokus"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "EZoom start position"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Canon EOS Zoom"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Canon EOS Zoom Position"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
-msgstr "Canon EOS søger"
+msgstr "Canon EOS-søger"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Panasonic-søger"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon søger"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Canon EOS fjernbetjent udløser"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "CHDK Script"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Filoptagelse"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Filmlyd"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Fokuseringsinfo"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Fokuseringsinfo"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Fokuseringsinfo"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Fokuseringspunkt lyst"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "PTP-operationskode"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Kameraproducent"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Enhedsversion"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Fremstiller udvidelse"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "PTP-version"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "DPOF-version"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Vekselstrøm"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Ekstern blitz"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Batteriniveau"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+#, fuzzy
+msgid "Mirror Up Status"
+msgstr "Spejl op"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Spejl op"
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+#, fuzzy
+msgid "Mirror Up Shooting Count"
+msgstr "Spejl op sekvens"
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Kontinuerlig fotografering"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Kameraorientering"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Blitz åben"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Aktiv AF-sensor"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Blitz opladet"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Objektiv navn"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Lukker tæller"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Optagelser tilgængeligt"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Mindste brændvidde"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Maksimal brændvidde"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Maksimal blændeåbning ved minimal brændvidde"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Maks. blændeåbning ved maks. brændvidde"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Low-Light"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Lysmåler"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "AF låst"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "AE låst"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "FV låst"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Filmlyd"
+
+#: camlibs/ptp2/config.c:10771
+#, fuzzy
+msgid "Movie Prohibit Condition"
+msgstr "LiveView forhindret tilstand"
+
+#: camlibs/ptp2/config.c:10772
+#, fuzzy
+msgid "Liveview Prohibit Condition"
+msgstr "LiveView forhindret tilstand"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Kameraets dato og tid"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Bippetilstand"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Billedkommentar"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "WLAN GUID"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Tillad billedkommentar"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "LCD slukket tid"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Optagemedie"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Hurtig gennemsyn tid"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "CSM-menu"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Omvendt kommando drejeskive"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Kamera uddata"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Optagelsesmål"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "EVF-tilstand"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Kunstner"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "CCD-nummer"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Ophavsret"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Rens sensor"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Rystelsesreduktion"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Tilpassede funktioner Ex"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Fokuseringsinfo"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Fokuseringsområde"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Blitz opladet"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Enkelt-skud"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Automatisk sluk"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Feltdybde"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menuer og afspilning"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Kamerahandlinger"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Størrelsesprioritet"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Understøttet miniature størrelse"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Hurtigt filsystem"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Optage mål"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Autofokus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Fjernbetjent tilstand"
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Effekttilstand"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Billedformat SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Billedformat CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Billedformat Ext HD"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Filopløsning"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Billedstørrelse"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Film-ISO-hastighed"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Hvidbalance"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Hvidbalance justering A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Hvidbalance justering B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Hvidbalance X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Hvidbalance X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Fotoeffekt"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Farvemodel"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Farverum"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Videoformat"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Videoopløsning"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Videobilledhastighed"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Videokontrast"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Videolysstyrke"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Lydformat"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Lydbithastighed"
+
+#: camlibs/ptp2/config.c:10894
+#, fuzzy
+msgid "Audio Sampling Rate"
+msgstr "Lydprøvehastighed"
+
+# lydbit per prøve
+# bit per prøve for lyd
+#: camlibs/ptp2/config.c:10895
+#, fuzzy
+msgid "Audio Bit per Sample"
+msgstr "Lyddele per prøve"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Lydstyrke"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Lang eksponerings støjreduktion"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Auto-fokuseringstilstand 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Zoomhastighed"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Hjælpelys"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Rotationsflag"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Eksponeringskompensation"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Hvidbalance"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Farvetemperatur"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "AF-tilstand"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Farvetonejustering"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Start filmoptagelse"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Blitzkompensation"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "AEB eksponeringskompensation"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Nikon blitz-tilstand"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Blitz-styrer tilstand"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Blitz-styrer strøm"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Blitz-styringskanal"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Blitz-styring egen-tilstand"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Blitz-styring egen-kompensation"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Blitz-styring egen-værdi"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Blitz-styring A tilstand"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Blitz-styring A kompensation"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Blitz-styring A værdi"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Blitz-styring B tilstand"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Blitz-styring B kompensation"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Blitz-styring B værdi"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "AF områdebelysning"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "AF bippetilstand"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Blænde-tal"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "LiveView tilstand"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Filmblændetal"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Fleksibel program"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kvalitet"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Billedstørrelse"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Billedformat"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Fokuseringsafstand"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Brændvidde"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Fokuseringstilstand 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Kontinuerlig AF"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Effekttilstand"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Eksponeringsprogram"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Kameratilstand"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Scenetilstand"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Sideforhold"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "AF-tilstand"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Sammendrag for lagerenheder:\n"
+msgstr "lagerenhed"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Høj-ISO støjreduktion"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "HDR-tilstand"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "HDR Høj Dynamik"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "HDR Udjævning"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Stilbilledeoptagetilstand"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Canon optagetilstand"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Canon automatisk eksponeringstilstand"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Canon automatisk eksponeringstilstand"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Drev-tilstand"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Billedestil"
 
 # evt. Fokusberegningstilstand
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Afstandsindstillingstilstand"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Eksponerings-målingstilstand"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV åben"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV maks"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Blændeåbning"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Fokuseringspunkt"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Optageforsinkelse"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Lukkerhastighed 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Filmlukkerhastighed 2"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Målingstilstand"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "AF-afstand"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Nulstilling af fokuseringsområde"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Eksponering forsinkelsestilstand"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Eksponeringslås"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "AE-L/AF-L tilstand"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "LiveView AF tilstand"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "LiveView AF fokusering"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "Liveview Drev-tilstand"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "LiveView billedzoom forhold"
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Hvidbalance"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "LiveView status"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Sæt filnumre i rækkefølge"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Blitzsymbol"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Modelerings blitz"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Søgergitter"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Billedgennemsyn"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Billedrotationsflag"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Frigør uden CF-kort"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Blitztilstand manuel-strøm"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Auto-fokus område"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Blitzeksponeringskompensation"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Bracketing"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Bracket tilstand"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "EV skridt"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Sammensat sæt"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Sammensat orden"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Eksponerings bracketing skridt"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Hvidbalance bracketing"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Bracketing til"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Hvidbalance bracketing"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Bracketing-burst"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "ADL bracketing"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "ADL bracketing"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Forvalgt bruger 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Forvalgt bruger 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Forvalgt bruger 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Forvalgt bruger 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Forvalgt bruger 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Forvalgt bruger 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Serie antal"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Serie interval"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Maksimale antal skud"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Automatisk hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Wolfram hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Fluorescerende hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Dagslys hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Blitz hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Skyet hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Skygget hvidbalance-korrektion"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Naturligt lys med automatisk hvidbalancekorrektion"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Hvidbalance-korrektion forindstillet nr"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Hvidbalance-korrektion forindstillet 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Hvidbalance-korrektion forindstillet 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Hvidbalance-korrektion forindstillet 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Hvidbalance-korrektion forindstillet 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Hvidbalance-korrektion forindstillet 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Selvudløserforsinkelse"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Centervægtområde"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Blitz-lukkerhastighed"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Fjernbetjent tidsudløb"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Fjernbetjent tilstand"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Programtilstand"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Optimér billede"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Gør skarpere"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Tone-kompensation"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Mætning"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Farvetonejustering"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Autoeksponerings-bracketing"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Automatisk lysoptimering"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Filmlyd"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Manuel film indstilling"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Omvendte indikatorer"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Automatisk forvrængningskontrol"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Vigneteringskontrol"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Video-tilstand"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Sensorbeskæring"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Filsletning, "
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Single-Servo AF"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Måler slukket tid"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Tilknyt funktionsknap"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Tilknyt smugkig-knap"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Film kvalitet"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Minidste lukkerhastighed"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Kontinuerlig fotografering lav hastighed"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Filmopløsning"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Kontinuerlig fotografering lav hastighed"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Minidste lukkerhastighed"
+
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Film kvalitet"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "ISO Auto høj grænse"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Blitz synkroniseringshastighed"
 
 # evt. Fokusberegning
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Afstandsindstilling"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Kontinuerlig fotografering høj hastighed"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "JPEG-komprimeringspolitik"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "AF-C tilstandsprioritet"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "AF-S tilstandsprioritering"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "AF aktivering"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Dynamisk AF område"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "AF lås til"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "AF område punkt"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "AF til-knap"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Støjreduktion for høj-ISO-film"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Maksimalt kontinuerlig udløsning"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Min. brændvidde"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "RAW komprimering"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Billedkvalitet 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Billedindstillinger"
+#: camlibs/ptp2/config.c:11288
+#, fuzzy
+msgid "Live View Zoom Area"
+msgstr "LiveView AF område"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Optageindstillinger"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "WIFI profiler"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Andre PTP enheders ejerforhold"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP ejerforhold 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
-msgstr "Beklager, egenskaben for »%s« / 0x%04x er pt skrivebeskyttet."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
+msgstr "Beklager, egenskaben for »%s« / 0x%04x er pt. skrivebeskyttet."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Egenskaben »%s« / 0x%04x var ikke sat (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Egenskabet »%s« / 0x%04x var ikke sat (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr "Fortolkning af værdien for kontrollen '%s' / 0x%04x fejlede med %d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Egenskaben »%s« blev ikke fundet."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Du er nødt til at angive en mappe, der starter med /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7784,190 +10087,213 @@
 "\n"
 "God fornøjelse!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Beklager, dit Nikonkamera returnerer tilsyneladende ikke et JPEG-billede i "
+"liveview-tilstand"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Canon tillad-søger fejlede"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Canon hent-søgerbillede fejlede"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Beklager, dit Canonkamera understøtter ikke Canon søger-tilstand"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Beklager, dit Nikonkamera understøtter ikke liveview-tilstand"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
-"Beklager, dit Nikonkamera returnerer tilsyneladende ikke et JPEG-billede i "
-"liveview-tilstand"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Nikon slå-liveview-fra fejlede"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
-#, fuzzy
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
-"Beklager, dit Nikonkamera returnerer tilsyneladende ikke et JPEG-billede i "
+"Beklager, dit Sonykamera returnerer tilsyneladende ikke et JPEG-billede i "
 "liveview-tilstand"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Beklager, dit Panasonickamera returnerer tilsyneladende ikke et JPEG-billede "
+"i liveview-tilstand"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Beklager, dit kamera understøtter ikke Nikonoptagelse"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 "Kunne ikke aktivere liveview på et Nikon 1, men det er krævet for optagelse"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Beklager, dit Canonkamera understøtter ikke Canon EOS-optagelse"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS hent ændringer fejlede"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Beklager, dit Canonkamera understøtter ikke Canon-optagelsesinitiering"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Canon slå-søger-fra fejlede"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Canonoptagelse fejlede"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Fuji-optagelse mislykkedes: Måske ikke i auto-fokus?"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Beklager, dit kamera understøtter ikke almen optagelse"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr "Kameraets hukommelseskort blev fyldt op under optagelse."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Canon EOS Half-Press fejlede"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Canon EOS-optagelse fejlede udløsning: Måske ikke i fokus?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Canon EOS Half-Release fejlede"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Canon EOS Full-Press fejlede"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Canon EOS Full-Release fejlede"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Canon EOS Full-Press fejlede"
+msgstr "Canon EOS M Full-Press mislykkedes"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr "Canon EOS-optagelse fejlede udløsning: Måske ikke i fokus?"
+msgstr "Canon EOS-optagelse mislykkedes: Måske ikke i fokus?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Canon EOS Full-Release fejlede"
+msgstr "Canon EOS M Full-Release mislykkede"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS-optagelse fejlede"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS-optagelse fejlede: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Canon EOS-optagelse fejlede udløsning: Er spejlet oppe?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 "Canon EOS-optagelse fejlede udløsning: Måske ikke mere hukommelsesplads på "
 "kort?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS-optagelse fejlede udløsning: Er kortet skrivebeskyttet?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr "Canon EOS-optagelse fejlede udløsning: Ukendt fejl %d, rapportér."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "Beklager, initiering af dit kamera virkede ikke. Send en fejlmelding, tak."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Producent: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Model: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Version: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Serienummer: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Fremstiller udvidelses ID: 0x%x(%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Fremstiller udvidelsesbeskrivelse: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "PTP Standardversion: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Funktionstilstand: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7975,20 +10301,31 @@
 "\n"
 "Optageformater: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Visningsformater: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+#, fuzzy
+msgid ""
+"\n"
+"Streams:"
+msgstr "Hent strøm"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Understøttede MTP objektegenskaber:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP fejl %04x ved forespørgsel"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7996,95 +10333,87 @@
 "\n"
 "Enhedens egenskaber:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
-msgstr "\tFil hjemhentning, "
+msgstr "\tFiloverførsel, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Filsletning, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Ingen filsletning, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Filoplægning\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Ingen filoplægning\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tAlmen billedoptagelse, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tIngen billedoptagelse, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Åben optagelse, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Ingen åben optagelse, "
 
-#: camlibs/ptp2/library.c:5740
-#, fuzzy
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
-msgstr "Canonoptagelse"
+msgstr "Canonoptagelse, "
 
-#: camlibs/ptp2/library.c:5742
-#, fuzzy
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
-msgstr "Canon EOS-optagelse"
+msgstr "Canon EOS-optagelse, "
 
-#: camlibs/ptp2/library.c:5744
-#, fuzzy
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
-msgstr "Canon EOS-optagelse"
+msgstr "Canon EOS-optagelse 2, "
 
-#: camlibs/ptp2/library.c:5748
-#, fuzzy
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
-msgstr "Nikon-optagelse 1"
+msgstr "Nikon-optagelse 1, "
 
-#: camlibs/ptp2/library.c:5750
-#, fuzzy
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
-msgstr "%sNikon-optagelse 2"
+msgstr "Nikon-optagelse 2, "
 
-#: camlibs/ptp2/library.c:5752
-#, fuzzy
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
-msgstr "%sNikon-optagelse 3"
+msgstr "Nikon-optagelse 3, "
 
-#: camlibs/ptp2/library.c:5756
-#, fuzzy
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
-msgstr "Sonyoptagelse"
+msgstr "Sonyoptagelse, "
 
-#: camlibs/ptp2/library.c:5761
-#, fuzzy
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
-msgstr "Olympus E XML optagelse\n"
+msgstr "Olympus E XML optagelse, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Ingen fremstillerspecifik optagelse\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
-msgstr "\tNikon Wifi understøttelse\n"
+msgstr "\tNikon Wifi-understøttelse\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
-msgstr "\tCanon Wifi understøttelse\n"
+msgstr "\tCanon Wifi-understøttelse\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8092,93 +10421,93 @@
 "\n"
 "Sammendrag for lagerenheder:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tBeskrivelse af lagerenheder: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tVolumen mærkat: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Indbygget rom"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Udtagelig rom"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Indbygget ram"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Udtagelig ram (hukommelseskort)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Ukendt: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tLagringstype: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Almen flad"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Almen hierarkisk"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Digitalkamera layout (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tFilsystemtype: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Læse-skrive"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Kun læsning"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Kun-læse med objekt-sletning"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tTilgangskapacitet: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaksimal kapacitet: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tLedig plads (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tLedig plads (billeder): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8186,47 +10515,47 @@
 "\n"
 "Enhedsengenskabs-sammendrag:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " ikke læsning ud.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "kan ikke forespørges.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "læse/skrive"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " fejl %x ved forespørgsel."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Filen '%s/%s' findes ikke."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Metadata understøttes kun for MTP enheder."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Enheden understøtter ikke indstilling af objekt-beskyttelse."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Enheden kunne ikke sætte objektbeskyttelsen til %d"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8234,7 +10563,7 @@
 msgstr ""
 "PTP er endnu kun implementeret for USB og PTP/IP kameraer, port type %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8242,2240 +10571,2351 @@
 "Olympus pakket-XML understøttelse er for nuværende kun tilgængeligt med "
 "libxml2 understøttelse indbygget."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP O.k.!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP generel fejl"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP session ikke åben"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ugyldig transaktions ID"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP handling ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ikke fuldstændig overførsel"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ugyldig lagrings ID"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ugyldig objekthåndtering"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhedsegenskaber ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ugyldig objekt formatkode"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP lager fuldt"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP Objektet er skrivebeskyttet"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP lager skrivebeskyttet"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP tilgang nægtet"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen miniature tilstede"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP selvtest mislykkedes"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis sletning"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP lager ikke tilgængeligt"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation efter format ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen gyldige objektinformationer"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP ugyldig kodeformat"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP ukendt fremstillerkode"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP-optagelse allerede afbrudt"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP-enhed optaget"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ugyldigt forældre-objekt"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ugyldig enhedsegenskabsformat"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ugyldig enhedsegenskabsværdi"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP ugyldig parameter"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP-session allerede åbnet"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP-transaktion afbrudt"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP-angivelse af mål ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP ugyldig objekthåndtering"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Ingen begrundelse tilgængelig"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Ugyldig status"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Filnavn er påkrævet"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Filnavnskonflikt"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Filnavn er ugyldigt"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Hardware fejl"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Ude af fokus"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Ændring af kameratilstand fejlede"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Ugyldig status"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Sæt ejerforhold ikke understøttet"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Hvidbalance nulstil-fejl"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Støv reference fejl"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Lukkerhastighed lang tid"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Spejl op sekvens"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Kameratilstand ikke justering FTal"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Ikke i Liveview"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Mf Drive Step End"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Mf Drive Step Insufficiency"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Avanceret overførsel afbrudt"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP ingen miniature tilstede"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Stroboskopfejl."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Kortet er ikke formatteret"
+
+#: camlibs/ptp2/ptp.c:6138
+#, fuzzy
+msgid "Bulb Release Busy"
+msgstr "Udløs + fokusér"
+
+#: camlibs/ptp2/ptp.c:6139
+#, fuzzy
+msgid "Silent Release Busy"
+msgstr "Lydløs udløser"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Lukkerhastighed 2"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP-optagelse allerede afbrudt"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Ugyldig status"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Ukendt kommando"
 
 # Operation?
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Proces afvist"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Objektivdæksel på"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Batteriniveau lav"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Kamera ikke klart"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Objektivdæksel på"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Batteri"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Kamera ikke klart"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Afskær objekt"
+
+#: camlibs/ptp2/ptp.c:6157
 #, fuzzy
+msgid "Memory Status Not Ready"
+msgstr "Kamera ikke klart"
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP ugyldig objekt formatkode"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP ugyldig objekt formatkode"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP ugyldig enhedsegenskabsværdi"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP ugyldig objekthåndtering"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Ugyldig status"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP specifikation efter format ikke understøttet"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP specifikation efter format ikke understøttet"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Sæt ejerforhold ikke understøttet"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Åbn medie session"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Ugyldig status"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP handling ikke understøttet"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "PTP-enhed optaget"
+msgstr "PTP ingen enhed"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "PTP-tidsudløb"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "PTP afbryd forespørgsel"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "PTP-svar forventet"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "PTP-data forventet"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "PTP I/O-fejl"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Funktionstilstand"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Komprimeringsindstillinger"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Hvidbalance"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB-forstærkning"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Eksponeringstid"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Eksponeringsprogramtilstand"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Eksponeringsindeks (filmhastigheds-ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Eksponeringskorrektionskompensation"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Forud-optageforsinkelse"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digital zoom"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Tidsforkortelses antal"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Tidsforkortelses interval"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Oplæg URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Ophavsretsinformation"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Understøttede strømme"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Aktiverede strømme"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Videoformat"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Videoopløsning"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Videokvalitet"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Videobilledhastighed"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Videokontrast"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Videolysstyrke"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Lydformat"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Lydbithastighed"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Lydprøvehastighed"
 
 # lydbit per prøve
 # bit per prøve for lyd
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Lyddele per prøve"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Lydstyrke"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Dato/tid stempelformat"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Video ud"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Strømspare"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Brugerfladens sprog"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Batteritype"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Batteritilstand"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "UILåsType"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Kameratilstand"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Fuldvisningsfilformat"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Selvudløse"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Optagetilstand"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Billedtilstand"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Langsom-lukker indstillinger"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "AF-tilstand"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Billedstabilisering"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Farveforstærkning"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Sensivitet"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Parametersæt"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Av åben"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Av maks"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Brændvidde tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Brændvidde vidvinkel"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Brændvidde beskriver"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Optagelse overførselstilstand"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Præfiks navn"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Størrelse/kvalitetstilstand"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Understøttet miniature størrelse"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Størrelse af uddata fra kamera"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Størrelse af inddata til Kamera"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Remote API Version"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Kameraejer"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX-tid"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Kamerahus id"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av åben Apex"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Digital zoom forstørrelse"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Ml spot position"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Disp Av maks"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av maks Apex"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "EZoom start position"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "EZoom størrelse af tele"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Blitz antal-tælling"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Rotations vinkel"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Rotations scene"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Hændelses emuleringstilstand"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Type af lysbilledshow"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Gennemsnitlige filstørrelser"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Model id"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Eksponeringsprofil"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Eksponeringsprofil A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Eksponeringsprofil B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Eksponeringsprofil C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Eksponeringsprofil D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Nulstil menuprofil 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Hvidbalance farvetemperatur"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Hvidbalance forvalgt nummer"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Hvidbalance forvalgt navn 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Hvidbalance forvalgt navn 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Hvidbalance forvalgt navn 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Hvidbalance forvalgt navn 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Hvidbalance forvalgt navn 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Hvidbalance forvalgt værdi 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Hvidbalance forvalgt værdi 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Hvidbalance forvalgt værdi 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Hvidbalance forvalgt værdi 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Hvidbalance forvalgt værdi 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Objektivets brændvidde (ikke CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Objektivets største blændeåbning (ikke CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Auto DX Crop"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Menuprofil A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Menuprofil B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Menuprofil C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Menuprofil D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Nulstil menuprofil"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Lodret AF til"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Fokus område zone"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Tillad ophavsret"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Eksponerings ISO skridt"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Eksponeringsskridt"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Eksponeringskompensation (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Centervægt område"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Eksponerings base matrix"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Eksponerings base center"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Eksponerings base spot"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "LiveView AF område"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Automatisk måler slukket tid"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Selvudløser forsinkelse"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Img Conf tid"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Automatisk sluk tidtager"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Vinkel niveau"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Eksponeringsforsinkelsestilstand"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Langtidseksponeringsstøjreduktion"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "LCD belysning"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Høj ISO støjreduktion"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Tips på skærm"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Kunstnernavn"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Ophavsretsinformation"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Modeler blitz"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Manueltilstand bracketing"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Automatisk sammensætning udvælgelse"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "Nikon automatisk bracketing indstilling"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Centerknap optagetilstand"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Centerknap afspilletilstand"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Multivælger"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Fotoinformation. Afspilning"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Tilknytningsfunktion. Knap"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Tilpas kommando drejeskiver"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Blændeåbningsindstilling"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Knapper og drejeskiver"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Ingen CF-kort udløst"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Centerknap zoomforhold"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Funktionsknap 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Normal AF til"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Rens billedsensor"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Billedkommentar streng"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Billedkommentar tilladt"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Billedrotation"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Manuel indstilling objektiv nummer"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Filmskærm størrelse"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Filmlyd"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Film mikrofon"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Film kortport"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Sluk skærm forsinkelse"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Bracketing til"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Eksponerings bracketing skridt"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Eksponerings bracketing program"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Autoeksponerings bracketing tælling"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Hvidbalance Bracketing skridt"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Hvidbalance Bracketing program"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Objektiv ID"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Objektivslags"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Objektivtype"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Min. brændvidde"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Maks. brændvidde"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Maks. blændeåbning ved min. brændvidde"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Maks. blændeåbning ved max. brændvidde"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Søger ISO visning"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Automatisk sluk billede"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Automatisk sluk menu"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Automatisk sluk information"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Selvudløser optagelsenummer"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Vigneteringskontrol"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Nikon eksponeringstid"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Advarselsstatus"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD-topindstilling 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Aktiv AF-sensor"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Eksponeringsmåler"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "USB-hastighed"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "CCD-serienummer"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Gruppe PTN type"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Blænde-tal lås"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Eksponeringsblændelås"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "TV lås indstilling"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "AV lås indstilling"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Illum indstilling"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Fokuseringspunkt lyst"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Ekstern blitz monteret"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Ekstern blitz-status"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Ekstern blitz-type"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Ekstern blitz-tilstand"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Ekstern blitz-kompensation"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "S/H udfylder effekt"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "S/H Skarphed"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "S/H Kontrast"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "S/H indstillingstype"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Plads 2 gem-tilstand"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Rå bit-tilstand"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Fluorescerende type"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Justering Farvetemperatur"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Indstil forvalgt 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Indstil forvalgt 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Indstil forvalgt 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Indstil forvalgt 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Indstil forvalgt 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Auto-fokuseringstilstand"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "AF hjælpelys"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Auto ISO P/A/DVP opsætning"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Søger gittervisning"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Blitz-tilstand fjernbetjener strøm"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Automatisk FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Advarsels skærm"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Battericelle type"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Automatisk-ISO øvre grænse"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Kontinuerlig hastighed høj"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Information Disp. indstilling"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Smugkig-knap"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Smugkig-knap 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "AEAF lås knap 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Indikator skærm"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Celle-type rækkefølge"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Bracketing rammer og skridt"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "LiveView tilstand"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Liveview Drev-tilstand"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "LiveView status"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "LiveView billedzoom forhold"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "LiveView forhindret tilstand"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Eksponeringsdisplay status"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Eksponeringsindikator status"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Informationsvindue fejlstatus"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Eksponeringsindikator oplysning"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Blitz MRepeat værdi"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Blitz MRepeat tælling"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Blitz MRepeat interval"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Active Pic Ctrl Item"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Change Pic Ctrl Item"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Kameraproducent"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7090
+#, fuzzy
+msgid "Release without SD card"
+msgstr "Frigør uden CF-kort"
+
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Billedkomprimering"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Sikker tid"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Enhedscertifikat"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Tilbagekaldelses info"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Synkroniseringspartner"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Enhedsvenligt navn"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Volumen niveau"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Enhedsikon"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Information for sessionsopstart"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Registreret enhedstype"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Afspilningshastighed"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Afspilningsobjekt"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Afspilnings indholdsindeks"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Afspilningsposition"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "PlaysForSure ID"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Kvalitet"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Udløse-tilstand"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Fokuseringsområder"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "AE lås"
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Fokuseringspunkt"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Billedstørrelse"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Farvetemperatur"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "Fokusstatus"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr "Objekter i hukommelse"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Eksponeringstid"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "AB-filter"
 
 # Det må være dette:
 # https://en.wikipedia.org/wiki/Still_frame
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Enkeltbillede"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Nært 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "AF område punkt"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Dato og tid"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "Rå + JPEG basis"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Hvidglødende"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Manuel fokusering"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automatisk makro (tæt-på)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Centervægtet gennemsnit"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Center-spot"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Automatisk blitz"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatisk rødøje-reduktion"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Rødøje udfyldning"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Motordrev"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Timer + Fjernbetjening"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Kun AF lås"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Blitz lås"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Nulstil fokuspunkt til centeret"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Oplys aktivt fokuspunkt"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Ubrugt"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRam"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "LCD baglys"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "LCD baglys og informations skærm"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Mørkt på lyst"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Lyst på mørkt"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Lithium Ion"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nickel hydride"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nickel cadmium"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkalium manganese"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Advarselsniveau 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Nødsituation"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Advarselsniveau 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Økonomi"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Superfin"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Rødøje reduktion"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Lav-hastigheds synkronisering"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatisk + rødøje-reduktion"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Til + rødøje-reduktion"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Fjern-visning"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Højhastighedslukker"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Lavhastighedslukker"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Nat-viser"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Gråskala"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Panoreringsfokusering"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Enkelt-billedsfotografering"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Kontinuerlig fotografering"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Tidsindstillet (enkelt) fotografering"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Kontinuerlig lavhastighedsfotografering"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Kontinuerlig højhastighedsfotografering"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Glat"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Centervægtet måling"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Spotmåling"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Centervægtet måling"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Evaluerende måling"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Del måling"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Centervægtet gennemsnitsmåling"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Spotmåling låst med AF-ramme"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Multi-spotmåling"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Lavhastighedslukkerfunktion ikke tilgængelig"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Lav 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Høj 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Øvre 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Øvre 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Standard fremkaldelsesparametre"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Fremkaldelsesparameter 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Fremkaldelsesparameter 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Fremkaldelsesparameter 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MlSpotPosCenter"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MlSpotPosAfLink"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Medie kort"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Medie kort gruppe"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Windows billedeformat"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Lyd ikke defineret"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Audible.com Codec"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Samsung afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Video ikke defineret"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Samling ikke defineret"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Abstrakt multimediealbum"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Abstrakt billedalbum"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Abstrakt lydalbum"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Abstrakt videoalbum"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Abstrakt lyd-video afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Abstrakt kontaktgruppe"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Abstrakt beskedmappe"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Abstrakt nummereret produktion"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Abstrakt lyd afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Abstrakt video afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstrakt Mediacast"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "WPL afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "M3U afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "MPL afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "ASX afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "PLS afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Ikke-defineret dokument"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstrakt dokument"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "XML dokument"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word dokument"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "MHT kompileret HTML dokument"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Microsoft Excel regneark (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Ikke-defineret besked"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstrakt besked"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Ikke-defineret kontakt"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstrakt kontakt"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vKort2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vKort3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Ikke-defineret kalenderpunkt"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstrakt kalenderpunkt"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vKalender1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vKalender2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Ikke-defineret Windows eksekverbar"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Media Cast"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sektion"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Ukendt(%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Hent enhedsinformation"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Åbn session"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Luk session"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Hent lagring-id'er"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Hent lagringsinformation"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Hent antallet af objekter"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Hent objekthåndtag"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Hent objektinformation"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Hent objekt"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Hent miniature"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Slet objekt"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Send objektinformation"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Send objekt"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Initialiser optagelse"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
-msgstr "Gemningsformat"
+msgstr "Lagerformat"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Nulstil enhed"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Selvtest enhed"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Sæt objektbeskyttelse"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Sluk for enhed"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Hent enhedsengenskabsbeskrivelse"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
-msgstr "Hent enheds-engenskabs-værdi"
+msgstr "Hent enhedsengenskabsværdi"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Sæt enhedsengenskabsværdi"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Nulstil enhedsengenskabsværdi"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Afbryd åben optagelse"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Flyt objekt"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Kopier objekt"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Hent partielt objekt"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Initier åben optagelse"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Start optælling af håndtag"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Optæl håndtag"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Stop optælling af håndtag"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Hent leverandørudvidelseskort"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Hent leverandørenhedsinformation"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Hent billedobjekt med ny størrelse"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Hent filsystemmanifest"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Hent strøminformation"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Hent strøm"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Hent understøttede objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Hent beskrivelse af objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Hent værdi af objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Sæt værdi af objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Hent liste for objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Sæt liste for objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Hent indbyrdes afhængige egenskabsbeskrivelser"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Send liste for objektegenskaber"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Hent objektreferencer"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Sæt objektreferencer"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Opdater enhedens firmware"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Spring videre til næste position i afspilningsliste"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Hent sikkertid udfordring"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Hent sikkertid svar"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Sæt licenssvar"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Hent synkroniseringsliste"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Send forespørgsel til måler-udfordring"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Hent måler-udfordring"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Hent målersvar"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Tøm datalager"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Hent licenstilstand"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Send WMDRM-PD kommando"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Send WMDRM-PD forespørgsel"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Rapportér tilføjede/slettede punkter"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Rapportér hentede punkter"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Hent spillelistetyper der kan overføres"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Send WMDRM-PD programforespørgsel"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Hent WMDRM-PD programsvar"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Tillad stoler-på-filer operationer"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Afbryd stoler-på-filer operationer"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Afslut stoler-på-programmer session"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Åbn medie session"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Luk medie session"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Hent næste datablok"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Sæt nuværende tidsposition"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Send registreringsforespørgsel"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Hent registreringssvar"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Hent nærheds-udfordring"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Send nærheds-svar"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Send WMDRM-ND licens forespørgsel"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Hent WMDRM-ND licenssvar"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Behandl WFC objekt"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Hent partielt objekt (64-bit forskydning)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Send partielt objekt"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Afskær objekt"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Begynd redigering af objekt"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Afslut redigering af objekt"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Ukendt PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Ukendt VendorExtensionID"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Ukendt værdi"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Henter film ..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Henter lyd ..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Henter EXIF-data ..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Ingen EXIF-data tilgængelige for %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Kunne ikke slette filen."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Kunne ikke fjerne kataloget."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Kunne ikke oprette kataloget."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Version: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTC status: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Kameratid: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Kamera-id: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Intet SD-kort isat.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD-kort ID: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Billeder i kamera: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD-hukommelse: %d MB total, %d MB fri.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Intern hukommelse: %d MB total, %d MB fri.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10487,7 +12927,7 @@
 "Omvendt-beregnet ved hjælp af  USB Snoopy,\n"
 "et kig på firmware-update billede og vilde gæt.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10499,12 +12939,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "baseret på Bob Paauwe's driver\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "ukendt (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10513,188 +12953,188 @@
 "Model: %s\n"
 "Hukommelse: %d byte af %d tilgængelig"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Udendørs"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maksimal"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimal"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Tegn"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Lyd"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Billede og lyd"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Tegn og lyd"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Generel"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Ophavsret (maks. 20 tegn)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Billeder"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Hvidniveau"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Optagetilstand"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Komprimering"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Hastigheden %i er ikke understøttet!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Forventede %i, fik %i. Rapportér denne fejl til %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Forventede %i byte, fik %i. Rapportér denne fejl til %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Vi forventede 0x%x men modtog 0x%x. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Forkerte tegn (0x%x, 0x%x). Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Kameraet optaget. Hvis problemet fortsætter, kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Tidsgrænse overskredet endda efter 2 ekstra forsøg. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Kommunikationsfejl endda efter 2 ekstra forsøg. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Kameraet er i en forkert tilstand. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Kameraet accepterede ikke parametrene. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "En ukendt fejl opstod. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "Filnavnslængde må ikke overstige 12 tegn ('%s' er på %i tegn)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10706,108 +13146,108 @@
 "til gphoto2. Marcus Meissner <marcus@jet.franken.de> rettede og forbedrede "
 "porten."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Opløsning plus størrelse"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Dato og tid (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Blændeåbningsindstillinger"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Farvetilstand"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Rødøjereduktion"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Blitzindstillinger"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Vært strømspare (sekunder)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Kamera strømspare (sekunder)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Objektivtilstand"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreansk"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Engelsk"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Fransk"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Tysk"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italiensk"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japansk"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Spansk"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Billedeindstillinger"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10827,225 +13267,221 @@
 "  PhotoPC 3000z, hvis dit kamera opfører sig anderledes\n"
 "  send en mail til gphoto udvikler mailinglisten (på engelsk)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Intet hukommelseskort tilstede"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Kan ikke hente batterikapacitet"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Kameraets batteriniveau er for lavt (%d%%). Funktionen er afbrudt."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Kan ikke hente hvor meget hukommelse der er tilbage"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Kameraet afviste 3 gange at holde forbindelse åben."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Den første byte modtaget (0x%x) er ikke gyldig."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr "Overførsel af pakke tidsudløb selv efter %i forsøg. Kontakt %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Kunne ikke overføre pakke selv efter adskillelige forsøg."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Pakke blev afvist af kamera. Kontakt %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Kunne ikke sende pakke (fejlkode %i). Kontakt %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Overførsel tidsudløb selv efter 2 forsøg. Giver op..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Fik uventede resultater 0x%x. Kontakt %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Modtog uventet svar (%i). Kontakt %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Kunne ikke hente register %i. Kontakt %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "For mange forsøg fejlede."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Sender data..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr "rekursive kald er ikke understøttet af sierradriveren! Kontakt %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Kunne ikke hente streng-register %i. Kontakt %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Forventede 32 byte, fik %i. Kontakt %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Lukkerhastighed i mikrosekunder (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Lukkerhastighed (i sekunder)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "S/H"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Anti-rødøje"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Langsom-synkronisering"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontrast-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Lyshed+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Lyshed-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Billedejustering"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Blink"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED-tilstand"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Uendelig"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Smugkig-miniature"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Næste"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Forrige"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Procestilstand"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCD-lyshed"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD-autosluk (sekunder)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Centervægtet"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Spot-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Eksponeringsmåling"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (i millimeter)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "ingen"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "AE-lås"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Fiskeøje"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Vidvinkel"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Blandede eksponerings/objektiv indstillinger"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Automatisk eksponeringslås"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11075,7 +13511,7 @@
 "        Sæt kameraet i 'M' tilstand, for at\n"
 "        kunne indstille lukkerhastigheden.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11087,74 +13523,70 @@
 "    The download should function correctly.\n"
 msgstr ""
 "Nikon Coolpix 880:\n"
-"    Kamera konfiguration (præferencer) for dette\n"
+"    Kamerakonfiguration (præferencer) for dette\n"
 "    kamera er ikke fuldstændige, kontakt gphoto\n"
 "    udviklernes mail-liste, hvis du kan/vil bidrage\n"
 "    til/med denne driver\n"
 "\n"
-"    Hjemhentning skulle fungere korrekt.\n"
+"    Du kan hente konfigurationen.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Hvid tavle"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Sort tavle"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Farve- eller funktions-tilstand"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Langsom"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Anti-rødøje udfyldning"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluorescerende-1-hjem-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluorescerende-2-bord-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Fluorescerende-3-kontor-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Skumring"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Skærm"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD-tilstand"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digital zoom"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Fokuseringsposition"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Tidsformat"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11188,7 +13620,7 @@
 "    forbinde kameraet til PC'en igen, og skifte LCD til\n"
 "    'Slukket'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11217,7 +13649,7 @@
 "    alligevel, skal du forbinde kameraet til PC'en igen, og\n"
 "    ændre 'LCD' til 'Slukket'."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11235,116 +13667,121 @@
 msgstr ""
 "Standard Sierra driver:\n"
 "\n"
-"    Dette er standard sierra driver, den skulle\n"
-"    være i stand til at understøtte hjemhentning\n"
-"    og gennemsyn af billede på dit kamera.\n"
+"    Dette er standarddriveren for sierra, den skulle\n"
+"    være i stand til at understøtte at hente\n"
+"    og gennemse billeder på dit kamera.\n"
 "\n"
-"    Kamera konfiguration (eller præferencer)\n"
+"    Kamerakonfiguration (eller præferencer)\n"
 "    indstillinger er baseret på Olympus 3040,\n"
-"    og er givetvis ufuldstændig. Hvis du konstaterer,\n"
+"    og er givetvis ufuldstændige. Hvis du konstaterer,\n"
 "    at indstillingerne er i orden for dit kamera, eller du\n"
 "    kan bidrage med kode eller har en komplet\n"
-"    konfiguration, kontakt udvikler mail-listen.\n"
+"    konfiguration, kontakt udviklernes postliste.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (ukendt)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Filen der skal oplægges har nul-længde"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Ikke tilstrækkelig hukommelse på kortet"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kan ikke hente navnet på mappen hvor billederne er"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
-msgstr "Oplægning er kun understøttet til '%s' mappen"
+msgstr "Overførsel er kun understøttet til »%s«-mappen"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Bedst"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (ukendt)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Lukkerhastighed (mikrosekunder, 0 auto)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Sort/hvid"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Hvid tavle"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Sort tavle"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Lyshed/kontrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Lyst+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Lyst-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Skylight"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Uendelig/fiskeøje"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Spotmålingstilstand"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Autosluk (vært)(i sekunder)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11352,12 +13789,12 @@
 "Hvor lang tid vil der gå før kameraet slukker, når det er tilsluttet en "
 "computer?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Autosluk (felt)(i sekunder)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11365,114 +13802,114 @@
 "Hvor lang tid vil der gå før kameraet slukker, når det ikke er tilsluttet en "
 "computer?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD-autosluk (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Skud-indstillinger"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "farve"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "sort/hvid"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Bemærk: intet hukommelseskort tilstede, nogle værdier er muligvis forkerte\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Kameramodel: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Serienummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Software rev.: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Rammer taget: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Rammer tilbage: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Batteriliv: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Hukommelse tilbage: %i byte\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Dato: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Ingen kamera manual tilgængelig.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11493,7 +13930,7 @@
 "  et PhotoPC 3000z. Hvis dit kamera opfører sig\n"
 "  anderledes, send en mail til %s (på engelsk)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11527,7 +13964,7 @@
 "    forbinde kameraet til PC'en igen, og skifte LCD til\n"
 "    'Slukket'."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11547,12 +13984,7 @@
 "for brug af deres Olympus C-3030Z for USB\n"
 "understøttelsesimplementation."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (ukendt)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11562,11 +13994,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Kunne ikke tilføje USB opsætning"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11586,7 +14018,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Driver for tilgang til Smal Ultrapocket kamera, og OEM versioner (slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11601,7 +14033,7 @@
 "Sonix kamera.\n"
 "Der er %i billeder i det.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11627,7 +14059,7 @@
 "Miniaturer for AVI'er er still-billeder dannet fra første ramme.\n"
 "Enkeltbilleder kan ikke slettes, medmindre det er det sidste.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11635,7 +14067,7 @@
 "Sonix kamera bibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11649,7 +14081,7 @@
 "Ken-ichi Hayashi\n"
 "Gphoto2 port ved Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11661,7 +14093,7 @@
 "Oprindeligt skrevet af Mark Davies <mdavies@dial.pipex.com>\n"
 "gPhoto2-port ved Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11674,12 +14106,12 @@
 "Hukommelse i alt: %ikB\n"
 "Ledig hukommelse:  %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Firmware revision: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11687,7 +14119,7 @@
 "Soundvision-driver\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11696,7 +14128,7 @@
 "FLASH:\n"
 " Filer: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11713,7 +14145,7 @@
 "Område brugt: %8d\n"
 "Ledigt område: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x bibliotek v"
 
@@ -11751,24 +14183,24 @@
 "specify from which clip they came. Thus, you may freely \n"
 "choose to save clip frames in separate directories. or not.\n"
 msgstr ""
-"For kameraer med S&Q-Technologies chip.\n"
+"For kameraer med S&Q-Technologies-chip.\n"
 "Skulle fungere med gtkam. Billeder gemmes i PPM-format.\n"
 "\n"
 "Alle kendte S&Q-kameraer har to opløsningsindstillinger. Hvad\n"
-"det er, afhænger af det bestemte kamera.\n"
+"denne er, afhænger af kameraet.\n"
 "Nogle af disse kameraer tillader sletning af alle billeder. Men de fleste "
 "gør ikke.\n"
-"Oplægning af data til kameraet er ikke understøttet.\n"
+"Overførsel af data til kameraet er ikke understøttet.\n"
 "Den billedkomprimeringstilstand der er på mange af S&Q-kameraerne\n"
 "er understøttet til en vis grad.\n"
 "Hvis der er videoklip på kameraet, vises disse som undermapper.\n"
-"Gtkam hjemhenter disse seperat. Når der en filmklip på kameraet, vises\n"
+"Gtkam henter disse hver for sig. Når der er et filmklip på kameraet, vises\n"
 "en lille trekant foran navnet på kameraet. Hvis der ikke vises et\n"
 "katalog, tryk på trekanten for at få dem vist. Klik på en mappe for\n"
-"at gå ind i det og se de rammer der er der, eller for at hjemhente dem.\n"
-"Rammerne hjemhentes som separate billeder, med specielle navne, der\n"
+"at gå ind i den og se de rammer der er der, eller for at hente dem.\n"
+"Rammerne hentes som separate billeder, med specielle navne, der\n"
 "specificerer hvilket filmklip de stammer fra. Du kan frit vælge, om du\n"
-"vil gemme rammerne i separate kataloger, eller ikke.\n"
+"vil gemme rammerne i separate mapper, eller ikke.\n"
 
 #: camlibs/sq905/library.c:176
 msgid ""
@@ -11778,12 +14210,12 @@
 "sq905 almen driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Din USB-billedramme har et ST2205-chipsæt\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11793,7 +14225,7 @@
 "Gphoto driveren til disse enheder tillader dig at hente,\n"
 "sende til, og slette billeder på billedrammen."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11805,11 +14237,7 @@
 "Denne driver tillader dig at hente, sende til,\n"
 "og slette billeder på billedrammen."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientering"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11821,110 +14249,110 @@
 "Driver for kameraer der bruger en STV0674 processor ASIC.\n"
 "Protokol omvendt-beregnet ved hjælp af SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Forkert eksponering (givetvis for lidt lys)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Information om STV0680 baserede kameraer:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Firmwarerevision: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC-revision: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Sensor-ID: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Kameraet er konfigureret for lys, der flimrer med %dHz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Hukommelse i kamera: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Kamera understøttet miniaturer.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Kamera understøtter video.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Kamerabilleder er monokrome.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Kamera har hukommelse.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Kamera understøtter videoformaterne: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Fremstiller ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Produkt ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Antal billeder: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Maksimalt antal billeder: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Billedbredde: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Billedhøjde: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Billedstørrelse: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Miniaturebredde: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Miniaturehøjde: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Miniaturestørrelse: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11940,12 +14368,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Udvidet til Aiptek PenCam og andre STM USB Dual-mode kameraer."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Henter information om %i filer..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11957,19 +14385,19 @@
 "Send bugreporter og kommentarer.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z er kun USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Driver indstillinger"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Turbo-tilstand"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11981,12 +14409,12 @@
 "Bibliotek til hentning / sending af filer fra en Topfield PVR.\n"
 "Porteret fra puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Henter %s ..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -11996,39 +14424,68 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 driver.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Din USB-billedramme har et ST2205-chipsæt\n"
+
+#: camlibs/tp6801/library.c:93
+#, fuzzy
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"ST2205 baserede billedrammer kommer med forskellige opløsninger.\n"
+"Gphoto driveren til disse enheder tillader dig at hente,\n"
+"sende til, og slette billeder på billedrammen."
+
+#: camlibs/tp6801/library.c:106
+#, fuzzy
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"ST2205 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Denne driver tillader dig at hente, sende til,\n"
+"og slette billeder på billedrammen."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "Intern fejl ved søgning efter camlibs. (stinavne for lange?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Henter kameradrivere fra '%s'..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Der opstod en fejl i IO-biblioteket ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Kunne ikke finde noget kamera"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Kunne ikke finde noget kamera i port %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Du skal angive en port før du initialiserer kameraet."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Kunne ikke indlæse nødvendig kameradriver '%s' (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Kameradriver '%s' mangler 'camera_init' funktionen."
@@ -12066,12 +14523,12 @@
 msgid "This camera can not capture previews."
 msgstr "Kameraet kan ikke optage smugkig."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Stien '%s' er ikke absolut."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12080,22 +14537,22 @@
 "Du har prøvet at slette '%s' fra mappen '%s', men filsystemet understøtter "
 "ikke sletning af filer."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Der er stadig undermapper i mappen '%s/%s' som du prøver at fjerne."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Der er stadig filer i mappen '%s/%s' som du prøver at fjerne."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet understøtter ikke oplægning af filer."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12103,112 +14560,132 @@
 "Mappen '%s' indeholder kun %i filer, men du efterspurgte en fil med nummer "
 "%i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Filen '%s' kunne ikke findes i mappe '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunne ikke finde filen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet understøtter ikke hentning af filer"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ukendt filtype %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Filsystemet understøtter ikke hentning af filinformationer"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Filsystemet understøtter ikke indstilling af filinformationer"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivebeskyttede filattributter som bredde og højde kan ikke ændres."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
-msgstr "Filsystemet understøtter ikke hentning af gemningsinformationer"
+msgstr "Filsystemet understøtter ikke indhentelse af lagringsinformationer"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Ødelagte data"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Fil eksisterer"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Ukendt model"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Kataloget blev ikke fundet"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
-msgstr "Kataloget eksisterer"
+msgstr "Mappen findes"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "I/O i fremgang"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Sti ikke absolut"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Proces afbrudt"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Kameraet kunne ikke fuldføre processen"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "OS-fejl i kamerakommunikation"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Ikke tilstrækkeligt fri plads"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
-msgstr "Ukendt kamerabiblioteks fejl"
+msgstr "Ukendt kamerabiblioteksfejl"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#~ msgid "Canon EOS Trigger Capture failed: 0x%x"
-#~ msgstr "Canon EOS-udløseroptagelse fejlede: 0x%x"
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Ukendt værdi %04d"
+
+#, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "%d mange-rammers støjreduktion"
+
+#~ msgid "Custom WB 2"
+#~ msgstr "Tilpasset WB 2"
+
+#~ msgid "Custom WB 3"
+#~ msgstr "Tilpasset WB 3"
+
+#~ msgid "Custom WB 4"
+#~ msgstr "Tilpasset WB 4"
+
+#~ msgid "Custom WB 5"
+#~ msgstr "Tilpasset WB 5"
+
+#~ msgid "Unknown Event"
+#~ msgstr "Ukendt hændelse"
 
-#~ msgid "%sCanon EOS Shutter Button"
-#~ msgstr "%sCanon EOS-lukkerknap"
+#~ msgid "Now value is not in enumeration."
+#~ msgstr "Nuværende værdi er ikke i optællingen."
 
-#~ msgid "Initializing Camera"
-#~ msgstr "Initialisation af kamera"
+#~ msgid "Setting 4"
+#~ msgstr "Indstilling 4"
 
-#~ msgid "Flourescent-1-home-6700K"
-#~ msgstr "Fluorescerende-1-hjem-6700K"
+#~ msgid "Setting 5"
+#~ msgstr "Indstilling 5"
 
-#~ msgid "Flourescent-2-desk-5000K"
-#~ msgstr "Fluorescerende-2-bord-5000K"
+#~ msgid "Setting 6"
+#~ msgstr "Indstilling 6"
 
-#~ msgid "Flourescent-3-office-4200K"
-#~ msgstr "Fluorescerende-3-kontor-4200K"
+#~ msgid "Setting 7"
+#~ msgstr "Indstilling 7"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/de.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/de.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/de.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/de.po Changed

@@ -5,21 +5,21 @@
 #
 # Lutz Müller <lutz@users.sf.net>, 2000.
 # Colin Marquardt <colin@marquardt-home.de>, 2001, 2002.
-# Marcus Meissner <marcus@jet.franken.de>, 2003, 2004, 2005, 2006, 2007, 2008, 2009. 2010, 2011, 2012, 2013, 2014.
+# Marcus Meissner <marcus@jet.franken.de>, 2003, 2004, 2005, 2006, 2007, 2008, 2009. 2010, 2011, 2012, 2013, 2014, 2019, 2021.
 # Christian Kirbach <christian.kirbach@gmail.com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 master\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2015-10-03 23:37+0200\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
-"Language-Team: gnome-de <gnome-de@gnome.org>\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2021-10-31 11:54+0100\n"
+"Last-Translator: Marcus Meissner <marcus@jet.franken.de>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Lokalize 21.08.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -28,10 +28,10 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 msgstr ""
-"Adc65\n"
+"ireAdc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -40,12 +40,12 @@
 "Kamera scheint keinen CompactFlash Speicher zu benutzen.\n"
 "Dies wird derzeit noch nicht unterstützt.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "Kamera hat %d Bilder aufgenommen und benutzt CompactFlash Speicher.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -78,36 +78,45 @@
 "Generischer Aox Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Der USB-Bilderrahmen hat einen AX203 Chipsatz.\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
+"AX203 Bilderrahmen kommen mit einer Vielzahl von Auflösungen.\n"
+"Dieser gphoto2 Treiber erlaubt das herunterladen, hochladen und \n"
+"löschen von Bildern."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
 "This driver allows you to download, upload and delete pictures\n"
 "from the picture frame."
 msgstr ""
+"Treiber für AX203 Bilder Rahmen\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Dieser Treiber unterstützt das Hochladen, \n"
+"das Herunterladen und Löschen von Bildern."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Konfiguration des Bilderrahmens"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Synchronisiere Datum und Zeit des Rahmens mit dem PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -116,7 +125,7 @@
 "Anzahl der Bilder: %i\n"
 "Firmware-Version: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -140,26 +149,26 @@
 "Implementiert mit Hilfe von Dokumenten\n"
 "aus dem Web. Mit Erlaubnis von Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Konnte Ordner »%s« nicht anlegen."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Konnte Ordner »%s« nicht löschen."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "könnte Tasten nicht sperren."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*UNBEKANNT*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -168,7 +177,7 @@
 "canon_int_capture_image: erste canon_usb_list_all_dirs() fehlgeschlagen mit "
 "status %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -177,24 +186,24 @@
 "canon_int_capture_image: finalletzte canon_usb_list_all_dirs() "
 "fehlgeschlagen mit status %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Name »%s« (%li Zeichen) ist zu lang, maximal 30 Zeichen erlaubt."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Kleingeschriebene Buchstaben sind in %s nicht erlaubt."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: ERROR: erste Meldung zu kurz (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -202,26 +211,26 @@
 "canon_int_list_directory: Ende des Pakets erreicht als erstes Ordnerelement "
 "untersucht wurde"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: verkürzte Ordnerelemente gefunden"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Datei geschützt."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_get_info_func: ERROR: erste Meldung zu kurz (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Könnte JPEG Vorschaubild von Daten nicht ausziehen: keine Anfang/Ende"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Könnte JPEG Vorschaubild von Daten nicht ausziehen: Daten sind nicht JFIF"
@@ -231,23 +240,23 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL Parameter \"%s\" in %s, Zeile %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr "Kann den Porttypen %i aka 0x%x in %s Zeile %i nicht behandeln."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "Fataler Fehler: Initialier CRC Wert für Länge %d unbekannt.\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "Kann initialien CRC Wert nicht raten.\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -256,291 +265,302 @@
 "Warnung: CRC nicht verglichen (Länge %d, Wert 0x%04x) "
 "##########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Kompatibilitätsmodus"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Vorschau"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Vollbild"
 
 # Langzeitbelichtung?
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Langzeitbelichtung"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofokus: einmal"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofokus: kontinuierlich"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Autofokus: AI Fokus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Manueller Fokus"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Ton aus"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Ton an"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Blitz aus"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Blitz an"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Blitz automatisch"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manuell 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Entfernte Szene"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Schnelle Belichtung"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Langsame Belichtung"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Nachtlandschaft"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Graustufen"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portrait"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "S/W"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Pan Fokus"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Lebhaft"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Lange Auslösung "
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super Macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Gebüsch"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Innenraum"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Feuerwerk"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Strand"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Unterwasser"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Schnee"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Kinder und Tiere"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Nachtschnapschuss"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Digital Macro"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "MyColors"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Foto im Film"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Small Normal JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Small Fine JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Medium Normal JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Medium Fine JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Large Normal JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Large Fine JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + Small Normal JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + Small Fine JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + Medium Normal JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + Medium Fine JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + Large Normal JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + Large Fine JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -571,44 +591,44 @@
 "Wenn viele serielle Transmissionsfehler auftreten, probieren sie den Rechner "
 "so idle wie möglich zu haben (z.B. keine Plattenaktivität)\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera nicht verfügbar: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Schalte Kamera aus"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Fehler beim Aufnehmen des Bildes"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Konnte Plattennamen nicht holen: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Kein Grund verfügbar"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Konnte Platteninfo nicht holen: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Interne Fehler nr.1 in get_file_func() (%s Zeile %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Keine Tondatei für »%s« konnte gefunden werden."
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -619,35 +639,35 @@
 "  %11s bytes gesamt\n"
 "  %11s bytes verfügbar"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Netzadapter "
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "mit Batterie "
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "Energieversorgung OK"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "Energieversorgung nicht OK"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "nicht verfügbar: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (Zeit am PC %s%i Sekunden)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -674,7 +694,7 @@
 "\n"
 "Zeit: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -695,25 +715,25 @@
 "Weitere Verbesserungen von:Holger Klemm\n"
 "Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Fehler beim Löschen der Datei"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Fehler beim Löschen des zugehörigen Vorschaubildes"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Raten über 57600 sind mit dieser Kamera nicht für das Hochladen unterstützt"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Konnte keinen Laufwerksbuchstaben für das Flash-Laufwerk bekommen"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -721,377 +741,399 @@
 "Kann nicht Hochladen, kein freier Ordnername verfügbar!\n"
 "Der Ordnername 999CANON existiert und enthält eine Datei namens AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Konnte Ordner \\DCIM nicht anlegen."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Konnte Zielverzeichnis nicht anlegen."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- und Treiber-Konfiguration"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Kameraeinstellungen"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Eigentümername"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Aufnahme Grössen Klasse"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO-Empfindlichkeit"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Aufnahmemodus"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Belichtungszeit"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Blende"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Belichtungskorrektur"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Bild Format"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Fokusmodus"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Blitzmodus"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Ton"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Kameraaktionen"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Kamera Datum und Zeit mit dem PC synchronisieren"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Statusinformationen der Kamera"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Kameramodell"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Datum und Zeit"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Fehler"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Firmware-Version"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Netzanschluss"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Treiber"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Alle Dateien auflisten"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Dateinamen beim Hochladen beibehalten"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Kamera nicht verfügbar"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Eigentümername geändert"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "Konnte Eigentümernamen nicht ändern"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Aufnahmeart geändert"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Ungültige Aufnahmeart"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Ungültige ISO-Empfindlichkeit"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "ISO-Empfindlichkeit geändert"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "ISO-Empfindlichkeit konnte nicht geändert werden"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Ungültiger Aufnahmemodus"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Aufnahmemodus geändert"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Konnte Aufnahmemodus nicht ändern"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Ungültige Belichtungszeit"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Belichtungszeit geändert"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Konnte Belichtungszeit nicht ändern"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Ungültige Blende"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Blende geändert"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Konnte Blende nicht ändern"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Ungültige Belichtungskorrektur"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Belichtungskorrektur geändert"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Konnte Belichtungskorrektur nicht ändern"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Ungültiges Bildformat"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Bildformat geändert"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Konnte Bildformat nicht ändern"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Ungültiger Fokusmodus"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Fokusmodus geändert"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Konnte Fokusmodus nicht ändern"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Ungültiger Tonmodus"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Tonmodus geändert"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Konnte Tonmodus nicht ändern"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Zoomwert geändert"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Konnte Zoom nicht ändern"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Ungültiger Blitzmodus"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Blitzmodus geändert"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Konnte Blitzmodus nicht ändern"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "Zeit gesetzt"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "konnte Zeit nicht setzen"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Nichtunterstützter Port-Typ %i = 0x%x angegeben. Initialisierung nicht "
 "möglich."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Batterie leer, Kamera aus."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "Fehler: unerwartete Meldung"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "Fehler: Meldungsüberlauf"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "Fehler: aus der Reihe."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "Fehler: unerwarteter Pakettyp."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "Fehler: Meldungsformatfehler."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "Fehler: unerwartete Meldung2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Lade Bild hoch..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Hole Datei..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1099,7 +1141,7 @@
 "\"canon_serial_get_dirents: canon_serial_dialogue könnte Ordnerelemente "
 "nicht holen \""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1107,145 +1149,145 @@
 "canon_serial_get_dirents: Anfangend Ordnerelementepaket zu kurz (nur %i "
 "bytes)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 "canon_serial_get_dirents: %i Byte Arbeitsspeicher konnten nicht reserviert "
 "werden"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: Lesen eines weiteren Ordnereintrags schlug fehl"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Abgeschnittene Ordnereinträge erhalten"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: Zu viele Ordnerelemente, wir müssen in einem "
 "Teufelskreis geraten sein."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Könnte Größe des Ordnerelementspuffers nicht auf "
 "%i bytes verändern"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Fehler beim Ändern der Datenrate."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Protokoll zurücksetzen..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Kamera OK."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Nach Kamera suchen..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Versuche, Kamera zu kontaktieren..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Kommunikationsfehler 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Keine Antwort von Kamera"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Nicht erkannte Antwort"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Erkannte eine »%s« alias »%s«"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Unbekanntes Modell »%s«"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Fehlerhafter EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Kommunikationsfehler 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Kommunikationsfehler 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Ändere Datenrate... Warte..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Fehler beim Ändern der Datenrate"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Fehler beim Warten auf ACK, probiere weiter"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Fehler beim Warten auf ACK während der Initialisierung"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Mit Kamera verbunden"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FEHLER: eine Fatalfehler würde empfindet, kann nicht weitermachen"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FEHLER: %d ist zu groß"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Vorschaubild holen..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "UNBEKANNT"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Konnte Kamera nicht anfänglich kontaktieren."
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Kamera war schon aktiv"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Kamera wurde aufgeweckt"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Erste Kameraantwort %c/ nicht erkannt"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1254,7 +1296,7 @@
 "Stufe 2 der Kamerainitialisierung fehlgeschlagen: (»%s« beim Lesen von %i) "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1263,7 +1305,7 @@
 "Stufe 2 der Kamerainitialisierung fehlgeschlagen! (%i Bytes erhalten, %i "
 "erwartet) Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1272,7 +1314,7 @@
 "Stufe 3 der Kamerainitialisierung fehlgeschlagen: »%s« beim Lesen von %i. "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1281,7 +1323,7 @@
 "Stufe 3 der Kamerainitialisierung fehlgeschlagen! (%i erhalten, %i erwartet) "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1290,30 +1332,30 @@
 "Stufe 3 der Kamerainitialisierung fehlgeschlagen: %s beim Schreiben von %i. "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Stufe nr.4 fehlgeschlagen: %s beim Lesen von %i. Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Stufe 4 fehlgeschlagen! (%i erhalten, %i erwartet) Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera nicht bereit, mehrere »Identify camera«-Anfragen fehlgeschlagen: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera nicht bereit, get_battery-Anfrage fehlgeschlagen: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1322,20 +1364,20 @@
 "canon_usb_lock_keys: Unerwartete Länge von »lock_keys« erhalten (%i "
 "erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Unerwartete Länge erhalten (%i erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: Unerwartete Länge erhalten (%i erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1344,20 +1386,20 @@
 "canon_usb_get_body_id: Unerwartete Datenlänge erhalten (%i erhalten, %i "
 "erwartet)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Empfange Daten..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Speicherplatz fehlt: %d bytes benötigt."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fehlgeschlagen"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1366,22 +1408,22 @@
 "canon_usb_set_file_attributes: canon_usb_dialogue gibt Status 0x%08x von der "
 "Kamera zurück"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Konnte Daten vom Datei »%s« nicht holen"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Speicherplatz fehlt: %ld bytes benötigt."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Bildhochladung fehlgeschlagen."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1389,7 +1431,7 @@
 "Datei war zu groß. Möglicherweise müssen Sie ihre Kamera aus- und wieder "
 "einschalten, um weitere Dateien hochzuladen."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1397,7 +1439,7 @@
 msgstr ""
 "canon_usb_get_dirents: Nutzlast passt nicht in Puffer, '%.96s' (verkurzt)"
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1406,7 +1448,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue könnte keine Ordnerelemente "
 "holen, status %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1415,7 +1457,7 @@
 "canon_usb_list_all_dirs: Nutzlast passt nicht in Puffer, »%.96s« (verkurtzt) "
 "zu lang."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1424,27 +1466,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue könnte keine Ordnerelemente "
 "holen, status %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Erkannte eine »%s«."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Name »%s« passt mit keinem bekanntes Modell"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Bildtyp %d nicht unterstützt"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Bild %s ist vor Löschen geschützt."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1457,37 +1499,37 @@
 "<itojun@itojun.org>.\n"
 "Integration von QVplay durch Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Batterieladung: %1f Volt. Revision: %08x"
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Kamera-Konfiguration"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batterie"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Zu hell"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Zu dunkel"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1567,6 +1609,18 @@
 "supported cameras allow deletion of individual photos by use of a\n"
 "software command.\n"
 msgstr ""
+"Treiber für Kameras mit Chips von S&Q Technologies, die USB Vendor\n"
+"ID 0x2770 und Product ID 0x905C, 0x9050, 0x9051, 0x9052 oder 0x913D haben.\n"
+"Bilder werden im PPM Format gespeichert.\n"
+"\n"
+"Manche dieser Kameras erlauben das Löschen von Bilder, andere nicht.\n"
+"Keine dieser Kameras kann Fernaufnahm. Alle Kameras können Liveview\n"
+"Aufnahme. Wenn das Löschen aller Bilder nicht funktioniert, hat Liveview\n"
+"den Seiteneffekt des Löschens aller Bilder auf der Kamera.\n"
+"\n"
+"Auch das Hochladen von Dateien ist nicht unterstützt. Auch das Löschen von\n"
+"Einzelbildern ist nicht unterstützt, nur alle Bilder können auf einmal\n"
+"gelöscht werden.\n"
 
 #: camlibs/digigr8/library.c:170
 msgid ""
@@ -1576,16 +1630,16 @@
 "Generischer sq905C Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Bildtyp nicht unterstützt"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Anzahl der Bilder: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1593,7 +1647,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1601,24 +1655,24 @@
 "Nur das Wurzelverzeichnis wird unterstützt - Sie forderten eine Dateiliste "
 "für Ordner »%s«."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problem beim Holen der Anzahl der Bilder"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problem beim Holen der Bildinformation"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Aufnahmetyp nicht unterstützt"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (Batterie ist zu %d%% voll)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1628,89 +1682,90 @@
 "Resolution is set to %s.\n"
 "Camera is %s powered %s.\n"
 msgstr ""
-"Dimera 3500 Ver. %s %d/%d %d:%d.\n"
-"%d Bilder von etwa %d (hohe Aufl.) oder %d (niedrige Aufl.).\n"
+"Dimera 3500 Version %s %d/%d %d:%d.\n"
+"%d Bilder von etwa %d (hohe Auflösung) oder %d (niedrige Auflösung).\n"
 "Kamera-Features: %s, %s, %s, %s.\n"
 "Blitz ist %s, ist %s und %s.\n"
 "Auflösung ist auf %s gesetzt.\n"
 "Kamera wird %s-betrieben%s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Blitz"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Kein Blitz"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dual-Iris"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Keine Dual-Iris"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Auflösungsumschaltung"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Keine Auflösungsumschaltung"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Keine Powerlampe"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "An"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "Aus"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "Bereit"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Nicht bereit"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "Im Füllmodus"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Nicht im Füllmodus"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "niedrig (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "hoch (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "extern"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "intern"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1728,7 +1783,7 @@
 "oder automatisch von der Aufnahmevorschau-Funktion gesetzt werden.\n"
 "* Die Bildqualität ist im Moment geringer als sie sein könnte.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1758,209 +1813,338 @@
 "     Informationen über Protokoll und Rohbildformat,\n"
 "     gphoto2-Portierung\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problem beim Lesen des Bildes vom Speicher"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Kein Speicherplatz vorhanden"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Lade Bild herunter..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problem beim Herunterladen des Bildes"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Benutzerabbruch beim Herunterladen"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problem bei der Aufnahme eines Live-Bildes"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Belichtung"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatische Belichtungskorrektur in der Vorschau"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Belichtungswert in der Vorschau"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Automatischer Blitz bei Aufnahme"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problem beim Öffnen des Ports"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problem beim Kamera-Reset"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problem beim Setzen der Kameradatenrate"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Sieht wie ein Modem aus, nicht wie eine Kamera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Liste Dateien in »%s«..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
-msgstr "Liste Ordnerse in »%s«..."
+msgstr "Liste Ordner in »%s«..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Konnte keine Informationen über »%s« bekommen (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Konnte keine Informationen über »%s« in »%s« bekommen (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Konnte die Zeit von Datei »%s« in »%s« nicht ändern (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Konnte »%s« nicht öffnen."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Der \"Kamera\" Ordnermodus erlaubt es Ihnen, \n"
 "Bilder auf der Festplatte zu indexieren."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Ordner-Modus - geschrieben von Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Konnte die Datei »%s« in Ordner »%s« nicht löschen (Fehler: %i:%s)."
 
-#: camlibs/enigma13/enigma13.c:69
-#, fuzzy
+#: camlibs/docupen/docupen.c:155
+msgid "Scanner Profile Configuration"
+msgstr "Scanner Profil Konfiguration"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+msgid "Mono mode"
+msgstr "Schwarzweiß Modus"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr "Tiefe"
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr "Schwarz/weiß (b/w)"
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr "Grau (4bpp)"
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr "Grau (8bpp)"
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+msgid "Lo Resolution"
+msgstr "Niedrige Auflösung"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr "100 DPI"
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr "200 DPI"
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+msgid "Hi Resolution"
+msgstr "Hohe Auflösung"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr "400 DPI"
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+msgid "Color Document mode"
+msgstr "Farbdokument Modus"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr "NQ (12bpp)"
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+msgid "Color Photo mode"
+msgstr "Farbfoto Modus"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr "HQ (24 bpp)"
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+"Docupen Scanner kann keine einzelnen Bilder herunterladen oder löschen,\n"
+"sondern nur alle auf einmal. Als Workaround wird eine Cache Datei benutzt\n"
+"die den Scanner Speicher zwischenspeichert. Dieser Cache wird durch jeden\n"
+"Download befüllt, so das der Download des ersten Bildes sehr lange dauern "
+"wird,\n"
+"wenn der Cache entweder leer oder ungültig ist. Der Cache wird verworfen, "
+"wenn\n"
+"der benutzte Speicher im Scanner und die Cache Größe nicht mehr "
+"übereinstimmen.\n"
+"Der Cache befindet ist in ~/.cache/docupen-SERIAL.bin\n"
+"\n"
+"Der Scanner hat eine sehr kurze Auto-Power-Down Zeit (8 Sekunden), auch "
+"wenn\n"
+"er an USB angebunden ist. Das heißt er muss vor jeder gPhoto2 Operation "
+"angeschaltet\n"
+"werden, und in manchen Situationen erfordern das man Knöpfe drückt um\n"
+"das Abschalten zu verhindern."
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+"DocuPen RC800 Treiber\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"basierend auf Docupen Tools von Florian Heinz <fh@cronon-ag.de>"
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
-"Download Programm f?r die Digital Dream Enigma 1.3 durch "
-"<olivier@aixmarseille.com>, angepaßt vom spca50x Treiber. Danke, spca50x "
+"Download Programm für die Digital Dream Enigma 1.3 durch "
+"<olivier@aixmarseille.com>, angepasst vom spca50x Treiber. Danke, spca50x "
 "Team, es war einfach den Treiber auf diese Kamera zu portieren!"
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Die Kamera sendete nur %i Bytes, aber wenigstens %i werden benötigt."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Konnte Kamera nicht kontaktieren."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Unerwartete Daten erhalten (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Falsche Escape Sequenz: erwartet 0x%02x, erhalten 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Falsche Daten - erhalten 0x%02x, erwartet 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Falsche Daten - erhalten 0x%02x, erwartet 0x%02x oder 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Falsche Checksumme - erhalten 0x%02x, erwartet 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Die Kamera hat das Kommando nicht akzeptiert."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Kamera hat sich selbst zurückgesetzt."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kamera hat unerwartetes Byte 0x%02x geschickt."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Lade herunter..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
-msgstr "Konnte nicht %i Bytes für den Download des Thumbnails anfordern."
+msgstr "Konnte nicht %i Bytes für den Download der Vorschau anfordern."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Konnte nicht %i Bytes für den Download des Bildes anfordern."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Die Kamera hat »%s« nicht als Dateinamen akzeptiert."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Konnte Upload nicht initialisieren (Kamera antwortete mit 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Die Kamera unterstützt die Geschwindigkeit %i nicht."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Konnte die Baudrate nicht auf %i setzen (Kamera antwortete mit %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1968,36 +2152,36 @@
 "Matthew G. Martin\n"
 "Basierend auf fujiplay Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Bitrate %ld wird nicht unterstützt."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Konfiguration der FUJI Kamera."
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Datum und Zeit"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Version: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modell:"
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Verfügbarer Speicher:"
 
@@ -2015,21 +2199,22 @@
 "Till Adam <till@adam-lilienthal.de>\n"
 "Jérôme Lodewyck <jerome.lodewyck@ens.fr>\n"
 "Unterstützung für die Mustek gSmart 300-Digitalkameras, basierend auf\n"
-"verschiedenen anderen gphoto2-Bibliotheken und den Spezifikationen, die\n"
+"verschiedenen anderen gPhoto2-Bibliotheken und den Spezifikationen, die\n"
 "freundlicherweise von Mustek zur Verfügung gestellt wurde.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
-"Nichtunterstützter Porttyp: %d. Dieser Treiber unterstützt nur USB-Kameras.\n"
+"Nicht unterstützter Port Typ: %d. Dieser Treiber unterstützt nur USB-"
+"Kameras.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Konnte Kamera nicht zurücksetzen.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2038,7 +2223,7 @@
 "Diese Kamera kann nur die jeweils letzte Datei löschen. In diesem Fall ist "
 "dies Datei »%s«."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2053,7 +2238,7 @@
 "Freie Bilder auf der Karte: %d\n"
 "Batterie Status: %d %%"
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2064,9 +2249,9 @@
 "hp215\n"
 "Marcus Meißner <marcus@jet.franken.de>\n"
 "Treiber für die HP Photosmart 215 Kamera.\n"
-"Entwickelt auf Basis des hp215 Programmes.\n"
-"Dieser Treiber erlaubt Download von Bildern und Previews, sowie das Löschen "
-"von Bildern.\n"
+"Entwickelt auf Basis des hp215 Programms.\n"
+"Dieser Treiber erlaubt Download von Bildern und Vorschauen, sowie das "
+"Löschen von Bildern.\n"
 
 #: camlibs/iclick/library.c:104
 #, c-format
@@ -2104,25 +2289,25 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
 # Haesslich Colin
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Aufgenommene Bilder: %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam-Bibliothek v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Daten herunterladen..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Vorschaubild herunterladen..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2141,7 +2326,7 @@
 "\n"
 "heruntergeladen werden.\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2153,31 +2338,31 @@
 "Treiber für die Jenoptik JD11-Kamera.\n"
 "Protokoll mit WINE und IDA rückentwickelt."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "JD11 Konfiguration"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Weitere Einstellungen"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Belichtungszeit bei Langzeitbelichtung"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Farbeinstellungen"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rot"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Grün"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Blau"
 
@@ -2251,11 +2436,11 @@
 "jl2005bcd Kamera Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "CompactFlash-Karte"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2266,7 +2451,7 @@
 "Ansehen der Kamerabilder benötigen Sie das \"kdc2tiff\"-Programm von http://"
 "kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2277,13 +2462,13 @@
 "Scott Fritzinger <scottf@gphoto.net>\n"
 "(aufgrund öffentlichen Interesses)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Hole Daten..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Warte auf Beendigung..."
 
@@ -2296,7 +2481,8 @@
 msgstr "Dateityp"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2309,7 +2495,7 @@
 msgstr "Dateiauflösung"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2333,8 +2519,9 @@
 msgid "High (good quality)"
 msgstr "Hoch (gute Qualität)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Aufnahme"
 
@@ -2363,77 +2550,84 @@
 msgstr "Belichtungskorrektur"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Immer"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Keine"
 
@@ -2442,71 +2636,78 @@
 msgstr "Rote-Augen-Blitz"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "An"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Aus"
 
@@ -2522,7 +2723,7 @@
 msgid "Port speed"
 msgstr "Portgeschwindigkeit"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Albumname"
 
@@ -2741,58 +2942,58 @@
 "Kamerabibliothek für die Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parameter 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parameter 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parameter 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modell: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Firmware-Revision: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Batteriestatus: %s, Netzteil: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Anzahl der Bilder: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Verbleibender Platz: hoch: %d, mittel: %d, niedrig: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Speicherkartenstatus (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Aufnahmen, gesamt: %d; Blitz verwendet: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2806,45 +3007,46 @@
 "Bibliothek für die Kameras Kodak DC240, DC280, DC3400 und DC5000.\n"
 "Neu geschrieben und aktualisiert für gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Schwach"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Leer"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Nicht benutzt"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Benutzt"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Karte ist geöffnet"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Karte ist nicht geöffnet"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Karte ist nicht formatiert"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Keine Karte vorhanden"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2853,12 +3055,12 @@
 "eine \n"
 "aktive Operation. Bitte warten Sie, bis die aktuelle Operation beendet wurde."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "Kamera inaktiv für > 9 Sekunden, initialisiere neu.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2874,7 +3076,7 @@
 "dann muss sie neu initialisiert werden. Wenn die Kamera nicht reagiert, \n"
 "dann wählen Sie die Kamera erneut an. Dies initialisiert die Kamera neu."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2886,7 +3088,7 @@
 "\n"
 "Fragen und Kommentare werden geschätzt."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2895,7 +3097,7 @@
 "Ihre USB Kamera ist eine Kodaz EZ200.\n"
 "Anzahl Bilder= %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2903,107 +3105,107 @@
 "Kodak EZ200 Treiber\n"
 "Bucas Jean Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fehler beim fokussieren."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Iris Fehler."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Blitzfehler."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROM-Prüfsummenfehler."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Interner Fehler (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Interner Fehler (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Keine Karte vorhanden."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Speicherkarte nicht unterstützt."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Speicherkarte während Zugriff entnommen."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Bildnummer ungültig."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Speicherkarte kann nicht geschrieben werden."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Datei ist schreibgeschützt."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Kein freier Speicher auf der Karte."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Bild ist geschützt."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Nicht genügend Licht."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Autofokus Fehler."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Systemfehler."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Illegaler Parameter."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Kommando kann nicht abgebrochen werden."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Lokalisierungsdatei zu lang."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Lokalisierungsdaten fehlerhaft."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Nicht unterstütztes Kommando."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Ein anderes Kommando wird bereits ausgeführt."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Fehler in Kommandoreihenfolge."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3014,15 +3216,15 @@
 "berichten sie folgenden Fehlercode an %s mit weiteren Information, wie "
 "dieser Fehler aufgetreten ist: (0x%x, 0x%x). Vielen Dank!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Hole Dateiliste..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Teste verschiedene Datenraten..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3030,12 +3232,12 @@
 "Konnte nicht mit der Kamera verbinden. Bitte stellen Sie sicher, daß die "
 "Kamera mit dem Computer verbunden und angeschaltet ist."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i Bilder konnten nicht gelöscht werden, da sie geschützt sind"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3054,7 +3256,7 @@
 "Name: %s,\n"
 "Hersteller: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3064,399 +3266,408 @@
 "Lutz Müller <lutz@users.sourceforge.net>\n"
 "Unterstützung für alle Konica- und verschiedene HP-Kameras."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Lade Kamera-Konfiguration..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica-Konfiguration"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Dauerhafte Einstellungen"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Soll die Kamera einen Ton spielen, wenn ein Bild aufgenommen wird?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Selbstauslöserzeit"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Zeit für automatische Abschaltung"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Diashow-Intervall"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Niedrig (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Mittel (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Hoch (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Lokalisierung"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Sprache"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Keine ausgewählt"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV-Ausgabeformat"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "TV-Menü nicht anzeigen"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Datumsformat"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Monat/Tag/Jahr"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Tag/Monat/Jahr"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Jahr/Monat/Tag"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Sitzungsdauerhafte Einstellungen"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "An, Rote-Augen-Vermeidung"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Auto, Rote-Augen-Vermeidung"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fokus"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fest eingestellt"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Flüchtige Einstellungen"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Selbstauslöser"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Selbstauslöser (nur nächstes Bild)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Konnte Lokalisierungsdaten nicht in »%s« finden"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Lokalisierungsdatei zu lang!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
-msgstr "Dieses Varschaubild existiert nicht."
+msgstr "Dieses Vorschaubild existiert nicht."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Daten würden beschädigt."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
-msgstr ""
+msgstr "Ohne EXIF Unterstützung gebaut, keine Vorschau verfügbar."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Bildtyp %d wird nicht von dieser Kamera unterstützt!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Kann Bild Bild »%s« nicht löschen."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Kann nicht alle Bilder löschen."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Lade Bild hoch..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Kann dieses Bild nicht zur Kamera hochladen. Eine Fehler ist passiert."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Sie müssen im Aufnahmemodus sein, um Bilder aufzunehmen."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr "Kein Platz für weitere Aufnahmen vorhanden. Sie müssen Bilder löschen."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Kann kein neues Bild aufnehmen. Unbekannter Fehler."
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Keine Antwort von der Kamera."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Niedrig"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Mittel"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Hoch"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikonen"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Weißabgleich"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Büro"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Tageslicht"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Schärfe"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Schärfe"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Weich"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "farbig"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Hell"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Tiefe"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "schwarz/weiß"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Einzelbild"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "9 Bilder Reihe"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Datumsanzeige"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Überall"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Wiedergabemodus"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Aufnahmemodus"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Überall"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "Netz"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Aufnahme"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "TT/MM/JJJJ"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "JJJJ/MM/AA"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/TT/JJJJ"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3471,13 +3682,13 @@
 "Modell: %s\n"
 "Speicherkapazität: %i MB\n"
 "Stromversorgung: %s\n"
-"Autoabschaltszeit: %i min\n"
+"Autoabschaltzeit: %i min\n"
 "Mode: %s\n"
 "Bilder: %i/%i\n"
 "Datumsanzeige: %s\n"
 "Datum und Zeit: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3486,13 +3697,13 @@
 "http://www.ap2c.com\n"
 "Support for the french Konica Q-M150."
 msgstr ""
-"Konica Q-M150 Library\n"
+"Konica Q-M150 Treiber\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "Aurelien Croc (AP2C) <programming@ap2c.com>\n"
 "http://www.ap2c.com\n"
 "Ünterstützung für die französische Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3512,7 +3723,7 @@
 "haben, schicken Sie bitte eine E-Mail an die Autoren\n"
 "dieses Treibers.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3520,7 +3731,7 @@
 "Largan Treiber\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3531,7 +3742,7 @@
 "Firmware: %s\n"
 "Firmware Version: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3539,7 +3750,94 @@
 "Generischer Treiber für LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+msgid "Lumix Configuration"
+msgstr "Lumix Konfiguration"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr "Uhr"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr "Belichtungszeit"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Qualität"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Filmqualität"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Film"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Autofokus Modus"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr "Live View Größe"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr "Gerätename"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr "MF Hilfe"
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr "MF Hilfe Mag"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr "Ex Teleconv"
+
+#: camlibs/lumix/lumix.c:1217
+msgid "Lens"
+msgstr "Objektiv"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr "Fähigkeit"
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr "All Menü"
+
+#: camlibs/lumix/lumix.c:1244
+msgid "Cur Menu"
+msgstr "Derzeitiges Menü"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+"Lumix WiFi Treiber\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Verbindet libgphoto2 mit Lumix Kameras über WiFi\n"
+"mit dem HTTP Interface."
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3554,7 +3852,7 @@
 "Mars MR97310 Kamera.\n"
 "Es sind %i Fotos auf der Kamera.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3579,7 +3877,7 @@
 "einzelne Standbilder heruntergeladen.\n"
 "Weitere Details finden Sie in libgphoto2/camlibs/mars/README.mars.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3587,7 +3885,7 @@
 "Mars MR97310 Kamera Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3598,7 +3896,7 @@
 "Hardware-Revision:\t%s\n"
 "Firmware-Revision:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3625,61 +3923,63 @@
 "Karten-ID:\t\t%d\n"
 "Blitzmodus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Entfernt"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokal"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nein"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fein"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisch\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Erzwinge Blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Verbiete Blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ungültiger Wert ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3691,79 +3991,79 @@
 msgstr ""
 "Batteriepegel:\t\t%s\n"
 "Anzahl der Bilder:\t%d\n"
-"Min verbl. Kapazität:   %d\n"
+"Min verbleibende Kapazität:   %d\n"
 "Beschäftigt:\t\t%s\n"
 "Blitz ladend:\t\t%s\n"
 "Linsenstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Nicht voll"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Voll"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Nicht beschäftigt"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Ladend"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Bereit"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
-msgstr "Linsenrichtung paßt nicht zum Blitz\n"
+msgstr "Linsenrichtung passt nicht zum Blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Linse nicht angeschlossen\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Falscher Wert für Linsenstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kartenstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Schreibgeschützt"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Nicht passende Karte"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Falscher Wert für Kartenstatus %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3776,63 +4076,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Besonderen Dank an Minolta für die Spezifikation."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Blitz: Auto (Rote-Augen-Vermeidung)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Blitz: Auto"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Blitz: An (Rote-Augen-Vermeidung)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Blitz: An"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Blitz: Aus"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Blitz: undefiniert"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Zusammenfassung für Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "kein Status ausgegeben."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "CompactFlash-Karte erkannt\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
-msgstr "Keine CompactFlash-Karte erkann\n"
+msgstr "Keine CompactFlash-Karte erkannt\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Aktueller Modus: Kameramodus\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Aktueller Modus: Wiedergabemodus\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Batterien sind okay."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Batterien sind schwach."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3841,46 +4141,46 @@
 msgstr ""
 "Mustek MDC-800 gPhoto2-Bibliothek\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
-"Portiert auf gphoto2 von Marcus Meißner <marcus@jet.franken.de>\n"
+"Portiert auf gPhoto2 von Marcus Meißner <marcus@jet.franken.de>\n"
 "Unterstützt das serielle und das USB-Protokoll."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot-Bibliothek v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Schließe Verbindung zu Kamera."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Lade Bild »%s« herunter."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Lade Bild »%s« hoch."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
 "%i bytes."
 msgstr ""
-"Dateigröße ist %ld bytes. Größtmögliche Datei für das Hochladen ist %i bytes."
+"Dateigröße ist %ld Bytes. Größtmögliche Datei für das Hochladen ist %i Bytes."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Lade Bild hoch..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Lösche Bild »%s«."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3896,12 +4196,12 @@
 "Fredrik Roubert <roubert@df.lth.se> und\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Lade »%s« herunter."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3917,12 +4217,12 @@
 "Fredrik Roubert <roubert@df.lth.se> und\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Lade »%s« herunter..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3943,7 +4243,7 @@
 "640x480.  Das CCD, welches die Bilder von der Linse aufnimmt, hat\n"
 "nur 300K Pixel und produziert so nur Bilder mit niedriger Qualität."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3960,7 +4260,7 @@
 "Kamera bei Problemen nicht ordnungsgemäß ausgeschaltet wurde und die\n"
 "Datenrate über 9600 bps liegt."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3968,7 +4268,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-Treiber\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3979,7 +4279,7 @@
 " Freier Speicher: %8d Byte(s).\n"
 " Anzahl Dateien: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3991,11 +4291,11 @@
 "Autoren: Till Adam <till@adam-lilienthal.de>\n"
 "und: Miah Gregory <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Lade Datei herunter..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4003,32 +4303,135 @@
 "Creative PC-CAM600\n"
 " Autor: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Erwartete > %d Blöcke, erhielt %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: Erhielt Index %d, erwarteter Index > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: Return Wert war %d statt %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Erwartete %d Blöcke, erhielt %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr "pccam600_init: Unerwarteter Fehler: gp_port_read lieferte %d statt %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+"Pentax K DSLR Treiber.\n"
+"Benutzt Code von pktriggercord von Andras Salamon.\n"
+"Gesammelte Status Informationen:\n"
+"%s"
+
+#: camlibs/pentax/library.c:634
+msgid "Model"
+msgstr "Modell"
+
+#: camlibs/pentax/library.c:651
+#, c-format
+msgid "Unknown format %d"
+msgstr "Unbekanntes Format %d"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Bildgröße"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Bildqualität"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Blende bei Minimaler Brennweite"
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Blende bei maximaler Brennweite"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Aufnahme Modus"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr "GRÜN"
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr "SV"
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr "TAV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr "B"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr "X"
+
+#: camlibs/pentax/library.c:788
+#, c-format
+msgid "Unknown mode %d"
+msgstr "Unbekannter Modus %d"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+"Der Aufnahme Modus muss auf \"B\" geschaltet werden für Langzeitbelichtung."
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4037,17 +4440,17 @@
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 "Bibliothek zum Zugriff auf verschiedene Polaroid Kameras.\n"
-"Originalauthor Peter Desnoyers <pjd@fred.cambridge.ma.us>, angepaßt für "
-"gphoto2 durch Nathan Stenzel <nathanstenzel@users.sourceforge.net> und Lutz "
+"Originalautor Peter Desnoyers <pjd@fred.cambridge.ma.us>, angepasst für "
+"gPhoto2 durch Nathan Stenzel <nathanstenzel@users.sourceforge.net> und Lutz "
 "Müller <lutz@users.sf.net>.\n"
 "Polaroid 640SE Tests durch Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modell: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4055,116 +4458,104 @@
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>. Bugfixes by "
 "Marcus Meissner <marcus@jet.franken.de>."
 msgstr ""
-"Bibliothek zum Zugriff auf GrandTek 98x basierte Kameras.Original Author: "
-"Chris Byrne <adapt@ihug.co.nz>, Anpassung für gphoto2 durch Lutz Müller "
+"Bibliothek zum Zugriff auf GrandTek 98x basierte Kameras.Original Autor: "
+"Chris Byrne <adapt@ihug.co.nz>, Anpassung für gPhoto2 durch Lutz Müller "
 "<lutz@users.sf.net>. Verbesserung im Protokoll und Bild Nachbearbeitung für "
 "Jenoptik JD350e durch Michael Trawny <trawny99@users.sourceforge.net>. "
 "Bugfixes von Marcus Meißner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Bildqualität"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Bildgröße"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Blitzeinstellungen"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Autom. Abschaltung (in Minuten)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informationen"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fein"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
-msgstr "superfein"
+msgstr "super fein"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "an"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "aus"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "Wiedergabe"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "Aufnahme"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "Menü"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "Batterie "
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "Netzadapter "
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Unerwarteten Header erhalten (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Unerwartete Antwort erhalten"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Prüfsummenfehler"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Die Kamera hat das Kommando nicht akzeptiert."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Die Kamera sendete mehr Bytes als erwartet (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4173,7 +4564,7 @@
 "Forderte Informationen über Bild %i (= 0x%x) an, erhielt jedoch "
 "Informationen über Bild %i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4182,29 +4573,30 @@
 "%i Bytes eines unbekannten Bildformates erhalten. Bitte schreiben Sie an %s "
 "(auf Englisch) für Unterstützung."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
 "Mueller <lutz@users.sf.net>."
 msgstr ""
-"Bibliothek zum Zugriff auf die Polaroid DC700 Kamera. Originaler Author Ryan "
-"Lantzer <rlantzer@umr.edu> für gphoto 4.x. Angepaßt für gphoto2 durch Lutz "
+"Bibliothek zum Zugriff auf die Polaroid DC700 Kamera. Originaler Autor Ryan "
+"Lantzer <rlantzer@umr.edu> für gPhoto 4.x. Angepasst für gPhoto2 durch Lutz "
 "Müller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Wie lange soll es dauern, bis die Kamera abschaltet?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Bild"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4237,3545 +4629,5347 @@
 "Automat. Ausschalten: %i Minuten\n"
 "Stromquelle: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Der angeforderte Port-Typ (%i) wird von diesem Treiber nicht unterstützt."
 
-#: camlibs/ptp2/config.c:201
-msgid "CHDK did not leave recording mode."
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr "CHDK LUA Engine berichtet Fehler: %s"
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
 msgstr ""
+"PTP2 / CHDK Treiber\n"
+"(c) 2015-%d Marcus Meißner <marcus@jet.franken.de>.\n"
+"Dieser Treiber ist ein PTP Treiber der das CHDK  Addon für Canon Kameras "
+"unterstützt.\n"
+"\n"
+"Enjoy!"
+
+#: camlibs/ptp2/chdk.c:489
+#, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "CHDK %d,%d Status:\n"
+
+#: camlibs/ptp2/chdk.c:492
+#, c-format
+msgid "Mode: %d\n"
+msgstr "Modus: %d\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr "SV96: %d, ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "TV96: %d, Belichtungszeit: %f\n"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr "AV96: %d, Blende: %f\n"
+
+#: camlibs/ptp2/chdk.c:500
+#, c-format
+msgid "Focus: %d\n"
+msgstr "Fokus: %d\n"
+
+#: camlibs/ptp2/chdk.c:502
+#, c-format
+msgid "ISO Mode: %d\n"
+msgstr "ISO Modus: %d\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom: %d\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Optische Temperatur: %d\n"
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "CCD Temperatur: %d\n"
+
+#: camlibs/ptp2/chdk.c:511
+#, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Batterie Temperatur: %d\n"
+
+#: camlibs/ptp2/chdk.c:514
+#, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Blitzmodus: %d\n"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr "Raw ISO"
+
+#: camlibs/ptp2/chdk.c:1031
+msgid "Press"
+msgstr "Drücke"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Auslösen"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr "Klick"
+
+#: camlibs/ptp2/chdk.c:1034
+msgid "Capture Mode"
+msgstr "Bildaufnahme Modus"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "AE Lock"
+
+#: camlibs/ptp2/chdk.c:1036
+msgid "AF Lock"
+msgstr "AF Lock"
+
+#: camlibs/ptp2/chdk.c:1037
+msgid "MF Lock"
+msgstr "MF Lock"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Kameraausrichtung"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Bildeinstellungen"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr "CHDK hole liveview Daten fehlgeschlagen"
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr "CHDK get live data fehlgeschlagen: nur %d Byte zurückgeliefert"
+
+#: camlibs/ptp2/config.c:171
+msgid "CHDK did not leave recording mode."
+msgstr "CHDK hat den Aufnahme Modus nicht verlassen."
+
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Diese Canon Kamera unterstützt nicht den Canon Aufnahme Modus"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Unbekannter Wert %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Unbekannter Wert %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "unerwarteter Datentyp %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
-msgstr ""
+msgstr "Zielwert ist nicht in der Aufzählung."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
-msgstr ""
+msgstr "Sony konnte den neuen Wert nicht setzen, ist er valide?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manuell"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Vollautomatik"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Kunstlicht - Fluoreszenzlampe"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Kunstlicht - Glühlampe"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Wolkig"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Schatten"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Farbtemperatur"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Natürliches Licht Automatisch"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Fluoreszenz Licht 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Fluoreszenz Licht 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Fluoreszenz Licht 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Fluoreszenz Licht 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Fluoreszenz Licht 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Wähle Farbtemperatur"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Preset Custom 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Preset Custom 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Preset Custom 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Preset Custom 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Preset Custom 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluoreszenz : Warmweiss"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluoreszenz: Kaltweiss"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Fluoreszenz: Tagweiss"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluoreszenz: Tageslicht"
 
-#: camlibs/ptp2/config.c:1555
-#, fuzzy
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
-msgstr "Voreinstellung"
+msgstr "Voreinstellung 1"
 
-#: camlibs/ptp2/config.c:1556
-#, fuzzy
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
-msgstr "Voreinstellung"
+msgstr "Voreinstellung 2"
 
-#: camlibs/ptp2/config.c:1557
-#, fuzzy
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
-msgstr "Voreinstellung"
+msgstr "Voreinstellung 3"
 
-#: camlibs/ptp2/config.c:1559
-#, fuzzy
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
-msgstr "Unterwasser"
+msgstr "Unterwasser: Automatisch"
 
-#: camlibs/ptp2/config.c:1563
-#, fuzzy
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Kunstlicht - Glühlampe"
 
-#: camlibs/ptp2/config.c:1566
-#, fuzzy
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
-msgstr "Fluoreszenz: Tagweiss"
+msgstr "Fluoreszenz: Weiß"
 
-#: camlibs/ptp2/config.c:1567
-#, fuzzy
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Fluoreszenz: Tageslicht"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Voreinstellung 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG Fein"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG Normal"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + JPEG Fein"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + JPEG Normal"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Groß Fein JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Groß Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Medium Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Klein Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Einzelbild"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Kontinuierliche Langsame Geschwindigkeit"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Kontinuierliche Hohe Geschwindigkeit"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Selbstauslöser"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Spiegel hochklappen"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr "PROVIA/Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr "Velvia/Lebhaft"
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr "ASTIA/Soft"
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr "PRO Neg.Hi"
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr "PRO Neg.Std"
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Schwarz & Weiß"
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr "Schwarz & Weiß + Gelbfilter"
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr "Schwarz & Weiß + Rotfilter"
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr "Schwarz & Weiß + Grünfilter"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr "Klassisches Chrome"
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr "ACROS"
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr "ACROS + Gelbfilter"
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr "ACROS + Rotfilter"
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr "ACROS + Grünfilter"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr "ETERNA/Kino"
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr "Klassisches Negativ"
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr "ETERNA BLEACH BYPASS"
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr "USB"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "Undefiniert"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "ökonomisch"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "verlustlos"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Lock"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
-msgstr "Nachtportrait"
+msgstr "Nacht Portrait"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Landschaft"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Nahaufnahme"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Blitz aus"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr "C2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr "C3"
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr "Kreative Automatik"
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr "Hand gehaltene Nachtlandschaft"
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr "HDR mit Hintergrundlicht Kontrolle"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr "SCN"
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Essen"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr "Körnig S/W"
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr "Soft Fokus"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr "Spielzeug Kamera Effekt"
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr "Fischaugen Effekt"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr "Wasserfarben Effekt"
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Miniatur Effekt"
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr "HDR Kunst Standard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr "HDR Kunst lebhaft"
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr "HDR Kunst stark"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr "HDR Prägekunst"
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr "Schwenken"
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr "HDR"
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr "Selbstportrait"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr "Hybrid Automatik"
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr "Glatte Haut"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr "Fv"
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Standard (abgeschaltet bei manueller Aufnahme)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Niedrig (abgeschaltet bei manueller Aufnahme)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Aus (abgeschaltet in manueller Aufnahme)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Hoch (abgeschaltet in manueller Aufnahme)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "Auffüllblitz"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "Auto + Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "An + Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Commander"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Wiederholend"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Automatische Blende"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Voll Manuell"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr "QVGA"
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr "VGA"
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr "XGA"
+
+#: camlibs/ptp2/config.c:2174
+msgid "Application"
+msgstr "Applikation"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Groß"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Klein"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (fest)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (selektiert)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Berechnend"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Partiell"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Mittelpunkt/Gewichtete Messung"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
-msgstr "Punktmessung mit AutoFokus Rahmen"
+msgstr "Punktmessung mit Autofokus Rahmen"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Mehrpunkt"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Treu"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Einfarbig"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Feine Details"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Benutzerdefiniert 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Benutzerdefiniert 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Benutzerdefiniet 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Fokuspunkt nur im Zentrum, Manuell"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Fokuspunkt nur im Zentrum, Automatisch"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Mehrere Fokuspunkte (keine Spezifikation), Manuell"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Mehrere Fokuspunkte, Automatisch"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Mehrere Fokuspunkte (Rechts)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Mehrere Fokuspunkt e(Mitte)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Mehrere Fokuspunkt (Links)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Groß"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Mittel 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Mittel 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Mittel 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Klein"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 Sekunden"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 Sekunden"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Einstellung 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Einstellung 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Einstellung 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Einstellung 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "Mobiltelefon"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT + Mobiltelefon"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC + Mobiltelefon"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC + Mobiltelefon"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "Mobiltelefon 2"
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT + Mobiltelefon 2"
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC + Mobiltelefon 2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC + Mobiltelefon 2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+#, fuzzy
+msgid "LiveMulti"
+msgstr "Mehrpunkt"
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Punkt-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "Kamera SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Speicherkarte"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Video OUT"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Unbekannt %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Werkseinstellung"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Auto ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
-#, fuzzy
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRAW"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
-msgstr "Kleineres JPEG (S2)"
+msgstr "Kleineres JPEG"
 
-#: camlibs/ptp2/config.c:2401
-#, fuzzy
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
-msgstr "Kleines JPEG (S3)"
+msgstr "Winziges JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + Sehr Feines JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + Sehr Feines JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRAW + Large Fine JPEG"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + Mittel Feines JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + Mittel Feines JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRAW + Medium Fine JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + Kleines Feines JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + Kleines Feines JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRAW + Small Fine JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + Large Normal JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + Large Normal JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRAW + Large Normal JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + Medium Normal JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + Medium Normal JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRAW + Medium Normal JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + Small Normal JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + Small Normal JPEG"
 
-#: camlibs/ptp2/config.c:2426
-#, fuzzy
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRAW + Small Normal JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
-msgstr "RAW + Small Fine JPEG (S2)"
+msgstr "RAW + Smaller JPEG"
 
-#: camlibs/ptp2/config.c:2427
-#, fuzzy
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
-msgstr "mRAW + Kleines Feines JPEG (S2)"
+msgstr "mRAW + Kleineres  JPEG"
 
-#: camlibs/ptp2/config.c:2428
-#, fuzzy
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
-msgstr "sRAW + Kleines Feines JPEG (S2)"
+msgstr "sRAW + Kleineres JPEG"
 
-#: camlibs/ptp2/config.c:2429
-#, fuzzy
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "RAW + Kleineres JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
-msgstr "RAW + Small Fine JPEG (S3)"
+msgstr "RAW + Winziges JPEG"
 
-#: camlibs/ptp2/config.c:2430
-#, fuzzy
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
-msgstr "mRAW + Sehr Feines JPEG (S3)"
+msgstr "mRAW + Winziges  JPEG"
 
-#: camlibs/ptp2/config.c:2431
-#, fuzzy
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
-msgstr "sRAW + Sehr Feines JPEG (S3)"
+msgstr "sRAW + Winziges JPEG"
+
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Klein Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Mittel 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Mittel 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Groß Fein JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Klein Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Mittel 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Mittel 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Groß Fein JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Groß Fein JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Mittel 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Mittel 2"
+
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Klein Normal JPEG+RAW"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Groß Fein JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Mittel 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Mittel 2"
+
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Klein Normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Kontinuierlich"
 
-#: camlibs/ptp2/config.c:2467
-#, fuzzy
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr "Video"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
-msgstr "Einzelbildaufnahme"
+msgstr "Leise Einzelbildaufnahme"
+
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Kontinuierlich mit Timer"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Selbstauslöser 10 Sekunden"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Selbstauslöser 2 Sekunden"
 
-#: camlibs/ptp2/config.c:2470
-#, fuzzy
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
-msgstr "Kontinuierliche Aufnamen"
+msgstr "Sehr schnelle kontinuierliche Aufnahmen"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Einzelbild leise"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Kontinuierlich leise"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Auto ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr "Schnell kontinuierlich leise "
+
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr "Langsam kontinuierlich leise"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Rauschunterdrückung bei Auto ISO Mehr Bild"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Um Langzeit Aufnahmen zu ermöglichen, muss das Mode Rad auf 'M' stehen und "
+"die Belichtungszeit auf 'bulb'."
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "%d Mehr Bild Rauschunterdrückung"
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr "Aufnahme"
 
-#: camlibs/ptp2/config.c:2617
+# Langzeitbelichtung?
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr "Langzeitbelichtung An"
+
+# Langzeitbelichtung?
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr "Langzeitbelichtung Aus"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr "AF"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr "Breche AF ab"
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Fuji Aufnahme fehlgeschlagen: Evt kein Fokus?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 Punkte (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 Punkte (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 Punkte (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 Punkte (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Mehr Bild Rauschunterdrückung"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
-#, fuzzy, c-format
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Rauschunterdrückung bei Auto ISO Mehr Bild"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
+#, c-format
 msgid "Time"
 msgstr "Selbstauslöser"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Kreativ"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Aktion"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Nachtlandschaft"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Kinder"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatischer (Kein Blitz)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr "U3"
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
-msgstr ""
+msgstr "Intelligent Automatik"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
-msgstr ""
+msgstr "Überlegen Automatik"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
-msgstr "Film"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr "Film (P)"
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr "Film (A)"
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr "Film (S)"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr "Film (M)"
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr "Film (Szene)"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
-msgstr ""
+msgstr "Kontinuierlicher Tele-Zoom Priorität AE"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
-msgstr ""
+msgstr "Schwenkpanorama"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
-msgstr ""
+msgstr "Intelligent Automatisch Blitz Aus"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Sonnenuntergang"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Nachtlandschaft"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Freihand bei Dämmerung"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr "Anti Bewegungsunschärfe"
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Bild Effekt"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr "S&Q"
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Nachtlandschaft"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Party/Innenraum"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Strand/Schnee"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Dämmerung"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Tierportrait"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Kerzenlicht"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Blume"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Herbstfarben"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Essen"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Kinder"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Nahaufnahme"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Kunstlicht - Fluoreszenzlampe"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Wasser"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr "1/3 EV"
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr "1/2 EV"
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr "2/3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Extra hoch"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr "2 Bilder (normal und unterhalb)"
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr "2 Bilder (normal und oberhalb)"
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr "3 Bilder (normal und 2 unterhalb)"
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr "3 Bilder (normal und 2 oberhalb)"
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr "3 Bilder (normal, unter- und oberhalb)"
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr "5 Bilder (normal, 2 unter- und 2 oberhalb)"
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr "7 Bilder (normal, 3 unter- und 3 oberhalb)"
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr "9 Bilder (normal, 4 unter- und 4 oberhalb)"
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr "Kein Bild"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr "2 Bilder (Aus -> Benutzerdefiniert)"
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr "3 Bilder (Aus -> Niedrig -> Benutzerdefiniert)"
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr "4 Bilder (Aus -> Niedrig -> Normal -> Hoch)"
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr "5 Bilder (Aus -> Niedrig -> Normal -> Hoch -> Extra Hoch)"
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Szene"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effekte"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Gegenlicht"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Weichzeichnen"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Tilt-Shift"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Einzelbild"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Mehrbild"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Zeitraffer"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Kontinuierlicher Langsame Geschwindigkeit"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Selbstauslöser"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Spiegel hochklappen"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Schnellreagierende Fernbedienung"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Verzögerte Fernsteuerung"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Leises Auslösen"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Kontinuierliches leises Auslösen"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Selbstauslöser 2s"
 
-#: camlibs/ptp2/config.c:3307
-#, fuzzy
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
-msgstr "Selbstauslöser 2s"
+msgstr "Selbstauslöser 5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Selbstauslöser 10s"
 
-#: camlibs/ptp2/config.c:3309
-#, fuzzy
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
-msgstr "Selbstauslöser 10s"
+msgstr "Selbstauslöser 10s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3310
-#, fuzzy
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
-msgstr "Selbstauslöser 10s"
+msgstr "Selbstauslöser 10s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3311
-#, fuzzy
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
-msgstr "Selbstauslöser 2s"
+msgstr "Selbstauslöser 5s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3312
-#, fuzzy
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
-msgstr "Selbstauslöser 2s"
+msgstr "Selbstauslöser 2s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3313
-#, fuzzy
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
-msgstr "Selbstauslöser 2s"
+msgstr "Selbstauslöser 2s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3314
-#, fuzzy
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
-msgstr "Selbstauslöser 2s"
+msgstr "Selbstauslöser 2s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3316
-#, fuzzy
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr "Kontinuierlich Hohe Geschwindigkeit"
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr "Kontinuierlich Mittlere Geschwindigkeit"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3317
-#, fuzzy
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3318
-#, fuzzy
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 9 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3320
-#, fuzzy
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3321
-#, fuzzy
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3322
-#, fuzzy
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 9 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3324
-#, fuzzy
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3325
-#, fuzzy
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3326
-#, fuzzy
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 9 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3328
-#, fuzzy
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3329
-#, fuzzy
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3330
-#, fuzzy
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 9 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3332
-#, fuzzy
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 2.0 Schritte"
 
-#: camlibs/ptp2/config.c:3333
-#, fuzzy
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 2.0 Schritte"
 
-#: camlibs/ptp2/config.c:3335
-#, fuzzy
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 3 Bilder und 3.0 Schritte"
 
-#: camlibs/ptp2/config.c:3336
-#, fuzzy
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe C 5 Bilder und 3.0 Schritte"
 
-#: camlibs/ptp2/config.c:3338
-#, fuzzy
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3339
-#, fuzzy
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3340
-#, fuzzy
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 9 Bilder und 0.3 Schritte"
 
-#: camlibs/ptp2/config.c:3342
-#, fuzzy
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3343
-#, fuzzy
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3344
-#, fuzzy
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 9 Bilder und 0.5 Schritte"
 
-#: camlibs/ptp2/config.c:3346
-#, fuzzy
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3347
-#, fuzzy
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3348
-#, fuzzy
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 9 Bilder und 0.7 Schritte"
 
-#: camlibs/ptp2/config.c:3350
-#, fuzzy
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3351
-#, fuzzy
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3352
-#, fuzzy
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 9 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3354
-#, fuzzy
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 1.0 Schritte"
 
-#: camlibs/ptp2/config.c:3355
-#, fuzzy
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 2.0 Schritte"
 
-#: camlibs/ptp2/config.c:3356
-#, fuzzy
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 3 Bilder und 3.0 Schritte"
 
-#: camlibs/ptp2/config.c:3357
-#, fuzzy
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
-msgstr "Belichtungsreihe Anzahl und Schritte"
+msgstr "Belichtungsreihe S 5 Bilder und 3.0 Schritte"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
-msgstr "Belichtungsreihe Whitebalance Low"
+msgstr "Belichtungsreihe Whitebalance Niedrig"
 
-#: camlibs/ptp2/config.c:3359
-#, fuzzy
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
-msgstr "Belichtungsreihe Whitebalance Low"
+msgstr "Belichtungsreihe DRO Niedrig"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
-msgstr "Belichtungsreihe Whitebalance High"
+msgstr "Belichtungsreihe Whitebalance Hoch"
 
-#: camlibs/ptp2/config.c:3361
-#, fuzzy
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
-msgstr "Belichtungsreihe Whitebalance High"
+msgstr "Belichtungsreihe DRO Hoch"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Zentral Punkt"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Mehrpunkt"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Einzelbereich"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Nächstes Subjekt"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Gruppendynamik"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Einzelbereich AF"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Dynamischer Bereich AF"
 
-#: camlibs/ptp2/config.c:3377
-#, fuzzy
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "Gruppendynamischer AF"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "Dynamischer Bereich AF mit nächstem Motiv Priorität"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Dynamischer AF Bereich (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Dynamischer AF Bereich (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Dynamischer AF Bereich (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "3D Verfolgung"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "Dynamischer Bereich AF (25 Punkte)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "Einzel Punkt AF"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "Auto-Bereich AF"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "3D-Verfolgung"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "Dynamischer Bereich AF (72 Punkte)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "Dynamischer Bereich AF (153 Punkte)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "Gruppendynamischer AF"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "Dynamischer Bereich AF (9 Punkte)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "Stecknadel AF"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "Weitwinkel AF (S)"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "Weitwinkel AF (L)"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Weitwinkel AF (S)"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Weitwinkel AF (S)"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (Portrait optimiert)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (Natur optimiert)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Unbekannter Wert 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Zentrum"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Oben"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Unten"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Links"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Rechts"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Weit"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "Zentrum"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Flexibles Programm"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Flexibles Programm"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Flexibles Programm"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Mehrpunkt"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Zentral Punkt"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Punkt + Highlights"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Punkt + Schatten"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr "Mehrpunkt"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr "Durschnitt über ganzes Bild"
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr "Punkt Standard"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr "Punkt Groß"
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr "Highlight"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Automatischer Blitz"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Auffüll Blitz"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "automatische Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Rote-Augen-Blitz Füllmodus"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Externer Sync"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Automatischer Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Hinterer Vorhang Sync+Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Rote-Augen-Vermeidung + Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Vorderer Vorhang Sync"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Rote-Augen-Vermeidung + Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Hinterer Vorhang Sync+Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Hinterer Vorhang Sync"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Hinterer Vorhang Sync"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
-msgstr ""
+msgstr "Drahtloses Synchronisieren"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Langsamer Sync"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Schwarz & Weiß"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Nachtsicht"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Farbmalmodus"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Miniatur Effekt"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Selektive Farbe"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Silhouette"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "High Key"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Low Key"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "unendlich"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "unendlich"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
-msgstr ""
+msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Composite"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "Langzeitbelichtung"
+
+#: camlibs/ptp2/config.c:5050
+msgid "Sync"
+msgstr "Sync"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "AF mit Gesichts-Priorität"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Weitwinkel AF"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Normaler Bereich AF"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "Subjektfolgender AF"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr "Punkt Bereich AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr "Ganze Anzeige"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200%"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr "33%"
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr "66%"
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Einzel AF"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr "Kontinuierlich gefahrener AF"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Kontinuierlicher AF"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
-msgstr "Manueller Fokus"
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr "Manueller Fokus (fixiert)"
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
+msgstr "MF (selektiert)"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "AE/AF Lock"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "nur AE Lock"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Nur AF Lock"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "AF Lock halten"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF an"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Blitzstärke Lock"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 Sekunden"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 Minuten"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 Minuten"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 Sekunden"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "Kamera SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 mm"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "Langzeitbelichtung"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1.6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1.3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1.3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1.6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Schärfer"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Weicher"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Direkt Druck"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Mittel Niedrig"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Mittel Hoch"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Niedriger Kontrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Mittel Hoch"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Hoch kontrolliert"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Fokuszone Nahaufnahme"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Fokuszone Sehr Nah"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Fokuszone Nah"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Fokuszone Mitte"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Fokuszone Weit"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Fokuszone (Reserviert 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Fokuszone (Reserviert 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Fokuszone (Reserviert 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Fokuszone (Reserviert 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatischer Makro"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Einzel AF"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Kontinuierlicher AF"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
-msgstr ""
+msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Einzel AF"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "AI Servo"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "AI Fokus"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 Sekunden"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 Sekunden"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Halten"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Fluoreszenz H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Benutzerdefinierter Weißabgleich PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Benutzerdefinierter Weißabgleich PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Benutzerdefinierter Weißabgleich PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Fehlende Zahl"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Schatten"
 
-#: camlibs/ptp2/config.c:4366
-#, fuzzy
-msgid "Custom WB 2"
-msgstr "Benutzerdefiniert"
-
-#: camlibs/ptp2/config.c:4367
-#, fuzzy
-msgid "Custom WB 3"
-msgstr "Benutzerdefiniert"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr "Benutzerdefinierter Weißabgleich: PC-1"
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
+msgstr "Benutzerdefinierter Weißabgleich: PC-2"
+
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
+msgstr "Benutzerdefinierter Weißabgleich: PC-3"
+
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
+msgstr "Manuell 3"
+
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
+msgstr "Manuell 4"
+
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr "Manuell 5"
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr "Benutzerdefinierter Weißabgleich: PC-4"
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr "Benutzerdefinierter Weißabgleich: PC-5"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "Automatische Whitebalance Weiß"
 
-#: camlibs/ptp2/config.c:4368
-#, fuzzy
-msgid "Custom WB 4"
-msgstr "Benutzerdefiniert"
-
-#: camlibs/ptp2/config.c:4369
-#, fuzzy
-msgid "Custom WB 5"
-msgstr "Benutzerdefiniert"
-
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Wenig Schärfe"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Schwarz und Weiss"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr "AE Abstufung"
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr "ISO Abstufung"
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr "Weißabgleichabstufung"
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr "FE Abstufung"
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr "Abstufungsmodus aus"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
-msgstr ""
+msgstr "automatisch impliziert"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE & Blitz"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "nur AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "nur Blitz"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Weißabgleichabstufung"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "ADL Abstufung"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Einschalten"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Abschalten"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Ein- und Abschalten"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Schnelle Reaktion"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Entfernt Spiegel hochklappen"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Applikationsmodus 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Applikationsmodus 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Mittel"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Erweitert"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > Unter"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Unter > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Auto Empfindlichkeit"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Hohe Empfindlichkeit"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Mittlere Empfindlichkeit"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Niedrige Empfindlichkeit"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Mikrofon aus"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hoch 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hoch 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Blitz/Belichtungszeit"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Blitz/Belichtungszeit/Blende"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Blitz/Blende"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG Basic"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Fein"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+Basic"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Normal"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
-#, fuzzy
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "JPEG Basic*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "JPEG Normal*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "JPEG Fein*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF+Basic"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF+Normal*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF+Fein*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
-msgstr "Extra hoch"
+msgstr "Extra fein"
+
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + JPEG (Fein)"
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + JPEG (Extra Fein)"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Fein"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "RAW + JPEG (Extra Fein)"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + JPEG (Fein)"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + JPEG (Extra Fein)"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fein"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG Fein"
+
+#: camlibs/ptp2/config.c:6922
 #, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
 msgstr "Mehrpunkt"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 Sekunden"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 Sekunden"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 Sekunden"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Verlustlos"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Verlustbehaftet"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "High Key"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Grössen Priorität"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optimale Qualität"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Auslösen"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Auslösen + Fokussieren"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 Punkte"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 Punkte"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 Punkte"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 Punkte (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (lang)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Normal)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (Kurz)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Auslöser/AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-AN"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "AE/AF Lock"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "nur AE Lock"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "AE LOck (Löschen beim Auslösen)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "AE Lock halten"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "nur AF Lock"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 pfs"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Nicht zugeordnet"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Vorschau"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "FV Lock"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "AE Lock halten"
 
-#: camlibs/ptp2/config.c:5148
-#, fuzzy
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Belichtungsreihe"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Matrix Messung"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Mittelpunkt/Gewichtete Messung"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Spotmessung"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Anzeigen"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
-msgstr ""
+msgstr "Zugriff auf oberstes Item in MY MENU"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (Raw)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
-msgstr ""
+msgstr "Bildbereich Raster"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Aktives D-Lighting"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 Schritt Blitz/Blende"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Nicht CPU Objektiv Nummer"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Virtueller Horizont im Sucher"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Starte Filmaufnahme"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
-msgstr ""
+msgstr "An (Bild review ausgenommen)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
+msgstr "Gesichtserkennung"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr "Gesichts- und Pupillen Erkennung"
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr "Tier Erkennung"
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Unbekannter Wert"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
-msgstr ""
+msgstr "Nikon changeafarea funktioniert nur im Liveview Modus."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Nikon autofokus erhielt keinen Fokus."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Der manuelle Fokus funktioniert nur im LiveView Modus."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Der manuelle Fokus ist am Anschlag."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Das Fokus Stepping ist zu gering."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Halb durchdrücken"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Voll durchdrücken"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
-msgstr "Halb durchdrücken"
+msgstr "Halb loslassen"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
-msgstr "Voll auslösen"
+msgstr "Voll loslassen"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Sofort"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Drücke 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Drücke 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Drücke 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Loslassen 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Loslassen 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Loslassen 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Nah 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Nah 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Nah 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Weit 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Weit 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Weit 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Nah %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Weit %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr "Liveview kann nicht starten: Batterie fast leer"
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr "Liveview kann nicht starten: Temperatur zu hoch"
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr "Liveview kann nicht starten: TTL Fehler"
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr "Liveview kann nicht starten: Mirror-Up Operation läuft"
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr "Liveview kann nicht starten: Objektiv fährt ein"
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr "Lieview kann nicht starten: Warnung minimum Blende"
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr "Liveview kann nicht starten: Bearbeiten von Aufnahme läuft"
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr "Liveview kann nicht starten: Sequenz Fehler"
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+"Liveview kann nicht starten: Belichtungsprogrammmodus ist nicht P/A/S/M"
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr "Liveview kann nicht starten: Langzeitbelichtungsmodus aktiv"
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr "Liview kann nicht starten: Karte nicht formatiert"
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr "Liveview kann nicht starten: Kartenfehler"
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr "Liveview kann nicht starten: Karte schreibgeschützt"
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+"Liveview kann nicht starten: Aufnahmeziel ist Karte, aber entweder keine "
+"Karte vorhanden oder Karte schreibgeschützt"
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr "Liveview kann nicht starten: Noch nicht runtergeladene SDRAM Bilder"
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr "Liveview kann nicht starten: Knopf voll gedrückt"
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr "Liveview kann nicht starten: Code 0x%08x"
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Anschalten der Nikon LiveView fehlgeschlagen"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr "Film Verhinderungszustand:"
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr "Nicht im Applikationsmodus"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr "Liveview Selektor ist angeschaltet"
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+msgid "In enlarged liveview"
+msgstr "In gezoomter Liveview"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr "Datei ist schreibgeschützt"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr "Filmaufnahme läuft bereits"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr "Bilder / Filme noch nicht im Buffer aufgenommen"
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr "Karte voll"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr "Karte ist nicht formatiert"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr "Karten Fehler"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr "Keine Film Verhinderungszustände"
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr "Live View Verhinderungszustand: "
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr "Sequenz Fehler"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr "Voll gedrückter Knopf"
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr "Warnung minimale Blende"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr "Batterie fast leer"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr "TTL Fehler"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr "Noch nicht heruntergeladene SDRAM Bilder"
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr "Aufnahmeziel Karte, aber keine Karte oder Karte schreibgeschützt"
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr "Aufnahme wird bearbeitet"
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr "Temperatur zu hoch"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr "Karte ist nicht formatiert"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr "Bulb Modus"
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr "Mirror-Up Operation läuft"
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr "Objektiv fährt ein"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Belichtungsprogrammmodus ist nicht P/A/S/M"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr "Liveview sollte nicht verhindert sein"
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr "Filmaufnahme kann nicht starten: %s."
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr "Kamera ist nicht im Applikationsmodus"
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr "Filmaufnahme kann nicht starten: Code 0x%08x."
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Kunstlicht - Fluoreszenzlampe"
+
+#: camlibs/ptp2/config.c:9152
+msgid "White set"
+msgstr "Weiße Umgebung"
+
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr "Schwarz Weiß"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Farbtemperatur 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Farbtemperatur 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Farbtemperatur 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Farbtemperatur 4"
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr "Automatisch Kalt"
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr "Automatisch Warm"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
 msgstr ""
-"Um Langzeit Aufnahmen zu ermöglichen, muss das Mode Rad auf 'M' stehen und "
-"die Belichtungszeit auf 'bulb'."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Unbekannt 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super Macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Weit 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Weit 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Nah 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Nah und Fern"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+#, fuzzy
+msgid "S"
+msgstr "SV"
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Aufnahme"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Wiedergabe"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Weitere Einstellungen"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Rauschunterdrückung bei hohen ISO"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "TV-Menü nicht anzeigen"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+"\n"
+"Ströme:"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "groß"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Unbekannte Vorschau Größe '%s'."
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "interner Speicher"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Speicherkarte"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Anzeige"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Anlegedatum: %s, Letzte Benutzung: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Löschen"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Managed"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Profilname"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP Addresse (leer bei DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Netzwerkmaske"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Default gateway"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Zugriffsmodus"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "WiFi Kanal"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Kryptographischer Schlüssel (hex)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Schreiben"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Liste aller WLAN-Profile"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Lege WiFI Profil an"
 
-#: camlibs/ptp2/config.c:7103
-#, fuzzy
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Kamera Datum und Zeit mit dem PC synchronisieren (UTC)"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
-msgstr "Nicht im Fokus"
+msgstr "Auto Fokus"
+
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Manueller Fokus"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Abschalten"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Fokus Lock"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Langzeit Belichtungsmodus"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "UILock"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Aufklappblitz"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Fahre NIKON DSLR Autofokus"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Fahre Canon DSLR Autofokus"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr "Fahre Fuji Autofokus"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Fahre NIKON DSLR manuellen Fokus"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Setze den NIKON Autofokusbereich"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Setze Nikon Kontrollmodus"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Fahre Canon DSLR manuellen Fokus"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Breche Canon DSLR Autofokus ab"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Fahre Olympus OMD manuellen Fokus"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Fahre Panasonic manuellen Fokus"
+
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr "Fahre Fuji Autofokus"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "EZoom Start Position"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Canon EOS Zoom"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Canon EOS Zoom Position"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Canon EOS Viewfinder"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Panasonic Viewfinder"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon Viewfinder"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Canon EOS Auslöser"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "CHDK Script"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Film Aufnahme"
 
-#: camlibs/ptp2/config.c:7127
-msgid "PTP Opcode"
+#: camlibs/ptp2/config.c:10712
+msgid "Movie Mode"
+msgstr "Film Modus"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Fokuspunkt beleuchtet"
+
+#: camlibs/ptp2/config.c:10719
+msgid "PTP Opcode"
+msgstr "PTP Kommando"
+
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Kamera Hersteller"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Version des Gerätes"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Hersteller Erweiterung"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "PTP Version"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "DPOF Version"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Netzanschluss"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Externer Blitz"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Batterie Ladezustand"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr "Status Spiegel Hochklappen"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Spiegel hochklappen"
+
+#: camlibs/ptp2/config.c:10742
+#, fuzzy
+msgid "Mirror Lock Status"
+msgstr "Status Spiegel Hochklappen"
+
+#: camlibs/ptp2/config.c:10743
+#, fuzzy
+msgid "Mirror Down Status"
+msgstr "Status Spiegel Hochklappen"
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr "Aufnahme Anzahl mit Spiegel hochgeklappt"
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr "Kontinuierliche Aufnahme Zahl"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Kameraausrichtung"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Blitz offen"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr "Aktiver Dateiordner"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Blitz geladen"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Objektivbezeichnung"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Auslöseanzahl"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Verfügbarer Aufnahmen"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "minimale Fokus Tiefe"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "maximale Fokus Tiefe"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Maximale Blende bei Minimaler Brennweite"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Maximale Blende bei Maximaler Brennweite"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Wenig Licht"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Belichtungsmesser"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "AF Lock an"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "AE Lock an"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "FV Lock an"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+msgid "Movie Switch"
+msgstr "Film Schalter"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr "Film Verhinderungszustand"
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr "Live View Verhinderungszustand"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Kamera Datum und Zeit"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Signalton Modus"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Bild Kommentar"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
-msgstr ""
+msgstr "WLAN GUID"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Schalte Bild Kommentar ein"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Zeit für automatische Abschaltung des LCD"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Aufnahmemedium"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Schnellansicht Zeit"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "CSM Menü"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Umgedrehtes Kommando Rad"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Kamera Output"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Aufnahmemedium"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "EVF Modus"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Künstler"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "CCD Seriennummer"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Reinige Sensor"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Flimmer Vermeidung"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Custom Functions Ex"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Fokusinformation"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Fokus Bereich"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr "Blitz feuert"
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr "Blitz Ladezustand"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr "Einzel Aufnahme Raw An"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Autom. Abschaltung"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
-msgstr ""
+msgstr "Tiefenschärfe"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menüs und Abspielen"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr "Externe Aufnahme Kontrolle"
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr "Kamera Aktion"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+msgid "Priority Mode"
+msgstr "Prioritätsmodus"
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr "Thumbnail Größe"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Schnelles Dateisystem"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Aufnahmeziel"
 
-#: camlibs/ptp2/config.c:7208
-#, fuzzy
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
-msgstr "Autofokus Modus"
+msgstr "Autofokus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Entfernter Modus"
+
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr "Event Modus"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Bild Format SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Bild Format CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Bild Format Externe HD"
 
-#: camlibs/ptp2/config.c:7230
-#, fuzzy
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr "Film Simulation"
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr "Raw Bildgröße"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
-msgstr "ISO-Empfindlichkeit"
+msgstr "Film ISO-Empfindlichkeit"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Weißabgleich"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Weißabgleich Anpassung A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Weißabgleich Anpassung B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Weißabgleich X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Weißabgleich X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Foto Effekt"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Farbmodell"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Farbraum"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Filmformat"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Filmauflösung"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Film Framerate"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Film Kontrast"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Film Helligkeit"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Tonformat"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Ton Bitrate"
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr "Ton Samplingrate"
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr "Ton Bits per Sample"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Lautstärke"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Rauschunterdrückung bei Langzeit Aufnahme"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Autofokusmodus 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Zoomgeschwindigkeit"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Autofokus Hilfslicht"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Rotationsmarkierung"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+msgid "Movie Exposure Compensation"
+msgstr "Film Belichtungskorrektur"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Weißabgleich"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Farbtemperatur"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "AF Modus"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "MF Hilfe"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Starte Filmaufnahme"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Blitzkorrektur"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "AEB automatische Belichtungskorrektur"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Nikon Blitzmodus"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Blitz Commander Modus"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Blitz Commander Modus Energie"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Blitz Commander Kanal"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Blitz Commander eigener Modus"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Blitz Commander eigene Belichtungskorrektur"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Blitz Commander Selbst Wert"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Blitz Commander A Modus"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Blitz Commander A Belichtungskorrektur"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Blitz Commander A Wert"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Blitz Commander B Modus"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Blitz Commander B Belichtungskorrektur"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Blitz Commander B Wert"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "AF Bereich Aufhellung"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "AF Signalton Modus"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "F-Nummer"
 
-#: camlibs/ptp2/config.c:7289
-#, fuzzy
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr "Live View Größe"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
-msgstr "F-Nummer"
+msgstr "Film F-Nummer"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Flexibles Programm"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Qualität"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Raw Bildgröße"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Bild Format"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Fokus Entfernung"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Fokus Tiefe"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Fokusmodus 2"
 
-#: camlibs/ptp2/config.c:7300
-#, fuzzy
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
-msgstr "Kontinuierlich"
+msgstr "Kontinuierlicher AF"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Effektmodus"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Belichtungs Programm"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+msgid "User Mode"
+msgstr "Benutzer Modus"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Szenen Modus"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Seitenverhältnis"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "AF Modus"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Informationen über Speichermedium:\n"
+msgstr "Speichermedium"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Rauschunterdrückung bei hohen ISO"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "HDR Modus"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "HDR Hoch Dynamisch"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "HDR Weichzeichnen"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Bildaufnahme Modus"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Canon Aufnahme Modus"
 
 # Is this correct?
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Canon Automatischer Belichtungsmodus"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+# Is this correct?
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Canon Automatischer Belichtungsmodus Rad"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Auslöse Modus"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Bild Style"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Entfernungs Messungs Modus"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Belichtungsmessmodus"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV Open"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV Max"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr "Blende 2"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Fokuspunkt"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Aufnahmeverzögerung"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Belichtungszeit 2"
 
-#: camlibs/ptp2/config.c:7333
-#, fuzzy
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
-msgstr "Belichtungszeit 2"
+msgstr "Film Belichtungszeit 2"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Spotmessung"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Autofokus Entfernung"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Fokus Bereich Wraparound"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Belichtungs Verzögerungs Modus"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Belichtungs Lock"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "AE-L/AF-L Modus"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Live View AF Modus"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Live View AF Fokus"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr "Live View Auslöse Vorschau"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Live View Zoom Faktor"
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr "Live View Weißabgleich"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Live View Größe"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Bildnummer Zählung"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Blitzzeichen"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Modellierblitz"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Gitterlinien im Sucher"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "BIldvorschau"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Rotationsmarkierung"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Auslösen ohne CF Karte"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Blitzmodus mit manuelle Energie"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Autofokusbereich"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Blitz Belichtungskorrektur"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Abstufung"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Abstufungsmodus"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "EV-Schritt"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Abstufungsbereich"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Abstufungsrichtung"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr "AE Abstufung Schritt"
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr "Weißabgleichabstufung Schritt"
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr "AE Abstufung Muster"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr "WB Weißabgleichabstufungsmuster"
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr "AE Belichtungsreihe Anzahl"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr "ADL Abstufung Muster"
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr "ADL Abstufung Schritt"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr "WB Preset Kommentar 1"
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr "WB Preset Kommentar 2"
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr "WB Preset Kommentar 3"
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr "WB Preset Kommentar 4"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr "WB Preset Kommentar 5"
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr "WB Preset Kommentar 6"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Bildzahl im Burstmodus"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Burst Abstand"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Maximale Bildanzahl"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Automatische Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Tungsten Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Floureszierend Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Tageslicht Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Blitz Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Wolkig Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Schattig Weißabgleich Abweichung"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Tageslicht Weißabgleich Abweichung"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Weißabgleich Abweichung Preset Nr"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Weißabgleich Abweichung Preset 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Weißabgleich Abweichung Preset 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Weißabgleich Abweichung Preset 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Weißabgleich Abweichung Preset 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Weißabgleich Abweichung Preset 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Selbstauslöserzeit"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Mittelpunkt/Gewichtet Bereich"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Blitz Belichtungszeit"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Fernsteuerungsabschaltzeit"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Entfernter Modus"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Applikationsmodus"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Bild Optimierung"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Schärfen"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Ton Anpassung"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Farbton Anpassung"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Automatische Belichtungs Abstufung"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Automatische Beleuchtungsoptimierung"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Film Sound"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Manuelle Filmeinstellung"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Vertauschte Indikatoren"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Automatische Verzerrungs Kontrolle"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr "Vignette Korrektur"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Video Modus"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Sensor Crop"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr "HDMI Ausgabe Datenbits"
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr "Gesichtserkennung"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr "Film Servo AF"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Sensorabschaltzeit"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Weise Func. Button zu"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Weise Vorschau Knopf zu"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Filmqualität"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Minimale Belichtungszeit"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Langsame Kontinuierliche Aufnahme"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Filmauflösung"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Langsame Kontinuierliche Aufname"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Minimale Belichtungszeit"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Filmqualität"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Hohes Limit für Auto ISO"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Blitzsynchronisations Geschwindigkeit"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Fokus Messung"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Schnelle kontinuierliche Aufnahme"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Richtlinie der JPEG-Kompression"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "AF-C Modus Priorität"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "AF-S Modus Priorität"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "AF Aktivierung"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Dynamischer AF-Bereich"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "AF-Sperre An"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "AF-Bereichspunkt"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "AF-Einschaltknopf"
 
-#: camlibs/ptp2/config.c:7512
-#, fuzzy
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
-msgstr "Rauschunterdrückung bei hohen ISO"
+msgstr "Rauschunterdrückung bei Videos mit hohen ISO"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Maximum an kontinuierlichen Aufnahmen"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr "Filmschleifen Länge"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "RAW.Komprimierung"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Bildqualität 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Bildeinstellungen"
-
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr "Liveview Zoom Bereich"
+
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Aufnahmeeinstellungen"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "WLAN-Profile"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Andere PTP Geräte Settings"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP Setting 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Die Property »%s« / 0x%04x is derzeit read-only."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Die Property »%s« / 0x%04x wurde nicht gesetzt, (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Die Property »%s« / 0x%04x wurde nicht gesetzt, (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr "Parsen des Wertes von Widget »%s« / 0x%04x fehlgeschalten mit %d."
 
-#: camlibs/ptp2/config.c:8215
-#, fuzzy, c-format
+#: camlibs/ptp2/config.c:12067
+#, c-format
 msgid "Property '%s' not found."
-msgstr "Ordner nicht gefunden"
+msgstr "Wert »%s« nicht gefunden"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Es muss ein mit /store_xxxxxxxx/ beginnender Folder angegeben werden."
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7795,191 +9989,209 @@
 "\n"
 "Viel Spaß!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "Diese Nikon Kamera scheint kein JPEG im LiveView Modus zu holen"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Anschalten des Viewfinder fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Holen des Viewfinder Bildes fehlgeschlagend"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Diese Kamera unterstützt nicht den Canon Viewfinder Modus"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Diese Nikon Kamera unterstützt nicht den LiveView Modus"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "Diese Nikon Kamera scheint kein JPEG im LiveView Modus zu holen"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr "Liveview kann nicht starten: %s"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Beenden der LiveView fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
-#, fuzzy
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
-msgstr "Diese Nikon Kamera scheint kein JPEG im LiveView Modus zu holen"
+msgstr "Diese Sony Kamera scheint kein JPEG im LiveView Modus zu holen"
+
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "Diese Panasonic Kamera scheint kein JPEG im LiveView Modus zu holen"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Diese Kamera unterstützt keine Nikon spezifische Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
+"Liveview konnte auf dieser Nikon 1 nicht aktiviert werden, wird aber für "
+"Aufnahme benötigt"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Diese Canon Kamera unterstützt nicht den Canon EOS Aufnahme Modus"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS Event Abfrage fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Diese Kamera versteht leider den Canon-Befehl zum Beginn von Aufnahmen per "
 "Fernauslöser nicht"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Abschalten des Viewfinders fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Canon Aufnahme fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr "Aufnahme fehlgeschlagen: Kein Fokus."
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Diese Kamera unterstützt keine Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
-msgstr ""
+msgstr "Speicherkarte voll während der Aufnahme"
 
-#: camlibs/ptp2/library.c:4402
-#, fuzzy
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS Halb-Drücken fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Canon EOS Aufnahme fehlgeschlagen: Evt kein Fokus?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
-#, fuzzy
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS Halb-Lösen fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4447
-#, fuzzy
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS Durchdrücken fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4450
-#, fuzzy
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS Loslassen fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS M Durchdrücken fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr "Canon EOS Aufnahme fehlgeschlagen: Evt kein Fokus?"
+msgstr "Canon EOS M Aufnahme fehlgeschlagen: Evt kein Fokus?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Canon EOS Aufnahme fehlgeschlagen"
+msgstr "Canon EOS M Loslassen fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS Aufnahme fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS Aufnahme fehlgeschlagen: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Canon EOS Aufnahme fehlgeschlagen: Evt Spiegel hochgeklappt?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr "Canon EOS Aufnahme fehlgeschlagen: Karte voll?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS Aufnahme fehlgeschlagen: Karte read-only?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Canon EOS Aufnahme fehlgeschlagen: Unbekannter Fehler %d, bitte berichten."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "Das Initialisieren Ihrer Kamera hat nicht funktioniert. Bitte reporten Sie "
 "dies."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Hersteller: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Modell: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Version: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Seriennummer: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Vendor Extension ID: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Beschreibung der Vendor Extension: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Version des PTP Standards: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Funktionsmodus: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7987,20 +10199,32 @@
 "\n"
 "Aufnahmeformate: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Anzeigeformate: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+"\n"
+"Ströme:"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "Audio"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Unterstützte MTP Object Properties:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr "PTP Fehler %04x beim Abfragen"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8008,95 +10232,87 @@
 "\n"
 "Fähigkeiten des Geräts:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tDateien Download, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Löschen von Dateien, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "kein Löschen von Dateien, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "kein Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tGenerische Bild Aufnahme, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tKeine Aufnahme von Bildern, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "keine Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:5740
-#, fuzzy
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
-msgstr "Canon Aufnahme"
+msgstr "Canon Aufnahme, "
 
-#: camlibs/ptp2/library.c:5742
-#, fuzzy
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
-msgstr "Canon EOS Aufnahme"
+msgstr "Canon EOS Aufnahme, "
 
-#: camlibs/ptp2/library.c:5744
-#, fuzzy
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
-msgstr "Canon EOS Aufnahme"
+msgstr "Canon EOS Aufnahme 2, "
 
-#: camlibs/ptp2/library.c:5748
-#, fuzzy
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
-msgstr "Nikon Aufnahme 1"
+msgstr "Nikon Aufnahme 1, "
 
-#: camlibs/ptp2/library.c:5750
-#, fuzzy
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
-msgstr "%sNikon Aufname 2"
+msgstr "Nikon Aufnahme 2, "
 
-#: camlibs/ptp2/library.c:5752
-#, fuzzy
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
-msgstr "%sNikon Aufnahme 3"
+msgstr "Nikon Aufnahme 3, "
 
-#: camlibs/ptp2/library.c:5756
-#, fuzzy
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
-msgstr "Sony Aufnahme"
+msgstr "Sony Aufnahme, "
 
-#: camlibs/ptp2/library.c:5761
-#, fuzzy
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
-msgstr "Olympus E XML Aufnahme\n"
+msgstr "Olympus E XML Aufnahme, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Kein Vendor spezifischer Aufnahmemodus\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon WiFi Unterstützung\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon WiFI Unterstützung\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8104,93 +10320,93 @@
 "\n"
 "Informationen über Speichermedium:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tBeschreibung des Speichergeräts: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tLabel des Speichergerätes: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Eingebautes ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Entfernbares ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Eingebauter Speicher"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Entfernbarer Speicher (Karte)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Unbekannt: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tSpeichertyp: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Generisch flacher Modus"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Generisch hierarchischer Modus"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Standard Digital Kamera Layout (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTyp des Dateisystems: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Lesen und Schreiben"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "nur Lesen"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Nur Lesen und Löschen"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tZugriffsmöglichkeiten: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaximale Kapazität: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tFreier Platz (Bytes): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tFreier Speicher (Bilder): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8198,47 +10414,47 @@
 "\n"
 "Properties des Geräts:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " nicht ausgelesen.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "kann nicht abgefragt werden.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "schreibgeschützt"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "schreibbar"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr "PTP Fehler %x beim Abfragen"
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Datei »%s/%s« existiert nicht"
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Der Metadaten Dateityp ist nur für MTP Geräte unterstützt."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Diese Kamera unterstützt kein Setzen von Bildschutz."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Das Gerät konnte Object Protection nicht auf %d setzen"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8247,2267 +10463,2323 @@
 "Derzeit ist PTP nur für USB und PTP/IP Kameras implementiert, Port Typ ist "
 "%x."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 "Olympus E series XML Unterstützung ist derzeit nur mit libxml2 moeglich."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP- Undefinierter Fehler"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP-OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP-Allgemeiner Fehler"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP-Sitzung nicht geöffnet"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP-Fehlerhafte Transaktions-ID"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP-Operation nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP-Parameter nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP-Unvollständiger Transfer"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP-Fehlerhafte Storage-ID"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP-Ungültiges Object Handle"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP-Geräteeigenschaft nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP-Ungültiger Object Formatcode"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP-Speicher voll"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP-Objekt schreibgeschützt"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP-Speicher-schreibgeschützt"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP-Zugriff verweigert"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP-Kein Thumbnail vorhanden"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP-Selbsttest fehlgeschlagen"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP-Partiell gelöscht"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP- Speicher nicht verfügbar"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP- Spezifikation durch Format nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP-Keine gültige Object Information"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP-Ungültiges Codeformat"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP-Unbekannter Händlercode"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP-Aufnahme bereits beendet"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP-Device belegt"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP-Ungültiges Vaterobjekt"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP-Ungültiges Geräteeigenschaften Format"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP-Ungültiger Geräteeigenschaftswert"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP-Ungültiger Parameter"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP- Sitzung bereits geöffnet."
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP-Transaktion abgebrochen"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP-Spezifikation des Zieles nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr "Ungültiges Aufzählungs Handle"
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr "Kein Strom angeschaltet"
+
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr "Ungültiger Datensatz"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Dateiname erforderlich"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Dateinamenskonflikt"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Dateiname ungültig"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Hardware Fehler"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Nicht im Fokus"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Ändern des Kameramodells fehlgeschlagen"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Ungültiger Status"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Setzen der PTP-Geräteeigenschaft nicht unterstützt"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Fehler beim Zurücksetzen des Weißabgleichs"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Staubreferenzfehler"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Belichtungszeit bei Langzeitbelichtung"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Spiegel hochklappen"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Kamera Modus FNummer nicht anpassen"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Nicht im Liveview Modus"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "MF am Anschlag"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "MF Schritt zu klein"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Abbruch des erweiterten Transfers"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr "Kein voll-HD Bild vorhanden"
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr "Kartenfehler"
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr "Karte ist nicht formatiert"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr "Langzeitbelichtung beschäftigt"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr "Leises Auslösen beschäftigt"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr "Filmaufnahme Auslösen ist beschäftigt"
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr "Belichtungszeit spezifiziert"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr "Warte auf zweites Auslösen"
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr "Spiegel-Hoch Aufnahme bereits gestartet"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr "Ungültiger SBAttribute Wert"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Unbekanntes Kommando"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Operation abgelehnt"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
-msgstr "Objektivkappe aufgesetzt"
+msgstr "Objektiv kappe aufgesetzt"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Batterie fast leer"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Kamera nicht bereit"
 
-#: camlibs/ptp2/ptp.c:4708
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr "Objektiv kappe aufgesetzt"
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr "Niedriger Batteriestand"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr "Objekt nicht bereit"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr "Kann Objekt nicht anlegen"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr "Speicherstatus nicht bereit"
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr "Ungültiger ObjectPropCode"
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr "Ungültiges ObjectProp Format"
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr "Ungültiger ObjectProp Wert"
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr "Ungültiges Objekt Referenz"
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr "Ungültiger Datensatz"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr " Spezifikation durch Gruppe nicht unterstützt"
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr "Spezifikation durch Tiefe nicht unterstützt"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr "Objekt zu groß"
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr "ObjectProp nicht unterstützt"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr "Ungültige Media Sitzungs ID"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr "Medien Sitzung Limit erreicht"
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr "Keine Daten mehr"
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr "Ungültige WFC Syntax"
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr "WFC Version nicht unterstützt"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "PTP-Device belegt"
+msgstr "PTP-Kein Device"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "PTP Timeout"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "PTP Abbruch Anfrage"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "PTP-Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "PTP-Protokollfehler: Daten erwartet"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "PTP-Ein/Ausgabefehler"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Undefinierte PTP Property"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Funktionsmodus"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Kompressionseinstellung"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Weißabgleich"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB-Verstärkung"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Belichtungszeit"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Belichtungsprogrammmodus"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Belichtungsindex (ISO-Filmempfindlichkeit)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Belichtungskorrektur"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Aufnahmeverzögerung"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digitalzoom"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Zeitraffer Nummer"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Zeitraffer Intervall"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Upload URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Copyright Information"
 
-#: camlibs/ptp2/ptp.c:4772
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
-msgstr "Unterstützte Thumbnail Größe"
+msgstr "Unterstützte Datenströme"
 
-#: camlibs/ptp2/ptp.c:4773
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
-msgstr "Ungültiger Status"
-
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Datumsformat"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Filmauflösung"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Filmqualität"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Kontrast"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Helligkeit"
+msgstr "Aktivierte Datenströme"
 
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Datumsformat"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
-msgstr ""
+msgstr "Ton Samplingrate"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
+msgstr "Ton Bits per Sample"
 
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Datums- und Zeitformat"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Video Ausgang"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Stromsparmodus"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Benutzerinterface Sprache"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Batterietyp"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Batteriemodus"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "UILockType"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Kameramodus"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Volles Anzeige Dateiformat"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Selbstauslöser"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Aufnahme Modus"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Bildmodus"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Langsame Aufnahme Einstellung"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "AF Modus"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Bildstabilisierung"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Farbverstärkung"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Empfindlichkeit"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Parameter Set"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Av Open"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Av Max"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Fokus Tiefe Tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Fokus Tiefe Weit"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Fokus Tiefe Nenner"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Aufnahmespeicherziel"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
-msgstr "Namensprefix"
+msgstr "Namenspräfix"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Bildgröße und -qualität"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
-msgstr "Unterstützte Thumbnail Größe"
+msgstr "Unterstützte Vorschau Größe"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Datengröße beim Transfer von der Kamera"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Datengröße beim Transfer zur Kamera"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Kamera API Version"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Kamerabesitzer"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX Zeit"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
-msgstr "Kamera Body ID"
+msgstr "Kamera Gehäuse ID"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av Open Apex"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Digitalzoom Vergrößerung"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "MI Punkt Position"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Disp Av Max"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av Max Apex"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "EZoom Start Position"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "EZoom Größe des Teles"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Blitzanzahl"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Rotationswinkel"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Rotationsszene"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Event Emulations Modus"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Art der Slideshow"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Durchschnittliche Dateigröße"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Modell ID"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr "EOS Fixierte Filmschalter"
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Aufnahme Bank"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Aufnahme Bankname A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Aufnahme Bankname B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Aufnahme Bankname C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Aufnahme Bankname D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Setze Menübank 0 zurück"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Weißabgleich Farbtemperatur"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Voreinstellung Weißabgleich Nummer"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Voreinstellung des Weißabgleichs Name 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Voreinstellung des Weißabgleichs Name 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Voreinstellung des Weißabgleichs Name 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Voreinstellung des Weißabgleichs Name 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Voreinstellung des Weißabgleichs Name 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Voreinstellung des Weißabgleichs Wert 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Voreinstellung des Weißabgleichs Wert 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Voreinstellung des Weißabgleichs Wert 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Voreinstellung des Weißabgleichs Wert 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Voreinstellung des Weißabgleichs Wert 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Fokus Tiefe der Linse (Nicht CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Maximale Blende der Linse (Nicht CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Automatisches DX Crop"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Menübank Name A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Menübank Name B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Menübank Name C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Menübank Name D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Setze Menübank zurück"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Vertikaler Autofokus An"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Fokus Bereich Zone"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Copyright aktivieren"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
-msgstr "Belichtungs ISO Schritt"
+msgstr "Belichtung ISO Schritt"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Belichtungszeitschritt"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Belichtungskorrektur (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Mittelpunkt/Gewichtet Bereich"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
-msgstr "Belichtungs Basis Matrix"
+msgstr "Belichtung Basis Matrix"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
-msgstr "Belichtungs Basis Zentrum"
+msgstr "Belichtung Basis Zentrum"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
-msgstr "Belichtungs Basis Punkt"
+msgstr "Belichtung Basis Punkt"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Liveview AF Bereich"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Zeit für automatische Sensor Abschaltung"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
-msgstr "Selbstauslöserzeit"
+msgstr "Selbstauslösezeit"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Img Conf Time"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Zeit für automatische Abschaltung"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Neigung"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Abstand bei Mehrfachbelichtung"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
-msgstr "Belichtungs Verzögerungs Modus"
+msgstr "Belichtung Verzögerung Modus"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Langzeitbelichtungsrauschkompensation"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "LCD Beleuchtung"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Rauschunterdrückung bei hohen ISO"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Tips auf dem Bildschirm"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Künstlername"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Copyright Information"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Modellierblitz"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Manueller Abstufungsmodus"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Automatischer Abstufungsselektion"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "NIKON Automatischer Abstufungsselektion"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Mittlerer Button Aufnahme Modus"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Mittlerer Button Playback Modus"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Multiselektor"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Photo Info. Playback"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
-msgstr "Weise Func. Button zu"
+msgstr "Weise Funktions. Button zu"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
-msgstr "Passe Kommando Dials an"
+msgstr "Passe Kommando Räder an"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Blendeneinstellung"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Knöpfe und Räder"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Auslösen ohne CF Karte"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Mittlerer Button Zoom Faktor"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
-msgstr "Funktions Knopf 2"
+msgstr "Funktion Knopf 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Normaler Autofokus An"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Säubere Bildsensor"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Bild Kommentar"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Bild Kommentar anschalten"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Bildrotationsflag"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Manuell gesetzte Objektivnummer"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
-msgstr "Film Bildschirmgrösse"
+msgstr "Film Bildschirmgröße"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Film Stimme"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Film Mikrofon"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Film Kartenslot"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Bildschirmabschaltverzögerung"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Aktivierung der Abstufung"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
-msgstr "Belichtungs Abstufung Schritt"
+msgstr "Belichtung Abstufung Schritt"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
-msgstr "Belichtungs Abstufung Programm"
+msgstr "Belichtung Abstufung Programm"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
-msgstr "Automatische Belichtungs Abstufung Anzahl"
+msgstr "Automatische Belichtung Abstufung Anzahl"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Automatische Weißabgleich Abweichung Schritt"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Automatische Weißabgleich Abweichung Programm"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Objektiv Kennung"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Objektivart"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Objektivtyp"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Minimale Brennweite"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Maximale Brennweite"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Maximale Blende bei Minimaler Brennweite"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Maximale Blende bei maximaler Brennweite"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "ISO Anzeige im Sucher"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Abschaltzeit für Fotoanzeige"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Abschaltzeit für Menü"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Abschaltzeit Information"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Selbstauslöser Aufnahmenummer"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Vignette Einstellungen"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Nikon Belichtungszeit"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Warn Status"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Top Modus 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Aktiver AF Sensor"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Belichtungsmesser"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "USB Geschwindigkeit"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "CCD Seriennummer"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Gruppen PTN Typ"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "F-Nummer Lock"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Belichtung Blende Lock"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "TV Lock Einstellungen"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "AV Lock Einstellungen"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Illum Einstellung"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Fokuspunkt beleuchtet"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Externer Blitz angesteckt"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Status Externer Blitz"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Art des externen Blitz"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Externer Blitzmodus"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Belichtungskorrektur des externen Blitzes"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
-msgstr "Schwarz/Weiss Filtereffekt"
+msgstr "Schwarz/Weiß Filtereffekt"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
-msgstr "Schwarz/Weiss Schärfe"
+msgstr "Schwarz/Weiß Schärfe"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
-msgstr "Schwarz/Weiss Kontrast"
+msgstr "Schwarz/Weiß Kontrast"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
-msgstr "Schwarz/Weiss Einstellungsart"
+msgstr "Schwarz/Weiß Einstellungsart"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Slot 2 Speichermodus"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "RAW Bit Modus"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
 msgstr "Fluoreszenztyp"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Farbtemperatur einstellen"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Voreinstellung 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Voreinstellung 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Voreinstellung 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Voreinstellung 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Voreinstellung 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Autofokus Modus"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Autofokus Hilfslicht"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Auto ISO P/A/DVP Einstellung"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Gitterlinien im Sucher"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Blitzkommandomodus Energie"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Auto FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
-msgstr "Warnungs Anzeige"
+msgstr "Warnung Anzeige"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Batterietyp"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
-msgstr "ISO Auto High Limit"
+msgstr "ISO Auto Hoch Limit"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Kontinuierliche Aufnahme schnell"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Info Anzeige Einstellung"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Vorschau Knopf"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Vorschau Knopf 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "AEAF Lock Knopf 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Anzeige"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
-msgstr "Battery Typ Priorität"
+msgstr "Batterie Typ Priorität"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Belichtungsreihe Anzahl und Schritte"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Live View Modus"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Live View Auslöse Modus"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Live View Status"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Live View Zoom Faktor"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Live View Verhinderungszustand"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
-msgstr "Belichtungs Anzeige Status"
+msgstr "Belichtung Anzeige Status"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
-msgstr "Belichtungs Indikator Status"
+msgstr "Belichtung Indikator Status"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Info Anzeige Fehler Status"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
-msgstr "Belichtungs Indikator Aufleuchten"
+msgstr "Belichtung Indikator Aufleuchten"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Blitz MRepeat Wert"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Blitz MRepeat Nummer"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Zeitraffer Intervall"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Aktiviertes Pic Ctrl Item"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Ändere Pic Ctrl Item"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr "Kamera Sprache"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr "Auslösen ohne SD Karte"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Bild Komprimierung"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Sichere Zeit"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Geräte Zertifikat"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Revokationsinformation"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Synchronisationspartner"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Anzeigbarer Gerätename"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Lautstärke"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Geräte Icon"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Session Initiator Information"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Angenommener Gerätetyp"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Abspielgeschwindigkeit"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Abgespieltes Objekt"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Abspiel Container Index"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Abspielposition"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "PlaysForSure ID"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Qualität"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Aufnahme Modus"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Fokus Bereich"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "AE Lock"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
+msgstr "Fokuspunkt"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Bildgröße"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Belichtungszeit"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Farbtemperatur"
-
-#: camlibs/ptp2/ptp.c:5439
-#, fuzzy
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
-msgstr "Fokus Bereich"
+msgstr "Fokus Status"
 
-#: camlibs/ptp2/ptp.c:5440
-#, fuzzy
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
-msgstr "Kein Speicherplatz vorhanden"
+msgstr "Objekte im Speicher"
 
-#: camlibs/ptp2/ptp.c:5441
-#, fuzzy
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
-msgstr "Belichtungszeit"
+msgstr "Aufnahme Index"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
-msgstr ""
+msgstr "AB Filter"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Standbild"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr "Nah und Fern"
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr "AF Bereichspunkt"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Datum und Zeit"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f Blendenstufen"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Normal"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Basic"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Kunstlicht - Glühlampe"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Manueller Fokus"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automatischer Makro (nah)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Zentral Punkt"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Automatischer Blitz"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Auto Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Rote-Augen-Blitz Füllmodus"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Schnellaufzug"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Selbstauslöser + Entfernt"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "nur AF Lock"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Blitz Lock"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Setze Fokus Punkt ins Zentrum"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Highlight auf aktiven Fokuspunkt"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Unbenutzt"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
-msgstr "SDRam"
+msgstr "SDRAM"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "LCD-Hintergrundbeleuchtung"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "LCD-Hintergrundlicht und Informationsdisplay"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 Minute"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 Minuten"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 Minuten"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 Minuten"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Dunkel auf Hell"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Hell auf Dunkel"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Lithium Ionen"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nickel Hydrid"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nickel Cadmium"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkalium Mangan"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Warnstufe 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Notfall"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Warnstufe 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Sparmodus"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Superfein"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Langsame Synchronisation"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatische Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "An + Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Fernaufnahme"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Schneller Verschluss"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Langsamer Verschluss"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Nachtansicht"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Graustufen"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Pan Fokus"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Einzelbildaufnahme"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
-msgstr "Kontinuierliche Aufnamen"
+msgstr "Kontinuierliche Aufnahmen"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Timer (Einzel) Aufnahme"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Kontinuierlicher Langsame Geschwindigkeit Aufnahme"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Kontinuierlicher Schnelle Geschwindigkeit Aufnahme"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Weich"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Mittelpunktgewichtete Messung"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Spotmessung"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Mittelwertmessung"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Berechnetes Messen"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Partielle Messung"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Mittelpunkt/Gewichtete Messung"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Punktmessung geschnitten mit AF Rahmen"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Mehrpunktmessung"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Langsame Verschlussfunktion nicht verfügbar"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Niedrig 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Hoch 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Höher 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Höher 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
-msgstr "Standart Entwicklungsparameter"
+msgstr "Standard Entwicklungsparameter"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Entwicklungsparameter 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Entwicklungsparameter 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Entwicklungsparameter 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MI Punkt Position Zentrum"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MI Punkt Position Autofokuskopplung"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Media Card"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Mediacard Gruppe"
 
-#: camlibs/ptp2/ptp.c:6280
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Windows Bild Format"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Undefiniertes Audioformat"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Audible.com Codec"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Samsung Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Undefiniertes Videoformat"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Undefinierte Sammlung"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Abstraktes Multimedia Album"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Abstraktes Bild Album"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Abstraktes Musik Album"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Abstraktes Video Album"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Abstrakte Audio Video Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
-msgstr "Abstrakte Addressen Gruppe"
+msgstr "Abstrakte Adressen Gruppe"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Abstrakter Nachrichten Ordner"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Abstrakte Produktion mit Kapiteln"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
-msgstr "Astrakte Audio Wiedergabeliste"
+msgstr "Abstrakte Audio Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
-msgstr "Astrakte Video Wiedergabeliste"
+msgstr "Abstrakte Video Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstrakter MediaCast"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "WPL Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "M3U Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "MPL Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "ASX Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "PLS Wiedergabeliste"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Undefiniertes Dokument"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstraktes Dokument"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
-msgstr "XMLDokument"
+msgstr "XML Dokument"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word Dokument"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "MHT Kompiliertes HTML Dokument"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Microsoft Excel Tabelle (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft PowerPoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Undefinierte Nachricht"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstrakte Nachricht"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
-msgstr "Undefinierter Addressbucheintrag"
+msgstr "Undefinierter Adressbucheintrag"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstrakter Adressbucheintrag"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Undefinierte Kalendereintrag"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstrakter Kalendereintrag"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
-msgstr "Undefiniertes Windows Executable"
+msgstr "Undefiniertes Windows Programm"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Mediacast"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sektion"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Unbekannt (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Device Informationen abfragen"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Sitzung öffnen"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Sitzung schließen"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Speicher IDs abfragen"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Speicher Information abfragen"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Anzahl an Objekten abfragen"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Objekt Handles holen"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Objekt Information holen"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Objekt holen"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
-msgstr "Thumbnail holen"
+msgstr "Vorschau holen"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Objekt löschen"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Objekt Information senden"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Objekt senden"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Aufnahme auslösen"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Speicher formatieren"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Gerät zurücksetzen"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Geräteselbsttest"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Objektschutz setzen"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Gerät ausschalten"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Device Property Beschreibung abfragen"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Device Property Wert abfragen"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Device Property Wert setzen"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Device Property Wert zurücksetzen"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
-msgstr "Open Capture beenden"
+msgstr "Offene Aufnahme beenden"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Objekt verschieben"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Objekt kopieren"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Teilobjekt holen"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
-msgstr "Open Capture starten"
+msgstr "Offene Aufnahme starten"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
-msgstr ""
+msgstr "Beginne Aufzählung von Handles"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
-msgstr ""
+msgstr "Zähle Handles auf"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
-msgstr ""
+msgstr "Stoppe Aufzählung von Handles"
 
-#: camlibs/ptp2/ptp.c:6422
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
-msgstr "Hersteller Erweiterung"
+msgstr "Hole Hersteller Erweiterung Listen"
 
-#: camlibs/ptp2/ptp.c:6423
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
-msgstr "Device Informationen abfragen"
+msgstr "Device Hersteller Informationen abfragen"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
-msgstr ""
+msgstr "Hole skaliertes Bild"
 
-#: camlibs/ptp2/ptp.c:6425
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
-msgstr "Schnelles Dateisystem"
+msgstr "Hole Schnellen Dateisysteminhalt"
 
-#: camlibs/ptp2/ptp.c:6426
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
-msgstr "Speicher Information abfragen"
+msgstr "Datenstrom Information"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
-msgstr ""
+msgstr "Hole Datenstrom"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
-msgstr "Unterstützte Objekt Properties abfragen"
+msgstr "Unterstützte Objekt Eigenschaften abfragen"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Objekt Property Beschreibung abfragen"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Objekt Property Wert abfragen"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Objekt Property Wert setzen"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Objekt Property Liste abfragen"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Objekt Property Liste setzen"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Interdependent Property Beschreibungen abfragen"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Objekt Property Liste senden"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Objekt Referenzen abfragen"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Objekt Referenzen setzen"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Firmware des Geräts aktualisieren"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
-msgstr "Zur nächsten Position in der Wiedergabeliste skippen"
+msgstr "Zur nächsten Position in der Wiedergabeliste springen"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
-msgstr "Secure Time Challenge holen"
+msgstr "Sichere Time Challenge holen"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
-msgstr "Secure Time Anfrage holen"
+msgstr "Sichere Time Anfrage holen"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Lizenz Antwort setzen"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Sync List holen"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Meter Challenge Anfrage senden"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Meter Challenge holen"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Meter Response holen"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
-msgstr "Daten Store löschen"
+msgstr "Daten Speicher löschen"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Lizenz Status holen"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "WMDRM-PD Kommando senden"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "WMDRM-PD Anfrage senden"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Hinzugefügte/gelöschte Objekte berichten"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Erworbene Objekte berichten"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Typen übertragbarer Wiedergabelisten holen"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "WMDRM-PD Applikationsanfrage senden"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "WMDRM-PD Applikations Antwort holen"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Trusted File Operationen anschalten"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Trusted File Operations ausschalten"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Trusted Application Sitzung beenden"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Media-Sitzung öffnen"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Media-Sitzung schließen"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Nächsten Daten Block holen"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Derzeitige Zeitposition setzen"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
-msgstr "Registrierungs Request sende"
+msgstr "Registrierungsanfrage senden"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Registrierungsantwort holen"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Proximity Challenge holen"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Proximity Challenge senden"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "WMDRM-ND Lizenz Anfrage senden"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "WMDRM-ND Lizenz Antwort holen"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "WFC Objekt bearbeiten"
 
-#: camlibs/ptp2/ptp.c:6487
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
-msgstr "Get partial object (64bit Offset)"
+msgstr "Hole Partielles Objekt (64bit Offset)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Partielles Objekt senden"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Objekt verkürzen"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
-msgstr "Edit Objekt beginnen"
+msgstr "Objekt Modifikation beginnen"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
-msgstr "Edit Objekt beenden"
+msgstr "Objekt Modifikation beenden"
 
-#: camlibs/ptp2/ptp.c:6737
-#, fuzzy
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
-msgstr "Unbekannt %d"
+msgstr "Unbekannter PTP OpCode"
 
-#: camlibs/ptp2/ptp.c:6755
-#, fuzzy
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
-msgstr "Hersteller Erweiterung"
+msgstr "Unbekannte Hersteller Erweiterungen ID"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Unbekannter Wert"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Film herunterladen..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Audio herunterladen..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "EXIF-Daten herunterladen..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Keine EXIF-Daten für %s verfügbar."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Konnte Datei nicht löschen."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Konnte Ordner nicht löschen."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Konnte Ordner nicht anlegen."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Version: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTC Status: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Kamera Zeit: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Kamera-ID: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "SD Speicherkarte nicht eingelegt.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD Karten-ID: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Fotos in Kamera: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD Speicher: %d MB total, %d MB frei.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Interner Speicher: %d MB total, %d MB frei.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10519,7 +12791,7 @@
 "Rückentwickelt mittels USB Snoopy, anschauen des Firmware Updates und wildem "
 "Ratens.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10531,12 +12803,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "basierend auf Bob Paauwes Treiber\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "unbekannt (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10545,198 +12817,198 @@
 "Modell: %s\n"
 "Speicherplatz: %d Byte(s) von %d frei"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Im Freien"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximal"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimal"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Charakter"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Sound"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Bild & Sound"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Charakter & Sound"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Allgemein"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
-msgstr "Copyright (max. 20 Zeichen)"
+msgstr "Copyright (maximal 20 Zeichen)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Bilder"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Weißlevel"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Aufnahmemodus"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Kompression"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Aufnahmegeschwindigkeit %i wird nicht unterstützt!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "%i erwartet, %i erhalten. Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "%i Bytes erwartet, %i erhalten. Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Wir haben 0x%x erwartet, aber 0x%x erhalten. Bitte kontaktieren Sie %s mit "
 "diesen und möglichen weiteren Debuginformationen (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Fehlerhafte Zeichen (0x%x, 0x%x). Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Kamera beschäftigt. Wenn dieses Problem länger auftritt, kontaktieren Sie "
 "bitte %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Time-Out selbst nach 2 Versuchen.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Kommunikationsproblem selbst nach 2 Versuchen.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Kamera ist im falschen Modus.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Kamera akzeptierte die Parameter nicht.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ein unbekannter Fehler trat auf.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -10744,7 +13016,7 @@
 "Die Länge des Dateinamens darf 12 Zeichen nicht überschreiten (»%s« hat %i "
 "Zeichen)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10752,113 +13024,112 @@
 "enhanced the port."
 msgstr ""
 "Der Samsung digimax 800k-Treiber wurde von James McKenzie <james@fishsoup."
-"dhs.org> für gphoto geschrieben. Lutz Müller <lutz@users.sourceforge.net> "
-"portierte den Treiber nach gphoto2. Marcus Meißner <marcus@jet.franken.de> "
+"dhs.org> für gPhoto geschrieben. Lutz Müller <lutz@users.sourceforge.net> "
+"portierte den Treiber nach gPhoto2. Marcus Meißner <marcus@jet.franken.de> "
 "vollendete und verbesserte die Portierung."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Auflösung und Größe"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Datum und Zeit (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Blendeneinstellungen"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Farbmodus"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Blitzeinstellungen"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Stromsparmodus am PC (in Sekunden)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Stromsparmodus der Kamera (in Sekunden)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Objektivmodus"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Englisch"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Französisch"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Deutsch"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italienisch"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
-#, fuzzy
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Bildeinstellungen"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10870,43 +13141,43 @@
 "  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Einige Kommentare über Epson-Kameras:\n"
-"- einige Parameter sind nicht fernsteuerbar:\n"
+"- einige Parameter sind nicht fern-steuerbar:\n"
 "  * Zoom\n"
 "  * Fokus\n"
 "  * Benutzer-Weißabgleich\n"
 "- Die Konfiguration wurde mit einer PhotoPC 3000z rückentwickelt.\n"
 "  Wenn Ihre Kamera anders reagiert, dann senden Sie bitte\n"
-"  eine Mail an die gphoto developer Mailing Liste (auf Englisch).\n"
+"  eine Mail an die gPhoto Entwickler Mailing Liste (auf Englisch).\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Keine Speicherkarte vorhanden"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Kann die Batteriekapazität nicht bekommen"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "Der Batteriestand der Kamera ist zu niedrig (%d%%). Befehl wird abgebrochen."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Kann verbleibenden Speicherplatz nicht abfragen"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Kamera hat 3 Versuche die Verbindung offen zu halten abgelehnt."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Das erste empfangene Byte (0x%x) ist nicht gültig."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -10914,57 +13185,57 @@
 "Time-Out für Übertragung des Datenpakets nach %i Versuchen. \n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Konnte Paket auch nach mehreren Versuchen nicht senden."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr ""
 "Datenpaket wurde von der Kamera abgelehnt. Bitte kontaktieren Sie %s (auf "
 "Englisch)."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Konnte Datenpaket nicht übertragen (Fehlercode %i).\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Time-Out für Übertragung auch noch 2 Versuchen. Gebe auf..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Unerwartetes Resultat (Fehlercode 0x%x) erhalten. Bitte kontaktieren Sie %s "
 "(auf Englisch)."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Unerwartete Antwort (Fehlercode %i) erhalten. Bitte kontaktieren Sie %s (auf "
 "Englisch)."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Konnte Register %i nicht holen. Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Zu viele Versuche misslungen."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Sende Daten..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -10972,149 +13243,145 @@
 "Rekursive Aufrufe werden vom Sierra-Treiber nicht unterstützt.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Konnte String-Register %i nicht lesen. \n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 Bytes erwartet, %i erhalten. Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Belichtungszeit (Mikrosekunden, 0 automatisch)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Belichtungszeit (in Sekunden)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "S/W"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Anti-Rotaugen"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Langsame Synchronisation"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontrast-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Helligkeit+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Helligkeit-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Bildjustierung"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Blinkend"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED-Modus"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Unendlich"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Vorschau Modus"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Nächstes"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Kameramodus"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCD-Helligkeit"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
-msgstr "Autom. Abschaltung des LCD (in Sekunden)"
+msgstr "Automatische Abschaltung des LCD (in Sekunden)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Punkt-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Belichtungsmessung"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (in Millimetern)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "kein"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Automatische Belichtungsnachführung"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Fischauge"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Weit"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Andere Belichtungs-/Objektiveinstellungen"
 
 # Is this correct?
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Automatische Belichtungsnachführung"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11135,7 +13402,7 @@
 "\n"
 "        Der optische Zoom funktioniert nicht richtig.\n"
 "\n"
-"        Nicht alle Konfigurationseinstllungen\n"
+"        Nicht alle Konfigurationseinstellungen\n"
 "        können korrekt gelesen oder geschrieben werden,\n"
 "        z.B. die Feineinstellung des Weißabgleichs oder\n"
 "        die Spracheinstellung.\n"
@@ -11143,7 +13410,7 @@
 "        Setzen Sie die Kamera in den »M«-Modus, um die\n"
 "        Belichtungszeit einzustellen.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11157,72 +13424,68 @@
 "Nikon Coolpix 995:\n"
 "    Kamerakonfiguration für diese Kamera ist\n"
 "    unvollständig, bitten kontaktieren Sie die\n"
-"    Entwickler auf der gphoto Entwickler Mailingliste,\n"
+"    Entwickler auf der gPhoto Entwickler Mailingliste,\n"
 "    wenn Sie mithelfen möchten.\n"
 "\n"
 "    Das Herunterladen sollte korrekt funktionieren.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "White Board"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Black Board"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Farb Funktions Modus"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Langsam"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Anti-Rotaugen-Filler"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Floureszierend-1-Wohnung-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluoreszierend-2-Tisch-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Fluoreszierend-3-Büro-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Dämmerung"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD-Modus"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digitalzoom"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Fokusposition"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Zeitformat"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11259,7 +13522,7 @@
 "    Sie die Kamera wieder mit dem PC verbinden und den \n"
 "    LCD-Modus auf »Aus« setzen."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11291,7 +13554,7 @@
 "    Sie die Kamera wieder mit dem PC verbinden und den \n"
 "    LCD-Modus auf »Aus« setzen."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11322,106 +13585,111 @@
 "    haben, dann setzen Sie sich bitte mit der\n"
 "    Entwickler-Mailingliste in Verbindung.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (unbekannt)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Die hochzuladende Datei hat eine Größe von null Bytes"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Nicht genügend Speicherplatz auf der Karte vorhanden"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kann den Namen des Ordnerses mit den Bildern nicht bekommen"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Hochladen ist nur in das Ordner »%s« unterstützt"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Beste"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (unbekannt)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Belichtungszeit (Mikrosekunden, 0 automatisch)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Schwarz/Weiß"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "White Board-Effekt"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Black Board-Effekt"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Helligkeit/Kontrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Hell+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Hell-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Tageslicht"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Unendlich/Fischauge"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Spotmessung"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Autom. Abschaltung (am PC) (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11429,12 +13697,12 @@
 "Wie lange soll es dauern, bis die Kamera abschaltet, wenn sie an den "
 "Computer angeschlossen ist?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Autom. Abschaltung (nicht am PC) (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11442,116 +13710,116 @@
 "Wie lange soll es dauern, bis die Kamera abschaltet, wenn sie nicht an den "
 "Computer angeschlossen ist?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Autom. Abschaltung des LCD (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Aufnahme-Einstellungen"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "Standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "farbig"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "schwarz/weiß"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Note: keine Speicherkarte vorhanden, einige Werte können ungültig sein\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Kameramodell: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Seriennummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Software-Revision: %s\n"
 
 # Haesslich Colin
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Aufgenommene Bilder: %i\n"
 
 # Haesslich... Colin
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Verbleibende Bilder: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Batterielebensdauer: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Verbleibender Speicher: %i bytes\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Datum: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Keine Kamera Hilfe verfügbar.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11572,7 +13840,7 @@
 "  Wenn Ihre Kamera anders reagiert, dann senden Sie bitte\n"
 "  eine Mail an %s (auf Englisch).\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11610,7 +13878,7 @@
 "    LCD-Modus auf »Aus« setzen."
 
 # Ist "Freigabe" richtig? Colin
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11629,12 +13897,7 @@
 "Dank an Data Engines (www.dataengines.com) für die\n"
 "Freigabe ihrer Olympus C-3030Z for USB-Implementierung."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (unbekannt)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11644,11 +13907,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meißner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Konnte USB-Einstellungen nicht setzen"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11669,7 +13932,7 @@
 "Bibliothek zum Zugriff auf die Smal Ultrapocket Kamera und ihre OEM "
 "Versionen (slimshot)."
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11684,7 +13947,7 @@
 "Sonix Kamera.\n"
 "Es sind %i Fotos auf der Kamera.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11710,7 +13973,7 @@
 "Thumbnails für AVIs sind normale Bilder vom ersten Bild.\n"
 "Bilder können nur gelöscht werden, wenn sie die letzten sind.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11718,7 +13981,7 @@
 "Sonix Kamera Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11732,7 +13995,7 @@
 "Ken-ichi Hayashi\n"
 "Gphoto2-Portierung von Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11744,7 +14007,7 @@
 "Erste Implementation durch Mark Davies <mdavies@dial.pipex.com>\n"
 "gPhoto2 Portierung durch Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11757,12 +14020,12 @@
 "Speicher:        %ikB\n"
 "Freier Speicher: %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Firmware-Revision: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11770,7 +14033,7 @@
 "Soundvision-Treiber\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11779,7 +14042,7 @@
 "Flash Speicher:\n"
 " Dateien: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11796,7 +14059,7 @@
 "Benutzter Speicher: %8d\n"
 "Freier Speicher: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x-Bibliothek v"
 
@@ -11859,12 +14122,12 @@
 "Generischer sq905 Treiber\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
-msgstr "Der USB Bilder Rahmer hat einen ST2205 Chipsatz.\n"
+msgstr "Der USB Bilder Rahmen hat einen ST2205 Chipsatz.\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11874,7 +14137,7 @@
 "Dieser Treiber erlaubt das Herunterladen, Hochladen und Löschen von Bildern\n"
 "vom Bilderrahmen."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11886,11 +14149,7 @@
 "Dieser Treiber erlaubt das Herunterladen, Hochladen und Löschen von Bildern\n"
 "vom Bilderrahmen."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Kameraausrichtung"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11902,110 +14161,110 @@
 "Treiber für Kameras mit dem STV0674 ASIC.\n"
 "Protokoll wurdde mit Snoopy Pro reverse engineered.\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Fehlbelichtung (wahrscheinlich nicht genug Licht)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informationen für STV0680-basierte Kamera:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Firmware-Revision: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC-Revision: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Sensor-ID: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Die Kamera ist für Kunstlicht mit %dHz konfiguriert.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Speicher in Kamera: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Kamera unterstützt Vorschaubilder.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Kamera unterstützt Video.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Kamerabilder sind monochrom.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Kamera hat Speicher.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Kamera unterstützt folgende Videoformate: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Hersteller-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Produkt-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Anzahl der Bilder: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Maximale Anzahl der Bilder: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Bildbreite: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Bildhöhe: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Bildgröße: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Vorschaubildbreite: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Vorschaubildhöhe: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Vorschaubildgröße: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12021,12 +14280,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Erweitert für Aiptek PenCam und andere STM USB Dual-Mode-Kameras."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Hole Informationen über %i Dateien..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12039,19 +14298,19 @@
 "Bitte senden sie Fehler und Kommentare.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z ist nur-USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Treiber Einstellungen"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Turbo Modus"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12063,12 +14322,12 @@
 "Bilbiothek um Dateien von einem Topfield PVR herunter- oder hochzuladen.\n"
 "Portiert von puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Lade »%s« herunter..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12078,41 +14337,68 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 Treiber.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Der USB Bilder Rahmen hat einen TP6801 Chipsatz.\n"
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"TP6801 basierte Bilderrahmen haben viele mögliche Auflösungen.\n"
+"Dieser Treiber erlaubt das Herunterladen, Hochladen und Löschen von Bildern\n"
+"vom Bilderrahmen."
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Treiber für TP6801 USB Bilder Rahmen\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Dieser Treiber erlaubt das Herunterladen, Hochladen und Löschen von Bildern\n"
+"vom Bilderrahmen."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 "Interner Fehler beim Suchen der Kamerabibliotheken (Pfadnamen zu lang?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Lade Kameratreiber von »%s«..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Ein Fehler trat in der IO-Bibliothek auf (»%s«): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Konnte keine Kamera finden"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Konnte keine Kamera am Port %s finden"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr ""
 "Sie müssen einen Port setzen, bevor Sie die Kamera initialisieren können"
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Konnte erforderlichen Kameratreiber »%s« (%s) nicht laden."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Kameratreiber »%s« hat keine Funktion »camera_init«."
@@ -12150,12 +14436,12 @@
 msgid "This camera can not capture previews."
 msgstr "Diese Kamera kann keine Vorschaubilder machen."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Die Pfadangabe »%s« ist nicht absolut."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12164,7 +14450,7 @@
 "Sie versuchen, »%s« aus dem Ordner »%s« zu löschen, aber das Dateisystem "
 "unterstützt kein Löschen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
@@ -12172,18 +14458,18 @@
 "Im Ordner »%s/%s«, das Sie zu Löschen versuchen, befinden sich immer noch "
 "Unterverzeichnisse."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Im Ordner »%s/%s«, das Sie zu Löschen versuchen, befinden sich immer noch "
 "Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Das Dateisystem unterstützt kein Hochladen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12191,100 +14477,201 @@
 "Ordner »%s« enthält nur %i Dateien, aber Sie verlangten eine Datei mit der "
 "Nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Datei »%s« konnte nicht im Ordner »%s« gefunden werden."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Konnte Datei »%s« nicht finden."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Das Dateisystem unterstützt kein Holen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Unbekannter Dateityp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Das Dateisystem unterstützt das Holen von Dateiinformationen nicht"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Das Dateisystem unterstützt das Setzen von Dateiinformationen nicht"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "\"Nur-Lesen\"-Dateiattribute wie Höhe und Breite können nicht geändert "
 "werden."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Das Dateisystem unterstützt das Holen von Speicherinformationen nicht"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Korrupte Daten"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Datei existiert bereits"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Unbekanntes Modell"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Ordner nicht gefunden"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Ordner existiert bereits"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "I/O Operation in Arbeit"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Pfadangabe nicht absolut"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operation abgebrochen"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Kamera konnte die Operation nicht vollenden"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Fehler in der Kamerakommunikation"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Nicht genug Plattenplatz"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Unbekannter Fehler des Kamera-Treibers"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
+#, fuzzy
+#~ msgid "Set liveview selector is enabled."
+#~ msgstr "Liveview Selektor ist angeschaltet"
+
+#, fuzzy
+#~ msgid "In enlarged liveview."
+#~ msgstr "In gezoomter Liveview"
+
+#, fuzzy
+#~ msgid "Card protected."
+#~ msgstr "Datei ist schreibgeschützt"
+
+#, fuzzy
+#~ msgid "Already in movie recording."
+#~ msgstr "Filmaufnahme läuft bereits"
+
+#, fuzzy
+#~ msgid "Images / movies not yet record in buffer."
+#~ msgstr "Bilder / Filme noch nicht im Buffer aufgenommen"
+
+#, fuzzy
+#~ msgid "Card full."
+#~ msgstr "Karte voll"
+
+#, fuzzy
+#~ msgid "Card not formatted."
+#~ msgstr "Karte ist nicht formatiert"
+
+#, fuzzy
+#~ msgid "Card error."
+#~ msgstr "Karten Fehler"
+
+#~ msgid "No card."
+#~ msgstr "Keine Karte vorhanden."
+
+#~ msgid "Movie recording cannot start: Camera is not in application mode."
+#~ msgstr ""
+#~ "Filmaufnahme kann nicht starten: Kamera ist nicht im Applikationsmodus"
+
+#~ msgid "Movie recording cannot start: Set liveview selector is enabled."
+#~ msgstr "Filmaufnahme kann nicht starten: Liveview Selektor aktiviert"
+
+#~ msgid "Movie recording cannot start: In enlarged liveview."
+#~ msgstr "Filmaufnahme kann nicht starten: In gezoomter Liveview"
+
+#~ msgid "Movie recording cannot start: Card protected."
+#~ msgstr "Filmaufnahme kann nicht starten: Karte schreibgeschützt."
+
+#~ msgid "Movie recording cannot start: Already in movie recording."
+#~ msgstr "Filmaufnahme kann nicht starten: Aufnahme läuft bereits."
+
+#~ msgid ""
+#~ "Movie recording cannot start: Images / movies not yet record in buffer."
+#~ msgstr ""
+#~ "Filmaufnahme kann nicht starten: Bilder / Filme noch nicht im Aufnahme "
+#~ "Buffer."
+
+#~ msgid "Movie recording cannot start: Card full."
+#~ msgstr "Filmaufnahme kann nicht starten: Karte voll."
+
+#~ msgid "Movie recording cannot start: Card not formatted."
+#~ msgstr "Filmaufnahme kann nicht starten: Karte nicht formatiert"
+
+#~ msgid "Movie recording cannot start: Card error."
+#~ msgstr "Filmaufnahme kann nicht starten: Kartenfehler"
+
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Unbekannter Wert %04d"
+
+#, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "%d Mehr Bild Rauschunterdrückung"
+
+#~ msgid "Custom WB 2"
+#~ msgstr "Benutzerdefinierter Weißabgleich 2"
+
+#~ msgid "Custom WB 3"
+#~ msgstr "Benutzerdefinierter Weißabgleich 3"
+
+#~ msgid "Custom WB 4"
+#~ msgstr "Benutzerdefinierter Weißabgleich 4"
+
+#~ msgid "Custom WB 5"
+#~ msgstr "Benutzerdefinierter Weißabgleich 5"
+
+#~ msgid "Unknown Event"
+#~ msgstr "Unbekanntes Event"
+
+#~ msgid "Setting 4"
+#~ msgstr "Einstellung 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Einstellung 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Einstellung 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Einstellung 7"
+
 #~ msgid "Small Fine JPEG  (S1 Fine)"
 #~ msgstr "Small Fine JPEG (S1 Fein)"
 
@@ -12498,9 +14885,6 @@
 #~ msgid "PTP: EK Filename Invalid"
 #~ msgstr "PTP: EK-Filename ungültig"
 
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP: Ein/Ausgabefehler"
-
 #~ msgid "PTP: Error: bad parameter"
 #~ msgstr "PTP: Fehler: Ungültiger Parameter"
 
@@ -12682,9 +15066,6 @@
 #~ msgid "multi spot metering"
 #~ msgstr "Mehrpunkt Messung"
 
-#~ msgid "large"
-#~ msgstr "groß"
-
 #~ msgid "medium 1"
 #~ msgstr "mittel 1"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/es.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/es.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/es.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/es.po Changed

@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.5.13\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2018-04-09 11:15+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2018-04-18 21:58+0200\n"
 "Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
@@ -21,6 +21,7 @@
 "X-Generator: Poedit 2.0.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: JPEG\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -30,7 +31,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -40,13 +41,13 @@
 "CompactFlash. Desgraciadamente no somos compatibles\n"
 "por este momento :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 "Cámara tiene tomadas %d cuadros, y está utilizando almacén CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -79,19 +80,19 @@
 "Controlador genérico Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Para utilizar marcos de cuadros tiene un chipset AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -99,16 +100,18 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Configuración de Marca Pictórica"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Sincronizar marcos de datos y tiempo con el PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -117,7 +120,7 @@
 "Cantidad de fotos: %i\n"
 "Versión del firmware: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -141,26 +144,26 @@
 "Implementado utilizando documentos encontrados\n"
 "en la web. Permiso concedido por Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "No pudo crear el directorio %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "No pudo eliminar el directorio %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "ha fallado el bloqueo de teclas."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*DESCONOCIDO*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -169,7 +172,7 @@
 "canon_int_capture_image: inicial canon_usb_list_all_dirs() ha fallado con "
 "estado %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -178,19 +181,19 @@
 "canon_int_capture_image: final canon_usb_list_all_dirs() ha fallado con "
 "estado %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "El nombre «%s» (%li caracteres) es demasiado largo, máximo de 20 caracteres "
 "están permitidos."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Minúsculas en %s no permitidas."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -198,7 +201,7 @@
 "canon_int_list_directory:  ERROR: mensaje inicial demasiado corto (%i < "
 "mínimo %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -206,26 +209,26 @@
 "canon_int_list_directory: alcanzado al final del paquete tras examinar la "
 "primera directorio"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: encontró entrada de directorio truncada"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Fichero protegido."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_get_info_func:  ERROR: mensaje inicial muy corto (%i < mínimo %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "No pudo extraer la miniatura JPEG de los datos: No hay comienzo/fin"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "No pudo extraer la miniatura JPEG de los datos: Los datos no están en JFIF"
@@ -235,7 +238,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parámetro NULL «%s» en %s línea %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -243,17 +246,17 @@
 "No se sabe como manipular el valor camera → port → type %i también conocido "
 "como 0x%xin %s línea %i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "ERROR FATAL: valor CRC inicial para la longitud %d desconocido\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "no es posible suponer el valor CRC inicial\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -262,290 +265,301 @@
 "advertencia: CRC no comprobada (añada longitud %d, valor 0x%04x) "
 "############\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Modo Compatible"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Imagen Completa"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Bombilla"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofocus: un-disparo"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofocus: servicio IA"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Error de autofocus: Foco IA"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Foco manual"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Pitido apagado"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Pitido encendido"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Flash apagado"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Flash encendido"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Flash auto"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manual 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Escena alejada"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Disparador rápido"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Disparador lento"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Escena nocturna"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Escala grisácea"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Retrato"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Punteo"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Macro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "BN"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Panorámico"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Vívido"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Disparo largo"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Follaje"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Interior"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Cohetes"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Playa"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Submarino"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Nieve"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Niños y perros"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Instantánea nocturna"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Ampliación Digital"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "MisColores"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Foto en película"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "Crudo"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "Crudo 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Pequeño Común JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Pequeño Fino JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Mediano Común JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Mediano Fino JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Grande Común JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Grande Fino JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "Crudo + Pequeño Común JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "Crudo + Pequeño Fino JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "Crudo + Mediano Común JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "Crudo + Mediano Fino JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "Crudo + Grande Común JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "Crudo + Grande Fino JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -562,44 +576,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Cámara no disponible: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Apagando Cámara"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Error al capturar imagen"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "No pudo obtener el nombre del disco: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Razón desconocida"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "No pudo obtener información del disco: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Error interno #1 en get_file_func() (%s línea %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "No pudo encontrar ningún fichero de audio para %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -610,35 +624,35 @@
 "  %11s bytes en total\n"
 "  %11s bytes disponibles"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Transformador de CA"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "activa baterías"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "energía OK"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "energía no-OK"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "no disponible: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (hora de la máquina %s%i segundos)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +679,7 @@
 "\n"
 "Hora: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -687,24 +701,24 @@
 "Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Error al borrar el fichero"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Error al borrar la miniatura asociada"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Esta cámara no soporta recibir a velocidades superiores a 57600"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "No pudo obtener la letra del disco Flash"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -712,378 +726,400 @@
 "No pudo enviar, no hay disponible ninguna carpeta libre\n"
 "Existe la carpeta 999CANON y contiene una imagen AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "No pudo crear el directorio \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "No pudo crear el directorio de destino."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Configuración del controlador y de la cámara"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Opciones de la cámara"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Nombre del Titular"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Clase del Tamaño Capturado"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Velocidad ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Estado desconocido"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Modo de disparo"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Velocidad Obturador"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Ampliación"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Apertura"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Formato de Imagen"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Modo Flash"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Pitido"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Opciones de Cámara"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Sincronizar fecha y hora de cámara con el PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Informe de Estado de Cámara"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Modelo de Cámara"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Fecha y Hora"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Error"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Versión Firmware"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Energía"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Controlador"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Lista de todos los ficheros"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Mantener el nombre de fichero al enviar"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Cámara no disponible"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Se ha cambiado el nombre del propietario"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "no se ha podido modificar el nombre del propietario"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Clase de tamaño de captura modificada"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Configurando clase de tamaño capturado inválido"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Velocidad ISO establecida inválida"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Velocidad ISO modificada"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "No pudo modificar velocidad ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 #, fuzzy
 msgid "Invalid shooting mode setting"
 msgstr "Opciones de modo fel foco inválido"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Modo disparador modificado"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "No pudo modificar modo de disparo"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Configuración de velocidad de obturador inválida"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Velocidad del obturador modificada"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "No pudo modificar velocidad de disparo"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Configuración de apertura inválida"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Apertura modificada"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "No pudo modificar apertura"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Configuración de compensación de exposición inválida"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Compensación de exposición modificada"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "No pudo modificar compensación de exposición"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Opción de formato de imagen inválido"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Formato de imagen modificado"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "No pudo modificar formato de imagen"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Opciones de modo fel foco inválido"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Modo de foco modificado"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "No pudo modifica modo foco"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Configuración del modo de aviso inválido"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Modo de pitido modificado"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "No pudo modificar nombre del pitido"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Nivel de ampliación modificado"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "No pudo modificar nivel de ampliación"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Modo flash modificado"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "No pudo modificar el modo flash"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "establecer hora"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "no pudo establecer hora"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Proporcionado tipo de puerto no soportado %i = 0x%x. Inicialización "
 "imposible."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Se ha agotado la batería, cámara apagada."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "ERROR: mensaje inesperado"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "ERROR: exceso de mensajes"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "ERROR: fuera de secuencia."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "ERROR: tipo de paquete inesperado."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "ERROR: formato erróneo del mensaje."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "ERROR: mensaje2 inesperado."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Cargando fichero…"
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Obteniendo fichero…"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1091,7 +1127,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue ha fallado al obtener las "
 "entradas de directorio"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1099,145 +1135,145 @@
 "canon_serial_get_dirents: Paquete inicial de entradas de directorio "
 "demasiado corto (sólo %i bytes)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: No se han podido asignar %i bytes de memoria"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Fallo al leer otra entrada de directorio"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 "canon_serial_get_dirents: Se ha recibido una entrada de directorio truncada"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: Demasiadas entradas de directorio, se debe de "
 "estar en un bucle."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: No pudo redimensionar el búfer de entradas de "
 "directorio a %i bytes"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Error al modificar la velocidad."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Reconfigurando protocolo…"
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Cámara Aceptada."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Buscando la cámara…"
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Intentando contactar con la cámara…"
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Error de comunicación 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "No hay respuesta de la cámara"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Respuesta no reconocida"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Se ha detectado una «%s» también conocida como «%s»"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modelo desconocido «%s»"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "FDL equivocado"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Error de comunicación 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Error de comunicación 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Modificando velocidad… espere…"
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Error modificando velocidad"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Error esperando acuse de recibo (ACK) durante la inicialización, reintentando"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Error esperando acuse de recibo (ACK) durante la inicialización"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Conectado a la cámara"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "ERROR: se ha detectado una condición de error fatal, no se puede continuar "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERROR: %d es demasiado grande"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Obteniendo miniaturas…"
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "NO RECONOCIDO"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "No pudo establecer contacto inicial con la cámara"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "La cámara ya estaba activa"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Se ha activado la cámara"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Respuesta inicial de la cámara «%c» no reconocida"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1246,7 +1282,7 @@
 "Paso nº 2 de la inicialización ha fallado: («%s» en lectura de %i). Cámara "
 "no operativa"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1255,7 +1291,7 @@
 "¡Paso nº2 de la inicialización ha fallado! (ha devuelto %i bytes, se "
 "esperaba %i). Cámara no operativa"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1264,7 +1300,7 @@
 "Paso nº 3 de la inicialización ha fallado: «%s» en lectura de %i. Cámara no "
 "operativa"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1273,7 +1309,7 @@
 "¡Paso nº 3 de inicialización ha fallado! (ha devuelto %i, se esperaba %i). "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1282,30 +1318,30 @@
 "Paso nº 3 de la inicialización ha fallado: «%s» en escritura de %i. Cámara "
 "no operativa"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Paso nº 4 fallada: «%s» en lectura de %i. Cámara no operativa"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Paso nº4 ha fallado (ha devuelto %i, se esperaba %i). Cámara no operativa"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "La cámara no está preparada, han fallado varios intentos de petición de "
 "identificación de la cámara: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "La cámara no está preparada, get_battery ha fallado: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1314,14 +1350,14 @@
 "canon_usb_lock_keys: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_get_body_id: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1329,8 +1365,8 @@
 "canon_usb_get_body_id: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
-#, fuzzy, c-format
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
+#, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
 "%i)"
@@ -1338,20 +1374,20 @@
 "canon_usb_get_body_id: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Recibiendo datos…"
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Fuera de memoria: %d bytes necesarios."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue ha fallado"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1360,22 +1396,22 @@
 "Aviso en canon_usb_set_file_attributes: canon_usb_dialogue ha devuelto el "
 "estado de error 0x%08x de la cámara"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "No pudo leer desde el fichero «%s»"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Fuera de memoria: %ld bytes necesarios."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "El envío de fichero ha fallado."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1383,7 +1419,7 @@
 "El fichero era demasiado grande. Puede tener que apagar su cámara y volver a "
 "encenderla antes de enviar más ficheros."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1392,7 +1428,7 @@
 "canon_usb_get_dirents: la carga no cabe en el búfer, '%.96s' (truncado) es "
 "demasiado largo."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1401,7 +1437,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue ha fallado al obtener "
 "entradas de directorio, ha devuelto %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1410,7 +1446,7 @@
 "canon_usb_list_all_dirs: la carga no cabe en el búfer, '%.96s' (truncado) es "
 "demasiado largo."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1419,27 +1455,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue ha fallado al obtener "
 "entradas de directorio, ha devuelto %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Se ha detectado una «%s»."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "El nombre «%s» desde la cámara no coincide con ninguna cámara conocida"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Tipo de imagen %d no compatible"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "La imagen %s está protegida contra borrado."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1447,37 +1483,37 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Nivel de batería: %.1f Volt. Revisión: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Configuración de Cámara"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batería"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Brillo"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Demasiado bsrillo"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Demasiado oscura"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "Aceptar"
 
@@ -1542,16 +1578,16 @@
 "Controlador genérico sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Tipo de imagen no soportado"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Cantidad de imágenes: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1559,7 +1595,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1567,25 +1603,25 @@
 "Sólo se soporta el directorio raíz, - usted ha pedido una lista de ficheros "
 "del directorio «%s»."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problema al obtener el número de imágenes"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problema al obtener la información de la imagen"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Tipo de captura no soportado"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (la batería está cargada al %d%%)"
 
 # FIXME
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1603,83 +1639,84 @@
 "La resolución está configurada a %s\n"
 "La cámara funciona con %s %s\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flash"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Sin Flash"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Doble diafragma"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Sin Diafragma Dual"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Interruptor de selección de la resolución"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 #, fuzzy
 msgid "No Resolution Switch"
 msgstr "Interruptor de selección de la resolución"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Sin Potencia de Luz"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "ACTIVO"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "INACTIVO"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "preparada"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "No preparado"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "en modo de carga"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "No dentro de modo de carga"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "baja (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "alta (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "externamente"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "internamente"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1697,7 +1734,7 @@
 "  configurarse manualmente o ponerse en modo automático.\n"
 "* La calidad de la imagen es actualmente menor de lo que podría ser.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1727,210 +1764,326 @@
 "     Información sobre el protocolo, formato de imagen en bruto,\n"
 "     y adaptación a gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problema al leer la imagen de la memoria flash"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Falta memoria"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Descargando imagen…"
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problema durante la descarga de la imagen"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "El usuario ha cancelado la descarga"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problema al tomar imagen en tiempo real"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Exposición"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Ajuste automático de la exposición en la previsualización"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Nivel de exposición en la previsualización"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Flash automático en la captura"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problema al abrir el puerto"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problema al reinicializar la cámara"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problema al configurar la velocidad de comunicación de la cámara"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Parece un módem, no una cámara"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listando los ficheros que hay en «%s»…"
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listado de las carpetas que hay en «%s»…"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "No pudo obtener información acerca de «%s» (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "No pudo obtener información acerca de «%s» en «%s» (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "No pudo modificar la hora del fichero «%s» en «%s» (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "No pudo abrir «%s»."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "La \"cámara\" 'Examinar el directorio' le permite indexar las fotos que hay "
 "en su disco duro."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Modo Examinar el directorio - escrito por Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "No pudo borrar el fichero «%s» de la carpeta «%s» (código de error %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Configuración del controlador y de la cámara"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Modo de disparo"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Resolución"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Resolución"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Modo de Color"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Modo de Color"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "La cámara ha enviado sólo %i byte(s), pero se necesitan al menos %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "No pudo contactar con la cámara."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Recibidos datos inesperados (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr ""
 "Secuencia de escape incorrecta: se esperaba 0x%02x, se ha recibido 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Datos incorrectos - se ha recibido 0x%02x, se esperaba 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr ""
 "Datos incorrectos - se ha recibido 0x%02x, se esperaba 0x%02x o 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr ""
 "Suma de comprobación incorrecta - se ha recibido 0x%02x, se esperaba 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "La cámara ha rechazado el mandato."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "La cámera se ha reiniciado sola."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "La cámara ha enviado un byte 0x%02x no esperado."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Descargando…"
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "No pudon asignar %i byte(s) para descargar la miniatura."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "No pudon asignar %i byte(s) para descargar la foto."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "La cámara no acepta «%s» como nombre de fichero."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "No pudo inicializar el envío (la cámara ha respondido con 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "La cámara no soporta la velocidad %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "No pudo ajustar la velocidad a %i (la cámara ha respondido con %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1938,36 +2091,36 @@
 "Matthew G. Martin\n"
 "Basado en fujiplay por Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "El valor bit %ld no es compatible."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Configuración para su cámara FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Fecha y Hora"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Versión: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modelo: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Memoria disponible: "
 
@@ -1989,18 +2142,18 @@
 "amablemente proporcionadas por Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Tipo de puerto no soportado: %d. Este controlador sólo funciona con cámaras "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "No pudo reinicializar la cámara.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2009,7 +2162,7 @@
 "Su cámara no soporta borrar el último fichero que hay en la cámara. En este "
 "caso, se trata del fichero «%s»."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2019,7 +2172,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2058,25 +2211,25 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
 # Haesslich Colin
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Marcos tomados: %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "biblioteca jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Descargando los datos…"
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Descargando la miniatura…"
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2092,7 +2245,7 @@
 "   - miniaturas (64x48, formato PGM)\n"
 "   - imágenes completas (640x480, formato PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2104,31 +2257,31 @@
 "Controlador para la cámara Jenoptik JD11.\n"
 "Ingeniería inversa del protocolo usando WINE e IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Configuración JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Otras Opciones"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Tiempo de exposición de la lámpara"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Opciones de Color"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rojo"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Verde (G)"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Azul (B)"
 
@@ -2180,11 +2333,11 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Tarjeta CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2196,7 +2349,7 @@
 "necesitará descargar el programa \"kdc2tiff\". Está disponible en http://"
 "kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2208,13 +2361,13 @@
 "Biblioteca para la cámara Kodak DC120\n"
 "(a petición popular)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Obteniendo los datos…"
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Esperando que finalice la operación…"
 
@@ -2227,7 +2380,8 @@
 msgstr "Tipo de fichero"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2240,7 +2394,7 @@
 msgstr "Resolución del fichero"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2264,8 +2418,9 @@
 msgid "High (good quality)"
 msgstr "Alta (buena calidad)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Captura"
 
@@ -2294,77 +2449,84 @@
 msgstr "Compensación de la exposición"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automática"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Forzar"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Ninguno"
 
@@ -2373,71 +2535,78 @@
 msgstr "Flash anti ojos rojos"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Activar"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Desactivar"
 
@@ -2453,7 +2622,7 @@
 msgid "Port speed"
 msgstr "Velocidad del puerto"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Nombre del álbum"
 
@@ -2672,58 +2841,58 @@
 "Biblioteca para la cámara Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parámetro 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parámetro 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parámetro 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modelo: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Revisión del firmware: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Estado de la batería: %s, transformador CA: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Cantidad de imágenes: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Espacio restante: Alta: %d, Media: %d, Baja: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Estado de la tarjeta de memoria (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Cantidad total de fotos capturadas: %d, iluminaciones del flash: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2737,45 +2906,46 @@
 "Biblioteca para la cámara Kodak DC240, DC280, DC3400 y DC5000.\n"
 "Reescrito y actualizado para gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Débil"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Vacía"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "No válida"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "No utilizada"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Empleado"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "La tarjeta está abierta"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "La tarjeta no está abierta"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "La tarjeta no está formateada"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Sin tarjeta"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2784,12 +2954,12 @@
 "operación a la vez. Por favor, espere a que haya finalizado la operación en "
 "curso."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "cámara inactiva por más de 9 segundos, volviendo a inicializar.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2805,7 +2975,7 @@
 "cámara no responde, simplemente vuelva a seleccionarla. Esto provocará la "
 "reinicialización."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2817,120 +2987,120 @@
 "\n"
 "Sus preguntas y comentarios serán bienvenidos."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 msgstr ""
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Error de enfoque."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Error del iris."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Error del estereoscopio."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Error de la suma de validación de la EEPROM."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Error interno (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Error interno (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Ninguna tarjeta presente."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Tarjeta no soportada."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Se ha quitado la tarjeta durante el acceso."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "El número de la imagen no es válido."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "No pudo escribir la tarjeta."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "La tarjeta está protegida contra escritura."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "No queda espacio en la tarjeta."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Imagen protegida."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Luz demasiado oscura."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Error de autofoco."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Error del sistema."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Parámetro no válido."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "No pudo cancelar el mandato."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Datos de localización demasiado largos."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Datos de localización corruptos."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Mandato no soportado."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Se está ejecutando otro mandato."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Error en el orden de los mandatos."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2941,15 +3111,15 @@
 "favor, informe de lo siguiente a %s con información adicional acerca de cómo "
 "ha obtenido este error: (0x%x,0x%x). ¡Muchísimas gracias!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Obteniendo la lista de ficheros…"
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Probando diferentes velocidades…"
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -2958,12 +3128,12 @@
 "No pudo contactar con la cámara. Por favor, asegúrese de que está conectada "
 "a la computadora y está encendida."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "no se pudieron borrar %i imágenes porque están protegidas"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2982,7 +3152,7 @@
 "Nombre: %s,\n"
 "Fabricante: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -2992,405 +3162,414 @@
 "Lutz Müller <lutz@users.sourceforge.net>\n"
 "Soporta todas las cámaras Konica y varias cámaras HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Obteniendo la configuración…"
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Configuración de Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Parámetros persistentes"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "¿La cámara debe emitir un pitido cuando se tome una foto?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Hora del temporizador"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Hora de apagado automático"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Intervalo del carrusel"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Resolución"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Baja (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Media (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Alta (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Localización"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Idioma"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Ninguno selecccionado"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Formato de salida de TV"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "No mostrar el menú TV"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Formato de Fecha"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Mes/Día/Año"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Día/Mes/Año"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Año/Mes/Día"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Parámetros de la sesión persistente"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Activar, reducción de ojos rojos"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automática, reducción de ojos rojos"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Foco"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fijado"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Parámetros temporales"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Temporizador"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "No pudo encontrar los datos de localización en «%s»"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "¡Fichero de localización demasiado largo!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Esta previsualización no existe."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Los datos se han corrompido."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr "Compilado sin capacidad EXIF, ninguna miniatura disponible."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "¡Esta cámara no soporta el tipo de imagen %d!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "No pudo borrar la imagen %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "No pudon borrar todas las imágenes."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Cargando imagen…"
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 #, fuzzy
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "No pudo enviar esta imagen a la cámara. Se ha producido un error."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 #, fuzzy
 msgid "You must be in record mode to capture images."
 msgstr "Debe estar en modo de grabación para capturar una imagen."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 #, fuzzy
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "No hay espacio disponible para capturar una nueva imagen. Debe borrar "
 "algunas imágenes."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 #, fuzzy
 msgid "Can't capture new images. Unknown error"
 msgstr "No pudo capturar una nueva imagen. Error desconocido"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "No hay respuesta de la cámara."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Baja"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Media"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Alta"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Iconos"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Balance de blancos"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Oficina"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Luz natural"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Nitidez"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Nítida"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Suave"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Color"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Suave"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Profundo"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Blanco y negro"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Única"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Secuencia 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Mostrar fecha"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "En cualquier lugar"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Modo de reproducción"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Modo de grabación"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "En todos lados"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "CA"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Reproducción"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Grabación"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/AAAA"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "AAAA/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/AAAA"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, fuzzy, c-format
 msgid ""
 "Model: %s\n"
@@ -3411,7 +3590,7 @@
 "Mostrar fecha: %s\n"
 "Fecha y hora: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3426,7 +3605,7 @@
 "http://www.ap2c.com\n"
 "Soporte para la Konica Q-M150 francesa."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3446,7 +3625,7 @@
 "Si tiene algún duda con este controlador, por favor\n"
 "envíe un correo-e a los autores del mismo.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3457,7 +3636,7 @@
 "\n"
 "Controla la cámara Largan Lmini.\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3465,13 +3644,107 @@
 "Firmware Version: %s\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Configuración"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Bloqueo"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Velocidad Obturador"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Calidad"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Calidad Vídeo"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Película"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Modo Autofoco"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "Vivo:"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "nombre de dispositivo fontdir"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "AF-ON"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "AF-ON"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Nombre de Lente"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Modo Compatible"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Manual Completo"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Menú CSM"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3482,7 +3755,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3496,13 +3769,13 @@
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3513,7 +3786,7 @@
 "Revisión de hardware:\t%s\n"
 "Revisión de firmware:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3540,61 +3813,63 @@
 "Identificador de tarjeta:\t\t%d\n"
 "Modo del flash:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Remota"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Local"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Sí"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "No"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Común"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automática\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Forzar el flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Prohibir el flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valor no válido (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3611,74 +3886,74 @@
 "Cargando el flash:\t\t%s\n"
 "Estado de la lente:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "No llena"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Llena"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Ocupado"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Inactivo"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Cargando"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Preparada"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "La dirección de la lente no coincide con la luz del flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "La lente no está conectada\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Valor incorrecto para el estado de la lente %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Estado de tarjeta:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Protegida contra escritura"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Tarjeta no conveniente"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Valor equivocado para estado de tarjeta %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3691,63 +3966,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Agradecimientos especiales a Minolta por las especificaciones."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Luz del flash: Automática (reducción de ojos rojos)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Luz del flash: Automática"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Luz del flash: Sí (reducción de ojos rojos)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Luz del flash: Sí"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Luz del flash: No"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Luz del flash: indefinida"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Resumen para Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "no se ha informado del estado."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Se ha detectado una tarjeta Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "No se ha detectado ninguna tarjeta Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Modo actual: Modo de cámara\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Modo actual: Modo de reproducción\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Las baterías están bien."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Las baterías están descargadas."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3759,25 +4034,25 @@
 "Adaptada a gphoto2 por Marcus Meissner <marcus@jet.franken.de>\n"
 "Soporta los protocolos Serie y USB."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "biblioteca coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Desconectando la cámara."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Descargando la imagen %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Cargando imagen: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3786,17 +4061,17 @@
 "El tamaño del fichero es %ld bytes. El tamaño máximo de fichero a enviar es "
 "de: %i bytes."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Cargando…"
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Borrando imagen %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3812,12 +4087,12 @@
 "Fredrik Roubert <roubert@df.lth.se> y\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Descargando %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3833,12 +4108,12 @@
 "Fredrik Roubert <roubert@df.lth.se> y\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Descargando «%s»…"
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -3860,7 +4135,7 @@
 "CCD que captura las imágenes de la lente solo tiene 300.000 pixels, y por lo "
 "tanto sólo produce imágenes de calidad baja."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3876,7 +4151,7 @@
 "como para recuperarse de estas situaciones, especialmente si se produce un "
 "problema y la cámara no se apaga adecuadamente a velocidades mayores a 9600."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3884,7 +4159,7 @@
 "Controlador para Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3895,7 +4170,7 @@
 " Memoria libre es  %8d bytes.\n"
 " Cuenta de ficheros: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3909,11 +4184,11 @@
 "y: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Descargando fichero…"
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 #, fuzzy
 msgid ""
 "Creative PC-CAM600\n"
@@ -3923,32 +4198,136 @@
 " Author: Peter Kajberg\n"
 " correo electrónico: <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, fuzzy, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "¡Valor de devolución inesperado %d de parse_toc_entry!\n"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Modelo: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Orden Desconocido"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Tamaño de Imagen"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Calidad de imagen"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Longitud Focal Máxima"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Longitud Focal Máxima"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "Modo de disparo"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "BN"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Modelo desconocido"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -3963,12 +4342,12 @@
 "La prueba con una Polaroid 640SE fue realizada por Michael Golden "
 "<naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modelo: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 #, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
@@ -3984,110 +4363,98 @@
 "sourceforge.net>. Corrección de errores por Marcus Meissner <marcus@jet."
 "franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Calidad de imagen"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Tamaño de Imagen"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Configuración del flash"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Apagado automático (en minutos)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Información"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "superfina"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "automática"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "activo"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "inactiva"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "lectura"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "escritura"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menú"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "batería"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "transformador CA"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Recibido encabezado no esperado (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Recibida respuesta no esperada"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Error de la suma de comprobación"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "La cámara no ha aceptado el mandato."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "La cámara ha enviado más bytes que lo esperado (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4096,7 +4463,7 @@
 "Se ha pedido información sobre la imagen %i (= 0x%x), pero se ha obtenido "
 "información sobre la imagen %i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4105,7 +4472,7 @@
 "se han recibido %i bytes de un formato de imágen desconocido. Por favor, "
 "escriba a %s y pida ayuda."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4115,19 +4482,20 @@
 "por Ryan Lantzer <rlantzer@umr.edu> para gphoto-4.x. Adaptado para gphoto2 "
 "por Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Cámara"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "¿Cuanto tiempo debería pasar hasta que la cámara se apague?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Imagen"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4160,3745 +4528,5759 @@
 "Apagado automático: %i minutos\n"
 "Fuente de energía: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Este controlador no soporta el tipo de puerto solicitado (%i)."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Estado de tarjeta:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Modelo: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Velocidad Obturador"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Modo del enfoque"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Modelo: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Ampliación: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Modo Flash"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Pulsar 1"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Versiones"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Modelo Transferencia de Captura"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Bloqueo AE"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "AF Bloqueado"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "AF Bloqueado"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientación"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CMDC"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "No Configurado"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Los siento, su cámara Canon no soporta captura Canon"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Valor %04x desconocido"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Valor desconocido %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "tipo de datos inesperado %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Valor objetivo no está dentro de enumeración."
 
-#: camlibs/ptp2/config.c:1483
-#, fuzzy
-msgid "Now value is not in enumeration."
-msgstr "Valor objetivo no está dentro de enumeración."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manual"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automático"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Una Pulsación Automática"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Nublado"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Sombreado"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Color Temperatura"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Preconfigurado"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Fluorescente 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Fluorescente 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Fluorescente 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Fluorescente 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Fluorescente 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Elejir Tamperatura del Color"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Preconfigurar Adaptación 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Preconfigurar Adaptación 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Preconfigurar Adaptación 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Preconfigurar Adaptación 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Preconfigurar Adaptación 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluorescente: Caliente Blanco"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluorescente: Frío Blanco"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Fluorescente: Día Blanco"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluorescente: Luz Dia"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Preconfigurar 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Preconfigurar 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Preconfigurar 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Submarino: Auto"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Tungsteno 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Fluorescente: blanco"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Fluorescente: tunsteno"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Preconfigurar 1"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Personalizada"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG Fino"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG Común"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "Crudo + JPEG Fino"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "Crudo + JPEG Común"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+#, fuzzy
+msgid "Large Fine JPEG+RAW"
+msgstr "Grande Fino JPEG"
+
+#: camlibs/ptp2/config.c:1540
+#, fuzzy
+msgid "Large Normal JPEG+RAW"
+msgstr "Grande Común JPEG"
+
+#: camlibs/ptp2/config.c:1541
+#, fuzzy
+msgid "Medium Normal JPEG+RAW"
+msgstr "Mediano Común JPEG"
+
+#: camlibs/ptp2/config.c:1542
+#, fuzzy
+msgid "Small Normal JPEG+RAW"
+msgstr "Pequeño Común JPEG"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Marco simple"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Velocidad baja continua"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Retemporizador"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Subir Espejo Mup"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Común"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+#, fuzzy
+msgid "ACROS+Ye Filter"
+msgstr "Filtro AB"
+
+#: camlibs/ptp2/config.c:1569
+#, fuzzy
+msgid "ACROS+R Filter,"
+msgstr "Filtro AB"
+
+#: camlibs/ptp2/config.c:1570
+#, fuzzy
+msgid "ACROS+G Filter"
+msgstr "Filtro AB"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "sin definir"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "economía"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Personalizada"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Bloqueo"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Retrato Nocturno"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Deporte"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Cierre"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Flash Apagado"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Creativo"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Escena nocturna"
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Alta"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Comida"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Fuera del Foco"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Ojo de pez"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+#, fuzzy
+msgid "Miniature effect"
+msgstr "Modo Efecto"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "común"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "Encabezado no es 60\n"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Retrato"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr ""
+"GnuCash intercambió a otro apoyo para almacenar preferencias usadas entre "
+"2.4 y 2.6. Para morder la transición, muchas preferencias serán emigradas la "
+"primera vez a la versión 2.6 está correr. Esta migracion debería ejecutarse "
+"únicamente una vez. Esta preferencia conserva los cambios si o no esta "
+"herramienta de migración ha ejecutado correctamente."
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "supresión de ojos rojos"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "rellena"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "auto + reducción de ojos rojos"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "activa + supresión de ojos rojos"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Comandante"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Repetible"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Apertura Auto"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Manual Completo"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Modo de Operación"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Largo"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Pequeño"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (fijado)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (selección)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 #, fuzzy
 msgid "Center-weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Promedio"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Evaluado"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Parcial"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "Promedio Ponderado"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 #, fuzzy
 msgid "Multi spot"
-msgstr "Punteo"
+msgstr "Multipunto"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monocromáticas"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Usuario definido 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Usuario definido 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Usuario definido 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 #, fuzzy
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Puntos Enfocados Múltiples, Auto"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Puntos Enfocados Múltiples, Auto"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "Puntos Enfocados Múltiples, Auto"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 #, fuzzy
 msgid "Multiple Focusing Points (Center)"
 msgstr "Puntos Enfocados Múltiples, Auto"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "Puntos Enfocados Múltiples, Auto"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Largo"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Medio 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Medio 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Medio 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Pequeño"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 segundos"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 segundos"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Configuración 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Configuración 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Configuración 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Configuración 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2530
+#, fuzzy
+msgid "TFT + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+#, fuzzy
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2536
+#, fuzzy
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Punteo-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Tarjeta"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Vídeo SALIDA"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Desconocido %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 #, fuzzy
 msgid "Factory Default"
 msgstr "No puedo obtener Factory"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "ISO Auto"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Menor JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
-msgstr "JPEG"
+msgstr "Crudo + Enano JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 #, fuzzy
 msgid "mRAW + Large Fine JPEG"
 msgstr "Crudo + Grande Fino JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 #, fuzzy
 msgid "sRAW + Large Fine JPEG"
 msgstr "Crudo + Grande Fino JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+#, fuzzy
+msgid "cRAW + Large Fine JPEG"
+msgstr "Crudo + Grande Fino JPEG"
+
+#: camlibs/ptp2/config.c:2718
 #, fuzzy
 msgid "mRAW + Medium Fine JPEG"
 msgstr "Crudo + Mediano Fino JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 #, fuzzy
 msgid "sRAW + Medium Fine JPEG"
 msgstr "Crudo + Mediano Fino JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
 #, fuzzy
+msgid "cRAW + Medium Fine JPEG"
+msgstr "Crudo + Mediano Fino JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
-msgstr "Crudo + Pequeño Fino JPEG"
+msgstr "Crudo mRAW + Pequeño Fino JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 #, fuzzy
 msgid "sRAW + Small Fine JPEG"
 msgstr "Crudo + Pequeño Fino JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
 #, fuzzy
+msgid "cRAW + Small Fine JPEG"
+msgstr "Crudo + Pequeño Fino JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
-msgstr "Crudo + Grande Común JPEG"
+msgstr "Crudo mRAW + Grande Común JPEG"
 
-#: camlibs/ptp2/config.c:2416
-#, fuzzy
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
+msgstr "Crudo sRAW + Grande Común JPEG"
+
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
 msgstr "Crudo + Grande Común JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2733
 #, fuzzy
 msgid "mRAW + Medium Normal JPEG"
 msgstr "Crudo + Mediano Común JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 #, fuzzy
 msgid "sRAW + Medium Normal JPEG"
 msgstr "Crudo + Mediano Común JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "Crudo + Mediano Común JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 #, fuzzy
 msgid "mRAW + Small Normal JPEG"
 msgstr "Crudo + Pequeño Común JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 #, fuzzy
 msgid "sRAW + Small Normal JPEG"
 msgstr "Crudo + Pequeño Común JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
 #, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "Crudo + Pequeño Común JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
-msgstr "CRUDO+JPEG"
+msgstr "Crudo + JPEG pequeño"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 #, fuzzy
 msgid "mRAW + Smaller JPEG"
 msgstr "Menor JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 #, fuzzy
 msgid "sRAW + Smaller JPEG"
 msgstr "Menor JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
 #, fuzzy
+msgid "cRAW + Smaller JPEG"
+msgstr "Crudo + JPEG pequeño"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
-msgstr "Crudo + Pequeño Común JPEG"
+msgstr "Crudo + Enano JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 #, fuzzy
 msgid "mRAW + Tiny JPEG"
-msgstr "mRAW"
+msgstr "Crudo + Enano JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 #, fuzzy
 msgid "sRAW + Tiny JPEG"
-msgstr "sRAW"
+msgstr "Crudo + Enano JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Pequeño"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Medio 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Medio 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Largo"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Medio 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Medio 2"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Medio 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Medio 2"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Medio 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Medio 2"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Contínuo"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Vídeo SALIDA"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
-msgstr "Modo disparador modificado"
+msgstr "Única"
+
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Contínuo"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Temporizador 10 sg"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Temporizador 2 sg"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 #, fuzzy
 msgid "Single silent"
 msgstr "  -s, --silent      trabajar silenciosamente\n"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 #, fuzzy
 msgid "Continuous silent"
 msgstr "Contínuo"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "ISO Auto"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Contínuo"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Compensación de la exposición"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Contínuo"
+
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Bombilla"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Bombilla"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AF-S"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 puntos (3D)"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 puntos (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 puntos (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 puntos (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Hora"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Creativo"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Operación"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Apaisado Nocturno"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Descendientes"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automática (Sin flash)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 #, fuzzy
 msgid "Intelligent Auto"
 msgstr "AUTO"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 #, fuzzy
 msgid "Superior Auto"
 msgstr "AUTO"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "Película"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Película"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "Película"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Película"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
 msgstr "Película"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 #, fuzzy
 msgid "Sweep Panorama"
 msgstr "Panorámico"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 #, fuzzy
 msgid "Intelligent Auto Flash Off"
-msgstr "Flash auto"
+msgstr "Flash apagado"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "Deporte"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 #, fuzzy
 msgid "Night Scene"
 msgstr "Escena nocturna"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 #, fuzzy
 msgid "Hand-held Twilight"
 msgstr " retenido"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
-msgstr "Opciones de la imagen"
+msgstr "Modo Efecto"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 #, fuzzy
 msgid "Night landscape"
-msgstr "Apaisado"
+msgstr "Apaisado Nocturno"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 #, fuzzy
 msgid "Party/Indoor"
 msgstr "Interior"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 #, fuzzy
 msgid "Beach/Snow"
 msgstr "Playa"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Polvo/Amanecer"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "Retrato"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Luz vela"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Flor"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 #, fuzzy
 msgid "Autumn colors"
 msgstr "Colores"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Comida"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Descenciente"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Cerrar superior"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Fluorescente"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Agua"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Extra claro"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Imagen"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Escena"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Efectos"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Luz Trasera"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorámico"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 #, fuzzy
 msgid "Tilt-Shift"
 msgstr "Mayús-a"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Seleccionar Color"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 #, fuzzy
 msgid "Single Shot"
 msgstr "Configuración de la toma"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
+#, fuzzy
 msgid "Burst"
-msgstr ""
+msgstr "Número Quemado"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 #, fuzzy
 msgid "Timelapse"
 msgstr "Intervalo Espera Temporal"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Velocidad Baja Continua"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Temporizador"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Subir Espejo"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Respuesta Rápida Remota"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Retraso Remoto"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Soltado Silencioso"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+#, fuzzy
+msgid "Continuous Quiet Release"
+msgstr "Soltado Silencioso"
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Temporizador (sólo la foto siguiente)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Velocidad Baja Continua"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Velocidad Baja Continua"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 #, fuzzy
 msgid "Centre-spot"
 msgstr "Centro"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 #, fuzzy
 msgid "Multi-spot"
-msgstr "Punteo"
+msgstr "Multipunto"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Área Única"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 #, fuzzy
 msgid "Closest Subject"
 msgstr "<sin asunto>"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 #, fuzzy
 msgid "Group Dynamic"
-msgstr "** dinámico"
+msgstr "** grupo"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 #, fuzzy
 msgid "Single-area AF"
-msgstr "Área Única"
+msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 #, fuzzy
 msgid "Dynamic-area AF"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 #, fuzzy
 msgid "Group-dynamic AF"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Área Dinámica (0)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Área Dinámica (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Área Dinámica (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "Seguimiento 3D"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+#, fuzzy
+msgid "Dynamic-area AF (25 points)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Autofocus: servicio IA"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "Seguimiento 3D"
+
+#: camlibs/ptp2/config.c:4253
+#, fuzzy
+msgid "Dynamic-area AF (72 points)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4254
+#, fuzzy
+msgid "Dynamic-area AF (153 points)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4256
+#, fuzzy
+msgid "Dynamic-area AF (9 points)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+#, fuzzy
+msgid "Wide-area AF (S)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4260
+#, fuzzy
+msgid "Wide-area AF (L)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (retrato)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (natural)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Valor desconocido 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centro"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Techo"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Suelo"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Izquierda"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Derecha"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Amplio"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Centro"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Compatibilidad bibliográfica flexible"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Compatibilidad bibliográfica flexible"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Compatibilidad bibliográfica flexible"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Multipunto"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Punto Central"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "¡se llamó shadow_funcs() dos veces!"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "Multipunto"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Común"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Largo"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Alta"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Flash Automático"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Rellenar flash"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Ojos Rojos Automático"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flash anti ojos rojos"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Sincr. Externa"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Automática, reducción de ojos rojos"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 #, fuzzy
 msgid "Front-curtain sync"
 msgstr "Sincr. Externa"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "Reducción de ojos rojos"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "Automática, reducción de ojos rojos"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 #, fuzzy
 msgid "Rear-curtain with slow sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 #, fuzzy
 msgid "Rear-curtain sync"
 msgstr "_Trasero"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 #, fuzzy
 msgid "Rear Curtain Sync"
 msgstr "_Trasero"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 #, fuzzy
 msgid "Wireless Sync"
 msgstr "Sincr. Externa"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Blanco y Negro"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 #, fuzzy
 msgid "Night Vision"
 msgstr "Escena nocturna"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Color mezclado"
 
-#: camlibs/ptp2/config.c:3522
-#, fuzzy
-msgid "Miniature effect"
-msgstr "Modo Efecto"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 #, fuzzy
 msgid "Selective color"
-msgstr "Acceso selectivo no esá activado para este directorio"
+msgstr "Color"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
-msgstr "CLAVE"
+msgstr "Palabra Clave"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Tecla baja"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "infinito"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "infinito"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Compresión"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "bombilla"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Sincronización lenta"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 #, fuzzy
 msgid "Face-priority AF"
 msgstr "Modo Prioridad AF-C "
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 #, fuzzy
 msgid "Wide-area AF"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 #, fuzzy
 msgid "Subject-tracking AF"
-msgstr "Asunto:"
+msgstr "AF-A"
+
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Punteo-AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Enseñar Indicador"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5648
 #, fuzzy
 msgid "Single-servo AF"
 msgstr "Autofocus: servicio IA"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "AF Continuo"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Foco Manual"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "MF (selección)"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Bloqueo AE/AE"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 #, fuzzy
 msgid "AE Lock only"
 msgstr "Bloqueo AE único"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 #, fuzzy
 msgid "AF Lock Only"
 msgstr "Bloqueo Activo AF"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 #, fuzzy
 msgid "AF Lock Hold"
 msgstr "Bloqueo Activo AF"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 #, fuzzy
 msgid "AF On"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 #, fuzzy
 msgid "Flash Level Lock"
 msgstr "Flash Bloqueado"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 segundos"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minutos"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minutos"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 segundos"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 mins"
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "bombilla"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1'6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1'3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1'3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1'6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 #, fuzzy
 msgid "Sharper"
 msgstr "Nítida"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 #, fuzzy
 msgid "Softer"
 msgstr "Suave"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
-#, fuzzy
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
-msgstr "Débito Directo"
+msgstr "Imprimir Directo"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "Espacio restante: Alta: %d, Media: %d, Baja: %d\n"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "Media"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Contraste bajo"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "Media"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 #, fuzzy
 msgid "High control"
 msgstr "Alta"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zona Foco (Cierre Superior)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 #, fuzzy
 msgid "Zone Focus (Very Close)"
 msgstr "Zona Foco (Cierre Superior)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zona Foco (Cierre)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zona Foco (Medio)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zona Foco (Lejano)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zona Foco (Reservado 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 #, fuzzy
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zona Foco (Reservado 1)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 #, fuzzy
 msgid "Zone Focus (Reserved 3)"
 msgstr "Zona Foco (Reservado 1)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 #, fuzzy
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zona Foco (Reservado 1)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Macro Automática"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 #, fuzzy
 msgid "Single-Servo AF"
 msgstr "Autofocus: servicio IA"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 #, fuzzy
 msgid "Continuous-Servo AF"
-msgstr "AF-A"
+msgstr "AF Continuo"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Un Disparo"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 #, fuzzy
 msgid "AI Servo"
 msgstr "Autofocus: servicio IA"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "Error de autofocus: Foco IA"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 seconds"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 segundos"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Suspenso"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Fluorescente H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
-msgstr "Balanceo Blanco X A"
+msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
-msgstr "Balanceo Blanco X A"
+msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
-msgstr "Balanceo Blanco X A"
+msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Número Ausente"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 #, fuzzy
 msgid "Shadow"
 msgstr "¡se llamó shadow_funcs() dos veces!"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "_Personalizado"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "_3×3"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
+msgid "Custom Whitebalance: PC-3"
 msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "_Personalizado"
+msgid "Manual 3"
+msgstr "Manual 2"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Manual 2"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Manual 2"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Personalizada"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Personalizada"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Sombreado"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Blanco y negro"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:6135
 #, fuzzy
+msgid "Bracket off"
+msgstr "Modo Corchete"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
-msgstr "AUTO"
+msgstr "autoimplícito"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 #, fuzzy
 msgid "AE & Flash"
 msgstr "Solo AE"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "Solo AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 #, fuzzy
 msgid "Flash only"
 msgstr "Flash encendido"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Despliegue"
 
-#: camlibs/ptp2/config.c:4567
-#, fuzzy
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
-msgstr ""
-"Problemas conocidos:\n"
-"\n"
-"Si se producen problemas de comunicaciones, reinicialice la cámara y vuelva "
-"a iniciar la aplicación. El controlador no es lo suficientemente robusto "
-"como para recuperarse de estas situaciones, especialmente si se produce un "
-"problema y la cámara no se apaga adecuadamente a velocidades mayores a 9600."
+msgstr "Apagar"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 #, fuzzy
 msgid "Startup and Shutdown"
 msgstr "Despliegue:"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 #, fuzzy
 msgid "Quick Response"
 msgstr "Respuesta Rápida Remota"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Act Espejo Remoto"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Modo de operación 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Modo de operación 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Mejorado"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 #, fuzzy
 msgid "MTR > Under"
 msgstr "<presiona un botón bajo la mesa>"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 #, fuzzy
 msgid "Under > MTR"
 msgstr "<presiona un botón bajo la mesa>"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 #, fuzzy
 msgid "Auto sensitivity"
 msgstr "Sensibilidad"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 #, fuzzy
 msgid "High sensitivity"
 msgstr "Sensibilidad"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 #, fuzzy
 msgid "Medium sensitivity"
 msgstr "Sensibilidad"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "Sensibilidad"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 #, fuzzy
 msgid "Microphone off"
-msgstr "INACTIVO"
+msgstr "Micrófono Película"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hi 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hi 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "Flash encendido"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 #, fuzzy
 msgid "Flash/speed/aperture"
 msgstr "Flash/apertura"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Flash/apertura"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 #, fuzzy
 msgid "JPEG Basic"
-msgstr "JPEG"
+msgstr "Libro _Básico"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 #, fuzzy
 msgid "NEF+Fine"
 msgstr "Está bien."
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 #, fuzzy
 msgid "NEF (Raw)"
 msgstr "Crudo"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 #, fuzzy
 msgid "NEF+Basic"
 msgstr "Libro _Básico"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 #, fuzzy
 msgid "NEF+Normal"
 msgstr "normal        "
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "Libro _Básico"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "JPEG Común"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG Fino"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "Libro _Básico"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "normal        "
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "Está bien."
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Extra Fina"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "CRUDO+JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "CRUDO+JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "Crudo + JPEG Fino"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "Crudo + JPEG Fino"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "Está bien."
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "Crudo + JPEG Fino"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "Crudo + JPEG Fino"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "CRUDO+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fina"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "CRUDO+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG Fino"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "Crudo 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
-msgstr "Punteo"
+msgstr "Multipunto"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 secundos"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 segundos"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 seconds"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
-msgstr ""
+msgstr "Sin pérdida"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Palabra Clave"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Tamaño Prioritario"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Calidad óptima"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Versiones"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 #, fuzzy
 msgid "Release + Focus"
-msgstr "Error de autofocus: Foco IA"
+msgstr "Versiones"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 puntos"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 puntos"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 puntos"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 puntos (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (Largo)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Común)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (Corto)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 #, fuzzy
 msgid "Shutter/AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Bloqueo AE/AF"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Bloqueo AE único"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Bloqueo AE (Restablecer al soltar)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Bloqueo AE (Mantener)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 #, fuzzy
 msgid "AF lock only"
 msgstr "Bloqueo Activo AF"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "No asignado"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 #, fuzzy
 msgid "FV lock"
 msgstr "Bloqueo"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "Bloqueo AE (mantener)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 #, fuzzy
 msgid "Matrix metering"
 msgstr "Matriz"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 #, fuzzy
 msgid "Center-weighted metering"
 msgstr "Centrado en el medio"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "Modo de medición de punteo"
 
-#: camlibs/ptp2/config.c:5152
-#, fuzzy
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
-msgstr "_Repetir"
+msgstr "Repetir"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 #, fuzzy
 msgid "+NEF (RAW)"
 msgstr "Crudo"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 #, fuzzy
 msgid "Framing grid"
 msgstr "Cuadrícula"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Activar D-Lighting"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 paso spd/apertura"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "Buscador de Visor Canon EOS"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 #, fuzzy
 msgid "Start movie recording"
 msgstr "Grabando a : %s"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Activar (revisión de imagen excluido)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Reducción de Ojos Rojos"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Valor desconocido"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Foco manual Nikon al límite."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Presión Media"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Presión Completa"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Soltar Mitad"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Soltar Completa"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Inmediato"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Pulsar 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Pulsar 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Pulsar 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Soltar 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Soltar 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Soltar 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Cercano 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Cercano 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Cercano 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Lejano 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Lejano 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Lejano 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Cercano %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Lejano %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Modo de Operación"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Activar (revisión de imagen excluido)"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "La tarjeta está protegida contra escritura."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+#, fuzzy
+msgid "Already in movie recording"
+msgstr "Grabando a : %s"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "Tarjeta"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "La tarjeta no está formateada"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Error del iris."
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Secuencia 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Configuración de apertura inválida"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Se ha agotado la batería, cámara apagada."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP: Error de E/S"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Configuración de apertura inválida"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "La tarjeta no está formateada"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Disp Av"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Modo de Programa de Exposición"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Fluorescente"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "establecer hora"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Blanco y Negro"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Color Temperatura"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automático"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Macro Automática"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Desconocido: 0x%04x\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Lejano 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Lejano 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Cercano 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Cercano 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Común"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Grabación"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Reproducción"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Otras Opciones"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Compensación de la exposición"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "No mostrar el menú TV"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr "FLUJO"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Largo"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Valor %04x desconocido"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "RAM Interna"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Tarjeta de memoria"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Pantalla"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Fecha creada: %s, Últ. fecha util: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Borrar"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Gestionado"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Nombre perfil"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "Dirección IP (vacía para DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Máscara de red"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 #, fuzzy
 msgid "Default gateway"
-msgstr "Estándar"
+msgstr "predeterminado"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Modo de acceso"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 #, fuzzy
 msgid "WIFI channel"
-msgstr "WIFI ESSID"
+msgstr "Perfiles WIFI"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Llave de cifrado (hex.)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Escritura"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 #, fuzzy
 msgid "List Wifi profiles"
-msgstr "WIFI ESSID"
+msgstr "Perfiles WIFI"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Crear perfil Wifi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Sincronizar fecha y hora de cámara con el PC"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Autofoco"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Foco Manual"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Apagar"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Foco Fijo"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Modo Bombilla"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Bloqueo IU"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Sin Flash"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr "Autofocus"
+
+#: camlibs/ptp2/config.c:10689
 #, fuzzy
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Foco manual Nikon al límite."
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 #, fuzzy
 msgid "Set Nikon Autofocus area"
 msgstr "Establecer modo de control Nikon"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Establecer modo de control Nikon"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+#, fuzzy
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Foco manual Nikon al límite."
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Foco manual Nikon al límite."
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Inicio:"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Ampliación Canon EOS"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 #, fuzzy
 msgid "Canon EOS Zoom Position"
 msgstr "Ampliación Canon EOS"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Buscador de Visor Canon EOS"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+#, fuzzy
+msgid "Panasonic Viewfinder"
+msgstr "Buscador de Visor Canon EOS"
+
+#: camlibs/ptp2/config.c:10704
 #, fuzzy
 msgid "Nikon Viewfinder"
 msgstr "Buscador de Visor Canon EOS"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 #, fuzzy
 msgid "Canon EOS Remote Release"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 #, fuzzy
 msgid "CHDK Script"
 msgstr "CMDC"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "Error película capturada... Terminando."
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Sonido"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Info Foco"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Info Foco"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Info Foco"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Brillo Punto Foco"
+
+#: camlibs/ptp2/config.c:10719
 #, fuzzy
 msgid "PTP Opcode"
 msgstr "No existe ese código operacional"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Número de Serie"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Fabricante de Cámara"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Versión del Dispositivo"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Extensión de Proveedor"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Versión PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Versión DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Energía AC"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Nivel de Batería"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+#, fuzzy
+msgid "Mirror Up Status"
+msgstr "Subir Espejo"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Subir Espejo"
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+#, fuzzy
+msgid "Mirror Up Shooting Count"
+msgstr "Subir Espejo Mup"
+
+# Translation thanks to Martin Kroeker. Colin
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Contínuo"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Orientación de Cámara"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Flash Abierto"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Vaciar Sensor"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Flash Cargado"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Nombre de Lente"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Contador Disparador"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Disparos Disponibles"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Longitud Focal Mínima"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Longitud Focal Máxima"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 #, fuzzy
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Longitud Focal Máxima"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 #, fuzzy
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Longitud Focal Máxima"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "Baja"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "Metrónomo"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "AF Bloqueado"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "AE Bloqueado"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "Está cerrado."
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Voz Película"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Fecha y hora de cámara"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Modo de Aviso"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 #, fuzzy
 msgid "Image Comment"
 msgstr "Activar Comentario de Imágen"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Activar Comentario de Imágen"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Apagado automático del LCD (en segundos)"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "Grabando a : %s"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 #, fuzzy
 msgid "Quick Review Time"
 msgstr "¿¡¿Tan rápido?!?"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Menú CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 #, fuzzy
 msgid "Reverse Command Dial"
 msgstr "revertir"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Salida de Cámara"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 #, fuzzy
 msgid "Recording Destination"
 msgstr "Grabando a : %s"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "Por Modo"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artista"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Número CCD"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Derecho de copia"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Vaciar Sensor"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Reducción de Ojos Rojos"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 #, fuzzy
 msgid "Custom Functions Ex"
 msgstr "Personalizada"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Info Foco"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Área Foco"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Flash Cargado"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Un Disparo"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Autoapagado"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Profundidad de Campo"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menús y Repetir"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Opciones de Cámara"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Tamaño Prioritario"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Tamaño Miniatura Admitida"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Sistema de ficheros rápido"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Objeto de Captura"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Autofocus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CMDC"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Modo Remoto"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Modo Efecto"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "Formato de Imagen"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "Formato de Imagen"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
-msgstr "Opción de formato de imagen inválido"
+msgstr "Imagen de formato BE8 de salida"
+
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Resolución del fichero"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Tamaño de Imagen"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "Velocidad ISO establecida inválida"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Balanceo Blanco X A"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "Balanceo Blanco X A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "Balanceo Blanco X B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Balanceo Blanco X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Balanceo Blanco X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 #, fuzzy
 msgid "Photo Effect"
 msgstr "Foto en película"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Modelo de Color"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Espacio del Color"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Formato de Vídeo"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Resolución Vídeo"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Tipo de Marco Vídeo"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Contraste Vídeo"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Brillo Vídeo"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Formato Audio"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Tasa de bit de Sonido"
+
+#: camlibs/ptp2/config.c:10894
+#, fuzzy
+msgid "Audio Sampling Rate"
+msgstr "Sonido Mostrado"
+
+#: camlibs/ptp2/config.c:10895
+#, fuzzy
+msgid "Audio Bit per Sample"
+msgstr "Tasa de bit de Sonido"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Volumen Sonido"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 #, fuzzy
 msgid "Auto Focus Mode 2"
-msgstr "Autofoco"
+msgstr "Error de autofocus: Foco IA"
+
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Modo de disparo"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 #, fuzzy
 msgid "Assist Light"
 msgstr "Suave"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 #, fuzzy
 msgid "Rotation Flag"
 msgstr "_Rotación"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Compensación de Exposición"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Color temperatura"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Modo AF"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Ajuste de la imagen"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Grabando a : %s"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
-msgstr "Establecer modo de control Nikon"
+msgstr "Modo Flash"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "Modo Flash"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "Comandante"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 #, fuzzy
 msgid "Flash Command Channel"
-msgstr "tipo: {fichero | syslog}> <canal: cadena"
+msgstr "Flash encendido"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 #, fuzzy
 msgid "Flash Command A Value"
 msgstr "Flash encendido"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "%B: orden de carga desconocida %#x"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 #, fuzzy
 msgid "Flash Command B Value"
-msgstr "%B: orden de carga desconocida %#x"
+msgstr "%B: No se reconoce la orden .directive: %s"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 #, fuzzy
 msgid "AF Area Illumination"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 #, fuzzy
 msgid "AF Beep Mode"
-msgstr "Modo de Aviso"
+msgstr "Modo AF"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Número-F"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "Vivo:"
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "Número-F"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 #, fuzzy
 msgid "Flexible Program"
-msgstr "PROGRAMA"
+msgstr "Compatibilidad bibliográfica flexible"
+
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Calidad"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Tamaño de Imagen"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Formato de Imagen"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Distancia Foco"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Longitud Focal"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/config.c:7300
-#, fuzzy
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
-msgstr "AF-A"
+msgstr "AF Continuo"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Modo Efecto"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Programa de Exposición"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Modo de Cámara"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "Escena"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Razón Aspecto"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Modo AF"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr ""
 "\n"
 "Resumen de Almacenaje de Dispositivos:\n"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "Encabezado no es 60\n"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 #, fuzzy
 msgid "HDR High Dynamic"
 msgstr "Encabezado no es 60\n"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 #, fuzzy
 msgid "HDR Smoothing"
 msgstr "Encabezado no es 60\n"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 #, fuzzy
 msgid "Still Capture Mode"
 msgstr "Modelo Transferencia de Captura"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "Modo de disparo"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Modo Exposición Canon Automático"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Modo Exposición Canon Automático"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Modo Controlador"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
-msgstr "=ESTILO"
+msgstr "Opciones de la imagen"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Métrica de Foco"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Medida de Exposición"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "Abrir AV"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV Max"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Apertura"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Punto Enfocador"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Captura Retrasada"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "Velocidad Obturador"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Configuración de velocidad de obturador inválida"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Modo de medición de punteo"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Distancia AF"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Área de Foco Envoltura"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "Modo de Programa de Exposición"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Bloqueo de exposición automática"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 #, fuzzy
 msgid "Live View AF Mode"
 msgstr "Modo Prioridad AF-C "
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "Modo Controlador"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Vivo:"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Secuenciando Número de Fichero"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Signo del Flash"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Forzar Modelando"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 #, fuzzy
 msgid "Viewfinder Grid"
-msgstr "Buscador de Visor Canon EOS"
+msgstr "Cuadrícula"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "Activar (revisión de imagen excluido)"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Imagen Rotativa"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
-msgstr "Error de autofocus: Foco IA"
+msgstr "Autofoco"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Modo Corchete"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Paso EV"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Conjunto de Corchete"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Orden de Corchete"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
 #, fuzzy
-msgid "Burst Number"
-msgstr "Número en:\n"
+msgid "AE Bracketing Step"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Encorchetando"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11062
 #, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Activar Encorchetado"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Encorchetando"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Preconfigurar Adaptación 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Preconfigurar Adaptación 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Preconfigurar Adaptación 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Preconfigurar Adaptación 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Preconfigurar Adaptación 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Preconfigurar Adaptación 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
+msgid "Burst Number"
+msgstr "Número Quemado"
+
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
-msgstr "Intervalo:"
+msgstr "Intervalo Quemado"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 #, fuzzy
 msgid "Maximum Shots"
 msgstr "Disparos Disponibles"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
-msgstr "Color de Temperatura de Balance Blanco"
+msgstr "Balance de blancos"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Color de Temperatura de Balance Blanco"
+
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "Preselección Número Balance Blanco"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "Preselección Nombre Balance Blanco 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "Preselección Nombre Balance Blanco 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "Preselección Nombre Balance Blanco 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "Preselección Nombre Balance Blanco 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "Preselección Nombre Balance Blanco 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Captura Retrasada"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Área"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Velocidad Obturador"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Control de Tiempo Remoto"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Modo Remoto"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Modo de Operación"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Imagen Optimizada"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Sombreado"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Compensación de Tono"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Saturación"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
-msgstr "Encorchetando"
+msgstr "Modo Exposición Canon Automático"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "Sonido"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "Película"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
+#, fuzzy
 msgid "Microphone"
-msgstr ""
+msgstr "Micrófono Película"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Indicadores Revertidos:"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Control de Autodistorsión"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Control Vignette"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Modo Vídeo"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Borrado del Fichero, "
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Autofocus: servicio IA"
+
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
-msgstr "Metrónomo"
+msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 #, fuzzy
 msgid "Assign Func Button"
 msgstr "Asignar Botón Anterior"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Asignar Botón Anterior"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Calidad Película"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Minimum Shutter Speed"
-msgstr "Velocidad Obturador"
+msgid "Continuous Shooting Speed Slow"
+msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Resolución"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
-msgstr "Velocidad alta continua"
+msgid "Minimum Shutter Speed"
+msgstr "Configuración de velocidad de obturador inválida"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Calidad Película"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "ISO Auto Límite Superior"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 #, fuzzy
 msgid "Flash Sync. Speed"
-msgstr "Flash encendido"
+msgstr "Sincr. Externa"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Métrica de Foco"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Método Compensación JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "Modo Prioridad AF-C "
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "Modo Prioridad AF-S"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "AF Activado"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Bloqueo Activo AF"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 #, fuzzy
 msgid "AF Area Point"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 #, fuzzy
 msgid "AF On Button"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 #, fuzzy
 msgid "Maximum continuous release"
 msgstr "Contínuo"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
 #, fuzzy
+msgid "Movie Loop Length"
+msgstr "Longitud Focal"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
-msgstr "Crudo"
+msgstr "Compresión Cruda"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Calidad de Imagen 2"
 
-#: camlibs/ptp2/config.c:7543
+#: camlibs/ptp2/config.c:11288
 #, fuzzy
-msgid "Image Settings"
-msgstr "Imagen"
+msgid "Live View Zoom Area"
+msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Opciones de Captura"
 
-#: camlibs/ptp2/config.c:7554
-#, fuzzy
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
-msgstr "WIFI ESSID"
+msgstr "Perfiles WIFI"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 #, fuzzy
 msgid "Other PTP Device Properties"
 msgstr "Propiedad de dispositivo PTP no soportada"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, fuzzy, c-format
 msgid "PTP Property 0x%04x"
 msgstr " Error %04x de PTP peticionado"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Propiedad '%s' no encontrada."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7910,151 +10292,178 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Disculpe, su cámara Nikon no parece tener un retorno de imagen JPEG en modo "
+"LiveView"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 #, fuzzy
 msgid "Canon enable viewfinder failed"
 msgstr "Buscador de Visor Canon EOS"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Los siento, su cámara Canon no soporta modo Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Los siento, su cámara Nikon no soporta captura modo LiveView"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
-"Disculpe, su cámara Nikon no parece tener un retorno de imagen JPEG en modo "
-"LiveView"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 "Lo siento, su cámara Sony no parece devolver una imagen JPEG en modo LiveView"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Lo siento, su cámara Sony no parece devolver una imagen JPEG en modo LiveView"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Lo siento, su cámara no soporta captura Nikon"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Los siento, su cámara Canon no soporta Captura EOS Canon"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 #, fuzzy
 msgid "Canon EOS Get Changes failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Los siento, su cámara Canon no soporta inicio de Captura Canon"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 #, fuzzy
 msgid "Canon disable viewfinder failed"
 msgstr "Buscador de Visor Canon EOS"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Captura Canon fallada"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Captura Canon fallada"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Los siento, su cámara Canon no soporta captura genérica"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 #, fuzzy
 msgid "Canon EOS Half-Press failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 #, fuzzy
 msgid "Canon EOS Half-Release failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 #, fuzzy
 msgid "Canon EOS Full-Press failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 #, fuzzy
 msgid "Canon EOS Full-Release failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr "Captura Canon EOS fallada: %x"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Captura Canon EOS fallada"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Captura Canon EOS fallada: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
 msgstr ""
@@ -8066,42 +10475,42 @@
 "Nombre: %s,\n"
 "Fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Modelo: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Versión: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Número serial: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "ID de Extensión Proveedor: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Descripción de Extensión de Proveedor: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
-msgstr " versión apt %d.%d.%d\n"
+msgstr "Versión: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Modo Funcional: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -8109,21 +10518,32 @@
 "\n"
 "Formatos de Captura: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Formatos de Pantalla:  "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+#, fuzzy
+msgid ""
+"\n"
+"Streams:"
+msgstr "FLUJO"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 #, fuzzy
 msgid "Supported MTP Object Properties:\n"
-msgstr "el formato del fichero objeto no admite la reubicación %d"
+msgstr ".linkonce no admitió en este formato de fichero objeto"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " Error %04x de PTP peticionado"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8131,88 +10551,88 @@
 "\n"
 "Capacidades del Dispositivo:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tDescargar fichero, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Borrado del Fichero, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Ningún Borrado de Fichero, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Carga de Fichero\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 #, fuzzy
 msgid "No File Upload\n"
 msgstr "Carga de Fichero\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tCaptura de Imagen Generérica, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tSin Imagen Capturada, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Abrir Captura, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Captura No Abierta, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Captura Canon, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Captura EOS Canon, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Captura Canon EOS 2, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Captura Nikon 1, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "Captura Nikon 2, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "Captura Nikon 3, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Captura Sony, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Captura sin proveedor especificado\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tCapacidad Nikon Wifi\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tNo se soporta Wifi\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8220,94 +10640,94 @@
 "\n"
 "Resumen de Almacenaje de Dispositivos:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tAlmacenamientoDescripto: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tEtiquetadoVolumen: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "ROM Interna"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "ROM retirable"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "RAM Interna"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "RAM retirable (tarj. memoria)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Desconocido: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tTipo de Almacenaje: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Plano Genérico"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Jerarquía Genérica"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 #, fuzzy
 msgid "Digital Camera Layout (DCIM)"
-msgstr "Capturar imágenes desde la cámara digital"
+msgstr "Diseño de cámara (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTipo sistema de fichero: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Lectura-Escritura"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Sólo-Lectura"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Solo Lectura con Objeto borrado"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tAcceso Capacidad: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tCapacidad Máxima: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tEspacio libre (bytes): %llu (%lu Mb)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tEspacio Libre (Imágenes): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8315,48 +10735,48 @@
 "\n"
 "Resumen Propietario del Dispositivo:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " no lee fuera.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "no se puede ser peticionado.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "solo lectura"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " error %x en consulta."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Fichero '%s/%s' no existe."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "Esta cámara no soporta la configuración de las opciones."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8364,1716 +10784,1820 @@
 msgstr ""
 "PTP está implementado sólo para cámaras USB y PTP/IP, tipo de puerto %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "Error general de PTP"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "Sesión PTP No Abierta"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "ID PTP de transacción no válido"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "Operación PTP no soportada"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "Parámetro PTP no soportado"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "Transferencia PTP Incompleta"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "ID PTP de almacenamiento no válido"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "Manejador PTP de objeto no válido"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "Propiedad de dispositivo PTP no soportada"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "Código PTP de formato de objeto no válido"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "Almacén PTP completo"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "Objeto PTP protegido contra escritura"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "Almacén PTP de sólo lectura"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "Acceso PTP denegado"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "Ninguna Miniatura PTP Presente"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "Falló la auto-comprobación PTP"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "Borrado parcial PTP"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "Almacén PTP no disponible PTP"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "No se soporta especificación PTP por formato PTP"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "No hay información válida PTP del objeto PTP"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "Formato de código PTP no válido PTP"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "Código PTP de fabricante desconocido PTP"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "Captura PTP ya terminada PTP"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "Formato PTP de propiedad del dispositivo no válido"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "Objeto PTP padre no válido PTP"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "Formato PTP de propiedad del dispositivo no válido PTP"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "Valor PTP de propiedad del dispositivo no válido PTP"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "Parámetro PTP no válido PTP"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "Sesión PTP ya está abierta"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "Transacción PTP Cancelada"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Especificación PTP De Destino No Soportado"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "Manejador PTP de objeto no válido"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Razón desconocida"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Estado Inválido"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Se Requiere Nombre de Fichero"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Conflictos de nombre de fichero"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Nombre de fichero inválido"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Error Hardware"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Fuera del Foco"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Modo de Modificación de Cámara Fallado"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Estado Inválido"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "Establece valor propietario del dispositivo"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "Restablecer"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Error Referencial de Polvo"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "Velocidad Obturador"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 #, fuzzy
 msgid "Mirror Up Sequence"
-msgstr "Act Espejo Remoto"
+msgstr "Subir Espejo Mup"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Modo de Cámara No Ajustado FNumero"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 #, fuzzy
 msgid "Not in Liveview"
 msgstr ""
 "Disculpe, su cámara Nikon no parece tener un retorno de imagen JPEG en modo "
 "LiveView"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Cancelar Transferencia Avanzada"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "Ninguna Miniatura PTP Presente"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Error del estereoscopio."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "La tarjeta no está formateada"
+
+#: camlibs/ptp2/ptp.c:6138
+#, fuzzy
+msgid "Bulb Release Busy"
+msgstr "Versiones"
+
+#: camlibs/ptp2/ptp.c:6139
+#, fuzzy
+msgid "Silent Release Busy"
+msgstr "Soltado Silencioso"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Velocidad Obturador"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "Captura PTP ya terminada PTP"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Estado Inválido"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Orden Desconocido"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Operación Rechazada"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Cubierta de Lente Presente"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Batería Baja"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Cámara No Preparada"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Cubierta de Lente Presente"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Batería"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Cámara No Preparada"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Referencias a objetos"
+
+#: camlibs/ptp2/ptp.c:6157
+#, fuzzy
+msgid "Memory Status Not Ready"
+msgstr "Cámara No Preparada"
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "Código PTP de formato de objeto no válido"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "Código PTP de formato de objeto no válido"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "Valor PTP de propiedad del dispositivo no válido PTP"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "Manejador PTP de objeto no válido"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Estado Inválido"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "No se soporta especificación PTP por formato PTP"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "No se soporta especificación PTP por formato PTP"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Establece valor propietario del dispositivo"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Cerrar Sesión Media"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Estado Inválido"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "Operación PTP no soportada"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "Formato PTP de propiedad del dispositivo no válido"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 #, fuzzy
 msgid "PTP Timeout"
 msgstr "Control de Tiempo Remoto"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 #, fuzzy
 msgid "PTP Cancel Request"
-msgstr "Versión PTP"
+msgstr "_Cancelar"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "Respuesta"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "se esperaba un registro de datos o control iWMMXt"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "Error de E/S sobre un fichero local"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Modo Funcional"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Compresión"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Balance de blancos"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Ganancia RVA"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Tiempo de exposición de la lámpara"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Modo de Programa de Exposición"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 #, fuzzy
 msgid "Pre-Capture Delay"
 msgstr "Captura Retrasada"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Contraste"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Ampliación Digital"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 #, fuzzy
 msgid "Timelapse Number"
 msgstr "Intervalo Espera Temporal"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Intervalo Espera Temporal"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Subir URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Información Copyright"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Flujos Admitido"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Activado Flujos"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Formato de Vídeo"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Resolución Vídeo"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Calidad Vídeo"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Tipo de Marco Vídeo"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Contraste Vídeo"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Brillo Vídeo"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Formato Audio"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Tasa de bit de Sonido"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Sonido Mostrado"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Volumen Sonido"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Formato de Sellado de Hora/Fecha"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Vídeo Salida"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Guardando Potencia"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Idioma IU"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Tipo de Batería"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Modo de Batería"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Modo de Cámara"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 #, fuzzy
 msgid "Full View File Format"
 msgstr "Vea el fichero "
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Hora para sí"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-#, fuzzy
-msgid "Shooting Mode"
-msgstr "Modo de disparo"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Modo de Imagen"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 #, fuzzy
 msgid "Slow Shutter Setting"
 msgstr "Disparador lento"
 
-#: camlibs/ptp2/ptp.c:4825
-#, fuzzy
-msgid "AF Mode"
-msgstr "Modo Prioridad AF-C "
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Estabilización de Imagen"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Color Ganado"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Sensibilidad"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Conjunto Paramétrico"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Abrir Av"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Av Max"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Longitud Focal Tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Longitud Focal Anchura"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Longitud Focal Denominador"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Modelo Transferencia de Captura"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Nombre Prefijo"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Tamaño de Modo de Calidad"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Tamaño Miniatura Admitida"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 #, fuzzy
 msgid "Size of Input Data to Camera"
 msgstr "Datos de entrada inconsistentes\n"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Versión API Remota"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Titular de Cámara"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Tiempo UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "ID Cuerpo Cámara"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 #, fuzzy
 msgid "Av Open Apex"
 msgstr "Av Max Apex"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Ampliación Digital"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 #, fuzzy
 msgid "Ml Spot Position"
 msgstr "ML: %s"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Disp Av Max"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av Max Apex"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 #, fuzzy
 msgid "EZoom Start Position"
 msgstr "Inicio:"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 #, fuzzy
 msgid "EZoom Size of Tele"
 msgstr "Longitud Focal Tele"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 #, fuzzy
 msgid "Flash Quantity Count"
-msgstr "Flash encendido"
+msgstr "_Inventario"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 #, fuzzy
 msgid "Rotation Angle"
 msgstr "Ángulo de rotación"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 #, fuzzy
 msgid "Rotation Scene"
-msgstr "Escena"
+msgstr "_Rotación"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 #, fuzzy
 msgid "Event Emulate Mode"
 msgstr "Espere un evento"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 #, fuzzy
 msgid "Type of Slideshow"
 msgstr "_Tipo: "
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 #, fuzzy
 msgid "Average Filesizes"
 msgstr "MEDIA"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "ID modelo"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "Nombre de Banco A Disparado"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Nombre de Banco A Disparado"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Nombre de Banco B Disparado"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Nombre de Banco C Disparado"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Nombre de Banco D Disparado"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Restablecer Banco 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Preselección Número Balance Blanco"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Preselección Nombre Balance Blanco 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Preselección Nombre Balance Blanco 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Preselección Nombre Balance Blanco 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Preselección Nombre Balance Blanco 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Preselección Nombre Balance Blanco 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Preselección Valor Balance Blanco 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Preselección Valor Balance Blanco 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Preselección Valor Balance Blanco 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Preselección Valor Balance Blanco 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Preselección Valor Balance Blanco 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 #, fuzzy
 msgid "Auto DX Crop"
 msgstr "AUTO"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Nombre Menú Banco A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Nombre Menú Banco B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Nombre Menú Banco C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Nombre Menú Banco D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Restablecer Menú Banco"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 #, fuzzy
 msgid "Vertical AF On"
-msgstr "AF-ON"
+msgstr "Espaciado Vertical"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Zona Área Foco"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Activar Copyright"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
-msgstr "ISO"
+msgstr "Exposición"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Exposición"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Compensación de Exposición"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Centro"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "Matriz"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "Exposición"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "Exposición"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 #, fuzzy
 msgid "Live View AF Area"
 msgstr "Área Dinámica AF"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Temporizador"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 #, fuzzy
 msgid "Img Conf Time"
 msgstr "fic-img"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "Autoapagado"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 #, fuzzy
 msgid "Angle Level"
 msgstr "Ángulo de rotación"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Modo de disparo"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "Modo de Programa de Exposición"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 #, fuzzy
 msgid "LCD Illumination"
 msgstr "LCD"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 #, fuzzy
 msgid "On screen tips"
 msgstr "Consejos"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Nombre Artista"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Información de copyright"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Modelando Flash"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 #, fuzzy
 msgid "Manual Mode Bracketing"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "AUTO"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "Establecer modo de control Nikon"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Modo Reproductor Botón Central"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Modo Reproductor Botón Central"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 #, fuzzy
 msgid "Photo Info. Playback"
-msgstr "_Repetir"
+msgstr "Repetir"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 #, fuzzy
 msgid "Assign Func. Button"
 msgstr "Asignar Botón Anterior"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 #, fuzzy
 msgid "Customise Command Dials"
 msgstr "Botones y Diales"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Configuración de apertura inválida"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Botones y Diales"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 #, fuzzy
 msgid "No CF Card Release"
 msgstr "Sin tarjeta"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "Modo Reproductor Botón Central"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 #, fuzzy
 msgid "Function Button 2"
 msgstr "Botón 2 - &buttoninfo"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "Normal"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Vaciar Sensor de Imagen"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Activar Comentario de Imágen"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "Activar Comentario de Imágen"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Imagen Rotativa"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 #, fuzzy
 msgid "Manual Set Lens Number"
 msgstr "Establecer a manual"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 #, fuzzy
 msgid "Movie Screen Size"
 msgstr "Película"
 
-#: camlibs/ptp2/ptp.c:5122
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
-msgstr "Voz"
+msgstr "Voz Película"
 
-#: camlibs/ptp2/ptp.c:5124
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
-msgstr "Película"
+msgstr "Micrófono Película"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 #, fuzzy
 msgid "Movie Card Slot"
 msgstr "Película"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 #, fuzzy
 msgid "Monitor Off Delay"
-msgstr "APAGADA"
+msgstr "Desativado"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Activar Encorchetado"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "Encorchetando"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "Modo de Programa de Exposición"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "Modo Exposición Canon Automático"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 #, fuzzy
 msgid "Lens ID"
 msgstr "Nombre de Lente"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 #, fuzzy
 msgid "Lens Sort"
-msgstr "Nombre de Lente"
+msgstr "_Ordenar por…"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Tipo de Lente"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "Longitud Focal"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "Longitud Focal"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 #, fuzzy
 msgid "Finder ISO Display"
 msgstr "Velocidad ISO"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "Autoapagado"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "Hora del temporizador"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Control Vignette"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Tiempo Exposición Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Estado de Advertencia"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Modo LCD"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 #, fuzzy
 msgid "Active AF Sensor"
 msgstr "Vaciar Sensor"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Medidor de Exposición"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Velocidad USB"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Número Serial CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 #, fuzzy
 msgid "Group PTN Type"
 msgstr "tipo de grupo de cursores %d inesperado"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "Bloqueo"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Bloqueo de exposición automática"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Bloquear Opciones TV"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "Bloquear Opciones TV"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "Preferencias"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Brillo Punto Foco"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 #, fuzzy
 msgid "External Flash Attached"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 #, fuzzy
 msgid "External Flash Status"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 #, fuzzy
 msgid "External Flash Sort"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "Flash Externo"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 #, fuzzy
 msgid "BW Filler Effect"
 msgstr "Nitidez BN"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "Nitidez BN"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "BN Contraste"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 #, fuzzy
 msgid "BW Setting Type"
 msgstr "Nitidez BN"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Modo Bit Crudo"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Tipo Fluorescente"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 #, fuzzy
 msgid "Tune Colour Temperature"
 msgstr "Color de Temperatura de Balance Blanco"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Tono Preseleccionado 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Tono Preseleccionado 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Tono Preseleccionado 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Tono Preseleccionado 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Tono Preseleccionado 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Modo Autofoco"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 #, fuzzy
 msgid "Viewfinder Grid Display"
-msgstr "Buscador de Visor Canon EOS"
+msgstr "Cuadrícula"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 #, fuzzy
 msgid "Flash Mode Commander Power"
 msgstr "Configuración del modo flash inválido"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Auto FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 #, fuzzy
 msgid "Warning Display"
-msgstr "Aviso"
+msgstr "Pantalla"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Clase Celda de Batería"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 #, fuzzy
 msgid "ISO Auto High Limit"
 msgstr "ISO Auto Límite Superior"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 #, fuzzy
 msgid "Continuous Speed High"
 msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
-msgstr "Preferencias"
+msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 #, fuzzy
 msgid "Preview Button"
 msgstr "Asignar Botón Anterior"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 #, fuzzy
 msgid "Preview Button 2"
 msgstr "Asignar Botón Anterior"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 #, fuzzy
 msgid "AEAF Lock Button 2"
 msgstr "Botón 2 - &buttoninfo"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Enseñar Indicador"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 #, fuzzy
 msgid "Cell Kind Priority"
 msgstr "Clase Celda de Batería"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Encorchetando Marcos y Pasos"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
-msgstr ""
-"\n"
-"      --list-live        lista de rutas live"
+msgstr "Vivo:"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 #, fuzzy
 msgid "Live View Drive Mode"
 msgstr "Modo Controlador"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 #, fuzzy
 msgid "Live View Status"
-msgstr ""
-"\n"
-"      --list-live        lista de rutas live"
-
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
+msgstr "Vivo:"
 
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Estado de Exposición de Pantalla"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 #, fuzzy
 msgid "Exposure Indicate Status"
 msgstr "Estado de Exposición de Pantalla"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 #, fuzzy
 msgid "Info Display Error Status"
 msgstr "  -V, --version     muestra información sobre la versión\n"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "Exposición"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 #, fuzzy
 msgid "Flash MRepeat Value"
 msgstr "Flash encendido"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
-msgstr "CUENTA"
+msgstr "CONTADOR"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 #, fuzzy
 msgid "Flash MRepeat Interval"
 msgstr "Flash encendido"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Fabricante de Cámara"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Compresión de Imagen"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
-msgstr "_No, esta vez"
+msgstr "Obtiene comprobación de tiempo seguro"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Dispositivo Certificado"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 #, fuzzy
 msgid "Revocation Info"
 msgstr "sin info"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 #, fuzzy
 msgid "Synchronization Partner"
 msgstr "Socio"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 #, fuzzy
 msgid "Friendly Device Name"
 msgstr "nombre de dispositivo fontdir"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Nivel Volúmen"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Icono Dispositivo"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 #, fuzzy
 msgid "Session Initiator Info"
 msgstr "Info: "
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 #, fuzzy
 msgid "Perceived Device Type"
 msgstr "tipo de dispositivo inválido %s"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 #, fuzzy
 msgid "Playback Rate"
-msgstr "_Repetir"
+msgstr "Tipo"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 #, fuzzy
 msgid "Playback Object"
 msgstr "_Repetir"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 #, fuzzy
 msgid "Playback Container Index"
 msgstr "_Repetir"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 #, fuzzy
 msgid "Playback Position"
 msgstr "Posición reproducida"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 #, fuzzy
 msgid "PlaysForSure ID"
 msgstr "  ID:       "
 
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "Baja (la mejor calidad)"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Modo Publicador"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Área Foco"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Bloqueo AE"
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Punto Enfocador"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Tamaño de imagen"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Velocidad Obturador"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Color temperatura"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Foco"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr " Objetos"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Índice de Exposición"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "Filtro AB"
 
-#: camlibs/ptp2/ptp.c:5447
-#, fuzzy
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
-msgstr "¡¡Ella sigue dentro!!"
+msgstr "Imagen Mantenida"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
-#, fuzzy, c-format
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Cercano 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "Área Dinámica AF"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Fecha y hora"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
+#, c-format
 msgid "%.1f stops"
-msgstr "  - ~h (~,1f%) diferido~%"
+msgstr "%.1f detenidas"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
-#, fuzzy
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
-msgstr " NORM"
+msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 #, fuzzy
 msgid "RAW + JPEG Basic"
 msgstr "Crudo + Pequeño Común JPEG"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Foco Manual"
+
+#: camlibs/ptp2/ptp.c:7848
 #, fuzzy
 msgid "Automatic Macro (close-up)"
 msgstr "Cerrar superior"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 #, fuzzy
 msgid "Center Weighted Average"
 msgstr "Promedio Ponderado"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 #, fuzzy
 msgid "Center-spot"
-msgstr "Centro"
+msgstr "Punto Central"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Flash automática"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "Automática, reducción de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 #, fuzzy
 msgid "Red-eye fill flash"
 msgstr "flash anti ojos rojos activado.\n"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "Energía"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 #, fuzzy
 msgid "Timer + Remote"
-msgstr "Temporizador"
+msgstr "Remota"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 #, fuzzy
 msgid "AF Lock only"
 msgstr "Bloqueo Activo AF"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Flash Bloqueado"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 #, fuzzy
 msgid "Reset focus point to center"
 msgstr "Brillo Punto Foco"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 #, fuzzy
 msgid "Highlight active focus point"
 msgstr "Brillo Punto Foco"
 
-#: camlibs/ptp2/ptp.c:5784
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
-msgstr "Mostrar cuentas _no utilizadas"
+msgstr "Sin Uso"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 #, fuzzy
 msgid "SDRam"
 msgstr "SDRAM"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "LCD"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 #, fuzzy
 msgid "LCD Backlight and Info Display"
 msgstr "enseña info acerca de la instancia de ejecución"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 mins"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 mins"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 mins"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Oscuro al iluminar"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Luz sobre oscuridad"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 #, fuzzy
 msgid "Warning Level 1"
 msgstr "1 advertencia dentro del grupo de compilación"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 #, fuzzy
 msgid "Warning Level 0"
 msgstr "%s: nivel de aviso desconocido `%s'\n"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Economía"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "SuperFina"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 #, fuzzy
 msgid "Red Eye Suppression"
 msgstr "supresión de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 #, fuzzy
 msgid "Low Speed Synchronization"
 msgstr "Velocidad baja continua"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Auto + Reducción de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 #, fuzzy
 msgid "On + Red Eye Suppression"
 msgstr "activa + supresión de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Vista Distancia"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Velocidad Obturador Alta"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Velocidad Obturador Baja"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Vista Nocturna"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
-msgstr "Foco"
+msgstr "moneda"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 #, fuzzy
 msgid "Single-Frame Shooting"
 msgstr "Marco simple"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "Contínuo"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 #, fuzzy
 msgid "Timer (Single) Shooting"
 msgstr "Modo de disparo"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 #, fuzzy
 msgid "Continuous Low-speed Shooting"
 msgstr "Velocidad baja continua"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 #, fuzzy
 msgid "Continuous High-speed Shooting"
 msgstr "Velocidad alta continua"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 #, fuzzy
 msgid "Smooth"
 msgstr ""
@@ -10083,792 +12607,785 @@
 "únicamente una vez. Esta preferencia conserva los cambios si o no esta "
 "herramienta de migración ha ejecutado correctamente."
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 #, fuzzy
 msgid "Center-weighted Metering"
 msgstr "Centrado en el medio"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "Modo de medición de punteo"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
-msgstr "Medida de Exposición"
+msgstr "MEDIA"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "Evaluado"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "Métrica de Foco"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 #, fuzzy
 msgid "Center-weighted Average Metering"
 msgstr "Promedio Ponderado"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "Modo de medición de punteo"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 #, fuzzy
 msgid "Low-speed shutter function not available"
 msgstr "Velocidad Obturador Baja"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Baja 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Alta 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Superior 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Superior 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 #, fuzzy
 msgid "Standard Development Parameters"
 msgstr "Parámetros"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "Parámetros"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "Parámetros"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "Parámetros"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Tarjeta Media"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 #, fuzzy
 msgid "Media Card Group"
 msgstr "Tarjeta Media"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Captura"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Caja de Captura"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 #, fuzzy
 msgid "Windows Image Format"
-msgstr "Opción de formato de imagen inválido"
+msgstr "Ven_tanas"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 #, fuzzy
 msgid "Undefined Audio"
-msgstr "                                        : Sonido\n"
+msgstr "                                        : Audio\n"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
+#, fuzzy
 msgid "Audible.com Codec"
-msgstr ""
+msgstr "Código JPEG 2000"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 #, fuzzy
 msgid "Samsung Playlist"
-msgstr "Listado reproducción de Sonido Abstracto"
+msgstr "listado aleatorio"
 
-#: camlibs/ptp2/ptp.c:6292
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
-msgstr "                                        : Vídeo\n"
+msgstr "Indefinió Vídeo"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 #, fuzzy
 msgid "Undefined Collection"
-msgstr "$<sin definir>"
+msgstr "Colección de compiladores GNU"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 #, fuzzy
 msgid "Abstract Multimedia Album"
 msgstr "Álbum de Vídeo Abstracto"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 #, fuzzy
 msgid "Abstract Image Album"
 msgstr "Álbum de Vídeo Abstracto"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 #, fuzzy
 msgid "Abstract Audio Album"
 msgstr "Álbum de Vídeo Abstracto"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Álbum de Vídeo Abstracto"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 #, fuzzy
 msgid "Abstract Audio Video Playlist"
 msgstr "Listado reproducción de Sonido Abstracto"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Grupo de Contacto Abstracto"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 #, fuzzy
 msgid "Abstract Message Folder"
 msgstr "Mensaje Abstracto"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 #, fuzzy
 msgid "Abstract Chaptered Production"
-msgstr "Mensaje Abstracto"
+msgstr "Producción de entorno musical"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Listado reproducción de Sonido Abstracto"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Listado reproducción de Vídeo Abstracto"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 #, fuzzy
 msgid "Abstract Mediacast"
 msgstr "Mensaje Abstracto"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 #, fuzzy
 msgid "WPL Playlist"
-msgstr "Listado reproducción de Sonido Abstracto"
+msgstr "listado aleatorio"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 #, fuzzy
 msgid "M3U Playlist"
-msgstr "Crear ficheros .m3u"
+msgstr "Opciones de lista de reproducción\n"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 #, fuzzy
 msgid "MPL Playlist"
-msgstr "Listado reproducción de Sonido Abstracto"
+msgstr "listado aleatorio"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 #, fuzzy
 msgid "ASX Playlist"
-msgstr "Listado reproducción de Sonido Abstracto"
+msgstr "listado aleatorio"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 #, fuzzy
 msgid "PLS Playlist"
-msgstr "Listado reproducción de Sonido Abstracto"
+msgstr "listado aleatorio"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 #, fuzzy
 msgid "Undefined Document"
-msgstr "$<sin definir>"
+msgstr "para el documento"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 #, fuzzy
 msgid "Abstract Document"
 msgstr "Mensaje Abstracto"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Documento Word Microsoft"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Mensaje Indefinido"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Mensaje Abstracto"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 #, fuzzy
 msgid "Undefined Contact"
-msgstr "sin definir"
+msgstr "Contacto"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Contacto Abstracto"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Ítem de Calendario Indefinido"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 #, fuzzy
 msgid "Abstract Calendar Item"
 msgstr "Ítem de Calendario Indefinido"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
-msgstr "ejecutable"
+msgstr "Ventanas Ejecutables Indefinidas"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 #, fuzzy
 msgid "Media Cast"
-msgstr "Tarjeta Media"
+msgstr "reparto:"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sección"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Desconocido(%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 #, fuzzy
 msgid "Get device info"
 msgstr "Obtén información sobre la aldea"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Abrir sesión"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Cerrar sesión"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 #, fuzzy
 msgid "Get storage IDs"
 msgstr "Incapaz de obtener ids desde bd"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 #, fuzzy
 msgid "Get storage info"
 msgstr "Obtén información sobre la aldea"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Obtiene número de objetos"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 #, fuzzy
 msgid "Get object handles"
-msgstr "Obtener Objeto de Imagen Redimensionado"
+msgstr "Manipulaciones Enumeradas"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 #, fuzzy
 msgid "Get object info"
-msgstr "No hay información válida PTP del objeto PTP"
+msgstr "Obtén información sobre la aldea"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 #, fuzzy
 msgid "Get object"
-msgstr "Error Docman: incapaz de obtener carpeta de objeto"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Obteniendo miniaturas"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Borrar objeto"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 #, fuzzy
 msgid "Send object info"
 msgstr "No hay información válida PTP del objeto PTP"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 #, fuzzy
 msgid "Send object"
 msgstr "Enviar"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Iniciar captura"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Formato de almacenaje"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Restablece dispositivo"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 #, fuzzy
 msgid "Self test device"
 msgstr "Falló la auto-comprobación PTP"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 #, fuzzy
 msgid "Set object protection"
-msgstr " Cambiar Protección (%u entradas):\n"
+msgstr "La calidad-de-protección solicitada no pudo ser provista"
 
-#: camlibs/ptp2/ptp.c:6408
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
-msgstr "Apagar"
+msgstr "Apagar dispositivo"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 #, fuzzy
 msgid "Get device property description"
-msgstr "Restablecer valor propietario de dispositivo"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 #, fuzzy
 msgid "Get device property value"
 msgstr "Establece valor propietario del dispositivo"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Establece valor propietario del dispositivo"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Restablecer valor propietario de dispositivo"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 #, fuzzy
 msgid "Terminate open capture"
 msgstr "Captura No Abierta, "
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Mueve objeto"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Copia objeto"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 #, fuzzy
 msgid "Get partial object"
 msgstr "Obtener Objeto de Imagen Redimensionado"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 #, fuzzy
 msgid "Initiate open capture"
 msgstr "Iniciar captura"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 #, fuzzy
 msgid "Start Enumerate Handles"
 msgstr "Manipulaciones Enumeradas"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Manipulaciones Enumeradas"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Detener Enumeración Manipuladores"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 #, fuzzy
 msgid "Get Vendor Extension Maps"
 msgstr "Extensión de Proveedor"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 #, fuzzy
 msgid "Get Vendor Device Info"
 msgstr "Obtén información sobre la aldea"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Obtener Objeto de Imagen Redimensionado"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 #, fuzzy
 msgid "Get Filesystem Manifest"
 msgstr "S.ficheros"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 #, fuzzy
 msgid "Get Stream Info"
-msgstr "FLUJO"
+msgstr "Obtén información sobre la aldea"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 #, fuzzy
 msgid "Get Stream"
 msgstr "FLUJO"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 #, fuzzy
 msgid "Get object properties supported"
 msgstr "No se pudo acceder al objeto complemento"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 #, fuzzy
 msgid "Get object property description"
-msgstr "Obtener Objeto de Imagen Redimensionado"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 #, fuzzy
 msgid "Set object property value"
-msgstr "Establece valor propietario del dispositivo"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 #, fuzzy
 msgid "Get object property list"
-msgstr "Obtener Objeto de Imagen Redimensionado"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 #, fuzzy
 msgid "Set object property list"
-msgstr "Establece valor propietario del dispositivo"
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
+#, fuzzy
 msgid "Get interdependent property description"
-msgstr ""
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 #, fuzzy
 msgid "Send object property list"
-msgstr "Lista los contenidos de un árbol de objeto."
+msgstr "Obtener objeto de valor propietario"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 #, fuzzy
 msgid "Get object references"
 msgstr "Referencias a objetos"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 #, fuzzy
 msgid "Set object references"
 msgstr "Referencias a objetos"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 #, fuzzy
 msgid "Update device firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Omitir al siguiente posición en listado reproductor"
 
-#: camlibs/ptp2/ptp.c:6445
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
-msgstr "Fallado al obtener la hora actual\n"
+msgstr "Obtiene comprobación de tiempo seguro"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 #, fuzzy
 msgid "Get secure time response"
-msgstr "Tiempo de Respuesta"
+msgstr "Obtiene comprobación de tiempo seguro"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "Respuesta"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 #, fuzzy
 msgid "Get sync list"
 msgstr "Obtener lista de seguimientos disponibles"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 #, fuzzy
 msgid "Get meter challenge"
 msgstr "Obtiene respuesta"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Obtiene respuesta"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Vaciar almacenaje de datos"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 #, fuzzy
 msgid "Get license state"
 msgstr "^Licencia"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 #, fuzzy
 msgid "Send WMDRM-PD Command"
 msgstr "No se pudo enviar orden scsi a: '%s' (%m)."
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Boletín Ítemes Añadido/Eliminado"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Boletín de Elementos Adquiridos"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
+#, fuzzy
 msgid "Enable trusted file operations"
-msgstr ""
+msgstr "Desactiva operaciones de fichero confiados"
 
-#: camlibs/ptp2/ptp.c:6466
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
-msgstr "desactiva fichero automático \"deduplicarción\" en el almacén"
+msgstr "Desactiva operaciones de fichero confiados"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 #, fuzzy
 msgid "End trusted application session"
-msgstr "(Final de sesión.)"
+msgstr "Gestor aplicando sonido de sesión"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 #, fuzzy
 msgid "Open Media Session"
 msgstr "Cerrar Sesión Media"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Cerrar Sesión Media"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Obtiene Siguiente Bloque de Datos"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 #, fuzzy
 msgid "Set Current Time Position"
 msgstr "La hora actual es ~a."
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 #, fuzzy
 msgid "Send Registration Request"
-msgstr "Aplicaciónde Registración"
+msgstr "Registro Aplicación"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 #, fuzzy
 msgid "Get Registration Response"
 msgstr "Obtiene respuesta"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 #, fuzzy
 msgid "Get Proximity Challenge"
-msgstr "desafío no coincidente\n"
+msgstr "Obtiene comprobación de tiempo seguro"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 #, fuzzy
 msgid "Send Proximity Response"
-msgstr "Enviar"
+msgstr "Respuesta"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 #, fuzzy
 msgid "Process WFC Object"
 msgstr "Marca el objeto para requerir proceso inmediato"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
-msgstr "Parcial"
+msgstr "Enviar"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 #, fuzzy
 msgid "Truncate Object"
-msgstr "Objeto Asociado"
+msgstr "Referencias a objetos"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Comenzar Editar Objeto"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Finalizar Objeto Editado"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Código PTP de fabricante desconocido PTP"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "*desconocido*    "
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Valor desconocido"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Descargando película…"
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Descargando sonido…"
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Descargando los datos EXIF…"
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "No hay datos EXIF disponibles para %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "No pudo borrar el fichero."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "No pudo eliminar el directorio."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "No pudo crear el directorio."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versión: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Estado RTC: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Hora de la cámara: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Identificador de la cámara: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "No hay insertada ninguna tarjeta SD.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "Identificador de la tarjeta SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Fotos que hay en la cámara: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Memoria SD: %d MB total, %d MB libres.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Memoria interna: %d MB total, %d MB libres.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10881,7 +13398,7 @@
 "la imagen de actualización del firmware e imaginación\n"
 "salvaje.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10893,12 +13410,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "basado en el controlador de Bob Paauwe\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "desconocido (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10907,190 +13424,190 @@
 "Modelo: %s\n"
 "Memoria: %d byte(s) de %d disponibles"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2'0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1'5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1'0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0'5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0'0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0'5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1,0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1,5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2,0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Exteriores"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Máximo"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Mínimo"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Carácter"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Sonido"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Imagen y sonido"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Carácter y Sonido"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Configuración"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Común"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright (máx. 20 caracteres)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Nivel de blancos"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Modo de Grabación"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Compresión"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "¡Velocidad %i no es compatible!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Se esperaba %i, se ha recibido %i. Por favor, informe de este error a %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Se esperaban %i bytes, se han recibido %i. Por favor, informe de este error "
 "a %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Se esperaban 0x%x pero se han recibido 0x%x. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Caracteres no válidos (0x%x, 0x%x). Por favor, contace con %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Cámara ocupada. Si el problema persiste, por favor contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Tiempo de espera superado incluso después de 2 reintentos. Por favor, "
 "contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Tiempo de espera superado incluso después de 2 reintentos. Por favor, "
 "contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "La cámara está en un modo incorrecto. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "La cámara no ha aceptado los parámetros. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Se ha producido un error desconocido. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -11098,7 +13615,7 @@
 "La longitud del nombre de fichero no debe exceder de 12 caracteres («%s» "
 "tiene %i caracteres)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -11110,109 +13627,108 @@
 "adaptó a gphoto2. Marcus Meissner <marcus@jet.franken.de> lo corrigió y "
 "mejoró."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Resolución más tamaño"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Fecha y hora (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Configuración de Apertura"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Modo de Color"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Reducción de ojos rojos"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Opciones del flash"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Ahorro de energía de la máquina (segundos)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Ahorro de energía de la cámara (segundos)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Modo de la lente"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Coreano"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Inglés"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Francés"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Alemán"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italiano"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japonés"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Castellano"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
-#, fuzzy
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Opciones de la imagen"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -11232,15 +13748,15 @@
 "  PhotoPC 3000z, si su cámara se comporta de manera diferente, por favor\n"
 "  envíe un correo a la lista de desarrolladores de gphoto (en inglés)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Ninguna tarjeta de memoria presente"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "No pudo obtener la capacidad de la batería"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
@@ -11248,20 +13764,20 @@
 "El nivel de la batería de la cámara es muy bajo (%d%%). Se ha interrumpido "
 "la operación."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "No pudo obtener la cantidad de memoria disponible"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "La cámara se negó 3 veces a mantener una conexión abierta."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "El primer byte recibido (0x%x) no es válido."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -11269,53 +13785,53 @@
 "La transmisión del paquete superó el tiempo de espera incluso después de %i "
 "reintentos. Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "No pudo transmitir el paquete incluso después de varios intentos."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, fuzzy, c-format
 msgid "Packet was rejected by camera. Please contact %s."
-msgstr "Cámara ocupada. Si el problema persiste, por favor contacte con %s."
+msgstr "La cámara no ha aceptado los parámetros. Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "No pudo transmitir el paquete (código de error %i). Por favor, contacte con "
 "%s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "La transmisión superó el tiempo de espera incluso después de 2 reintentos. "
 "Abandonando…"
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Se ha obtenido el resultado inesperado 0x%x. Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Recibida respuesta inesperada (%i). Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "No pudo obtener el registro %i. Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Demasiados reintentos fallidos."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Enviando datos…"
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -11323,146 +13839,142 @@
 "llamada recursiva no estan soportada por el controlador sierra! Por favor, "
 "contacte con %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "No pudo obtener el registro de cadena %i. Por favor, contacte con %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Se esperaban 32 bytes, se han recibido %i. Por favor, contacte con %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Velocidad del obturador en microsegundos (0 automática)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "B/N"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Anti ojos rojos"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Contraste+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Contraste-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Brillo+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Brillo-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Parpadeo"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Modo LED"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Infinito"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Previsualizar Miniatura"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Siguiente"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Anterior"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Modo Operativo"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Brillantez LCD"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Apagado automático del LCD (en segundos)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matriz"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Punteo-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Medida de Exposición"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Ampliación (en milímetros)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "ninguno"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Bloqueo AE"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Ojo de pez"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Amplio"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "Otros ajustes de exposición/lentes"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Bloqueo de exposición automática"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11492,7 +14004,7 @@
 "        Ponga la cámara en modo 'M' para poder\n"
 "        ajustar la velocidad del obturador.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11512,71 +14024,67 @@
 "\n"
 "      La descarga debería funcionar correctamente.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Pizarra blanca"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Pizarra negra"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "Modo de Color"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "Sincronización lenta"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Filtro anti ojos rojos"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluorescente"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluorescente"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Polvo"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Modo LCD"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Ampliación digital"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Posición del foco"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Formato de la hora"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -11613,7 +14121,7 @@
 "    debería volver a conectar la cámara a la computadora\n"
 "    y poner LCD en 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -11647,7 +14155,7 @@
 "    debería volver a conectar la cámara a la computadora\n"
 "    y poner LCD en 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11677,106 +14185,111 @@
 "     configuración completa, por favor contacte con\n"
 "     la lista de distribución de los desarrolladores.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (desconocida)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "El fichero a enviar tiene longitud nula"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "No hay suficiente memoria disponible en la tarjeta de memoria"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "No pudo obtener el nombre del directorio que contiene las imágenes"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Carga está soportada dentro de la carpeta «%s» exclusivamente"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Mejor"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (desconocida)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Velocidad del obturador (microsegundos, 0 automática)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Blanco y negro"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Pizarra blanca"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Pizarra negra"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Brillo/Contraste"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Brillo+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Brillo-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Luz de día"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Infinito/Ojo de pez"
 
 # Translation thanks to Martin Kroeker. Colin
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Modo de medición de punteo"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Apagado automático (en la máquina) (en segundos)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11784,12 +14297,12 @@
 "¿Cuánto tiempo pasará hasta que la cámara se apague cuando esté conectada a "
 "la computadora?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Apagado automático (en el campo) (en segundos)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11797,119 +14310,119 @@
 "¿Cuánto tiempo pasará hasta que la cámara se apague cuando no esté conectada "
 "a la computadora?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Apagado automático del LCD (en segundos)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Configuración de la toma"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "común"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "color"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "blanco y negro"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Nota: no hay ninguna tarjeta de memoria, algunos valores pueden no ser "
 "válidos\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr ""
 "Modelo de Cámara: %s\n"
 "\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, fuzzy, c-format
 msgid "Serial Number: %s\n"
 msgstr "  Número serial: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, fuzzy, c-format
 msgid "Software Rev.: %s\n"
 msgstr "  %#06lx: Rev: %d  Opcs: %s"
 
 # Haesslich Colin
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, fuzzy, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Marcos tomados: %4d\n"
 
 # Haesslich... Colin
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Marco Izquierdo: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Vida de baterías: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, fuzzy, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "No pudo obtener la cantidad de memoria disponible"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Fecha: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Manual de la cámara no disponible.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11930,7 +14443,7 @@
 "  PhotoPC 3000z, si su cámara se comporta de manera diferente, por favor\n"
 "  envíe un correo a %s (en inglés)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -11968,7 +14481,7 @@
 "    y poner LCD en 'Off'."
 
 # Ist "Freigabe" richtig? Colin
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11989,12 +14502,7 @@
 "por la utilización de su Olympus C-3030Z\n"
 "para la implementación del soporte USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (desconocida)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12004,11 +14512,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "No pudon aplicar las opciones de USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12029,7 +14537,7 @@
 "Controlador para acceder a la cámara Smal Ultrapocket, y versiones OEM "
 "(slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -12040,7 +14548,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -12055,13 +14563,13 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -12075,7 +14583,7 @@
 "Ken-ichi Hayashi\n"
 "Adaptado a gPhoto2 por Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -12087,7 +14595,7 @@
 "Escrita originalmente por Mark Davies <mdavies@dial.pipex.com>\n"
 "Adaptada a gPhoto2 por Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -12100,12 +14608,12 @@
 "Memoria total: %ikB\n"
 "Memoria libre:  %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Revisión del firmware: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -12113,7 +14621,7 @@
 "Controlador Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -12122,7 +14630,7 @@
 "FLASH:\n"
 " Ficheros: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -12139,7 +14647,7 @@
 "Espacio usado: %8d\n"
 "Espacio libre: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "biblioteca spca50x v"
 
@@ -12180,22 +14688,22 @@
 "sq905 generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Controlador genérico sq905C\n"
+"sq905C como controlador genérico\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, fuzzy, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Para utilizar marcos de cuadros tiene un chipset AX203\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12203,11 +14711,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientación"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12219,110 +14723,110 @@
 "Controlador para cámaras que utilizan el procesador ASIC STV0674.\n"
 "Ingeniería inversa del protocolo usando una SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Exposición incorrecta (probablemente no haya luz suficiente)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Información acerca de la cámara STV0680\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Revisión del firmware: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Revisión del ASIC: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "ID del sensor: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Cámara está configurada para una luz centelleante a %dHz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Memoria en la cámara: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "La cámara soporta miniaturas.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "La cámara soporta vídeo.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Las fotos de la cámara son monocromáticas.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "La cámara tiene memoria.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "La cámara soporta los formatos de vídeo: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Identificador del fabricante: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Identificador del producto: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Cantidad de imágenes: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Cantidad máxima de imágenes: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Anchura de la imagen: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Altura de la imagen: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Tamaño de la imagen: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Anchura de miniatura: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Altura de miniatura: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Tamaño de miniatura: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12338,12 +14842,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Extendido para las Aiptek PenCam y otras cámaras USB de modo STM doble."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Obteniendo información sobre %i ficheros…"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12356,19 +14860,19 @@
 "Por favor envíe informes de errores y comentarios.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z es sólo USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Configurado de Controlador"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Modo turbo"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12376,12 +14880,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Descargando %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12391,39 +14895,59 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Controlador Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Para utilizar marcos de cuadros tiene un chipset AX203\n"
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Cargando los controladores para la cámara desde «%s»…"
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Se ha producido un error en la biblioteca de entrada-salida («%s»): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "No pudo detectar cámara alguna"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "No pudo detectar cámara alguna en puerto %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Debe establecer el puerto antes de la inicialización de la cámara."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "No pudo cargar el controlador necesario de la cámara «%s» (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Falta la función 'camera_init' en el controlador de la cámara «%s»."
@@ -12461,12 +14985,12 @@
 msgid "This camera can not capture previews."
 msgstr "Esta cámara no permite la pre-visualización de las capturas."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "La ruta «%s» no es absoulta."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12475,22 +14999,22 @@
 "Ha estado intentando borrar «%s» de la carpeta «%s», pero el sistema de "
 "ficheros no soporta con el borrado de ficheros."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Aún hay subcarpetas en la carpeta «%s/%s» que está intentando quitar."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Aún hay ficheros en la carpeta «%s/%s» que está intentando quitar."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Este sistema de ficheros no soporta el envío de ficheros."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12498,106 +15022,150 @@
 "La carpeta «%s» sólo contiene %i ficheros, pero usted ha solicitado un "
 "fichero con número %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "No pudo encontrar el fichero «%s» en la carpeta «%s»."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "No pudo encontrar el fichero «%s»."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "El sistema de ficheros no compatible con obtención de ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Tipo de fichero %i desconocido."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "El sistema de ficheros no compatible con la obtención de información sobre "
 "los ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "El sistema de ficheros no compatible con la modificación de la información "
 "sobre los ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Los atributos de sólo lectura como anchura y altura no se pueden modificar."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr ""
 "El sistema de ficheros no compatible con la obtención de información "
 "almacenada"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Datos corruptos"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "El fichero existe"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Modelo desconocido"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Directorio no encontrado"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Directorio existe"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "E/S en curso"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Ruta no absoluta"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Cámara no pudo completar operación"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Error de OS en comunicación de cámara"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Sin suficiente espacio libre"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Error desonocido de la biblioteca de la cámara"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Error desconocido"
 
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Valor desconocido %04d"
+
 #, fuzzy
+#~ msgid "Now value is not in enumeration."
+#~ msgstr "Valor objetivo no está dentro de enumeración."
+
+#~ msgid "Setting 4"
+#~ msgstr "Configuración 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Configuración 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Configuración 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Configuración 7"
+
+#, fuzzy, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "Compensación de la exposición"
+
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 2"
+#~ msgstr "Preconfigurar Adaptación 2"
+
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 3"
+#~ msgstr "Preconfigurar Adaptación 3"
+
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 4"
+#~ msgstr "Preconfigurar Adaptación 4"
+
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 5"
+#~ msgstr "Preconfigurar Adaptación 5"
+
+#, fuzzy, c-format
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x"
 #~ msgstr "Captura Canon EOS fallada: %x"
 
@@ -12943,9 +15511,6 @@
 #~ msgid "PTP: EK Filename Invalid"
 #~ msgstr "PTP: Nombre de fichero EK no válido"
 
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP: Error de E/S"
-
 #~ msgid "PTP: Error: bad parameter"
 #~ msgstr "PTP: Error: parámetro incorrecto"
 
@@ -12956,10 +15521,6 @@
 #~ msgstr "PTP: Error de protocolo, se esperaba respuesta"
 
 #, fuzzy
-#~ msgid "Date Time"
-#~ msgstr "Fecha y hora"
-
-#, fuzzy
 #~ msgid "ShutterSpeed"
 #~ msgstr "Velocidad del obturador (en segundos)"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/eu.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/eu.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/eu.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/eu.po Changed

@@ -7,11 +7,11 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2005-05-12 16:52+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n"
 "Language-Team:  <itzulpena@euskalgnu.org>\n"
-"Language: \n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,19 +26,19 @@
 "Benjamin Moos <benjamin@psnw.com>"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -71,19 +71,19 @@
 "Aox kontrolatzaile orokorra\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -91,17 +91,19 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 #, fuzzy
 msgid "Picture Frame Configuration"
 msgstr "Kameraren konfigurazioa"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -110,7 +112,7 @@
 "Argazki-kopurua: %i\n"
 "Firmware-bertsioa: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -134,26 +136,26 @@
 "Sarean topatutako dokumentuak erabiliz\n"
 "inplementatua. Baimena Vision-ek emana."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Ezin izan da %s direktorioa sortu."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Ezin izan da %s direktorioa kendu."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "blokeo-teklek huts egin dute."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*EZEZAGUNA*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -162,7 +164,7 @@
 "canon_int_capture_image: hasierako canon_usb_list_all_dirs()-ek huts egin du "
 "%i egoerarekin"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -171,25 +173,25 @@
 "canon_int_capture_image: amaierako canon_usb_list_all_dirs()-ek huts egin du "
 "%i egoerarekin"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "'%s' izena (%i karaktere) luzeegia da gehienez 30 karaktere izan ditzakete."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "%s-(e)n letra minuskulan ez dira onartzen."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, fuzzy, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERROREA: hasierako mezua laburregia da (%i < minimoa %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -198,29 +200,29 @@
 "canon_int_list_dir: Paketearen amaierara heldu da direktorioaren 1. sarrera "
 "aztertzen"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: direktorioko sarrera trunkatua aurkitu da"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Fitxategia babestuta."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, fuzzy, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERROREA: hasierako mezua laburregia da (%i < minimoa %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "Ezin izan da JPEG koadro txikia atera datuetatik: ez dago hasierarik/"
 "amaierarik"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Ezin izan da datuen JPEG koadro txikia atera: Datuak ez dira JFIF"
 
@@ -229,24 +231,24 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "\"%s\" NULL parametroa %s(e)ko %i lerroan "
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, fuzzy, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 "Ez dakit nola maneiatu camera->port->type balioa %i aka 0x%xin %s %i lerroa."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "ERRORE LARRIA: %d luzerarako hasierako CRC balioa ezezaguna da\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "ezin da hasierako CRC balioa aurkitu\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -255,314 +257,325 @@
 "kontuz: CRC ez da egiaztatu (gehitu %d luzera, 0x%04x balioa) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 #, fuzzy
 msgid "Compatibility Mode"
 msgstr "Bateria"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 #, fuzzy
 msgid "Thumbnail"
 msgstr "Aurreikusi koadro txikia"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 #, fuzzy
 msgid "Full Image"
 msgstr "Irudia"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 #, fuzzy
 msgid "Auto focus: one-shot"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 #, fuzzy
 msgid "Auto focus: AI servo"
 msgstr "Autofokusaren errorea."
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 #, fuzzy
 msgid "Auto focus: AI focus"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 #, fuzzy
 msgid "Manual focus"
 msgstr "Eskuzkoa"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 #, fuzzy
 msgid "Beep off"
 msgstr "Soinu-seinalea"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 #, fuzzy
 msgid "Beep on"
 msgstr "Soinu-seinalea"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 #, fuzzy
 msgid "Flash off"
 msgstr "Flasharen modua"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 #, fuzzy
 msgid "Flash on"
 msgstr "Flasharen modua"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 #, fuzzy
 msgid "Flash auto"
 msgstr "Flasharen modua"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 #, fuzzy
 msgid "Manual 2"
 msgstr "Eskuzkoa"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 #, fuzzy
 msgid "Far scene"
 msgstr "Fluoreszentea"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 #, fuzzy
 msgid "Fast shutter"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 #, fuzzy
 msgid "Slow shutter"
 msgstr "Argazki-ateratzearen ezarpenak"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr ""
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr ""
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontrastea"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Puntua"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makroa"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 #, fuzzy
 msgid "BW"
 msgstr "Z/B"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 #, fuzzy
 msgid "PanFocus"
 msgstr "Fokua"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 #, fuzzy
 msgid "Neutral"
 msgstr "Normala"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 #, fuzzy
 msgid "Long shutter"
 msgstr "Foku-distantzia"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 #, fuzzy
 msgid "Indoor"
 msgstr "Aire zabalekoa"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr ""
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr ""
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr ""
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr ""
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr ""
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr ""
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 #, fuzzy
 msgid "Digital macro"
 msgstr "Zoom digitala"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 #, fuzzy
 msgid "MyColors"
 msgstr "Kolorea"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -579,44 +592,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera ez dago erabilgarri"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Kamera itzaltzen"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Errorea irudia kapturatzean"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Ezin izan da diskoaren izena eskuratu: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Ez da arrazoirik ezagutzen"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Ezin izan da diskoaren informazioa eskuratu: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Barne-errorea #1 get_file_func()-en (%s, %i lerroa)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Ezin izan da audio-fitxategirik aurkitu %s-(e)ntzat"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -627,35 +640,35 @@
 "  %11s byte guztira\n"
 "  %11s byte erabilgarri"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "AC moldagailua"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "bateriarekin"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "energia ondo"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "energia gaizki"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "ez dago erabilgarri: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (ostalariaren denbora %s%i segundo)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +695,7 @@
 "\n"
 "Ordua: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -703,25 +716,25 @@
 "A5erako gehikuntzak: Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Errorea fitxategia ezabatzean"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Errorea asoziatutako koadro txikia ezabatzean"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "57600 baino abiadura handiagoak ez dira onartzen kamera honetan kargatzeko"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Ezin izan da flash unitatearen letra lortu"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -729,411 +742,433 @@
 "Ezin izan da kargatu, karpeta-izenik ez dago erabilgarri!\n"
 "999CANON karpeta-izena badago eta AUT_9999.JPG argazkia du barruan."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Ezin izan da \\DCIM direktorioa sortu."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Ezin izan da helburuko direktorioa sortu."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Kameraren eta kontrolatzailearen konfigurazioa"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 #, fuzzy
 msgid "Owner Name"
 msgstr "Jabearen izena"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 #, fuzzy
 msgid "Capture Size Class"
 msgstr "Aurre-kapturaren atzerapena"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO abiadura"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 #, fuzzy
 msgid "Shooting mode"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zooma"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Irekiera"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 #, fuzzy
 msgid "Image Format"
 msgstr "Data-formatua"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Soinu-seinalea"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 #, fuzzy
 msgid "Camera Actions"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 #, fuzzy
 msgid "Camera Status Information"
 msgstr "Kameraren konfigurazioa"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Kamera-modeloa"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Data eta ordua"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Errorea"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmwarearen berrikuspena: %8s"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 #, fuzzy
 msgid "Power"
 msgstr "Energia aurreztea"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Kontrolatzailea"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Fitxategi guztien zerrenda"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Mantendu fitxategi-izena kargatzean"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Kamera ez dago erabilgarri"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Jabearen izena aldatu da"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 #, fuzzy
 msgid "ISO speed changed"
 msgstr "Jabearen izena aldatu da"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 #, fuzzy
 msgid "Could not change ISO speed"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 #, fuzzy
 msgid "Invalid shooting mode setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 #, fuzzy
 msgid "Shooting mode changed"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 #, fuzzy
 msgid "Could not change shooting mode"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 #, fuzzy
 msgid "Shutter speed changed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 #, fuzzy
 msgid "Could not change shutter speed"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 #, fuzzy
 msgid "Invalid aperture setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 #, fuzzy
 msgid "Aperture changed"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 #, fuzzy
 msgid "Could not change aperture"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 #, fuzzy
 msgid "Invalid exposure compensation setting"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 #, fuzzy
 msgid "Exposure compensation changed"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 #, fuzzy
 msgid "Could not change exposure compensation"
 msgstr "Ezin izan da direktorioa sortu."
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 #, fuzzy
 msgid "Invalid image format setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 #, fuzzy
 msgid "Image format changed"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 #, fuzzy
 msgid "Could not change image format"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 #, fuzzy
 msgid "Focus mode changed"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 #, fuzzy
 msgid "Could not change focus mode"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 #, fuzzy
 msgid "Invalid beep mode setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 #, fuzzy
 msgid "Beep mode changed"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 #, fuzzy
 msgid "Could not change beep mode"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 #, fuzzy
 msgid "Zoom level changed"
 msgstr "Jabearen izena aldatu da"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 #, fuzzy
 msgid "Could not change zoom level"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 #, fuzzy
 msgid "Invalid flash mode setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 #, fuzzy
 msgid "Flash mode changed"
 msgstr "Fokuaren modua"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 #, fuzzy
 msgid "Could not change flash mode"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "ordua ezarrita"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "ezin izan da ordua ezarri"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Onartzen ez den %i = 0x%x motako ataka adierazi duzu. Ezin da abiarazi."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Bateria agortu da, kamera itzali egingo da."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "ERROREA: espero ez zen mezua"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "ERROREA: mezu gehiegi"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "ERROREA: sekuentziatik kanpo."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "ERROREA: espero ez zen pakete-mota."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "ERROREA: mezu-formatu okerra."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "ERROREA: espero ez zen mezua2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Fitxategia kargatzen..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Fitxategia eskuratzen..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1141,7 +1176,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1149,148 +1184,148 @@
 "canon_serial_get_dirents: direktorio-sarreren hasierako paketea txikiegia "
 "da(%i byte bakarrik)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: ezin izan dira memoriako %i byte esleitu"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: ezin izan da direktorioaren beste sarrera bat "
 "irakurri"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: direktorio-sarrera trunkatua jaso da"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: direktorio-sarrera gehiegi, begizta batean egongo "
 "gara."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: ezin izan da direktorioaren sarreraren bufferra %i "
 "byteko tamainan jarri"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Errorea abiadura aldatzean."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Protokoloa berrezartzen..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 #, fuzzy
 msgid "Camera OK."
 msgstr "Kamera ondo dago.\n"
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Kamera bila..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Kamera kontaktatzen saiatzen..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Komunikazio-errorea 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Kamerak ez du erantzuten"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Erantzun ezezaguna"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "\"%s\" detektatu da, \"%s\" izenez ere ezagutzen dena"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modelo ezezaguna \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Transmisio-amaiera (EOT) okerra"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Komunikazio-errorea 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Komunikazio-errorea 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Abiadura aldatzen... itxaron..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Errorea abiadura aldatzean"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 #, fuzzy
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Errorea gertatu da berrabiarazi bitartean hartu-agiriaren (ACK) zain dagoela"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Errorea abiarazi bitartean hartu-agiriaren (ACK) zain dagoela"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Kamerara konektatuta"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "ERROREA: errore larriaren baldintza bat detektatu da, ezin da jarraitu "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERROREA: %d handiegia da"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Koadro txikia eskuratzen..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "EZ DA EZAGUTZEN"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Ezin izan da hasierako kontaktua egin kamerarekin"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Kamera lehendik aktibatuta zegoen"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Kamera aktibatuta zegoen"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Kameraren hasierako erantzuna %c/'%s' ezezaguna)"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1299,7 +1334,7 @@
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1308,7 +1343,7 @@
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1317,7 +1352,7 @@
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1326,7 +1361,7 @@
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1335,31 +1370,31 @@
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "4.1 urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera ez dabil"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, fuzzy, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "4.1 urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera ez dabil"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera ez dago prest, kamera identifikatzeko hainbat eskaerek huts egin "
 "dute: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera ez dago prest, get_battery-k huts egin du: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1368,14 +1403,14 @@
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1383,7 +1418,7 @@
 "canon_usb_unlock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1392,20 +1427,20 @@
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Datuak jasotzen..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Memoriarik ez: %d byte behar dira."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue-ek huts egin du"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1414,22 +1449,22 @@
 "canon_usb_set_file_attributes: canon_usb_dialogue-k kameraren 0x%08x errore-"
 "egoera itzuli du"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Ezin izan da \"%s\" fitxategitik irakurri"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Memoriarik ez: %ld byte behar dira."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1437,7 +1472,7 @@
 "Fitxategia handiegia zen. Agian kamera itzali eta berriro piztu beharko duzu "
 "fitxategi gehiago kargatu baino lehen."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1446,7 +1481,7 @@
 "canon_usb_get_dirents: karga ez da bufferrean kabitzen, '%.96s' (trunkatua) "
 "handiegia da."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1455,7 +1490,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu, %i itzuli du"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1464,7 +1499,7 @@
 "canon_usb_list_all_dirs: karga ez da bufferrean kabitzen, "
 "'%.96s' (trunkatua) handiegia da."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1473,27 +1508,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu, %i itzuli du"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' detektatu da."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Kameraren \"%s\" izena ez dator bat ezagutzen diren kamerekin"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, fuzzy, c-format
 msgid "Image type %d not supported"
 msgstr "Irudi-mota hori ez onartzen"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "%s irudia ezabatzearen kontra babestuta dago."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1501,40 +1536,40 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Kameraren konfigurazioa"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Bateria"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 #, fuzzy
 msgid "Brightness"
 msgstr "Distira-"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 #, fuzzy
 msgid "Too bright"
 msgstr "Copyright-a"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 #, fuzzy
 msgid "Too dark"
 msgstr "Argi gutxiegi dago."
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "Ados"
 
@@ -1603,16 +1638,16 @@
 "sq905 kontrolatzaile orokorra\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Irudi-mota hori ez onartzen"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Argazki-kopurua: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1620,7 +1655,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1628,24 +1663,24 @@
 "Erroko karpeta bakarrik onartzen da; zuk '%s' karpetarako fitxategien "
 "zerrenda eskatu zenuen."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Irudi-kopurua lortzeko arazoa dago"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Arazoa irudiari buruzko informazioa lortzean"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Kapturatze-mota hori ez onartzen"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (bateria %d%% dago beteta)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, fuzzy, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1663,88 +1698,89 @@
 "Uneko bereizmen-ezarpena: %s\n"
 "Kamerak %s %s(e)kin funtzionatzen du\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flasha"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 #, fuzzy
 msgid "No Flash"
 msgstr "Flashik GABE"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Iris-diafragma duala"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 #, fuzzy
 msgid "No Dual Iris"
 msgstr "Iris-diafragma dualik EZ"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Bereizmena hautatzeko etengailua"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 #, fuzzy
 msgid "No Resolution Switch"
 msgstr "Bereizmena hautatzeko etengailurik EZ"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 #, fuzzy
 msgid "No Power Light"
 msgstr "Energia-adierazlerik EZ"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "PIZTUTA"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "ITZALITA"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "prest"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 #, fuzzy
 msgid "Not ready"
 msgstr "EZ dago prest"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "betetze-moduan"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 #, fuzzy
 msgid "Not in fill mode"
 msgstr "betetze-moduan EZ"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "txikia (320 x 240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "handia (640 x 480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "kanpotik"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "barnetik"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1762,7 +1798,7 @@
 "  edo modu automatikoan konfigura daiteke.\n"
 "* Uneko irudi-kalitatea izan litekeena baino txikiagoa da.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1792,118 +1828,234 @@
 "     Protokoloari, formaturik gabeko irudiei,\n"
 "     gphoto2 atakari buruzko informazioa\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Arazoa irudia Flashetik irakurtzean"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Memoriarik ez"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Irudia deskargatzen..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Arazoa irudia deskargatzean"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Erabiltzaileak bertan behera utzi du deskargatzea"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Arazoa zuzeneko irudia hartzean"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Esposizioa"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Esposizioa automatikoki doitzea aurrebistan"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Esposizio-maila aurrebistan"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Flash automatikoa irudia kapturatzean"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Arazoa ataka irekitzean"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Arazoa kamera berrezartzean"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Arazoa kameraren komunikazio-abiadura ezartzean"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Modema dirudi, ez kamera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "'%s'(e)ko fitxategien zerrenda..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "'%s'(e)ko karpeten zerrenda..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Ezin izan da '%s'(e)ri buruzko informazioa lortu (%m)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, fuzzy, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Ezin izan da '%s'(e)ri buruzko informazioa lortu '%s'(e)tik (%m)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Ezin izan da '%s' fitxategiaren data aldatu '%s'(e)n (%m)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Ezin izan da '%s' ireki."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Arakatu direktorioa \"kameraren\" bidez, argazkiak disko gogorrean indexa "
 "ditzakezu."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Direktorioa arakatzeko modua - Scott Fritzinger-ek idatzia, <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, fuzzy, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "Ezin izan da '%s' fitxategia ezabatu '%s' karpetatik (errore-kodea %i: %m)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Kameraren eta kontrolatzailearen konfigurazioa"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Modelo ezezaguna"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Bereizmena"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Bereizmena"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Funtzionalitate-modua"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Kolorearen modua"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 #, fuzzy
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
@@ -1915,89 +2067,89 @@
 "spca50x taldea, erraza izan da zuen korntolatzailea eogkitzea kamera "
 "honentzako."
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kamerak %i byte baino ez ditu bidali, eta gutxienez %i behar ditugu."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Ezin izan da kamerarekin kontaktuan jarri."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Espero ez ziren datuak jaso dira (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Ihes-sekuentzia okerra: 0x%02x espero zen, 0x%02x jaso da."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Datu okerrak - 0x%02x jaso da, 0x%02x espero zen."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Datu okerrak - 0x%02x jaso da, 0x%02x edo 0x%02x espero zen."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Kontrol-batura okerra - 0x%02x jaso da, 0x%02x espero zen."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Kamerak komandoa ezetsi du."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Kamera bere kabuz berrezarri da."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kamerak espero ez zen 0x%02x bytea bidali du."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Deskargatzen..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Ezin izan dira %i byte esleitu koadro txikia deskargatzeko."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Ezin izan dira %i byte esleitu irudia deskargatzeko."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Kamerak ez du '%s' fitxategi-izen gisa onartzen."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Ezin izan da kargatzea hasieratu (kamerak 0x%02x(e)kin erantzun du)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Kamerak ez du %i abiadura onartzen."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Ezin izan da %i abiadura ezarri (kamerak %i(e)kin erantzun du)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -2005,36 +2157,36 @@
 "Matthew G. Martin\n"
 "Thierry Bousch-en (bousch@topo.math.u-psud.fr) fujiplay-n oinarritua\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "%ld bit-abiadura ez da onartzen."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Zure FUJI kamerarako konfigurazioa"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Data eta ordua"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "IDa"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modeloa: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Erabilgarri dagoen memoria: "
 
@@ -2056,18 +2208,18 @@
 "ek atseginez emanak.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Onartzen ez den ataka-mota: %d. Kontrolatzaile honek USB kamerekin baino ez "
 "du funtzionatzen.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Ezin izan da kamera berrezarri.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2076,7 +2228,7 @@
 "Zure kamerak kamerako azken fitxategia bakarrik uzten du borratzen. Kasu "
 "honetan, '%s' fitxategia da."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2086,7 +2238,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2126,25 +2278,25 @@
 "Aox kontrolatzaile orokorra\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Hartutako fotogramak     : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam liburutegia v "
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Datuak deskargatzen..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Koadro txikia deskargatzen..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2160,7 +2312,7 @@
 "   - koadro txikiak (64 x 48, PGM formatua)\n"
 "   - irudi osoak (640 x 480, PPM formatua)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2172,32 +2324,32 @@
 "Jenoptik JD11 kamerarako kontrolatzailea.\n"
 "Protokoloaren ingeniaritza alderantzikatua WINE eta IDA erabiliz egin da."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 #, fuzzy
 msgid "JD11 Configuration"
 msgstr "Konfigurazioa"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Bestelako ezarpenak"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Bonbilaren esposizio-denbora"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Kolore-ezarpenak"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Gorria"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Berdea"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Urdina"
 
@@ -2285,11 +2437,11 @@
 "Mars MR97310 kameraren liburutegia\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "CompactFlash txartela"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2301,7 +2453,7 @@
 "programa deskargatu behar duzu. http://kdc2tiff.sourceforge.net helbidean "
 "eskura daiteke."
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2313,13 +2465,13 @@
 "Kodak DC120 kamerarako kamera-liburutegia\n"
 "(jendeak eskatuta)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Datuak eskuratzen..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Burutzeko zain..."
 
@@ -2332,7 +2484,8 @@
 msgstr "Fitxategi-mota"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2345,7 +2498,7 @@
 msgstr "Fitxategiaren bereizmena"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2369,8 +2522,9 @@
 msgid "High (good quality)"
 msgstr "Handia (kalitate ona)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Kapturatu"
 
@@ -2399,77 +2553,84 @@
 msgstr "Esposizio-konpentsazioa"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automatikoa"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Behartu"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -2478,71 +2639,78 @@
 msgstr "Begi gorrien kontrako flasha"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Aktibatuta"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Desaktibatuta"
 
@@ -2558,7 +2726,7 @@
 msgid "Port speed"
 msgstr "Atakaren abiadura"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Albumaren izena"
 
@@ -2771,58 +2939,58 @@
 "Kodak DC215 Zoom kamerarako kamera-liburutegia.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "1. parametroa"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "2. parametroa"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "3. parametroa"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modeloa: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Firmwarearen bertsioa: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Bateriaren egoera: %s, AC moldagailua: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Argazki-kopurua: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Geratzen den lekua: Handia: %d, Tartekoa: %d, Txikia: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Memoria-txartelaren egoera (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Kapturatutako argazkiak guztira: %d, Flashez argituak: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2836,45 +3004,46 @@
 "Kodak DC240, DC280, DC3400 eta DC5000 kameretarako kamera-liburutegia.\n"
 "gPhoto2-rako berridatzia eta eguneratua."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Ahula"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Hutsa"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Baliogabea"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Erabili gabe"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Erabiltzen"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Txartela irekita dago"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Txartela ez dago irekita"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Txartela ez dago formateatuta"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Txartelik ez"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2882,12 +3051,12 @@
 "Unean eragiketa bat egiten ari da. Kamera honek eragiketa bakarra onartzen "
 "du aldiko. Itxaron uneko eragiketa amaitu arte."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "kamera inaktibo egon da 9 segundoz, berrabiarazi egingo da.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2902,7 +3071,7 @@
 "denboraz kanpo geratuko da eta berriro hasieratu beharko da. Kamerak "
 "erantzuten ez badu, hautatu berriro kamera. Ondorioz, berriro abiaraziko da."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2914,7 +3083,7 @@
 "\n"
 "Galderak eta oharrak ongi etorriak izango dira."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2923,7 +3092,7 @@
 "Zure USB kamera Kodak EZ200 da.\n"
 "IRUD kopurua = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2931,107 +3100,107 @@
 "Kodak EZ200 kontrolatzailea\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fokatze-errorea."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Iris-errorea."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Strobe-ren errorea."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROMen kontrol-baturaren errorea."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Barne-errorea (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Barne-errorea (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Ez dago txartelik."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Txartela ez da onartzen."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Txartela kendu egin da atzitu bitartean."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Irudi-zenbakia ez da baliozkoa."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Ezin da txartela idatzi."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Txartelak idazketaren kontrako babesa du."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Ez da lekurik geratzen txartelean."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Irudia babestuta dago."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Argi gutxiegi dago."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Autofokusaren errorea."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Sistema-errorea."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Parametro baliogabea."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Komandoa ezin da bertan behera utzi."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Lokalizatzeko datuak luzeegiak dira."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Lokalizatzeko datuak hondatuta."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Komando hori ez da onartzen."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Beste komando bat exekutatzen ari da."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Komando-ordenan errorea."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Errore ezezaguna."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3042,15 +3211,15 @@
 "berri %s(e)ri eta adierazi nola agertu zaizun errore hau: (0x%x,0x%x). Mila "
 "esker!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Fitxategi-zerrenda eskuratzen..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Abiadura desberdinak probatzen..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -3059,12 +3228,12 @@
 "Ezin izan da kamera kontaktatu. Ziurtatu ordenagailura konektatuta eta "
 "piztuta dagoela."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i irudi ezin izan dira ezabatu, babestuta daudelako"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3083,7 +3252,7 @@
 "Izena: %s,\n"
 "Fabrikatzailea: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3093,405 +3262,414 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Konica kamera guztiak eta hainbat HP kamera onartzen ditu."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Konfigurazioa eskuratzen..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konicaren konfigurazioa"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Ezarpen iraunkorrak"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Kamerak soinua egin beharko luke argazkia egitean?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Diapositiba-erakusketaren tartea"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Bereizmena"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Txikia (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Tartekoa (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Handia (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Lokalizazioa"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Bat ere ez hautatuta"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Telebistaren irteerako formatua"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Ez bistaratu TB menua"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Data-formatua"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Hila/Eguna/Urtea"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Eguna/Hila/Urtea"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Urtea/Hila/Eguna"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Saioaren ezarpen iraunkorrak"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Aktibatuta, begi gorriak gutxitzea"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fokua"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Finkoa"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Ezarpen aldakorrak"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Tenporizadorea"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normala"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Ezin izan da lokalizatzeko daturik aurkitu '%s'(e)n"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Lokalizatzeko fitxategia luzeegia da."
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Aurrebista hau ez dago."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Datuak hondatu egin dira."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Kamerak honek ez du onartzen %d irudi-mota!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Ezin da %s irudia ezabatu."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Ezin dira irudi guztiak ezabatu."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Irudia kargatzen..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 #, fuzzy
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Ezin da irudi hau kameran kargatu. Errore bat gertatu da."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 #, fuzzy
 msgid "You must be in record mode to capture images."
 msgstr "Grabatzeko moduan egon behar duzu irudiak kapturatzeko."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 #, fuzzy
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Ez dago lekurik irudi berriak kapturatzeko. Irudi batzuk ezabatu behar "
 "dituzu."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 #, fuzzy
 msgid "Can't capture new images. Unknown error"
 msgstr "Ezin da irudi berria kapturatu. Errore ezezaguna"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Kamerak ez du erantzuten."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Txikia"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Tartekoa"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Handia"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikonoak"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Zuri-balantzea"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Bulegoa"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Argi naturala"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Zorroztasuna"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Garbia"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Suabea"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Kolorea"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Argia"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Sakona"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Zuri-beltza"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Soila"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Sekuentzia 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Bistaratu data"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Edonon"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Erreproduzitze-modua"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Grabatze-modua"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Leku guztietan"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Grabatu"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "EE/HH/UUUU"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, fuzzy, c-format
 msgid "YYYY/MM/DD"
 msgstr "UUUU/HH/EE"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "HH/EE/UUUU"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, fuzzy, c-format
 msgid ""
 "Model: %s\n"
@@ -3512,7 +3690,7 @@
 "Data-bistaratzea: %s\n"
 "Data eta ordua: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3527,7 +3705,7 @@
 "http://www.ap2c.com\n"
 "Konica Q-M150 frantseserako euskarria."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, fuzzy, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3549,7 +3727,7 @@
 "\n"
 "Eskerrik asko GPhoto2 eta UNIX/Linux sistema eragileak erabiltzeagatik.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3560,7 +3738,7 @@
 "\n"
 "Largan Lmini kamera kontrolatzen du.\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3568,13 +3746,106 @@
 "Firmware Version: %s\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Konfigurazioa"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "AE blokeoa"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+#, fuzzy
+msgid "Quality"
+msgstr "Irudiaren kalitatea"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Bideo irteera"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+#, fuzzy
+msgid "Autofocus Mode"
+msgstr "Fokuaren modua"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Argi-laguntza"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Argi-laguntza"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Lentearen modua"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Kolorearen modua"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, fuzzy, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3589,7 +3860,7 @@
 "Mars MR97310 kamera.\n"
 "%i argazki ditu. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 #, fuzzy
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
@@ -3616,7 +3887,7 @@
 "Bideo fotogramak deskarga ditzake, kamerak fotogramak edukiz gero, ondoz "
 "ondoko argazki gisa.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3624,7 +3895,7 @@
 "Mars MR97310 kameraren liburutegia\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3635,7 +3906,7 @@
 "Hardwarearen berrikuspena:\t%s\n"
 "Firmwarearen berrikuspena:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3662,61 +3933,63 @@
 "Txartelaren IDa:\t\t%d\n"
 "Flash-modua:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokala"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Bai"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Ez"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Estandarra"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatikoa\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Behartu flasha\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Debekatu flasha\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Balio baliogabea ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3733,74 +4006,74 @@
 "Flasha kargatzen:\t\t%s\n"
 "Lentearen egoera:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Ez dago beteta"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Beteta"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Inaktibo"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Kargatzen"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Prest"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Lentearen noranzkoa ez dator bat flasharen argiarekin\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Lentea ez dago konektatuta\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Balio okerra lentearen egoerarako %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Txartelaren egoera:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Idazketaren kontra babestuta"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Txartel desegokia"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, fuzzy, c-format
 msgid "Bad value for card status %d"
 msgstr "Balio okerra txartelaren egoerarako %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3813,63 +4086,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Eskerrik asko bereziki Minoltari zehaztapenengatik."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Flasharen argia: automatikoa (begi gorriak gutxitzea)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Flasharen argia: automatikoa"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Flasharen argia: aktibatuta (begi gorriak gutxitzea)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Flasharen argia: aktibatuta"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Flasharen argia: desaktibatuta"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Flasharen argia: definitu gabe"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Mustek MDC800ren laburpena:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "ez da egoeraren berri eman."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Compact Flash txartela detektatu da\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Ez da Compact Flash txartela detektatu\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Uneko modua: kamera-modua\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Uneko modua: erreproduzitze-modua\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Bateriak ondo daude."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Bateriak baxu daude."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 #, fuzzy
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
@@ -3882,25 +4155,25 @@
 "gphoto2ra Marcus Meissner-ek emana <marcus@jet.franken.de>\n"
 "Serieko eta USB protokoloak onartzen ditu."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot liburutegia v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Kamera deskonektatzen."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "%s irudia deskargatzen."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Irudia kargatzen: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3909,17 +4182,17 @@
 "Fitxategiak %ld byteko tamaina du. Karga daitekeen fitxategi handienaren "
 "tamaina hau da: %i byte."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Kargatzen..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "%s irudia ezabatzen."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3935,12 +4208,12 @@
 "Galen Brooks-ek (galen@nine.com)idatzitako\n"
 "dc1000 programan oinarritua."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "%s deskargatzen."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 #, fuzzy
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
@@ -3957,12 +4230,12 @@
 "Galen Brooks-ek (galen@nine.com)idatzitako\n"
 "dc1000 programan oinarritua."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "'%s' deskargatzen..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -3984,7 +4257,7 @@
 "kapturatzen dituen CCD gailuak 300.000 pixel bakarrik ditu; ondorioz, "
 "kalitate txikiko irudiak bakarrik egiten ditu."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -4000,7 +4273,7 @@
 "batez ere arazoren bat badago eta kamera 9600 baino abiadura handiagoetan "
 "behar bezala itzaltzen ez bada."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -4008,7 +4281,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-erako kontrolatzailea\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -4019,7 +4292,7 @@
 " %8d byteko memoria dago libre.\n"
 " Fitxategi-kontaketa: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4033,11 +4306,11 @@
 "eta: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Fitxategia deskargatzen..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 #, fuzzy
 msgid ""
 "Creative PC-CAM600\n"
@@ -4047,33 +4320,133 @@
 " Egilea: Peter Kajberg\n"
 " h.el.: <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, fuzzy, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: %d bloke espero dira; %d lortua"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: %d indize lortuta, %d espero ziren"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, fuzzy, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: itzulitako balioa %d da, %d izan beharrean"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, fuzzy, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: %d bloke espero dira; %d lortuak"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, fuzzy, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: ustegabeko errorea: gp_port_read-ek %d itzuli du, %d ordez"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Modeloa: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Modelo ezezaguna \"%s\""
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Irudiaren tamaina"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Irudiaren kalitatea"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr ""
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr ""
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr ""
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr ""
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Modelo ezezaguna"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4087,12 +4460,12 @@
 "net> egokitua.\n"
 "Polaroid 640Seren proba Michael Golden-ek egin zuen <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modeloa: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 #, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
@@ -4108,110 +4481,98 @@
 "sourceforge.net> egina. Akats-konponketak Marcus Meissner-ek <marcus@jet."
 "franken.de> eginak."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Irudiaren kalitatea"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Irudiaren tamaina"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Flasharen konfigurazioa"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automatikoki itzaltzea (minutuak)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informazioa"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normala"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "oso fina"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "automatikoa"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "aktibatuta"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "desaktibatuta"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "erreproduzitu"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "grabatu"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menua"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "bateria"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "a/c moldagailua"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Espero ez zen goiburua jaso da (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Espero ez zen erantzuna jaso da"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Kontrol-baturaren errorea"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Kamerak ez du komandoa onartu."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Kamerak uste baino byte gehiago bidali ditu (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4220,7 +4581,7 @@
 "%i (= 0x%x) irudiari buruzko informazioa eskatu da, baina %i irudiari "
 "buruzkoa jaso da"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4229,7 +4590,7 @@
 "Irudi-formatu ezezaguneko %i byte jaso dira. Idatzi %s(e)ri eta eskatu "
 "laguntza."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4239,19 +4600,20 @@
 "<rlantzer@umr.edu> idatzia gphoto-4.x-rako. gphoto2rako Lutz Mueller-ek "
 "<lutz@users.sf.net> egokitua."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Zenbat denbora pasatzen da kamera itzali arte?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Irudia"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4284,3809 +4646,5728 @@
 "Automatikoki itzaltzea: %i minutu\n"
 "Energia-iturria: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Kontrolatzaile honek ez du onartzen eskatutako ataka-mota (%i)."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Txartelaren egoera:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Modeloa: "
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "%sKamera-modeloa: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Zooma"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Flasharen modua"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Aurrez ezarria"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Kaptura modua"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+#, fuzzy
+msgid "AE Lock"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "Kameraren ezarpenak"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, fuzzy, c-format
-msgid "Unknown value %04d"
-msgstr "%i fitxategi-mota ezezaguna."
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "ustegabeko %i datu mota"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Tungstenoa"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Lainotua"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 #, fuzzy
 msgid "Shade"
 msgstr "Garbia"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 #, fuzzy
 msgid "Fluorescent Lamp 1"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 #, fuzzy
 msgid "Fluorescent Lamp 2"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 #, fuzzy
 msgid "Fluorescent Lamp 3"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 #, fuzzy
 msgid "Fluorescent Lamp 4"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 #, fuzzy
 msgid "Fluorescent Lamp 5"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 #, fuzzy
 msgid "Choose Color Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Tungstenoa"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Aurrez ezarria"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Pertsonalizatua"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normala"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 #, fuzzy
 msgid "RAW + JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 #, fuzzy
 msgid "RAW + JPEG Normal"
 msgstr "Normala"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 #, fuzzy
 msgid "Single frame"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 #, fuzzy
 msgid "Self-timer"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Estandarra"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2035
 #, fuzzy
 msgid "undefined"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Pertsonalizatua"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 #, fuzzy
 msgid "Sports"
 msgstr "Puntua"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 #, fuzzy
 msgid "Flash Off"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "F2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Arrain-begia"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "Estandarra"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Kontrastea"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1x"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "F2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 #, fuzzy
 msgid "red eye suppression"
 msgstr "Aktibatuta, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 #, fuzzy
 msgid "auto + red eye suppression"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 #, fuzzy
 msgid "on + red eye suppression"
 msgstr "Aktibatuta, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 #, fuzzy
 msgid "Commander"
 msgstr "Komando-ordenan errorea."
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 #, fuzzy
 msgid "Auto Aperture"
 msgstr "Irekiera"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 #, fuzzy
 msgid "Full Manual"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Automatikoa"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+#, fuzzy
+msgid "Large"
+msgstr "Irudia"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 #, fuzzy
 msgid "AF-C"
 msgstr "AC"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 #, fuzzy
 msgid "AF-A"
 msgstr "AC"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 #, fuzzy
 msgid "MF (fixed)"
 msgstr "Finkoa"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 #, fuzzy
 msgid "MF (selection)"
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 #, fuzzy
 msgid "Center-weighted"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 #, fuzzy
 msgid "Evaluative"
 msgstr "Ezarpen aldakorrak"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 #, fuzzy
 msgid "Partial"
 msgstr "1. parametroa"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 #, fuzzy
 msgid "User defined 1"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 #, fuzzy
 msgid "User defined 2"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 #, fuzzy
 msgid "User defined 3"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 #, fuzzy
 msgid "Multiple Focusing Points, Auto"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-#, fuzzy
-msgid "Large"
-msgstr "Irudia"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 #, fuzzy
 msgid "Medium 1"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 #, fuzzy
 msgid "Medium 2"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 #, fuzzy
 msgid "Medium 3"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2244
-#, fuzzy
-msgid "Setting 4"
-msgstr "Flasharen konfigurazioa"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2245
-#, fuzzy
-msgid "Setting 5"
-msgstr "Flasharen konfigurazioa"
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2246
-#, fuzzy
-msgid "Setting 6"
-msgstr "Flasharen konfigurazioa"
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2247
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
 #, fuzzy
-msgid "Setting 7"
-msgstr "Flasharen konfigurazioa"
+msgid "LiveSpotAF"
+msgstr "Puntua-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 #, fuzzy
 msgid "Video OUT"
 msgstr "Bideo irteera"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, fuzzy, c-format
 msgid "Unknown %d"
 msgstr "Ezezaguna"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, fuzzy, c-format
+msgid "Auto ISO"
+msgstr "Automatikoa"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+msgid "Small + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2760
+msgid "Large + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Bideo irteera"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2803
 #, fuzzy
 msgid "Timer 10 sec"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 #, fuzzy
 msgid "Timer 2 sec"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 #, fuzzy
 msgid "Single silent"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, fuzzy, c-format
-msgid "Auto ISO"
-msgstr "Automatikoa"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Esposizio-konpentsazio joera"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AC"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 #, fuzzy
 msgid "Action"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 #, fuzzy
 msgid "Automatic (No Flash)"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+#, fuzzy
+msgid "U1"
+msgstr "1x"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+#, fuzzy
+msgid "U2"
+msgstr "F2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "Argazki efektua"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 #, fuzzy
 msgid "Candlelight"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "Fluoreszentea"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
-#, fuzzy
-msgid "Effects"
-msgstr "Efektu-modua"
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:3256
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
 #, fuzzy
-msgid "U1"
-msgstr "1x"
+msgid "0 image"
+msgstr "Irudia"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:3257
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 #, fuzzy
-msgid "U2"
-msgstr "F2"
+msgid "Effects"
+msgstr "Efektu-modua"
 
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "Argia"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 #, fuzzy
 msgid "Single Shot"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 #, fuzzy
 msgid "Burst"
 msgstr "Onena"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 #, fuzzy
 msgid "Timelapse"
 msgstr "Denbora-hutsune zenbakia"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 #, fuzzy
 msgid "Timer"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 #, fuzzy
 msgid "Delayed Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 #, fuzzy
 msgid "Centre-spot"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 #, fuzzy
 msgid "Single Area"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 #, fuzzy
 msgid "Single-area AF"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 #, fuzzy
 msgid "3D Tracking"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Soila"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4267
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, fuzzy, c-format
 msgid "Unknown value 0x%04x"
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 #, fuzzy
 msgid "Centre"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 #, fuzzy
 msgid "Bottom"
 msgstr "Zooma"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 #, fuzzy
 msgid "Right"
 msgstr "Argia"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Zabala"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Orokorra"
+
+#: camlibs/ptp2/config.c:4353
+msgid "Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4354
+msgid "Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4355
+msgid "Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 #, fuzzy
 msgid "Center Spot"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Estandarra"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Handia"
+
+#: camlibs/ptp2/config.c:4387
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flasha"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Begi gorrien kontrako flasha"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 #, fuzzy
 msgid "External sync"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Zuri-beltza"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 #, fuzzy
 msgid "Color sketch"
 msgstr "Kolorearen modua"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
 msgstr "Handia"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
+#, c-format
+msgid "%d mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
 #, fuzzy
 msgid "infinite"
 msgstr "Infinitua"
 
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
-msgid "%d mm"
+msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
-#, c-format
-msgid "x 200"
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Konprimitzea"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Sinkronizazio motela"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "Normala"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Puntua-AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Bistaratu data"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 #, fuzzy
 msgid "Single-servo AF"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
+#: camlibs/ptp2/config.c:5651
 #, fuzzy
-msgid "Manual Focus"
+msgid "Manual Focus (fixed)"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 #, fuzzy
 msgid "20s"
 msgstr "2.0"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 #, fuzzy
 msgid "15s"
 msgstr "1.5"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 #, fuzzy
 msgid "10s"
 msgstr "1.0"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 #, fuzzy
 msgid "8s"
 msgstr "F8"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 #, fuzzy
 msgid "4s"
 msgstr "F4"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 #, fuzzy
 msgid "2s"
 msgstr "F2"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 #, fuzzy
 msgid "1s"
 msgstr "1x"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 #, fuzzy
 msgid "Sharper"
 msgstr "Garbia"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 #, fuzzy
 msgid "Softer"
 msgstr "Suabea"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 #, fuzzy
 msgid "Direct Print"
 msgstr "Direktorioa badago"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 #, fuzzy
 msgid "Zone Focus (Close)"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 #, fuzzy
 msgid "Single-Servo AF"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 #, fuzzy
 msgid "One Shot"
 msgstr "Soila"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "Fokua"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 #, fuzzy
 msgid "Missing Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 #, fuzzy
 msgid "Shadow"
 msgstr "Garbia"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Pertsonalizatua"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Pertsonalizatua"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Pertsonalizatua"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Pertsonalizatua"
+msgid "Manual 3"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 #, fuzzy
 msgid "Black & white"
 msgstr "Zuri-beltza"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Automatikoa, begi gorriak gutxitzea"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 #, fuzzy
 msgid "AE & Flash"
 msgstr "Flashik GABE"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 #, fuzzy
 msgid "AE only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 #, fuzzy
 msgid "Flash only"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 #, fuzzy
 msgid "Remote Mirror Up"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "Operazio-modua"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "Operazio-modua"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "Txikia (kalitaterik onena)"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 #, fuzzy
 msgid "Flash/aperture"
 msgstr "Irekiera"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 #, fuzzy
 msgid "NEF+Fine"
 msgstr "Fina"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 #, fuzzy
 msgid "NEF+Normal"
 msgstr "Normala"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "Normala"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "Normala"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "Fina"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+msgid "RAW+JPEG (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "Fina"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+msgid "RAW+HEIF (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6884
+msgid "RAW+HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fina"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "F2"
+
+#: camlibs/ptp2/config.c:6920
+msgid "RAW & JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6922
+msgid "RAW Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 #, fuzzy
 msgid "Optimal quality"
 msgstr "Irudiaren kalitatea"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 #, fuzzy
 msgid "3 (Normal)"
 msgstr "Normala"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 #, fuzzy
 msgid "AE/AF lock"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 #, fuzzy
 msgid "AE lock only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 #, fuzzy
 msgid "AF lock only"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 #, fuzzy
 msgid "Preview"
 msgstr "Aurrekoa"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 #, fuzzy
 msgid "Matrix metering"
 msgstr "1. parametroa"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 #, fuzzy
 msgid "Center-weighted metering"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "Puntua neurtzeko modua"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "Erreproduzitu"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr ""
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5271
-msgid "75%"
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
+#: camlibs/ptp2/config.c:7312
+msgid "75%"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 #, fuzzy
 msgid "Unknown value"
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 #, fuzzy
 msgid "Press Full"
 msgstr "PTP Biltegia beteta"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Irudiaren tamaina"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Txartelak idazketaren kontrako babesa du."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Txartela ez dago formateatuta"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Iris-errorea."
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Sekuentzia 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Bateria agortu da, kamera itzali egingo da."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP S/I errorea"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Txartela ez dago formateatuta"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Esposizio-programa modua"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "Fluoreszentea"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "ordua ezarrita"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Zuri-beltza"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatikoa\n"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Automatikoa\n"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "ezezaguna (0x%02x)"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Makroa"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "AC"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Estandarra"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Grabatu"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Erreproduzitu"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Bestelako ezarpenak"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Fitxategiaren bereizmena"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Ez bistaratu TB menua"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Irudia"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "%i fitxategi-mota ezezaguna."
+
+#: camlibs/ptp2/config.c:9970
 #, fuzzy
 msgid "Internal RAM"
 msgstr "barnetik"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 #, fuzzy
 msgid "Memory card"
 msgstr "Txartelik ez"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 #, fuzzy
 msgid "Display"
 msgstr "Bistaratu data"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 #, fuzzy
 msgid "Delete"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 #, fuzzy
 msgid "Managed"
 msgstr "Hizkuntza"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 #, fuzzy
 msgid "Ad-hoc"
 msgstr "AE blokeoa"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 #, fuzzy
 msgid "Default gateway"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 #, fuzzy
 msgid "Access mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 #, fuzzy
 msgid "Encryption"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 #, fuzzy
 msgid "Write"
 msgstr "Zabala"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 #, fuzzy
 msgid "List Wifi profiles"
 msgstr "Fitxategi guztien zerrenda"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 #, fuzzy
 msgid "Bulb Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Flashik GABE"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 #, fuzzy
 msgid "Set Nikon Autofocus area"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 #, fuzzy
 msgid "Set Nikon Control Mode"
 msgstr "Kaptura modua"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Fokuaren kokalekua"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 #, fuzzy
 msgid "Canon EOS Zoom Position"
 msgstr "Fokuaren kokalekua"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 #, fuzzy
 msgid "Nikon Viewfinder"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "LED modua"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+msgid "Focus Magnify Down"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+msgid "Focus Magnify Right"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 #, fuzzy
 msgid "Serial Number"
 msgstr "%sSerie-zenbakia: %s\n"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 #, fuzzy
 msgid "Camera Manufacturer"
 msgstr "%sFabrikatzailea: %s\n"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 #, fuzzy
 msgid "Device Version"
 msgstr "Bertsioa: "
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 #, fuzzy
 msgid "PTP Version"
 msgstr "Bertsioa: "
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 #, fuzzy
 msgid "DPOF Version"
 msgstr "Bertsioa: "
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 #, fuzzy
 msgid "External Flash"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Bateria maila"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 #, fuzzy
 msgid "Camera Orientation"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 #, fuzzy
 msgid "Flash Open"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "LED modua"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 #, fuzzy
 msgid "Flash Charged"
 msgstr "CompactFlash txartela"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 #, fuzzy
 msgid "Lens Name"
 msgstr "Lentearen modua"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 #, fuzzy
 msgid "Shutter Counter"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 #, fuzzy
 msgid "Available Shots"
 msgstr "Erabilgarri dagoen memoria: "
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 #, fuzzy
 msgid "Focal Length Minimum"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 #, fuzzy
 msgid "Focal Length Maximum"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "Argia"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "Argia"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 #, fuzzy
 msgid "AF Locked"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 #, fuzzy
 msgid "AE Locked"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Bereizmena hautatzeko etengailua"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 #, fuzzy
 msgid "Camera Date and Time"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 #, fuzzy
 msgid "Image Comment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 #, fuzzy
 msgid "Enable Image Comment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "Grabatze-modua"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 #, fuzzy
 msgid "Camera Output"
 msgstr "Kamera ondo dago.\n"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artista"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 #, fuzzy
 msgid "CCD Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright-a"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 #, fuzzy
 msgid "Flicker Reduction"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "CompactFlash txartela"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "Automatikoki itzaltzea (minutuak)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Kameraren ezarpenak"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "LED modua"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Onartutako balioak"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 #, fuzzy
 msgid "Capture Target"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "Grabatze-modua"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Efektu-modua"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Fitxategiaren bereizmena"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Irudiaren tamaina"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 #, fuzzy
 msgid "WhiteBalance X A"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 #, fuzzy
 msgid "WhiteBalance X B"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Argazki efektua"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 #, fuzzy
 msgid "Color Model"
 msgstr "Kolorearen modua"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 #, fuzzy
 msgid "Color Space"
 msgstr "Kolore-ezarpenak"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Data-formatua"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Fitxategiaren bereizmena"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Kontrastea"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Distira-"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Data-formatua"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 #, fuzzy
 msgid "Auto Focus Mode 2"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Argi-laguntza"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 #, fuzzy
 msgid "Rotation Flag"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Esposizio-konpentsazioa"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+#, fuzzy
+msgid "Color temperature"
+msgstr "Kolorearen tenperatura"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+#, fuzzy
+msgid "AF Mode"
+msgstr "Soinu-seinalea"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Irudia doitzea"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 #, fuzzy
 msgid "Flash Command Channel"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 #, fuzzy
 msgid "Flexible Program"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Irudiaren kalitatea"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Irudiaren tamaina"
+
+#: camlibs/ptp2/config.c:10962
+msgid "PC Save Image Format"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Efektu-modua"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Kamera-modeloa"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Soinu-seinalea"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr "Irudiaren tamaina"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "LED modua"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Kaptura modua"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "Esposizio automatikoaren blokeoa"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 #, fuzzy
 msgid "Drive Mode"
 msgstr "LED modua"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
 msgstr "Irudiaren ezarpenak"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Fokua neurtzeko modua"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Irekiera"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 #, fuzzy
 msgid "Capture Delay"
 msgstr "Aurre-kapturaren atzerapena"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 #, fuzzy
 msgid "AF Distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Esposizioa"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Flasharen konfigurazioa"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "Behartu flasha\n"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "Irudiaren tamaina"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 #, fuzzy
 msgid "EV Step"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Automatikoa, begi gorriak gutxitzea"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Esposizioa neurtzeko modua"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Automatikoa, begi gorriak gutxitzea"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Automatikoa, begi gorriak gutxitzea"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Jarraitasun zenbakia"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Jarraitasun tartea"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "Grabatze-modua"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "Operazio-modua"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 #, fuzzy
 msgid "Sharpening"
 msgstr "Kargatzen"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 #, fuzzy
 msgid "Saturation"
 msgstr "Konfigurazioa"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "Soinua"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "PTP definitu gabeko propietatea"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 #, fuzzy
 msgid "Video Mode"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Fitxategiaren bereizmena"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Movie Quality"
-msgstr "Irudiaren kalitatea"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-#, fuzzy
-msgid "Minimum Shutter Speed"
+msgid "Continuous Shooting Speed Slow"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
+msgid "Minimum Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+#, fuzzy
+msgid "Movie Quality"
+msgstr "Irudiaren kalitatea"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "Fokua neurtzeko modua"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 #, fuzzy
 msgid "JPEG Compression Policy"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 #, fuzzy
 msgid "AF Activation"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 #, fuzzy
 msgid "AF Lock On"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Foku-luzera"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 #, fuzzy
 msgid "Raw Compression"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Irudiaren kalitatea"
 
-#: camlibs/ptp2/config.c:7543
-#, fuzzy
-msgid "Image Settings"
-msgstr "Kameraren ezarpenak"
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 #, fuzzy
 msgid "WIFI profiles"
 msgstr "Fitxategi guztien zerrenda"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 #, fuzzy
 msgid "Other PTP Device Properties"
 msgstr "PTP Gailuaren propietatea ez da onartzen"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "Ez da direktorioa aurkitu"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -8098,2932 +10379,3057 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+#, fuzzy
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "Zure kamerak ez du onartzen kaptura generikoa"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 #, fuzzy
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-#, fuzzy
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "Zure kamerak ez du onartzen kaptura generikoa"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "Zure kamerak ez du onartzen kaptura generikoa"
+
+#: camlibs/ptp2/library.c:4128
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 #, fuzzy
 msgid "Canon EOS Get Changes failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 #, fuzzy
 msgid "Canon Capture failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Aurre-kapturaren atzerapena"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 #, fuzzy
 msgid "Canon EOS Half-Press failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 #, fuzzy
 msgid "Canon EOS Half-Release failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 #, fuzzy
 msgid "Canon EOS Full-Press failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 #, fuzzy
 msgid "Canon EOS Full-Release failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 #, fuzzy
 msgid "Canon EOS Capture failed"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, fuzzy, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
 msgstr "%sFabrikatzailea: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, fuzzy, c-format
 msgid "Model: %s\n"
 msgstr "Modeloa: "
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, fuzzy, c-format
 msgid "  Version: %s\n"
 msgstr "Bertsioa: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, fuzzy, c-format
 msgid "  Serial Number: %s\n"
 msgstr "%sSerie-zenbakia: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Firmwarearen bertsioa: %d.%02d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, fuzzy, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Funtzionalitate-modua"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 #, fuzzy
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 #, fuzzy
 msgid "Display Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 #, fuzzy
 msgid "File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 #, fuzzy
 msgid "No File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 #, fuzzy
 msgid "File Upload\n"
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 #, fuzzy
 msgid "Open Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 #, fuzzy
 msgid "Olympus E XML Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 #, fuzzy
 msgid "\tCanon Wifi support\n"
 msgstr "Txartela ez da onartzen."
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 #, fuzzy
 msgid "Read-Write"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 #, fuzzy
 msgid "Read-Only"
 msgstr "Prest"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Irudi-kopurua: %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 #, fuzzy
 msgid "cannot be queried.\n"
 msgstr "Ezin da txartela idatzi."
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "Kamera honek ez du konfigurazio-aukerak ezartzea onartzen."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr "PTP USB kameretarako bakarrik dago ezarrita."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP Ondo!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP Errore orokorra"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP Saioa ez dago irekita"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP Transakzio baliogabearen IDa"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP Eragiketa ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Parametroa ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Osatu gabeko transferentzia"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP Biltegiratze baliogabearen IDa"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP Objektu baliogabeen heldulekua"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP Gailuaren propietatea ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Objektu-formatuaren kode baliogabea"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP Biltegia beteta"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP Objektua idazketaren kontra babestuta"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP Biltegia irakurtzeko soilik"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP Atzipena ukatu egin da"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP Ez dago koadro txikirik"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP Proba automatikoak huts egin du"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP Zatika ezabatzea"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP Biltegia ez dago erabilgarri"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Formatuaren zehaztapenak ez dira onartzen"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP Ez dago objektuari buruzko baliozko informaziorik"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP Kodearen formatu baliogabea"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Fabrikatzailearen kode ezezaguna"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Kapturatzea amaitu da"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP Gailuaren busa"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP Objektu guraso baliogabea"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP Gailuaren propietatearen formatu baliogabea"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP Gailuaren propietatearen balio baliogabea"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP Parametro baliogabea"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP Saioa irekita dago"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP Transakzioa bertan behera utzi da"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Helburuaren zehaztapena ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP Objektu baliogabeen heldulekua"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Ez da arrazoirik ezagutzen"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/ptp2/ptp.c:6117
 #, fuzzy
 msgid "Filename Required"
 msgstr "PTP EK fitxategi-izena behar da"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 #, fuzzy
 msgid "Filename Conflicts"
 msgstr "PTP EK fitxategi-izenaren gatazkak"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "PTP EK fitxategi-izen baliogabea"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 #, fuzzy
 msgid "Out of Focus"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 #, fuzzy
 msgid "Change Camera Mode Failed"
 msgstr "Kamera-modeloa"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 #, fuzzy
 msgid "Invalid Status"
 msgstr "Baliogabea"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "PTP Gailuaren propietatea ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP Ez dago koadro txikirik"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Strobe-ren errorea."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Txartela ez dago formateatuta"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP Kapturatzea amaitu da"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Modelo ezezaguna"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "Bateria"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "Kamera-modeloa (irakurtzeko soilik)"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Bateria"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP Objektu-formatuaren kode baliogabea"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP Objektu-formatuaren kode baliogabea"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP Gailuaren propietatearen balio baliogabea"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP Objektu baliogabeen heldulekua"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP Formatuaren zehaztapenak ez dira onartzen"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP Formatuaren zehaztapenak ez dira onartzen"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "PTP Gailuaren propietatea ez da onartzen"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Konprimitzea"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP Eragiketa ez da onartzen"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP Gailuaren busa"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 #, fuzzy
 msgid "PTP Timeout"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "PTP Protokolo-errorea, erantzuna espero zen"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "PTP Protokolo-errorea, datuak espero ziren"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "PTP S/I errorea"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Funtzionalitate-modua"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Konpresio-ezarpena"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Zuri-balantzea"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB irabazia"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Esposizio-indizea (pelikularen ISO abiadura)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Aurre-kapturaren atzerapena"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Zoom digitala"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Denbora-hutsune zenbakia"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Denbora-hutsune tartea"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Kargatu URLa"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Copyright informazioa"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "Onartutako balioak"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Data-formatua"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Fitxategiaren bereizmena"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Bideo irteera"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Kontrastea"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Distira-"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Data-formatua"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Data-/denbora-markaren formatua"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Bideo irteera"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "UI hizkuntza"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 #, fuzzy
 msgid "Battery Type"
 msgstr "Bateria"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 #, fuzzy
 msgid "Battery Mode"
 msgstr "Bateria"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 #, fuzzy
 msgid "Camera Mode"
 msgstr "Kamera-modeloa"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 #, fuzzy
 msgid "Self Time"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-#, fuzzy
-msgid "Shooting Mode"
-msgstr "Obturadorearen abiadura"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 #, fuzzy
 msgid "Image Mode"
 msgstr "Irudiaren tamaina"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 #, fuzzy
 msgid "Slow Shutter Setting"
 msgstr "Argazki-ateratzearen ezarpenak"
 
-#: camlibs/ptp2/ptp.c:4825
-#, fuzzy
-msgid "AF Mode"
-msgstr "Soinu-seinalea"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 #, fuzzy
 msgid "Color Gain"
 msgstr "Kolore-ezarpenak"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 #, fuzzy
 msgid "Parameter Set"
 msgstr "1. parametroa"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 #, fuzzy
 msgid "Focal Length Tele"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 #, fuzzy
 msgid "Focal Length Wide"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 #, fuzzy
 msgid "Focal Length Denominator"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 #, fuzzy
 msgid "Capture Transfer Mode"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Tamaina-kalitatea modua"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 #, fuzzy
 msgid "Supported Thumb Size"
 msgstr "Onartutako balioak"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Kameraren jabea"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX ordua"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 #, fuzzy
 msgid "Camera Body ID"
 msgstr "Kamera-modeloa"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Zoom digitala"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 #, fuzzy
 msgid "Ml Spot Position"
 msgstr "Fokuaren kokalekua"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 #, fuzzy
 msgid "Rotation Angle"
 msgstr "Bereizmena hautatzeko etengailua"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 #, fuzzy
 msgid "Rotation Scene"
 msgstr "Bereizmena hautatzeko etengailua"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 #, fuzzy
 msgid "Model ID"
 msgstr "Modeloa: "
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 #, fuzzy
 msgid "Shooting Bank Name A"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 #, fuzzy
 msgid "Shooting Bank Name B"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 #, fuzzy
 msgid "Shooting Bank Name C"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 #, fuzzy
 msgid "Shooting Bank Name D"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 #, fuzzy
 msgid "White Balance Preset Number"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 #, fuzzy
 msgid "White Balance Preset Name 0"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 #, fuzzy
 msgid "White Balance Preset Name 1"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 #, fuzzy
 msgid "White Balance Preset Name 2"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 #, fuzzy
 msgid "White Balance Preset Name 3"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 #, fuzzy
 msgid "White Balance Preset Name 4"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 #, fuzzy
 msgid "White Balance Preset Value 0"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 #, fuzzy
 msgid "White Balance Preset Value 1"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 #, fuzzy
 msgid "White Balance Preset Value 2"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 #, fuzzy
 msgid "White Balance Preset Value 3"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 #, fuzzy
 msgid "White Balance Preset Value 4"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 #, fuzzy
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 #, fuzzy
 msgid "Focus Area Zone"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 #, fuzzy
 msgid "Enable Copyright"
 msgstr "Copyright-a"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 #, fuzzy
 msgid "Artist Name"
 msgstr "Artista"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 #, fuzzy
 msgid "Copyright Information"
 msgstr "Copyright informazioa"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Behartu flasha\n"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Uneko modua: erreproduzitze-modua\n"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 #, fuzzy
 msgid "Function Button 2"
 msgstr "Funtzionalitate-modua"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "Normala"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 #, fuzzy
 msgid "Clean Image Sensor"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 #, fuzzy
 msgid "Lens ID"
 msgstr "Lentearen modua"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 #, fuzzy
 msgid "Lens Sort"
 msgstr "Lentearen modua"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 #, fuzzy
 msgid "Lens Type"
 msgstr "Lentearen modua"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 #, fuzzy
 msgid "Finder ISO Display"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 #, fuzzy
 msgid "Warning Status"
 msgstr "Txartelaren egoera:\t\t"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD modua"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 #, fuzzy
 msgid "USB Speed"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 #, fuzzy
 msgid "CCD Serial Number"
 msgstr "%sSerie-zenbakia: %s\n"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "TB A/B ezarpena"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "TB A/B ezarpena"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 #, fuzzy
 msgid "External Flash Attached"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 #, fuzzy
 msgid "External Flash Sort"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 #, fuzzy
 msgid "BW Sharpness"
 msgstr "Zorroztasuna"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 #, fuzzy
 msgid "BW Contrast"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
+#: camlibs/ptp2/ptp.c:6951
 #, fuzzy
-msgid "Flourescent Type"
+msgid "Fluorescent Type"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 #, fuzzy
 msgid "Tune Colour Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 #, fuzzy
 msgid "Tune Preset 0"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 #, fuzzy
 msgid "Tune Preset 1"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 #, fuzzy
 msgid "Tune Preset 2"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 #, fuzzy
 msgid "Tune Preset 3"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 #, fuzzy
 msgid "Tune Preset 4"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/ptp.c:5267
-#, fuzzy
-msgid "Autofocus Mode"
-msgstr "Fokuaren modua"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "Argi-laguntza"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "TB A/B ezarpena"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 #, fuzzy
 msgid "Flash Mode Commander Power"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 #, fuzzy
 msgid "Warning Display"
 msgstr "Bistaratu data"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 #, fuzzy
 msgid "Battery Cell Kind"
 msgstr "Bateria"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "Flasharen konfigurazioa"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 #, fuzzy
 msgid "Preview Button"
 msgstr "Aurreikusi koadro txikia"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 #, fuzzy
 msgid "Preview Button 2"
 msgstr "Aurreikusi koadro txikia"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 #, fuzzy
 msgid "AEAF Lock Button 2"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 #, fuzzy
 msgid "Indicator Display"
 msgstr "Bistaratu data"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
 msgstr "LED modua"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 #, fuzzy
 msgid "Live View Drive Mode"
 msgstr "LED modua"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 #, fuzzy
 msgid "Exposure Display Status"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 #, fuzzy
 msgid "Info Display Error Status"
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 #, fuzzy
 msgid "Flash MRepeat Interval"
 msgstr "Denbora-hutsune tartea"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Hizkuntza"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 #, fuzzy
 msgid "Revocation Info"
 msgstr "Bereizmena hautatzeko etengailua"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "Irudiaren kalitatea"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 #, fuzzy
 msgid "Release Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 #, fuzzy
 msgid "Focus Areas"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:5422
+#: camlibs/ptp2/ptp.c:7326
 #, fuzzy
-msgid "AE Lock"
-msgstr "Fokuaren modua"
+msgid "Focus Point"
+msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "Irudiaren tamaina"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:5436
-#, fuzzy
-msgid "Color temperature"
-msgstr "Kolorearen tenperatura"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Memoriarik ez"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "Irudia"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "Fokuaren kokalekua"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Data eta ordua"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Goria"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Eskuzkoa"
+
+#: camlibs/ptp2/ptp.c:7848
 #, fuzzy
 msgid "Automatic Macro (close-up)"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 #, fuzzy
 msgid "Center Weighted Average"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 #, fuzzy
 msgid "Center-spot"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 #, fuzzy
 msgid "Automatic flash"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 #, fuzzy
 msgid "Red-eye fill flash"
 msgstr "Begi gorrien kontrako flasha"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "LCDren distira"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 #, fuzzy
 msgid "Dark on light"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 #, fuzzy
 msgid "Light on dark"
 msgstr "Argi gutxiegi dago."
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Oso fina"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 #, fuzzy
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 #, fuzzy
 msgid "On + Red Eye Suppression"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 #, fuzzy
 msgid "Distant View"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 #, fuzzy
 msgid "Single-Frame Shooting"
 msgstr "Soila"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 #, fuzzy
 msgid "Timer (Single) Shooting"
 msgstr "Soila"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 #, fuzzy
 msgid "Center-weighted Metering"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "Puntua neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "Ezarpen aldakorrak"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "1. parametroa"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 #, fuzzy
 msgid "Center-weighted Average Metering"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "Puntua neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 #, fuzzy
 msgid "High 2"
 msgstr "Handia"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "1. parametroa"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "2. parametroa"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "3. parametroa"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 #, fuzzy
 msgid "MlSpotPosCenter"
 msgstr "Fokuaren kokalekua"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 #, fuzzy
 msgid "MlSpotPosAfLink"
 msgstr "Fokuaren kokalekua"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 #, fuzzy
 msgid "Encounter"
 msgstr "bat ere ez"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 #, fuzzy
 msgid "Encounter Box"
 msgstr "bat ere ez"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 #, fuzzy
 msgid "Undefined Document"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 #, fuzzy
 msgid "Undefined Message"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 #, fuzzy
 msgid "Undefined Contact"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 #, fuzzy
 msgid "Undefined Calendar Item"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 #, fuzzy
 msgid "Section"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 #, fuzzy
 msgid "Open session"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 #, fuzzy
 msgid "Close session"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 #, fuzzy
 msgid "Get thumbnail"
 msgstr "Koadro txikia eskuratzen..."
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 #, fuzzy
 msgid "Delete object"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 #, fuzzy
 msgid "Self test device"
 msgstr "PTP Proba automatikoak huts egin du"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "Erantzun ezezaguna"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 #, fuzzy
 msgid "Get meter response"
 msgstr "Espero ez zen erantzuna jaso da"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 #, fuzzy
 msgid "Open Media Session"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 #, fuzzy
 msgid "Close Media Session"
 msgstr "Konprimitzea"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 #, fuzzy
 msgid "Get Registration Response"
 msgstr "Espero ez zen erantzuna jaso da"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 #, fuzzy
 msgid "Get WMDRM-ND License Response"
 msgstr "Erantzun ezezaguna"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
 msgstr "PTP Objektu guraso baliogabea"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Ezezaguna"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "PTP Fabrikatzailearen kode ezezaguna"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Ezezaguna"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Filma deskargatzen..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Audioa deskargatzen..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "EXIF datuak deskargatzen..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Ez dago EXIF daturik erabilgarri %s(e)rako."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Ezin izan da fitxategia ezabatu."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Ezin izan da direktorioa kendu."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Ezin izan da direktorioa sortu."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Bertsioa: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTCren egoera: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Kamerako ordua: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Kameraren IDa: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Ez dago SD txartelik sartuta.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD txartelaren IDa: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Kamerako argazkiak: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD memoria: %d MB guztira, %d MB libre.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Barneko memoria: %d MB guztira, %d MB libre.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11035,7 +13441,7 @@
 "Ingeniaritza alderantzikatua USB Snoopy erabiliz egin da, \n"
 "firmwarearen eguneratze-irudiari begira eta ausaz asmatzen.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -11047,12 +13453,12 @@
 "eta Martin Fischer-en <martin.fischer@inka.de> eskutik,\n"
 "Bob Paauwe-n kontrolatzailean oinarrituta\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -11061,182 +13467,182 @@
 "Modeloa: %s\n"
 "Memoria: %d /%d byte erabilgarri"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Aire zabalekoa"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximoa"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimoa"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Pertsonaia"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Soinua"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Irudia eta soinua"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Pertsonaia eta soinua"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Orokorra"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright-a (geh. 20 karaktere)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Argazkiak"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Zuriaren maila"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Grabatze-modua"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Konprimitzea"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "%i abiadura ez da onartzen!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "%i espero zen, %i jaso da. Eman erroren honen berri %s(e)ri."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "%i byte espero ziren, %i jaso d(ir)a. Eman errore honen berri %s(e)ri."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "0x%x espero genuen, baina 0x%x jaso da. Jarri harremanetan %s(e)rekin."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Karaktere okerrak (0x%x, 0x%x). Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Kamera okupatuta dago. Arazoak jarraitzen badu, jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Denbora-muga gainditu egin da 2 saiakeren ondoren ere. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Komunikazio-errorea 2 saiakeren ondoren ere. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Kamera modu okerrean dago. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Kamerak ez ditu parametroak onartu. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Errore ezezagun bat gertatu da. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -11244,7 +13650,7 @@
 "Fitxategi-izenak ez ditu 12 karaktere baino gehiago izan behar ('%s'(e)k %i "
 "karaktere ditu)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -11256,110 +13662,110 @@
 "eraman du gphoto2ra. Marcus Meissner-ek <marcus@jet.franken.de> finkatu eta "
 "hobetu du ataka."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Bereizmena eta tamaina"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Data eta ordua (GTM)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 #, fuzzy
 msgid "Aperture Settings"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Kolorearen modua"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Flasharen ezarpenak"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Ostalariaren energia aurreztea (segundoak)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Kameraren energia aurreztea (segundoak)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Lentearen modua"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreera"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Ingelesa"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Frantsesa"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Alemana"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italiera"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japoniera"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Irudiaren ezarpenak"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -11379,35 +13785,35 @@
 "  PhotoPC 3000z kamerarekin, zure kamera beste modu batera portatzen\n"
 "  bada, bidali mezu bat gphoto garatzaileen posta zerrendara (ingelesez)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Ez dago memoria-txartelik."
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Ezin da bateriaren ahalmena eskuratu"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "Kameraren bateria-maila txikiegia da (%d%%). Eragiketa bertan behera utzi da."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Ezin da berreskuratu geratzen den memoria erabilgarria"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Kamerak 3 aldiz ukatu du konexio bat irekita edukitzea."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Jasotako lehen bytea (0x%x) ez da baliozkoa."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -11415,196 +13821,192 @@
 "Paketearen transmisioak denbora-muga gainditu du %i saiakeren ondoren ere. "
 "Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Ezin izan da paketea transmititu hainbat saiakera eginda ere."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, fuzzy, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Kamerak atzera bota du paketea. Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Ezin izan da paketea transmititu (%i errore-kodea). Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "Transmisioaren denbora-muga gainditu egin da 2 saiakeren ondoren ere. Utzi "
 "egingo da..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Espero ez zen emaitza lortu da 0x%x. Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Espero ez zen erantzuna jaso da (%i). Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Ezin izan da %i erregistroa lortu. Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Saiakera gehiegik egin dute huts."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Datuak bidaltzen..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "sierra kontrolatzaileak ez ditu dei errekurtsiboak onartzen! Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Ezin izan da %i kate-erregistroa lortu. Jo %s(r)engana."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "32 byte espero ziren, %i lortu dira. Jo %s(r)engana."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Obturadorearen abiadura mikrosegundotan (0 automatikoa)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Obturadorearen abiadura (segundotan)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Z/B"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontrastea+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontrastea-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Distira+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Distira-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Irudia doitzea"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Keinua"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED modua"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Infinitua"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Aurreikusi koadro txikia"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Operazio-modua"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCDren distira"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD automatikoki itzaltzea (segundoak)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Erdian zentratuta"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrizea"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Puntua-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zooma (milimetrotan)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "bat ere ez"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "AE blokeoa"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Arrain-begia"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Zabala"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "Esposizioaren/Lenteen beste ezarpen batzuk"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Esposizio automatikoaren blokeoa"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11634,7 +14036,7 @@
 "        Jarri kamera 'M' moduan obturadorearen\n"
 "        abiadura ezartzeko.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11654,73 +14056,69 @@
 "\n"
 "    Deskargatzeak ondo funtzionatu beharko luke.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Arbel zuria"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Arbel beltza"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "Funtzionalitate-modua"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 #, fuzzy
 msgid "Anti-redeye Fill"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluoreszentea"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluoreszentea"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 #, fuzzy
 msgid "Fluorescent-3-office-4200K"
 msgstr "Fluoreszentea"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitorea"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD modua"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Zoom digitala"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Fokuaren kokalekua"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Ordu-formatua"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -11757,7 +14155,7 @@
 "    konektatu kamera berriro PCra\n"
 "    eta jarri LCD 'Desaktibatuta'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -11788,7 +14186,7 @@
 "    baduzu, konektatu kamera berriro PCra\n"
 "    eta jarri LCD 'Desaktibatuta'."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11818,105 +14216,110 @@
 "    eman badezakezu, jarri harremanetan,\n"
 "    garatzaileen posta-zerrendarekin.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (ezezaguna)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Kargatu beharreko fitxategiak luzera nulua du"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Ez dago nahikoa memoria erabilgarri memoria-txartelean"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Ezin da berreskuratu irudiak dituen karpetaren izena"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "'%s' karpetan kargatzea baino ez da onartzen"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Onena"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (ezezaguna)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Obturadorearen abiadura (mikrosegundotan, 0 automatikoa)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Zuri-beltza"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Arbel zuria"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Arbel beltza"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Distira/Kontrastea"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Distira+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Distira-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Argi naturala"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Infinitua/Arrainbegia"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Puntua neurtzeko modua"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Automatikoki itzaltzea (ostalaria) (segundotan)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11924,12 +14327,12 @@
 "Zenbat denbora pasatzen da kamera itzali arte ordenagailura konektatuta "
 "dagoenean?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Automatikoki itzaltzea (eremua) (segundotan)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11937,116 +14340,116 @@
 "Zenbat denbora pasatzen da kamera itzali arte ordenagailura konektatuta ez "
 "dagoenean?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD automatikoki itzaltzea (segundotan)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Argazki-ateratzearen ezarpenak"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 #, fuzzy
 msgid "standard"
 msgstr "Estandarra"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "kolorea"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "zuri-beltza"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Oharra: ez dago memoria-txartelik, baliteke balio batzuk baliozkoak ez "
 "izatea\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, fuzzy, c-format
 msgid "Camera Model: %s\n"
 msgstr "%sKamera-modeloa: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, fuzzy, c-format
 msgid "Serial Number: %s\n"
 msgstr "%sSerie-zenbakia: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, fuzzy, c-format
 msgid "Software Rev.: %s\n"
 msgstr "%sSoftwarearen berrikuspena: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, fuzzy, c-format
 msgid "Frames Taken: %i\n"
 msgstr "%sHartutako fotogramak: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, fuzzy, c-format
 msgid "Frames Left: %i\n"
 msgstr "%sGeratzen diren fotogramak: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, fuzzy, c-format
 msgid "Battery Life: %i\n"
 msgstr "%sBateriaren iraupena: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, fuzzy, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "%sGeratzen den memoria: %i byte\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, fuzzy, c-format
 msgid "Date: %s"
 msgstr "%sData: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Kameraren eskulibururik ez dago erabilgarri.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -12067,7 +14470,7 @@
 "  PhotoPC 3000z kamerarekin, zure kamera beste modu batera portatzen\n"
 "  bada, bidali mezu bat %s helbidera (ingelesez)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -12104,7 +14507,7 @@
 "    konektatu kamera berriro PCra\n"
 "    eta jarri LCD 'Desaktibatuta'."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -12125,12 +14528,7 @@
 "Olympus C-3030Z erabiltzeagatik USB\n"
 "euskarria ezartzeko."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (ezezaguna)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12140,11 +14538,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Ezin izan dira USB ezarpenak aplikatu"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12165,7 +14563,7 @@
 "Smal Ultrapocket kamerara eta OEM bertsioetara (slimshot) sartzeko "
 "kontrolatzailea"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, fuzzy, c-format
 msgid ""
 "Sonix camera.\n"
@@ -12180,7 +14578,7 @@
 "Mars MR97310 kamera.\n"
 "%i argazki ditu. \n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -12195,7 +14593,7 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 #, fuzzy
 msgid ""
 "Sonix camera library\n"
@@ -12204,7 +14602,7 @@
 "Mars MR97310 kameraren liburutegia\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -12218,7 +14616,7 @@
 "interfazean oinarritua\n"
 "Gphoto2ra Bart van Leeuwen-ek <bart@netage.nl> ekarria"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -12230,7 +14628,7 @@
 "Mark Davies-ek <mdavies@dial.pipex.com> idatzia\n"
 "gPhoto2ra Raymond Penners-ek <raymond@dotsphinx.com> ekarria"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -12243,12 +14641,12 @@
 "Memoria osoa: %ikB\n"
 "Libre dagoen memoria:  %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Firmwarearen berrikuspena: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -12256,7 +14654,7 @@
 "Soundvision kontrolatzailea\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -12265,7 +14663,7 @@
 "FLASH:\n"
 " Fitxategiak: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -12282,7 +14680,7 @@
 "Erabilitako lekua: %8d\n"
 "Libre dagoen lekua: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x liburutegia v"
 
@@ -12346,19 +14744,19 @@
 "sq905 kontrolatzaile orokorra\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12366,11 +14764,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12382,111 +14776,111 @@
 "ASIC STV0674 prozesadorea erabiltzen duten kameretarako kontrolatzailea.\n"
 "Protokoloaren ingeniaritza alderantzikatua SnoopyPro erabiliz egin da\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Esposizio okerra (baliteke nahikoa argi ez egotea)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 #, fuzzy
 msgid "Information on STV0680-based camera:\n"
 msgstr "STV0680en oinarritutako kameretarako informazioa:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Firmwarearen berrikuspena: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASICen berrikuspena: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Sentsorearen IDa: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, fuzzy, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Kamera %dHz-etan keinu egiten duten argietarako konfiguratuta dago.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Kameraren memoria: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Kamerak koadro txikiak onartzen ditu.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Kamerak bideoa onartzen du.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Kamerako irudiak monokromatikoak dira.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Kamerak memoria du.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Kamerak bideo-formatuak onartzen ditu: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Hornitzailearen IDa: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Produktuaren IDa: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Irudi-kopurua: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Gehienezko irudi-kopurua: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Irudiaren zabalera: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Irudiaren altuera: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Irudiaren tamaina: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Koadro txikiaren zabalera: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Koadro txikiaren altuera: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Koadro txikiaren tamaina: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12503,12 +14897,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Aiptek PenCam eta STM USB modu dualeko kameretarako zabaldua."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "%i fitxategietako informazioa eskuratzen..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12521,21 +14915,21 @@
 "Eman erroreen berri eta bidali iruzkinak.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z USB da soilik"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 #, fuzzy
 msgid "Driver Settings"
 msgstr "Bestelako ezarpenak"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 #, fuzzy
 msgid "Turbo mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12543,12 +14937,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, fuzzy, c-format
 msgid "Downloading %s..."
 msgstr "'%s' deskargatzen..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12558,40 +14952,60 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 kontrolatzailea.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Kamera-kontrolatzaileak kargatzen '%s'(e)tik..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Errorea gertatu da sarrera-irteera liburutegian ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Ezin izan da kamerarik detektatu"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, fuzzy, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Ezin izan da kamerarik detektatu"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 #, fuzzy
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Ataka ezarri behar da kamera abiarazi aurretik."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Ezin izan da kargatu eskatutako '%s' (%s) kamera-kontrolatzailea."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "'%s' kamera-kontrolatzailean 'camera_init' funtzioa falta da."
@@ -12632,12 +15046,12 @@
 msgid "This camera can not capture previews."
 msgstr "Kamera honek ezin ditu aurrebistak kapturatu."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "'%s' bidea ez da absolutua."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12646,22 +15060,22 @@
 "'%s' ezabatzen saiatu zara '%s' karpetatik, baina fitxategi-sistemak ez du "
 "onartzen fitxategiak ezabatzea."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, fuzzy, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Kentzen saiatzen ari zaren azpikarpetak daude oraindik '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, fuzzy, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Kentzen saiatzen ari zaren fitxategiak daude oraindik '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Fitxategi-sistemak ez du onartzen fitxategiak kargatzea."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, fuzzy, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12669,105 +15083,106 @@
 "'%s' karpetak  %i fitxategiak bakarrik ditu, baina %i zenbakia duen "
 "fitxategia eskatu duzu."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Ezin izan da '%s' fitxategia aurkitu '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Ezin izan da '%s' fitxategia aurkitu."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Fitxategi-sistemak ez du onartzen fitxategiak eskuratzea"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "Fitxategi-sistemak ez du onartzen fitxategiei buruzko informazioa eskuratzea"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Fitxategi-sistemak ez du onartzen fitxategiei buruzko informazioa ezartzea"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Irakurtzeko soilik fitxategien atributuak, adibidez zabalera eta altuera, "
 "ezin dira aldatu."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 #, fuzzy
 msgid "The filesystem doesn't support getting storage information"
 msgstr ""
 "Fitxategi-sistemak ez du onartzen fitxategiei buruzko informazioa eskuratzea"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Datuak hondatuta"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Fitxategia badago"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Modelo ezezaguna"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Ez da direktorioa aurkitu"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Direktorioa badago"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "S/I eragiketa abian dago"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Bidea ez da absolutua"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 #, fuzzy
 msgid "OS error in camera communication"
 msgstr "Arazoa kameraren komunikazio-abiadura ezartzean"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Kamera-liburutegiaren errore ezezaguna"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
+#, c-format
 #~ msgid "%s is a file type for which no thumbnail is provided"
 #~ msgstr "%s fitxategi-motarako ez dago koadro txikirik"
 
@@ -12798,7 +15213,7 @@
 #~ msgid "Unknown (some kind of error)"
 #~ msgstr "Ezezaguna (errore-motaren bat))"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid ""
 #~ "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, "
 #~ "%6.3f sec \"%s\""
@@ -12806,6 +15221,7 @@
 #~ "canon_usb_poll_interrupt_pipe: etenaldi-irakurketak huts egin du %i "
 #~ "saiakeren ondoren, \"%s\""
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, "
 #~ "\"%s\""
@@ -12813,12 +15229,14 @@
 #~ "canon_usb_poll_interrupt_multiple: etenaldi-irakurketak huts egin du %i "
 #~ "saiakeren ondoren, \"%s\""
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 #~ msgstr ""
 #~ "canon_usb_capture_dialogue: 0x%04x luzera faltsua koadro txikiaren "
 #~ "tamainako paketerako"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 #~ msgstr ""
@@ -12840,6 +15258,7 @@
 #~ "canon_usb_capture_dialogue: bigarren etenaldi-irakurketa sekuentziatik "
 #~ "kanpo"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 #~ msgstr ""
@@ -12856,6 +15275,7 @@
 #~ "canon_usb_capture_dialogue: laugarren EOS etenaldi-irakurketa "
 #~ "sekuentziatik kanpo"
 
+#, c-format
 #~ msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 #~ msgstr ""
 #~ "canon_usb_dialogue: karga handiegia da, ez da bufferrean kabituko (%i > "
@@ -12896,18 +15316,10 @@
 #~ msgstr "Puntua"
 
 #, fuzzy
-#~ msgid "Center"
-#~ msgstr "Orokorra"
-
-#, fuzzy
 #~ msgid "Default"
 #~ msgstr "Argi naturala"
 
 #, fuzzy
-#~ msgid "20 mm"
-#~ msgstr "29 mm"
-
-#, fuzzy
 #~ msgid "Medium low"
 #~ msgstr "Tartekoa"
 
@@ -12969,6 +15381,7 @@
 #~ msgid "PTP Error: bad parameter"
 #~ msgstr "PTP Errorea: parametro okerra"
 
+#, c-format
 #~ msgid ""
 #~ "Model: %s\n"
 #~ "  device version: %s\n"
@@ -13106,9 +15519,6 @@
 #~ msgid "PTP: Protocol error, response expected"
 #~ msgstr "PTP: Protokolo-errorea, erantzuna espero zen"
 
-#~ msgid "Date Time"
-#~ msgstr "Data eta ordua"
-
 #~ msgid "ShutterSpeed"
 #~ msgstr "Obturadorearen abiadura"
 
@@ -13121,10 +15531,6 @@
 #~ msgstr "Esposizioa neurtzeko modua"
 
 #, fuzzy
-#~ msgid "Exposure Bracketing Number"
-#~ msgstr "Esposizioa neurtzeko modua"
-
-#, fuzzy
 #~ msgid "Flourescent-1-home-6700K"
 #~ msgstr "Fluoreszentea"
 
@@ -13145,12 +15551,15 @@
 #~ msgid "Sorry, taking pictures is not implemented..."
 #~ msgstr "Argazkiak hartzea ez dago garatuta..."
 
+#, c-format
 #~ msgid "Couldn't open camera.\n"
 #~ msgstr "Ezin izan da kamera ireki.\n"
 
+#, c-format
 #~ msgid "Error opening camera\n"
 #~ msgstr "Errorea kamera irekitzean\n"
 
+#, c-format
 #~ msgid "Picture number is too large.\n"
 #~ msgstr "Argazki-zenbakia luzegia da.\n"
 
@@ -13171,9 +15580,11 @@
 #~ "\n"
 #~ "Liburutegi honek ez du funtzionatuko. YMMV\n"
 
+#, c-format
 #~ msgid "Error opening camera.\n"
 #~ msgstr "Errorea kamera irekitzean.\n"
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "Ezin izan da kontrolatzailerik bidali '%s'(e)rako"
 
@@ -13184,22 +15595,26 @@
 #~ msgid "This camera does not support event handling."
 #~ msgstr "Kamerak ez du %i abiadura onartzen."
 
+#, c-format
 #~ msgid "Could not find folder '%s'."
 #~ msgstr "Ezin izan da '%s' karpeta aurkitu."
 
+#, c-format
 #~ msgid "Folder '%s' does not contain a folder '%s'."
 #~ msgstr "'%s' karpetak ez du '%s' karpetarik."
 
+#, c-format
 #~ msgid ""
 #~ "Could not append '%s' to folder '%s' because this file already exists."
 #~ msgstr ""
 #~ "Ezin izan zaio '%s' '%s' karpetari erantsi, fitxategi hori lehendik "
 #~ "badagoelako."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Deleting '%s' from folder '%s'..."
 #~ msgstr "'%s' deskargatzen '%s' karpetatik..."
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "'%s' deskargatzen '%s' karpetatik..."
 
@@ -13354,10 +15769,6 @@
 #~ msgstr "Benetako irudiaren zabalera"
 
 #, fuzzy
-#~ msgid "Colour Mode"
-#~ msgstr "Kolorearen modua"
-
-#, fuzzy
 #~ msgid "Incadescent"
 #~ msgstr "Goria"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/fr.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/fr.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/fr.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/fr.po Changed

@@ -6,14 +6,14 @@
 # Aurélien Croc <aurelien@ap2c.com>, 2003.
 # Dimitri Duc <dimitri.duc@gmail.com>, 2009.
 # David Prévot <david@tilapin.org>, 2012-2014.
-# Stéphane Aulery <lkppo@free.fr>, 2016, 2017.
+# Stéphane Aulery <lkppo@free.fr>, 2016, 2017, 2019-2021.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.13\n"
+"Project-Id-Version: libgphoto2 2.5.27\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2017-04-30 05:46+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2021-11-22 22:51+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -21,8 +21,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -32,7 +32,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -41,13 +41,13 @@
 "L'appareil photographique ne semble pas utiliser de mémoire CompactFlash\n"
 "Malheureusement, ce n'est pas encore pris en charge pour le moment\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 "L'appareil a pris %d photographies et utilise de la mémoire CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -80,12 +80,12 @@
 "Pilote générique Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Le cadre numérique USB a une puce AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -95,7 +95,7 @@
 "résolutions. Le pilote gPhoto pour ces périphériques permet\n"
 "d'envoyer, recevoir et effacer des images du cadre numérique."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -107,16 +107,18 @@
 "Ce pilote permet d'envoyer, recevoir et effacer des images du\n"
 "cadre numérique."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Configuration du cadre numérique"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Synchroniser les données et date d'image avec l'ordinateur"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -125,7 +127,7 @@
 "Nombre d'images : %i\n"
 "Version de microcode : %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -149,26 +151,26 @@
 "Mis en œuvre en utilisant des documents trouvés\n"
 "sur le web. Permission accordée par Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Impossible de créer le répertoire %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Impossible de supprimer le répertoire %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "échec du verrouillage des touches."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*inconnu*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -177,7 +179,7 @@
 "canon_int_capture_image : échec de canon_usb_list_all_dirs() initial avec "
 "l'état %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -186,18 +188,18 @@
 "canon_int_capture_image : échec de canon_usb_list_all_dirs() final avec "
 "l'état %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Nom « %s » (%li caractères) trop long, au plus 30 caractères sont permis."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Lettres minuscules dans %s non autorisées."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -205,7 +207,7 @@
 "canon_int_list_directory : erreur : message initial trop court (%i < minimum "
 "%i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -213,16 +215,16 @@
 "canon_int_list_directory : fin du paquet atteinte en examinant la première "
 "entré du répertoire"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 "anon_int_list_directory : rencontre d'une entrée de répertoire tronquée"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Fichier protégé en écriture."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -230,12 +232,12 @@
 "canon_int_get_info_func : erreur : message initial trop court (%i < minimum "
 "%i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "Impossible d'extraire la vignette JPEG des données : pas de début ou de fin"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Impossible d'extraire la vignette JPEG des données : les données ne sont pas "
@@ -246,7 +248,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Paramètre « %s » NULL dans %s, ligne %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -254,310 +256,321 @@
 "Le programme ne sait pas comment gérer la valeur camera->port->type %i, "
 "alias 0x%x dans %s, ligne %i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "Erreur fatale : valeur CRC initiale pour la longueur %d inconnue\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
-msgstr "Impossible de déterminer la valeur CRC initiale\n"
+msgstr "impossible de déterminer la valeur CRC initiale\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
 "#########################\n"
 msgstr ""
-"Avertissement : CRC non vérifié (ajout longueur %d, valeur 0x%04x) "
+"avertissement : CRC non vérifié (ajout longueur %d, valeur 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Mode de compatibilité"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Vignette"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Image entière"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Pose longue"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofocus : one-shot"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofocus : AI servo"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Autofocus : AI focus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Mise au point manuelle"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Son désactivé"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Son activé"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Flash désactivé"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Flash activé"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Flash automatique"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manuel 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Scène éloignée"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Temps de pose court"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Temps de pose long"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Scène de nuit"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Niveaux de gris"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sépia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portrait"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Macro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "N/B"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Mise au point panoramique"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Vivid"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutre"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Temps de pose long"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Feuillage"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Intérieur"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Feux d'artifice"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Plage"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Sous-marin"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Neige"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Enfants et animaux"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Cliché de nuit"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Macro numérique"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "MesCouleurs"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Photographies en film"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "Brut"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "Brut 2"
 
 # Taille/qualité
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Petit JPEG normal"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Petit JPEG fin"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Moyen JPEG normal"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Moyen JPEG fin"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Grand JPEG normal"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Grand JPEG fin"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "Brut et petit JPEG normal"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "Brut et petit JPEG fin"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "Brut et moyen JPEG normal"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "Brut et moyen JPEG fin"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "Brut et grand JPEG normal"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "Brut et grand JPEG fin"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -589,44 +602,44 @@
 " minimiser l'activité des disques (en fermant tous les programmes\n"
 " non nécessaires par exemple).\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Appareil non disponible : %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Éteindre l'appareil"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Erreur d'acquisition d'image"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Impossible d'obtenir le nom du disque : %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Aucune raison disponible"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Impossible d'obtenir des renseignements sur le disque : %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Erreur interne nº 1 dans get_file_func() (%s, ligne %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Impossible de trouver un fichier audio pour %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -637,35 +650,35 @@
 "  %11s octets au total\n"
 "  %11s octets disponibles"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Transformateur"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "sur batterie"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "alimentation : bonne"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "alimentation : mauvaise"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
-msgstr "Indisponible : %s"
+msgstr "indisponible : %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (heure de l'hôte %s%i secondes)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -692,7 +705,7 @@
 "\n"
 "Heure : %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -714,26 +727,26 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Erreur de suppression de fichier"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Erreur de suppression du fichier de vignette associé"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Les vitesses supérieures à 57600 ne sont pas possibles pour envoyer vers "
 "l'appareil"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Impossible d'obtenir la lettre de la mémoire flash"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -741,378 +754,400 @@
 "Impossible de télécharger, pas de nom de répertoire libre disponible.\n"
 "Le répertoire 999CANON existe et contient déjà une image AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Impossible de créer le répertoire \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Impossible de créer le répertoire de destination."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Configuration de l'appareil et du pilote"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Réglages de l'appareil photographique"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Nom du propriétaire"
 
 # camlibs/canon/canon.h:ligne 65
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Classe de taille d'acquisition"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Vitesse ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Mode de prise de vue"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Temps de pose"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Ouverture"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Correction d'exposition"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Format d'image"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Mode de mise au point"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Mode de flash"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Son"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Action de l'appareil photographique"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 "Synchroniser la date et l'heure de l'appareil avec celles de l'ordinateur"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Renseignements sur l'état de l'appareil"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Modèle de l'appareil photographique"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Erreur"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Version de microcode"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Alimentation"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Pilote"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Afficher tous les fichiers"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Conserver le nom du fichier lors du chargement"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Appareil non disponible"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Le nom du propriétaire a changé"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "impossible de modifier le nom du propriétaire"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Classe de taille d'acquisition modifiée"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Réglage de classe de taille d'acquisition incorrect"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Paramètre de vitesse ISO incorrect"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Vitesse ISO modifiée"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Impossible de modifier la vitesse ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Paramètre du mode de prise de vue incorrect"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Mode de prise de vue modifié"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Impossible de modifier le mode de prise de vue"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Paramètre de temps de pose incorrect"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Temps de pose modifié"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Impossible de modifier le temps de pose"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Paramètre d'ouverture incorrect"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Ouverture modifiée"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Impossible de modifier l'ouverture"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Paramètre de correction d'ouverture incorrect"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Correction d'exposition modifiée"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Impossible de modifier la correction d'exposition"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Paramètre de format d'image incorrect"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Format d'image modifié"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Impossible de modifier le format d'image"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Réglage du mode de mise au point incorrect"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Mode de mise au point modifié"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Impossible de modifier le mode de mise au point"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Paramètre de mode sonore incorrect"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Mode sonore modifié"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Impossible de modifier le mode sonore"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Niveau de zoom modifié"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Impossible de modifier le niveau du zoom"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Paramètre du mode de flash incorrect"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Mode de flash modifié"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Impossible de modifier le mode de flash"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "mise à l'heure"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "impossible de mettre à l'heure"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Type %i = 0x%x de port donné non pris en charge. Initialisation impossible."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Batteries à plat, extinction de l'appareil."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "Erreur : message inattendu"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "Erreur : message dépassé"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "Erreur : désynchronisé."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "Erreur : type de paquet inattendu."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "Erreur : erreur de format du message."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "Erreur : message2 inattendu."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Chargement du fichier…"
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Récupération du fichier…"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1120,7 +1155,7 @@
 "canon_serial_get_dirents : canon_serial_dialogue n'a pas réussi à obtenir "
 "les entrées du répertoire"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1128,214 +1163,214 @@
 "canon_serial_get_dirents : paquet dirent initial trop petit (seulement "
 "%i octets)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents : impossible d'allouer %i octets de mémoire"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents : impossible de lire une autre entrée de répertoire"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents : entrée de répertoire tronquée reçue"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents : trop d'entrées, probablement en boucle."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents : impossible de modifier la taille du tampon dirent "
 "à %i octets"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Erreur de modification de vitesse."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Réinitialisation du protocole…"
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Appareil OK."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Recherche de l'appareil…"
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Tentative de contact de l'appareil…"
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Erreur de communication 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Pas de réponse de l'appareil"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Réponse non reconnue"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "« %s » détecté, alias « %s »"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modèle « %s » inconnu"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Mauvaise fin de transfert"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Erreur de communication 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Erreur de communication 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Modification de vitesse… Attente…"
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Erreur de modification de vitesse"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Erreur d'attente d'accusé de réception pendant l'initialisation, nouvel "
 "tentative"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Erreur d'attente d'accusé de réception pendant l'initialisation"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Connecté à l'appareil photographique"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "Erreur : une condition d'erreur fatale a été détectée, impossible de "
 "continuer "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "Erreur : %d est trop grand"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Récupération de la vignette…"
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "Non reconnu"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
-msgstr "Impossible d'établir une initiation de connexion à l'appareil."
+msgstr "Impossible d'établir la connexion avec l'appareil"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "L'appareil était déjà actif"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "L'appareil était réveillé"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Réponse initiale « %c » de l'appareil non reconnue"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr ""
 "Échec de l'étape nº 2 d'initialisation : (« %s » en lecture de %i). Appareil "
-"non opérationnel."
+"non opérationnel"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
 "not operational"
 msgstr ""
 "Échec de l'étape nº 2 d'initialisation. (%i octets renvoyés, %i attendus). "
-"Appareil non opérationnel."
+"Appareil non opérationnel"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr ""
 "Échec de l'étape nº 3 d'initialisation : « %s » en lecture de %i. Appareil "
-"non opérationnel."
+"non opérationnel"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr ""
 "Échec de l'étape nº 3 d'initialisation. (%i renvoyé, %i attendu). Appareil "
-"non opérationnel."
+"non opérationnel"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr ""
 "Échec de l'étape nº 3 d'initialisation : « %s » en écriture sur %i. Appareil "
-"non opérationnel."
+"non opérationnel"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
-"Échec de l'étape nº 4 : « %s » en lecture de %i. Appareil non opérationnel."
+"Échec de l'étape nº 4 : « %s » en lecture de %i. Appareil non opérationnel"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
-"Échec de l'étape nº 4 (%i renvoyé, %i attendu). Appareil non opérationnel."
+"Échec de l'étape nº 4 (%i renvoyé, %i attendu). Appareil non opérationnel"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Appareil non prêt, échec de plusieurs requêtes d'identification de "
 "l'appareil : %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Appareil non prêt, échec de get_battery : %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1344,20 +1379,20 @@
 "canon_usb_lock_keys : longueur inattendue renvoyée par la fonction « lock "
 "keys » (%i octets, %i attendus)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys : longueur renvoyée inattendue (%i octets, %i attendus)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys : longueur renvoyée inattendue (%i octets, %i attendus)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1366,44 +1401,44 @@
 "canon_usb_get_body_id : longueur de données renvoyée inattendue (%i octets, "
 "%i attendus)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Réception des données…"
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Plus de mémoire : %d octets nécessaires."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes : échec de canon_usb_dialogue"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
-"canon_usb_set_file_attributes : canon_usb_dialogue renvoie un état d'erreur "
-"0x%08x de l'appareil"
+"Avertissement canon_usb_set_file_attributes : canon_usb_dialogue renvoie un "
+"état d'erreur 0x%08x de l'appareil"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Impossible de lire le fichier « %s »"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Plus de mémoire : %ld octets nécessaires."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Échec d'envoi de fichier."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1411,7 +1446,7 @@
 "Fichier trop grand. Vous pourriez ayez besoin d'éteindre puis de rallumer "
 "l'appareil avant de charger d'autres fichiers."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1420,7 +1455,7 @@
 "canon_usb_get_dirents : impossible de faire tenir la charge dans le tampon, "
 "« %.96s » (tronqué) trop long."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1429,7 +1464,7 @@
 "canon_usb_get_dirents : échec de récupération des entrées de répertoires par "
 "canon_usb_long_dialogue, %i renvoyé"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1438,7 +1473,7 @@
 "canon_usb_list_all_dirs : impossible de faire tenir la charge dans le "
 "tampon, « %.96s » (tronqué) trop long."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1447,27 +1482,27 @@
 "canon_usb_list_all_dirs : échec de récupération des entrées de répertoires "
 "par canon_usb_long_dialogue, %i renvoyé"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "« %s » détecté."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Le nom de l'appareil « %s » ne correspond à aucun appareil connu"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Type %d d'image non géré"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Image %s protégée contre la suppression."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1480,37 +1515,37 @@
 "org>.\n"
 "L'intégration de QVplay a été réalisée par Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Niveau de la batterie : %.1f volts. Révision : %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Configuration de l'appareil"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batterie"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Trop clair"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Trop sombre"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1613,19 +1648,19 @@
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Pilote générique sq905C\n"
+"pilote générique sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Le type d'image n'est pas pris en charge"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Nombre d'images : %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1633,7 +1668,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1641,24 +1676,24 @@
 "Seul le dossier racine est géré, la liste des fichiers du répertoire « %s » "
 "a été demandée."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problème à l'obtention du nombre de fichiers"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problème à l'obtention des renseignements sur l'image"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Le type d'acquisition n'est pas pris en charge"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (la batterie est chargée à %d %%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1676,82 +1711,83 @@
 "La résolution est positionnée à %s\n"
 "L'appareil fonctionne sur %s %s\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flash"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Pas de flash"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Double diaphragme"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Pas de double diaphragme"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Interrupteur de choix de la résolution"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Pas d'interrupteur de choix de la résolution"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Pas d'indicateur de mise sous tension"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "Sous tension"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "Hors tension"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "prêt"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Pas prêt"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "en mode remplissage"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Pas en mode remplissage"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "basse (320×240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "haute (640×480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "externe"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "interne"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1772,7 +1808,7 @@
 "* La qualité de l'image est actuellement inférieure\n"
 "  à ce qu'elle pourrait être.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1802,120 +1838,236 @@
 "     Renseignements sur le protocole, format\n"
 "     d'images brutes, portage gPhoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problème de lecture d'image sur la mémoire flash"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Plus de mémoire"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Téléchargement d'image…"
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problème de téléchargement d'image"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Téléchargement annulé par l'utilisateur"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problème de prise de vue en temps réel"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Exposition"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Ajustement automatique de l'exposition en prévisualisation"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Niveau d'exposition en prévisualisation"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Flash automatique lors de l'acquisition"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problème d'ouverture de port"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problème de réinitialisation de l'appareil"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problème de configuration de vitesse de communication avec l'appareil"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Ça ressemble à un modem, pas à un appareil photo"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Liste des fichiers de « %s »…"
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Liste des répertoires de « %s »…"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Impossible d'obtenir des renseignements sur « %s » (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Impossible d'obtenir des renseignements sur « %s » dans « %s » (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Impossible de modifier l'heure du fichier « %s » dans « %s » (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Impossible d'ouvrir « %s »."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Le navigateur de répertoire « camera » permet d'indexer les photographies "
 "sur disque."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Mode de navigation de répertoire — écrit par Scott Fritzinger <scottf@unr."
 "edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "Impossible de supprimer le fichier « %s » du répertoire « %s » (code "
 "d'erreur %i : %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Configuration de l'appareil et du pilote"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Mode de prise de vue"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Résolution"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Résolution"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Mode couleur ou fonction"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Mode couleur"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -1925,91 +2077,91 @@
 "<olivier@aixmarseille.com>, adapté du pilote spca50x. Remerciements à "
 "l'équipe spca50x, dont le portage du pilote a été facile pour cet appareil. "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "L'appareil n'a envoyé que %i octet(s), mais %i sont nécessaires."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Impossible de contacter l'appareil photo."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Réception d'en-tête imprévu (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Mauvaise séquence d'échappement : 0x%02x attendu, 0x%02x reçu."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Mauvaises données — 0x%02x reçu, 0x%02x attendu."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Mauvaises données — 0x%02x reçu, 0x%02x ou 0x%02x attendu."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Mauvaise somme de contrôle — 0x%02x reçu, 0x%02x attendu."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "L'appareil a refusé la commande."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "L'appareil se réinitialise lui-même."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "L'appareil a envoyé l'octet 0x%02x inattendu."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Téléchargement…"
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr ""
 "Impossible d'allouer %i octet(s) pour le téléchargement de la vignette."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Impossible d'allouer %i octet(s) pour le téléchargement de l'image."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "L'appareil n'accepte pas le nom de fichier « %s »."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
 "Impossible d'initialiser le chargement (l'appareil a répondu avec 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Cet appareil ne ne permet pas la vitesse %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Impossible de régler la vitesse à %i (l'appareil a répondu %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -2017,36 +2169,36 @@
 "Matthew G. Martin\n"
 "Basé sur fujiplay de Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Le débit binaire %ld n'est pas possible."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Configuration d'appareil FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Date et heure"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "Identifiant"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Version : "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modèle : "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Mémoire disponible : "
 
@@ -2060,7 +2212,7 @@
 "provided by Mustek.\n"
 "\n"
 msgstr ""
-"Bibliothèque gsmart300\n"
+"bibliothèque gsmart300\n"
 "Till Adam <till@adam-lilienthal.de>\n"
 "Jérôme Lodewyck <jerome.lodewyck@ens.fr>\n"
 "Prise en charge des appareils Mustek gSmart 300\n"
@@ -2068,18 +2220,18 @@
 "les spécifications gentiment fournies par Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Type de port non géré : %d. Ce pilote ne fonctionne qu'avec des appareils "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Impossible de réinitialiser l'appareil.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2088,7 +2240,7 @@
 "L'appareil ne permet que la suppression du dernier fichier de l'appareil. "
 "Dans ce cas, c'est le fichier « %s »."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2103,7 +2255,7 @@
 "Estimation du nombre d'image disponible : %8$d\n"
 "Niveau de la batterie : %9$d %%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2158,25 +2310,25 @@
 "pilote iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Vues prises      : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
-msgstr "Bibliothèque jamcam v"
+msgstr "bibliothèque jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Téléchargement des données…"
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Téléchargement de la vignette…"
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2192,7 +2344,7 @@
 "   - vignettes (format PGM 64×48 ormat)\n"
 "   - images complètes (format PPM 640×480)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2204,31 +2356,31 @@
 "Pilote pour l'appareil Jenoptik JD11.\n"
 "Protocole rétroconçu en utilisant WINE et IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Configuration du JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Autres réglages"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Temps d'exposition en pose longue"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Réglages couleur"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rouge"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Vert"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Bleu"
 
@@ -2270,7 +2422,7 @@
 "jl2005a camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Bibliothèque d'appareils jl2005a\n"
+"bibliothèque d'appareils jl2005a\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
 #: camlibs/jl2005c/library.c:135
@@ -2306,14 +2458,14 @@
 "jl2005bcd camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Bibliothèque d'appareils jl2005bcd\n"
+"bibliothèque d'appareils jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Carte CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2325,7 +2477,7 @@
 "télécharger le programme « kdc2tiff ». Il est disponible en http://kdc2tiff."
 "sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2337,13 +2489,13 @@
 "Bibliothèque pour l'appareil Kodak DC120.\n"
 "(à la demande générale)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Réception des données…"
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Attente de la fin de l'opération…"
 
@@ -2356,7 +2508,8 @@
 msgstr "Type de fichier"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2369,7 +2522,7 @@
 msgstr "Résolution du fichier"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 × 480"
 
@@ -2393,8 +2546,9 @@
 msgid "High (good quality)"
 msgstr "Haute (qualité correcte)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Acquisition"
 
@@ -2423,77 +2577,84 @@
 msgstr "Correction d'exposition"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automatique"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Forcer"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Aucune"
 
@@ -2502,71 +2663,78 @@
 msgstr "Dispositif anti yeux rouges"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Activé"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Désactivé"
 
@@ -2582,7 +2750,7 @@
 msgid "Port speed"
 msgstr "Vitesse du port"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Nom de l'album"
 
@@ -2802,58 +2970,58 @@
 "Bibliothèque pour l'appareil Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Attente…"
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Paramètre 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Paramètre 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Paramètre 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modèle : Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Version de microcode : %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "État des piles : %s, transformateur : %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Nombre d'images : %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Espace restant : haute : %d, moyenne : %d, basse : %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "État de la carte (%d) : %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Nombre total de prises de vue : %d, utilisation du flash : %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2867,45 +3035,46 @@
 "Bibliothèque pour les appareils Kodak DC240, DC280, DC3400 et DC5000.\n"
 "Réécrit et mis à jour pour gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Faible"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Vide"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Incorrect"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Non utilisé"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "En cours d'utilisation"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "La carte est ouverte"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Carte n'est pas ouverte"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "La carte n'est pas formatée"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Pas de carte"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2913,12 +3082,12 @@
 "Une opération est actuellement en cours. Cet appareil n'en gère qu'une seule "
 "de façon concurrente, Veuillez attendre la fin de l'opération en cours."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "appareil inactif depuis plus de 9 secondes, réinitialisation.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2934,7 +3103,7 @@
 "vous remarquez que l'appareil ne répond plus, resélectionnez l'appareil. "
 "Cela provoquera sa réinitialisation."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2946,7 +3115,7 @@
 "\n"
 "Questions et commentaires bienvenus."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2955,7 +3124,7 @@
 "Cet appareil USB est un Kodak EZ200.\n"
 "Le nombre de photographies prises est %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2963,107 +3132,107 @@
 "Pilote Kodak EZ200\n"
 "Jean-Francois Bucas <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Erreur de mise au point."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Erreur de diaphragme."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Erreur de stroboscope."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Erreur de somme de contrôle EEPROM."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Erreur interne (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Erreur interne (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Pas de carte."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Type de carte non prise en charge."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Carte enlevée lors de son accès."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Numéro d'image incorrect."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Impossible d'écrire sur la carte."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Carte protégée en écriture."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Plus d'espace sur la carte."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Image protégée."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Pas assez de lumière."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Erreur de mise au point automatique."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Erreur système."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Paramètre incorrect."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Cette commande ne peut pas être annulée."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Données de localisation trop grandes."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Données de localisation corrompues."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Commandes non prises en charge."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Autre commande en cours d'exécution."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
-msgstr "Erreur d'ordre de commandes. "
+msgstr "Erreur d'ordre de commandes."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3072,17 +3241,17 @@
 msgstr ""
 "L'appareil vient de renvoyer une erreur inconnue. Veuillez signaler cela à "
 "l'équipe de développement %s en expliquant comment reproduire cette erreur : "
-"(0x%x,0x%x). Merci d'avance."
+"(0x%x,0x%x). Merci d'avance !"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Récupération de la liste des fichiers…"
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Test de différentes vitesses…"
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3090,12 +3259,12 @@
 "L'appareil n'a pas pu être contacté. Veuillez vérifier qu'il est connecté à "
 "l'ordinateur et allumé."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i images n'ont pas pu être effacées car elles sont protégées"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3114,7 +3283,7 @@
 "Nom : %s,\n"
 "Fabricant : %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3124,402 +3293,411 @@
 "Lutz Müller <lutz@users.sourceforge.net>\n"
 "Gère tous les appareils Konica et plusieurs appareils HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Récupération de la configuration…"
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Configuration Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Paramètres persistants"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "L'appareil doit-il émettre un son à la prise de vue ?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Heure du retardateur"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Heure d'extinction automatique"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Intervalle du projecteur de diapositives"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Résolution"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Basse (576 × 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Moyenne (1152 × 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Haute (1152 × 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Localisation"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Langue"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Aucune sélectionnée"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Format de sortie TV"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Ne pas afficher le menu TV"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Format de date"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Mois/Jour/Année"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Jour/Mois/Année"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Année/Mois/Jour"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Paramètres persistants de session"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Oui, dispositif anti yeux rouges"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatique, dispositif anti yeux rouges"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Mise au point"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fixe"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Paramètres temporaires"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Retardateur"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Retardateur (image suivante uniquement)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Impossible de trouver les données de localisation en « %s »"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
-msgstr "Fichier de localisation trop grand."
+msgstr "Fichier de localisation trop grand !"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Cette prévisualisation n'existe pas."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Les données ont été corrompues."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
-msgstr "compilé sans prise en charge d’EXIF, miniatures indisponible."
+msgstr "Compilé sans prise en charge d’EXIF, miniatures indisponible."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
-msgstr "Le type %d de photographie n'est pas géré par cet appareil."
+msgstr "Le type %d de photographie n'est pas géré par cet appareil !"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Impossible de supprimer l'image %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Impossible de supprimer toutes les images."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Téléchargement de l'image…"
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 "Impossible de charger cette image dans l'appareil. Une erreur s'est produite."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Il faut être en mode enregistrement pour acquérir des images."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Aucune place disponible pour acquérir de nouvelles images. Vous devez "
 "supprimer quelques images."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Impossible d'acquérir de nouvelles images. Erreur inconnue"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Pas de réponse de l'appareil."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Faible"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Moyenne"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Haute"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Icônes"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2,0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0,5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0,1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Balance des blancs"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Bureau"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Lumière naturelle"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Dureté"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Dur"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Doux"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Couleur"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Lumière"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Profondeur"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Noir et blanc"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Unique"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Séquence de 9 images"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Affichage de la date"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "N’importe où"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Mode de visualisation"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Mode d’enregistrement"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Partout"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "Secteur"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Lecture"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Enregistrement"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "JJ/MM/AAAA"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "AAAA/MM/JJ"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/JJ/AAAA"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3540,7 +3718,7 @@
 "Affichage de la date : %s\n"
 "Date et heure : %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3555,7 +3733,7 @@
 "http://www.ap2c.com\n"
 "Prise en charge du Konica Q-M150 français."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3575,7 +3753,7 @@
 "Si vous avez des problèmes avec ce pilote,\n"
 "veuillez envoyer un message à ses auteurs.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3583,7 +3761,7 @@
 "Pilote Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3594,7 +3772,7 @@
 "Microcode : %s\n"
 "Version de microcode : %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3602,7 +3780,100 @@
 "Pilote générique LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Configuration"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Verrouillage de valeur de flash"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr "Vitesse d'obturation"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Qualité"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Qualité vidéo"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Film"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Mode de mise au point automatique"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "Taille de la vue en temps réél"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Nom du périphérique familier"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Éclairage d'assistance de mise au point automatique"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Éclairage d'assistance de mise au point automatique"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Identifiant de l'objectif"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Mode de compatibilité"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Totalement manuel"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Menu CSM"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3617,7 +3888,7 @@
 "Appareil Mars MR97310.\n"
 "%i images y sont contenues.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3643,7 +3914,7 @@
 "Pour obtenir plus de précisions, veuillez consulter\n"
 "libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3651,7 +3922,7 @@
 "Bibliothèque d'appareils Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3662,7 +3933,7 @@
 "Révision de matériel :\t%s\n"
 "Révision de microcode :\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3689,61 +3960,63 @@
 "Identifiant de carte :\t\t%15$d\n"
 "Mode de flash :\t\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Distant"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Local"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Oui"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Non"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatique\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Flash forcé\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Flash interdit\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valeur incorrecte (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3760,74 +4033,74 @@
 "Chargement du flash :\t\t%s\n"
 "État de l'objectif :\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Non pleine"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Pleine"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Occupé"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Libre"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "En cours de chargement"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Prêt"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "La direction de l'objectif ne correspond pas à la lumière du flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objectif non connecté\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Valeur incorrecte pour l'état %d de l'objectif\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "État de la carte :\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Protection en écriture"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Carte non convenable"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Valeur incorrecte pour l'état %d de la carte"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3840,63 +4113,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Remerciements à Minolta pour les spécifications ."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Flash : automatique (dispositif anti yeux rouges)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Flash : automatique"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Flash : actif (dispositif anti yeux rouges)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Flash : actif"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Flash : désactivé"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Flash : non défini"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Résumé pour Mustek MDC800 :\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
-msgstr "Pas de signalement d'état."
+msgstr "pas de signalement d'état."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Carte CompactFlash détectée\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Carte CompactFlash non détectée\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Mode actuel : prise de vues\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Mode actuel : lecture\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Batteries opérationnelles."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Batteries faibles."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3908,25 +4181,25 @@
 "Porté pour gPhoto2 par Marcus Meissner <marcus@jet.franken.de>\n"
 "Prise en charge des protocoles série et USB."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
-msgstr "Bibliothèque coolshot v"
+msgstr "bibliothèque coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Déconnexion de l'appareil."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Téléchargement de l'image %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Envoi de l'image : %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3935,17 +4208,17 @@
 "La taille du fichier est de %ld octets. La taille du fichier envoyé ne peut "
 "pas dépasser %i octets."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Envoi…"
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Suppression de l'image %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3961,12 +4234,12 @@
 "Fredrik Roubert <roubert@df.lth.se> et\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Téléchargement de %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3982,12 +4255,12 @@
 "Fredrik Roubert <roubert@df.lth.se> et\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Téléchargement de « %s »…"
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -4008,7 +4281,7 @@
 "(320×240) ou FINE (640×480). Le capteur CCD derrière l'objectif ne possède "
 "que 300 000 pixels, et ne produit donc que des images de basse qualité."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -4025,7 +4298,7 @@
 "l'appareil n'est pas correctement arrêté à des vitesses supérieures à "
 "9600 bauds."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -4033,7 +4306,7 @@
 "Pilote de mini caméscope Panasonic PV-L859-K ou PV-L779-K\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -4044,7 +4317,7 @@
 " L'espace mémoire libre est de %8d octets.\n"
 " Nombre de fichiers : %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4058,11 +4331,11 @@
 "et : Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Téléchargement de fichier…"
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4070,35 +4343,138 @@
 "Creative PC-CAM600\n"
 "Auteur : Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init : plus de %d blocs attendus, %d reçus"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 "pccam600_get_file : indice %d, alors qu'un indice supérieur à %d était "
 "attendu"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close : la valeur de retour est %d au lieu de %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init : %d blocs attendus, %d reçus"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init : erreur inattendue : gp_port_read a renvoyé %d au lieu de %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Modèle : "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Commande inconnue"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Taille d'image"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Qualité d'image"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Ouverture maximale à la distance focale minimale"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Ouverture minimale à la distance focale maximale"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Mode de prise de vue"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "N/B"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Modèle inconnu"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4113,12 +4489,12 @@
 "Les tests du Polaroid 640SE ont été effectués par Michael Golden "
 "<naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modèle : %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4133,119 +4509,107 @@
 "sourceforge.net>. Corrections de bogues par Marcus Meissner <marcus@jet."
 "franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Qualité d'image"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Taille d'image"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Réglage du flash"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Autoextinction (en minute)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Renseignements"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normale"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "très fine"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "automatique"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "activé"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "désactivé"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "lecture"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "enregistrement"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menu"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "batterie"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "secteur"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Réception d'en-tête inattendu (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Réception d'une réponse inattendue"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Erreur de somme de contrôle"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "L'appareil a refusé la commande."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "L'appareil a envoyé plus d'octets que prévu (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
 "picture %i back"
 msgstr ""
 "Demande de renseignements sur l'image %i (= 0x%x), mais renseignements sur "
-"l'image %i reçus."
+"l'image %i reçus"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4254,7 +4618,7 @@
 "%i octets reçus d'une image de format inconnu. Veuillez écrire à %s pour "
 "demander de l'aide."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4264,19 +4628,20 @@
 "par Ryan Lantzer <rlantzer@umr.edu> pour gPhoto 4.x. Adapté pour gPhoto2 par "
 "Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Appareil"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Combien de temps avant l'arrêt de l'appareil ?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Image"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4309,3489 +4674,5413 @@
 "Extinction automatique : %18$i minutes\n"
 "Source d'énergie : %19$s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Le type de port demandé (%i) n'est pas géré par ce pilote."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "État de la carte :\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Modèle : %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Vitesse d'obturation"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Mode de mise au point"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Modèle : %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom : 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Température 1"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Température 1"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Température 1"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Mode de flash"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Appuyez sur 1"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Relâchement"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Mode d’acquisition de cliché"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Verrouillage d'exposition automatique"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Mise au point automatique verrouillée"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Mise au point automatique verrouillée"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientation"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Réglages de l'image"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK n’a pas quitté le mode d’enregistrement."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Cet appareil Canon ne prend pas en charge Canon Capture"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Valeur %04x inconnue"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Valeur %04d inconnue"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "type de données %i inattendu"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "La valeur de cible n’est pas dans l’énumération."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr "Maintenant valeur n’est pas dans l’énumération."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 "Sony n’a pas été capable de sélectionner la nouvelle valeur, est-elle "
 "valide ?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatique"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Automatique en une pression"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Tungstène"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Nuageux"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Ombre"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Température de couleur"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Préconfiguré"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Lumière naturelle automatique"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Lampe fluorescente 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Lampe fluorescente 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Lampe fluorescente 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Lampe fluorescente 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Lampe fluorescente 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Choix de température de couleur"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Préconfiguration personnalisée 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Préconfiguration personnalisée 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Préconfiguration personnalisée 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Préconfiguration personnalisée 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Préconfiguration personnalisée 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluorescent : blanc chaud"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluorescent : blanc froid"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Fluorescent : blanc jour"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluorescent : lumière du jour"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Préconfiguré 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Préconfiguré 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Préconfiguré 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Sous-marin : auto"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Tungstène 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Fluorescent : blanc"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Fluorescent : Tungstène"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Préconfiguré 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG fin"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG normal"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "Brut et JPEG fin"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "Brut et JPEG normal"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Grand JPEG+RAW fin"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Grand JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Moyen JPEG+RAW normal"
+
+# Taille/qualité
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Petit JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Une seule prise"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Continu à vitesse lente"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Continu à vitesse rapide"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Retardateur"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Miroir relevé"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr "PROVIA / Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Noir et blanc"
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr "Noir et blanc + Filtre Ye"
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr "Noir et blanc + Filtre R"
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr "Noir et blanc + Filtre G"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr "ACROS"
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr "ACROS + Filtre Ye"
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr "ACROS + Filtre R,"
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr "ACROS + Filtre G"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "indéfinie"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
-msgstr "économique "
+msgstr "économie"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "aucune perte de qualité"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Verrou"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Portrait de nuit"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sports"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Paysage"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Gros plan"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Flash désactivé"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Creative"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Scène de nuit"
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Contrôle élevé"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Alimentation"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr "Mise au point logiciel"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr "Effet Yeux de poisson"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Effet miniature"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "standard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "Mode grande gamme dynamique (HDR)"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr "Autoportrait"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr "Lissage de grande gamme dynamique"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Standard (désactivé en exposition manuelle)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Bas (désactivé en exposition manuelle)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Off (désactivé en exposition manuelle)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Haut (désactivé en exposition manuelle)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
-msgstr "Supprimer l'effet yeux rouges"
+msgstr "supprimer les yeux rouges"
 
 # Le fill-in permet d'équilibrer la lumière du flash et la lumière ambiante.
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "équilibrer"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "automatique et suppression de l'effet yeux rouges"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "activé et suppression de l'effet yeux rouges"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Commande"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Stroboscopique"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Ouverture automatique du diaphragme"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Totalement manuel"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Mode d’application"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Large"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Petite"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (fixe)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (sélection)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Pondérée centrale"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Évaluative"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Partielle"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Moyenne pondérée centrale"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Point de mesure associé au cadre de mise au point automatique"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Plusieurs points"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Fidèle"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monochrome"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Détails fins"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Défini par d'utilisateur 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Défini par d'utilisateur 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Défini par d'utilisateur 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Mise au point manuelle seulement au centre"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Mise au point automatique seulement au centre"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Mise au point manuelle sur plusieurs points (non indiqués)"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Mise au point automatique sur plusieurs points"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Plusieurs points de mise au point (à droite)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Plusieurs points de mise au point (au centre)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Plusieurs points de mise au point (à gauche)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Large"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Moyenne 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Moyenne 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Moyenne 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Petite"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 secondes"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 secondes"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT et PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Réglage 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Réglage 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Réglage 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Réglage 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "MOBILE"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT et MOBILE"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC et MOBILE"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT et MOBILE"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "MOBILE2"
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT et MOBILE2"
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC et MOBILE2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT et MOBILE2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+#, fuzzy
+msgid "LiveMulti"
+msgstr "Plusieurs"
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Mise au point automatique sur un point"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Carte"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Sortie vidéo"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Inconnue %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Paramètres d'usine"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Automatique ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRAW"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "JPEG plus petit"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "JPEG très petit"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW et grand JPEG fin"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW et grand JPEG fin"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRAW et grand JPEG fin"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW et moyen JPEG fin"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW et moyen JPEG fin"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRAW et moyen JPEG fin"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRAW et petit JPEG fin"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW et grand JPEG normal"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW et grand JPEG normal"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRAW et grand JPEG normal"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW et moyen JPEG normal"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW et moyen JPEG normal"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRAW et moyen JPEG normal"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW et petit JPEG normal"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW et petit JPEG normal"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRAW et petit JPEG normal"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "Brut et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "cRAW et petit JPEG fin"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "Brut et petit JPEG fin"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW et grand JPEG fin"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW et grand JPEG fin"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+# Taille/qualité
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Petit JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Moyenne 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Moyenne 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Grand JPEG+RAW fin"
+
+# Taille/qualité
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Petit JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Moyenne 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Moyenne 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Grand JPEG+RAW fin"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Grand JPEG+RAW fin"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Moyenne 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Moyenne 2"
+
+# Taille/qualité
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Petit JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Grand JPEG+RAW fin"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Moyenne 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Moyenne 2"
+
+# Taille/qualité
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Petit JPEG+RAW normal"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Continu"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr "Vidéo"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr "Unique : prise de vue silencieuse"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Chronomètre continu"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Retardateur de 10 secondes"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Retardateur de 2 secondes"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr "Prise de vue continue à haute vitesse"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Un seul silencieux"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Continu silencieux"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Automatique ISO"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Prise de vue silencieuse continue HS"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Réduction du bruit multi-image ISO automatique"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Prise de vue silencieuse continue LS"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "Réduction du bruit multi-image %d"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Pour faire fonctionner l'acquisition en pose longue, assurez-vous que le "
+"mode de connexion est commuté sur « M » et d'avoir réglé le « temps de "
+"pose » sur « pose longue »."
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr "Prise de vue"
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr "Bulb active"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr "Bulb inactive"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr "AF"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Capture Fuji n'a pas pu déclencher : problème de mise au point?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 points (3D)"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Réduction du bruit multi-image"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Réduction du bruit multi-image ISO automatique"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Temps"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4f s"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Creative"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Action"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Paysage de nuit"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Enfants"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatique (flash désactivé)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Automatique intelligent"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Automatique supérieur"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "Film"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Film"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
 msgstr "Film"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Son du film"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Taille de l'écran de film"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Téléobjectif continu, priorité à l’exposition automatique"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Panorama glissé"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Automatique intelligent sans flash"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Sports et action"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Coucher de soleil"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Scène de nuit"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Crépuscule sans trépied"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Effet d’image"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr "S&Q"
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Paysage de nuit"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Fête ou intérieur"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Plage ou neige"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Crépuscule ou aube"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Portrait d'animal"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Lumière de bougie"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Fleurissement"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Couleurs d'automne"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Alimentation"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Enfant"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Gros plan"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-# NOTE: s/ou/uo/
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Fluorescent"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Eau"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr "1/3 EV"
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr "1/2 EV"
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr "2/3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Très élevé"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr "2 images (normal et dessous)"
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr "2 images (normal et dessus)"
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr "3 images (normal et 2 dessous)"
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr "3 images (normal et 2 dessus)"
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr "3 images (normal, dessous et dessus)"
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr "5 images (normal, 2 dessous et 2 dessus)"
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr "7 images (normal, 3 dessous et 3 dessus)"
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr "9 images (normal, 4 dessous et 4 dessus)"
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr "0 image"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr "2 prises (Off -> Configuration utilisateur)"
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr "3 prises (Off -> Basse -> Configuration utilisateur)"
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr "4 prises (Off -> Basse -> Normal -> Haute)"
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr "5 prises (Off -> Basse -> Normal -> Haute -> Très haute)"
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scène"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effets"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Rétroéclairage"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Lissage de grande gamme dynamique"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Effet maquette"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Couleurs sélectives"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Un seul coup"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Rafale"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Intervallomètre"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Continu à vitesse lente"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Retardateur"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Miroir relevé"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Télécommande à réponse rapide"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Télécommande à retardateur"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Relâchement silencieux"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Relâchement silencieux continu"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Retardateur 2 s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr "Retardateur 5 s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Retardateur 10 s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Retardateur 10 s / 3 images"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Retardateur 10 s / 5 images"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Retardateur 5 s / 3 images"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Retardateur 5 s / 5 images"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Retardateur 2 s / 3 images"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Retardateur 2 s / 5 images"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr "Continu à vitesse rapide"
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr "Continu à vitesse moyenne"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 0,3 / 3 images"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 0,3 / 5 images"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Paliers du bracketing C 0,3 / 9 images"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 0,5 / 3 images"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 0,5 / 5 images"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Paliers du bracketing C 0,5 / 9 images"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 0,7 / 3 images"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 0,7 / 5 images"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Paliers du bracketing C 0,7 / 9 images"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 1,0 / 3 images"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 1,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Paliers du bracketing C 1,0 / 9 images"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 2,0 / 3 images"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 2,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing C 3,0 / 3 images"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing C 3,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 0,3 / 3 images"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 0,3 / 5 images"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Paliers du bracketing S 0,3 / 9 images"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 0,5 / 3 images"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 0,5 / 5 images"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Paliers du bracketing S 0,5 / 9 images"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 0,7 / 3 images"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 0,7 / 5 images"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Paliers du bracketing S 0,7 / 9 images"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 1,0 / 3 images"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 1,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Paliers du bracketing S 1,0 / 9 images"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 2,0 / 3 images"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 2,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Paliers du bracketing S 3,0 / 9 images"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Paliers du bracketing S 3,0 / 5 images"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Balance des blancs du bracketing basse"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr ""
 "Bracketing avec de faibles variations du réglage de l'optimiseur de plage "
-"dynamique."
+"dynamique"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Balance des blancs du bracketing haute"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr ""
 "Bracketing des variations importantes du réglage de l'optimiseur de plage "
-"dynamique."
+"dynamique"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Point central"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Plusieurs points"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Une seule zone"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Sujet le plus proche"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Groupe dynamique"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Mise au point automatique sur une seule zone"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Mise au point automatique sur une zone dynamique"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "Mise au point automatique sur un groupe dynamique"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 "Mise au point automatique sur une zone dynamique avec priorité à l'objet le "
 "plus proche"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Zone dynamique (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Zone dynamique (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Zone dynamique (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "Suivi en 3D"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "Mise au point automatique sur une zone dynamique (25 points)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "Mise au point automatique avec un seul point"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "Mise au point automatique sur zone auto"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "Suivi en 3D"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "Mise au point automatique sur une zone dynamique (72 points)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "Mise au point automatique sur une zone dynamique (153 points)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "Mise au point automatique sur un zone groupe"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "Mise au point automatique sur une zone dynamique (9 points)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "Mise au point automatique sur un point de visée"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "Mise au point automatique sur zone large (S)"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "Mise au point automatique sur zone large (L)"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Mise au point automatique sur zone large (S)"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Mise au point automatique sur zone large (S)"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRVB (portrait)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRVB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRVB (nature)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRVB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Valeur inconnu (0x%04x)"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centre"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Haut"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Bas"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Gauche"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Droite"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Large"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "Centre"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Programme flexible"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Programme flexible"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Programme flexible"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Pondérée centré"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Plusieurs points"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Point central"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Cliché+Éclairages"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Point+Ombres"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr "Plusieurs"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr "Moy. de l'écran entier"
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr "Point standard"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr "Point large"
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr "Éclairages"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Flash automatique"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Flash en appoint"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Dispositif anti yeux rouges automatique"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Dispositif anti yeux rouges en appoint"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Synchronisation externe"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Synchronisation automatique lente"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Synchronisation au deuxième rideau et synchronisation lente"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Dispositif anti yeux rouges et synchronisation lente"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Synchronisation au premier rideau"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Dispositif anti yeux rouges"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Dispositif anti yeux rouges avec synchronisation lente"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Synchronisation au deuxième rideau avec synchronisation lente"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Synchronisation au deuxième rideau"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Synchronisation au deuxième rideau"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Synchronisation sans fil"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Noir et blanc"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Vision nocturne"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Esquisse en couleur"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Effet miniature"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Couleurs sélectives"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Silhouette"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Touche haut"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Touche bas"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "Infini"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "infini"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Composite"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "pose longue"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Synchronisation lente"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "Mise au point automatique en priorité sur le visage"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Mise au point automatique sur zone large"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Mise au point automatique sur zone normale"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "Mise au point automatique avec suivi d'objet"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr "Point-zone AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr "Affichage entier"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25 %"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50 %"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100 %"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200 %"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Mise au point automatique avec un seul servo"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr "Continous-servo AF"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Mise au point automatique avec servo à plein temps"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
-msgstr "Mise au point manuelle"
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr "Mise au point manuelle (fixe)"
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
+msgstr "Mise au point manuelle (sélection)"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Verrouillage d’exposition ou mise au point automatiques"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Verrouillage d’exposition automatique seulement"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Verrouillage de mise au point automatique seulement"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Verrouillage de mise au point automatique en attente"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "Mise au point automatique activée"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Verrouillage de niveau de flash"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 secondes"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minute"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 secondes"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 mm"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "pose longue"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30 s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25 s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20 s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15 s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13 s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10 s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8 s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6 s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5 s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4 s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3 s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2,5 s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2 s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1,6 s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1,3 s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1 s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1,3 s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1,6 s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2 s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2,5 s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3 s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4 s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5 s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6 s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8 s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10 s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13 s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15 s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20 s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25 s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30 s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40 s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50 s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60 s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80 s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100 s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125 s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160 s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200 s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250 s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320 s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400 s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500 s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640 s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800 s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000 s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250 s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600 s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000 s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500 s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200 s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000 s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000 s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400 s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000 s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Plus nette"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Plus Doux"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Directement pour l'impression"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Moyenne basse"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Moyenne élevée"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Faible contraste"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Moyenne élevée"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Contrôle élevé"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zone de mise au point (gros plan)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Zone de mise au point (très proche)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zone de mise au point (proche)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zone de mise au point (moyen)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zone de mise au point (loin)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zone de mise au point (réservé 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zone de mise au point (réservé 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Zone de mise au point (réservé 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zone de mise au point (réservé 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Macro automatique"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Mise au point automatique avec un seul servo"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Mise au point automatique avec servo en continu"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Un coup"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "AI Servo"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "AI Focus"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 secondes"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 secondes"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Attente"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Fluorescent élevé"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
-msgstr "Balance des blancs, réglage nº 1 "
+msgstr "Balance des blancs, réglage nº 1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
-msgstr "Balance des blancs, réglage nº 2 "
+msgstr "Balance des blancs, réglage nº 2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
-msgstr "Balance des blancs, réglage nº 3 "
+msgstr "Balance des blancs, réglage nº 3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Nombre manquant"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Ombre"
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
-msgstr "Personnalisé WB 2"
-
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
-msgstr "Personnalisé WB 3"
-
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
-msgstr "Personnalisé WB 4"
-
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
-msgstr "Personnalisé WB 5"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr "Balance des blancs : réglage nº 1"
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
+msgstr "Balance des blancs : réglage nº 2"
+
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
+msgstr "Balance des blancs : réglage nº 3"
+
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
+msgstr "Manuel 3"
+
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
+msgstr "Manuel 4"
+
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr "Manuel 5"
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr "Balance des blancs : réglage nº 4"
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr "Balance des blancs : réglage nº 5"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "AWB blanc"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Netteté faible"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Noir et blanc"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr "Bracketing d'exposition automatique"
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr "Bracketing ISO"
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr "Bracketing Balance des blancs"
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr "Bracketing FE"
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr "Bracket désactivé"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr "auto implicite"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "Exposition automatique et flash"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "Exposition automatique uniquement"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Flash uniquement"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Balance des blancs du bracketing"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "D-Lighting actif (ADL) du bracketing"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Démarrage"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Arrêt"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Démarrage et arrêt"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Réponse rapide"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Miroir relevé par la télécommande"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Mode d’application 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Mode d’application 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Modéré"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Renforcé"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > au-dessous"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Au-dessous > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Sensibilité automatique"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Sensibilité élevée"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Sensibilité moyenne"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Sensibilité basse"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Microphone désactivé"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Haut 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Haut 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Flash/vitesse"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Flash/vitesse/ouverture"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Flash/ouverture"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG de base"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF et fin"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (brut)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF et de base"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF et normal"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RVB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "JPEG de base*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "JPEG normal*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "JPEG fin*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF et de base*"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF et normal*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF et fin*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Très fin"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "Brut et JPEG (Std)"
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr "Brut et JPEG (Std)"
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr "Brut et JPEG (Fin)"
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr "Brut et JPEG (Extrafin)"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF et fin"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "Brut et JPEG (Extrafin)"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "Brut et JPEG (Std)"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "Brut et JPEG (Std)"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "Brut et JPEG (Fin)"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "Brut et JPEG (Extrafin)"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
+#, fuzzy
 msgid "RAW+JPEG"
-msgstr "Brut et JPEG"
+msgstr "Brut et JPEG (Std)"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fine"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
 #, fuzzy
+msgid "RAW & JPEG"
+msgstr "Brut et JPEG (Std)"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG fin"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "Brut 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
-msgstr "Plusieurs points"
+msgstr "Plusieurs clichés"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 secondes"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 secondes"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 secondes"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Aucune perte de qualité"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Perte de qualité"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Touche haut"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Priorité de taille"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Qualité optimale"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250 s (synchronisation ultrarapide automatique)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320 s (synchronisation ultrarapide automatique)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Relâchement"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Relâchement et mise au point"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 points"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 points"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 points"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 points (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (long)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (normal)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (court)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Temps de pose ou mise au point automatique activés"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "Mise au point automatique activée"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Verrouillage d’exposition ou mise au point automatiques"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Verrouillage d’exposition automatique seulement"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 "Verrouillage d’exposition automatique (réinitialisation au relâchement)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Verrouillage d’exposition automatique (en attente)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Verrouillage de mise au point automatique seulement"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Non assigné"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "Verrouillage de valeur de flash"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "Verrouillage d’exposition automatique (en attente)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Bracketing en rafale"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Mesure en matrice"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Mesure pondérée centrale"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Mesure de position"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Lecture"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Accéder aux éléments principaux dans MON MENU"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (brut)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Grille de cadrage"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "D-Lighting actif"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "Un pas de vitesse/ouverture"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Choisir un numéro d’objectif (non CPU)"
 
 # NOTE: s/t$//
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Horizon virtuel de viewfinder"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Démarrer l’enregistrement de film"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Activé (affichage d’image exclue)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50 %"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
+msgstr "Détection des visages"
+
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr "Détection de la figure et des pupilles"
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr "Détection d'animal"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100 %"
-
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75 %"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25 %"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Valeur inconnue"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 "La modification de zone de mise au point automatique de Nikon ne fonctionne "
 "qu’en mode de visée par l’écran."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "La fonction de mise au point automatique Nikon n’a pas fonctionné."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 "La mise au point manuelle de Nikon ne fonctionne qu’en mode de visée par "
 "l’écran."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Mise au point manuelle de Nikon à la limite."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Pas de mise au point manuelle de Nikon trop petit."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Appuyez à moitié"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Appuyez complètement"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Relâchez à moitié"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Relâchez complètement"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Immédiat"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Appuyez sur 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Appuyez sur 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Appuyez sur 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Relâchez 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Relâchez 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Relâchez 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Proche 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Proche 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Proche 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Loin 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Loin 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Loin 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Proche %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Loin %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr "La visée par écran ne peut pas démarrer : batterie vide"
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr "La visée par écran ne peut pas démarrer : température trop élevée"
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr "La visée par écran ne peut pas démarrer : erreur TTL"
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+"La visée par écran ne peut pas démarrer : miroir en cours de relèvement"
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr "La visée par écran ne peut pas démarrer : lentille rétractée"
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr "La visée par écran ne peut pas démarrer : ouverture miniamle"
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr "La visée par écran ne peut pas démarrer : prise de vue en cours"
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr "La visée par écran ne peut pas démarrer : erreur de séquence"
+
+#: camlibs/ptp2/config.c:8311
+#, fuzzy
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr "La visée par écran ne peut pas démarrer : température trop élevée"
+
+#: camlibs/ptp2/config.c:8312
+#, fuzzy
+msgid "Liveview cannot start: Bulb warning"
+msgstr "La visée par écran ne peut pas démarrer : ouverture miniamle"
+
+#: camlibs/ptp2/config.c:8313
+#, fuzzy
+msgid "Liveview cannot start: Card unformatted"
+msgstr "La visée par écran ne peut pas démarrer : batterie vide"
+
+#: camlibs/ptp2/config.c:8314
+#, fuzzy
+msgid "Liveview cannot start: Card error"
+msgstr "La visée par écran ne peut pas démarrer : erreur TTL"
+
+#: camlibs/ptp2/config.c:8315
+#, fuzzy
+msgid "Liveview cannot start: Card protected"
+msgstr "Impossible de démarrer le film : carte protégée."
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+#, fuzzy
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr "La visée par écran ne peut pas démarrer : lentille rétractée"
+
+#: camlibs/ptp2/config.c:8319
+#, fuzzy
+msgid "Liveview cannot start: Fully pressed button"
+msgstr "La visée par écran ne peut pas démarrer : lentille rétractée"
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr "La visée par écran ne peut pas démarrer : code 0x%08x"
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Impossible d'activer le mode de visée par l’écran de Nikon"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+#, fuzzy
+msgid "Movie prohibit conditions: "
+msgstr "Condition interdite en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr "Pas en mode application"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+#, fuzzy
+msgid "Set liveview selector is enabled"
+msgstr "Impossible de démarrer le film : la visée sur écran est activée."
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Impossible d'activer le mode de visée par l’écran de Nikon"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr "Carte protégée"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr "Enregistrement vidéo déjà en cours"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+#, fuzzy
+msgid "Images / movies not yet record in buffer"
 msgstr ""
-"Pour faire fonctionner l'acquisition en pose longue, assurez-vous que le "
-"mode de connexion est commuté sur « M » et d'avoir réglé le « temps de "
-"pose » sur « pose longue »."
+"Impossible de démarrer le film : images / films en cours de mis en cache."
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr "Carte pleine"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr "Carte non formatée"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr "Erreur de carte"
+
+#: camlibs/ptp2/config.c:8569
+#, fuzzy
+msgid "No movie prohibit conditions"
+msgstr "Condition interdite en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:8587
+#, fuzzy
+msgid "Live View prohibit conditions: "
+msgstr "Condition interdite en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr "Séquence d'erreurr"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "La visée par écran ne peut pas démarrer : ouverture miniamle"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr "Batteries vides"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr "Erreur TTL"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+#, fuzzy
+msgid "Processing of shooting operation"
+msgstr "La visée par écran ne peut pas démarrer : prise de vue en cours"
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr "Température trop haute"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr "Carte non formatée"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+#, fuzzy
+msgid "In Mirror-up operation"
+msgstr ""
+"La visée par écran ne peut pas démarrer : miroir en cours de relèvement"
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr "Objectif rétracté"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Le mode du programme d’exposition n'est pas P/A/S/M"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, fuzzy, c-format
+msgid "Movie recording cannot start: %s."
+msgstr "Impossible de démarrer le film : pas de carte."
+
+#: camlibs/ptp2/config.c:8670
+#, fuzzy
+msgid "Camera is not in application mode"
+msgstr "Pas en mode application"
+
+#: camlibs/ptp2/config.c:8680
+#, fuzzy, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr "Impossible de démarrer le film : code 0x%08x"
+
+# NOTE: s/ou/uo/
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Fluorescent"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "mise à l'heure"
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr "Noir et blanc"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Température 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Température 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Température 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Température 4"
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr "Automatique Cool"
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr "Chaleur automatique"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Inconnu 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Loin 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Loin 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Proche 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Proche 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Enregistrement"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Lecture"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Autres réglages"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Réduction du bruit pour grande ISO"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Ne pas afficher le menu TV"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+"\n"
+"Flux :"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "large"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Taille de miniature inconnue '%s'."
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Mémoire interne"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Carte mémoire"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Affichage"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Date de création : %s, dernière date d'utilisation : %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Supprimer"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64 bits"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128 bits"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Pris en charge"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Nom du profil"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "ESSID du Wi-Fi"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "Adresse IP (vide pour DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Masque du réseau"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Passerelle par défaut"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Mode d’accès"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Canal Wi-Fi"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Clef de chiffrement (en hexadécimal)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Écriture"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Liste des profils Wi-Fi"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Créer un profil Wi-Fi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+"Synchroniser la date et l'heure de l'appareil avec celles de l'ordinateur"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Mise au point automatique"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Mise au point manuelle"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Éteindre"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Verrouillage de mise au point"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Mode pose longue"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Verrouillage d’interface utilisateur"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Popup flash"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 "Fonction de mise au point automatique d'appareil reflex numérique Nikon"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 "Fonction de mise au point automatique d'appareil reflex numérique Canon"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr ""
+"Fonction de mise au point automatique d'appareil reflex numérique Nikon"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Fonction de mise au point manuelle d'appareil reflex numérique Nikon"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Définition de zone de mise au point automatique Nikon"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Définition du mode de contrôle Nikon"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Fonction de mise au point manuelle d'appareil reflex numérique Canon"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 "Annulation de mise au point automatique d'appareil reflex numérique Canon"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Fonction de mise au point manuelle d'appareil reflex Drive Olympus OMD"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Fonction de mise au point manuelle d'appareil Panasonic"
+
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr ""
+"Fonction de mise au point automatique d'appareil reflex numérique Nikon"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Position initiale de l'EZoom"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Zoom de Canon EOS"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Position du zoom de Canon EOS"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Viewfinder de Canon EOS"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Viewfinder de Panasonic"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Viewfinder de Nikon"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Télécommande de déblocage du Canon EOS"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "Script CHDK"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Acquisition de film"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Son du film"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Informations de mise au point"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Informations de mise au point"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Informations de mise au point"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Luminosité de l'endroit de mise au point"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "PTP Opcode"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Numéro de série"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Fabricant de l'appareil"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Version du périphérique"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Extension du fabricant"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Version de PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Version de DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Alimentation sur secteur"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Flash externe"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Niveau de batterie"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr "État du miroir relevé"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Miroir relevé"
+
+#: camlibs/ptp2/config.c:10742
+#, fuzzy
+msgid "Mirror Lock Status"
+msgstr "État du miroir relevé"
+
+#: camlibs/ptp2/config.c:10743
+#, fuzzy
+msgid "Mirror Down Status"
+msgstr "État du miroir relevé"
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr "Compteur de prise de vue avec miroir relevé"
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr "Nombre de prise de vue continue"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Orientation de la l'appareil"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Flash activé"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr "Dossier actif"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Flash chargé"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Nom d'objectif"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Décompte du temps de pose"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Prises de vue disponibles"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Distance focale minimale"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Distance focale maximale"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Ouverture maximale à distance focale minimale"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Ouverture minimale à distance focale maximale"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Lumière faible"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Posemètre"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Mise au point automatique verrouillée"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "Exposition automatique verrouillée"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "Valeur de flash verrouillée"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Voix du film"
+
+#: camlibs/ptp2/config.c:10771
+#, fuzzy
+msgid "Movie Prohibit Condition"
+msgstr "Condition interdite en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:10772
+#, fuzzy
+msgid "Liveview Prohibit Condition"
+msgstr "Condition interdite en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Date et heure de l'appareil"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Mode Sonore"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Commentaire de l'image"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "GUID du WLAN"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Permettre les commentaires d'image"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Temps d'extinction de l'écran LCD"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Support d'enregistrement"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Temps d'affichage rapide"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Menu CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Inverser les boutons de commande"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Type de sortie de l'appareil"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Destination d'enregistrement"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Mode EVF"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artiste"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Numéro CCD"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Nettoyer le capteur"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Dispositif anti scintillement"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Fonctions Ex personnalisées"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Informations de mise au point"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Zone de mise au point"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr "Etat de chargement du flash"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Un coup"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Autoextinction"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Profondeur de champ"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menus et lecture"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr "Contrôle de l'enregistrement externe"
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr "Action de l'appareil photographique"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Priorité de taille"
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr "Taille de vignette"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Système de fichiers rapide"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Cible d'acquisition"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Mise au point automatique"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Mode télécommande"
+
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr "Mode évènement"
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Format d'image SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Format d'image CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Format d'image disque dur externe"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr "Simulation de film"
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr "Taille d'image brute"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Vitesse ISO de la vidéo"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO automatique"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Balance des blancs ajustement A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Balance des blancs ajustement B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Balance des blancs X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Balance des blancs X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Effet photographie"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Mode de couleur"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Espace de couleur"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Format vidéo"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Résolution vidéo"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Taux d’échantillonage vidéo"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Contraste vidéo"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Luminosité vidéo"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Format audio"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Débit audio"
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr "Taux d’échantillonnage audio"
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr "Nombre de bits par échantillon audio"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Volume sonore"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Réduction du bruit pour l'exposition longue"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Mode de mise au point automatique 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Vitesse de zoom"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Éclairage d'assistance"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Attribut de rotation"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Correction d'exposition"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Température de couleur"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Mode de mise au point automatique"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Ajustement de le nuance"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Démarrer l’enregistrement de film"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Correction du flash"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "Correction d'exposition AEB"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Mode de flash Nikon"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Mode de commande du flash"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Énergie de commande du flash"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Canal de commande du flash"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Mode automatique de commande du flash"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Correction de commande automatique du flash"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Valeur automatique de commande du flash"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Mode A de commande du flash"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Correction A de commande du flash"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Valeur A de commande du flash"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Mode B de commande du flash"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Correction B de commande du flash"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Valeur B de commande du flash"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "Éclairage de la zone de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "Mode sonore de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Valeur d'ouverture du diaphragme"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr "Taille de la vue en temps réél"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Valeur d'ouverture du diaphragme"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Programme flexible"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Qualité"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Taille d'image brute"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Format d'image"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Longueur de mise au point"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Distance focale"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Mode de mise au point 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Mise au point automatique en continu"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Mode effet"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Programme d'exposition"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Mode de l'appareil"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Mode scène"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Format d’image"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "Mode de mise au point automatique"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Résumé du dispositifs de stockage :\n"
+msgstr "Périphérique de stockage"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Réduction du bruit pour grande ISO"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "Mode grande gamme dynamique (HDR)"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "Grande gamme dynamique (HDR)"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "Lissage de grande gamme dynamique (HDR)"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Mode d’acquisition de cliché"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Mode de prise de vue Canon"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Mode d’exposition automatique Canon"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Mode d’exposition automatique Canon"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Mode de commande"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Style de l'image"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Mode de mesure de mise au point"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Mode de mesure de l'exposition"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "Priorité à l'ouverture active"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "Priorité à l'ouverture maximale"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr "Ouverture 2"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Point de mise au point"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Retard d'acquisition"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Temps de pose 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Temps de pose 2 pour vidéo"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Mode de mesure"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Longueur de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Collimateur de zone de mise au point"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Mode de temporisation d'exposition"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Verrouillage d’exposition"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Mode AE-L/AF-L"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Mode de mise au point automatique en mode de visée par l’écran"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Mise au point automatique en mode de visée par l’écran"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr "Aperçu de la visée sur écran"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Rapport du zoom d'image en mode de visée par l’écran"
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr "Vue directe de la balance des blancs"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Taille de la vue en temps réél"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Numéro de fichier séquencé"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Authentifier le flash"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Modélisation du flash"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Grille viewfinder"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Affichage d’image"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Attribut de rotation de l'image"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Débloquer sans la carte CompactFlash"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Énergie du mode manuel du flash"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Zone de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Correction d'exposition par le flash"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Bracketing"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Mode de bracket"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Palier de valeur d'exposition"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Bracket défini"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Ordre de bracket"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr "Palier du bracketing d'exposition automatique"
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr "Palier du bracketing de la balance des blancs"
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr "Motif de bracketing d'exposition automatique"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr "Motif de bracketing de la balance des blancs"
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr "Compteur de bracketing d'exposition automatique"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr "Motif de bracketing D-Lighting actif (ADL)"
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr "Palier du bracketing D-Lighting actif (ADL)"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr "Préconfiguration de la balance des blancs personnalisée 1"
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr "Préconfiguration de la balance des blancs personnalisée 2"
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr "Préconfiguration de la balance des blancs personnalisée 3"
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr "Préconfiguration de la balance des blancs personnalisée 4"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr "Préconfiguration de la balance des blancs personnalisée 5"
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr "Préconfiguration de la balance des blancs personnalisée 6"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Nombre d'images en rafale"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Intervalle de prise de vue en rafale"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
-msgstr "Prise de vue maximum "
+msgstr "Prise de vue maximum"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Balance des blancs automatique"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Balance des blancs tungstène"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Balance des blancs fluorescent"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Balance des blancs ensoleillé"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Balance des blancs flash"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Balance des blancs nuageux"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Balance des blancs ombre"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Balance des blancs ensoleillés naturels"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
-msgstr "Nombre de Balance des blancs pré-configuré"
+msgstr "Balance des blancs pré-configurée #"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
-msgstr "Balance des blancs pré-configuré 0"
+msgstr "Balance des blancs pré-configurée 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
-msgstr "Balance des blancs pré-configuré 1"
+msgstr "Balance des blancs pré-configurée 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
-msgstr "Balance des blancs pré-configuré 2"
+msgstr "Balance des blancs pré-configurée 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
-msgstr "Balance des blancs pré-configuré 3"
+msgstr "Balance des blancs pré-configurée 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
-msgstr "Balance des blancs pré-configuré 4"
+msgstr "Balance des blancs pré-configurée 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Délai du retardateur"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Zone pondérée centrale"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Temps de pose avec flash"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Temporisation"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Mode télécommande"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Mode d’application"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Optimiser l'image"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Netteté"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Correction des tons"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Saturation"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Ajustement de le nuance"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Exposition automatique du bracketing"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Optimisation automatique de la luminosité"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Son du film"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Réglage de film manuel"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Microphone"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Inverser les indicateurs"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Contrôle de distorsion automatique"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr "Correction des vignettes"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Mode vidéo"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Rognage du capteur"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr "Profondeur de données de la sortie HDMI"
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr "Détection des visages"
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Mise au point automatique avec un seul servo"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Temps de mesure expiré"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Assigner une touche de fonction"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Assigner un bouton de prévisualisation"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Qualité du film"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Temps de pose minimal"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Vitesse lente de prise de vue continue"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Résolution du film"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Vitesse lente de prise de vue continue"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Temps de pose minimal"
+
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Qualité du film"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Limite haute d'ISO automatique"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Vitesse de synchronisation du flash"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Mesure de mise au point"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Vitesse rapide de prise de vue continue"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
-msgstr "politique de compression JPEG"
+msgstr "Politique de compression JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
-msgstr "priorité au mode AF-C"
+msgstr "Priorité au mode AF-C"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
-msgstr "priorité au mode AF-S"
+msgstr "Priorité au mode AF-S"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "Activation de la mise au point automatique"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Zone dynamique de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Verrouillage de mise au point automatique activé"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "Zone ponctuelle de mise au point automatique"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "Bouton d'activation de la mise au point automatique"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Réduction du bruit pour grande ISO en vidéo"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Maximum de relâchement continu"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr "longueur de la boucle vidéo"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Compression brute"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Qualité d'image 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Réglages de l'image"
-
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr "Zone de zoom de la visée par l’écran"
+
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Réglages de capture d'image"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Profils Wi-Fi"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Autres propriétés de périphérique PTP"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "Propriété PTP 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "La propriété « %s » sur 0x%04x est actuellement en lecture seule."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "La propriété « %s » sur 0x%04x n'était pas définie (0x%04x : %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "La propriété « %s » sur 0x%04x n'était pas définie (0x%04x : %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 "Échec d'analyse de la valeur de l'élément graphique « %s » sur 0x%04x avec "
 "%d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Propriété « %s » introuvable."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Vous devez indiquer un répertoire commençant par /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7806,199 +10095,220 @@
 "© 2001-2005 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "© 2003-%d par Marcus Meissner <marcus@jet.franken.de>.\n"
 "Ce Pilote permet d'utiliser les appareils compatibles PTP ou PictBridge\n"
-"et les lecteur multimédia utilisant MTP (Media Transfer Protocol)."
+"et les lecteurs multimédia utilisant MTP (Media Transfer Protocol).\n"
+"\n"
+"Amusez-vous bien !"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Cet appareil Nikon n'a pas l'air de renvoyer une image JPEG en mode de visée "
+"par l’écran"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Impossible d'activer Canon viewfinder"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Impossible d'obtenir l'image dans Canon viewfinder"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Cet appareil Canon ne prend pas en charge le mode Canon viewfinder"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Cet appareil Nikon ne prend pas en charge le mode de visée par l’écran"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr ""
-"Cet appareil Nikon n'a pas l'air de renvoyer une image JPEG en mode de visée "
-"par l’écran"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, fuzzy, c-format
+msgid "Liveview cannot start: %s"
+msgstr "La visée par écran ne peut pas démarrer : code 0x%08x"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Impossible de désactiver le mode de visée par l’écran de Nikon"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 "Cet appareil Sony n'a pas l'air de renvoyer une image JPEG en mode de visée "
 "par l’écran"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Cet appareil Panasonic n'a pas l'air de renvoyer une image JPEG en mode de "
+"visée par l’écran"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Cet appareil ne prend pas en charge l'acquisition Nikon"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
-"Impossible d'activer le mode de visée par l’écran sur un Nikon 1, mais c’est "
-"nécessaire pour la capture."
+"Impossible d'activer le mode de visée sur écran sur un Nikon 1, mais c’est "
+"nécessaire pour la capture"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Cet appareil ne prend pas en charge Capture EOS Canon"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Impossible d'obtenir les modifications de Canon EOS"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Cet appareil Canon ne prend pas en charge l'initiation de Canon Capture"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Impossible de désactiver Canon viewfinder"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Échec de Canon Capture"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Capture Fuji n'a pas pu déclencher : problème de mise au point?"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Cet appareil ne prend pas en charge l'acquisition générique"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr "La carte mémoire de l’appareil a été saturée durant la capture."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Échec de la demi-pression EOS Canon"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
-msgstr ""
-"Capture EOS Canon n'a pas pu déclencher : possible problème de mise au point."
+msgstr "Capture EOS Canon n'a pas pu déclencher : problème de mise au point ?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Échec de la demi-relâche EOS Canon"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Échec de la pression complète EOS Canon"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Échec de la relâche complète EOS Canon"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Échec de la pression complète EOS Canon"
+msgstr "Échec de la pression complète EOS M Canon"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr ""
-"Capture EOS Canon n'a pas pu déclencher : possible problème de mise au point."
+msgstr "Capture EOS M Canon n'a pas pu déclencher : problème de mise au point?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Échec de la relâche complète EOS Canon"
+msgstr "Échec de la relâche complète EOS M Canon"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Échec de Capture EOS Canon"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Échec de Capture EOS Canon : %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
-msgstr ""
-"Capture EOS Canon n'a pas pu déclencher : possible problème de miroir relevé."
+msgstr "Capture EOS Canon n'a pas pu déclencher : problème de miroir relevé?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
-"Capture EOS Canon n'a pas pu déclencher : possible manque de mémoire sur la "
-"carte."
+"Capture EOS Canon n'a pas pu déclencher : manque de mémoire sur la carte?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
-msgstr ""
-"Capture EOS Canon n'a pas pu déclencher : carte peut-être en lecture seule."
+msgstr "Capture EOS Canon n'a pas pu déclencher : carte en lecture seule?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Capture EOS Canon n'a pas pu déclencher : erreur %d inconnue, veuillez le "
 "signaler."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "L'initialisation de cet appareil ne fonctionne pas. Veuillez le signaler."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Fabricant : %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Modèle : %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Version : %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Numéro de série : %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Identifiant du fabricant : 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Description du fabricant : %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Version standard de PTP : %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Mode d’opération : 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -8006,20 +10316,32 @@
 "\n"
 "Formats d'acquisition : "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Formats d'affichage : "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+"\n"
+"Flux :"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "Audio"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Propriétés de la prise en charge d'objet MTP :\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " Erreur PTP %04x pour cette requête"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8027,87 +10349,87 @@
 "\n"
 "Capacités de l'appareil :\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tFichier téléchargé, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Fichier supprimé, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Pas de fichier supprimé, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Fichier envoyé\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Pas de fichier envoyé\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tAcquisition d'image générique, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tPas d'image capturée, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Prise de vue ouverte, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Pas de capture possible, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Canon Capture, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Capture Canon EOS, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Capture Canon EOS 2, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Capture 1 Nikon, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "Capture 2 Nikon, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "Capture 3 Nikon, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Capture Sony, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr "Capture Olympus E XML, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Aucune acquisition spécifique au fabricant\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tPrise en charge du Wi-Fi Nikon\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tPrise en charge du Wi-Fi Canon\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8115,93 +10437,93 @@
 "\n"
 "Résumé du dispositifs de stockage :\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tDescription du stockage : %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tNom de volume : %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "ROM intégrée"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "ROM amovible"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "RAM intégrée"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "RAM amovible (carte mémoire)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Inconnu : 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tType de stockage : %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Générique plat"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Générique hiérarchique"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
-msgstr "Disposition de l'appareil numérique (DCIM) "
+msgstr "Disposition de l'appareil numérique (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tType de système de fichiers : %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Lecture et écriture"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Lecture seule"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Lecture seul avec suppression d'objet"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tCapacité d'accès : %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tCapacité maximale : %llu (%lu Mo)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tEspace mémoire libre (en octet) : %llu (%lu Mo)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tEspace mémoire libre (en nombre d'images) : %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8209,48 +10531,48 @@
 "\n"
 "Résumé des propriétés de l'appareil :\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " n'a pas pu être lue.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "impossible d'être demandé.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "lecture seule"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "lecture et écriture"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " erreur %x pour cette requête."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Le fichier « %s/%s » n'existe pas."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Les métadonnée ne sont prises en charge que par les appareils MTP."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Ce périphérique ne permet pas de définir la protection d'objet."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 "Impossible de définir la protection de l'objet à %d sur le périphérique"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8259,7 +10581,7 @@
 "PTP n'est actuellement implémenté que pour les appareils USB et PTP/IP, type "
 "de port %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8267,2237 +10589,2316 @@
 "La prise en charge du XML encapsulé d’Olympus n’est actuellement disponible "
 "qu’avec la prise en charge de libxml2 lors de la construction."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "Erreur PTP non définie"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
-msgstr "PTP fonctionnel"
+msgstr "PTP fonctionnel !"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "Erreur générale PTP"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "Session PTP non ouverte"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "Identifiant de transaction PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "Opération PTP non prise en charge"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "Paramètre PTP non pris en charge"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "Transfert PTP incomplet"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "Identifiant de stockage PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "Identificateur d'objet PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "Propriété de périphérique PTP non prise en charge"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "Code de format d'objet PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "Pas d'espace PTP disponible"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "Objet PTP protégé en écriture"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "Mémoire PTP en lecture seule"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "Accès PTP refusé"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "Pas de vignette PTP présente"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "Échec du test PTP automatique"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "Effacement PTP partiel"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "Espace PTP non disponible"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "Spécification PTP par format non prise en charge"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "Pas de renseignements PTP corrects sur l'objet"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "Format de code PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "Code de fabricant PTP inconnu"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "Acquisition PTP déjà terminée"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "Périphérique PTP occupé"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "Objet PTP père incorrect"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "Format de propriété de périphérique PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "Valeur de propriété de périphérique PTP incorrecte"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "Paramètre PTP incorrect"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "Session PTP déjà ouverte"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "Opération PTP annulée"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Spécification PTP de la destination non prise en charge"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr "Gestionnaire d'Enum invalide"
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr "Aucun flux actif"
+
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr "Jeu de données invalide"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Nom de fichier nécessaire"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Conflit de nom de fichier"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Nom de fichier incorrect"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Erreur matérielle"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Hors de mise au point"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Échec de modification du mode de l'appareil"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "État incorrect"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Définition de propriété non prise en charge"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Erreur de réinitialisation de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Erreur de référence de poussière"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Temps de pose en pose longue"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Séquence avec miroir relevé"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 "Mode de l'appareil sans ajustement de la valeur d'ouverture du diaphragme"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Pas en mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Fin de palier de lecteur Mf"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Palier de lecteur Mf insuffisant"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Annulation du transfert avancé"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr "Pas de mode Full HD disponible"
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr "Error de stockage"
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr "Stockage non formaté"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr "Relâchement en cours de la pose longue"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr "Relâchement en cours du silencieux"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr "Relâchement en cours de la caméra"
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr "Temps de pose"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr "En attente du second relâchement"
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr "Relâchement en cours du miroir"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr "Valeur SBAttribute incorrecte"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Commande inconnue"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Opération refusée"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Présence du cache d'objectif"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Batterie déchargée"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Appareil non prêt"
 
-#: camlibs/ptp2/ptp.c:4708
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr "Cache d'objectif non retiré"
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr "Batterie faible"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr "Objet non prêt"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr "Impossible de fabriquer l'objet"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr "Etat de la mémoire non prêt"
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr "ObjectPropCode invalide"
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr "Format ObjectPropCode invalide"
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr "Valeur ObjectPropCode invalide"
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr "ObjectReference invalide"
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr "Jeu de données invalide"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr "Spécification par groupe non prise en charge"
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr "Spécification par profondeur non prise en charge"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr "Objet trop grand"
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr "ObjectProp non pris en charge"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr "Identifiant de session media invalide"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr "Limite de session média atteinte"
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr "Plus de données"
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr "Syntaxe WFC invalide"
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr "Version de WFC non prise en charge"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "Périphérique PTP occupé"
+msgstr "Périphérique PTP absent"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "Délai d'attente PTP"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "Annuler la demande PTP"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "Réponse PTP attendue"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "Données PTP attendues"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "Erreur d'entrée sortie PTP"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Propriété PTP non définie"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Mode d’opération"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Paramètre de compression"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Balance des blancs"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Augmentation RVB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Temps de pose"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
-msgstr "Mode d’exposition programmé "
+msgstr "Mode du programme d’exposition"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Indice d’exposition (vitesse ISO du film)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Correction d’exposition de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Retard de préacquisition"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Contraste"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Zoom numérique"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Nombre d'image pour l'intervallomètre"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Intervalle de prise de vue pour l'intervallomètre"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL d'envoi"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Droit d'auteur"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Flux pris en charge"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Activer les flux"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Format vidéo"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Résolution vidéo"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Qualité vidéo"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Taux d’échantillonage vidéo"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Contraste vidéo"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Luminosité vidéo"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Format audio"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Débit audio"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Taux d’échantillonnage audio"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Nombre de bits par échantillon audio"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Volume sonore"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Format d'horodatage"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Sortie vidéo"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Économie d'énergie"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Langue de l'interface utilisateur"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Type de batterie"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Mode de batterie"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "Type de verrouillage d'interface utilisateur"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Mode de l'appareil"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Vue complète du format de fichier"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Retardateur automatique"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Mode de prise de vue"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Mode d’image"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Réglage du temps de pose long"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Mode de mise au point automatique"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Stabilisation d'image"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Gain des couleurs"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Sensibilité"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Jeu de paramètres"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Priorité à l'ouverture active"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Priorité à l'ouverture maximale"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Distance focale de type téléobjectif"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Largeur de distance focale"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Dénominateur de distance focale"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Mode de transfert de prise de vue"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Préfixe du nom"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Mode de qualité des tailles d'image"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Taille de vignette prise en charge"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Taille de sortie des données depuis l'appareil"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Taille d'entrée des données vers l'appareil"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Version d'API de la télécommande"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Propriétaire de l'appareil"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Temps UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Identifiant du matériel de l'appareil"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
-msgstr "Afficher la valeur d'ouverture "
+msgstr "Afficher la valeur d'ouverture"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Priorité à l'ouverture de l'Apex ouverte"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Zoom numérique avec loupe de visée"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Position plusieurs points"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Afficher la valeur d'ouverture maximale"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Priorité à l'ouverture de l'Apex au maximum"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "Position initiale de l'EZoom"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "Taille du téléobjectif de l'EZoom"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Quantité du flash énumérée"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Angle de rotation"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Rotation de la scène"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Mode émulation de l'événement"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Type de diaporama"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Taille moyenne des fichiers"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
-msgstr "Identifiant du modèle :"
+msgstr "Identifiant du modèle"
+
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Prise de vue personnalisée"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Nom de prise de vue personnalisée A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Nom de prise de vue personnalisée B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Nom de prise de vue personnalisée C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Nom de prise de vue personnalisée D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Réinitialiser la personnalisation 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Température de couleur de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Numéro de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Nom 0 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Nom 1 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Nom 2 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Nom 3 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Nom 4 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Valeur 0 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Valeur 1 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Valeur 2 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Valeur 3 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Valeur 4 de préconfiguration de balance des blancs"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Distance focale de l'objectif (non CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Ouverture relative au maximum de l'objectif (non CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "DX automatiquement rogné"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Nom de menu personnalisé A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Nom de menu personnalisé B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Nom de menu personnalisé C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Nom de menu personnalisé D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Réinitialiser le menu personnalisé"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Mise au point automatique verticale activée"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Zone de mise au point"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Activer les droits d'auteur"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Palier d'exposition ISO"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Palier d'exposition"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Correction d'exposition (valeur d'exposition)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Zone pondérée centrale"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Matrice de base d'exposition"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Centre de base d'exposition"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Point de base d'exposition"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Zone de mise au point automatique en mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Mesure automatique hors délai"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Délai du retardateur"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Configuration de date d'image"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Délais d'extinction automatique"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Niveau d'angle"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Vitesse de prise du vue"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Mode de temporisation d'exposition"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Réduction du bruit pour exposition longue"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Éclairage du LCD"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Réduction du bruit pour grande ISO"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Conseils sur l'écran"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Nom de l'artiste"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Renseignements sur les droits d'auteur"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Modélisation du flash"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Mode bracketing manuel"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Sélection de bracket automatique"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "Bracketing Nikon automatique réglé"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Mode de prise de vue par le bouton central"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Mode de lecture par le bouton central"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Multisélecteur"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Lecture des renseignements de la photographie"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Assigner une touche de fonction"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Personnaliser les boutons de commande"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Réglages de l'ouverture du diaphragme"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Boutons et commandes"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Pas de carte CompactFlash libérée"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Rapport du zoom par le bouton central"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Bouton de fonction 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Mise au point automatique normale activée"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Nettoyer le capteur d'image"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Commentaire d'image"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Commentaire d'image activé"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Rotation de l'image"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Définition manuelle du nombre d'objectifs"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Taille de l'écran de film"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Voix du film"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Microphone du film"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Emplacement de carte du film"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Retard d'extinction du moniteur"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Bracketing activé"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Palier d'exposition du bracketing"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Programme d'exposition du bracketing"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Mesure d'exposition automatique de bracket"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Palier de balance des blancs du bracket"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Programme de balance des blancs du bracket"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Identifiant de l'objectif"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Genre d'objectif"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Type d'objectif"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Distance focale minimale"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Distance focale maximale"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Ouverture maximale à la distance focale minimale"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Ouverture minimale à la distance focale maximale"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Afficher la découverte d'ISO"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Arrêt automatique des photographies"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Arrêt automatique du menu"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Arrêt automatique des renseignements"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Nombre de prises de vue avec retardateur"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Contrôle des vignettes"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Temps de pose du Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "État d'alerte"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "Mode 2 de mise au point automatique LCD en haut"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Capteur de mise au point automatique activé"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Vitesse du port USB"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Numéro de série du CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Type PTN du groupe"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Verrouillage de la valeur d'ouverture du diaphragme"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Verrouillage de l'ouverture d'exposition"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Réglage du verrouillage télévision"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "Réglage du verrouillage de priorité à l'ouverture"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Réglages de l'éclairage"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Luminosité de l'endroit de mise au point"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Flash externe connecté"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "État du flash externe"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Spécification du flash externe"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Mode de flash externe"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Correction d'exposition par le flash externe"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "Effet de remplissage noir et blanc"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "Dureté noir et blanc"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "Contraste noir et blanc"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "Type de réglages noir et blanc"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Mode de sauvegarde emplacement 2"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Mode de bit brut"
 
 # NOTE: s/ou/uo/
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
 msgstr "Type fluorescent"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Ajuster la température de couleur"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Ajuster la préconfiguration 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Ajuster la préconfiguration 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Ajuster la préconfiguration 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Ajuster la préconfiguration 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Ajuster la préconfiguration 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Mode de mise au point automatique"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Éclairage d'assistance de mise au point automatique"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Réglage automatique ISO P/A/DVP"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Afficher la grille viewfinder"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Énergie du mode de commande du flash"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Synchronisation ultrarapide automatique"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Affichage d'avertissement"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Type de cellule de batterie"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Limite haute d'ISO automatique"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Continu à vitesse rapide"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Réglage d'affichage de renseignements"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Bouton de prévisualisation"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Bouton de prévisualisation 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "Bouton 2 de verrouillage d'exposition ou mise au point automatiques"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Affichage d'indicateur"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Priorité de type de cellule"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Images et paliers du bracketing"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Fonction mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "État du mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Rapport du zoom d'image en mode de visée par l’écran"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Condition interdite en mode de visée par l’écran"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Affichage de l'état d'exposition"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
-msgstr "État d'indicateur d'exposition "
+msgstr "État d'indicateur d'exposition"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "État d'erreur d'affichage de renseignements"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "L'éclairage indique l'exposition"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Valeur de répétition manuelle du flash"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Nombre de répétitions manuelles du flash"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Intervalle de répétitions manuelles du flash"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Activer le contrôle d'image"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Modifier le contrôle d'image"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr "Langue de l'appareil"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7090
+#, fuzzy
+msgid "Release without SD card"
+msgstr "Débloquer sans la carte CompactFlash"
+
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Compression d’image"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Retardateur sécurisé"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Certification du périphérique"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Révocation de renseignements"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Synchronisation des partenaires"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Nom du périphérique familier"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Niveau sonore"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Icône du périphérique"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Renseignements sur l'initiateur de session"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Type d'appareil perçu"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Taux de lecture"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Lecture d'objets"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Lecture de l'indice du conteneur"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Position de lecture"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "Identifiant PlaysForSure"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Qualité"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Mode de relâchement"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Zones de mise au point"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Verrouillage d'exposition automatique"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
+msgstr "Point focus"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Taille d'image"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Temps de pose"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Température de couleur"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "État du zoom"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr "Objets en mémoire"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Indice d’exposition"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "Filtre AB"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Image fixe"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Proche 1"
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr "Position zone AF"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Date et heure"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f arrêts"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Normal"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG de base"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Incandescent"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Mise au point manuelle"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Macro automatique (bloquée)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Moyenne pondérée centrale"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Point central"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Flash automatique"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Dispositif anti yeux rouges automatique"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Flash anti yeux rouges en appoint"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Puissance du vent"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Retardateur avec télécommande"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Verrouillage de mise au point automatique seulement"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Verrouillage du flash"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Réinitialisation de la mise au point au centre"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Mise en évidence de l'endroit de mise au point actif"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Inutilisé"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRAM"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "Luminosité de l'écran LCD"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "Luminosité de l'écran LCD et affichage de renseignements"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Foncé sur clair"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Clair sur foncé"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Lithium Ion"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nickel hydride"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nickel cadmium"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkalium manganese"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Alerte niveau 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Cas d'urgence"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Alerte niveau 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Économique"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Très fine"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Suppression des yeux rouge"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Synchronisation basse vitesse"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatique + suppression des yeux rouge"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Activé + suppression des yeux rouge"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Afficher la distance"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Temps de pose court"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Temps de pose long"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Vue de nuit"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Mise au point panoramique"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Une seule prise de vue"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Prise de vue continue"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Retardateur pour une seul prise de vue"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Prise de vue continue (basse vitesse)"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Prise de vue continue (haute vitesse)"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Régulier"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Mesure pondérée centrale"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Mesure de position"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Mesure moyenne"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Mesure évaluative"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Mesure partielle"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Mesure pondérée centrale moyenne"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Mesure de position associée au cadre de mise au point automatique"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Mesure sur plusieurs points"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Fonction de temps de pose long non disponible"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Faible 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Élevé 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Haute 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Haute 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Paramètre standard de développement"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Paramètre 1 de développement"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Paramètre 2 de développement"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Paramètre 3 de développement"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "Position sur plusieurs points centrés"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "Position sur plusieurs point attachés à la mise au point automatique"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Carte support"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Groupe de la carte support"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Rencontrer"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Boîte de rencontre"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Microcode"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Format d'image Windows"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Audio non définie"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Codec Audible.com"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Liste de lecture Samsung"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Vidéo non définie"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Collection non définie"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Résumé multimédia de l'album"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Résumé d'image de l'album"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Résumé audio de l'album"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Résumé vidéo de l'album"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Résumé de lecture audio et vidéo"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Résumé du groupe de contact"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Résumé du répertoire de messages"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Résumé du chapitre production"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Résumé de la liste audio"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Résumé de la liste vidéo"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Résumé du support de diffusion"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "Liste de lecture WPL"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "Liste de lecture M3U"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "Liste de lecture MPL"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "Liste de lecture ASX"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "Liste de lecture PLS"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Document non défini"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Résumé du document"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Document XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Document Microsoft Word"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "Document HTML compilé MHT"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Feuille de calcul Microsoft Excel (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Message non défini"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Résumé du message"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Contact non défini"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Résumé du contact"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Objet non défini dans le calendrier"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Résumé de l'objet dans le calendrier"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Exécutable Windows non défini"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Support de diffusion"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Section"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
-msgstr "inconnu(%04x)"
+msgstr "Inconnu(%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Obtenir les renseignements du périphérique"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Ouvrir la session"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Fermer la session"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
-msgstr "Obtenir l'identifiant du support de stockage "
+msgstr "Obtenir l'identifiant du support de stockage"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Obtenir les renseignements sur le support de stockage"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Obtenir le nombre d'objet"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Obtenir les identificateurs de l'objet"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
-msgstr "Obtenir les renseignements sur l'objet "
+msgstr "Obtenir les renseignements sur l'objet"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Obtenir l'objet"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Récupération de vignette"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Supprimer l'objet"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Envoyer des renseignements sur l'objet"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Envoyer l'objet"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Initialiser l'acquisition"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Format de stockage"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Réinitialiser le périphérique"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Test automatique du dispositif"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Définir la protection de l'objet"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Éteindre le périphérique"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Obtenir la description de propriété du périphérique"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
-msgstr "Obtenir la valeur de propriété du périphérique "
+msgstr "Obtenir la valeur de propriété du périphérique"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Réglage de valeur de propriété du périphérique"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Réinitialiser la valeur de propriété du périphérique"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Mettre fin à l'acquisition ouverte"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Déplacer l'objet"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Copier l'objet"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Obtenir l'objet partiel"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Initier l'acquisition ouverte"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Démarrer l’énumération des identificateurs"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Énumération des identificateurs"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Arrêter l’énumération des identificateurs"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Obtenir la carte d’extension du fabricant"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Obtenir les renseignements du fabricant sur le périphérique"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Obtenir une image redimensionnée"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Obtenir le manifeste du système de fichiers"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Obtenir des renseignements sur le flux"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Obtenir un flux"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Obtenir les propriétés de l'objet prises en charge"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Obtenir la description des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Obtenir la valeur des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Définir la valeur des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Obtenir la liste des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Définir la liste des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Obtenir les propriétés interdépendantes de l'objet"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Envoyer la liste des propriétés de l'objet"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Obtenir les références de l'objet"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Définir les références de l'objet"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Mettre à jour le microcode de l'appareil"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Aller à la position suivante de la liste de lecture"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Obtenir une requête sur le temps de sécurité"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Obtenir une réponse sur le temps de sécurité"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Définir la réponse de la licence"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Obtenir la liste de synchronisation"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Envoyer une demande de mesure"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Obtenir la demande de mesure"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Obtenir une réponse sur la mesure"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Effacer les données stockées"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Obtenir l'état de la licence"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Envoyer une commande WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Envoyer une requête WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Signaler les articles ajoutés ou supprimés"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Signaler les articles acquis"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Obtenir les types de liste de lecture transférable"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Envoyer une requête WMDRM-PD pour l'application"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Obtenir une réponse WMDRM-PD pour l'application"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Activer les opérations de fichier de confiance"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Désactiver les opérations de fichier de confiance"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Fin de la session sécurisée"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Ouvrir une session média"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Fermer une session média"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Obtenir le bloc de donnée suivant"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Régler l'heure de la position actuelle"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Envoyer une requête d'enregistrement"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Obtenir une réponse d'enregistrement"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Obtenir une requête de proximité"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Envoyer d'une réponse de proximité"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Envoyer une requête de licence WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Obtenir une réponse de licence WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Processus de l'objet WFC"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Obtenir l'objet partiel (offset de 64 bits)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Envoyer l'objet partiel"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Tronquer l'objet"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Début d’édition d’objet"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Fin d’édition d’objet"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Inconnue PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Identifiant d’extension fabricant inconnue"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Valeur inconnue"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Téléchargement du film…"
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Téléchargement audio…"
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Téléchargement des données EXIF…"
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Pas de données EXIF disponibles pour %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Impossible de supprimer le fichier."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Impossible de supprimer le répertoire."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Impossible de créer le répertoire."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Version : %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "État RTC : %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Date de l'appareil : %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Identifiant de l'appareil : %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Pas de carte SD insérée.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "Identifiant de carte SD : %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Photographies sur l'appareil : %d.\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Mémoire SD : %d Mo au total, %d Mo libre.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Mémoire interne : %d Mo au total, %d Mo libre.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10509,7 +12910,7 @@
 "Rétroconception en utilisant USB Snoopy, en observant l'image\n"
 "de mise à jour du microcode et en faisant des essais au hasard.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10521,12 +12922,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "basé sur le pilote de Bob Paauwe\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "inconnu (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10535,186 +12936,186 @@
 "Modèle : %s\n"
 "Mémoire : %d octet(s) sur %d disponible(s)"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2,0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1,5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1,0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0,5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0,0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0,5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1,0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1,5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2,0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 × 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Extérieur"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximal"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimal"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Personnage"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Son"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Image et son"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Personnage et son"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Configuration"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Général"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Droit d’auteur (20 caractères maximum)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Images"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Balance des blancs"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Mode d’enregistrement"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Compression"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
-msgstr "La vitesse %i n'est pas autorisée."
+msgstr "La vitesse %i n'est pas prise en charge !"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "%i attendus, %i reçus. Veuillez signaler cette erreur à %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "%i octets attendus, %i reçus. Veuillez signaler cette erreur à %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "0x%x était attendu mais 0x%x a été reçu. Veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Mauvais caractères (0x%x, 0x%x). Veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "L'appareil est occupé. Si le problème persiste, veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Délai d'attente dépassé même après deux nouvelles tentatives. Veuillez "
 "contacter %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Erreur de communication même après deux nouvelles tentatives. Veuillez "
 "contacter %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "L'appareil n'est pas dans le bon mode. Veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "L'appareil n'a pas accepté les paramètres. Veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Une erreur inconnue est survenue. Veuillez contacter %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -10722,7 +13123,7 @@
 "La longueur du fichier ne doit pas dépasser 12 caractères (« %s » contient "
 "%i caractères)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10734,108 +13135,108 @@
 "l'a porté pour gPhoto2. Marcus Meißner <marcus@jet.franken.de> l'a corrigé "
 "et amélioré."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Résolution et taille"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Date et heure (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Réglages de l'ouverture"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Mode couleur"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Dispositif anti yeux rouges"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Réglage du flash"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Économie d'énergie pour l'hôte (seconde)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Économie d'énergie pour l'appareil (seconde)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Mode de l'objectif"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Coréen"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Anglais"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Français"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Allemand"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italien"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japonais"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Réglages de l'image"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10855,230 +13256,226 @@
 "  au cas où le vôtre se comporterait différemment, veuillez contacter\n"
 "  la liste de développement par courrier électronique (en anglais)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Pas de carte présente"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Impossible d'obtenir la capacité de la batterie"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Le niveau de la batterie est trop faible (%d %%). Opération annulée."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Impossible de récupérer la quantité de mémoire disponible"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "L'appareil a refusé trois fois de garder la connexion ouverte."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Le premier octet reçu (0x%x) n'est pas valable."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "La transmission du paquet a échoué après %i essais. Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Impossible de transmettre un paquet malgré plusieurs tentatives."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr ""
 "Le paquet de donnée a été rejeté par l'appareil. Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Impossible de transmettre un paquet (code erreur %i). Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "La transmission a échoué après deux essais. Abandon…"
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Résultat inattendu 0x%x. Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Réponse inattendue (%i). Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Impossible d'obtenir le registre %i. Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Trop de tentatives infructueuses."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Envoi de données…"
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
-"Les appels récursifs ne sont pas gérées par le pilote sierra. Veuillez "
+"les appels récursifs ne sont pas gérées par le pilote sierra. Veuillez "
 "contacter %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Impossible d'obtenir la chaîne de registre %i. Veuillez contacter %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "32 octets attendus, %i reçus. Veuillez contacter %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Temps de pose (en microseconde, 0 pour auto)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Temps de pose (en seconde)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "N/B"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Anti yeux rouges"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Contraste+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Contraste-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Luminosité+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Luminosité-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Ajustement de l'image"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Clignote"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Mode LED"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Infini"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Prévisualisation de vignette"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Suivant"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Précédent"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Mode d’opération"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Luminosité de l’écran LCD"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Extinction automatique de l’écran LCD (en seconde)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Poids centré"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Mise au point automatique sur un point"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (en millimètre)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
-msgstr "Aucun"
+msgstr "aucun"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Verrouillage d'exposition automatique"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Fisheye"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Large"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Paramètres divers d'exposition et d'objectif"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Verrouillage d’exposition automatique"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11108,7 +13505,7 @@
 "        placez l'appareil en mode « M » pour pouvoir\n"
 "        paramétrer le temps de pose.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11128,67 +13525,63 @@
 "    la récupération des images devrait fonctionner\n"
 "    correctement.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Tableau blanc"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Tableau noir"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Mode couleur ou fonction"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Lente"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Anti yeux rouges en appoint"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Tube fluorescent nº 1 (maison, température de couleur 6700 K)"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Tube fluorescent nº 2 (bureau, température de couleur 5000 K)"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Tube fluorescent nº 3 (travail, température de couleur 4200 K)"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Crépuscule"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Mode LCD"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Zoom numérique"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Position de mise au point"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Format de l'heure"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11223,7 +13616,7 @@
 "    Si vous êtes bloqué dans cet état, vous devrez reconnecter\n"
 "    l'appareil au PC et repasser LCD sur « Off »."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11252,7 +13645,7 @@
 "    Si vous êtes bloqué dans cet état, vous devrez reconnecter\n"
 "    l'appareil au PC et repasser LCD sur « Off »."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11282,105 +13675,110 @@
 "    permettre une configuration complète, veuillez\n"
 "    contacter la liste de diffusion des développeurs.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (inconnu)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Le fichier à envoyer est de longueur nulle"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Pas assez de mémoire disponible sur la carte mémoire"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Impossible d'obtenir le nom du répertoire contenant les images"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Le téléchargement est géré uniquement dans le répertoire « %s »"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Meilleure"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (inconnu)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Temps de pose (en microseconde, 0 pour auto)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Noir/Blanc"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Tableau blanc"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Tableau noir"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Lumière/Contraste"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Lumière+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Lumière-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Lumière naturelle"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Infini/Fisheye"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Mode de mesure de point"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Arrêt automatique (serveur) (en seconde)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11388,12 +13786,12 @@
 "Combien de temps sera nécessaire à l'extinction de l'appareil connecté à "
 "l'ordinateur ?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Arrêt automatique (test) (en seconde)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11401,114 +13799,114 @@
 "Combien de temps sera nécessaire à l'extinction de l'appareil non connecté à "
 "l'ordinateur ?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Arrêt automatique de l'écran LCD (en seconde)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Réglage de la prise de vue"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "couleur"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "noir et blanc"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Note : absence de carte mémoire, quelques valeurs peuvent être incorrectes\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Modèle de l'appareil : %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Numéro de série : %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Révision du logiciel : %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Images prises : %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Images restantes : %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Durée de vie de la batterie : %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Mémoire restante : %i octets\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Date : %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Manuel de l'appareil non disponible.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11529,7 +13927,7 @@
 "  PhotoPC 3000z, au cas où le vôtre se comporterait différemment,\n"
 "  veuillez contacter %s par courrier électronique (en anglais)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11565,7 +13963,7 @@
 "    Si vous êtes bloqué dans cet état, vous devrez reconnecter\n"
 "    l'appareil au PC et repasser LCD sur « Off »."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11576,7 +13974,7 @@
 "for the use of their Olympus C-3030Z for USB\n"
 "support implementation."
 msgstr ""
-"Bibliothèque sierra SPARClite\n"
+"bibliothèque sierra SPARClite\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
 "Prise en charge des appareils numériques basés\n"
 "sur les composants sierra dont les Olympus,\n"
@@ -11586,12 +13984,7 @@
 "l'utilisation de leur implémentation de la\n"
 "prise en charge de l'USB pour Olympus C-3030Z."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (inconnu)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11601,11 +13994,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Impossible d'appliquer les réglages USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11625,7 +14018,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Pilote de contrôle des appareils Smal Ultrapocket, et versions OEM (slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11640,7 +14033,7 @@
 "Appareil Sonix.\n"
 "%i images y sont contenues.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11667,7 +14060,7 @@
 "Les vignettes des vidéos AVI sont prise de la première image.\n"
 "Une seule image ne peut pas être supprimé sauf si c'est la dernière.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11675,7 +14068,7 @@
 "Bibliothèque pour les appareils Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11689,7 +14082,7 @@
 "de Ken-ichi Hayashi\n"
 "Adaptation à gPhoto2 réalisée par Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11702,7 +14095,7 @@
 "Version initiale écrite par Mark Davies <mdavies@dial.pipex.com>\n"
 "Adaptation à gPhoto2 réalisée par Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11715,12 +14108,12 @@
 "Mémoire totale : %i ko\n"
 "Mémoire libre :  %i ko\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Révision du microcode : %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11728,7 +14121,7 @@
 "Pilote Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11737,7 +14130,7 @@
 "FLASH :\n"
 " Fichiers : %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11754,9 +14147,9 @@
 "Espace utilisé : %8d\n"
 "Espace libre :   %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
-msgstr "Bibliothèque spca50x v"
+msgstr "bibliothèque spca50x v"
 
 #: camlibs/sq905/library.c:133
 #, c-format
@@ -11817,15 +14210,15 @@
 "sq905 generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
-"Pilote générique sq905\n"
+"pilote générique sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Le cadre numérique USB a une puce ST2205\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11835,7 +14228,7 @@
 "résolutions. Le pilote gPhoto pour ces périphériques permet\n"
 "d'envoyer, recevoir et effacer des images du cadre numérique."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11847,11 +14240,7 @@
 "Ce pilote permet d'envoyer, recevoir et effacer des images du\n"
 "cadre numérique."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientation"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11863,110 +14252,110 @@
 "Pilote pour les appareils utilisant le processeur ASIC STV0674.\n"
 "Protocole rétroconçu en utilisant SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Mauvaise exposition (probablement manque de lumière)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informations pour les appareils basés sur le STV0680 :\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Révision du microcode : %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Révision de l'ASIC : %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Identifiant du capteur : %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "L'appareil est configuré pour une lumière scintillante à %d Hz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Mémoire dans l'appareil : %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "L'appareil gère les vignettes.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "L'appareil gère la vidéo.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Les images de l'appareil sont monochromes.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "L'appareil a de la mémoire.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "L'appareil permet d'utiliser les formats vidéo : "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Identifiant du fabricant : %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Identifiant de produit : %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Nombre d'images : %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Nombre maximal d'images : %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Largeur d'image : %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Hauteur d'image : %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Taille de l'image : %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Largeur de la vignette : %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Hauteur de la vignette : %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Taille de la vignette : %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11983,12 +14372,12 @@
 "Étendu les appareils Aiptek PenCam et autres appareils en mode double USB "
 "STM."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Obtention d'informations sur %i fichiers…"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12001,19 +14390,19 @@
 "Veuillez envoyer les rapports de bogue et commentaires à :\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z ne gère que l'USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Réglages du pilote"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Mode turbo"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12025,12 +14414,12 @@
 "Bibliothèque pour télécharger et envoyer des fichiers de Topfield PVR.\n"
 "Porté depuis puppy © Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Téléchargement de %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12040,42 +14429,71 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Pilote Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Le cadre numérique USB a une puce ST2205\n"
+
+#: camlibs/tp6801/library.c:93
+#, fuzzy
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Les cadres numériques basés sur ST2205 existent avec de nombreuses\n"
+"résolutions. Le pilote gPhoto pour ces périphériques permet\n"
+"d'envoyer, recevoir et effacer des images du cadre numérique."
+
+#: camlibs/tp6801/library.c:106
+#, fuzzy
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Pilote de cadre numérique USB ST2205\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Ce pilote permet d'envoyer, recevoir et effacer des images du\n"
+"cadre numérique."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 "Erreur interne lors de la rechercher de camlibs (noms de chemin d'accès peut-"
 "être trop long)."
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Chargement des pilotes depuis « %s »…"
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr ""
 "Une erreur est survenue dans la bibliothèque d'entrée sortie (« %s ») : %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Aucun appareil n'a pu être détecté"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Aucun appareil n'a pu être détecté sur le port %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Vous devez indiquer un port avant d'initialiser l'appareil."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Impossible de charger le pilote d'appareil « %s » nécessaire (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "La fonction « camera_init » manque au pilote d'appareil « %s »."
@@ -12113,12 +14531,12 @@
 msgid "This camera can not capture previews."
 msgstr "Cet appareil ne permet pas l'acquisition de prévisualisations."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Le chemin d'accès « %s » n'est pas absolu."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12127,7 +14545,7 @@
 "Vous avez essayé d'effacer « %s » du répertoire « %s », mais le système de "
 "fichiers ne permet pas l'effacement de fichiers."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
@@ -12135,18 +14553,18 @@
 "Des sous-répertoires sont toujours présents dans le répertoire « %s/%s » que "
 "vous essayez d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Des fichier sont toujours présents dans le répertoire « %s/%s » que vous "
 "essayez d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Ce système de fichiers ne permet pas l'envoi de fichiers."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12154,108 +14572,136 @@
 "Le répertoire « %s » ne contient que %i fichiers, mais un fichier numéro %i "
 "a été demandé."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Le fichier « %s » n'a pas été trouvé dans le répertoire « %s »."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Impossible de trouver le fichier « %s »."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Ce système de fichiers ne permet pas de récupérer des fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Type de fichier %i inconnu."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "Ce système de fichiers ne permet pas la récupération d'informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Ce système de fichiers ne permet pas de modifier les informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Les attributs en lecture seule (comme la hauteur et la largeur) ne peuvent "
 "être modifiés."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr ""
 "Ce système de fichiers ne permet pas de récupérer d'informations sur le type "
 "de stockage"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Données corrompues"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Le fichier existe"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Modèle inconnu"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Répertoire non trouvé"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Fichier non trouvé"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Le répertoire existe"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "E/S en cours"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Le chemin d'accès n'est pas absolu"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Impossible de finir l'opération avec l'appareil"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Erreur de communication entre l'appareil et le système d'exploitation"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Pas assez d'espace"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Erreur inconnue dans la bibliothèque de l'appareil"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#~ msgid "Canon EOS Trigger Capture failed: 0x%x"
-#~ msgstr "Échec du déclenchement de Capture EOS Canon : 0x%x"
+#, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "Réduction du bruit multi-image %d"
+
+#~ msgid "Movie recording cannot start: Camera is not in application mode."
+#~ msgstr ""
+#~ "Impossible de démarrer le film : l'appareil n'est pas en mode application."
+
+#~ msgid "Movie recording cannot start: Set liveview selector is enabled."
+#~ msgstr "Impossible de démarrer le film : la visée sur écran est activée."
+
+#~ msgid "Movie recording cannot start: In enlarged liveview."
+#~ msgstr "Impossible de démarrer le film : visée sur écran élargie."
+
+#~ msgid "Movie recording cannot start: Card protected."
+#~ msgstr "Impossible de démarrer le film : carte protégée."
+
+#~ msgid "Movie recording cannot start: Already in movie recording."
+#~ msgstr "Impossible de démarrer le film : enregistrement de film en cours."
+
+#~ msgid ""
+#~ "Movie recording cannot start: Images / movies not yet record in buffer."
+#~ msgstr ""
+#~ "Impossible de démarrer le film : images / films en cours de mis en cache."
+
+#~ msgid "Movie recording cannot start: Card full."
+#~ msgstr "Impossible de démarrer le film : carte pleine."
+
+#~ msgid "Movie recording cannot start: Card not formatted."
+#~ msgstr "Impossible de démarrer le film : carte non formatée."
 
-#~ msgid "Initializing Camera"
-#~ msgstr "Initialisation de l'appareil"
+#~ msgid "Movie recording cannot start: Card error."
+#~ msgstr "Impossible de démarrer le film : erreur de la carte."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/hu.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/hu.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/hu.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/hu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2003-02-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -23,19 +23,19 @@
 "Benjamin Moos <benjamin@psnw.com>"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -58,19 +58,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -78,17 +78,19 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 #, fuzzy
 msgid "Picture Frame Configuration"
 msgstr "A kamera beállításai"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -97,7 +99,7 @@
 "A képek száma: %i\n"
 "A firmware verziószáma: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -121,82 +123,82 @@
 "A weben talált dokumentáció alapján\n"
 "készült. A Vision engedélyével."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
 "%i"
 msgstr ""
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "A(z) '%s' név (%i karakter) túl hosszú (%i karakter), legfeljebb 30 "
 "karaktert lehet használni."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Védett fájl."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
@@ -205,334 +207,345 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr ""
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 #, fuzzy
 msgid "Thumbnail"
 msgstr "Az előnézeti kép mérete: %d\n"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 #, fuzzy
 msgid "Full Image"
 msgstr "Kép"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 #, fuzzy
 msgid "Auto focus: one-shot"
 msgstr "Autofókuszálási hiba."
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 #, fuzzy
 msgid "Auto focus: AI servo"
 msgstr "Autofókuszálási hiba."
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 #, fuzzy
 msgid "Auto focus: AI focus"
 msgstr "Autofókuszálási hiba."
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 #, fuzzy
 msgid "Manual focus"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 #, fuzzy
 msgid "Beep off"
 msgstr "LED-mód"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 #, fuzzy
 msgid "Beep on"
 msgstr "LED-mód"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 #, fuzzy
 msgid "Flash off"
 msgstr "Vakus mód"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 #, fuzzy
 msgid "Flash on"
 msgstr "Vakus mód"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 #, fuzzy
 msgid "Flash auto"
 msgstr "Vakus mód"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 #, fuzzy
 msgid "Manual 2"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 #, fuzzy
 msgid "Far scene"
 msgstr "Fluoreszkáló"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 #, fuzzy
 msgid "Fast shutter"
 msgstr "Zársebesség (s)"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr ""
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr ""
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Szépia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontraszt-"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr ""
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makró"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr ""
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 #, fuzzy
 msgid "PanFocus"
 msgstr "Fókusz"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 #, fuzzy
 msgid "Neutral"
 msgstr "Normál"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 #, fuzzy
 msgid "Long shutter"
 msgstr "A fókusz helyzete"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 #, fuzzy
 msgid "Indoor"
 msgstr "Szabadban"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr ""
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr ""
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr ""
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr ""
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr ""
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr ""
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 #, fuzzy
 msgid "Digital macro"
 msgstr "Digitális nagyítás"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 #, fuzzy
 msgid "MyColors"
 msgstr "színes"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -549,44 +562,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Hiba képrögzítéskor"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "A hiba oka nem ismert"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -597,35 +610,35 @@
 "  %11s bájt összesen\n"
 "  %11s bájt szabad"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "AC adapterről"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "akkumulátorról"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "energiaszint: megfelelő"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "energiaszint: nem megfelelő"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "nem érhető el: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (a számítógép ideje %s%i másodperc)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -652,7 +665,7 @@
 "\n"
 "Idő: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -673,26 +686,26 @@
 "A5-kiegészítések: Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Hiba történt a fájl törlésekor"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Nem sikerült törölni a társított előnézeti képet"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "57600-nál magasabb sebességet nem lehet használni ennél a kameránál "
 "feltöltéshez"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Nem sikerült lekérdezni a Flash meghajtó betűjelét"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 #, fuzzy
 msgid ""
 "Could not upload, no free folder name available!\n"
@@ -701,674 +714,696 @@
 "A feltöltés nem sikerült, nincs szabad könyvtárnév.\n"
 "A 999CANON könyvtár létezik, és található benne egy AUT 9999.JPG nevű kép."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Nem sikerült létrehozni a célkönyvtárat."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "A kamera és a meghajtóprogram beállításai"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 #, fuzzy
 msgid "Owner Name"
 msgstr "A tulajdonos neve"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 #, fuzzy
 msgid "Capture Size Class"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, fuzzy, c-format
 msgid "Unknown"
 msgstr "Ismeretlen hiba"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 #, fuzzy
 msgid "Shooting mode"
 msgstr "Zársebesség (s)"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Nagyítás"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Apertúra"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 #, fuzzy
 msgid "Image Format"
 msgstr "Dátumformátum"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Hangjelzés"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 #, fuzzy
 msgid "Camera Actions"
 msgstr "A kamera beállításai"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 #, fuzzy
 msgid "Camera Status Information"
 msgstr "A kamera beállításai"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Dátum és idő"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Hiba"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmware-revízió: %d.%d\n"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 #, fuzzy
 msgid "Power"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Meghajtó"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Az összes fájl kilistázása"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "A fájlnév megőrzése feltöltéskor"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "A tulajdonos neve megváltozott"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 #, fuzzy
 msgid "ISO speed changed"
 msgstr "A tulajdonos neve megváltozott"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 #, fuzzy
 msgid "Could not change ISO speed"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 #, fuzzy
 msgid "Shooting mode changed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 #, fuzzy
 msgid "Could not change shooting mode"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 #, fuzzy
 msgid "Shutter speed changed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 #, fuzzy
 msgid "Could not change shutter speed"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 #, fuzzy
 msgid "Invalid aperture setting"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 #, fuzzy
 msgid "Aperture changed"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 #, fuzzy
 msgid "Could not change aperture"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 #, fuzzy
 msgid "Invalid exposure compensation setting"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 #, fuzzy
 msgid "Exposure compensation changed"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 #, fuzzy
 msgid "Could not change exposure compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 #, fuzzy
 msgid "Invalid image format setting"
 msgstr "A kamera beállításai"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 #, fuzzy
 msgid "Image format changed"
 msgstr "Védett kép."
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 #, fuzzy
 msgid "Could not change image format"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 #, fuzzy
 msgid "Focus mode changed"
 msgstr "Fókuszálási mód"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 #, fuzzy
 msgid "Could not change focus mode"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 #, fuzzy
 msgid "Beep mode changed"
 msgstr "A tulajdonos neve megváltozott"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 #, fuzzy
 msgid "Could not change beep mode"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 #, fuzzy
 msgid "Could not change zoom level"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 #, fuzzy
 msgid "Flash mode changed"
 msgstr "Compact Flash kártya"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 #, fuzzy
 msgid "Could not change flash mode"
 msgstr "Nem sikerült lekérdezni a Flash meghajtó betűjelét"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "az idő beállítva"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "az idő beállítása nem sikerült"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Nem támogatott porttípus (%i = 0x%x) van megadva. Nem lehet inicializálni a "
 "kamerát."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Az akkumulátor lemerült, a kamera kikapcsolt."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "HIBA: nem várt üzenet"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "HIBA: üzenettúlfutás"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "HIBA: nem megfelelő sorrend"
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "HIBA: nem várt csomagtípus"
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "HIBA: hibás üzenetformátum"
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "HIBA: nem várt üzenet2"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Fájl letöltése..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "A sebesség megváltoztatása nem sikerült."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "A protokoll alapállapotba hozása..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 #, fuzzy
 msgid "Camera OK."
 msgstr "A kamera OK.\n"
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Kamera keresése..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Kapcsolatfelvétel a kamerával..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Kommunikációs hiba (1)"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "A kamera nem válaszolt"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Nem felismerhető válasz"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, fuzzy, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Detektálva: '%s'."
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, fuzzy, c-format
 msgid "Unknown model \"%s\""
 msgstr "Ismeretlen típus"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Hibás EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Kommunikációs hiba (2)"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Kommunikációs hiba (3)"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Sebességváltás...egy kis türelmet kérek..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "A sebesség megváltoztatása nem sikerült"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 #, fuzzy
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "A reinicializálás során hiba történt az ACK jelre való várakozás közben"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Nem jött ACK válasz az inicializálás közben"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Létrejött a kapcsolat a kamerával"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Előnézeti képek letöltése..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Nem sikerült felvenni a kapcsolatot a kamerával."
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "A kamera nem áll készen, több kameraazonosítási kísérlet nem sikerült: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "A kamera nem áll készen, több kameraazonosítási kísérlet nem sikerült: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
 "%i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Adatok fogadása..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 #, fuzzy
 msgid "File upload failed."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1376,55 +1411,55 @@
 "A fájl túl nagy. A következő feltöltési kísérlet előtt érdemes ki- és "
 "bekapcsolni a kamerát."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detektálva: '%s'."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, fuzzy, c-format
 msgid "Image type %d not supported"
 msgstr "A képtípus nem támogatott"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, fuzzy, c-format
 msgid "Image %s is delete protected."
 msgstr "Védett kép."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1432,40 +1467,40 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "A kamera beállításai"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, fuzzy, c-format
 msgid "Battery"
 msgstr "akkumulátor"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 #, fuzzy
 msgid "Brightness"
 msgstr "Az LCD fényereje"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 #, fuzzy
 msgid "Too bright"
 msgstr "Szerzői jog"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 #, fuzzy
 msgid "Too dark"
 msgstr "Túl sötét a megvilágítás."
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1528,16 +1563,16 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "A képtípus nem támogatott"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "A képek száma: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1545,7 +1580,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1553,24 +1588,24 @@
 "Csak a gyökérkönyvtár használható - listázási kísérlet történt a(z) '%s' "
 "könyvtárra."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Nem sikerült lekérdezni a képek számát"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Nem sikerült lekérdezni a kép adatait"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "A felvétel típusa nem támogatott"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (az akkumulátor feltöltöttsége: %d%%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, fuzzy, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1587,88 +1622,89 @@
 "A pillanatnyi felbontás: %s\n"
 "A kamera ellátása: %s - %s\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Vaku"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 #, fuzzy
 msgid "No Flash"
 msgstr "NINCS vaku"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Duál írisz"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 #, fuzzy
 msgid "No Dual Iris"
 msgstr "NINCS duál írisz"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Felbontáskapcsoló"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 #, fuzzy
 msgid "No Resolution Switch"
 msgstr "NINCS felbontáskapcsoló"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 #, fuzzy
 msgid "No Power Light"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "BE"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "KI"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "kész"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 #, fuzzy
 msgid "Not ready"
 msgstr "NEM áll készen"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "feltöltöttségi mód"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 #, fuzzy
 msgid "Not in fill mode"
 msgstr "NEM feltöltöttségi mód"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "alacsony (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "magas (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "külső"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "belső"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 #, fuzzy
 msgid ""
 "* Image glitches or problems communicating are\n"
@@ -1687,7 +1723,7 @@
 "  az előnézeti képet kezelő rész állítja be.\n"
 "* A képminőség jelenleg nem a lehető legjobbra van beállítva.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1717,208 +1753,324 @@
 "     Információ a protokollról, a nyers képformátumról,\n"
 "     a gphoto2-átiratról\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Nem sikerült beolvasni egy képet a Flash kártyáról"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Kép letöltése..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Nem sikerült letölteni a képet"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "A felhasználó megszakította a letöltést"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Nem sikerült közvetlenül felvételt készíteni"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Exponálás"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 #, fuzzy
 msgid "Exposure level on preview"
 msgstr "Exponálásmérés"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Hiba történt a port megnyitásakor"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Nem sikerült alapállapotba hozni a kamerát"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Nem sikerült beállítani a kamera átviteli sebességét"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Az eszköz modemnek tűnik, nem kamerának"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "A fájlok kilistázása itt: '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "A könyvtárak listázása itt: '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Nem sikerült információt lekérdezni erről: '%s' (%m)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, fuzzy, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Nem sikerült információt lekérdezni erről: '%s' itt: '%s' (%m)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Nem sikerült módosítani a(z) '%s' fájl idejét itt: '%s' (%m)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "'%s' megnyitása nem sikerült."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "A \"camera\" böngészése lehetővé teszi a képek indexelését a merevlemezen."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Könyvtárböngészési mód - készítette: Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, fuzzy, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "Nem sikerült törölni a(z) '%s' fájlt a(z) '%s' könyvtárban (hibakód - %i: "
 "%m)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "A kamera és a meghajtóprogram beállításai"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Ismeretlen típus"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Felbontás"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Felbontás"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Működési mód"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Színmód"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "A kamera csak %i bájtot küldött, de legalább %i bájtot kellett volna."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Nem sikerült felvenni a kapcsolatot a kamerával."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Nem várt adatok érkeztek (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Hibás escape-szekvencia: 0x%02x helyett 0x%02x érkezett."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Hibás adatok - 0x%02x érkezett 0x%02x helyett."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Hibás adatok - 0x%02x érkezett 0x%02x vagy 0x%02x helyett."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Hibás ellenőrzőösszeg - 0x%02x érkezett 0x%02x helyett."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "A kamera nem fogadta el a parancsot."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "A kamera alapállapotba állt vissza."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Nem várt bájt (0x%02x) érkezett a kamerától."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Letöltés..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Nem sikerült %i bájtot lefoglalni az előnézeti képek részére."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Nem sikerült %i bájtot lefoglalni a kép letöltéséhez."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "A kamera nem fogadja el a(z) '%s' fájlnevet."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Nem sikerült inicializálni a feltöltést (a kamera válasza: 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "A kamera nem támogatja a(z) %i sebességet."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Nem sikerült beállítani a(z) %i sebességet (a kamera válasza: %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1926,36 +2078,36 @@
 "Matthew G. Martin\n"
 "Thierry Bousch <bousch@topo.math.u-psud.fr> fujiplay programja alapján\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, fuzzy, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "A(z) %i bitráta nem támogatott."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "A Fuji kamera beállításai"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Dátum és idő"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "Azonosító"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Verzió:"
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Típus:"
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "A rendelkezésre álló memória: "
 
@@ -1977,18 +2129,18 @@
 "rendelkezésre).\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
 "működik.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "A kamerát nem sikerült alapállapotba hozni.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -1997,7 +2149,7 @@
 "A kamera csak az utolsó felvétel törlését teszi lehetővé. Jelen pillanatban "
 "ennek neve: '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2007,7 +2159,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2042,25 +2194,25 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, fuzzy, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "%sFelvett képkocka: %i\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam programkönyvtár v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Adatok letöltése..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Előnézeti képek letöltése..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2076,7 +2228,7 @@
 "   - előnézeti képek (64x48 PGM formátumban)\n"
 "   - teljes képek (640x480 PPM formátumban)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2088,32 +2240,32 @@
 "Meghajtóprogram a Jenoptik JD11 kamerához.\n"
 "A protokoll visszafejtése a WINE és az IDA segítségével történt."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 #, fuzzy
 msgid "JD11 Configuration"
 msgstr "Beállítások"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Egyéb beállítások"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Színbeállítások"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Vörös"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Zöld"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Kék"
 
@@ -2165,11 +2317,11 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Compact Flash kártya"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2180,7 +2332,7 @@
 "A kameráról letöltött képek megtekintéséhez szükség van a \"kdc2tiff\" "
 "programra, mely letölthető innen: http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2192,13 +2344,13 @@
 "Programkönyvtár a Kodak DC120 kamera kezeléséhez\n"
 "(sokak kérésére)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Adatok lekérdezése..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Várakozás a művelet befejeződésére..."
 
@@ -2211,7 +2363,8 @@
 msgstr "Fájltípus"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2224,7 +2377,7 @@
 msgstr "Fájlfelbontás"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2248,8 +2401,9 @@
 msgid "High (good quality)"
 msgstr "Magas (jó minőség)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Rögzítés"
 
@@ -2278,77 +2432,84 @@
 msgstr "Exponálási kompenzáció"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Automatikus"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Kényszerítés"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Nincs"
 
@@ -2357,71 +2518,78 @@
 msgstr "Vörösszem-vaku"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Be"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Ki"
 
@@ -2437,7 +2605,7 @@
 msgid "Port speed"
 msgstr "A csatlakozó sebessége"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Kötetnév"
 
@@ -2650,58 +2818,58 @@
 "Kamerakezelési programkönyvtár a Kodak DC215 Zoom kamerához.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "1. paraméter"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "2. paraméter"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "3. paraméter"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Típus: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "A firmware verziószáma: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Az akkumulátor állapota: %s, AC adapter: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Megmaradt hely: magas (%d), közepes (%d), alacsony (%d)\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "A memóriakártya állapota (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "A felvett képek száma: %d, a vakuvillanások száma: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2715,45 +2883,46 @@
 "Programkönyvtár a Kodak DC240, DC280, DC3400 és DC5000 kamerák kezeléséhez.\n"
 "Újraírva és felfrissítve a gPhoto2-höz."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Gyenge"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Üres"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Érvénytelen"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Nem használt"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Használt"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "A kártya meg van nyitva"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "A kártya nincs megnyitva"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "A kértya nincs megformázva"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Nincs kártya"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2761,12 +2930,12 @@
 "Jelenleg még tart egy művelet, és a kamera egyszerre csak egy művelet "
 "végzését teszi lehetővé. Kérem várja meg a művelet befejeződését."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "a kamera inaktív volt több mint 9 másodpercig, újrainicializálás.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2782,7 +2951,7 @@
 "válassza ki újból a kamerát, melynek hatására megtörténik az "
 "újrainicializálás."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2794,120 +2963,120 @@
 "\n"
 "Várom a kérdéseket, észrevételeket."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 msgstr ""
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fókuszálási hiba."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Íriszhiba."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Strobe-hiba."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Hibás EEPROM-ellenőrzőösszeg."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Belső hiba (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Belső hiba (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Nincs behelyezve kártya."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "A kártya nem támogatott."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "A kártyát eltávolították a hozzáférés közben."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Egy képszám érvénytelen."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "A kártya nem írható."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "A kártya írásvédett."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Nem maradt szabd hely a kártyán."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Védett kép."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Túl sötét a megvilágítás."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Autofókuszálási hiba."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Rendszerhiba."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Nem megengedett paraméter."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "A parancs nem szakítható félbe."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "A nemzetköziesítési adat túl hosszú."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "A nemzetköziesítési adat hibás."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Nem támogatott parancs."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Más parancs fut."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Hibás parancssorrend."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2918,15 +3087,15 @@
 "adatokat a <gphoto-devel@lists.sourceforge.net> címre a hiba "
 "bekövetkezésének részletes leírásával: (0x%x,0x%x). Köszönjük a segítségét!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "A fájllista lekérdezése..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "A különféle sebességek tesztelése..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -2935,12 +3104,12 @@
 "Nem sikerült felvenni a kapcsolatot a kamerával. Ellenőrizze, hogy össze van-"
 "e kötve a számítógéppel és be van-e kapcsolva."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i képet nem sikerült letörölni, mert védettek"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2959,7 +3128,7 @@
 "Név: %s,\n"
 "Gyártó: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -2969,410 +3138,419 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Az összes Konica és néhány HP kamera támogatása."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Információk lekérdezése..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica-beállítások"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Megmaradó beállítások"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Adjon hangjelzést a kamera kép felvételekor?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Diavetítési időköz"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Alacsony (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Közepes (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Magas (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Nemzetköziesítés"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Nyelv"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Nincs kiválasztva"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV-kimeneti formátum"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "A TV-menü ne jelenjen meg"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Dátumformátum"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Hónap/nap/év"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Nap/hónap/év"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Év/hónap/nap"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Munkafolyamathoz kötött beállítások"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Be, vörösszemeffektus-csökkentés"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fókusz"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Rögzített"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Nem megmaradó beállítások"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Saját időzítő"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normál"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Nemzetköziesítési adat nem található itt: '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "A nemzetköziesítési fájl túl hosszú."
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr ""
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr ""
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, fuzzy, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "A képtípus nem támogatott"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, fuzzy, c-format
 msgid "Can't delete image %s."
 msgstr "A(z) %s kép törlése."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 #, fuzzy
 msgid "Uploading image..."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr ""
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 #, fuzzy
 msgid "No answer from the camera."
 msgstr "A kamera nem válaszolt"
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Alacsony"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Közepes"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Magas"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr ""
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 #, fuzzy
 msgid "White balance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 #, fuzzy
 msgid "Office"
 msgstr "Ki"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 #, fuzzy
 msgid "Daylight"
 msgstr "Égbolt"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr ""
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr ""
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 #, fuzzy
 msgid "Color"
 msgstr "színes"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 #, fuzzy
 msgid "Light"
 msgstr "Magas"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 #, fuzzy
 msgid "Deep"
 msgstr "Hangjelzés"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 #, fuzzy
 msgid "Black and White"
 msgstr "Fekete-fehér"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 #, fuzzy
 msgid "Play mode"
 msgstr "Vakus mód"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 #, fuzzy
 msgid "Record mode"
 msgstr "Felvételi mód"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Lejátszás"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Felvétel"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3385,7 +3563,7 @@
 "Date and Time: %s\n"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3395,7 +3573,7 @@
 "Support for the french Konica Q-M150."
 msgstr ""
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3407,7 +3585,7 @@
 "If you have some issues with this driver, please e-mail its authors.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3418,7 +3596,7 @@
 "\n"
 "Largan Lmini kamerák kezeléséhez.\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3426,13 +3604,103 @@
 "Firmware Version: %s\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Beállítások"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Zársebesség (s)"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+#, fuzzy
+msgid "Quality"
+msgstr "Képminőség"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Képminőség"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+#, fuzzy
+msgid "Autofocus Mode"
+msgstr "Fókuszálási mód"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Lencsemód"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Színmód"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3443,7 +3711,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3457,13 +3725,13 @@
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3474,7 +3742,7 @@
 "Hardver-verzió:\t%s\n"
 "Firmware-verzió:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3501,61 +3769,63 @@
 "Kártyaazonosító:\t\t%d\n"
 "Vakuzási mód:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "távoli"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "helyi"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Igen"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nem"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Finom"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatikus\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Vaku mindig\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "A vaku letiltása\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Érvénytelen érték ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3572,74 +3842,74 @@
 "vaku-feltöltés:\t\t%s\n"
 "A lencse állapota:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Nincs tele"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Tele"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Üresjárat"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Töltés"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Kész"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normál\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "A lencse iránya nem felel meg a vakuénak\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "A lencse nincs bekötve\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Hibás értékű lencse-állapotkód: %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "A kártya állapota:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Írásvédett"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Nem megfelelő kártya"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, fuzzy, c-format
 msgid "Bad value for card status %d"
 msgstr "Hibás kártya-állapotkód: %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3652,63 +3922,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Köszönet a Minoltának a specifikáció megadásáért!"
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Vaku: automatikus (vörösszem-csökkentés)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Vaku: automatikus"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Vaku: be (vörösszem-csökkentés)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Vaku: be"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Vaku: ki"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Vaku: nem definiált"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "A Mustek MDC800 áttekintése:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "nincs állapotinformáció."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Compact Flash kártya detektálva\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Nem található Compact Flash kártya\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "A jelenlegi mód: kameramód\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Jelenlegi üzemmód: lejátszás\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Az akkumulátor szintje megfelelő."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Az akkumulátor szintje alacsony."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 #, fuzzy
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
@@ -3721,42 +3991,42 @@
 "A gphoto2-átirat Marcus Meissner <marcus@jet.franken.de> munkája\n"
 "Soros és USB-csatlakozós gépeket is támogat."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "Coolshot programkönyvtár v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "A kapcsolat megszűnt a kamerával."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "A(z) %s kép letöltése."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Kép feltöltése: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, fuzzy, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
 "%i bytes."
 msgstr "A fájlméret %i bájt. A feltölthető fájlok maximális mérete: %i bájt."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "A(z) %s kép törlése."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3772,12 +4042,12 @@
 "Galen Brooks <galen@nine.com>\n"
 "dc1000 nevű programja alapján."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "%s letöltése."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 #, fuzzy
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
@@ -3794,12 +4064,12 @@
 "Galen Brooks <galen@nine.com>\n"
 "dc1000 nevű programja alapján."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "'%s' letöltése..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -3821,7 +4091,7 @@
 "leveszi - 300K-s, ezért a gép csak alacsony minőségű képek készítésére "
 "alkalmas."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3837,7 +4107,7 @@
 "helyzeteket automatikusan megoldja, különösen akkor, ha a sebesség nagyobb "
 "9600-nál és a kamera lezárása nem a szokott módon történt."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3845,7 +4115,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-meghajtó\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3853,7 +4123,7 @@
 " Filecount: %d"
 msgstr ""
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3862,11 +4132,11 @@
 " <mace@darksilence.net>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Fájl letöltése..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 #, fuzzy
 msgid ""
 "Creative PC-CAM600\n"
@@ -3876,32 +4146,132 @@
 " Szerző: Peter Kajberg\n"
 " E-mail: <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Típus:"
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Ismeretlen típus"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Képméret"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Képminőség"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "Zársebesség (s)"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr ""
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr ""
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr ""
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr ""
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Ismeretlen típus"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -3910,12 +4280,12 @@
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr ""
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -3924,110 +4294,98 @@
 "Marcus Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Képminőség"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Képméret"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "A vaku beállításai"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automatikus kikapcsolás (perc)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Információ"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normál"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "finom"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "nagyon finom"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "automatikus"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "be"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "ki"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "lejátszás"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "felvétel"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menü"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "akkumulátor"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "a/c adapter"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Nem várt fejléc érkezett (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Nem várt válasz érkezett"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Hibás ellenőrzőösszeg"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "A kamera nem fogadta el a parancsot."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "A kamera a vártnál több bájtot küldött (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4036,7 +4394,7 @@
 "A(z) %i (= 0x%x) azonosítójú kép adatainak lekérdezése történt, de a gép "
 "a(z) %i azonosítójú kép adatait adta vissza"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, fuzzy, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4045,26 +4403,27 @@
 "%i bájtnyi adat érkezett ismeretlen képformátumban. Kérem küldje el a hiba "
 "körülményeinek leírását a <gphoto-devel@lists.sourceforge.net> címre."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
 "Mueller <lutz@users.sf.net>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Mennyi idő után kapcsoljon ki a kamera?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Kép"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4097,3751 +4456,5642 @@
 "Automatikus kikapcsolás: %i perc után\n"
 "Áramellátás: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "A kért porttípust (%i) nem támogatja ez a meghajtó."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "A kártya állapota:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Típus:"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Típus:"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Nagyítás"
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "%sA telep élettartama: %i\n"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Vakus mód"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "portugál"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Rögzítés"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+#, fuzzy
+msgid "AE Lock"
+msgstr "Exponálás"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "A kamera beállításai"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ismeretlen fájltípus: %i."
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, fuzzy, c-format
-msgid "Unknown value %04d"
-msgstr "Ismeretlen fájltípus: %i."
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "HIBA: nem várt csomagtípus"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 #, fuzzy
 msgid "Manual"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Tungsten"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Felhős"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 #, fuzzy
 msgid "Preset"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 #, fuzzy
 msgid "Fluorescent Lamp 1"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 #, fuzzy
 msgid "Fluorescent Lamp 2"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 #, fuzzy
 msgid "Fluorescent Lamp 3"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 #, fuzzy
 msgid "Fluorescent Lamp 4"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 #, fuzzy
 msgid "Fluorescent Lamp 5"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Tungsten"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "portugál"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "egyéni"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normál"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 #, fuzzy
 msgid "RAW + JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 #, fuzzy
 msgid "RAW + JPEG Normal"
 msgstr "Normál"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 #, fuzzy
 msgid "Self-timer"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Fekete-fehér"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Fekete-fehér"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Fekete-fehér"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Fekete-fehér"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2035
 #, fuzzy
 msgid "undefined"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "egyéni"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 #, fuzzy
 msgid "Flash Off"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Fájltípus"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Kontraszt-"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 #, fuzzy
 msgid "red eye suppression"
 msgstr "Be, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 #, fuzzy
 msgid "auto + red eye suppression"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 #, fuzzy
 msgid "on + red eye suppression"
 msgstr "Be, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 #, fuzzy
 msgid "Commander"
 msgstr "Hibás parancssorrend."
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 #, fuzzy
 msgid "Auto Aperture"
 msgstr "Apertúra"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 #, fuzzy
 msgid "Full Manual"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Nemzetköziesítés"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+#, fuzzy
+msgid "Large"
+msgstr "Kép"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 #, fuzzy
 msgid "MF (fixed)"
 msgstr "Rögzített"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 #, fuzzy
 msgid "User defined 1"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 #, fuzzy
 msgid "User defined 2"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 #, fuzzy
 msgid "User defined 3"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 #, fuzzy
 msgid "Multiple Focusing Points, Auto"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-#, fuzzy
-msgid "Large"
-msgstr "Kép"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 #, fuzzy
 msgid "Medium 1"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 #, fuzzy
 msgid "Medium 2"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 #, fuzzy
 msgid "Medium 3"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2244
-#, fuzzy
-msgid "Setting 4"
-msgstr "A vaku beállításai"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2245
-#, fuzzy
-msgid "Setting 5"
-msgstr "A vaku beállításai"
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2246
-#, fuzzy
-msgid "Setting 6"
-msgstr "A vaku beállításai"
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2247
-#, fuzzy
-msgid "Setting 7"
-msgstr "A vaku beállításai"
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+msgid "LiveSpotAF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, fuzzy, c-format
 msgid "Unknown %d"
 msgstr "Ismeretlen hiba"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 #, fuzzy
 msgid "Factory Default"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, fuzzy, c-format
+msgid "Auto ISO"
+msgstr "Automatikus"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+msgid "Small + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2760
+msgid "Large + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Közepes"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2803
 #, fuzzy
 msgid "Timer 10 sec"
 msgstr "távoli"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 #, fuzzy
 msgid "Timer 2 sec"
 msgstr "távoli"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, fuzzy, c-format
-msgid "Auto ISO"
-msgstr "Automatikus"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Exponálási kompenzáció"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 #, fuzzy
 msgid "Automatic (No Flash)"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "Képbeállítások"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 #, fuzzy
 msgid "Candlelight"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "Fluoreszkáló"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
 #, fuzzy
-msgid "Effects"
-msgstr "Felvételi mód"
+msgid "0 image"
+msgstr "Kép"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
+#, fuzzy
+msgid "Effects"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "Magas"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 #, fuzzy
 msgid "Timer"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 #, fuzzy
 msgid "Delayed Remote"
 msgstr "távoli"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Saját időzítő (csak a következő képnél)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 #, fuzzy
 msgid "Centre-spot"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4267
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, fuzzy, c-format
 msgid "Unknown value 0x%04x"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 #, fuzzy
 msgid "Centre"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 #, fuzzy
 msgid "Bottom"
 msgstr "Nagyítás"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 #, fuzzy
 msgid "Right"
 msgstr "Magas"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Rögzítés"
+
+#: camlibs/ptp2/config.c:4353
+msgid "Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4354
+msgid "Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4355
+msgid "Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Magas"
+
+#: camlibs/ptp2/config.c:4387
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 #, fuzzy
 msgid "Fill flash"
 msgstr "Vaku"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Vörösszem-vaku"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 #, fuzzy
 msgid "External sync"
 msgstr "külső"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Fekete-fehér"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 #, fuzzy
 msgid "Color sketch"
 msgstr "Színmód"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
 msgstr "Magas"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
+#, c-format
+msgid "%d mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
 #, fuzzy
 msgid "infinite"
 msgstr "Végtelen/halszem"
 
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
-msgid "%d mm"
+msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
-#, c-format
-msgid "x 200"
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Tömörítés"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Lassú szinkronizálás"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "Normál"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
+#: camlibs/ptp2/config.c:5651
 #, fuzzy
-msgid "Manual Focus"
+msgid "Manual Focus (fixed)"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 #, fuzzy
 msgid "2"
 msgstr "2x"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 #, fuzzy
 msgid "4"
 msgstr "4x"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 #, fuzzy
 msgid "8"
 msgstr "8x"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 #, fuzzy
 msgid "15"
 msgstr "1,5"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 #, fuzzy
 msgid "20s"
 msgstr "2,0"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 #, fuzzy
 msgid "15s"
 msgstr "1,5"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 #, fuzzy
 msgid "10s"
 msgstr "1,0"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 #, fuzzy
 msgid "Sharper"
 msgstr "Töltés"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 #, fuzzy
 msgid "Direct Print"
 msgstr "A könyvtár már létezik"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "Közepes"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "Fókusz"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "egyéni"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "egyéni"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "egyéni"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "egyéni"
+msgid "Manual 3"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Töltés"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 #, fuzzy
 msgid "Black & white"
 msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 #, fuzzy
 msgid "AE & Flash"
 msgstr "NINCS vaku"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 #, fuzzy
 msgid "AE only"
 msgstr "kész"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 #, fuzzy
 msgid "Flash only"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 #, fuzzy
 msgid "Remote Mirror Up"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "Alacsony (a legjobb minőség)"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 #, fuzzy
 msgid "Flash/aperture"
 msgstr "Apertúra"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 #, fuzzy
 msgid "NEF+Fine"
 msgstr "Finom"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 #, fuzzy
 msgid "NEF+Normal"
 msgstr "Normál"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "Normál"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "Normál"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "Finom"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+msgid "RAW+JPEG (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+msgid "RAW+HEIF (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6884
+msgid "RAW+HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Finom"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+msgid "2M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6920
+msgid "RAW & JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6922
+msgid "RAW Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 #, fuzzy
 msgid "Optimal quality"
 msgstr "Képminőség"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 #, fuzzy
 msgid "3 (Normal)"
 msgstr "Normál"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr ""
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5271
-msgid "75%"
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
+#: camlibs/ptp2/config.c:7312
+msgid "75%"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 #, fuzzy
 msgid "Unknown value"
 msgstr "Ismeretlen hiba"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 #, fuzzy
 msgid "Press Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "portugál"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Képméret"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "A kártya írásvédett."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "A kértya nincs megformázva"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Íriszhiba."
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Az akkumulátor lemerült, a kamera kikapcsolt."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP I/O-hiba"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Az apertúra beállításai"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "A kértya nincs megformázva"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "Fluoreszkáló"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "az idő beállítva"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Fekete-fehér"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Apertúra"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Apertúra"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Apertúra"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Apertúra"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatikus\n"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Automatikus\n"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "ismeretlen (0x%02x)"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Makró"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+msgid "A"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Felvétel"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Lejátszás"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Egyéb beállítások"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Fájlfelbontás"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "A TV-menü ne jelenjen meg"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Kép"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9970
 #, fuzzy
 msgid "Internal RAM"
 msgstr "belső"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 #, fuzzy
 msgid "Memory card"
 msgstr "Nincs kártya"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 #, fuzzy
 msgid "Display"
 msgstr "lejátszás"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 #, fuzzy
 msgid "Default gateway"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 #, fuzzy
 msgid "List Wifi profiles"
 msgstr "Az összes fájl kilistázása"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Fókusz"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 #, fuzzy
 msgid "Bulb Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "NINCS vaku"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "A fókusz helyzete"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+msgid "Focus Magnify Down"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+msgid "Focus Magnify Right"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 #, fuzzy
 msgid "Serial Number"
 msgstr "%sSorozatszám: %s\n"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 #, fuzzy
 msgid "Camera Manufacturer"
 msgstr "A kamera OK.\n"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 #, fuzzy
 msgid "Device Version"
 msgstr "Verzió:"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 #, fuzzy
 msgid "PTP Version"
 msgstr "Verzió:"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 #, fuzzy
 msgid "DPOF Version"
 msgstr "Verzió:"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 #, fuzzy
 msgid "AC Power"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 #, fuzzy
 msgid "External Flash"
 msgstr "külső"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Pontmérő mód (spot metering)"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 #, fuzzy
 msgid "Camera Orientation"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 #, fuzzy
 msgid "Flash Open"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 #, fuzzy
 msgid "Flash Charged"
 msgstr "Compact Flash kártya"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 #, fuzzy
 msgid "Lens Name"
 msgstr "Lencsemód"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 #, fuzzy
 msgid "Shutter Counter"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 #, fuzzy
 msgid "Available Shots"
 msgstr "A rendelkezésre álló memória: "
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "Magas"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "Magas"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 #, fuzzy
 msgid "AF Locked"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Felbontáskapcsoló"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 #, fuzzy
 msgid "Camera Date and Time"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 #, fuzzy
 msgid "Image Comment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 #, fuzzy
 msgid "Enable Image Comment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 #, fuzzy
 msgid "Camera Output"
 msgstr "A kamera OK.\n"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 #, fuzzy
 msgid "Flicker Reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Compact Flash kártya"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "Automatikus kikapcsolás (perc)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "A kamera beállításai"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Az előnézeti kép mérete: %d\n"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 #, fuzzy
 msgid "Capture Target"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Autofókuszálási hiba."
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Fájlfelbontás"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Képméret"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "Automatikus"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 #, fuzzy
 msgid "WhiteBalance X A"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 #, fuzzy
 msgid "WhiteBalance X B"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 #, fuzzy
 msgid "Color Model"
 msgstr "Színmód"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 #, fuzzy
 msgid "Color Space"
 msgstr "Színmód"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Dátumformátum"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Fájlfelbontás"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Kontraszt-"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Az LCD fényereje"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Dátumformátum"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 #, fuzzy
 msgid "Auto Focus Mode 2"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Zársebesség (s)"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Exponálási kompenzáció"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+#, fuzzy
+msgid "AF Mode"
+msgstr "LED-mód"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Képkiigazítás"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Képminőség"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Képméret"
+
+#: camlibs/ptp2/config.c:10962
+msgid "PC Save Image Format"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 #, fuzzy
 msgid "Focus Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Felvételi mód"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+msgid "AF Method"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr "Képméret"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "Autoexponálási zárolás"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 #, fuzzy
 msgid "Drive Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
 msgstr "Képbeállítások"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Apertúra"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 #, fuzzy
 msgid "Capture Delay"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 #, fuzzy
 msgid "AF Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exponálás"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 #, fuzzy
 msgid "Flash Sign"
 msgstr "A vaku beállításai"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "Vaku mindig\n"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "Képméret"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 #, fuzzy
 msgid "EV Step"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "Felvételi mód"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 #, fuzzy
 msgid "Sharpening"
 msgstr "Töltés"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 #, fuzzy
 msgid "Saturation"
 msgstr "Beállítások"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "Hang"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 #, fuzzy
 msgid "Video Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Automatikus, vörösszemeffektus-csökkentés"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-#, fuzzy
-msgid "Movie Quality"
-msgstr "Képminőség"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Minimum Shutter Speed"
+msgid "Continuous Shooting Speed Slow"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
+msgid "Minimum Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+#, fuzzy
+msgid "Movie Quality"
+msgstr "Képminőség"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 #, fuzzy
 msgid "JPEG Compression Policy"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 #, fuzzy
 msgid "AF Lock On"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 #, fuzzy
 msgid "Raw Compression"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Képminőség"
 
-#: camlibs/ptp2/config.c:7543
-#, fuzzy
-msgid "Image Settings"
-msgstr "A kamera beállításai"
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 #, fuzzy
 msgid "Other PTP Device Properties"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "A könyvtár nem található"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7853,2876 +10103,3002 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+#, fuzzy
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "A kamera nem támogatja fájlnevek cserélését."
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 #, fuzzy
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-#, fuzzy
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "A kamera nem támogatja fájlnevek cserélését."
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "A kamera nem támogatja fájlnevek cserélését."
+
+#: camlibs/ptp2/library.c:4128
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr ""
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
 msgstr "%sGyártó: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, fuzzy, c-format
 msgid "Model: %s\n"
 msgstr "Típus:"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, fuzzy, c-format
 msgid "  Version: %s\n"
 msgstr "Verzió:"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, fuzzy, c-format
 msgid "  Serial Number: %s\n"
 msgstr "%sSorozatszám: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "A firmware verziószáma: %d.%02d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, fuzzy, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 #, fuzzy
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 #, fuzzy
 msgid "Display Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 #, fuzzy
 msgid "File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 #, fuzzy
 msgid "No File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 #, fuzzy
 msgid "File Upload\n"
 msgstr "Fájl feltöltése..."
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 #, fuzzy
 msgid "Open Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 #, fuzzy
 msgid "\tCanon Wifi support\n"
 msgstr "A kártya nem támogatott."
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Általános"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 #, fuzzy
 msgid "Read-Only"
 msgstr "Kész"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 #, fuzzy
 msgid "cannot be queried.\n"
 msgstr "A kártya nem írható."
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 #, fuzzy
 msgid "read only"
 msgstr "kész"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "A kamera nem teszi lehetővé a beállítások módosítását."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr "A PTP csak USB-csatolós kameráknál használható."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK."
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP - általános hiba"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP - a munkafolyamat nincs megnyitva"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP - érvénytelen tranzakciós azonosító"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP - nem támogatott művelet"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP - nem támogatott paraméter"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP - nem teljes transzfer"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP érvénytelen tárolóazonosító"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "Érvénytelen PTP objektumazonosító"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP érvénytelen objektumformátum-kód"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP - az objektum írásvédett"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP - a tároló csak olvasható"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP - a hozzáférés megtagadva"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP - nem érhető el előnézeti kép"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "A PTP-tároló nem érhető el"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "Nem támogatott formátumú PTP-specifikáció"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP érvénytelen objektuminformáció"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP érvénytelen kódformátum"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "A PTP-felvétel már befejeződött"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP érvénytelen eszköztulajdonság-formátum"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP érvénytelen eszköztulajdonság-érték"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP - érvénytelen paraméter"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP - a munkafolyamat már meg van nyitva"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP - a tranzakció félbeszakadt"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Nem támogatott PTP specifikáció vagy cél"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "Érvénytelen PTP objektumazonosító"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "A hiba oka nem ismert"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "PTP - érvénytelen paraméter"
+
+#: camlibs/ptp2/ptp.c:6117
 #, fuzzy
 msgid "Filename Required"
 msgstr "PTP EK fájlnév szükséges"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 #, fuzzy
 msgid "Filename Conflicts"
 msgstr "PTP EK fájlnévütközés"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "Érvénytelen PTP EK fájlnév"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 #, fuzzy
 msgid "Out of Focus"
 msgstr "Elfogyott a memória"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 #, fuzzy
 msgid "Change Camera Mode Failed"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 #, fuzzy
 msgid "Invalid Status"
 msgstr "Érvénytelen"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP - nem érhető el előnézeti kép"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Strobe-hiba."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "A kértya nincs megformázva"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Zársebesség (s)"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "A PTP-felvétel már befejeződött"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Ismeretlen típus"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "A művelet félbeszakadt"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "akkumulátor"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "A kamera típusa (csak olvasható)"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "akkumulátor"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP érvénytelen objektumformátum-kód"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP érvénytelen objektumformátum-kód"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP érvénytelen eszköztulajdonság-érték"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "Érvénytelen PTP objektumazonosító"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "PTP - érvénytelen paraméter"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "Nem támogatott formátumú PTP-specifikáció"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "Nem támogatott formátumú PTP-specifikáció"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Nem támogatott PTP eszköztulajdonság"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "PTP - érvénytelen tranzakciós azonosító"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP - nem támogatott művelet"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 #, fuzzy
 msgid "PTP Timeout"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "PTP protokollhiba, nem érkezett adat"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "PTP I/O-hiba"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Fehéregyensúly"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digitális nagyítás"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Dátumformátum"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Fájlfelbontás"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Képminőség"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Kontraszt-"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Az LCD fényereje"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Dátumformátum"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 #, fuzzy
 msgid "Power Saving"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 #, fuzzy
 msgid "UI Language"
 msgstr "Nyelv"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 #, fuzzy
 msgid "Battery Type"
 msgstr "akkumulátor"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 #, fuzzy
 msgid "Battery Mode"
 msgstr "akkumulátor"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 #, fuzzy
 msgid "Camera Mode"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 #, fuzzy
 msgid "Self Time"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-#, fuzzy
-msgid "Shooting Mode"
-msgstr "Zársebesség (s)"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 #, fuzzy
 msgid "Image Mode"
 msgstr "Képméret"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 #, fuzzy
 msgid "Slow Shutter Setting"
 msgstr "Képkészítési beállítások"
 
-#: camlibs/ptp2/ptp.c:4825
-#, fuzzy
-msgid "AF Mode"
-msgstr "LED-mód"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 #, fuzzy
 msgid "Color Gain"
 msgstr "Színbeállítások"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 #, fuzzy
 msgid "Parameter Set"
 msgstr "1. paraméter"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 #, fuzzy
 msgid "Capture Transfer Mode"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Képminőség"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 #, fuzzy
 msgid "Camera Owner"
 msgstr "A kamera OK.\n"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 #, fuzzy
 msgid "Camera Body ID"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Digitális nagyítás"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 #, fuzzy
 msgid "Ml Spot Position"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 #, fuzzy
 msgid "Model ID"
 msgstr "Típus:"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 #, fuzzy
 msgid "White Balance Preset Number"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 #, fuzzy
 msgid "White Balance Preset Name 0"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 #, fuzzy
 msgid "White Balance Preset Name 1"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 #, fuzzy
 msgid "White Balance Preset Name 2"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 #, fuzzy
 msgid "White Balance Preset Name 3"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 #, fuzzy
 msgid "White Balance Preset Name 4"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 #, fuzzy
 msgid "White Balance Preset Value 0"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 #, fuzzy
 msgid "White Balance Preset Value 1"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 #, fuzzy
 msgid "White Balance Preset Value 2"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 #, fuzzy
 msgid "White Balance Preset Value 3"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 #, fuzzy
 msgid "White Balance Preset Value 4"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 #, fuzzy
 msgid "Focus Area Zone"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 #, fuzzy
 msgid "Enable Copyright"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 #, fuzzy
 msgid "Copyright Information"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Vaku mindig\n"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Jelenlegi üzemmód: lejátszás\n"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 #, fuzzy
 msgid "Function Button 2"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "Normál"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 #, fuzzy
 msgid "Clean Image Sensor"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 #, fuzzy
 msgid "Image Rotation"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 #, fuzzy
 msgid "Lens ID"
 msgstr "Lencsemód"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 #, fuzzy
 msgid "Lens Sort"
 msgstr "Lencsemód"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 #, fuzzy
 msgid "Lens Type"
 msgstr "Lencsemód"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 #, fuzzy
 msgid "Warning Status"
 msgstr "A kártya állapota:\t\t"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD-mód"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 #, fuzzy
 msgid "USB Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 #, fuzzy
 msgid "CCD Serial Number"
 msgstr "%sSorozatszám: %s\n"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "Képkészítési beállítások"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "Képkészítési beállítások"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 #, fuzzy
 msgid "BW Contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
+#: camlibs/ptp2/ptp.c:6951
 #, fuzzy
-msgid "Flourescent Type"
+msgid "Fluorescent Type"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 #, fuzzy
 msgid "Tune Preset 0"
 msgstr "portugál"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 #, fuzzy
 msgid "Tune Preset 1"
 msgstr "portugál"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 #, fuzzy
 msgid "Tune Preset 2"
 msgstr "portugál"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 #, fuzzy
 msgid "Tune Preset 3"
 msgstr "portugál"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 #, fuzzy
 msgid "Tune Preset 4"
 msgstr "portugál"
 
-#: camlibs/ptp2/ptp.c:5267
-#, fuzzy
-msgid "Autofocus Mode"
-msgstr "Fókuszálási mód"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "Automatikus"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 #, fuzzy
 msgid "Battery Cell Kind"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "A vaku beállításai"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 #, fuzzy
 msgid "Exposure Display Status"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Nyelv"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "Képminőség"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 #, fuzzy
 msgid "Release Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 #, fuzzy
 msgid "Focus Areas"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptp.c:5422
+#: camlibs/ptp2/ptp.c:7326
 #, fuzzy
-msgid "AE Lock"
-msgstr "Exponálás"
+msgid "Focus Point"
+msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "Képméret"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Elfogyott a memória"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "Kép"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "A fókusz helyzete"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Dátum és idő"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Fehéren izzó"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 #, fuzzy
 msgid "Automatic flash"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 #, fuzzy
 msgid "Red-eye fill flash"
 msgstr "Vörösszem-vaku"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "távoli"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "Az LCD fényereje"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 #, fuzzy
 msgid "Dark on light"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 #, fuzzy
 msgid "Light on dark"
 msgstr "Túl sötét a megvilágítás."
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "SuperFine"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 #, fuzzy
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 #, fuzzy
 msgid "High 2"
 msgstr "Magas"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "1. paraméter"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "2. paraméter"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "3. paraméter"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 #, fuzzy
 msgid "Encounter"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 #, fuzzy
 msgid "Undefined Document"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 #, fuzzy
 msgid "Undefined Contact"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 #, fuzzy
 msgid "Open session"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 #, fuzzy
 msgid "Close session"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 #, fuzzy
 msgid "Get thumbnail"
 msgstr "Előnézeti képek letöltése..."
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 #, fuzzy
 msgid "Self test device"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "Nem felismerhető válasz"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 #, fuzzy
 msgid "Get meter response"
 msgstr "Nem várt válasz érkezett"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Ismeretlen hiba"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Ismeretlen hiba"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 #, fuzzy
 msgid "Downloading movie..."
 msgstr "Fájl letöltése..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 #, fuzzy
 msgid "Downloading audio..."
 msgstr "Letöltés..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 #, fuzzy
 msgid "Downloading EXIF data..."
 msgstr "Adatok letöltése..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, fuzzy, c-format
 msgid "No EXIF data available for %s."
 msgstr "nem érhető el: %s"
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 #, fuzzy
 msgid "Could not delete file."
 msgstr "A(z) '%s' fájl nem található."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 #, fuzzy
 msgid "Could not remove directory."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 #, fuzzy
 msgid "Could not create directory."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, fuzzy, c-format
 msgid "Version: %s\n"
 msgstr "Verzió:"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, fuzzy, c-format
 msgid "RTC Status: %d\n"
 msgstr "A kártya állapota:\t\t"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, fuzzy, c-format
 msgid "Camera time: %s %s\n"
 msgstr "%sKameraazonosító: %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, fuzzy, c-format
 msgid "Camera ID: %s\n"
 msgstr "%sKameraazonosító: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, fuzzy, c-format
 msgid "No SD Card inserted.\n"
 msgstr "A kártya nem támogatott."
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, fuzzy, c-format
 msgid "SD Card ID: %s\n"
 msgstr "%sKameraazonosító: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, fuzzy, c-format
 msgid "Photos on camera: %d\n"
 msgstr "A kamera memóriája: %d Mbit.\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10730,7 +13106,7 @@
 "at the firmware update image and wild guessing.\n"
 msgstr ""
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10742,12 +13118,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "Bob Paauwe meghajtóprogramja segítségével\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10756,160 +13132,160 @@
 "Típus: %s\n"
 "Memória: %d bájt áll rendelkezésre %d bájtból"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2,0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1,5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1,0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0,5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0,0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0,5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1,0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1,5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2,0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Szabadban"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximális"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimális"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Karakter"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Hang"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Kép és hang"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Karakter és hang"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Általános"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Szerzői jog (max. 20 karakter)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Képek"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Fehérszint"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Tömörítés"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "A megadott sebesség (%i) nem támogatott."
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, fuzzy, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "%i bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, fuzzy, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "%i bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, fuzzy, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "0x%x helyett 0x%x érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, fuzzy, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Hibás karakterek (0x%x, 0x%x). Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, fuzzy, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
@@ -10917,48 +13293,48 @@
 "probkléma nem szűnik meg, kérjük jelezze itt: <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, fuzzy, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Időtúllépési hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 "hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, fuzzy, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Adatátviteli hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 "hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, fuzzy, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "A kamera nem megfelelő módba van kacsolva. További információ: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, fuzzy, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "A kamera nem fogadta el a paramétereket. Kérjük jelezze a hibát ezen a "
 "címen: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, fuzzy, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ismeretlen hiba történt. Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "A fájlnév nem lehet 12 karakternél hosszabb ('%s': %i karakter)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10970,110 +13346,110 @@
 "átírta a gphoto2-höz. Marcus Meissner <marcus@jet.franken.de> tovább "
 "tökéletesítette az átiratot, kijavítva néhány hibát."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Felbontás és méret"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Dátum és idő (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 #, fuzzy
 msgid "Aperture Settings"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Színmód"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "A vaku beállításai"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "A számítógép energiatakarékossági ideje (s)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "A kamera energiatakarékossági ideje (s)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Lencsemód"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "koreai"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "angol"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "francia"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "német"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "olasz"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "japán"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "spanyol"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "portugál"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Képbeállítások"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 #, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11094,35 +13470,35 @@
 "  fejtettem vissza, ha az Ön gépénél nem működik valami,\n"
 "  kérem értesítsen a <gphoto-devel@lists.sourceforge.net> címen (angolul)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Nincs behelyezve memóriakártya"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "A telep kapacitását nem lehet lekérdezni"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "A kamera energiaszintje nagyon alacsony (%d%%). A művelet félbeszakadt."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Nem kérdezhető le a rendelkezésre álló szabad memória"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "A kamera háromszor is megtagadta a kapcsolat nyitvatartását."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Az első fogadott bájt (0x%x) érvénytelen."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, fuzzy, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -11130,60 +13506,60 @@
 "Egy csomag átvitele %i próbálkozás után is időtúllépési hibával fejeződött "
 "be. Kérjük jelezze a hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Több próbálkozás után sem sikerült egy csomag átvitele."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, fuzzy, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr ""
 "A kamera visszautasított egy csomagot. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, fuzzy, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Egy csomag átvitele nem sikerült (hibakód: %i). Kérjük jelezze a hibát itt: "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "Az adatátvitel 2 próbálkozás után sem sikerült (időtúllépés történt). A "
 "művelet nem sikerült..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, fuzzy, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Nem várt eredmény: 0x%x. További információ: <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, fuzzy, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Nem várt válasz érkezett (%i). Küldjön hibajelentést erre a címre: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, fuzzy, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Nem sikerült regisztrálni: %i. További információ: <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Túl sok próbálkozás nem sikerült."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Adatok küldése..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, fuzzy, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -11191,156 +13567,152 @@
 "Rekurzív hívásokat nem támogat a Sierra-meghajtó! További információ: "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, fuzzy, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Egy sztringregiszter (%i) letöltése nem sikerült. Kérjük jelezze a hibát "
 "itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, fuzzy, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Zársebesség ezredmásodpercben (0=automatikus)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Zársebesség (s)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 #, fuzzy
 msgid "Slow-sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontraszt+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontraszt-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 #, fuzzy
 msgid "Brightness+"
 msgstr "Az LCD fényereje"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 #, fuzzy
 msgid "Brightness-"
 msgstr "Az LCD fényereje"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Képkiigazítás"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED-mód"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 #, fuzzy
 msgid "Infinity"
 msgstr "Végtelen/halszem"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Működési mód"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Az LCD fényereje"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Az LCD automatikus kikapcsolása (s)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Exponálásmérés"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Nagyítás (mm)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 #, fuzzy
 msgid "none"
 msgstr "Nincs"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 #, fuzzy
 msgid "Fisheye"
 msgstr "Fájltípus"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "Egyéb exponálási- és lencsebeállítások"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Autoexponálási zárolás"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11370,7 +13742,7 @@
 "        Kapcsolja a kamerát 'M' módba a\n"
 "        zársebesség beállításához.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 #, fuzzy
 msgid ""
 "Nikon Coolpix 995:\n"
@@ -11391,73 +13763,69 @@
 "\n"
 "    A letöltési funkciónak mindenképpen működnie kell.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 #, fuzzy
 msgid "White board"
 msgstr "Fehér alap"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 #, fuzzy
 msgid "Black board"
 msgstr "Fekete alap"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "Működési mód"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluoreszkáló"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluoreszkáló"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD-mód"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digitális nagyítás"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "A fókusz helyzete"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Időformátum"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -11494,7 +13862,7 @@
 "    kösse össze újból a számítógépet és a kamerát,\n"
 "    és kapcsolja 'Off' állapotba az LCD-t."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -11528,7 +13896,7 @@
 "    kösse össze újból a számítógépet és a kamerát,\n"
 "    és kapcsolja 'Off' állapotba az LCD-t."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 #, fuzzy
 msgid ""
 "Default sierra driver:\n"
@@ -11559,232 +13927,237 @@
 "    a hiányzó opciók elkészítésében, kérjük\n"
 "    értesítsen minket a gphoto-devel@gphoto.net címen.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (ismeretlen)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "A feltöltendő fájl 0 hosszúságú"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Nincs elég szabad memória a memóriakártyán"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Nem sikerült lekérdezni a képeket tartalmazó könyvtár nevét"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Csak a(z) '%s' mappába lehet fájlokat feltölteni"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Legjobb"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (ismeretlen)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Zársebesség (ezredmásodperc, 0 = automatikus)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Fekete/fehér"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Fehér alap"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Fekete alap"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Fényerő/kontraszt"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Fényerő+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Fényerő-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Égbolt"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Végtelen/halszem"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1,6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2,5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Automatikus kikapcsolás (kapcsolat esetén) (s)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 "Mennyi idő után kapcsoljon le a kamera, ha össze van kötve egy számítógéppel?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Automatikus kikapcsolás (kapcsolat nélkül) (s)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 "Mennyi idő után kapcsoljon le a kamera, ha nincs összekötve számítógéppel?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD automatikus kikapcsolás (s)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Képkészítési beállítások"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 #, fuzzy
 msgid "standard"
 msgstr "Standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "színes"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "fekete-fehér"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "Megjegyzés: nincs memóriakártya, néhány érték érvénytelen lehet\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, fuzzy, c-format
 msgid "Camera Model: %s\n"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, fuzzy, c-format
 msgid "Serial Number: %s\n"
 msgstr "%sSorozatszám: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, fuzzy, c-format
 msgid "Software Rev.: %s\n"
 msgstr "%sA szoftver revíziója: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, fuzzy, c-format
 msgid "Frames Taken: %i\n"
 msgstr "%sFelvett képkocka: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, fuzzy, c-format
 msgid "Frames Left: %i\n"
 msgstr "%sMegmaradt képkocka: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, fuzzy, c-format
 msgid "Battery Life: %i\n"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, fuzzy, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "%sMegmaradt memória: %i bájt\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, fuzzy, c-format
 msgid "Date: %s"
 msgstr "%sDátum: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, fuzzy, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11805,7 +14178,7 @@
 "  fejtettem vissza, ha az Ön gépénél nem működik valami,\n"
 "  kérem értesítsen a <gphoto-devel@lists.sourceforge.net> címen (angolul)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -11842,7 +14215,7 @@
 "    kösse össze újból a számítógépet és a kamerát,\n"
 "    és kapcsolja 'Off' állapotba az LCD-t."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -11863,12 +14236,7 @@
 "akik engedélyezték az Olympus C-3030Z for USB termékük\n"
 "felhasználását a program elkészítéséhez."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (ismeretlen)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11878,11 +14246,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Nem sikerült alkalmazni az USB-beállításokat"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11899,7 +14267,7 @@
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11910,7 +14278,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11925,13 +14293,13 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11945,7 +14313,7 @@
 "Ken-ichi Hayashi munkája\n"
 "A Gphoto2-átirat szerzője: Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11957,7 +14325,7 @@
 "Az eredeti program Mark Davies <mdavies@dial.pipex.com> munkája\n"
 "Átirat a gPhoto2-höz: Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11966,12 +14334,12 @@
 "Memory Free:  %ikB\n"
 msgstr ""
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, fuzzy, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Firmware-revízió: %d.%d\n"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11979,14 +14347,14 @@
 "Soundvision-meghajtó\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
 " Files: %d\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11997,7 +14365,7 @@
 "Space free: %8d\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 #, fuzzy
 msgid "spca50x library v"
 msgstr "gsmart programkönyvtár v"
@@ -12039,19 +14407,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12059,11 +14427,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12071,111 +14435,111 @@
 "Protocol reverse engineered using SnoopyPro\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Hibás exponálás (valószínűleg nincs elég fény)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 #, fuzzy
 msgid "Information on STV0680-based camera:\n"
 msgstr "Információ (STV0680-alapú kamera):\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Firmware-revízió: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC-revízió: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Érzékelőazonosító: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, fuzzy, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "A kamera %dHz-es fényfelvillantásra van beállítva.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "A kamera memóriája: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "A kamera támogatja gyorsnézeti képek (thumbnailek) használatát.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "A kamera támogatja videofelvételek készítését.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "A kamera képei fekete-fehérek.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "A kamera nem tartalmaz memóriát.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "A kamera által támogatott videoformátumok: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Gyártóazonosító: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Termékazonosító: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "A képek maximális száma: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "A kép szélessége: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "A kép magassága: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "A kép mérete: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Az előnézeti kép szélessége: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Az előnézeti kép magassága: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Az előnézeti kép mérete: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12192,12 +14556,12 @@
 "Továbbfejlesztette a meghajtóprogramot az Aiptek PenCam és más STM USB duál "
 "módú kamerák kezeléséhez."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Információ lekérdezése %i fájlról..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12205,20 +14569,20 @@
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "az sx330z csak USB-s"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 #, fuzzy
 msgid "Driver Settings"
 msgstr "Egyéb beállítások"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12226,52 +14590,72 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, fuzzy, c-format
 msgid "Downloading %s..."
 msgstr "'%s' letöltése..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 driver.\n"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Kamerameghajtók letöltése innen: '%s'..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Hiba történt a kimeneti/bemeneti programkönyvtárban ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Nem található kamera"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, fuzzy, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Nem található kamera"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 #, fuzzy
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "A kamera inicializálása előtt be kell állítani a port értékét."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Nem sikerült betölteni a(z) '%s' nevű meghajtóprogramot (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, fuzzy, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "A(z) '%s' nevű meghajtóprogram nem tartalmaz 'camera init' függvényt."
@@ -12312,12 +14696,12 @@
 msgid "This camera can not capture previews."
 msgstr "Ez a kamera nem támogat gyorsnézeteket."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Az elérési út ('%s') nem abszolút."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12326,122 +14710,122 @@
 "A program megpróbálta törölni a(z) '%s' fájlt a(z) '%s' mappából, de a "
 "fájlrendszer nem támogatja fájlok törlését."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, fuzzy, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Az eltávolítani kívánt '%s' könyvtár nem üres, még tartalmaz alkönyvtárakat."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, fuzzy, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Az eltávolítani kívánt '%s' könyvtár még nem üres, fájlokat tartalmaz."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "A fájlrendszer nem támogatja fájlok feltöltését."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, fuzzy, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 "A(z) '%s' könyvtár csak %i fájlt tartalmaz, de a kért fájl száma %i volt."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "A(z) '%s' fájl nem található."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "A fájlrendszer nem támogatja fájlok letöltését"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ismeretlen fájltípus: %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "A fájlrendszer nem támogatja a fájljellemzők lekérdezését."
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "A fájlrendszer nem támogatja fájlinformációk beállítását"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "A csak olvasható fájljellemzők (pl. szélesség, magasság) nem változtathatók "
 "meg."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 #, fuzzy
 msgid "The filesystem doesn't support getting storage information"
 msgstr "A fájlrendszer nem támogatja a fájljellemzők lekérdezését."
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Hibás adatok"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "A fájl már létezik"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Ismeretlen típus"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "A könyvtár nem található"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "A könyvtár már létezik"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Az elérési út nem abzolút"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "A művelet félbeszakadt"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 #, fuzzy
 msgid "OS error in camera communication"
 msgstr "Nem sikerült beállítani a kamera átviteli sebességét"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Ismeretlen hiba a kamerakezelő programkönyvtárban"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -12467,9 +14851,11 @@
 #~ msgid "Unsupported image type"
 #~ msgstr "Nem támogatott képtípus"
 
+#, c-format
 #~ msgid "Could not follow the link '%s' (%m)."
 #~ msgstr "A(z) '%s' link követése nem sikerült (%m)."
 
+#, c-format
 #~ msgid "Could not follow the link '%s' in '%s' (%m)."
 #~ msgstr "Nem sikerült követni a(z) '%s' linket itt: '%s' (%m)."
 
@@ -12479,7 +14865,7 @@
 #~ msgid "View hidden directories"
 #~ msgstr "A rejtett könyvtárak megjelenítése"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
 #~ msgstr ""
 #~ "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
@@ -12553,10 +14939,6 @@
 #~ msgstr "Kamera"
 
 #, fuzzy
-#~ msgid "Macro Mode"
-#~ msgstr "Felvételi mód"
-
-#, fuzzy
 #~ msgid "Number of values"
 #~ msgstr "A képek száma: %d\n"
 
@@ -12725,29 +15107,14 @@
 #~ msgstr "PTP protokollhiba, nem jött válasz"
 
 #, fuzzy
-#~ msgid "Date Time"
-#~ msgstr "Dátum és idő"
-
-#, fuzzy
-#~ msgid "ShutterSpeed"
-#~ msgstr "Zársebesség (s)"
-
-#, fuzzy
 #~ msgid "Real Image Width"
 #~ msgstr "A kép szélessége: %d\n"
 
 #, fuzzy
-#~ msgid "Colour Mode"
-#~ msgstr "Színmód"
-
-#, fuzzy
-#~ msgid "Exposure Bracketing Distance"
-#~ msgstr "Exponálásmérés"
-
-#, fuzzy
 #~ msgid "Incadescent"
 #~ msgstr "Fehéren izzó"
 
+#, c-format
 #~ msgid "%sCamera ID: %s\n"
 #~ msgstr "%sKameraazonosító: %s\n"
 
@@ -12760,12 +15127,15 @@
 #~ msgid "Sorry, taking pictures is not implemented..."
 #~ msgstr "Képek készítése egyelőre nem lehetséges."
 
+#, c-format
 #~ msgid "Couldn't open camera.\n"
 #~ msgstr "A kamera megnyitása nem sikerült.\n"
 
+#, c-format
 #~ msgid "Error opening camera\n"
 #~ msgstr "Hiba történt a kamera megnyitása közben\n"
 
+#, c-format
 #~ msgid "Picture number is too large.\n"
 #~ msgstr "A képek száma túl nagy.\n"
 
@@ -12802,38 +15172,47 @@
 #~ "rendelkezésre).\n"
 #~ "\n"
 
+#, c-format
 #~ msgid "Could not open '%s'"
 #~ msgstr "Nem sikerült megnyitni: '%s'..."
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "Nem található meghajtó ehhez: '%s'"
 
 #~ msgid "No additional information available."
 #~ msgstr "Nem áll rendelkezésre további információ."
 
+#, c-format
 #~ msgid "Could not load required camera driver '%s'."
 #~ msgstr "A szükséges meghajtóprogram ('%s') betöltése nem sikerült."
 
+#, c-format
 #~ msgid "Could not append folder '%s' as this folder already exists."
 #~ msgstr ""
 #~ "A(z) '%s' nevű könyvtár hozzáfűzése nem sikerült, mert már létezik ilyen "
 #~ "nevű könyvtár."
 
+#, c-format
 #~ msgid "Could not find folder '%s'."
 #~ msgstr "'%s' nevű könyvtár nem ttalálható."
 
+#, c-format
 #~ msgid "Folder '%s' does not contain a folder '%s'."
 #~ msgstr "A(z) '%s' nevű könyvtár nem tartalmaz '%s' nevű fájlt."
 
+#, c-format
 #~ msgid ""
 #~ "Could not append '%s' to folder '%s' because this file already exists."
 #~ msgstr ""
 #~ "Nem sikerült hozzáfűzni ezt: '%s' a(z) '%s' mappához, mert a fájl már "
 #~ "létezik."
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "'%s' letöltése a(z) '%s' mappából..."
 
+#, c-format
 #~ msgid ""
 #~ "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 #~ "filesystem is mounted."
@@ -12841,17 +15220,19 @@
 #~ "Nem sikerült megnyitni olvasásra a '/proc/meminfo' fájlt ('%m'). "
 #~ "Ellenőrizze, hogy a proc fájlrendszer csatlakoztatva van-e."
 
+#, c-format
 #~ msgid "An error occured while reading '/proc/meminfo' ('%m')."
 #~ msgstr "Hiba történt '/proc/meminfo' olvasása közben ('%m')."
 
+#, c-format
 #~ msgid "sysctl call failed ('%m')."
 #~ msgstr "A sysctl hívás nem sikerült ('%m')."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "sysconf call failed ('%m')."
 #~ msgstr "A sysctl hívás nem sikerült ('%m')."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "swapctl call failed ('%m')."
 #~ msgstr "A sysctl hívás nem sikerült ('%m')."

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/it.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/it.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/it.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/it.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.5.8\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2015-08-05 14:42+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -27,7 +27,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -36,12 +36,12 @@
 "La fotocamera sembra non usare memorie CompactFlash\n"
 "Sfortunatamente ciò non è supportato al momento.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "La fotocamera ha scattato %d foto, e usa memoria CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -74,19 +74,19 @@
 "Driver generico Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -94,16 +94,18 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr ""
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -112,7 +114,7 @@
 "Numero di immagini: %i\n"
 "Versione del firmware: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -136,26 +138,26 @@
 "Implementato usando documenti trovati\n"
 "in rete. Permesso ottenuto da Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Impossibile creare la directory %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Impossibile rimuovere la directory \"%s\"."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "blocco dei tasti non riuscito."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*SCONOSCIUTO*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -164,7 +166,7 @@
 "canon_int_capture_image: canon_usb_list_all_dirs() iniziale fallito con "
 "stato %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -173,19 +175,19 @@
 "canon_int_capture_image: canon_usb_list_all_dirs() finale fallito con stato "
 "%i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Il nome \"%s\" (%li caratteri) è troppo lungo, può avere 30 caratteri al "
 "massimo."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Non sono permesse lettere minuscole in %s."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -193,7 +195,7 @@
 "canon_int_list_directory: ERRORE: messaggio initial troppo corto (%i < "
 "minimo %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -201,26 +203,26 @@
 "canon_int_list_directory: fine del pacchetto raggiunta durante l'analisi "
 "della prima voce di directory"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: incontrata una voce di directory troncata"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "File protetto."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_func: ERRORE: messaggio initial troppo corto (%i < minimo %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Impossibile estrarre miniatura JPEG dai dati: inizio/fine mancante"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Impossibile estrarre miniatura JPEG dai dati: i dati non sono JFIF"
 
@@ -229,7 +231,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parametro \"%s\" NULL in %s riga %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -237,17 +239,17 @@
 "Impossibile gestire il valore %i in camera->port->type aka 0x%x in %s riga "
 "%i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "ERRORE FATALE: valore CRC iniziale per lunghezza %d sconosciuto\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "impossibile indovinare il valore CRC iniziale\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -256,290 +258,301 @@
 "attenzione: CRC non controllato (add len %d, value 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Modo compatibilità"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Immagine intera"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Bulb"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofocus: uno scatto"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr ""
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr ""
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Messa a fuoco manuale"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Segnale acustico spento"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Segnale acustico acceso"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Flash spento"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Flash attivo"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Flash automatico"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manuale 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Scena distante"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Otturatore veloce"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Otturatore lento"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Scena notturna"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Scala di grigi"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Seppia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Ritratto"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Macro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "B/N"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr ""
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Vivo"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutro"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Otturatore lungo"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Fogliame"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Interno"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Fuochi d'artificio"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Spiaggia"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Sott'acqua"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Neve"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Bambini e animali"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Scatto notturno"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Macro digitale"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr ""
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "JPEG Normale piccola"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "JPEG Fine piccola"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "JPEG Normale media"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "JPEG Fine media"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "JPEG Normale larga"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "JPEG Fine larga"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + JPEG Normale piccola"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + JPEG Fine piccola"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + JPEG Normale media"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + JPEG Fine media"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + JPEG Normale piccola"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + JPEG Fine larga"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -556,44 +569,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Fotocamera non disponibile: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Spegnimento fotocamera"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Errore durante la cattura dell'immagine"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Impossibile leggere il nome del disco: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Nessun motivo disponibile"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Impossibile leggere le informazioni sul disco: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Errore interno #1 in get_file_func() (%s riga %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Nessun file audio è stato trovato per %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -604,35 +617,35 @@
 "  %11s byte totali\n"
 "  %11s byte disponibili"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "adattatore AC"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "alimentazione OK"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "non disponibile: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +661,7 @@
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -670,26 +683,26 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Errore durante l'eliminazione del file"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Errore durante l'eliminazione della miniatura associata"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Velocità maggiori di 57600 non sono gestite durante il caricamento su questa "
 "fotocamera"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Impossibile ottenere la lettera del drive flash"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -697,377 +710,399 @@
 "Impossibile fare il caricamento, nessun nome di cartella disponibile!\n"
 "La cartella 999CANON esiste e contiene un'immagine AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Impossibile creare la directory \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Impossibile creare la directory di destinazione."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Configurazione fotocamera e driver"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Impostazioni fotocamera"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Nome proprietario"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr ""
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Velocità ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Modalità di scatto"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Velocità otturatore"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Apertura"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Compensazione esposizione"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Formato immagine"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Modalità messa a fuoco"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Modo flash"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Segnale acustico"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Azioni fotocamera"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Sincronizza data e ora della fotocamera con il PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Informazioni di stato fotocamera"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Modello fotocamera"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Data e ora"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Errore"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Revisione del firmware"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Alimentazione"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Driver"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Elenca tutti i file"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Mantieni il nome di file al caricamento"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Fotocamera non disponibile"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Nome del proprietario cambiato"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "impossibile cambiare il nome del proprietario"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Impostazione velocità ISO non valida"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Velocità ISO cambiata"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Impossibile cambiare la velocità ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Impostazione modalità di scatto non valida"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Modalità di scatto cambiata"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Impossibile cambiare la modalità di scatto"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Impostazione della velocità otturatore non valida"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Velocità otturatore cambiata"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Impossibile cambiare la velocità dell'otturatore"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Impostazione dell'apertura non valida"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Apertura cambiata"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Impossibile cambiare l'apertura"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Impostazione della compensazione dell'esposizione non valida"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Compensazione dell'esposizione cambiata"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Impossibile cambiare la compensazione dell'esposizione"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Impostazione del formato immagine non valida"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Formato immagine cambiato"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Impossibile cambiare il formato immagine"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Impostazione messa a fuoco non valida"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Modalità messa a fuoco cambiata"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Impossibile cambiare la modalità di messa a fuoco"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Impostazione segnale acustico non valida"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Modalità segnale acustico cambiata"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Impossibile cambiare modalità del segnale acustico"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Livello di zoom cambiato"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Impossibile cambiare il livello di zoom"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Impostazione flash non valida"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Modalità flash cambiata"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Impossibile cambiare la modalità flash"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "orario impostato"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "impossibile impostare l'orario"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Tipo di porta %i = 0x%x non gestito. Initializzazione impossibile."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Batteria esaurita, fotocamera spenta."
 
 # FIXME UPSTREAM: missing final '.'
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "ERRORE: messaggio inatteso."
 
 # FIXME UPSTREAM: missing final '.'
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "ERROR: message troppo lungo."
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "ERRORE: fuori sequenza."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "ERRORE: tipo di pacchetto inatteso."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "ERRORE: errore di formato del messaggio."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "ERRORE: messaggio inatteso 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Caricamento del file in corso..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Lettura del file in corso..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1075,151 +1110,151 @@
 "canon_serial_get_dirents: canon_serial_dialogue non è riuscito a recuperare "
 "le voci di directory"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: impossibile allocare %i byte di memoria"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: impossibile leggere un'altra voce di directory"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: ricevuta voce di directory troncata"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: troppe voci di directory, ci deve essere un ciclo."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Impossibile ridimensionare il buffer per le voci "
 "di directory a %i byte"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Errore durante il cambiamento di velocità."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Reimpostazione del protocollo in corso..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Fotocamera OK."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Ricerca della fotocamera..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Tentativo di contattare la fotocamera in corso..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Errore di comunicazione 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Nessuna risposta dalla fotocamera"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Risposta non riconosciuta"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Rilevata una \"%s\" ovvero \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modello \"%s\" sconosciuto"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "EOT non valido"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Errore di comunicazione 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Errore di comunicazione 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Cambiamento velocità in corso... attendere..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Errore durante il cambiamento di velocità"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Errore nell'attesa di ACK durate l'inizializzazione, un altro tentativo in "
 "corso"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Errore nell'attesa di ACK durate l'inizializzazione"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Connesso alla fotocamera"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "ERRORE: rilevata condizione di errore fatale, impossibile continuare "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERRORE: %d è troppo grande"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Lettura miniatura..."
 
 # FIXME: femminile?
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "NON RICONOSCIUTO"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Impossibile stabilire un contatto iniziale con la fotocamera"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "La fotocamera era già attiva"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "La fotocamera è stata risvegliata"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Risposta iniziale '%c' della fotocamera non riconosciuta"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1228,7 +1263,7 @@
 "Passo #2 dell'inizializzazione non riuscito: (\"%s\" durante la lettura di "
 "%i). Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1237,7 +1272,7 @@
 "Passo #2 dell'inizializzazione non riuscito! (restituiti %i byte, attesi "
 "%i). Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1246,7 +1281,7 @@
 "Passo #3 dell'inizializzazione non riuscito: \"%s\" durante la lettura di "
 "%i. Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1255,7 +1290,7 @@
 "Passo #3 dell'inizializzazione non riuscito! (restituito %i, atteso %i). "
 "Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1264,53 +1299,53 @@
 "Passo #3 dell'inizializzazione non riuscito: \"%s\" durante la scrittura di "
 "%i. Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Passo #4 non riuscito: \"%s\" durante la lettura di %i. Fotocamera non "
 "operativa"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Passo #4 non riuscito! (restituito %i, atteso %i). Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Fotocamera non pronta, molte richieste \"Identify camera\" non riuscite: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Fotocamera non pronta, get_battery non riuscito: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
-"canon_usb_lock_keys: restituita lunghezza inattesa dalla funzione \"lock keys"
-"\" (%i byte, attesi %i)"
+"canon_usb_lock_keys: restituita lunghezza inattesa dalla funzione \"lock "
+"keys\" (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: restituita lunghezza inattesa (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: restituita lunghezza inattesa (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1319,20 +1354,20 @@
 "canon_usb_get_body_id: restituita lunghezza dei dati inattesa (%i byte, "
 "attesi %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Ricezione dati in corso..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Memoria esaurita: %d byte necessari."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue non riuscito"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1341,22 +1376,22 @@
 "Avvertimento in canon_usb_set_file_attributes: canon_usb_dialogue ha "
 "restituito lo stato di errore 0x%08x dalla fotocamera"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Impossibile leggere dal file \"%s\""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Memoria esaurita: %ld byte necessari."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Caricamento del file non riuscito."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1364,14 +1399,14 @@
 "Il file era troppo grande. Spegnere e riaccendere la fotocamera prima di "
 "caricare altri file."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1380,14 +1415,14 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue non è riuscito a recuperare "
 "le voci di directory, restituito %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1396,29 +1431,29 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue non è riuscito a recuperare "
 "le voci di directory, restituito %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Individuata una \"%s\"."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 "Il nome \"%s\" dalla fotocamera non corrisponde ad alcuna fotocamera "
 "conosciuta."
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Tipo di immagine %d non gestito"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "L'immagine %s è protetta da eliminazione"
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1426,37 +1461,37 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Livello batteria: %.1f Volt. Revisione: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Configurazione fotocamera"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batteria"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Troppo chiaro"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Troppo scuro"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1523,16 +1558,16 @@
 "Driver generico per sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Tipo di immagine non gestito"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Numero di immagini: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1540,7 +1575,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1548,24 +1583,24 @@
 "Solo la directory radice è gestita (è stato richiesto di elencare la "
 "directory \"%s\")."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problema durante la lettura del numero di immagini"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problema durante la lettura delle informazioni sulle immagini"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Tipo di cattura non gestito"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (la batteria è %d%% carica)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1576,82 +1611,83 @@
 "Camera is %s powered %s.\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flash"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Senza flash"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "Accesa"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "Spenta"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "pronta"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Non pronta"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "bassa (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "alta (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "esternamente"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "internamente"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1662,7 +1698,7 @@
 "* Image quality is currently lower than it could be.\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1679,210 +1715,326 @@
 "     gphoto2 port\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problema leggendo l'immagine dalla memoria"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Scaricamento immagine in corso..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problema durante lo scaricamento dell'immagine"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Scaricamento annullato dall'utente"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Esposizione"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Aggiustamento automatico dell'esposizione nell'anteprima"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Livello di esposizione nell'anteprima"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Flash automatico alla cattura"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problema durante l'apertura della porta"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problema durante la reimpostazione della fotocamera"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr ""
 "Problema durante l'impostazione della velocità di comunicazione della "
 "fotocamera"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Sembra un modem, non una fotocamera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Elencazione dei file in \"%s\"..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Elencazione delle cartelle in \"%s\"..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Impossibile ottenere le informazioni su \"%s\" (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Impossibile ottenere informazioni su \"%s\" in \"%s\" (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Impossibile cambiare l'orario del file \"%s\" in \"%s\" (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Impossibile aprire \"%s\"."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "Impossibile eliminare il file \"%s\" nella cartella \"%s\" (codice errore "
 "%i; %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Configurazione fotocamera e driver"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Modalità di scatto"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Risoluzione"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Risoluzione"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Modalità colore"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Modalità colore"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "La fotocamera ha inviato solo %i byte, ma ne sono necessari almeno %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Impossibile contattare la fotocamera."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Ricevuti dati inattesi (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Sequenza di escape non corretta: attesa 0x%02x, ricevuta 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Dati non corretti - ricevuto 0x%02x, atteso 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Dati non corretti - ricevuto 0x%02x, atteso 0x%02x o 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Somma di controllo non corretta - ricevuto 0x%02x, atteso 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "La fotocamera ha rifiutato il comando."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "La fotocamera si è reimpostata."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "La fotocamera ha inviato il byte 0x%02x inatteso."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Scaricamento in corso..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Impossibile allocare %i byte per scaricare la miniatura."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Impossibile allocare %i byte per scaricare l'immagine."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "La fotocamera non accetta \"%s\" come nome di file."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
-"Impossibile inizializzare il caricamento (la fotocamera ha risposto con 0x"
-"%02x)."
+"Impossibile inizializzare il caricamento (la fotocamera ha risposto con "
+"0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "La fotocamera non supporta la velocità %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr ""
 "Impossibile impostare la velocità a %i (la fotocamera ha risposto con %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1890,36 +2042,36 @@
 "Matthew G. Martin\n"
 "Basato su fujiplay di Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Il bit rate %ld non è gestito."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Configurazione della fotocamera FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Data e ora"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Versione: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modello: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Memoria disponibile: "
 
@@ -1941,18 +2093,18 @@
 "Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Tipo di porta non gestito: %d. Questo driver funziona solo con fotocamere "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Impossibile reimpostare la fotocamera.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -1961,7 +2113,7 @@
 "Questa fotocamera supporta solo l'eliminazione dell'ultimo file. In questo "
 "caso, questo file è \"%s\"."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -1971,7 +2123,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2010,25 +2162,25 @@
 "Driver iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Foto scattate    : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "Libreria jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Scaricamento dei dati in corso..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Scaricamento miniature in corso..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2038,7 +2190,7 @@
 "   - full images (640x480 PPM format)\n"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2046,31 +2198,31 @@
 "Protocol reverse engineered using WINE and IDA."
 msgstr ""
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Configurazione JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Altre impostazioni"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Tempo di esposizione bulb"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Impostazioni colore"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rosso"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Verde"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Blu"
 
@@ -2130,11 +2282,11 @@
 "Libreria per la fotocamera jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Scheda CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2142,7 +2294,7 @@
 "sourceforge.net"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2154,13 +2306,13 @@
 "Libreria per la fotocamera Kodak DC120.\n"
 "(a grande richiesta)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Lettura dei dati..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "In attesa di completamento..."
 
@@ -2173,7 +2325,8 @@
 msgstr "Tipo di file"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2186,7 +2339,7 @@
 msgstr "Risoluzione file"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2210,8 +2363,9 @@
 msgid "High (good quality)"
 msgstr "Alta (buona qualità)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Cattura"
 
@@ -2240,77 +2394,84 @@
 msgstr "Compensazione dell'esposizione"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Forza"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Nessuno"
 
@@ -2319,71 +2480,78 @@
 msgstr "Riduzione occhi rossi"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Acceso"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Spento"
 
@@ -2399,7 +2567,7 @@
 msgid "Port speed"
 msgstr "Velocità porta"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Nome album"
 
@@ -2612,58 +2780,58 @@
 "Libreria per la fotocamera Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "In attesa..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parametro 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parametro 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parametro 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modello: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Versione del firmware: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Stato batteria: %s, adattatore AC: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Numero di immagini: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Spazio rimanente: Alta: %d, Media: %d, Bassa: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Stato scheda di memoria (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Numero di foto scattate: %d, Flash scattati: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2677,45 +2845,46 @@
 "Libreria per le fotocamere Kodak DC240, DC280, DC3400 e DC5000.\n"
 "Riscritto e aggiornato per gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Debole"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Vuoto"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Non valido"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Non usato"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "In uso"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "La scheda è aperta"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "La scheda non è aperta"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "La scheda non è formattata"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Nessuna scheda"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2723,12 +2892,12 @@
 "Un'operazione è in corso. Questa fotocamera gestisce solo un'operazione alla "
 "volta. Attendere fino alla conclusione dell'operazione corrente."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "fotocamera inattiva per più di 9 secondi, reinizializzata.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2738,7 +2907,7 @@
 "reinitialize."
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2750,7 +2919,7 @@
 "\n"
 "Domande e commenti sono apprezzati."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2759,7 +2928,7 @@
 "La fotocamera USB è una Kodak EZ200.\n"
 "Numero di immagini: %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2767,107 +2936,107 @@
 "Driver per Kodak EZ200\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Errore di messa a fuoco."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr ""
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr ""
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr ""
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Errore interno (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Errore interno (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Nessuna scheda presente."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Scheda non gestita."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Scheda rimossa durante l'accesso."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Numero di immagine non valido."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "La scheda non può essere scritta."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "La scheda è protetta da scrittura."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Nessuno spazio rimasto sulla scheda."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Immagine protetta."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Troppo poca luce."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Errore di autofocus."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Errore di sistema."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Parametro illecito."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Il comando non può essere annullato."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Dati di localizzazione troppo lunghi."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Dati di localizzazione danneggiati."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Comando non gestito."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Un altro comando in esecuzione."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Errore nell'ordine dei comandi"
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2875,15 +3044,15 @@
 "error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Lettura della lista dei file..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Prova velocità diverse..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -2891,12 +3060,12 @@
 "Non è stato possibile contattare la fotocamera. Assicurarsi che sia connessa "
 "al computer e sia accesa."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i immagini non sono state eliminate perché sono protette"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2915,7 +3084,7 @@
 "Nome: %s,\n"
 "Produttore: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -2925,402 +3094,411 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Supporto per tutte le fotocamere Konica e molte fotocamere HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Lettura della configurazione..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Configurazione Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Impostazioni persistenti"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr ""
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr ""
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Tempo di spegnimento automatico"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Intervallo presentazione"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Bassa (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Media (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Alta (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Localizzazione"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Lingua"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Nessuno selezionato"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Formato TV"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr ""
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Formato data"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Mese/Giorno/Anno"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Giorno/Mese/Anno"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Anno/Mese/Giorno"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Impostazioni persistenti"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Acceso, riduzione occhi rossi"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatico, riduzione occhi rossi"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fuoco"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fisso"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Impostazioni volatili"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr ""
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr ""
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normale"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Impossibile trovare i dati di localizzazione in '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "File di localizzazione troppo lungo."
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Questa anteprima non esiste."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "I dati sono stati danneggiati."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Il tipo di immagine %d non è gestito da questa fotocamera!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Impossibile eliminare l'immagine %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Impossibile eliminare tutte le immagini."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Caricamento dell'immagine in corso..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 "Impossibile caricare questa immagine sulla fotocamera. È occorso un errore."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Occorre essere in modalità di registrazione per catturare un'immagine."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Nessuno spazio disponibile per catturare nuove immagini. Eliminare alcune "
 "immagini."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Impossibile catturare nuove immagini. Errore sconosciuto"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Nessuna risposta dalla fotocamera."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Bassa"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Media"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Alta"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Icone"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Ufficio"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Luce diurna"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Nitidezza"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr ""
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Colore"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Luce"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Bianco e nero"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Singolo"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Sequenza 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Mostra data"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Ovunque"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Modalità riproduzione"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Modalità registrazione"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Ovunque"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Riproduci"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Registra"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "GG/MM/AAAA"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "AAAA/MM/GG"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/GG/AAAA"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3341,7 +3519,7 @@
 "Mostra data: %s\n"
 "Data e ora: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3356,7 +3534,7 @@
 "http://www.ap2c.com\n"
 "Supporto per la Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3368,7 +3546,7 @@
 "If you have some issues with this driver, please e-mail its authors.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3376,7 +3554,7 @@
 "Driver per Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3387,7 +3565,7 @@
 "Firmware: %s\n"
 "Versione del firmware: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3395,7 +3573,99 @@
 "Driver generico per LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Configurazione"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Velocità otturatore"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Qualità"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Qualità filmato"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Filmato"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Modalità autofocus."
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Versione dispositivo"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Luce di assistenza"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Identificativo lente"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Modo compatibilità"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Menu CSM"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Menu CSM"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3410,7 +3680,7 @@
 "Fotocamera Mars MR97310.\n"
 "Ci sono %i foto. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3424,7 +3694,7 @@
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3432,7 +3702,7 @@
 "Libreria per la fotocamera Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3443,7 +3713,7 @@
 "Revisione hardware:\t%s\n"
 "Revisione firmware:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3459,61 +3729,63 @@
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Remoto"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Locale"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Sì"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "No"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatico\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Forza flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Proibisci flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valore non valido (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3524,74 +3796,74 @@
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Non piena"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Piena"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Occupata"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "In attesa"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Caricamento in corso"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Pronta"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normale\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Lente non connessa\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Stato scheda:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Protetto da scrittura"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Scheda non adatta"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Valore non valido per lo stato scheda di memoria %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3604,64 +3876,64 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Un ringraziamento speciale a Minolta per le specifiche."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Flash: automatico (riduzione occhi rossi)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Flash: automatico"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Flash: acceso (riduzione occhi rossi)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Flash: acceso"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Flash: spento"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Flash: non definito"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Sommario per Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "nessuno stato riportato."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Scheda Compact Flash rilevata\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Nessuna scheda Compact Flash rilevata\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Modalità corrente: fotocamera\n"
 
 # FIXME
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Modalità corrente: visualizzazione\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Le batterie sono cariche."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Le batterie sono quasi scariche."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3673,25 +3945,25 @@
 "Portato su gphoto2 da Marcus Meissner <marcus@jet.franken.de>\n"
 "Gestisce i protocolli seriale e USB."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "Libreria coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Disconnessione della fotocamera."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Scaricamento dell'immagine %s in corso."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Caricamento dell'immagine: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3700,17 +3972,17 @@
 "La dimensione del file è %ld byte. La dimensione massima di un file "
 "possibile da caricare è %i byte."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Caricamento in corso..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Eliminazione dell'immagine %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3726,12 +3998,12 @@
 "Fredrik Roubert <roubert@df.lth.se> e\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Scaricamento di %s in corso."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3747,12 +4019,12 @@
 "Fredrik Roubert <roubert@df.lth.se> e\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Scaricamento di \"%s\" in corso..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3764,7 +4036,7 @@
 "the lens is only 300K and thus produces only low quality pictures."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3774,7 +4046,7 @@
 "shutdown at speeds faster than 9600."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3782,7 +4054,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3793,7 +4065,7 @@
 " Memoria libera: %8d byte.\n"
 " Numero di file: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3807,11 +4079,11 @@
 "e: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Scaricamento del file in corso..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -3819,33 +4091,136 @@
 "Creative PC-CAM600\n"
 "Autore: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: attesi > %d blocchi, ricevuti %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: ricevuto indice %d ma attestp indice > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: valore di ritorno %d invece di %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: attesi %d blocchi, ricevuti %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: errore inatteso: gp_port_read ha restituito %d invece di %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Modello: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Comando sconosciuto"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Dimensioni immagine"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Qualità immagine"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Massima apertura alla distanza focale minima"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Massima apertura alla distanza focale massima"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Modalità di scatto"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "B/N"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Modello sconosciuto"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -3854,12 +4229,12 @@
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modello: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -3868,117 +4243,105 @@
 "Marcus Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Qualità immagine"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Dimensioni immagine"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Impostazioni del flash"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Spegnimento automatico (minuti)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informazioni"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normale"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "superfine"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "acceso"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "spento"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "riproduci"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "registra"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menù"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "batteria"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "adattatore di corrente"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Ricevuta una intestazione inattesa (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Ricevuta una risposta inattesa"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Errore nella somma di controllo"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "La fotocamera non ha accettato il comando."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "La fotocamera ha inviato più byte del previsto (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
 "picture %i back"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -3987,26 +4350,27 @@
 "Sono stati ricevuti %i byte di un formato immagine sconosciuto. Contattare "
 "%s per assistenza."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
 "Mueller <lutz@users.sf.net>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Fotocamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Immagine"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4025,3488 +4389,5471 @@
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Il tipo di porta richiesto (%i) non è gestito da questo driver."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Stato scheda:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Modello: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Velocità otturatore"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Modalità messa a fuoco"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Modello: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Modo flash"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Preimpostato"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Cattura"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Solo blocco AF"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Blocca"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientamento"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Impostazioni immagine"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Questa fotocamera Canon non gestisce la cattura Canon"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Valore %04x sconosciuto"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Valore %04d sconosciuto"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "tipo di dati %i inatteso"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manuale"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatico"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Nuvoloso"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Ombra"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Temperatura colore"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Preimpostato"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Lampada Fluorescente 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Lampada Fluorescente 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Lampada Fluorescente 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Lampada Fluorescente 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Lampada Fluorescente 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Scegli temperatura colore"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Impostazione personalizzata 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Impostazione personalizzata 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Impostazione personalizzata 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Impostazione personalizzata 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Impostazione personalizzata 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluorescente: bianco caldo"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluorescente: bianco freddo"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluorescente: Luce diurna"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "Preimpostato"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "Preimpostato"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "Preimpostato"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 #, fuzzy
 msgid "Underwater: Auto"
 msgstr "Sott'acqua"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Tungsteno"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "Fluorescente: bianco caldo"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "Fluorescente: Luce diurna"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Preimpostato"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Personalizzato"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG Fine"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + JPEG Fine"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + JPEG Normale"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+#, fuzzy
+msgid "Large Fine JPEG+RAW"
+msgstr "JPEG Fine larga"
+
+#: camlibs/ptp2/config.c:1540
+#, fuzzy
+msgid "Large Normal JPEG+RAW"
+msgstr "JPEG Normale larga"
+
+#: camlibs/ptp2/config.c:1541
+#, fuzzy
+msgid "Medium Normal JPEG+RAW"
+msgstr "JPEG Normale media"
+
+#: camlibs/ptp2/config.c:1542
+#, fuzzy
+msgid "Small Normal JPEG+RAW"
+msgstr "JPEG Normale piccola"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Continuo bassa velocità"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Continuo alta velocità"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "non definito"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "economia"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "lossless"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Non definito"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Personalizzato"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Blocca"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Ritratto notturno"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Paesaggio"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Primo piano"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Flash spento"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Creativo"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Scena notturna"
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Cibo"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Fuori fuoco"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Effetto miniatura"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Ritratto animale"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "riduzione occhi rossi"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "riempimento"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "Automatico + riduzione occhi rossi"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "Acceso + riduzione occhi rossi"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Ripetizione"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Apertura automatica"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Azione"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Grande"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Piccola"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Pesata al centro"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Media"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Parziale"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Fedele"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monocromatico"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Definito utente 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Definito utente 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Definito utente 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Grande"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Media 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Media 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Media 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Piccola"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 secondi"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 secondi"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Impostazioni 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Impostazioni 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Impostazioni 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Impostazioni 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2530
+#, fuzzy
+msgid "TFT + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+#, fuzzy
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+#, fuzzy
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Spot-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Card"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Uscita video"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Sconosciuto %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Predefinito"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Auto ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 #, fuzzy
 msgid "Smaller JPEG"
 msgstr "JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + JPEG Fine larga"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + JPEG Fine larga"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+#, fuzzy
+msgid "cRAW + Large Fine JPEG"
+msgstr "RAW + JPEG Fine larga"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + JPEG Fine media"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + JPEG Fine media"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+#, fuzzy
+msgid "cRAW + Medium Fine JPEG"
+msgstr "RAW + JPEG Fine media"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+#, fuzzy
+msgid "cRAW + Small Fine JPEG"
+msgstr "RAW + JPEG Fine piccola"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + JPEG Normale grande"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + JPEG Normale grande"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "RAW + JPEG Normale piccola"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + JPEG Normale media"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + JPEG Normale media"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "RAW + JPEG Normale media"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + JPEG Normale piccola"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + JPEG Normale piccola"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "RAW + JPEG Normale piccola"
+
+#: camlibs/ptp2/config.c:2743
 #, fuzzy
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 #, fuzzy
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 #, fuzzy
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+#, fuzzy
+msgid "cRAW + Smaller JPEG"
+msgstr "RAW + JPEG Fine piccola"
+
+#: camlibs/ptp2/config.c:2747
 #, fuzzy
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + JPEG Fine piccola"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 #, fuzzy
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + JPEG Fine larga"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 #, fuzzy
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + JPEG Fine larga"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Piccola"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Media 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Media 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Grande"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Media 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Media 2"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Media 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Media 2"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Media 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Media 2"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Continuo"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Uscita video"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "Scatto singolo"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Continuo silenzioso"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Timer 10 sec"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Timer 2 sec"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "Scatto continuo"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Singolo silenzioso"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Continuo silenzioso"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Auto ISO"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Continuo"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Continuo"
+
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
 msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AF-S"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 punti (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 punti (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 punti (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 punti (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Timer"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Creativo"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Azione"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Paesaggio notturno"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Bambini"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatico (senza flash)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "Filmato"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
 msgstr "Filmato"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "Filmato"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Filmato"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Velocità ISO filmato"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Azione sportiva"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Tramonto"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Scena notturna"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Effetti foto"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Paesaggio notturno"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Party/Interno"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Spiaggia/Neve"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Alba/Crepuscolo"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Ritratto animale"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Luce di candela"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Fiore"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Colori autunnali"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Cibo"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Bambino"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Primo piano"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Fluorescente"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Acqua"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Immagine"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effetti"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Scatto singolo"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Raffica"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Timer"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+#, fuzzy
+msgid "Continuous Quiet Release"
+msgstr "Continuo silenzioso"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "orario impostato"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Continuo alta velocità"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Continuo bassa velocità"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Area singola"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Soggetto più vicino"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Area dinamica (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Area dinamica (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Area dinamica (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+#, fuzzy
+msgid "Dynamic-area AF (25 points)"
+msgstr "Area dinamica (21)"
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Singolo silenzioso"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4253
+#, fuzzy
+msgid "Dynamic-area AF (72 points)"
+msgstr "Area dinamica (21)"
+
+#: camlibs/ptp2/config.c:4254
+#, fuzzy
+msgid "Dynamic-area AF (153 points)"
+msgstr "Area dinamica (21)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4256
+#, fuzzy
+msgid "Dynamic-area AF (9 points)"
+msgstr "Area dinamica (9)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (ritratto)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (natura)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Valore 0x%04x sconosciuto"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centro"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Alto"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Basso"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Sinistra"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Destra"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Largo"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Centro"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Programma flessibile"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Programma flessibile"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Programma flessibile"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Pesata al centro"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "Ombra"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Grande"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Alta"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Flash automatico"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Flash riempimento"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Riempimento occhi rossi"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Sincronizzazione esterna"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Sincronizzazione lenta automatica"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Riduzione occhi rossi + Sincronizzazione lenta"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Riduzione occhi rossi con sincronizzazione lenta"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Sincronizzazione lenta"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Sincronizzazione lenta"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Bianco e nero"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Visione notturna"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Effetto miniatura"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Colore selettivo"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Silhouette"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "Infinito"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "Infinito"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Compressione"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "posa bulb"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Sincronizzazione lenta"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Spot-AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Mostra data"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "Continuo"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Messa a fuoco manuale"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "Messa a fuoco manuale"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Solo blocco AF"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF attivo"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Blocco livello del flash"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 secondi"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minuti"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minuti"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 secondi"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 min"
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "posa bulb"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1.6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1.3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1.3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1.6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Più preciso"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Più soffice"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Stampa diretta"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Medio bassa"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Medio alta"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Contrasto basso"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Medio alta"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Macro automatico"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Scatto singolo"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 secondi"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 secondi"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Fluorescente H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Numero mancante"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Ombra"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Personalizzato"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Bilanciamento del bianco automatico"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Personalizzato"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Bilanciamento del bianco automatico"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Personalizzato"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Bilanciamento del bianco automatico"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Personalizzato"
+msgid "Manual 3"
+msgstr "Manuale 2"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Manuale 2"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Manuale 2"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Bilanciamento del bianco automatico"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Bilanciamento del bianco automatico"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Bianco e nero"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Segnale acustico spento"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Solo Flash"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Avvio"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Spegnimento"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Avvio e spegnimento"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Risposta veloce"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Moderato"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Sensibilità automatica"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Sensibilità alta"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Sensibilità media"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Sensibilità bassa"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Microfono spento"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Flash/velocità"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Flash/velocità/apertura"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Flash/apertura"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG Base"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Fine"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+Base"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Normale"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG Base"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "JPEG Normale"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG Fine"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "NEF+Base"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "NEF+Normale"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "NEF+Fine"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG Fine"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + JPEG Fine"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + JPEG Fine"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Fine"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + JPEG Fine"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + JPEG Fine"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fine"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG Fine"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 secondi"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 secondi"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 secondi"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Qualità ottimale"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 punti"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 punti"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 punti"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 punti (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Normale)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Anteprima"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (RAW)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Eliminazione file, "
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Valore sconosciuto"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Vicino 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Vicino 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Vicino 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Lontano 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Lontano 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Lontano 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Vicino %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Lontano %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Controlla immagine"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "La scheda è protetta da scrittura."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "Card"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "La scheda non è formattata"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Errore nell'ordine dei comandi"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Sequenza 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Impostazione dell'apertura non valida"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Batteria esaurita, fotocamera spenta."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Impostazione dell'apertura"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "La scheda non è formattata"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Programma di esposizione"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Fluorescente"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "orario impostato"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Bianco e nero"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatico"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Macro automatico"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Sconosciuto (0x%04x)\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Lontano 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Lontano 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Vicino 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Vicino 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Registra"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Riproduci"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Altre impostazioni"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Riduzione occhi rossi"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Display"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Grande"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Valore %04x sconosciuto"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "RAM interna"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Scheda di memoria"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Display"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Data creazione: %s, Data di ultimo uso: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Elimina"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Gestito"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Nome profilo"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "Indirizzo IP (vuoto per DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Maschera di rete"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Gateway predefinito"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Modalità di accesso"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Canale WIFI"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Scrivi"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Elenca i profili Wifi"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Crea un profilo Wifi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Sincronizza data e ora della fotocamera con il PC"
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Fuori fuoco"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Messa a fuoco manuale"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Spegni"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Blocca focus"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Modalità posa bulb"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Senza flash"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Messa a fuoco manuale"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Posizione di fuoco"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Canon EOS Zoom"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Cattura filmato"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Modalità video"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Modalità messa a fuoco"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+msgid "Focus Magnify Down"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Posizione di fuoco"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Numero di serie"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Produttore fotocamera"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Versione dispositivo"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Versione PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Versione DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Alimentazione AC"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Flash esterno"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Livello batteria"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Scatto continuo"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Orientamento fotocamera"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Flash aperto"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Colore selettivo"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Flash caricato"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Nome lente"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Scatti disponibili"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Lunghezza focale minima"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Lunghezza focale massima"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Massima apertura alla lunghezza focale minima"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Massima apertura alla lunghezza focale minima"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Luce bassa"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Qualità filmato"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Data e ora fotocamera"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Modalità del segnale acustico"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Commento all'immagine"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Abilita commento all'immagine"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Menu CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Modalità EVF"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artista"
 
 #
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Numero di CCD"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Area di messa a fuoco"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Flash caricato"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Scatto singolo"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Spegnimento automatico"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Profondità di campo"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menù e riproduzione"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Azioni fotocamera"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Modalità video"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Dimensioni miniature gestite"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Filesystem veloce"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Modalità autofocus."
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Modalità lente"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Formato immagine SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Formato immagine CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Formato immagine HD esterno"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Risoluzione file"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Dimensioni immagine"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Velocità ISO filmato"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Bilanciamento bianco"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Bilanciamento bianco A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Bilanciamento bianco B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Bilanciamento bianco X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Bilanciamento bianco X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Effetti foto"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Modello colore"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Spazio colore"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Formato data"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Risoluzione filmato"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Contrasto"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Luminosità"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Formato data"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Autofocus modo 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Velocità di scatto"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Luce di assistenza"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Compensazione esposizione"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Temperatura colore"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Modalità autofocus"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Aggiustamento tonalità"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Compensazione flash"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Modo flash Nikon"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Numero f"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Programma flessibile"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Qualità"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Dimensioni immagine"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Formato immagine"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Distanza messa a fuoco"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Lunghezza focale"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Modalità messa a fuoco 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Programma di esposizione"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Modalità fotocamera"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Modalità autofocus"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr "Controlla immagine"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Stile fotografia"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Apertura"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Ritardo di cattura"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Velocità otturatore 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Distanza AF"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Blocca esposizione"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Controlla immagine"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Area di autofocus"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Impostazione personalizzata 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Impostazione personalizzata 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Impostazione personalizzata 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Impostazione personalizzata 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Impostazione personalizzata 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Impostazione personalizzata 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Numero raffica"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Intervallo raffica"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Scatti massimi"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Bilanciamento del bianco automatico"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Bilanciamento del bianco automatico"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Ottimizza immmagine"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Compensazione tono"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Saturazione"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Aggiustamento tonalità"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Microfono"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Collezione non definita"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Modalità video"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Eliminazione file, "
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Imposta pulsante anteprima"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Qualità filmato"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Velocità otturatore minima"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Risoluzione filmato"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr ""
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Velocità otturatore minima"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Qualità filmato"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Distanza focale minima"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Compressione Raw"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Qualità immagine 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Impostazioni immagine"
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Impostazioni di cattura"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Profili WIFI"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "Proprietà PTP 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
-#, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
+#, fuzzy, c-format
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Spiacenti, la proprietà '%s' / 0x%04x è di sola lettura."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "La proprietà '%s' / 0x%04x non è stata impostata (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "La proprietà '%s' / 0x%04x non è stata impostata (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "Directory non trovata"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Occorre indicare una cartella che inizia con /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7518,35 +9865,48 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Questa fotocamera Nikon sembra non produrre un'immagine JPEG in modalità "
+"LiveView"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Questa fotocamera Canon non gestisce la modalità Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Questa fotocamera Nikon non gestisce la modalità LiveView"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
-"Questa fotocamera Nikon sembra non produrre un'immagine JPEG in modalità "
-"LiveView"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
@@ -7554,152 +9914,167 @@
 "Questa fotocamera Nikon sembra non produrre un'immagine JPEG in modalità "
 "LiveView"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Questa fotocamera Nikon sembra non produrre un'immagine JPEG in modalità "
+"LiveView"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Questa fotocamera non gestisce la cattura Nikon"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Spiacenti, questa fotocamera Canon non gestisce la cattura Canon EOS"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
 # FIXME
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Spiacenti, questa fotocamera Canon non gestisce Canon Capture initiation"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Cattura Canon non riuscita"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Cattura Canon non riuscita"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Cattura Canon EOS non riuscita"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr "Cattura Canon EOS non riuscita: %x"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "Cattura Canon EOS non riuscita"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Cattura Canon EOS non riuscita"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Cattura Canon EOS non riuscita: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Produttore: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Modello: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Versione: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Numero di serie: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Versione standard PTP: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7707,20 +10082,30 @@
 "\n"
 "Formati di cattura: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Formati di visualizzazione: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP errore %04x alla richiesta"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7728,186 +10113,186 @@
 "\n"
 "Capacità dispositivo:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tScaricamento file, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Eliminazione file, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Nessuna eliminazione file, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Caricamento del file\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Nessun caricamento file\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Cattura Canon"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "Cattura Canon EOS"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "Cattura Canon EOS"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "Cattura Nikon 1"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "%sCattura Nikon 2"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "%sCattura Nikon 3"
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Cattura Sony"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tGestione Nikon Wifi\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tGestione Canon Wifi\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "ROM interna"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "ROM rimovibile"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "RAM interna"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "RAM rimovibile (scheda di memoria)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Sconosciuto (0x%04x)\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Generico piatto"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Generico gerarchico"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Lettura-Scrittura"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Solo Lettura"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tCapacità massima: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tSpazio libero (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tSpazio libero (immagini): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -7915,47 +10300,47 @@
 "\n"
 "Sommario proprietà dispositivo:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "solo lettura"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " errore %x alla richiesta."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Il file \"%s/%s\" non esiste."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7964,2256 +10349,2358 @@
 "Per il momento, PTP è implementato solo per fotocamere USB e PTP/IP, porta "
 "tipo %x."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP Errore generico"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP Sessione non aperta"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID di transazione non valido"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP Operazione non gestita"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Parametro non gestito"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Trasferimento incompleto"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ID di memoria non valido"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Codice di formato dell'oggetto non valido"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP Oggetto protetto da scrittura"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP Accesso negato"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP Nessuna miniatura presente"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP Eliminazione parziale"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Specificazione di formato non gestita"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP Formato codice non valido"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Codice fornitore sconosciuto"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Cattura già completata"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP Dispositivo occupato"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "Parametro PTP non valido"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP Sessione già aperta"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP Transazione annullata"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Specificazione di destinazione non gestita"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Nessun motivo disponibile"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Stato non valido"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Nome di file richiesto"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Nome di file non valido"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Errore hardware"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Fuori fuoco"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Cambiamento modalità fotocamera non riuscito"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Stato non valido"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP Nessuna miniatura presente"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Errore di sistema."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "La scheda non è formattata"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Velocità otturatore 2"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP Cattura già completata"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Stato non valido"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Comando sconosciuto"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Operazione rifiutata"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Coprilente presente"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Batteria bassa"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Fotocamera non pronta"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Coprilente presente"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Batteria"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Fotocamera non pronta"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Tronca oggetto"
+
+#: camlibs/ptp2/ptp.c:6157
+#, fuzzy
+msgid "Memory Status Not Ready"
+msgstr "Fotocamera non pronta"
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP Codice di formato dell'oggetto non valido"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP Codice di formato dell'oggetto non valido"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP Codice di formato dell'oggetto non valido"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP Codice di formato dell'oggetto non valido"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Stato non valido"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP Specificazione di formato non gestita"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP Specificazione di formato non gestita"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "PTP Operazione non gestita"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "PTP ID di transazione non valido"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Stato non valido"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP Operazione non gestita"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP Dispositivo occupato"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "Attesa risposta PTP"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "Attesi dati PTP"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "Errore di I/O PTP"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Impostazioni di compressione"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Bilanciamento del bianco"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Guadagno RGB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Tempo di esposizione"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Zoom digitale"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL di caricamento"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Informazioni di copyright"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "Dimensioni miniature gestite"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 #, fuzzy
 msgid "Enabled Streams"
 msgstr "Stato non valido"
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Formato data"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Risoluzione filmato"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Qualità filmato"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Contrasto"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Luminosità"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Formato data"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Uscita video"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Salvataggio energia"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Lingua interfaccia"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Tipo batteria"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Modalità batteria"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Modalità fotocamera"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Modalità di scatto"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Modalità immagine"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Modalità autofocus"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Stabilizzazione immagine"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Guadagno colore"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Sensibilità"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Lunghezza focale tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Lunghezza focale grandangolo"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Lunghezza focale denominatore"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Prefisso nome"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Dimensioni miniature gestite"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Proprietario fotocamera"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Orario UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Identificativo corpo fotocamera"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Ingrandimento zoom digitale"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Angolo di rotazione"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Rotazione scena"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Tipo di presentazione"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Dimensioni medie dei file"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Modello ID"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Impostazione bilanciamento del bianco nome 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Impostazione bilanciamento del bianco nome 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Impostazione bilanciamento del bianco nome 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Impostazione bilanciamento del bianco nome 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Impostazione bilanciamento del bianco nome 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Impostazione bilanciamento del bianco valore 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Impostazione bilanciamento del bianco valore 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Impostazione bilanciamento del bianco valore 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Impostazione bilanciamento del bianco valore 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Impostazione bilanciamento del bianco valore 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Abilita copyright"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Tempi di spegnimento automatico"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Velocità di scatto"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Illuminazione LCD"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Nome artista"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Informazioni di copyright"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Impostazione dell'apertura"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Abilita commento all'immagine"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Rotazione immagine"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Identificativo lente"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Tipo lente"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Distanza focale minima"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Distanza focale massima"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Massima apertura alla distanza focale minima"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Massima apertura alla distanza focale massima"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Tempo di esposizione Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Velocità USB"
 
 #
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Numero di serie CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Impostazioni illuminazione"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Posizione di fuoco"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Flash esterno collegato"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Stato flash esterno"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Modalità flash esterno"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Compensazione flash esterno"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Tipo fluorescente"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Modalità autofocus."
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Pulsante anteprima"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Pulsante anteprima 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Produttore fotocamera"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Compressione immagine"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Certificato dispositivo"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Livello volume"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Icona dispositivo"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Velocità di riproduzione"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Qualità"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Aree di fuoco"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr ""
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Posizione di fuoco"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Dimensioni immagine"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Velocità otturatore"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Temperatura colore"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Aree di fuoco"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Memoria esaurita"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Indice di esposizione"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Vicino 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "Posizione di fuoco"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Data e ora"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Base"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Messa a fuoco manuale"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Flash automatico"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatico, riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Riempimento occhi rossi"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Non utilizzato"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRam"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Litio-ione"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nickel ibrido"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nickel-Cadmio"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Emergenza"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "SuperFine"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatico + riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Acceso + riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Otturatore alta velocità"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Otturatore bassa velocità"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Scala di grigi"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Scatto singolo"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Scatto continuo"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Bassa 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Alta 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Audio non definito"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Video non definito"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Collezione non definita"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Documento non definito"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Documento astratto"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Documento XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr " Documento Microsoft Word"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Foglio di calcolo Microsoft Excel (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Messaggio non definito"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Messaggio astratto"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Contatto non definito"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Contatto astratto"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Elemento calendario non definito"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Elemento calendario astratto"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Eseguibile Windows non definito"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sezione"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Sconosciuto (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 #, fuzzy
 msgid "Get device info"
 msgstr "Reimposta dispositivo"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Apri sessione"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Chiudi sessione"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Elimina oggetto"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Invia informazioni sull'oggetto"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Invia oggetto"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Reimposta dispositivo"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Spegni dispositivo"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Sposta oggetto"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Copia oggetto"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 #, fuzzy
 msgid "Get Filesystem Manifest"
 msgstr "Filesystem veloce"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Aggiornare il firmware del dispositivo"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Invia richiesta di registrazione"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Ricevi risposta di registrazione"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Invia oggetto parziale"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Tronca oggetto"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Sconosciuto %d"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "PTP Codice fornitore sconosciuto"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Valore sconosciuto"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Scaricamento filmato in corso..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Scaricamento audio in corso..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Scaricamento dati EXIF in corso..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Nessun dato EXIF disponibile per %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Impossibile eliminare il file."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Impossibile rimuovere la directory."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Impossibile creare la directory."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versione: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Stato RTC: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Orario fotocamera: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "ID Fotocamera: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Nessuna scheda SD inserita.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "ID scheda SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Foto sulla fotocamera: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Memoria SD: %d MB totali, %d MB liberi.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Memoria interna: %d MB totale, %d MB liberi.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10221,7 +12708,7 @@
 "at the firmware update image and wild guessing.\n"
 msgstr ""
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10233,12 +12720,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "basato sul driver di Bob Paauwe's\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "sconosciuto (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10247,182 +12734,182 @@
 "Modello: %s\n"
 "Memoria: %d byte su %d disponibili"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Esterno"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Massima"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minima"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Carattere"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Audio"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Immagini e audio"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Carattere e audio"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Generale"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright (20 caratteri al massimo)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Immagini"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr ""
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Modalità di registrazione"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Compressione"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "La velocità %i non è supportata!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Previsto %i, ricevuto %i. Segnalare questo errore a %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Previsti %i byte, ricevuti %i. Segnalare questo errore a %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Previsto 0x%x ma ricevuto 0x%x. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Carattere non valido (0x%x, 0x%x). Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Fotocamera occupata. Se il problema persiste, contattare %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Tempo scaduto dopo 2 tentativi. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Errore di comunicazione anche dopo 2 tentativi. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "La fotocamera è in una modalità errata. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "La fotocamera non ha accettato i parametri. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Si è verificato un errore sconosciuto. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -10430,7 +12917,7 @@
 "La lunghezza del nome del file non può superare 12 caratteri (\"%s\" ha %i "
 "caratteri)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10438,109 +12925,109 @@
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Data e ora (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Impostazioni di apertura"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Modalità colore"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Impostazioni del flash"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Risparmio energetico fotocamera (secondi)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Modalità lente"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Coreano"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Inglese"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Francese"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Tedesco"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italiano"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Impostazioni immagine"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10552,15 +13039,15 @@
 "  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Nessuna scheda di memoria presente"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Impossibile recuperare la capacità della batteria"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
@@ -10568,211 +13055,207 @@
 "Il livello della batteria della fotocamera è troppo bassoi (%d%%). "
 "L'operazione è annullata."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Impossibile leggere la quantità di memoria libera"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "La fotocamera ha rifiutato 3 volte di mantenere la connessione aperta."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Il primo byte ricevuto (0x%x) non è valido."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr "Trasmissione dei pacchetti scaduta dopo %i tentativi. Contattare %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Impossibile trasmettere il pacchetto anche dopo diversi tentativi."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Il pacchetto è stato rifiutato dalla fotocamera. Contattare %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Impossibile trasmettere pacchetto (codice errore %i). Contattare %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Trasmissione scaduta dopo 2 tentativi."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Ricevuto risultato non previsto 0x%x. Contattare %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Ricevuta risposta non prevista (%i). Contattare %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Impossibile leggere il registro %i. Contattare %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Troppi tentativi non riusciti."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Invio dei dati in corso..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Impossibile leggere il registro %i. Contattare %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Attesi 32 byte, ricevuti %i. Contattare %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Velocità otturatore in microsecondi (0 automatico)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Velocità otturatore (in secondi)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "B/N"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Contrasto+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Contrasto-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Luminosità+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Luminosità-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Aggiustamento immagine"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Infinito"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Anteprima miniatura"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Successivo"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Precedente"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Modalità di operazione"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Luminosità LCD"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Spot-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Misurazione esposizione"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (in millimetri)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "nessuno"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Largo"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -10789,7 +13272,7 @@
 "        to set the shutter speed.\n"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -10801,67 +13284,63 @@
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Lento"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Tramonto"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Modo LCD"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Zoom digitale"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Posizione di fuoco"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Formato dell'orario"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -10880,7 +13359,7 @@
 "    PC, then switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -10896,7 +13375,7 @@
 "    PC, then switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -10913,230 +13392,235 @@
 "    please contact the developer mailing list.\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (sconosciuto)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Il file da caricare ha lunghezza nulla"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Insufficiente memoria disponibile sulla scheda di memoria"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Impossibile ottenere il nome della cartella contenente le foto"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "È possibile caricare un file solo nella cartella \"%s\""
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Migliore"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (sconosciuto)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Velocità otturatore (microsecondi, 0 autotomatico)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Bianco e nero"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Luminosità/Contrasto"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Impostazioni scatto"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "Standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "colori"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "bianco e nero"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Nota: scheda di memoria non presente, alcuni valori possono essere non "
 "validi\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Modello fotocamera: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Numero di serie: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Revisione software: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Scatti fatti: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Scatti rimasti: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Durata batteria: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Memoria libera: %i byte\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Data: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Nessun manuale per la fotocamera disponibile.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11149,7 +13633,7 @@
 "  please send a mail to %s (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11168,7 +13652,7 @@
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11180,12 +13664,7 @@
 "support implementation."
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (sconosciuto)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11195,11 +13674,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Impossibile applicare le impostazioni USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11216,7 +13695,7 @@
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11231,7 +13710,7 @@
 "Fotocamera Sonix.\n"
 "Ci sono %i foto. \n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11246,7 +13725,7 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11254,7 +13733,7 @@
 "Libreria per la fotocamera Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11263,7 +13742,7 @@
 "Gphoto2 port by Bart van Leeuwen <bart@netage.nl>"
 msgstr ""
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11271,7 +13750,7 @@
 "gPhoto2 port by Raymond Penners <raymond@dotsphinx.com>"
 msgstr ""
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11284,12 +13763,12 @@
 "Memoria totale: %ikB\n"
 "Memoria libera: %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Revisione del firmware: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11297,7 +13776,7 @@
 "Driver per Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11306,7 +13785,7 @@
 "FLASH:\n"
 " File: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11323,7 +13802,7 @@
 "Spazio usato:  %8d\n"
 "Spazio libero: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "Libreria spca50x v"
 
@@ -11366,19 +13845,19 @@
 "Driver generico per sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11386,11 +13865,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientamento"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11398,110 +13873,110 @@
 "Protocol reverse engineered using SnoopyPro\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Cattiva esposizione (probabilmente non abbastanza luce)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informazioni per la fotocamera basata su STV0680:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Revisione del firmware: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Revisione ASIC: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "ID sensore: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Memoria nella fotocamera: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "La fotocamera gestisce le miniature.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "La fotocamera gestisce i filmati.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "La fotocamera gestisce i formati video."
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "ID Vendor: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "ID prodotto: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Numero di immagini: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Massimo numero di immagini: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Larghezza immagine :%d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Altezza immagine: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Dimensioni immagine: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Larghezza miniatura: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Altezza miniatura: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Dimensioni miniatura: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11517,12 +13992,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Esteso per Aiptek PenCam e altre fotocamere STM USB Dual-mode."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Lettura informazioni su %i file in corso..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11530,19 +14005,19 @@
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z è solo USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Impostazioni driver"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Modalità turbo"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11550,12 +14025,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Scaricamento di \"%s\"..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -11565,41 +14040,61 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Driver per Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 "Errore interno durante la ricerca di camlibs (nomi di percorso troppo "
 "lunghi?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Caricamento dei driver della fotocamera da \"%s\"..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Si è verificato un errore nella libreria di I/O (\"%s\"): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Impossibile rilevare alcuna fotocamera"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Impossibile rilevare alcuna fotocamera alla porta %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Occorre impostare la porta prima di inizializzare la fotocamera."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Impossibile caricare il driver della fotocamera \"%s\" richiesto (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr ""
@@ -11639,12 +14134,12 @@
 msgid "This camera can not capture previews."
 msgstr "Questa fotocamera non può catturare anteprime."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Il percorso \"%s\" non è assoluto."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -11653,7 +14148,7 @@
 "Si è cercato di eliminare \"%s\" dalla cartella \"%s\", ma il filesystem non "
 "gestisce l'eliminazione di file."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
@@ -11661,17 +14156,17 @@
 "Ci sono ancora delle sottocartelle nella cartella \"%s/%s\" che si vuole "
 "rimuovere."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Ci sono ancora dei file nella cartella \"%s/%s\" che si vuole rimuovere."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Il filesystem non gestisce il caricamento di file."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -11679,101 +14174,117 @@
 "La cartella \"%s\" contiene solo %i file, ma è stato richiesto un file con "
 "numero %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Il file \"%s\" non è stato trovato nella cartella \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Impossibile trovare il file \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Il filesystem non gestisce la lettura dei file."
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Tipo di file %i sconosciuto."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Il filesystem non gestisce la lettura delle informazioni del file."
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Il filesystem non gestisce l'impostazione delle informazioni del file"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Attributi di sola lettura del file, come larghezza e altezza, non possono "
 "essere modificati."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Il filesystem non gestisce la lettura delle informazioni del file"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Dati danneggiati"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Il file esiste"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Modello sconosciuto"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Directory non trovata"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "File non trovato"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "La directory esiste"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "I/O in avanzamento"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Percorso non assoluto"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "La fotocamera non ha potuto completare l'operazione"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr ""
 "Errore del sistema operativo durante la comunicazione con la fotocamera"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Spazio libero non sufficiente"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Errore sconosciuto nella libreria della fotocamera"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Valore %04d sconosciuto"
+
+#~ msgid "Setting 4"
+#~ msgstr "Impostazioni 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Impostazioni 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Impostazioni 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Impostazioni 7"
+
 #~ msgid "Small Fine JPEG  (S1 Fine)"
 #~ msgstr "JPEG Fine piccola (S1 Fine)"
 
@@ -11801,5 +14312,6 @@
 #~ msgid "Initializing Camera"
 #~ msgstr "Inizializzazione fotocamera"
 
+#, c-format
 #~ msgid "Unknown (%04x)"
 #~ msgstr "Sconosciuto (%04x)"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/ja.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/ja.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/ja.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/ja.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.4.7\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2009-09-23 04:00+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -28,19 +28,19 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -73,19 +73,19 @@
 "Aox 汎用ドライバ\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -93,18 +93,20 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 #, fuzzy
 msgid "Picture Frame Configuration"
 msgstr "カメラの設定"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 #, fuzzy
 msgid "Synchronize frame data and time with PC"
 msgstr "カメラの日時と PC を同期する"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -113,7 +115,7 @@
 "写真の数: %i\n"
 "ファームウェア・バージョン: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -137,26 +139,26 @@
 "WEB 上に実装済みの使用方法のドキュメント\n"
 "があります。Vision の承諾済み。"
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "ディレクトリ %s を生成できませんでした。"
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "ディレクトリ %s を削除できませんでした。"
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "キーのロックに失敗しました。"
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*不明*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -165,7 +167,7 @@
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() の初期化に失敗しまし"
 "た (ステータス %li)"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -174,24 +176,24 @@
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() の終了処理に失敗しま"
 "した (ステータス %i)"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "名前 '%s' (%li 個の文字) は長すぎます。最大 30 文字まで有効です。"
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "%s に小文字があります。"
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: ERROR: 初期メッセージが短すぎます (%i < 最小値 %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -199,27 +201,27 @@
 "canon_int_list_directory: 最初の dirent を調査する際にパケットの終端に到達し"
 "ました"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: 切りつめられたディレクトリに遭遇しました"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "ファイルが保護されています。"
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, fuzzy, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: ERROR: 初期メッセージが短すぎます (%i < 最小値 %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "データから JPEG サムネイルへ展開できませんでした: 開始/終端がありません"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "データから JPEG サムネイルへ展開できませんでした: データは JFIF ではありませ"
@@ -230,24 +232,24 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "%3$i 行の %2$s にあるパラメータ \"%1$s\" が NULL です"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, fuzzy, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 "%4$i 行の %3$s にある camera->port->type の値 %1$i (0x%2$x) を扱えません。"
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "致命的なエラー: CRC の初期値 (サイズ %d) が不明です\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "CRC の初期値を推測できません\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -256,302 +258,313 @@
 "警告: CRC がチェックされていません (サイズ %d, 値 0x%04x の追加) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "互換モード"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "サムネイル"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "完全な画像"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "オートフォーカス: ワンショット"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "オートフォーカス: AI サーボ"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "オートフォーカス: AI フォーカス"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "マニュアルフォーカス"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "ビープなし"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "ビープあり"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "フラッシュなし"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "フラッシュあり"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "自動フラッシュ"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 #, fuzzy
 msgid "Manual 2"
 msgstr "取り扱い説明書"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 #, fuzzy
 msgid "Far scene"
 msgstr "蛍光灯"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 #, fuzzy
 msgid "Fast shutter"
 msgstr "シャッター速度"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 #, fuzzy
 msgid "Night scene"
 msgstr "夜風景"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr ""
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "セピア"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "縦向き"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "焦点"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "マクロ"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 #, fuzzy
 msgid "BW"
 msgstr "B/W"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 #, fuzzy
 msgid "PanFocus"
 msgstr "マニュアルフォーカス"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Vivid"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "ナチュラル"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 #, fuzzy
 msgid "Long shutter"
 msgstr "フォーカスの距離"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 #, fuzzy
 msgid "Indoor"
 msgstr "屋外"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr ""
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr ""
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr ""
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr ""
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr ""
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 #, fuzzy
 msgid "Night snapshot"
 msgstr "夜風景"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 #, fuzzy
 msgid "Digital macro"
 msgstr "デジタル・ズーム"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 #, fuzzy
 msgid "MyColors"
 msgstr "色彩"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 #, fuzzy
 msgid "Photo in movie"
 msgstr "Fill モードなし"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -568,44 +581,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "カメラが利用できません: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "カメラを OFF にします"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "画像のキャプチャ中にエラー"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "ディスク名を取得できませんでした: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "使用不可の理由"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "ディスク情報を取得できませんでした: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "関数 get_file_func() で内部エラー #1 (%2$i 行の %1$s)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "%s のオーディオ・ファイルが見つかりませんでした"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -616,35 +629,35 @@
 "  合計 %11s バイト\n"
 "  %11s バイト有効"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "AC アダプタ"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "バッテリー容量"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "電源 ○"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "電源 ×"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "使用不可: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (host 時間 %s%i 秒)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -671,7 +684,7 @@
 "\n"
 "時刻: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -692,24 +705,24 @@
 "A5 追加は Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "ファイルの削除中にエラー"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "共有サムネイルの削除中にエラー"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "このカメラにスピード 57600 以上でアップロードすることはできません"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "フラッシュドライブを取得できませんでした"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -717,385 +730,407 @@
 "アップロードできませんでした。使われていないフォルダ名がありません！\n"
 "フォルダ 999CANON は既に存在しており、画像 AUT_9999.JPG がその中にあります。"
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "\\DCIM ディレクトリを作成できませんでした"
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "対象となるディレクトリを作成できませんでした"
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "カメラとドライバの設定"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "カメラの設定"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "所有者の名前"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 #, fuzzy
 msgid "Capture Size Class"
 msgstr "キャプチャサイズのクラス"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO スピード"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "不明"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 #, fuzzy
 msgid "Shooting mode"
 msgstr "測光モード"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "ズーム"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "絞り"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "露出度"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "画像形式"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "ビープ音"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "カメラの操作"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "カメラの日時と PC を同期する"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "カメラの状態についての情報"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "カメラの型式"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "日付と時間"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "エラー"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "ファームウェアのバージョン"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "電源"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "ドライバ"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "全ファイルの一覧"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "アップロード時にファイル名を保持する"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "カメラが無効です"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "所有者が変更されました"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "ISO 速度設定が正しくありません"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "ISO 速度を変更しました"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "ISO 速度を変更できませんでした"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 #, fuzzy
 msgid "Invalid shooting mode setting"
 msgstr "フラッシュ モードの設定が正しくありません"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 #, fuzzy
 msgid "Shooting mode changed"
 msgstr "フォーカスモードを変更しました"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 #, fuzzy
 msgid "Could not change shooting mode"
 msgstr "フラッシュ モードの変更ができませんでした"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "シャッター速度設定が正しくありません"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "シャッター速度を変更しました"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "シャッター速度を変更できませんでした"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "開口設定が正しくありません"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "開口を変更しました"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "開口を変更できませんでした"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 #, fuzzy
 msgid "Invalid exposure compensation setting"
 msgstr "解像度設定が正しくありません"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 #, fuzzy
 msgid "Exposure compensation changed"
 msgstr "露出度"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 #, fuzzy
 msgid "Could not change exposure compensation"
 msgstr "解像度を変更できませんでした"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "画像形式の設定が正しくありません"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "画像形式の変更"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 #, fuzzy
 msgid "Could not change image format"
 msgstr "開口を変更できませんでした"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "フォーカスモードの設定が正しくありません"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "フォーカスモードを変更しました"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "フォーカスモードを変更できませんでした"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "ビープモードの設定が正しくありません"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "ビープモードを変更しました"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "ビープモードを変更できませんでした"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "ズームレベルを変更しました"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "ズームレベルを変更できませんでした"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "フラッシュ モードの設定が正しくありません"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "フラッシュ モードを変更しました"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "フラッシュ モードの変更ができませんでした"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "時刻のセット"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "時刻をセットできませんでした"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "未サポートのポートの種類 %i = 0x%x が指定されました。初期化できません。"
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "バッテリーが消耗しました。カメラを OFF にします。"
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "エラー: 予期しないメッセージ"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "エラー: メッセージのオーバーラン"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "エラー: シーケンスを越えました。"
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "エラー: 予期しないパケットの種類です。"
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "エラー: メッセージ書式のエラーです。"
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "エラー: 予期しないメッセージ 2 です。"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "ファイルのアップロード中..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "ファイルの取得中..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1103,149 +1138,149 @@
 "canon_serial_get_dirents: canon_serial_dialogue でディレクトリを取得できませ"
 "んでした"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 "canon_serial_get_dirents: dirent の初期パケットが短すぎます (%i バイトだけ)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: %i バイトのメモリーを確保できませんでした"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: 別のディレクトリを読み込めませんでした"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: 切りつめられたディレクトリを受け取りました"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: dirent が多すぎます (ループせざるを得ないです)"
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: dirent のバッファ・サイズを %i バイトに変更できませ"
 "んでした"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "スピード変更でエラーが発生しました。"
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "プロトコルの再設定..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "カメラは OK です。"
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "カメラの検出中..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "カメラと通信中..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "通信エラー 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "カメラから反応がありません"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "認識できない反応です"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "\"%s\" (\"%s\") を検出しました。"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "不明な型式 \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "おかしな EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "通信エラー 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "通信エラー 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "スピードの変更中... 少々お待ち下さい..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "スピード変更でエラー"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 #, fuzzy
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "再初期化中の ACK 待ちでエラー"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "初期化中の ACK 待ちでエラー"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "カメラに接続済み"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "エラー: 致命的なエラーを検出しました。続行できません。"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "エラー: %d は大きすぎます"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "サムネイルの取得中..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "認識されていません"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "カメラと初期接続を確立できませんでした"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "カメラは既にアクティブです"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "カメラが起動されました"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "カメラの初期応答 %c/'%s' を認識できません"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1254,7 +1289,7 @@
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1263,7 +1298,7 @@
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1272,7 +1307,7 @@
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1281,7 +1316,7 @@
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1290,30 +1325,30 @@
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "ステップ #4.1 で失敗しました (返り値 %i, 期待値 %i)。カメラを操作できません！"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, fuzzy, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "ステップ #4.1 で失敗しました (返り値 %i, 期待値 %i)。カメラを操作できません！"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "カメラの準備ができていません。複数回 \"カメラ情報\" 要求が失敗しました: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "カメラの準備ができていません (get_battery に失敗): %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1322,14 +1357,14 @@
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1337,7 +1372,7 @@
 "canon_usb_unlock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1346,44 +1381,44 @@
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "データの受信中..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "メモリーが足りません: %d バイト必要です。"
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue に失敗しました"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
-"canon_usb_set_file_attributes: canon_usb_dialogue がエラー・ステータス 0x"
-"%08x を受け取りました"
+"canon_usb_set_file_attributes: canon_usb_dialogue がエラー・ステータス "
+"0x%08x を受け取りました"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "ファイル \"%s\" を読み込めませんでした"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "メモリーが足りません: %ld バイト必要です"
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "ファイルのアップロードに失敗しました"
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1391,7 +1426,7 @@
 "ファイルが大きすぎます。お使いのカメラの電源を OFF にして、ファイルをアップ"
 "ロードする前に戻して下さい。"
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1400,7 +1435,7 @@
 "canon_usb_get_dirents: バッファに読み込めません。切りつめたサイズ '%.96s' が"
 "大きすぎます。"
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1409,7 +1444,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue でディレクトリの取得に失敗しま"
 "した (返り値 %i)"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1418,7 +1453,7 @@
 "canon_usb_list_all_dirs: バッファに読み込めません。切りつめたサイズ '%.96s' "
 "が大きすぎます。"
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1427,27 +1462,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue でディレクトリの取得に失敗し"
 "ました (返り値 %i)"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' を検出しました。"
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "カメラの名前 \"%s\" が既存のカメラ名に一致しません"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "画像の種類 %d はサポートされていません"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "画像 %s はプロテクトされており削除できません。"
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1455,37 +1490,37 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "バッテリーレベル: %.1f ボルト リビジョン: %08x"
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "カメラの設定"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "バッテリー"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "明るさ"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "明るすぎます"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "暗すぎます"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1552,16 +1587,16 @@
 "sq905C 向け汎用ドライバ。\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "画像の種類がサポートされていません"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "写真の数: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1569,7 +1604,7 @@
 "Digita gPhoto ライブラリ\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1577,24 +1612,24 @@
 "ルートのフォルダのみサポートしています - フォルダ '%s' のファイル一覧を要求し"
 "ました。"
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "画像の番号の取得中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "画像情報の取得中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "キャプチャの種類がサポートされていません"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (バッテリー容量: 残り %d%%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, fuzzy, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1611,82 +1646,83 @@
 "解像度: %s\n"
 "カメラは %s (電源%s)\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "フラッシュあり"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "フラッシュなし"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "デュアル Iris あり"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "デュアル Iris なし"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "解像度切替えあり"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "解像度切替えなし"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "電源ランプなし"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "ON"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "OFF"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "準備完了"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "準備未完了"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "Fill モードあり"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Fill モードなし"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "低 (320 x 240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "高 (640 x 480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "外部"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "内部"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1704,7 +1740,7 @@
 "  自動的にセットされます。\n"
 "* 画像の品質は今のところ可能なレベルよりも低いものになっています。\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1733,116 +1769,232 @@
 "     プロトコルの情報、生画像の形式、\n"
 "     gPhoto2 への移植担当\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "フラッシュカードから画像の読み込み中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "メモリーが足りません"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "画像のダウンロード中..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "画像のダウンロード中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "ユーザによってダウンロードが取り消されました"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "リアルタイム画像の取得中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "露出"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "自動露出調整のプレビュー"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "露出レベルのプレビュー"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "キャプチャ時の自動フラッシュ"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "ポートを開いている最中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "カメラの再設定中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "カメラの通信速度の設定中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "カメラではなく、モデムのようです"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "'%s' にあるファイル一覧を作成中..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "'%s' にあるフォルダ一覧の作成中..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "'%s' (%m) の情報を取得できませんでした。"
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, fuzzy, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "'%s' ('%s' の中にある) (%m) の情報を取得できませんでした。"
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "ファイル '%s' ('%s' の中にある) (%m) の時刻を変更できませんでした。"
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "'%s' を開けませんでした。"
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "ディレクトリ参照 \"camera\" はコンピュータ上の写真の目録を作成します。"
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "ディレクトリ参照モード - Scott Fritzinger <scottf@unr.edu> 氏の提供。"
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, fuzzy, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 "ファイル '%s' (フォルダ '%s' の中にある) を削除できませんでした (エラーコー"
 "ド %i:%m)。"
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "カメラとドライバの設定"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "不明な型式"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "解像度"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "解像度"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "操作モード"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "カラーモード"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 #, fuzzy
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
@@ -1854,94 +2006,94 @@
 "た。Spca50x 開発チームに感謝します。このカメラ用のドライバを簡単にポートでき"
 "ました！"
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 "カメラが %i バイトのみ送信しましたが、必要なバイト数は少なくとも %i です。"
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "カメラに接続できませんでした。"
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "予期しないデータを受け取りました (0x%02x, 0x%02x)。"
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr ""
 "エスケープ・シーケンスが間違っています: 0x%02x なのに 0x%02x を受け取りまし"
 "た。"
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "データがおかしいです - 0x%02x を取得しました (期待値: 0x%02x)"
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr ""
 "データがおかしいです - 0x%02x を取得しました (期待値: 0x%02x または 0x%02x)"
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "チェックサムがおかしいです - 0x%02x を取得しました (期待値: 0x%02x)"
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "カメラがコマンドを受け付けませんでした。"
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "カメラがリセットしました。"
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "カメラが予期しないバイト 0x%02x を送信してきました。"
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "ダウンロード中..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr ""
 "サムネイルをダウンロードするのに必要な %i バイトを確保できませんでした。"
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "画像をダウンロードするのに必要な %i バイトを確保できませんでした。"
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "カメラはファイル名として '%s' を受け付けませんでした。"
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "アップロードを初期化できませんでした (カメラからの応答: 0x%02x)。"
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "カメラはスピード %i をサポートしていません。"
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "スピードを %i にセットできませんでした (カメラからの応答: %i)。"
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1949,36 +2101,36 @@
 "Matthew G. Martin 氏\n"
 "Thierry Bousch <bousch@topo.math.u-psud.fr> 作の fujiplay がベースです。\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "ビットレート %ld はサポートされていません。"
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "FUJI カメラの設定"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "日付と時間"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "バージョン: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "型式: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "有効なメモリー: "
 
@@ -1999,18 +2151,18 @@
 "gPhoto2 camlib モジュールと Mustek が提供してくれた仕様。\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "サポートしていないポートの種類: %d 【このドライバは USB カメラでのみ動作しま"
 "す】\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "カメラをリセットできませんでした\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2019,7 +2171,7 @@
 "お使いのカメラでは最後のファイルの削除のみサポートしています。現在このファイ"
 "ルは '%s' に該当します。"
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2029,7 +2181,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2068,25 +2220,25 @@
 "iClick 5X 向けドライバ\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "撮影したフレーム数: %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam ライブラリ Ver"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "データのダウンロード中..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "サムネイルのダウンロード中..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2102,7 +2254,7 @@
 "   - サムネイル (64x48 PGM フォーマット)\n"
 "   - 画像 (640x480 PPM フォーマット)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2114,31 +2266,31 @@
 "Jenoptik JD11 カメラ用のドライバ担当。\n"
 "WINE と IDA を使用してリバースエンジニアされたプロトコル。"
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "JD11 設定"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "その他の設定"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "バルブ露出時間"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "色の設定"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "赤"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "緑"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "青"
 
@@ -2207,11 +2359,11 @@
 "jl2005c カメラのライブラリ\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "コンパクトフラッシュ・カード"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2222,7 +2374,7 @@
 "らダウンロードして画像を表示する場合は、\"kdc2tiff\" プログラムを http://"
 "kdc2tiff.sourceforge.net から入手する必要があります。"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2234,13 +2386,13 @@
 "Kodak DC120 カメラ用のライブラリ\n"
 "(やっと普及したので)"
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "データの取得中..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "完了するのを待っています..."
 
@@ -2253,7 +2405,8 @@
 msgstr "ファイルの種類"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2266,7 +2419,7 @@
 msgstr "ファイルの解像度"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2290,8 +2443,9 @@
 msgid "High (good quality)"
 msgstr "高 (普通の品質)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "キャプチャ"
 
@@ -2320,77 +2474,84 @@
 msgstr "露出度"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "強制発光"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "なし"
 
@@ -2399,71 +2560,78 @@
 msgstr "赤目軽減フラッシュ"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "ON"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "OFF"
 
@@ -2479,7 +2647,7 @@
 msgid "Port speed"
 msgstr "ポートのスピード"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "アルバム名"
 
@@ -2694,58 +2862,58 @@
 "Kodak DC215 ズーム・カメラ用のライブラリです。\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "引数 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "引数 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "引数 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "型式: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "ファームウェアのリビジョン: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "電源: %s  AC アダプタ: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "写真の数: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "残り空き容量: 高: %d 中: %d, 低: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "メモリー カードの状態 (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "キャプチャした写真の合計: %d フラッシュの発光数: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2759,45 +2927,46 @@
 "Kodak DC240, DC280, DC3400 and DC5000 カメラ用のライブラリ担当。\n"
 "gPhoto2 向けに書き直しと更新。"
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "弱い"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "空"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "不正"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "未使用"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "使用中"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "カードが空いています"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "カードが閉まっています"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "カードがフォーマットされていません"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "カードがありません"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2805,12 +2974,12 @@
 "現在操作が進行中です。このカメラのみ同時に一つの操作をサポートしています。現"
 "在の操作が終了するまでお待ち下さい。"
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "カメラが 9 秒以上動作していません。再初期化します。\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2825,7 +2994,7 @@
 "ているので、再初期化する必要があります。カメラに反応がなかったら、カメラを再"
 "選択するだけでよいでが、この場合も再初期化して下さい。"
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2837,7 +3006,7 @@
 "\n"
 "質問やコメントは大歓迎です。"
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2846,7 +3015,7 @@
 "お使いの USB カメラは Kodak EZ200 です。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2854,107 +3023,107 @@
 "Kodak EZ200 ドライバ\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "フォーカスのエラーです。"
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "アイリスのエラーです。"
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "ストローブのエラーです。"
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROM チェックサム・エラーです。"
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "内部エラー (1) です。"
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "内部エラー (2) です。"
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "カードがありません。"
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "カードをサポートしていません。"
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "カードがアクセス中に抜き取られました。"
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "画像の番号が正しくありません。"
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "カードに書き込めません。"
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "カードへの書き込み保護が有効です。"
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "カードに残り容量がありません。"
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "画像が保護されています。"
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "フラッシュが暗すぎます。"
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "自動フォーカスのエラーです。"
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "システムのエラーです。"
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "不正なパラメータです。"
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "コマンドはキャンセルできません。"
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "日本語データが長すぎます。"
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "日本語データがおかしいです。"
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "サポートしていないコマンドです。"
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "他のコマンドの実行が中止されました。"
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "コマンドの実行順でエラーです。"
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "エラーを特定できません。"
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2964,15 +3133,15 @@
 "カメラが不明なエラーを返してきました。このエラーを再現する方法を追加したバ"
 "グ・レポートを %s まで報告して下さい (0x%x,0x%x)。ご協力に感謝します！"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "ファイル一覧の取得中..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "異なるスピードでテスト中..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -2981,12 +3150,12 @@
 "カメラと通信できませんでした。コンピュータに接続してから電源を投入して下さ"
 "い。"
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "書き込み保護がかかっている %i 個の写真を削除できませんでした"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3005,7 +3174,7 @@
 "名称: %s\n"
 "製造元: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3015,404 +3184,413 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Konika 全機種と幾つかの HP カメラのサポート担当。"
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "設定の取得中..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica の設定"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "全機種に共通な設定"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "写真を撮る時にカメラのビープ音を鳴らしますか？"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "スライドショーの表示間隔"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "解像度"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "低 (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "中 (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "高 (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "日本語化"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "言語"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "何も選択されていません"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV 出力の形式"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "TV メニューを表示しない"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "データ形式"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "月/日/年"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "日/月/年"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "年/月/日"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "全機種に共通なセッションの設定"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "ON, Red-Eye 減少"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "フォーカス"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "固定"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Volatile の設定"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "セルフタイマー"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "標準"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "'%s' に日本語データが見つかりませんでした"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "ローカライズファイルが長すぎます！"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "このプレビューは存在しません。"
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "データが壊れています。"
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "この画像の種類 %d はサポートされていません！"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "画像 %s を削除できません。"
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "全ての画像を削除できません。"
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "画像のアップロード中..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 #, fuzzy
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "エラーが発生したので、この画像をカメラへアップロードできません。"
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 #, fuzzy
 msgid "You must be in record mode to capture images."
 msgstr "画像をキャプチャするには記録モードに切り替えて下さい。"
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 #, fuzzy
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "新しい画像を保存するための空き容量がありません。何か画像を削除して下さい。"
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 #, fuzzy
 msgid "Can't capture new images. Unknown error"
 msgstr "不明なエラーが発生したので、新しい画像を保存できません。"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "カメラから応答がありません"
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "低"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "中"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "高い"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "液晶モニタ"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "アイコン"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "ホワイトバランス"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "オフィス"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "晴天"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "鮮明度"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "シャープ"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "ソフト"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "色彩"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "光源"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "深さ"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "モノクロ"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "シングル"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "シーケンス 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "日付の表示"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "どこでも"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "再生モード"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "記録モード"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "場所を問わず"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "電源"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "再生"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "記録"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/YYYY"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "YYYY/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/YYYY"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3433,7 +3611,7 @@
 "日付の表示: %s\n"
 "日付と時刻: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3448,7 +3626,7 @@
 "http://www.ap2c.com\n"
 "フランス製 Konica Q-M150 のサポート。"
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, fuzzy, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3469,7 +3647,7 @@
 "\n"
 "GPhoto2 と UNIX/Linux を使ってくれてありがとう。\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3480,7 +3658,7 @@
 "\n"
 "Largan Lmini カメラの操作用です。\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, fuzzy, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3491,7 +3669,7 @@
 "ファームウェア:           %s\n"
 "ファームウェアバージョン: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3499,7 +3677,103 @@
 "LG GSM 汎用ドライバ\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "設定"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "AE-ロック"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "シャッター速度"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+#, fuzzy
+msgid "Quality"
+msgstr "画像の品質"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "ビデオ出力"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "自動フォーカスモード"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "液晶モード"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "デバイスアイコン"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "補助光"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "補助光"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "レンズ ID"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "互換モード"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "完全手動"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "CSM メニュー"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, fuzzy, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3514,7 +3788,7 @@
 "Mars MR97310 カメラ。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 #, fuzzy
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
@@ -3540,7 +3814,7 @@
 "お使いのカメラが動画のキャプチャ機能を提供している場合、\n"
 "ビデオ・クリップのフレームは連続した写真としてダウンロードします。\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3548,7 +3822,7 @@
 "Mars MR97310 カメラのライブラリ。\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3559,7 +3833,7 @@
 "ハードウェア・リビジョン:\t%s\n"
 "ファームウェア・リビジョン:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3586,61 +3860,63 @@
 "カードID:\t\t%d\n"
 "フラッシュ モード:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "リモート"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "ローカル"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "はい"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "いいえ"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "ファイン"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "標準"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "自動\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "強制発光\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "発光禁止\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "おかしな値 ( %d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3657,74 +3933,74 @@
 "フラッシュ充電:\t%s\n"
 "レンズの状態:\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "使用中"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "フル充電"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "動作中"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "アイドル中"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "充電中"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "準備 OK"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "標準\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "レンズの向きがフラッシュの方向と同じではありません\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "レンズがついていません\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "レンズの状態がおかしいです %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "カードの状態:\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "書き込み保護つき"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "サポートしないカード"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, fuzzy, c-format
 msgid "Bad value for card status %d"
 msgstr "カード %d の状態がおかしい値"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3737,63 +4013,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "ミノルタ(株) からの仕様提供に感謝します。"
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "フラッシュライト : 自動 (赤目軽減発光)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "フラッシュライト : 自動"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "フラッシュライト : ON (赤目軽減発光)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "フラッシュライト : ON"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "フラッシュライト : OFF"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "フラッシュライト : なし"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Mustek MDC800 の概要:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "ステータスが報告されていません。"
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "コンパクトフラッシュ・カードを検出しました\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "コンパクトフラッシュ・カードがありませんでした\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "現在のモード: カメラ・モード\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "現在のモード: 再生モード\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "バッテリーは充分です。"
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "バッテリーが少ないです。"
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 #, fuzzy
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
@@ -3806,25 +4082,25 @@
 "Marcus Meissner 氏 <marcus@jet.franken.de> によるポーティング。\n"
 "シリアルと USB プロトコルをサポートしています。"
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot ライブラリ Ver"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "カメラとの接続が切れています。"
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "画像 %s のダウンロード中です。"
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "画像 %s のアップロード中です。"
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3832,17 +4108,17 @@
 msgstr ""
 "ファイルサイズは %ld バイトです。アップロード可能なサイズは %i バイトです。"
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "画像 %s を削除します。"
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3858,12 +4134,12 @@
 "Galen Brooks 氏 <galen@nine.com> が\n"
 "作成した dc1000 プログラムがベースです。"
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "%s のダウンロード中です。"
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3879,12 +4155,12 @@
 "Fredrik Roubert 氏 <roubert@df.lth.se> と\n"
 "Galen Brooks 氏 <galen@nine.com> が作成しました。"
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "'%s' のダウンロード中..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -3904,7 +4180,7 @@
 "あります; '標準' は 320x240 'ファイン' は 640x480 です。動画をキャプチャする "
 "CCD デバイスは 300K のみで、低解像度の写真のみ提供します。"
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3920,7 +4196,7 @@
 "ていません。特に問題が発生した場合はカメラは通信速度 9600 よりも高い状態で強"
 "制終了することはありません。"
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3928,7 +4204,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder ドライバ\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3939,7 +4215,7 @@
 " 空きメモリー = %8d バイト\n"
 " ファイル数: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3953,11 +4229,11 @@
 "と Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "ファイルのダウンロード中..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -3965,34 +4241,134 @@
 "Creative PC-CAM600\n"
 "作者: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, fuzzy, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: 期待値 > %d 個のブロック, 返り値 %d 個"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: インデックス %d 個、期待値 > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, fuzzy, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: 返り値 %d, 期待値 %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, fuzzy, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: 期待値 %d のブロック, 返り値 %d 個のブロック"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, fuzzy, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: 予期しないエラー: gp_port_read が %2$d ではなく %1$d を返しま"
 "した"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "型式: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "不明な %d"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "画像サイズ"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "画像の品質"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr ""
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr ""
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "不明な型式"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4007,12 +4383,12 @@
 "Polaroid 640SE を使ったテストは Michael Golden <naugrim@juno.com> が担当しま"
 "した。"
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "型式: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 #, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
@@ -4027,110 +4403,98 @@
 "Michael Trawny <trawny99@users.sourceforge.net> が担当しました。バグ修正は "
 "Marcus Meissner <marcus@jet.franken.de> が担当しました。"
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "画像の品質"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "画像サイズ"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "フラッシュの設定"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "自動パワーオフ (分後)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "情報"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "標準"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "ファイン"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "スーパーファイン"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "自動"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "ON"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "OFF"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "再生"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "記録"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "メニュー"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "バッテリー"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "電源アダプタ"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "不明なヘッダを受け取りました (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "予期しない反応を受け取りました"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "チェックサム・エラー"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "カメラはコマンドを受け付けませんでした。"
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "カメラが予期しないサイズ以上を送信しました (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4139,14 +4503,14 @@
 "写真 %i についての情報 (= 0x%x) を要求しましたが、写真 %i の情報を取得しまし"
 "た"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
 "and ask for assistance."
 msgstr "%i バイトの不明な画像形式を受け取りました。%s まで連絡して下さい。"
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4156,19 +4520,20 @@
 "ナルの作者は Ryan Lantzer <rlantzer@umr.edu> です。gPhoto2 へのポーティング"
 "は Lutz Mueller <lutz@users.sf.net> が担当しました。"
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "カメラ"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "カメラをパワーオフするまでの時間を指定して下さい。"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "画像"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4201,3768 +4566,5723 @@
 "自動パワーオフ: %i 分後\n"
 "電源元: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "このドライバでは要求したポート型式 (%i) をサポートしていません。"
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "カードの状態:\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "型式: "
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "型式: "
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "ズーム: 58mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "色温度"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "色温度"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "色温度"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "フラッシュ モード"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "プリセット"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "キャプチャ・モード"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+#, fuzzy
+msgid "AE Lock"
+msgstr "AE/AF ロック"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "AF ロック維持"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "AF ロック維持"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+#, fuzzy
+msgid "Orientation"
+msgstr "カメラの設定"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "カメラの設定"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 "すみません、お使いのカメラはキヤノンキャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "不明な値 %04x です"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, fuzzy, c-format
-msgid "Unknown value %04d"
-msgstr "不明な値 %04x です"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "予期しないデータ種 %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "取り扱い説明書"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "自動"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "ワンプッシュ自動"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "電球"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "曇天"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "シェード"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 #, fuzzy
 msgid "Fluorescent Lamp 1"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 #, fuzzy
 msgid "Fluorescent Lamp 2"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 #, fuzzy
 msgid "Fluorescent Lamp 3"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 #, fuzzy
 msgid "Fluorescent Lamp 4"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 #, fuzzy
 msgid "Fluorescent Lamp 5"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 #, fuzzy
 msgid "Choose Color Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "電球"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "プリセット"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "カスタム"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG ファイン"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG 標準"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 #, fuzzy
 msgid "RAW + JPEG Fine"
 msgstr "JPEG ファイン"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 #, fuzzy
 msgid "RAW + JPEG Normal"
 msgstr "JPEG 標準"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 #, fuzzy
 msgid "Single frame"
 msgstr "シングルエリア"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 #, fuzzy
 msgid "Continuous low speed"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 #, fuzzy
 msgid "Continuous high speed"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 #, fuzzy
 msgid "Self-timer"
 msgstr "セルフタイマー"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "標準"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "2.0"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "未定義"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "エコノミー"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "劣化なし"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "未定義"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 #, fuzzy
 msgid "DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "カスタム"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 #, fuzzy
 msgid "Lock"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "夜間ポートレート"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "スポーツ"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "横向き"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 #, fuzzy
 msgid "Flash Off"
 msgstr "フラッシュなし"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Creative"
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "晴天"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "魚眼"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "標準"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "縦向き"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr "ソフト"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "赤目軽減"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "フィルイン"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "自動、赤目軽減"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "ON、赤目軽減"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 #, fuzzy
 msgid "Commander"
 msgstr "コマンドの実行順でエラーです。"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "繰り返し"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "自動開口"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "完全手動"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "操作"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+#, fuzzy
+msgid "Large"
+msgstr "大きい"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+#, fuzzy
+msgid "Small"
+msgstr "小さい"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (固定)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (選択)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 #, fuzzy
 msgid "Center-weighted"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "平均"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 #, fuzzy
 msgid "Evaluative"
 msgstr "Volatile の設定"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 #, fuzzy
 msgid "Partial"
 msgstr "引数 1"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 #, fuzzy
 msgid "Multi spot"
 msgstr "複数焦点"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "ユーザー定義 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "ユーザー定義 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "ユーザー定義 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 #, fuzzy
 msgid "Multiple Focusing Points, Auto"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-#, fuzzy
-msgid "Large"
-msgstr "大きい"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 #, fuzzy
 msgid "Medium 1"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 #, fuzzy
 msgid "Medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 #, fuzzy
 msgid "Medium 3"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-#, fuzzy
-msgid "Small"
-msgstr "小さい"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 秒"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 秒"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 #, fuzzy
 msgid "TFT"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2244
-#, fuzzy
-msgid "Setting 4"
-msgstr "フラッシュの設定"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2245
-#, fuzzy
-msgid "Setting 5"
-msgstr "フラッシュの設定"
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2246
-#, fuzzy
-msgid "Setting 6"
-msgstr "フラッシュの設定"
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2247
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
 #, fuzzy
-msgid "Setting 7"
-msgstr "フラッシュの設定"
+msgid "LiveSpotAF"
+msgstr "焦点 AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "カード"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "ビデオ出力"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "不明な %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "工場出荷時の値"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "自動 ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 #, fuzzy
 msgid "sRAW"
 msgstr "sRAW1"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "小さい"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "大きい"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "ビデオ出力"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "測光モード"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "10 秒のタイマー"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "2 秒のタイマー"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 #, fuzzy
 msgid "Single silent"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 #, fuzzy
 msgid "Continuous silent"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "自動 ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "露出バイアスの代償"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "ビープモード"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AF-S"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "タイマー"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4f 秒"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, fuzzy, c-format
 msgid "%f"
 msgstr "%f 秒"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Creative"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "操作"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "夜風景"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "自動 (フラッシュなし)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+#, fuzzy
+msgid "U1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+#, fuzzy
+msgid "U2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "操作"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 #, fuzzy
 msgid "Night Scene"
 msgstr "光源"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "写真の効果"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 #, fuzzy
 msgid "Night landscape"
 msgstr "夜風景"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "縦向き"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 #, fuzzy
 msgid "Candlelight"
 msgstr "晴天"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "蛍光灯"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
-#, fuzzy
-msgid "Effects"
-msgstr "効果モード"
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:3256
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
 #, fuzzy
-msgid "U1"
-msgstr "1"
+msgid "0 image"
+msgstr "画像"
 
-#: camlibs/ptp2/config.c:3257
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 #, fuzzy
-msgid "U2"
-msgstr "2"
+msgid "Effects"
+msgstr "効果モード"
 
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "晴天"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 #, fuzzy
 msgid "Smoothing"
 msgstr "ソフト"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "バースト"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "タイマー"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 #, fuzzy
 msgid "Delayed Remote"
 msgstr "リモート"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "セルフタイマー (次の写真のみ)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "測光モード"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "測光モード"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "中央焦点"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "複数焦点"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "シングルエリア"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 #, fuzzy
 msgid "Single-area AF"
 msgstr "シングルエリア"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 #, fuzzy
 msgid "3D Tracking"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "単一ショット"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "自動"
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "不明な値 0x%04x です"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "中央"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "上"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "下"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "左"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "右"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "ワイド"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "中央"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "露出プログラム・モード"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "露出プログラム・モード"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "露出プログラム・モード"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 #, fuzzy
 msgid "Center Weighted"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "複数焦点"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "中央焦点"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "シェード"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "複数焦点"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "標準"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "大きい"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "高い"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "自動フラッシュ"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 #, fuzzy
 msgid "Fill flash"
 msgstr "フラッシュあり"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "自動赤目軽減"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "赤目軽減フラッシュ"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "外部同期"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "モノクロ"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 #, fuzzy
 msgid "Color sketch"
 msgstr "カラーモード"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
 msgstr "高い"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 #, fuzzy
 msgid "Low key"
 msgstr "低"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "∞"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "∞"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "圧縮"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "スローシンクロ"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "標準"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "焦点 AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "日付の表示"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 #, fuzzy
 msgid "Single-servo AF"
 msgstr "シングルエリア"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "測光モード"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "マニュアルフォーカス"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "MF (選択)"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "AE/AF ロック"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "AE ロックのみ"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "AF ロックのみ"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF オン"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "フラッシュレベルのロック"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 秒"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 分"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 分"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 分"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 秒"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 分"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 #, fuzzy
 msgid "30s"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 #, fuzzy
 msgid "25s"
 msgstr "25%"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 #, fuzzy
 msgid "20s"
 msgstr "2.0"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 #, fuzzy
 msgid "15s"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 #, fuzzy
 msgid "10s"
 msgstr "1.0"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 #, fuzzy
 msgid "8s"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 #, fuzzy
 msgid "4s"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 #, fuzzy
 msgid "2s"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 #, fuzzy
 msgid "1s"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 #, fuzzy
 msgid "1/15s"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 #, fuzzy
 msgid "1/30s"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 #, fuzzy
 msgid "1/60s"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 分"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "シャープに"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "ソフトに"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "ダイレクト印刷"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "低コントラスト"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 #, fuzzy
 msgid "Zone Focus (Close)"
 msgstr "自動フォーカスモード"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自動マクロ"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 #, fuzzy
 msgid "Single-Servo AF"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 #, fuzzy
 msgid "Continuous-Servo AF"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 #, fuzzy
 msgid "One Shot"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "フォーカス"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 秒"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 秒"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 #, fuzzy
 msgid "Missing Number"
 msgstr "バースト数"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 #, fuzzy
 msgid "Shadow"
 msgstr "シェード"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "カスタム"
+msgid "Custom Whitebalance: PC-1"
+msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "カスタム"
+msgid "Custom Whitebalance: PC-2"
+msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "カスタム"
+msgid "Custom Whitebalance: PC-3"
+msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "カスタム"
+msgid "Manual 3"
+msgstr "取り扱い説明書"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "取り扱い説明書"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "取り扱い説明書"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "モノクロ"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "自動, Red-Eye 減少"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE とフラッシュ"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "AE のみ"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "フラッシュのみ"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 #, fuzzy
 msgid "Remote Mirror Up"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "操作モード"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "操作モード"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 #, fuzzy
 msgid "Auto sensitivity"
 msgstr "感度"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 #, fuzzy
 msgid "High sensitivity"
 msgstr "感度"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 #, fuzzy
 msgid "Medium sensitivity"
 msgstr "感度"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "感度"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 #, fuzzy
 msgid "Flash/aperture"
 msgstr "絞り"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG 基本"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF + ファイン"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF + 基本"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF + 標準"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG 基本"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "JPEG 標準"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG ファイン"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "NEF + 基本"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "NEF + 標準"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "NEF + ファイン"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG ファイン"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+msgid "RAW+JPEG (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "JPEG ファイン"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "JPEG ファイン"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF + ファイン"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+msgid "RAW+HEIF (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6884
+msgid "RAW+HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "ファイン"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:6920
+msgid "RAW & JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG ファイン"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "AF ロックのみ"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "複数焦点"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 秒"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 秒"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 分"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 #, fuzzy
 msgid "Optimal quality"
 msgstr "画像の品質"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 #, fuzzy
 msgid "1/250s (Auto FP)"
 msgstr "自動"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 #, fuzzy
 msgid "1/320s (Auto FP)"
 msgstr "自動"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 #, fuzzy
 msgid "3 (Normal)"
 msgstr "標準"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 #, fuzzy
 msgid "AE/AF lock"
 msgstr "AE/AF ロック"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 #, fuzzy
 msgid "AE lock only"
 msgstr "AE ロックのみ"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 #, fuzzy
 msgid "AE lock (Hold)"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 #, fuzzy
 msgid "AF lock only"
 msgstr "AF ロックのみ"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 #, fuzzy
 msgid "Preview"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 #, fuzzy
 msgid "AE lock (hold)"
 msgstr "AE ロックのみ"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 #, fuzzy
 msgid "Matrix metering"
 msgstr "引数 1"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 #, fuzzy
 msgid "Center-weighted metering"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "焦点測光モード"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "再生"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 #, fuzzy
 msgid "+NEF (RAW)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "MF (選択)"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "不明な値です"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 #, fuzzy
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 #, fuzzy
 msgid "Press Full"
 msgstr "PTP の空き容量がありません"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "プリセット"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Fill モードなし"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "画像サイズ"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "カードへの書き込み保護が有効です。"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "カード"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "カードがフォーマットされていません"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "アイリスのエラーです。"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "シーケンス 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "開口設定が正しくありません"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "バッテリーが消耗しました。カメラを OFF にします。"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP I/O エラーです"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "外観の設定"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "カードがフォーマットされていません"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "フラッシュの設定"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "露出プログラム・モード"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "蛍光灯"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "時刻のセット"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "自動"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "自動マクロ"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "不明 (%04x)\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "マクロ"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "電源"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "標準"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "記録"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "再生"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "その他の設定"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "露出バイアスの代償"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "TV メニューを表示しない"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "大きい"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "不明な値 %04x です"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "内部 RAM"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "メモリー カード"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 #, fuzzy
 msgid "Display"
 msgstr "日付の表示"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "削除"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64 ビット"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128 ビット"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 #, fuzzy
 msgid "Managed"
 msgstr "言語"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "アドホック"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP アドレス (DHCP の場合は空)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "ネットワーク マスク"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "デフォルト ゲートウェイ"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "アクセスモード"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "WIFI チャンネル"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "暗号化"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "暗号鍵 (16 進数)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "書き込み"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "WIFI プロファイルの一覧"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "WIFI プロファイルの作成"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "カメラの日時と PC を同期する"
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "自動フォーカスモード"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "マニュアルフォーカス"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "フォーカス ロック"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 #, fuzzy
 msgid "Bulb Mode"
 msgstr "ビープモード"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 #, fuzzy
 msgid "UI Lock"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "フラッシュなし"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 #, fuzzy
 msgid "Set Nikon Autofocus area"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 #, fuzzy
 msgid "Set Nikon Control Mode"
 msgstr "キャプチャ・モード"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "マニュアルフォーカス"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "フォーカス位置"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 #, fuzzy
 msgid "Canon EOS Zoom Position"
 msgstr "フォーカス位置"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 #, fuzzy
 msgid "Nikon Viewfinder"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "液晶モード"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "フォーカス エリアのゾーン"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "フォーカスの焦点"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 #, fuzzy
 msgid "Camera Manufacturer"
 msgstr "%s製造: %s\n"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 #, fuzzy
 msgid "Device Version"
 msgstr "デバイスアイコン"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 #, fuzzy
 msgid "Vendor Extension"
 msgstr "ベンダー拡張の詳細: %s\n"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 #, fuzzy
 msgid "PTP Version"
 msgstr "DPOF のバージョン"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "DPOF のバージョン"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "AC 電源"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "外部フラッシュ"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "バッテリーのレベル"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "測光モード"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 #, fuzzy
 msgid "Camera Orientation"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 #, fuzzy
 msgid "Flash Open"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "液晶モード"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 #, fuzzy
 msgid "Flash Charged"
 msgstr "コンパクトフラッシュ・カード"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "レンズの名前"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "シャッター回数"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 #, fuzzy
 msgid "Available Shots"
 msgstr "有効なメモリー: "
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 #, fuzzy
 msgid "Focal Length Minimum"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 #, fuzzy
 msgid "Focal Length Maximum"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "光源"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "光源"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 #, fuzzy
 msgid "AF Locked"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 #, fuzzy
 msgid "AE Locked"
 msgstr "AE/AF ロック"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "AF ロック維持"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "解像度切替えあり"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 #, fuzzy
 msgid "Camera Date and Time"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "ビープモード"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "画像のコメント"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 #, fuzzy
 msgid "Enable Image Comment"
 msgstr "画像のコメント"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "LCD OFF 時間"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "記録モード"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "CSM メニュー"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 #, fuzzy
 msgid "Camera Output"
 msgstr "カメラは OK です。\n"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 #, fuzzy
 msgid "Recording Destination"
 msgstr "記録モード"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "AF モード"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "作者"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 #, fuzzy
 msgid "CCD Number"
 msgstr "%sシリアル番号: %s\n"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "コピーライト"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 #, fuzzy
 msgid "Flicker Reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "コンパクトフラッシュ・カード"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "自動パワーオフ (分後)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "メニューと再生"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "カメラの操作"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "液晶モード"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "サポートしているサムネイルの大きさ"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "取り込み対象"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "自動フォーカスモード"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "記録モード"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "効果モード"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "画像形式"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "画像形式"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "画像形式"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "ファイルの解像度"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "画像サイズ"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "自動"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 #, fuzzy
 msgid "WhiteBalance X A"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 #, fuzzy
 msgid "WhiteBalance X B"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "写真の効果"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "カラー形式"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "色空間"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "データ形式"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "ファイルの解像度"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "コントラスト"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "明るさ"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "データ形式"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "自動フォーカスモード 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "シャッター速度"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "補助光"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 #, fuzzy
 msgid "Rotation Flag"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "露出度"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+#, fuzzy
+msgid "Color temperature"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "AF モード"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "画像の調整"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 #, fuzzy
 msgid "Flash Command Channel"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 #, fuzzy
 msgid "Flash Command Self Value"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 #, fuzzy
 msgid "Flash Command A Value"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 #, fuzzy
 msgid "Flash Command B Value"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "AF ビープモード"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "液晶モード"
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 #, fuzzy
 msgid "Flexible Program"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "画像の品質"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Canon 画像の大きさ"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "画像形式"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 #, fuzzy
 msgid "Continuous AF"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "効果モード"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 #, fuzzy
 msgid "Exposure Program"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "カメラモード"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "ビープモード"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "AF モード"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr ""
 "\n"
 "ストレージ デバイスの要約:\n"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 #, fuzzy
 msgid "HDR Smoothing"
 msgstr "ソフト"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "キャプチャ・モード"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "自動露出ロック"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 #, fuzzy
 msgid "Drive Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
 msgstr "写真の設定"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "フォーカス測光モード"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 #, fuzzy
 msgid "AV Open"
 msgstr "AF オン"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "絞り"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 #, fuzzy
 msgid "Capture Delay"
 msgstr "キャプチャの遅れ"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 #, fuzzy
 msgid "AF Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "露出"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 #, fuzzy
 msgid "Live View AF Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 #, fuzzy
 msgid "Live View AF Focus"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "液晶モード"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 #, fuzzy
 msgid "Flash Sign"
 msgstr "フラッシュの設定"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "強制発光\n"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "画像サイズ"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 #, fuzzy
 msgid "EV Step"
 msgstr "ISO ステップ"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 #, fuzzy
 msgid "Bracket Set"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "露出補正"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "色温度"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "バースト数"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "バーストの間隔"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "記録モード"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "操作モード"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 #, fuzzy
 msgid "Sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 #, fuzzy
 msgid "Saturation"
 msgstr "設定"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "サウンド"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "取り込みの設定"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "PTP 未定義のプロパティ"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 #, fuzzy
 msgid "Video Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "ファイルの削除、"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 #, fuzzy
 msgid "Assign Func Button"
 msgstr "ボタンの機能割り当て"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 #, fuzzy
 msgid "Assign Preview Button"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-#, fuzzy
-msgid "Movie Quality"
-msgstr "画像の品質"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Minimum Shutter Speed"
-msgstr "シャッター速度"
+msgid "Continuous Shooting Speed Slow"
+msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "ファイルの解像度"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
-msgstr "測光モード"
+msgid "Minimum Shutter Speed"
+msgstr "シャッター速度"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+#, fuzzy
+msgid "Movie Quality"
+msgstr "画像の品質"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 #, fuzzy
 msgid "ISO Auto Hi Limit"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "フラッシュ同期速度"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "フォーカス測光モード"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "測光モード"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "JPEG 圧縮のポリシー"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 #, fuzzy
 msgid "AF Activation"
 msgstr "操作"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 #, fuzzy
 msgid "AF Lock On"
 msgstr "AF ロックのみ"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 #, fuzzy
 msgid "AF On Button"
 msgstr "AE ロックのみ"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "フォーカスの長さ"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "RAW 圧縮"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "画像の品質"
 
-#: camlibs/ptp2/config.c:7543
+#: camlibs/ptp2/config.c:11288
 #, fuzzy
-msgid "Image Settings"
-msgstr "カメラの設定"
+msgid "Live View Zoom Area"
+msgstr "液晶モード"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "取り込みの設定"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "WIFI プロファイル"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 #, fuzzy
 msgid "Other PTP Device Properties"
 msgstr "サポートされていない PTP デバイス Prop"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP プロパティ 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "ディレクトリがみつかりません"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7974,215 +10294,251 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+#, fuzzy
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 #, fuzzy
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-#, fuzzy
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
-"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:4128
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 #, fuzzy
 msgid "Canon Capture failed"
 msgstr "Canon 画像の大きさ"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr ""
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
 msgstr "%s製造: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, fuzzy, c-format
 msgid "Model: %s\n"
 msgstr "型式: "
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, fuzzy, c-format
 msgid "  Version: %s\n"
 msgstr "バージョン: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, fuzzy, c-format
 msgid "  Serial Number: %s\n"
 msgstr "%sシリアル番号: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "ベンダー拡張の詳細: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "ファームウェアのリビジョン: %d.%02d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, fuzzy, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "操作モード"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 #, fuzzy
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 #, fuzzy
 msgid "Display Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8190,96 +10546,96 @@
 "\n"
 "デバイスの能力:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tファイルのダウンロード、"
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "ファイルの削除、"
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "ファイルの削除なし、"
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "ファイルのアップロード\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "ファイルのアップロードなし\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 #, fuzzy
 msgid "Open Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 #, fuzzy
 msgid "Olympus E XML Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon Wifi サポート\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon Wifi サポート\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8287,96 +10643,96 @@
 "\n"
 "ストレージ デバイスの要約:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tストレージの説明: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tボリューム ラベル: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "組み込み ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "リムーバブル ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "組み込み RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "リムーバブル RAM (メモリー カード)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "不明 (%04x)\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tストレージの種類: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 #, fuzzy
 msgid "Generic Flat"
 msgstr "全般"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 #, fuzzy
 msgid "Read-Write"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 #, fuzzy
 msgid "Read-Only"
 msgstr "準備 OK"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tアクセス能力: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\t最大能力: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\t空き容量 (バイト): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\t空き容量 (画像数): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8384,2489 +10740,2581 @@
 "\n"
 "デバイスプロパティの要約:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 #, fuzzy
 msgid "cannot be queried.\n"
 msgstr "カードに書き込めません。"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "読み込みのみ"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "ファイル '%s/%s' は存在しません。"
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "このカメラでは設定したいくつかのオプションをサポートしていません。"
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, fuzzy, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "このカメラでは設定したいくつかのオプションをサポートしていません。"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr "PTP は USB カメラのみサポートしています。"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP の一般的なエラー"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP のセッションが開かれていません"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP の不正なトランザクション ID"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "サポートされていない PTP 操作"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "サポートされていない PTP パラメータ"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP の転送が完了していません"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP の不正なストレージ ID"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP 不正なオブジェクト操作"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "サポートされていない PTP デバイス Prop"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP の不正なオブジェクト書式コード"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP の空き容量がありません"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP オブジェクトへの書き込み保護が有効です"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP は読み込み専用です"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP へのアクセスが拒否されました"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP にはサムネイルがありません"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP の自己診断に失敗しました"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP の部分的な削除"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP に格納できません"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "サポートしていない PTP 書式の指定"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP の不正なオブジェクト情報"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP の不正なコード書式"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP の不明なベンダーコードです"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP のキャプチャは中断しました"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP のデバイス ビジー"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP 不正なオブジェクト"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP の不正なデバイス Prop 書式"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP の不正なデバイス Prop 値"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP の不正なパラメータ"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP のセッションはオープンしています"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP トランザクションがキャンセルされました"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "サポートしていない PTP 転送先の指定"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP 不正なオブジェクト操作"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "使用不可の理由"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "開口設定が正しくありません"
+
+#: camlibs/ptp2/ptp.c:6117
 #, fuzzy
 msgid "Filename Required"
 msgstr "PTP EK ファイル名が必要です"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 #, fuzzy
 msgid "Filename Conflicts"
 msgstr "PTP EK ファイル名が重複しています"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "PTP EK 不正なファイル名です"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 #, fuzzy
 msgid "Out of Focus"
 msgstr "自動フォーカスモード"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 #, fuzzy
 msgid "Change Camera Mode Failed"
 msgstr "カメラの型式"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 #, fuzzy
 msgid "Invalid Status"
 msgstr "不正"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "サポートされていない PTP デバイス Prop"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP にはサムネイルがありません"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "ストローブのエラーです。"
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "カードがフォーマットされていません"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "シャッター速度"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP のキャプチャは中断しました"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "不明な %d"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "操作を取り消しました"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "バッテリーモード"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "カメラモード"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "バッテリー"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "準備未完了"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP の不正なオブジェクト書式コード"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP の不正なオブジェクト書式コード"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP の不正なデバイス Prop 値"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP 不正なオブジェクト操作"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "開口設定が正しくありません"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "サポートしていない PTP 書式の指定"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "サポートしていない PTP 書式の指定"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "サポートされていない PTP デバイス Prop"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "PTP の不正なトランザクション ID"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "サポートされていない PTP 操作"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP のデバイス ビジー"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "PTP タイムアウト"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 #, fuzzy
 msgid "PTP Cancel Request"
 msgstr "PTP 取り消しの要求"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "PTP プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "PTP プロトコル・エラー (期待値: データ)"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "PTP I/O エラーです"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "未定義の PTP プロパティ"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "操作モード"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "圧縮の設定"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "ホワイトバランス"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB ゲイン"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "露出のインデックス (フィルム速度 ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "キャプチャの遅れ"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "低速度撮影の間隔"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "アップロードする URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "コピーライト"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "サポートしているサムネイルの大きさ"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "データ形式"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "ファイルの解像度"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "ビデオ出力"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "コントラスト"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "明るさ"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "データ形式"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "日時の書式"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "ビデオ出力"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "使用する言語"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "バッテリーの種類"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "バッテリーモード"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "カメラモード"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "セルフタイマー"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "画像モード"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "AF モード"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "色ゲイン"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "感度"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "テレのフォーカス長"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "ワイドのフォーカス長"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 #, fuzzy
 msgid "Focal Length Denominator"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 #, fuzzy
 msgid "Capture Transfer Mode"
 msgstr "キャプチャ・モード"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "名前の接頭辞"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "サイズと品質モード"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "サポートしているサムネイルの大きさ"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "リモート API バージョン"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "カメラの所有者"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX 時刻"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "カメラ本体の ID"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 #, fuzzy
 msgid "Ml Spot Position"
 msgstr "フォーカス位置"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "イベントのエミュレート モード"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "型式 ID"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 #, fuzzy
 msgid "Shooting Bank Name A"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 #, fuzzy
 msgid "Shooting Bank Name B"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 #, fuzzy
 msgid "Shooting Bank Name C"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 #, fuzzy
 msgid "Shooting Bank Name D"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "バンク 0 のリセット"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 #, fuzzy
 msgid "White Balance Preset Number"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 #, fuzzy
 msgid "White Balance Preset Name 0"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 #, fuzzy
 msgid "White Balance Preset Name 1"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 #, fuzzy
 msgid "White Balance Preset Name 2"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 #, fuzzy
 msgid "White Balance Preset Name 3"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 #, fuzzy
 msgid "White Balance Preset Name 4"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 #, fuzzy
 msgid "White Balance Preset Value 0"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 #, fuzzy
 msgid "White Balance Preset Value 1"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 #, fuzzy
 msgid "White Balance Preset Value 2"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 #, fuzzy
 msgid "White Balance Preset Value 3"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 #, fuzzy
 msgid "White Balance Preset Value 4"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 #, fuzzy
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "フォーカス エリアのゾーン"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "コピーライトの有効"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "露出度"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 #, fuzzy
 msgid "Live View AF Area"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 #, fuzzy
 msgid "Img Conf Time"
 msgstr "画像のコメント"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 #, fuzzy
 msgid "Angle Level"
 msgstr "ボリュームレベル"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 #, fuzzy
 msgid "Artist Name"
 msgstr "作者"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 #, fuzzy
 msgid "Copyright Information"
 msgstr "コピーライト"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "強制発光\n"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "現在のモード: 再生モード\n"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "再生フォト情報"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "ボタンの機能割り当て"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "コマンドダイアルのカスタマイズ"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "外観の設定"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "ボタンとダイアル"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 #, fuzzy
 msgid "Function Button 2"
 msgstr "操作モード"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "標準"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 #, fuzzy
 msgid "Clean Image Sensor"
 msgstr "Canon 画像の大きさ"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 #, fuzzy
 msgid "Image Comment String"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "画像のコメント"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 #, fuzzy
 msgid "Image Rotation"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "レンズ ID"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "レンズの並び替え"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "レンズの種類"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 #, fuzzy
 msgid "Finder ISO Display"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 #, fuzzy
 msgid "Warning Status"
 msgstr "カードの状態:\t"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 #, fuzzy
 msgid "USB Speed"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 #, fuzzy
 msgid "CCD Serial Number"
 msgstr "%sシリアル番号: %s\n"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "F-番号"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "TV A/V 設定"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "TV A/V 設定"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 #, fuzzy
 msgid "External Flash Attached"
 msgstr "外部同期"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 #, fuzzy
 msgid "External Flash Sort"
 msgstr "外部同期"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 #, fuzzy
 msgid "BW Sharpness"
 msgstr "鮮明度"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 #, fuzzy
 msgid "BW Contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
+#: camlibs/ptp2/ptp.c:6951
 #, fuzzy
-msgid "Flourescent Type"
+msgid "Fluorescent Type"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 #, fuzzy
 msgid "Tune Colour Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 #, fuzzy
 msgid "Tune Preset 0"
 msgstr "プリセット"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 #, fuzzy
 msgid "Tune Preset 1"
 msgstr "プリセット"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 #, fuzzy
 msgid "Tune Preset 2"
 msgstr "プリセット"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 #, fuzzy
 msgid "Tune Preset 3"
 msgstr "プリセット"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 #, fuzzy
 msgid "Tune Preset 4"
 msgstr "プリセット"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "自動フォーカスモード"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "補助光"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "TV A/V 設定"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 #, fuzzy
 msgid "Flash Mode Commander Power"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "自動"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 #, fuzzy
 msgid "Warning Display"
 msgstr "日付の表示"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 #, fuzzy
 msgid "Battery Cell Kind"
 msgstr "バッテリーのレベル"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 #, fuzzy
 msgid "Continuous Speed High"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "フラッシュの設定"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 #, fuzzy
 msgid "Preview Button"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 #, fuzzy
 msgid "Preview Button 2"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 #, fuzzy
 msgid "AEAF Lock Button 2"
 msgstr "AE ロックのみ"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 #, fuzzy
 msgid "Indicator Display"
 msgstr "日付の表示"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 #, fuzzy
 msgid "Live View Drive Mode"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 #, fuzzy
 msgid "Exposure Display Status"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 #, fuzzy
 msgid "Info Display Error Status"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "露出度"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 #, fuzzy
 msgid "Flash MRepeat Interval"
 msgstr "低速度撮影の間隔"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "言語"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "RAW 圧縮"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
 msgstr "セルフタイマ"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "ボリュームレベル"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "デバイスアイコン"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "再生位置"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "画像の品質"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 #, fuzzy
 msgid "Release Mode"
 msgstr "フラッシュ モード"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 #, fuzzy
 msgid "Focus Areas"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/ptp.c:5422
+#: camlibs/ptp2/ptp.c:7326
 #, fuzzy
-msgid "AE Lock"
-msgstr "AE/AF ロック"
+msgid "Focus Point"
+msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "画像サイズ"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:5436
-#, fuzzy
-msgid "Color temperature"
-msgstr "色温度"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "メモリーが足りません"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "完全な画像"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "フォーカス位置"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "日付と時間"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "白熱灯"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "マニュアルフォーカス"
+
+#: camlibs/ptp2/ptp.c:7848
 #, fuzzy
 msgid "Automatic Macro (close-up)"
 msgstr "自動マクロ"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 #, fuzzy
 msgid "Center Weighted Average"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 #, fuzzy
 msgid "Center-spot"
 msgstr "中央焦点"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 #, fuzzy
 msgid "Automatic flash"
 msgstr "自動フラッシュ"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 #, fuzzy
 msgid "Red-eye fill flash"
 msgstr "赤目軽減フラッシュ"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "タイマーとリモート"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "AF ロックのみ"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "フラッシュロック"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 #, fuzzy
 msgid "Unused"
 msgstr "使用中"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 #, fuzzy
 msgid "USB 2.0"
 msgstr "2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "晴天"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 分"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 分"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 分"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 分"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 #, fuzzy
 msgid "Dark on light"
 msgstr "晴天"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 #, fuzzy
 msgid "Light on dark"
 msgstr "フラッシュが暗すぎます。"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "警告レベル 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "警告レベル 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "エコノミー"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "スーパーファイン"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 #, fuzzy
 msgid "Auto + Red Eye Suppression"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 #, fuzzy
 msgid "Distant View"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
 msgstr "マニュアルフォーカス"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 #, fuzzy
 msgid "Single-Frame Shooting"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 #, fuzzy
 msgid "Timer (Single) Shooting"
 msgstr "単一ショット"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 #, fuzzy
 msgid "Smooth"
 msgstr "ソフト"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 #, fuzzy
 msgid "Center-weighted Metering"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "焦点測光モード"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "Volatile の設定"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "引数 1"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 #, fuzzy
 msgid "Center-weighted Average Metering"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "焦点測光モード"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 #, fuzzy
 msgid "Low 2"
 msgstr "低"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 #, fuzzy
 msgid "High 2"
 msgstr "高い"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "引数 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "引数 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "引数 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 #, fuzzy
 msgid "MlSpotPosCenter"
 msgstr "フォーカス位置"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 #, fuzzy
 msgid "MlSpotPosAfLink"
 msgstr "フォーカス位置"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "メディアカード"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "メディアカードグループ"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 #, fuzzy
 msgid "Encounter"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "ファームウェア"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Windows 画像形式"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "不明な書類"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "XML 書類"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word 書類"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 #, fuzzy
 msgid "Undefined Contact"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "不明 (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 #, fuzzy
 msgid "Get device info"
 msgstr "デバイス情報の取得"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "セッションを開く"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "セッションを閉じる"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "ストレージ ID の取得"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "ストレージ情報の取得"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "オブジェクト番号の取得"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "オブジェクト情報の取得"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "オブジェクトの取得"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "サムネイルの取得"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "オブジェクトの削除"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "ストレージの初期化"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "デバイスのリセット"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 #, fuzzy
 msgid "Self test device"
 msgstr "PTP の自己診断に失敗しました"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 #, fuzzy
 msgid "Get Vendor Extension Maps"
 msgstr "ベンダー拡張の詳細: %s\n"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 #, fuzzy
 msgid "Get Vendor Device Info"
 msgstr "デバイス情報の取得"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 #, fuzzy
 msgid "Get Stream Info"
 msgstr "ストレージ情報の取得"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "認識できない反応です"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 #, fuzzy
 msgid "Get meter response"
 msgstr "予期しない反応を受け取りました"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
 msgstr "PTP 不正なオブジェクト"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "不明な %d"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "PTP の不明なベンダーコードです"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "不明な値です"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "動画のダウンロード中..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "音声のダウンロード中..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "EXIF データのダウンロード中..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "%s で利用可能な EXIF データではありません。"
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "ファイルを削除できませんでした。"
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "フォルダを削除できませんでした。"
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "フォルダを生成できませんでした。"
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "バージョン: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTC の状態: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "カメラの時刻: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "カメラの ID: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "SD カードが装着されていません。\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD カードの ID: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "写真の合計: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD メモリー: 合計 %d MB, 空き %d MB\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "内部メモリー: 合計 %d MB, 空き %d MB\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10878,7 +13326,7 @@
 "USB スヌープを利用したリバース・エンジニアリング、\n"
 "ファイヤーワイヤーの画像更新と見当違いの憶測。\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10890,12 +13338,12 @@
 "Martin Fischer <martin.fischer@inka.de> 作の\n"
 "Ricoh / Philips ドライバ\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "不明 (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10904,190 +13352,190 @@
 "型式: %s\n"
 "メモリー: %d/%d バイト有効"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "屋外"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "最大"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "最小"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "文字"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "サウンド"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "画像とサウンド"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "文字とサウンド"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "設定"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "全般"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "コピーライト (最大 20文字)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "写真"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "ホワイトバランス"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "記録モード"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "圧縮"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "シャッター速度 %i はサポートされていません！"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "%i バイトを期待しましたが、%i バイトを受け取りました。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "%i バイトを期待しましたが、%i バイトを受け取りました。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "0x%x を期待しましたが、0x%x を受け取りました。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "おかしな文字 (0x%x, 0x%x) です。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "カメラがビジーです。この状態が長く続いた場合は %s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "二回リトライしましたがタイムアウトです。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "二回トライしましたが通信エラーです。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "カメラが間違ったモードにあります。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "カメラが引数を受け取りません。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "不明なエラーが発生しました。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "ファイル名は 12文字以内にして下さい ('%s' は %i 文字あります)。"
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -11099,110 +13547,110 @@
 "sourceforge.net> 氏はそれを gphoto2 向けに実装し直しました。Marcus Meissner "
 "氏 <marcus@jet.franken.de> 氏はバグフィックスと拡張機能を担当しました。"
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "解像度の増分値"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "日付と時間 (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 #, fuzzy
 msgid "Aperture Settings"
 msgstr "外観の設定"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "カラーモード"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "フラッシュの設定"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "ホストのパワーセーブ (秒)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "カメラのパワーセーブ (秒)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "レンズモード"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "韓国語"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "英語"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "フランス語"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "ドイツ語"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "イタリア語"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "日本語"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "写真の設定"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -11222,230 +13670,226 @@
 "  お使いのカメラがおかしな動きをした場合は\n"
 "  メーリング・リストまで (英語で) 連絡して下さい。\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "メモリー・カードがありません"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "バッテリー容量を取得することができません"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "カメラのバッテリー残量が低すぎます (%d%%)。操作を中止します。"
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "有効なメモリー残量を取得できません。"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "接続を保持するのに３回失敗しました。"
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "最初に受け取ったデータ (0x%x) は無効です。"
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "パケットを %i 回送信しましたが、タイムアウトしました。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "リトライ後もパケット送信できませんでした。"
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, fuzzy, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "パケットがカメラに拒否されました。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "パケットを送信できませんでした (エラーコード %i)。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "二回再送しましたがタイムアウトしました。終了します..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "予期しない結果 0x%x を受け取りました。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "予期しない結果 (%i) を受け取りました。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "レジスタ %i を取得できません。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "リトライに失敗しました。"
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "データの送信中..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Sierra ドライバでは再帰呼び出しはサポートしていません！ %s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "string 型レジスタ %i を取得できませんでした。%s に連絡して下さい。"
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 バイトを期待しましたが、%i バイトを受け取りました。%s に連絡して下さい。"
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "シャッター速度 (マイクロ秒, 0:自動)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "シャッター速度 (秒, 0:自動)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "B/W"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "赤目対策"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "スローシンクロ"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "コントラスト(+)"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "コントラスト(-)"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "明るさ(+)"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "明るさ(-)"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "画像の調整"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "点滅"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "液晶モード"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "∞"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "進む"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "戻る"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "操作モード"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "液晶モニタの明るさ"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "液晶モニタの自動オフ (秒)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "中央部重点"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "マトリックス"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "焦点 AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "露出補正"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "ズーム (ミリ単位)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "なし"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "AE-ロック"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "魚眼"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "ワイド"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "その他の露出/レンズの設定"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "自動露出ロック"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11475,7 +13919,7 @@
 "        シャッター・スピードをセットする場合は\n"
 "        'M' モードにして下さい。\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11494,72 +13938,68 @@
 "\n"
 "    ダウンロードは正しく機能する必要があります。\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "白板"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "黒板"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "操作モード"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "スローシンクロ"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 #, fuzzy
 msgid "Anti-redeye Fill"
 msgstr "赤目対策"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "蛍光灯"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "蛍光灯"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "モニタ"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "液晶モード"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "デジタル・ズーム"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "フォーカス位置"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "時刻の形式"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -11594,7 +14034,7 @@
 "    もしこのような状態になったら、PC から取り外しして再び接続し\n"
 "    液晶を \"OFF\" に切り替えて下さい。"
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -11624,7 +14064,7 @@
 "    もしこのような状態になったら、PC から取り外しして再び接続し\n"
 "    液晶を \"OFF\" に切り替えて下さい。"
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11652,230 +14092,235 @@
 "    設定機能を完全にするために開発に協力してくれるのならば\n"
 "    開発者のメーリング・リストまで連絡して下さい。\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (不明)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "アップロードしたファイルのサイズが NULL です"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "メモリー カードに空き容量がありません"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "写真を格納するフォルダ名が取得できません"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "フォルダ '%s' へのアップロードのみサポートしています"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "ベスト"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (不明)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "シャッター速度 (マイクロ秒, 0:自動)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "モノクロ"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "白板"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "黒板"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "明るさ/コントラスト"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "明るさ(+)"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "明るさ(-)"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "晴天"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "∞/フラッシュアイ"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "焦点測光モード"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "x1"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "x1.6"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "x2.5"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "自動パワーオフ (host) (秒後)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr "コンピュータに接続した時に自動的にパワーオフするまでの時間です"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "自動パワーオフ (屋外) (秒後)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "屋外で自動的にパワーオフするまでの時間です"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "液晶モニタの自動オフ (秒後)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "ショットの設定"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "標準"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "高解像度"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "色彩"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "モノクロ"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "注意: メモリー・カードがありません。いくつかの値が不正になるかもしれませ"
 "ん。\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "カメラの型式: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "シリアル番号: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "ソフトウェアのリビジョン: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "フレーム数: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "残りフレーム数: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "バッテリーの寿命: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "メモリーの空き容量: %i バイト\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "日付: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "取り扱い説明書は利用できません。\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11896,7 +14341,7 @@
 "  お使いのカメラがおかしな動きをした場合は\n"
 "  %s まで (英語で) 連絡して下さい。\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -11931,7 +14376,7 @@
 "    もしこのような状態になったら、PC から取り外しして再び接続し\n"
 "    液晶を \"OFF\" に切り替えて下さい。"
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -11952,12 +14397,7 @@
 "Data Engines 氏 (www.dataengines.com)\n"
 "に感謝します。"
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (不明)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11967,11 +14407,11 @@
 "Vincent Sanders 氏 <vince@kyllikki.org>\n"
 "Marcus Meissner 氏 <marcus@jet.franken.de>\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "USB 設定を適用できませんでした"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11991,7 +14431,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Smal Ultrapocket カメラ向のドライバで、OEM 版です (slimshot)。"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, fuzzy, c-format
 msgid ""
 "Sonix camera.\n"
@@ -12006,7 +14446,7 @@
 "Mars MR97310 カメラ。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -12021,7 +14461,7 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -12029,7 +14469,7 @@
 "Sonix カメラのライブラリ。\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -12043,7 +14483,7 @@
 "インタフェース部を提供して貰いました\n"
 "Gphoto2 実装の担当は Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -12056,7 +14496,7 @@
 "gPhoto2 へのポーティングは Raymond Penners 氏 <raymond@dotsphinx.com> が担当"
 "しました。"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -12069,12 +14509,12 @@
 "メモリーの合計: %i Kバイト\n"
 "空きメモリーの合計:  %i Kバイト\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "ファームウェアのリビジョン: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -12082,7 +14522,7 @@
 "Soundvision ドライバ\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -12091,7 +14531,7 @@
 "フラッシュ・メモリー:\n"
 " ファイル数: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -12108,7 +14548,7 @@
 "使用済みの容量: %8d\n"
 "空き容量: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x ライブラリ Ver"
 
@@ -12174,19 +14614,19 @@
 "sq905 向け汎用ドライバ。\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12194,12 +14634,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-#, fuzzy
-msgid "Orientation"
-msgstr "カメラの設定"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12211,110 +14646,110 @@
 "STV0674 プロセッサの ASIC 回路を搭載したカメラのドライバです。\n"
 "SnoopyPro を使ってプロトコルをリバースエンジニアしました。\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "露出がおかしいです (おそらくフラッシュが十分ではありません)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "STV0680 ベースのカメラ情報:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "ファームウェア・リビジョン: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC リビジョン: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "センサ ID: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, fuzzy, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "カメラのフラッシュ設定は %dHz です。\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "カメラ内蔵メモリー: %d Mビット\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "サムネイル形式をサポートしています。\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "ビデオ形式をサポートしています。\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "白黒です。\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "メモリーを内蔵しています。\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "サポート済みのビデオ形式:"
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "ベンダー ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "製品 ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "写真の数: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "画像の最大数: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "画像の幅: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "画像の高さ: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "画像サイズ: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "サムネイルの幅: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "サムネイルの高さ: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "サムネイルのサイズ: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12330,12 +14765,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de> 氏が担当。\n"
 "Aiptek PenCam の拡張とその他の STM USB Dual-mode カメラを担当。"
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "%i 個のファイルの情報を取得中..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12347,19 +14782,19 @@
 "バグ報告とコメントは次にへメールして下さい:\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z は USB にのみ対応しています"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "ドライバーの設定"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "ターボ モード"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12367,12 +14802,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "「%s」をダウンロードしています..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12382,40 +14817,60 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 向けのドライバ。\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "'%s' からカメラのドライバを読み込み中..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "I/O ライブラリ ('%s') でエラーが発生しました: %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "カメラを検出できませんでした"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, fuzzy, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "カメラを検出できませんでした"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 #, fuzzy
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "カメラの初期化を行う前に先にポートをセットして下さい。"
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "必要なカメラのドライバ '%s' (%s) が読み込めませんでした。"
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "カメラのドライバ '%s' には 'camera_init' 関数がありません。"
@@ -12456,12 +14911,12 @@
 msgid "This camera can not capture previews."
 msgstr "このカメラはキャプチャのプレビューができません。"
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "パス名 '%s' が無効です。"
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12470,118 +14925,118 @@
 "'%s' をフォルダ '%s' から削除しようとしましたが、ファイルシステムはファイルの"
 "削除をサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, fuzzy, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "削除しようとしたフォルダ '%s' の中にサブフォルダが存在します。"
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, fuzzy, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "削除しようとしたフォルダ '%s' の中にファイルが存在しています。"
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "ファイルシステムではファイルのアップロードをサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, fuzzy, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 "フォルダ '%s' には %i 個のファイルがありますが、要求した番号は %i です。"
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "ファイル '%s' がフォルダ '%s' の中にありません。"
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "ファイル '%s' が見つかりませんでした。"
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "ファイルシステムはこの形式のファイル取得をサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "不明なファイル形式 %i です。"
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "ファイルシステムはこの形式のファイル情報取得をサポートしていません"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "ファイルシステムはこの形式のファイル情報の設定をサポートしていません"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "ファイルの幅と高さなどの読み込み専用属性を変更することはできません。"
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 #, fuzzy
 msgid "The filesystem doesn't support getting storage information"
 msgstr "ファイルシステムはこの形式のファイル情報取得をサポートしていません"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "おかしなデータ"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "ファイルが存在します"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "不明な型式"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "ディレクトリがみつかりません"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "ファイルがみつかりません"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "ディレクトリが存在します"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "進行中の I/O"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "パス名が無効です"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "操作を取り消しました"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "操作を完了できませんでした"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "カメラとの通信中に OS のエラーが発生しました"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "カメラ ライブラリの不明なエラー"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "不明なエラー"
 
@@ -12615,6 +15070,7 @@
 #~ msgid "Zoom 9"
 #~ msgstr "ズーム 9"
 
+#, c-format
 #~ msgid "%s is a file type for which no thumbnail is provided"
 #~ msgstr "サムネイルではないファイル %s が指定されました"
 
@@ -12628,7 +15084,7 @@
 #~ msgid "Unknown (some kind of error)"
 #~ msgstr "不明なエラー (詳細不明)"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid ""
 #~ "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, "
 #~ "%6.3f sec \"%s\""
@@ -12636,6 +15092,7 @@
 #~ "canon_usb_poll_interrupt_pipe: %i 回試行しましたが割り込みに失敗しました "
 #~ "(\"%s\")"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, "
 #~ "\"%s\""
@@ -12643,17 +15100,19 @@
 #~ "canon_usb_poll_interrupt_multiple: %i 回試行しましたが割り込みに失敗しまし"
 #~ "た (\"%s\")"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 #~ msgstr ""
-#~ "canon_usb_capture_dialogue: サムネイルのパケット・サイズがおかしいです (0x"
-#~ "%04x)"
+#~ "canon_usb_capture_dialogue: サムネイルのパケット・サイズがおかしいです "
+#~ "(0x%04x)"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 #~ msgstr ""
-#~ "canon_usb_capture_dialogue: 画像パケットの合計サイズがおかしいです (0x"
-#~ "%04x)"
+#~ "canon_usb_capture_dialogue: 画像パケットの合計サイズがおかしいです "
+#~ "(0x%04x)"
 
 #, fuzzy
 #~ msgid "canon_usb_capture_dialogue: secondary image descriptor received"
@@ -12668,11 +15127,12 @@
 #~ msgstr ""
 #~ "canon_usb_capture_dialogue: シーケンスの外で二回目の割り込みが発生しました"
 
+#, c-format
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 #~ msgstr ""
-#~ "canon_usb_capture_dialogue: 写真のシグナル受信に失敗しました (コード = 0x"
-#~ "%08x)"
+#~ "canon_usb_capture_dialogue: 写真のシグナル受信に失敗しました (コード = "
+#~ "0x%08x)"
 
 #~ msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 #~ msgstr ""
@@ -12685,11 +15145,13 @@
 #~ "canon_usb_capture_dialogue: シーケンスとの外で四回目の割り込みが発生しまし"
 #~ "た (EOS)"
 
+#, c-format
 #~ msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 #~ msgstr ""
 #~ "canon_usb_dialogue: サイズが大きすぎます。バッファに取り込めません (%i > "
 #~ "%i)"
 
+#, c-format
 #~ msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 #~ msgstr ""
 #~ "canon_usb_dialogue: 0x%x バイトを期待したが、カメラは 0x%x を返しました"
@@ -12707,9 +15169,6 @@
 #~ msgid "multi spot metering"
 #~ msgstr "Volatile の設定"
 
-#~ msgid "large"
-#~ msgstr "大きい"
-
 #~ msgid "medium 1"
 #~ msgstr "中 1"
 
@@ -12861,9 +15320,11 @@
 #~ msgid "PTP: Protocol error, response expected"
 #~ msgstr "PTP: プロトコル・エラー (期待値: 応答)"
 
+#, c-format
 #~ msgid "Unknown (%04x)"
 #~ msgstr "不明 (%04x)"
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "'%s' 用のドライバが見つかりませんでした"
 
@@ -12873,14 +15334,17 @@
 #~ msgid "This camera does not support event handling."
 #~ msgstr "カメラはイベントのハンドリングをサポートしていません。"
 
+#, c-format
 #~ msgid ""
 #~ "Could not append '%s' to folder '%s' because this file already exists."
 #~ msgstr ""
 #~ "ファイル '%s' が既に存在しているのでフォルダ '%s' に追加できませんでした。"
 
+#, c-format
 #~ msgid "Deleting '%s' from folder '%s'..."
 #~ msgstr "'%s' をフォルダ '%s' から削除中..."
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "'%s' をフォルダ '%s' からダウンロード中..."
 
@@ -13084,12 +15548,6 @@
 #~ msgid "Current value"
 #~ msgstr "現在の値"
 
-#~ msgid "Date Time"
-#~ msgstr "日付と時間"
-
-#~ msgid "ShutterSpeed"
-#~ msgstr "シャッター速度"
-
 #~ msgid "Real Image Width"
 #~ msgstr "実画像の幅"
 
@@ -13225,12 +15683,6 @@
 #~ msgid "Could not find any driver for '%s' / '%s'"
 #~ msgstr "'%s' 用のドライバが見つかりませんでした"
 
-#~ msgid "Center"
-#~ msgstr "中央"
-
-#~ msgid "20 mm"
-#~ msgstr "20 mm"
-
 #, fuzzy
 #~ msgid "EOS Metering Mode"
 #~ msgstr "測光モード"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/libgphoto2-6.pot -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/libgphoto2-6.pot Changed

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The gPhoto Team
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the libgphoto2 package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: libgphoto2 2.5.31\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,19 +24,19 @@
 "Benjamin Moos <benjamin@psnw.com>"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -59,19 +59,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -79,23 +79,25 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr ""
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
 "Firmware Version: %s"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -109,80 +111,80 @@
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr ""
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
 "%i"
 msgstr ""
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
@@ -191,313 +193,324 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr ""
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr ""
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr ""
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr ""
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr ""
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr ""
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr ""
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr ""
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr ""
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr ""
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr ""
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr ""
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr ""
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr ""
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr ""
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr ""
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr ""
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr ""
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr ""
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr ""
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr ""
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr ""
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr ""
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr ""
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr ""
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr ""
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr ""
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr ""
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr ""
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr ""
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -514,44 +527,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr ""
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr ""
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr ""
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr ""
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr ""
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr ""
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr ""
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -559,35 +572,35 @@
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr ""
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -603,7 +616,7 @@
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -616,710 +629,732 @@
 " Stephen H. Westin"
 msgstr ""
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr ""
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
 msgstr ""
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr ""
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr ""
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr ""
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr ""
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr ""
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr ""
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr ""
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr ""
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr ""
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr ""
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr ""
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr ""
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr ""
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr ""
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr ""
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr ""
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr ""
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr ""
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr ""
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr ""
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr ""
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr ""
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr ""
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr ""
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr ""
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr ""
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr ""
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr ""
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr ""
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr ""
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr ""
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr ""
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr ""
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr ""
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr ""
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr ""
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr ""
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr ""
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr ""
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr ""
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr ""
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr ""
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr ""
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr ""
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr ""
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr ""
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
 "%i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1327,37 +1362,37 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr ""
 
@@ -1420,45 +1455,45 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr ""
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr ""
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1469,82 +1504,83 @@
 "Camera is %s powered %s.\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1555,7 +1591,7 @@
 "* Image quality is currently lower than it could be.\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1572,238 +1608,348 @@
 "     gphoto2 port\n"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr ""
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr ""
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr ""
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr ""
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr ""
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+msgid "Scanner Profile Configuration"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+msgid "Mono mode"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+msgid "Lo Resolution"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+msgid "Hi Resolution"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+msgid "Color Document mode"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+msgid "Color Photo mode"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
 "to port your driver on this cam! "
 msgstr ""
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr ""
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 msgstr ""
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr ""
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr ""
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr ""
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr ""
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr ""
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr ""
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr ""
 
@@ -1818,23 +1964,23 @@
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -1844,7 +1990,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -1879,25 +2025,25 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr ""
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr ""
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr ""
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr ""
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -1907,7 +2053,7 @@
 "   - full images (640x480 PPM format)\n"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -1915,31 +2061,31 @@
 "Protocol reverse engineered using WINE and IDA."
 msgstr ""
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr ""
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr ""
 
@@ -1991,11 +2137,11 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2003,7 +2149,7 @@
 "sourceforge.net"
 msgstr ""
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2011,13 +2157,13 @@
 "(by popular demand)."
 msgstr ""
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr ""
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr ""
 
@@ -2030,7 +2176,8 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr ""
 
@@ -2043,7 +2190,7 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr ""
 
@@ -2067,8 +2214,9 @@
 msgid "High (good quality)"
 msgstr ""
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr ""
 
@@ -2097,77 +2245,84 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr ""
 
@@ -2176,71 +2331,78 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr ""
 
@@ -2256,7 +2418,7 @@
 msgid "Port speed"
 msgstr ""
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr ""
 
@@ -2461,58 +2623,58 @@
 "Michael Koltan <koltan@gmx.de>\n"
 msgstr ""
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr ""
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr ""
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr ""
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2521,56 +2683,57 @@
 "Rewritten and updated for gPhoto2."
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr ""
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2580,7 +2743,7 @@
 "reinitialize."
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2588,120 +2751,120 @@
 "Questions and comments appreciated."
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 msgstr ""
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr ""
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr ""
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr ""
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr ""
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr ""
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr ""
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr ""
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr ""
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr ""
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr ""
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr ""
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr ""
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr ""
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr ""
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr ""
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr ""
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr ""
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr ""
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr ""
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr ""
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr ""
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr ""
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr ""
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr ""
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr ""
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2709,26 +2872,26 @@
 "error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr ""
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr ""
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
 msgstr ""
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr ""
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2740,406 +2903,415 @@
 "Manufacturer: %s\n"
 msgstr ""
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Support for all Konica and several HP cameras."
 msgstr ""
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr ""
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr ""
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr ""
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr ""
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr ""
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr ""
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr ""
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr ""
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr ""
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr ""
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr ""
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr ""
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr ""
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr ""
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr ""
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr ""
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr ""
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr ""
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr ""
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr ""
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr ""
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr ""
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr ""
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr ""
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr ""
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr ""
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr ""
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr ""
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr ""
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr ""
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr ""
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr ""
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr ""
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr ""
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr ""
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr ""
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr ""
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr ""
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr ""
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr ""
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr ""
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr ""
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr ""
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr ""
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr ""
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr ""
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr ""
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr ""
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3152,7 +3324,7 @@
 "Date and Time: %s\n"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3162,7 +3334,7 @@
 "Support for the french Konica Q-M150."
 msgstr ""
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3174,13 +3346,13 @@
 "If you have some issues with this driver, please e-mail its authors.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3188,13 +3360,96 @@
 "Firmware Version: %s\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+msgid "Lumix Configuration"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+msgid "Lens"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1244
+msgid "Cur Menu"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3205,7 +3460,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3219,13 +3474,13 @@
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3233,7 +3488,7 @@
 "Firmware Revision:\t%s\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3249,61 +3504,63 @@
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3314,74 +3571,74 @@
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3390,63 +3647,63 @@
 "Special thanks to Minolta for the spec."
 msgstr ""
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr ""
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr ""
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr ""
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr ""
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr ""
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3454,42 +3711,42 @@
 "Supports Serial and USB Protocols."
 msgstr ""
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
 "%i bytes."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr ""
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3499,12 +3756,12 @@
 "Galen Brooks <galen@nine.com>."
 msgstr ""
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr ""
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3514,12 +3771,12 @@
 "Galen Brooks <galen@nine.com>."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3531,7 +3788,7 @@
 "the lens is only 300K and thus produces only low quality pictures."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3541,13 +3798,13 @@
 "shutdown at speeds faster than 9600."
 msgstr ""
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3555,7 +3812,7 @@
 " Filecount: %d"
 msgstr ""
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3564,42 +3821,140 @@
 " <mace@darksilence.net>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr ""
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+msgid "Model"
+msgstr ""
+
+#: camlibs/pentax/library.c:651
+#, c-format
+msgid "Unknown format %d"
+msgstr ""
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr ""
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr ""
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr ""
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr ""
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr ""
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr ""
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr ""
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, c-format
+msgid "Unknown mode %d"
+msgstr ""
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -3608,12 +3963,12 @@
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr ""
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -3622,143 +3977,132 @@
 "Marcus Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr ""
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr ""
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
 "picture %i back"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
 "and ask for assistance."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
 "Mueller <lutz@users.sf.net>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -3777,3461 +4121,5254 @@
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/config.c:201
-msgid "CHDK did not leave recording mode."
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
-msgid "Sorry, your Canon camera does not support Canon capture"
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/chdk.c:489
 #, c-format
-msgid "Unknown value %04x"
+msgid "CHDK %d.%d Status:\n"
 msgstr ""
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
+#: camlibs/ptp2/chdk.c:492
 #, c-format
-msgid "Unknown value %04d"
+msgid "Mode: %d\n"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/chdk.c:494
 #, c-format
-msgid "unexpected datatype %i"
+msgid "SV96: %d, ISO: %d\n"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1422
-msgid "Target value is not in enumeration."
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/chdk.c:500
+#, c-format
+msgid "Focus: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:502
+#, c-format
+msgid "ISO Mode: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:505
+#, c-format
+msgid "Zoom: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:511
+#, c-format
+msgid "Battery Temperature: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:514
+#, c-format
+msgid "Flash Mode: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+msgid "Press"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+msgid "Capture Mode"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1036
+msgid "AF Lock"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1037
+msgid "MF Lock"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
+msgid "CHDK did not leave recording mode."
+msgstr ""
+
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
+msgid "Sorry, your Canon camera does not support Canon capture"
+msgstr ""
+
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
+#, c-format
+msgid "Unknown value %04x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
+#, c-format
+msgid "unexpected datatype %i"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1327
+msgid "Target value is not in enumeration."
+msgstr ""
+
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+msgid "Application"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+msgid "LiveSpotAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+msgid "Small + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2758
+msgid "Medium 1 + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2759
+msgid "Medium 2 + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2760
+msgid "Large + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+msgid "Medium 1 + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2763
+msgid "Medium 2 + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+msgid "Medium 1 + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2769
+msgid "Medium 2 + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+msgid "Medium 1 + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2773
+msgid "Medium 2 + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
-msgid "Effects"
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
+msgid "Effects"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4353
+msgid "Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4354
+msgid "Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4355
+msgid "Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
+#, c-format
+msgid "%d mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
 msgid "infinite"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
-msgid "%d mm"
+msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
 #, c-format
-msgid "x 200"
+msgid "Composite"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5050
+msgid "Sync"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+msgid "RAW+JPEG (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+msgid "HEIF (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+msgid "RAW+HEIF (Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6884
+msgid "RAW+HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+msgid "X.Fine"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+msgid "2M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6920
+msgid "RAW & JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6921
+msgid "JPEG Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6922
+msgid "RAW Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5271
-msgid "75%"
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
+#: camlibs/ptp2/config.c:7312
+msgid "75%"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+msgid "In enlarged liveview"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9152
+msgid "White set"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9305
+msgid "AF macro"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+msgid "A"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+msgid "Standby"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9495
+msgid "Recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9496
+msgid "Playing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+msgid "Other playing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9499
+msgid "Noise reduction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9500
+msgid "Displaying menu"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+msgid "Fuji Zoom Position"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+msgid "Movie Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10713
+msgid "Focus Magnify"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+msgid "Focus Magnify Down"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+msgid "Focus Magnify Right"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+msgid "Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+msgid "Priority Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+msgid "Movie Exposure Compensation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10926
+msgid "MF Adjust"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+msgid "JPEG Quality"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10961
+msgid "PC Save Image Size"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10962
+msgid "PC Save Image Format"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+msgid "User Mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+msgid "AF Method"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
+msgid "Movie Resolution"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7461
-msgid "Movie Resolution"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7243,2660 +9380,2773 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr ""
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6792
-msgid "Unknown Event"
-msgstr ""
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr ""
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -9904,7 +12154,7 @@
 "at the firmware update image and wild guessing.\n"
 msgstr ""
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -9912,200 +12162,200 @@
 "based on Bob Paauwe's driver\n"
 msgstr ""
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr ""
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
 "Memory: %d byte(s) of %d available"
 msgstr ""
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr ""
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr ""
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr ""
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr ""
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr ""
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr ""
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr ""
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr ""
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr ""
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr ""
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr ""
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr ""
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr ""
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr ""
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr ""
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr ""
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr ""
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr ""
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr ""
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr ""
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr ""
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr ""
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr ""
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10113,108 +12363,108 @@
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10226,225 +12476,221 @@
 "  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr ""
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr ""
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr ""
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr ""
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr ""
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -10461,7 +12707,7 @@
 "        to set the shutter speed.\n"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -10473,67 +12719,63 @@
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -10552,7 +12794,7 @@
 "    PC, then switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -10568,7 +12810,7 @@
 "    PC, then switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -10585,228 +12827,233 @@
 "    please contact the developer mailing list.\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -10819,7 +13066,7 @@
 "  please send a mail to %s (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -10838,7 +13085,7 @@
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -10850,23 +13097,18 @@
 "support implementation."
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 msgstr ""
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr ""
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10880,7 +13122,7 @@
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -10891,7 +13133,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -10906,13 +13148,13 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -10921,7 +13163,7 @@
 "Gphoto2 port by Bart van Leeuwen <bart@netage.nl>"
 msgstr ""
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -10929,7 +13171,7 @@
 "gPhoto2 port by Raymond Penners <raymond@dotsphinx.com>"
 msgstr ""
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -10938,25 +13180,25 @@
 "Memory Free:  %ikB\n"
 msgstr ""
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr ""
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
 " Files: %d\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -10967,7 +13209,7 @@
 "Space free: %8d\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr ""
 
@@ -11008,19 +13250,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11028,11 +13270,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11040,110 +13278,110 @@
 "Protocol reverse engineered using SnoopyPro\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr ""
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr ""
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11153,12 +13391,12 @@
 "Extended for Aiptek PenCam and other STM USB Dual-mode cameras."
 msgstr ""
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr ""
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11166,19 +13404,19 @@
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11186,51 +13424,71 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr ""
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 driver.\n"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr ""
@@ -11268,127 +13526,127 @@
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr ""

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/nl.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/nl.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/nl.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/nl.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2-2.5.4\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2014-04-09 11:10+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -29,7 +29,7 @@
 "Adc65-stuurprogramma\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -38,13 +38,13 @@
 "De camera lijkt geen CompactFlash-kaart te gebruiken.\n"
 "Helaas worden andere typen opslag nog niet ondersteund.  :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 "De camera heeft %d opnames gemaakt, en gebruikt een CompactFlash-kaart.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -77,12 +77,12 @@
 "Generisch Aox-stuurprogramma\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Uw USB-fotoframe heeft een AX203-chipset.\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -92,7 +92,7 @@
 "Het gphoto-stuurprogramma voor deze apparaten kan foto's van het\n"
 "fotoframe downloaden, ernaar uploaden, en ervan verwijderen."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -104,16 +104,18 @@
 "Dit stuurprogramma kan foto's van het fotoframe downloaden,\n"
 "ernaar uploaden, en ervan verwijderen."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Fotoframeconfiguratie"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Datum en tijd van fotoframe synchroniseren met PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -122,7 +124,7 @@
 "Aantal afbeeldingen: %i\n"
 "Firmware-versie: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -146,26 +148,26 @@
 "Geïmplementeerd met gebruik van documenten\n"
 "gevonden op het internet.  Met permissie van Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Kan map %s niet aanmaken."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Kan map %s niet verwijderen."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "Vergrendelen van toetsen is mislukt."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*ONBEKEND*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -174,7 +176,7 @@
 "canon_int_capture_image: eerste canon_usb_list_all_dirs() is() is mislukt "
 "met status %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -183,24 +185,24 @@
 "canon_int_capture_image: laatste canon_usb_list_all_dirs()() is mislukt met "
 "status %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Naam '%s' (%li tekens) is te lang, maximum 30 tekens toegestaan."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Kleine letters in %s zijn niet toegestaan."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: ERROR: eerste melding te kort (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -208,27 +210,27 @@
 "canon_int_list_directory: Einde van het pakket bereikt tijdens onderzoek van "
 "het eerste dirent."
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: afgekapte mapingang tegengekomen"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Bestand is beveiligd."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_get_info_func: ERROR: eerste melding te kort (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "Kan het JPEG-miniatuurvoorbeeld niet uit de data extraheren: geen begin/einde"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Kan het JPEG-miniatuurvoorbeeld niet uit de data extraheren: data is geen "
@@ -239,23 +241,23 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL parameter \"%s\" in %s regel %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr "Kan het poorttype %i (alias 0x%x) in %s regel %i niet behandelen."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "FATALE FOUT: initiële CRC-waarde voor lengte %d is onbekend\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "kan de initiële CRC-waarde niet raden\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -264,290 +266,301 @@
 "waarschuwing: CRC is niet gecontroleerd (lengte %d, waarde 0x%04x) "
 "##########\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Compatibiliteitsmodus"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniatuur"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Volledig beeld"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Bulb"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofocus: één opname"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofocus: AI-servo"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Autofocus: AI-focus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Handmatige focus"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Piep uit"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Piep aan"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Flits uit"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Flits aan"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Flits auto"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Handmatig 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Grote afstand"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Korte sluitertijd"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Lange sluitertijd"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Nachtopname"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Grijswaarden"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portret"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Punt"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Macro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "Z-W"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr ""
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Levendig"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Lange sluitertijd"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Supermacro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Gebladerte"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Binnenshuis"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Vuurwerk"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Strand"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Onderwater"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Sneeuw"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Kinderen en dieren"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Nachtopname"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Digitale macro"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr ""
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Foto in film"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Kleine, normale JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Kleine, fijne JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Gemiddelde, normale JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Gemiddelde, fijne JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Grote, normale JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Grote, fijne JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + kleine, normale JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + kleine, fijne JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + gemiddelde, normale JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + gemiddelde, fijne JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + grote, normale JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + grote, fijne JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -577,44 +590,44 @@
 "Als u veel seriële transmissiefouten ervaart, probeer uw computer dan zo\n"
 "  inactief mogelijk te houden (dat wil zeggen geen schijfactiviteit).\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Camera is onbeschikbaar: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Uitschakelen van camera"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Fout bij de beeldopname"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kan de schijfnaam niet vinden: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Geen reden voorhanden"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Kan de schijfinformatie niet vinden: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "**Interne fout** #1 in get_file_func() (%s line %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Er is geen geluidsbestand gevonden voor %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -625,35 +638,35 @@
 "  %11s bytes totaal\n"
 "  %11s bytes beschikbaar"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "netadapter"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "op accu"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "voeding is OK"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "voeding niet OK"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "niet beschikbaar: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (computertijd %s%i seconden)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -680,7 +693,7 @@
 "\n"
 "Tijd: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -703,26 +716,26 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Fout bij verwijderen van bestand"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Fout bij verwijderen van bijbehorende miniatuurvoorbeeldbestand"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Het uploaden naar deze camera met snelheden hoger dan 57600 wordt niet "
 "ondersteund"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Kan de flash-schijfletter niet vinden"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -730,376 +743,398 @@
 "Kan niet uploaden, geen vrije mapnaam beschikbaar!\n"
 "Mapnaam 999CANON bestaat al en bevat een afbeelding AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Kan de \\DCIM-map niet aanmaken."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Kan geen bestemmingsmap aanmaken."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Configuratie van camera en stuurprogramma"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Camera-instellingen"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Naam van eigenaar"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Afmetingsklasse van opname"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO-snelheid"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "(onbekend)"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Opnamemodus"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Sluitertijd"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoomen"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Diafragma"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Belichtingscompensatie"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Beeldindeling"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Focusmodus"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Flitsmodus"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Piep"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Camera-acties"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Datum en tijd van camera synchroniseren met PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Cameratoestandsinformatie"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Cameramodel"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Fout"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Firmware-versie"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Voeding"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Stuurprogramma"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Alle bestanden tonen"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Bestandsnaam bij het uploaden behouden"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Camera is onbeschikbaar"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Naam van eigenaar is gewijzigd"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "Kan de naam van de eigenaar niet wijzigen"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Afmetingsklasse van opname is gewijzigd"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Ongeldige afmetingsklasse van opname"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Ongeldige ISO-snelheid"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "ISO-snelheid is gewijzigd"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Kan de ISO-snelheid niet wijzigen"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Ongeldige opnamemodus"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Opnamemodus is gewijzigd"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Kan de opnamemodus niet wijzigen"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Ongeldige sluitertijd"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Sluitertijd is gewijzigd"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Kan de sluitertijd niet wijzigen"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Ongeldige diafragma-instelling"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Diafragma is gewijzigd"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Kan het diafragma niet wijzigen"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Ongeldige belichtingscompensatie"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Belichtingscompensatie is gewijzigd"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Kan de belichtingscompensatie niet wijzigen"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Ongeldige beeldindeling"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Beeldindeling is gewijzigd"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Kan de beeldindeling niet wijzigen"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Ongeldige focusmodus"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Focusmodus is gewijzigd"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Kan de focusmodus niet wijzigen"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Ongeldige piepmodus"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Piepmodus is gewijzigd"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Kan de piepmodus niet wijzigen"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Zoomniveau is gewijzigd"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Kan het zoomniveau niet wijzigen"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Ongeldige flitsmodus"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Flitsmodus is gewijzigd"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Kan de flitsmodus niet wijzigen"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "tijd is ingesteld"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "kan de tijd niet instellen"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Niet-ondersteund poorttype %i = 0x%x gegeven.  Initialisatie is onmogelijk."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Accu is leeg, camera uit."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "FOUT: onverwacht bericht"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "FOUT: berichtoverloop"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "FOUT: niet op volgorde."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "FOUT: onverwacht pakkettype."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "FOUT: onjuiste berichtopmaak."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "FOUT: onverwacht bericht (2)."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Uploaden van bestand..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Ophalen van bestand..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1107,7 +1142,7 @@
 "canon_serial_get_dirents: Ophalen van mapitems door canon_serial_dialogue() "
 "is mislukt"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1115,140 +1150,140 @@
 "canon_serial_get_dirents: Eerste 'dirent'-pakket is te kort (slechts %i "
 "bytes)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Kan geen %i bytes geheugen reserveren"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Kan volgende mapitem niet lezen"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Afgekapt mapitem ontvangen"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: Te veel mapitems -- oneindige lus?"
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Kan grootte van mapitemsbuffer niet naar %i bytes "
 "wijzigen"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Fout bij wijzigen van snelheid."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Resetten van protocol..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Camera is OK."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Zoeken naar camera..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Verbinding maken met camera..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Communicatiefout 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Geen antwoord van camera"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Niet-herkend antwoord"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Een \"%s\" is gedetecteerd, ook bekend als \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Onbekend model \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Onjuiste EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Communicatiefout 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Communicatiefout 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Wijzigen van snelheid... even geduld..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Fout bij wijzigen van snelheid"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Fout bij wachten op ACK tijdens initialisatie -- nieuwe poging"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Fout bij wachten op ACK tijdens initialisatie"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Verbonden met de camera"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FOUT: een fatale fouttoestand werd gevonden, kan niet verdergaan "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FOUT: %d is te groot"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Ophalen van miniatuur..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "NIET HERKEND"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Kan geen eerste contact met camera maken"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Camera was al actief"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Camera werd gewekt"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Eerste antwoord van camera '%c' is onbegrijpelijk"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1257,7 +1292,7 @@
 "Stap 2 van initialisatie is mislukt: (\"%s\" bij lezen van %i).  Camera "
 "werkt niet"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1266,7 +1301,7 @@
 "Stap 2 van initialisatie is mislukt: (%i bytes ontvangen, %i verwacht).  "
 "Camera werkt niet"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1275,7 +1310,7 @@
 "Stap 3 van initialisatie is mislukt: (\"%s\" bij lezen van %i).  Camera "
 "werkt niet"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1284,7 +1319,7 @@
 "Stap 3 van initialisatie is mislukt: (%i bytes ontvangen, %i verwacht).  "
 "Camera werkt niet"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1293,29 +1328,29 @@
 "Stap 3 van initialisatie is mislukt: (\"%s\" bij schrijven van %i).  Camera "
 "werkt niet"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Stap 4 is mislukt: (\"%s\" bij lezen van %i).  Camera werkt niet"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr "Stap 4 is mislukt: (%i ontvangen, %i verwacht).  Camera werkt niet"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Camera is niet gereed; meerdere camera-identificatie-aanvragen zijn mislukt: "
 "%s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Camera is niet gereed; get_battery() is mislukt: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1324,14 +1359,14 @@
 "canon_usb_lock_keys: Onverwachte lengte teruggekregen van \"lock keys\"-"
 "functie (%i bytes ontvangen, %i verwacht)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Onverwachte lengte teruggekregen (%i bytes ontvangen, "
 "%i verwacht)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1339,7 +1374,7 @@
 "canon_usb_lock_keys: Onverwachte lengte teruggekregen (%i bytes ontvangen, "
 "%i verwacht)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1348,20 +1383,20 @@
 "canon_usb_get_body_id: Onverwachte data-lengte teruggekregen (%i bytes "
 "ontvangen, %i verwacht)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Ontvangen van data..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Onvoldoende geheugen beschikbaar: %d bytes nodig."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue mislukt"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1370,22 +1405,22 @@
 "Waarschuwing in canon_usb_set_file_attributes: canon_usb_dialogue geeft "
 "foute status 0x%08x van camera"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kan niet uit bestand \"%s\" lezen"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Onvoldoende geheugen beschikbaar: %ld bytes nodig."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Uploaden van bestand is mislukt."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1393,7 +1428,7 @@
 "Het bestand was te groot. Het kan nodig zijn om uw camera uit en weer aan te "
 "zetten alvorens meer bestanden te uploaden."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1402,7 +1437,7 @@
 "canon_usb_get_dirents: Actiegedeelte past niet in de buffer, "
 "'%.96s' (afgekapt) te lang"
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1411,7 +1446,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue mislukte bij het ophalen van "
 "lijstelementen, status %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1420,7 +1455,7 @@
 "canon_usb_list_all_dirs: Kon actiegedeelte niet in buffer laden, "
 "'%.96s' (afgekapt) te lang."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1429,28 +1464,28 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue mislukte bij het ophalen "
 "van lijstelementen, status %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Een '%s' is gedetecteerd."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 "Benaming \"%s\" van de camera komt niet overeen met een bekend type camera"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Beeldtype %d wordt niet ondersteund"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Beeld %s is tegen verwijderen beschermd."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1458,37 +1493,37 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Accustatus: %.1f Volt.  Revisie: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Cameraconfiguratie"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Accu"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Te helder"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Te donker"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1555,16 +1590,16 @@
 "Generisch sq905-stuurprogramma\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Beeldtype wordt niet ondersteund"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Aantal afbeeldingen: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1572,7 +1607,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1580,24 +1615,24 @@
 "Alleen de hoofdmap wordt ondersteund - u vroeg een bestandslijst voor de map "
 "'%s'."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Probleem bij het ophalen van het aantal beelden"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Probleem bij het ophalen van beeldinformatie"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Opnametype wordt niet ondersteund"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (accu is voor %d%% geladen)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1614,82 +1649,83 @@
 "Resolutie is gezet op %s.\n"
 "Camera is %s-gevoed %s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flits"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Geen flits"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dual-iris"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Geen dual-iris"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Resolutieomschakeling"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Geen resolutieomschakeling"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Geen voedingslampje"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "AAN"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "UIT"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "gereed"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Niet gereed"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "in vulmodus"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Niet in vulmodus"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "laag (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "hoog (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "extern"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "intern"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1707,7 +1743,7 @@
 "  ingesteld worden, of op automatisch gezet worden.\n"
 "* De beeldkwaliteit is momenteel lager dan ze zou kunnen zijn.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1736,114 +1772,230 @@
 "     Informatie over protocol en raw-beeldformaat,\n"
 "     gphoto2-poorten\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problemen bij lezen van beeld van de flash-geheugenkaart"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Downloaden van beeld..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problemen bij downloaden van beeld"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Downloaden is door gebruiker gestopt"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problemen bij opnemen van rechtstreeks beeld"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Belichting"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatische belichtingscorrectie bij de voorbeeldweergave"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Belichtingsniveau bij de voorbeeldweergave"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Automatische flits bij opname"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problemen bij het openen van de poort"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problemen bij het terugzetten van de camerainstelling"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problemen bij het instellen van de communicatiesnelheid van de camera"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Lijkt op een modem, niet op een camera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Inventariseren van bestanden in '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Inventariseren van mappen in '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Kan geen informatie over '%s' krijgen (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Kan geen informatie over '%s' in '%s' krijgen (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Kan de tijd van het bestand '%s' in '%s' niet wijzigen (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kan '%s' niet openen."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "De maplijst \"camera\" laat u de foto's op de harde schijf indexeren."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Maplijstmodus -- geschreven door Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Kan bestand '%s' in map '%s' niet verwijderen (foutcode %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Configuratie van camera en stuurprogramma"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Opnamemodus"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Resolutie"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Resolutie"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Kleur- of functiemodus"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Kleurmodus"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 #, fuzzy
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
@@ -1856,90 +2008,90 @@
 "Bedankt, spca50x-team, het was eenvoudig om jullie\n"
 "stuurprogramma naar deze camera over te zetten. "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 "De camera verzond slechts %i byte(s), maar we hebben minstens %i nodig."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Kan geen contact maken met de camera."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Onverwachte data ontvangen (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Verkeerde 'escape'-stuurcode: 0x%02x verwacht, 0x%02x ontvangen."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Onjuiste data -- 0x%02x ontvangen, 0x%02x werd verwacht."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Onjuiste data -- 0x%02x ontvangen, 0x%02x of 0x%02x werd verwacht."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Onjuiste controlesom -- 0x%02x ontvangen, 0x%02x werd verwacht."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "De camera heeft het commando geweigerd."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "De camera heeft zichzelf gereset."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "De camera verzond onverwachte byte 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Bezig met downloaden..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Kan geen %i bytes reserveren voor het downloaden van de miniatuur."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Kan geen %i bytes reserveren voor het downloaden van de afbeelding."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "De camera accepteert '%s' niet als bestandsnaam."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Kan de upload niet starten (de camera antwoordde met 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Snelheid %i wordt niet door de camera ondersteund."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Kan de snelheid niet op %i zetten (de camera antwoordde met %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1947,36 +2099,36 @@
 "Matthew G. Martin\n"
 "Gebaseerd op fujiplay door Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Transmissiesnelheid %ld wordt niet ondersteund."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Configuratie voor uw FUJI-camera"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Datum en tijd"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Versie: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Model: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Beschikbaar geheugen: "
 
@@ -1998,18 +2150,18 @@
 "en op de specificaties aangeleverd door Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Poorttype %d wordt niet ondersteund.\n"
 "Dit stuurprogramma werkt alleen met USB-camera's.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Kan de camera niet resetten.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2018,7 +2170,7 @@
 "Deze camera kan alleen het laatste bestand verwijderen.  In dit geval is dit "
 "het bestand '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2033,7 +2185,7 @@
 "Nog ruimte voor %d afbeeldingen\n"
 "Accuniveau: %d%%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2085,25 +2237,25 @@
 "iClick 5X-stuurprogramma\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Opgenomen beelden     : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam bibliotheek v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Downloaden van data..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Downloaden van miniatuurvoorbeeld..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2121,7 +2273,7 @@
 "\n"
 "downloaden.\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2133,31 +2285,31 @@
 "Stuurprogramma voor de Jenoptik JD11-camera.\n"
 "Het protocol werd ontrafeld met behulp van WINE and IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "JD11-configuratie"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Andere instellingen"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Bulb-belichtingstijd"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Kleurinstellingen"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Rood"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Groen"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Blauw"
 
@@ -2232,11 +2384,11 @@
 "jl2005bcd-camerabibliotheek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "CompactFlash-kaart"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2247,7 +2399,7 @@
 "slaan.  Om de beelden te bekijken dient u het \"kdc2tiff\"-programma te "
 "downloaden.  Het is beschikbaar op http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2259,13 +2411,13 @@
 "Camerabibliotheek voor de Kodak DC120-camera.\n"
 "(Vanwege de grote interesse.)"
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Ophalen van data..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Wacht op voltooiing..."
 
@@ -2278,7 +2430,8 @@
 msgstr "Bestandstype"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2291,7 +2444,7 @@
 msgstr "Bestandsresolutie"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2315,8 +2468,9 @@
 msgid "High (good quality)"
 msgstr "Hoog (goede kwaliteit)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Opname"
 
@@ -2345,77 +2499,84 @@
 msgstr "Belichtingscompensatie"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Altijd"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Geen"
 
@@ -2424,71 +2585,78 @@
 msgstr "Antirodeogenflits"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Aan"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Uit"
 
@@ -2504,7 +2672,7 @@
 msgid "Port speed"
 msgstr "Poortsnelheid"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Albumnaam"
 
@@ -2722,58 +2890,58 @@
 "Camera-bibliotheek voor de Kodak DC215 Zoom camera.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Wacht..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parameter 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parameter 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parameter 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Model: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Firmware versie: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Accustatus: %s, netadapter: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Aantal afbeeldingen: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Resterende opslagruimte: Hoog: %d, Gemiddeld: %d, Laag: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Geheugenkaartstatus (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Totaal opgenomen afbeeldingen: %d, aantal keren geflitst: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2787,45 +2955,46 @@
 "Camerabibliotheek voor de Kodak DC240, DC280, DC3400 and DC5000 camera's.\n"
 "Herschreven en geactualiseerd voor gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Zwak"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Leeg"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Ongeldig"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Niet gebruikt"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "In gebruik"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Kaart is geopend"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Kaart is niet geopend"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Kaart is niet geformatteerd"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Geen kaart aanwezig"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2833,12 +3002,12 @@
 "Momenteel is er een proces aan de gang. Deze camera ondersteunt slechts één "
 "actief proces. Gelieve te wachten tot het actieve proces afgelopen is."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "camera is langer dan 9 seconden inactief -- herinitialisatie.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2853,7 +3022,7 @@
 "moet deze opnieuw geïnitialiseerd worden. Als de camera niet reageert, "
 "selecteer deze dan opnieuw.  Dit herinitialiseert de camera."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2865,7 +3034,7 @@
 "\n"
 "Vragen en commentaren worden gewaardeerd."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2874,7 +3043,7 @@
 "Uw USB-camera is een Kodak EZ200.\n"
 "Aantal afbeeldingen = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2882,107 +3051,107 @@
 "Kodak EZ200-stuurprogramma\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fout tijdens het focussen."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Irisfout."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Flitsfout."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROM-controlesomfout."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "**Interne fout** (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "**Interne fout** (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Geen kaart aanwezig."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Kaart wordt niet ondersteund."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Kaart werd verwijderd tijdens de toegang."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Nummer van beeld is niet geldig."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Kaart kan niet beschreven worden."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Kaart is tegen schrijven beveiligd."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Geen vrije opslagruimte op kaart."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Beeld is beveiligd."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Niet genoeg licht."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Fout bij autofocus."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Systeemfout."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Ongeldige parameter."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Het commando kan niet afgebroken worden."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Lokalisatiegegevens zijn te lang."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Lokalisatiegegevens zijn beschadigd."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Commando wordt niet ondersteund."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Ander commando is in uitvoering."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Fout in commandovolgorde."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2990,18 +3159,18 @@
 "error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "De camera heeft zojuist een onbekende fout gemeld.  Wilt u het volgende "
-"rapporteren aan %s met als bijkomende informatie hoe de fout is ontstaan: (0x"
-"%x,0x%x).  Hartelijk bedankt!"
+"rapporteren aan %s met als bijkomende informatie hoe de fout is ontstaan: "
+"(0x%x,0x%x).  Hartelijk bedankt!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Ophalen van bestandenlijst..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Testen van verschillende snelheden..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3009,12 +3178,12 @@
 "Kan geen verbinding maken met de camera.  Verzeker u ervan dat de camera op "
 "de computer aangesloten is en ingeschakeld is."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i afbeeldingen konden niet worden verwijderd omdat ze beveiligd zijn"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3033,7 +3202,7 @@
 "Naam: %s,\n"
 "Fabrikant: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3043,402 +3212,411 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Ondersteuning voor alle Konica en meerdere HP camera's."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Ophalen van instellingen..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica-configuratie"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Permanente instellingen"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Moet de camera een piep geven als er een opname gemaakt wordt?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Zelfontspannertijd"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Tijd tot automatische uitschakeling"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Diashowinterval"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Laag (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Gemiddeld (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Hoog (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Lokalisatie"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Taal"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Niets geselecteerd"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV-signaal"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Geen TV-menu tonen"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Datumopmaak"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "maand/dag/jaar"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "dag/maand/jaar"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "jaar/maand/dag"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Persistente instellingen"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Aan, rodeogenreductie"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Auto, rodeogenreductie"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Focus"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Vast ingesteld"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Vluchtige instellingen"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Zelfontspanner"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Zelfontspanner (alleen volgende opname)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normaal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Kan de lokalisatiegegevens niet vinden in '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Lokalisatiebestand is te lang!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Dit voorbeeld bestaat niet."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Gegevens zijn beschadigd."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Beeldtype %d wordt door deze camera niet ondersteund!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Kan beeld %s niet verwijderen."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Kan niet alle beelden verwijderen."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Uploaden van beeld..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 "Kan dit beeld niet uploaden naar de camera.  Er is een fout opgetreden."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "U moet in opnamemodus zijn om beelden op kunnen te nemen."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Er is geen ruimte beschikbaar om nieuwe beelden op te slaan. U moet een "
 "aantal beelden verwijderen."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Kan geen nieuwe beelden opnemen.  Onbekende fout"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Geen antwoord van de camera."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Laag"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Middel"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Hoog"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2,0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0,5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0,1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Witbalans"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Kantoor"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Daglicht"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Scherpte"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Scherp"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Zacht"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Kleur"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Licht"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Diepte"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Zwart-wit"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Enkel"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Reeks van 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Datumweergave"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Overal"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Weergavemodus"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Opnamemodus"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Overal"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Weergave"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Opname"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD-MM-JJJJ"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "JJJJ-MM-DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM-DD-JJJJ"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3459,7 +3637,7 @@
 "Datumweergave: %s\n"
 "Datum en tijd: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3474,7 +3652,7 @@
 "    http://www.ap2c.com\n"
 "Ondersteuning voor de Franse Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3493,7 +3671,7 @@
 "Indien u problemen ondervindt met dit stuurprogramma,\n"
 "stuur dan een e-mail naar de ontwikkelaars ervan.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3501,7 +3679,7 @@
 "Largan-stuurprogramma\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3512,7 +3690,7 @@
 "Firmware: %s\n"
 "Firmware-versie: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3520,7 +3698,103 @@
 "Generisch LG GSM-stuurprogramma\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Configuratie"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Belichtings-/focusvergrendeling"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Sluitertijd"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Filmkwaliteit"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+#, fuzzy
+msgid "Movie"
+msgstr "Filmgeluid"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Autofocusmodus"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "LiveView-AF-zone"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Gewone toestelnaam"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Autofocushulplicht"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Autofocushulplicht"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Lens-ID"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Compatibiliteitsmodus"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Volledig handmatig"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "CSM-menu"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3535,7 +3809,7 @@
 "Mars MR97310-camera.\n"
 "Er staan %i foto's op de camera. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3559,7 +3833,7 @@
 "als opeenvolgende stilstaande beelden gedownload.\n"
 "Voor verdere details, zie libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3567,7 +3841,7 @@
 "Mars MR97310-camerabibliotheek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3578,7 +3852,7 @@
 "Hardware-revisie:  %s\n"
 "Firmware-revisie:  %s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3605,61 +3879,63 @@
 "Kaart-ID:\t\t%d\n"
 "Flitsmodus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Op afstand"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokaal"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nee"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fijn"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standaard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisch\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Altijd flitsen\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Geen flits\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ongeldige waarde ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3676,74 +3952,74 @@
 "Laden van flits:\t\t%s\n"
 "Lensstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Niet vol"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Vol"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Bezig"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Niet bezig"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Bezig met laden"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Gereed"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normaal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Lensrichting komt niet overeen met flitslicht\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Lens is niet aangesloten\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Onjuiste waarde voor lensstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kaartstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Beveiligd tegen schrijven"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Niet-passende kaart"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Onjuiste waarde voor kaartstatus %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3756,63 +4032,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Met bijzondere dank aan Minolta voor de specificaties."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Flits: Auto (rodeogenreductie)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Flits: Auto"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Flits: Aan (rodeogenreductie)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Flits: Aan"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Flits: Uit"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Flits: ongedefinieerd"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Samenvatting voor Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "geen status gerapporteerd."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "CompactFlash-kaart is gedetecteerd\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Geen CompactFlash-kaart gedetecteerd\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Huidige modus: Cameramodus\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Huidige modus: Weergavemodus\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Batterijen zijn OK."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Batterijen zijn bijna leeg."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3824,25 +4100,25 @@
 "Overgezet naar gphoto2 door Marcus Meissner <marcus@jet.franken.de>\n"
 "Ondersteunt serieel en USB-protocol."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot-bibliotheek v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Verbreken van verbinding met camera."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Downloaden van beeld %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Uploaden van beeld %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3851,17 +4127,17 @@
 "Bestandsgrootte is %ld bytes.  De maximale bestandsgrootte die geüpload kan "
 "worden is %i bytes."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Verwijderen van beeld %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3877,12 +4153,12 @@
 "door Fredrik Roubert <roubert@df.lth.se>\n"
 "en Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Downloaden van %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3898,12 +4174,12 @@
 "door Fredrik Roubert <roubert@df.lth.se>\n"
 "en Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Downloaden van %s..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3924,7 +4200,7 @@
 "die de beelden opneemt heeft slechts 300K pixels en produceert daardoor "
 "enkel beelden van lage kwaliteit."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3941,7 +4217,7 @@
 "transmissiesnelheid boven 9600 lag en de camera niet behoorlijk afgesloten "
 "werd."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3949,7 +4225,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-stuurprogramma\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3960,7 +4236,7 @@
 " Vrij geheugen is   %8d bytes.\n"
 " Aantal bestanden: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3972,11 +4248,11 @@
 "Auteurs: Till Adam <till@adam-lilienthal.de>\n"
 "en Miah Gregory <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Downloaden van bestand..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -3984,32 +4260,135 @@
 "Creative PC-CAM600-stuurprogramma\n"
 "Auteur: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Verwachtte > %d blokken, ontving %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: Ontving index %d maar verwachtte index > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: Teruggekregen waarde was %d i.p.v. %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Verwachtte %d blokken, ontving %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr "pccam600_init: Onverwachte fout: gp_port_read() gaf %d i.p.v. %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Model: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Onbekende opdracht"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Beeldgrootte"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Beeldkwaliteit"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Max. diafragmaopening bij min. focuslengte"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Max. diafragmaopening bij max. focuslengte"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Opnamemodus"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "Z-W"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Onbekend model"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4023,12 +4402,12 @@
 "Mueller <lutz@users.sf.net>.  Polaroid 640SE-tests werden uitgevoerd door "
 "Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Model: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4042,110 +4421,98 @@
 "nabewerking voor de Jenoptik JD350e door Michael Trawny <trawny99@users."
 "sourceforge.net>.  Correcties door Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Beeldkwaliteit"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Beeldgrootte"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Flitsinstelling"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Auto-uitschakeling (in minuten)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informatie"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normaal"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fijn"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "superfijn"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "aan"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "uit"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "weergave"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "opname"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menu"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "accu"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "netadapter"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Onverwachte header ontvangen (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Onverwacht antwoord ontvangen"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Fout in controlesom"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Het commando werd door de camera geweigerd."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "De camera verzond meer bytes dan verwacht (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4154,7 +4521,7 @@
 "Heb informatie over afbeelding %i (= 0x%x) gevraagd, maar kreeg informatie "
 "over afbeelding %i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4163,7 +4530,7 @@
 "%i bytes ontvangen van een onbekend beeldformaat.\n"
 "Schrijf naar %s en vraag om assistentie."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4173,19 +4540,20 @@
 "door Ryan Lantzer <rlantzer@umr.edu> voor gphoto-4.x.  Aangepast voor "
 "gphoto2 door Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Camera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Na hoeveel tijd moet de camera zichzelf uitschakelen?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Beeld"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4218,3612 +4586,5633 @@
 "Auto-uitschakeling: %i minuten\n"
 "Voedingsbron: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Het gevraagde poorttype (%i) wordt door dit stuurprogramma niet ondersteund."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Kaartstatus:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Focusmodus"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Model: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Flitsmodus"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Aangepaste voorinstelling 1"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Opname van stilstaand beeld"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Autofocus vergrendeld"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Autofocus vergrendeld"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Oriëntatie"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Beeldinstellingen"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Deze camera ondersteunt geen Canon-beeldopname"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Onbekende waarde %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Onbekende waarde %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "Onverwacht datatype %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Handmatig"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Volautomatisch"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "TL-lamp"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Gloeilamp"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Bewolkt"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Schaduw"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Kleurtemperatuur"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Voorinstelling"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "TL-lamp 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "TL-lamp 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "TL-lamp 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "TL-lamp 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "TL-lamp 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Kies kleurtemperatuur"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Aangepaste voorinstelling 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Aangepaste voorinstelling 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Aangepaste voorinstelling 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Aangepaste voorinstelling 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Aangepaste voorinstelling 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "TL-lamp: warmwit"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "TL-lamp: koudwit"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "TL-lamp: dagwit"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "TL-lamp: daglicht"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "Voorinstelling"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "Voorinstelling"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "Voorinstelling"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 #, fuzzy
 msgid "Underwater: Auto"
 msgstr "Onderwater"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Gloeilamp"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "TL-lamp: dagwit"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "TL-lamp: daglicht"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Voorinstelling"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Aangepast"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "fijne JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "normale JPEG"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + fijne JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + normale JPEG"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+#, fuzzy
+msgid "Large Fine JPEG+RAW"
+msgstr "Grote, fijne JPEG"
+
+#: camlibs/ptp2/config.c:1540
+#, fuzzy
+msgid "Large Normal JPEG+RAW"
+msgstr "Grote, normale JPEG"
+
+#: camlibs/ptp2/config.c:1541
+#, fuzzy
+msgid "Medium Normal JPEG+RAW"
+msgstr "Gemiddelde, normale JPEG"
+
+#: camlibs/ptp2/config.c:1542
+#, fuzzy
+msgid "Small Normal JPEG+RAW"
+msgstr "Kleine, normale JPEG"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Enkel-frame"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Continu, lage snelheid"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Continu, hoge snelheid"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Zelfontspanner"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Spiegel omhoog (Mup)"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Standaard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Zwart-wit"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Zwart-wit"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Zwart-wit"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Zwart-wit"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "ongedefinieerd"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "economisch"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "verliesloos"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Aangepast"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Nachtportret"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Landschap"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Close-up"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Flits uit"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Creatief"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Nachtopname"
+
+# Originele string lijkt me fout.
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Hoog contrast"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Eten"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Onscherp"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Visoog"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Miniatuureffect"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "Standaard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "HDR-modus"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Huisdierportret"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "rodeogenreductie"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "invulflits"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "auto + rodeogenreductie"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "aan + rodeogenreductie"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Automatisch diafragma"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Volledig handmatig"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Toepassingsmodus"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Groot"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Klein"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Centrum-gewogen"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Gemiddeld"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Evaluatief"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Gedeeltelijk"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Centrumgericht gemiddelde"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Puntsmeting gecombineerd met AF-frame"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Meerdere punten"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Getrouw"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monochroom"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Gebruikersinstelling 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Gebruikersinstelling 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Gebruikersinstelling 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Focuspunt alleen in midden, handmatig"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Focuspunt alleen in midden, automatisch"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Meerdere focuspunten (geen specificatie), handmatig"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Meerdere focuspunten, automatisch"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Meerdere focuspunten (rechts)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Meerdere focuspunten (midden)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Meerdere focuspunten (links)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Groot"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Medium 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Medium 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Medium 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Klein"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 seconden"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 seconden"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Instelling 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Instelling 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Instelling 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Instelling 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2530
+#, fuzzy
+msgid "TFT + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+#, fuzzy
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+#, fuzzy
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Spot-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "kaart"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Video-uit"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "onbekend %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Fabrieksinstellingen"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Auto-ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 #, fuzzy
 msgid "Smaller JPEG"
 msgstr "Kleinere JPEG (S2)"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "Minieme JPEG (S3)"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + grote, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + grote, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+#, fuzzy
+msgid "cRAW + Large Fine JPEG"
+msgstr "RAW + grote, fijne JPEG"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + gemiddelde, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + gemiddelde, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+#, fuzzy
+msgid "cRAW + Medium Fine JPEG"
+msgstr "RAW + gemiddelde, fijne JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + kleine, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + kleine, fijne JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+#, fuzzy
+msgid "cRAW + Small Fine JPEG"
+msgstr "RAW + kleine, fijne JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + grote, normale JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + grote, normale JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "RAW + grote, normale JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + gemiddelde, normale JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + gemiddelde, normale JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "RAW + gemiddelde, normale JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + kleine, normale JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + kleine, normale JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "RAW + kleine, normale JPEG"
+
+#: camlibs/ptp2/config.c:2743
 #, fuzzy
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + kleine, fijne JPEG (S2)"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 #, fuzzy
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + kleine, fijne JPEG (S2)"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 #, fuzzy
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + kleine, fijne JPEG (S2)"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+#, fuzzy
+msgid "cRAW + Smaller JPEG"
+msgstr "RAW + kleine, fijne JPEG (S2)"
+
+#: camlibs/ptp2/config.c:2747
 #, fuzzy
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + minieme JPEG (S3)"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 #, fuzzy
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + minieme JPEG (S3)"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 #, fuzzy
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + minieme JPEG (S3)"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Klein"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Groot"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Continu"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Video-uit"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "Enkel-frames opnamemodus"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Continu, stil"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "Continue opnamemodus"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Enkele opname, stil"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Continu, stil"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Auto-ISO"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Continu"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Ruisonderdrukking bij lange belichting"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Continu"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Bulb"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+#, fuzzy
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Canon EOS-opname is mislukt: %x"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51-punts (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51-punts (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51-punts (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51-punts (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "Ruisonderdrukking bij lange belichting"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "Ruisonderdrukking bij lange belichting"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Tijdsspanne"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Creatief"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Actie"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Nachtlandschap"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Kinderen"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatisch (geen flits)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+#, fuzzy
+msgid "U1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+#, fuzzy
+msgid "U2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
+#: camlibs/ptp2/config.c:3840
 #, fuzzy
-msgid "Movie"
+msgid "Movie (P)"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
 msgstr "Filmgeluid"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Zonsondergang"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 #, fuzzy
 msgid "Night Scene"
 msgstr "Nachtopname"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 #, fuzzy
 msgid "Hand-held Twilight"
 msgstr "Kaarslicht"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "Miniatuureffect"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Nachtlandschap"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Feest/Binnenshuis"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Strand/Sneeuw"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Schemering"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Huisdierportret"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Kaarslicht"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Bloesem"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Herfstkleuren"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Eten"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 #, fuzzy
 msgid "Child"
 msgstr "Kinderen"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 #, fuzzy
 msgid "Close up"
 msgstr "Close-up"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "TL-lamp"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 #, fuzzy
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 #, fuzzy
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 #, fuzzy
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Extra hoog"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Beeld"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scène"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effecten"
 
-#: camlibs/ptp2/config.c:3256
-#, fuzzy
-msgid "U1"
-msgstr "1"
-
-#: camlibs/ptp2/config.c:3257
-#, fuzzy
-msgid "U2"
-msgstr "2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "LCD-achtergrondlicht"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 #, fuzzy
 msgid "Select Color"
 msgstr "Selectieve kleur"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Enkele opname"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Burst"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Tijdsspanne"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Continu, lage snelheid"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Spiegel omhoog"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Snelle reactie, op afstand"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Vertraagd, op afstand"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+#, fuzzy
+msgid "Continuous Quiet Release"
+msgstr "Continu, stil"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Zelfontspanner 2s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "Zelfontspanner 2s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Zelfontspanner 10s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Zelfontspanner 10s"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Zelfontspanner 10s"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Zelfontspanner (alleen volgende opname)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Zelfontspanner (alleen volgende opname)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Zelfontspanner 2s"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Zelfontspanner 2s"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Continu, lage snelheid"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Continu, lage snelheid"
+
+#: camlibs/ptp2/config.c:4172
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 #, fuzzy
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 #, fuzzy
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 #, fuzzy
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 #, fuzzy
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 #, fuzzy
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 #, fuzzy
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 #, fuzzy
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 #, fuzzy
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 #, fuzzy
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 #, fuzzy
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 #, fuzzy
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 #, fuzzy
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 #, fuzzy
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 #, fuzzy
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 #, fuzzy
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 #, fuzzy
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Middelpunts"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Meerpunts"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Enkele zone"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Dichtstbijzijnd onderwerp"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Groepsdynamisch"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Enkele-zone AF"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Dynamische-zone AF"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 #, fuzzy
 msgid "Group-dynamic AF"
 msgstr "Groepsdynamische AF"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "Dynamische-zone AF met prioriteit voor dichtstbijzijnd onderwerp"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 #, fuzzy
 msgid "Dynamic Area (9)"
 msgstr "Dynamische AF-zone"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 #, fuzzy
 msgid "Dynamic Area (21)"
 msgstr "Dynamische AF-zone"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 #, fuzzy
 msgid "Dynamic Area (51)"
 msgstr "Dynamische AF-zone"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 #, fuzzy
 msgid "3D Tracking"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+#, fuzzy
+msgid "Dynamic-area AF (25 points)"
+msgstr "Dynamische-zone AF"
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Enkele-zone AF"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "Normale-zone AF"
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:4253
+#, fuzzy
+msgid "Dynamic-area AF (72 points)"
+msgstr "Dynamische-zone AF"
+
+#: camlibs/ptp2/config.c:4254
+#, fuzzy
+msgid "Dynamic-area AF (153 points)"
+msgstr "Dynamische-zone AF"
+
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "Groepsdynamische AF"
+
+#: camlibs/ptp2/config.c:4256
+#, fuzzy
+msgid "Dynamic-area AF (9 points)"
+msgstr "Dynamische-zone AF"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+#, fuzzy
+msgid "Wide-area AF (S)"
+msgstr "Brede-zone AF"
+
+#: camlibs/ptp2/config.c:4260
+#, fuzzy
+msgid "Wide-area AF (L)"
+msgstr "Brede-zone AF"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Brede-zone AF"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Brede-zone AF"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (portret)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (natuur)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Onbekende waarde 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centrum"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Boven"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Beneden"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Links"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Rechts"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Breedte"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "Centraal"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Flexibel programma"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Flexibel programma"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Flexibel programma"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Centrumgericht"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Meerdere punten"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Middelpunt"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "Schaduw"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "Meerdere punten"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Standaard"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Groot"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Hoog"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Automatische flits"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Invulflits"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Antirodeogen automatisch"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Antirodeogen-invulflits"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Externe sync"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Automatische Slow-sync"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Achtergronddoeksync + Slow-sync"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Rodeogenreductie + Slow-sync"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Voorgronddoeksync"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Rodeogenreductie"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Rodeogenreductie + Slow-sync"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Slow-sync"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Achtergronddoeksync + Slow-sync"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Achtergronddoeksync"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 #, fuzzy
 msgid "Rear Curtain Sync"
 msgstr "Achtergronddoeksync"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Slow-sync"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Zwart-wit"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Nachtzicht"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Kleurenschets"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Miniatuureffect"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Selectieve kleur"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Silhouet"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "oneindig"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "oneindig"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Comprimering"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Slow-sync"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 #, fuzzy
 msgid "Face-priority AF"
 msgstr "Gezichtsgerichte AF"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Brede-zone AF"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Normale-zone AF"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Spot-AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Datumweergave"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "Continu"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Handmatige focus"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "Handmatige focus"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Belichtings-/focusvergrendeling"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "alleen autobelichtingsvergrendeling"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "alleen autofocusvergrendeling"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Autofocusvergrendeling vast"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "Autofocus aan"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Flitsniveauvergrendeling"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 seconden"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minuut"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minuten"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minuten"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 seconden"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 min"
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2,5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1,6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1,3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1,3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1,6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2,5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minuten"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Scherper"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Zachter"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Direct printen"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Laag-gemiddeld"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Hoog-gemiddeld"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Laag contrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Hoog-gemiddeld"
 
 # Originele string lijkt me fout.
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Hoog contrast"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zonefocus (close-up)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Zonefocus (heel dichtbij)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zonefocus (dichtbij)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zonefocus (medium)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zonefocus (veraf)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zonefocus (gereserveerd 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zonefocus (gereserveerd 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Zonefocus (gereserveerd 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zonefocus (gereserveerd 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatische macro"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Enkele opname"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 seconden"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 seconden"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "TL-licht H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Aangepaste witbalans PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Aangepaste witbalans PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Aangepaste witbalans PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Ontbrekend nummer"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Schaduw"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Aangepast"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Aangepaste witbalans PC-1"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Aangepast"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Aangepaste witbalans PC-2"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Aangepast"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Aangepaste witbalans PC-3"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Aangepast"
+msgid "Manual 3"
+msgstr "Handmatig 2"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Handmatig 2"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Handmatig 2"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Aangepaste witbalans PC-1"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Aangepaste witbalans PC-1"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Zwart-wit"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Minder scherpte"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Zwart-wit"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Reeksvolgorde"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Alleen flits"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Opstarten"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Uitschakeling"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Opstarten en uitschakeling"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Snelle reactie"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Spiegel omhoog op afstand"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Toepassingsmodus 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Toepassingsmodus 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Matig"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Verhoogd"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Automatische gevoeligheid"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Hoge gevoeligheid"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Medium gevoeligheid"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Lage gevoeligheid"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Microfoon uit"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hoog 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hoog 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Flits/snelheid"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Flits/snelheid/diafragma"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Flits/diafragma"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG-basis"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+fijn"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+basis"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+normaal"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG-basis"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "normale JPEG"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "fijne JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "NEF+basis"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "NEF+normaal"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "NEF+fijn"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "Extra hoog"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + fijne JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + fijne JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+fijn"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + fijne JPEG"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + fijne JPEG"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fijn"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "fijne JPEG"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "Meerpunts"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 seconden"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 seconden"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 seconden"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minuten"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Verliesloos"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Met verlies"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+msgid "High Efficiency"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optimale kwaliteit"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 #, fuzzy
 msgid "1/320s (Auto FP)"
 msgstr "Auto"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9-punts"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21-punts"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51-punts"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51-punts (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (lang)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (normaal)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (kort)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Belichtings-/focusvergrendeling"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "alleen belichtingsvergrendeling"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Belichtingsvergrendeling (reset bij loslaten)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Belichtingsvergrendeling (vast)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "alleen autofocusvergrendeling"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 #, fuzzy
 msgid "Unassigned"
 msgstr "Ongedefinieerd"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 #, fuzzy
 msgid "Preview"
 msgstr "Miniatuurvoorbeeld"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 #, fuzzy
 msgid "FV lock"
 msgstr "Belichtings-/focusvergrendeling"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 #, fuzzy
 msgid "AE lock (hold)"
 msgstr "Belichtingsvergrendeling (vast)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Matrix-meting"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Centrumgerichte meting"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Puntsmeting"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "Afspelen"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (RAW)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "Beeldzoekerraster"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Filmopname starten"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Flikkerreductie"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Onbekende waarde"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Wijzigen van AF-zone van Nikon werkt alleen in LiveView-modus."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "De autofocus-drive van Nikon heeft niet scherpgesteld."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Handmatige focus van Nikon werkt alleen in LiveView-modus."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Handmatige focus van Nikon is aan zijn limiet."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Handmatige focusstap van Nikon is te klein."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Direct"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "Aangepaste voorinstelling 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "Aangepaste voorinstelling 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "Aangepaste voorinstelling 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 #, fuzzy
 msgid "Release 1"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 #, fuzzy
 msgid "Release 2"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 #, fuzzy
 msgid "Release 3"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Dichtbij 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Dichtbij 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Dichtbij 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Veraf 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Veraf 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Veraf 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Dichtbij %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Veraf %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 #, fuzzy
 msgid "Nikon enable liveview failed"
 msgstr "Inschakelen van Nikon-rechtstreeks beeld is mislukt: %x"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Toepassingsmodus"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Beeldoverzicht"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Kaart is tegen schrijven beveiligd."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+#, fuzzy
+msgid "Already in movie recording"
+msgstr "Filmopname starten"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "kaart"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Kaart is niet geformatteerd"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Irisfout."
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Reeks van 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Ongeldige diafragma-instelling"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Accu is leeg, camera uit."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP-invoer-/uitvoerfout"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Diafragma-instelling"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Kaart is niet geformatteerd"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Flitsinstelling"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Belichtingsprogrammamodus"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "TL-lamp"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "tijd is ingesteld"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Zwart-wit"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Automatisch"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Automatische macro"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Onbekend: 0x%04x\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Supermacro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Veraf 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Veraf 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Dichtbij 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Dichtbij 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standaard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Opname"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Weergave"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Andere instellingen"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Hoge ISO-ruisonderdrukking"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Geen TV-menu tonen"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Groot"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Onbekende waarde %04x"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Interne RAM"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Geheugenkaart"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Weergave"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Aanmaakdatum: %s, laatst gebruikt: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bits"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bits"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "beheerd"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "ad hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Profielnaam"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "Wifi-ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP-adres (leeg bij DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Netwerkmasker"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Standaard gateway"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Toegangsmodus"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Wifi-kanaal"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Encryptie"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Encryptiesleutel (hex)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Schrijven"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Wifi-profielen tonen"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Wifi-profiel aanmaken"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Datum en tijd van camera synchroniseren met PC"
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Onscherp"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Handmatige focus"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "Power Wind"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Focusvergrendeling"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Geen flits"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Autofocuszone van Nikon instellen"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 #, fuzzy
 msgid "Set Nikon Control Mode"
 msgstr "Nikon flitsmodus"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Handmatige focus"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Canon EOS-zoompositie"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Canon EOS-zoom"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Canon EOS-zoompositie"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Canon EOS beeldzoeker"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+#, fuzzy
+msgid "Panasonic Viewfinder"
+msgstr "Canon EOS beeldzoeker"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon beeldzoeker"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Filmopname"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Focusmodus"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Focuszoneoverloop"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Focuspunt"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Camerafabrikant"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Toestelversie"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "PTP-versie"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "DPOF-versie"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Netvoeding"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Externe flits"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Accuniveau"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+#, fuzzy
+msgid "Mirror Up Status"
+msgstr "Spiegel omhoog"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Spiegel omhoog"
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+#, fuzzy
+msgid "Mirror Up Shooting Count"
+msgstr "Spiegel-omhoog-sequentie"
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Continue opnamemodus"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Camera-oriëntering"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Flits open"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Actieve AF-sensor"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Flits opgeladen"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Lensnaam"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Sluiterteller"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Nog beschikbare opnames"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Minimale focuslengte"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Maximale focuslengte"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Max. diafragmaopening bij min. focuslengte"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Max. diafragmaopening bij max. focuslengte"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Weinig licht"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Lichtmeter"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Autofocus vergrendeld"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 #, fuzzy
 msgid "AE Locked"
 msgstr "Autobelichting vergrendeld"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Microfoon uit"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Cameradatum en -tijd"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Piepmodus"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Beeldcommentaar"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Beeldcommentaar inschakelen"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "LCD-uitschakelingstijd"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Opnamemedium"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "CSM-menu"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Commandokiezer omkeren"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Camera-uitvoer"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 #, fuzzy
 msgid "Recording Destination"
 msgstr "Opnamemedium"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "Autofocusmodus"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artiest"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "CCD-nummer"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Sensor schoonmaken"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Flikkerreductie"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "Focusmodus"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "Focuszones"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Flits opgeladen"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Enkele opname"
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "Auto-uitschakeling (in minuten)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menu's en weergave"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Camera-acties"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Drivemodus"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Ondersteunde miniatuurgrootte"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Snel bestandssysteem"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Opnamedoel"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Autofocusmodus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "Opnamemodus"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Effectmodus"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Beeldindeling SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Beeldindeling CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "Beeldindeling ext HD"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Bestandsresolutie"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Beeldgrootte"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "ISO-snelheid"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Witbalans"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Witbalans-bijstelling A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Witbalans-bijstelling B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Witbalans-X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Witbalans-X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Fotoeffect"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Kleurmodel"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Kleurruimte"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Datumopmaak"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Bestandsresolutie"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Contrast"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Helderheid"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Datumopmaak"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Ruisonderdrukking bij lange belichting"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Autofocusmodus 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Opnamesnelheid"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Hulplicht"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Rotatievlag"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Belichtingscompensatie"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Witbalans"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+#, fuzzy
+msgid "Color temperature"
+msgstr "Kleurtemperatuur"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Autofocusmodus"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Tintaanpassing"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Filmopname starten"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Flitscompensatie"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "AEB-belichtingscompensatie"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Nikon flitsmodus"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "Flitsmodus: altijd, "
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 #, fuzzy
 msgid "Flash Command Channel"
 msgstr "Flitsmodus is gewijzigd"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "Flitscompensatie"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "Flitscompensatie"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "Flitsmodus"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "Flitscompensatie"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "AF-zoneverlichting"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "AF-piepmodus"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "F-nummer"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "LiveView-AF-zone"
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "F-nummer"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Flexibel programma"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kwaliteit"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Beeldgrootte"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Beeldindeling"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Focusafstand"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Focuslengte"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Focusmodus 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 #, fuzzy
 msgid "Continuous AF"
 msgstr "Continu"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Effectmodus"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Belichtingsprogramma"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Cameramodus"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Scènemodus"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Autofocusmodus"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr ""
 "\n"
 "Samenvatting van opslagapparaten:\n"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Hoge ISO-ruisonderdrukking"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "HDR-modus"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 #, fuzzy
 msgid "Still Capture Mode"
 msgstr "Opname van stilstaand beeld"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Canon-opnamemodus"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "Canon auto-belichtingsmodus"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Canon auto-belichtingsmodus"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Drivemodus"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Afbeeldingsstijl"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Focusmetingmodus"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Meetmethode belichting"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Diafragma"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Focuspunt"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Opnamevertraging"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Sluitertijd 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Sluitertijd 2"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Meetmethode"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Autofocusafstand"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Focuszoneoverloop"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Belichtingsuitstellingsmodus"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Belichtingsvergrendeling"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Belichtings-/focusvergrendeling"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "LiveView-AF-zone"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Witbalans"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Opeenvolging bestandsnummers"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Flitssignaal"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "Altijd flitsen"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Beeldzoekerraster"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Beeldoverzicht"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Beeldrotatievlag"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Autofocuszone"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Flitsbelichtingscompensatie"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Reeksvolgorde"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Opnamereeks"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Reeksvolgorde"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Belichting reeksopname (bracketing)"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Belichting reeksopname"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Aangepaste voorinstelling 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Aangepaste voorinstelling 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Aangepaste voorinstelling 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Aangepaste voorinstelling 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Aangepaste voorinstelling 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Aangepaste voorinstelling 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Burst-nummer"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Burst-interval"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Maximum opnames"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Witbalans: automatisch"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Witbalans: gloeilamp"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Witbalans: TL-licht"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Witbalans: daglicht"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Witbalans: flits"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Witbalans: bewolkt"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Witbalans: schaduw"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Witbalans: daglicht"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Witbalans-voorinstellingsnummer"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Witbalans-voorinstelling 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Witbalans-voorinstelling 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Witbalans-voorinstelling 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Witbalans-voorinstelling 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Witbalans-voorinstelling 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Zelfontspannertijd"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Centrumzone"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Flitssluitertijd"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Timeout op afstand"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "Opnamemodus"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Toepassingsmodus"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Beeldoptimalisatie"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Scherpte"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Tooncompensatie"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Verzadiging"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Tintaanpassing"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Filmgeluid"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "Handmatige reeksopname (bracketing)"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Microfoon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 #, fuzzy
 msgid "Reverse Indicators"
 msgstr "Commandokiezer omkeren"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+# Originele string lijkt me fout.
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Hoog contrast"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Videomodus"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "bestandsverwijdering, "
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Filmgeluid"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Meter-uitschakelingstijd"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Functieknop toewijzen"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 #, fuzzy
 msgid "Assign Preview Button"
 msgstr "Voorproefknop toewijzen"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Filmkwaliteit"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Minimum sluitertijd"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Continue opnamemodus, lage snelheid"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Bestandsresolutie"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Continue opnamemodus, lage snelheid"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Minimum sluitertijd"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Filmkwaliteit"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Flitssynchronisatiesnelheid"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "Focusmetingmodus"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Continue opnamemodus, hoge snelheid"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "JPEG-compressiebeleid"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "AF-activering"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Dynamische AF-zone"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "AF-vergrendeling aan"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "AF-zonepunt"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "AF op knop"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Hoge ISO-ruisonderdrukking"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Min. focuslengte"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 #, fuzzy
 msgid "Raw Compression"
 msgstr "Comprimering"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Beeldkwaliteit"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Beeldinstellingen"
+#: camlibs/ptp2/config.c:11288
+#, fuzzy
+msgid "Live View Zoom Area"
+msgstr "LiveView-AF-zone"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Opname-instellingen"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Wifi-profielen"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Andere PTP-toesteleigenschappen"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP-eigenschap 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
-#, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
+#, fuzzy, c-format
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Eigenschap '%s' / 0x%04x is momenteel alleen-lezen."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, fuzzy, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Eigenschap '%s' / 0x%04x is niet ingesteld; PTP-foutcode is 0x%04x."
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, fuzzy, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Eigenschap '%s' / 0x%04x is niet ingesteld; PTP-foutcode is 0x%04x."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "Map niet gevonden"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7835,196 +10224,222 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 #, fuzzy
 msgid "Canon enable viewfinder failed"
 msgstr "Inschakelen van Canon-beeldzoeker is mislukt: %d"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 #, fuzzy
 msgid "Canon get viewfinder image failed"
 msgstr "Ophalen van beeld van Canon-beeldzoeker is mislukt: %d"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Uw Canon-camera ondersteunt de Canon-Viewfinder-modus niet"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Uw Nikon-camera ondersteunt de LiveView-modus niet"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 #, fuzzy
 msgid "Nikon disable liveview failed"
 msgstr "Uitschakelen van Canon-beeldzoeker is mislukt: %d"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Uw Nikon-camera ondersteunt de LiveView-modus niet"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "Uw Nikon-camera ondersteunt de LiveView-modus niet"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Deze camera ondersteunt geen Nikon-beeldopname"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Deze Canon-camera ondersteunt geen EOS-beeldopname"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 #, fuzzy
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS-opname is mislukt: 0x%04x"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Deze Canon-camera ondersteunt geen opname-initiatie"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 #, fuzzy
 msgid "Canon disable viewfinder failed"
 msgstr "Uitschakelen van Canon-beeldzoeker is mislukt: %d"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 #, fuzzy
 msgid "Canon Capture failed"
 msgstr "Canon-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Canon-opname is mislukt: %x"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Deze camera ondersteunt geen generische beeldopname"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 #, fuzzy
 msgid "Canon EOS Half-Press failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 #, fuzzy
 msgid "Canon EOS Half-Release failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 #, fuzzy
 msgid "Canon EOS Full-Press failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 #, fuzzy
 msgid "Canon EOS Full-Release failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 #, fuzzy
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 #, fuzzy
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS-opname is mislukt: %x"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Fabrikant: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Model: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Versie: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Serienummer: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "PTP-standaardversie: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Functionele modus: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -8032,20 +10447,30 @@
 "\n"
 "Opname-indelingen: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Weergave-indelingen: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Ondersteunde MTP-objecteigenschappen:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP-fout %04x na vraag"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -8053,94 +10478,94 @@
 "\n"
 "Toestelmogelijkheden:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tbestand downloaden, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "bestandsverwijdering, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "geen bestandsverwijdering, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "bestand uploaden\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "geen bestandsupload\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Canon-opname"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "Canon EOS-opname"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "Canon EOS-opname"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "Nikon-opname 1"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "%sNikon-opname 2"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "%sNikon-opname 3 "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Sony-opname"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Geen fabrikantspecifieke opname\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon Wifi-ondersteuning\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon Wifi-ondersteuning\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8148,93 +10573,93 @@
 "\n"
 "Samenvatting van opslagapparaten:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tOpslagomschrijving: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tVolumenlabel: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "ingebouwde ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "verwijderbare ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "ingebouwde RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "verwijderbare RAM (geheugenkaart)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Onbekend: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tOpslagtype: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "gewoon vlak"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "gewoon hiërarchish"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "layout van digitale camera (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tBestandssysteemsoort: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "lezen+schrijven"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "alleen-lezen"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "alleen-lezen plus objectverwijdering"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tToegangsrechten: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaximum capaciteit: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tVrije ruimte (bytes): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tVrije ruimte (beelden): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8242,48 +10667,48 @@
 "\n"
 "Samenvatting van apparaateigenschappen:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " niet uitgelezen.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "kan niet gepolst worden.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "alleen-lezen"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "lezen+schrijven"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " fout %x na vraag."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Bestand '%s/%s' bestaat niet."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Metagegevens worden alleen ondersteund voor MTP-apparaten."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "Deze camera ondersteunt het wijzigen van instellingsopties niet."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, fuzzy, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Deze camera ondersteunt het wijzigen van instellingsopties niet."
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8292,2320 +10717,2421 @@
 "Momenteel is PTP alleen voor USB- en PTP/IP-camera's geïmplementeerd, met "
 "poorttype %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP - Ongedefinieerde fout"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP - Algemene fout"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP: Sessie is niet open"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP: Ongeldig transactie-ID"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP: Actie wordt niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP: Parameter wordt niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP: Overdracht is niet compleet"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP: Ongeldig opslag-ID"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP: Ongeldig objecthandvat"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP: Toesteleigenschap wordt niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP: Ongeldige objectopmaakcode"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP: Opslagruimte is vol"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP: Object is tegen schrijven beveiligd"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP: Opslagruimte is alleen-lezen"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP: Toegang geweigerd"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP: Geen miniatuurvoorbeeld aanwezig"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP: Zelftest is mislukt"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP: Gedeeltelijk verwijderd"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP: Opslagruimte is niet beschikbaar"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP: Specificatie door formaat niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP: Geen geldige objectinformatie"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP: Ongeldig codeformaat"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP: Onbekende leverancierscode"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP: Opname is reeds beëindigd"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP: Toestel is bezig"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP: Ongeldig hoofdobject"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP: Ongeldige opmaak van toesteleigenschap"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP: Ongeldige waarde voor toesteleigenschap"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP: Ongeldige parameter"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP: Sessie is reeds geopend"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP: Transactie is geannuleerd"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP: Opgave van bestemming wordt niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP: Ongeldig objecthandvat"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Geen reden voorhanden"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Ongeldige toestand"
+
+#: camlibs/ptp2/ptp.c:6117
 #, fuzzy
 msgid "Filename Required"
 msgstr "PTP EK: Bestandsnaam is vereist"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 #, fuzzy
 msgid "Filename Conflicts"
 msgstr "PTP EK: Bestandsnaamconflict"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "PTP EK: Ongeldige bestandsnaam"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Hardwarefout"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Onscherp"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Verandering van cameramodus is mislukt"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Ongeldige toestand"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Eigenschap instellen wordt niet ondersteund"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Witbalans-resetfout"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "Sluitertijd"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Spiegel-omhoog-sequentie"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP: Geen miniatuurvoorbeeld aanwezig"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Flitsfout."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Kaart is niet geformatteerd"
+
+#: camlibs/ptp2/ptp.c:6138
+#, fuzzy
+msgid "Bulb Release Busy"
+msgstr "Flitsmodus"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Sluitertijd 2"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP: Opname is reeds beëindigd"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Ongeldige toestand"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Onbekende opdracht"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "Actie is geweigerd"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 #, fuzzy
 msgid "Lens Cover Present"
 msgstr "Lensdop aanwezig"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "Accu is bijna leeg"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "Camera is niet gereed"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Lensdop aanwezig"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Accu"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Niet gereed"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Object afkappen"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP: Ongeldige objectopmaakcode"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP: Ongeldige objectopmaakcode"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP: Ongeldige waarde voor toesteleigenschap"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP: Ongeldig objecthandvat"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Ongeldige toestand"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP: Specificatie door formaat niet ondersteund"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP: Specificatie door formaat niet ondersteund"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Eigenschap instellen wordt niet ondersteund"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Mediasessie openen"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Ongeldige toestand"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP: Actie wordt niet ondersteund"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP: Toestel is bezig"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "PTP-timeout"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 #, fuzzy
 msgid "PTP Cancel Request"
 msgstr "PTP-annuleringsverzoek"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "PTP-protocolfout, antwoord werd verwacht"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "PTP-protocolfout, data werd verwacht"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "PTP-invoer-/uitvoerfout"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Ongedefinieerde PTP-eigenschap"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Functionele modus"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Compressie-instelling"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Witbalans"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB-versterking"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Belichtingstijd"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Belichtingsprogrammamodus"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Belichtingsindex (volgens ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Belichtingscompensatie"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Vertraging voor-opname"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Contrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digitale zoom"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Tijdspanne-nummer"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Tijdspanne-interval"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Upload-URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Copyrightinfo"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "Ondersteunde waarden"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 #, fuzzy
 msgid "Enabled Streams"
 msgstr "Ongeldige toestand"
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Datumopmaak"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Bestandsresolutie"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Filmkwaliteit"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Contrast"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Helderheid"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Datumopmaak"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Opmaak van datum-/tijdweergave"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Video-uit"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Stroombesparend"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Taal gebruikersinterface"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Accutype"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Accumodus"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Cameramodus"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Zelfontspannertijd"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Opnamemodus"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Beeldmodus"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Lange sluitertijd"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Autofocusmodus"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Beeldstabilisatie"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Kleurversterking"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Gevoeligheid"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Parameterset"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Focuslengte tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Focuslengte breed"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 #, fuzzy
 msgid "Focal Length Denominator"
 msgstr "Focuslengte"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Opnameoverdrachtmodus"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Naamvoorvoegsel"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Beeldgrootte-/kwaliteitsmodus"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Ondersteunde miniatuurgrootte"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Grootte van uitvoergegevens uit camera"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Grootte van invoergegevens naar camera"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Camera-eigenaar"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX-tijd"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Camera body-ID"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Digitale zoomvergroting"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 #, fuzzy
 msgid "Flash Quantity Count"
 msgstr "Flits auto"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Rotatiehoek"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Soort diashow"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Gemiddelde bestandsgroottes"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Model-ID"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "Opnamemodus"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 #, fuzzy
 msgid "Shooting Bank Name A"
 msgstr "Opnamemodus"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 #, fuzzy
 msgid "Shooting Bank Name B"
 msgstr "Opnamemodus"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 #, fuzzy
 msgid "Shooting Bank Name C"
 msgstr "Opnamemodus"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 #, fuzzy
 msgid "Shooting Bank Name D"
 msgstr "Opnamemodus"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Witbalans-kleurtemperatuur"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Witbalans-voorinstellingsnummer"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Witbalans-voorinstellingsnaam 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Witbalans-voorinstellingsnaam 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Witbalans-voorinstellingsnaam 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Witbalans-voorinstellingsnaam 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Witbalans-voorinstellingsnaam 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Witbalans-voorinstellingswaarde 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Witbalans-voorinstellingswaarde 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Witbalans-voorinstellingswaarde 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Witbalans-voorinstellingswaarde 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Witbalans-voorinstellingswaarde 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Focuslengte van lens (non-CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Max. diafragma van lens (non-CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Verticale AF aan"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 #, fuzzy
 msgid "Focus Area Zone"
 msgstr "Focuszoneoverloop"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Copyright inschakelen"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "ISO-belichtingsstap"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Belichtingsstap"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Belichtingscompensatie (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Centrumzone"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "Belichtingsmeter"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "Belichtingstrap"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "LiveView-AF-zone"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Tijd automatische uitschakeling"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Zelfontspannertijd"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "Tijd tot automatische uitschakeling"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 #, fuzzy
 msgid "Angle Level"
 msgstr "Volumeniveau"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Opnamesnelheid"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Belichtingsuitstellingsmodus"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Ruisonderdrukking bij lange belichting"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "LCD-verlichting"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Hoge ISO-ruisonderdrukking"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Tips in beeld"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Auteursnaam"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Copyright-informatie"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Altijd flitsen"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Handmatige reeksopname (bracketing)"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Automatische opnamereeksselectie"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "Nikon opnamereeks"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Centrale knop opnamemodus"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Centrale knop weergavemodus"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Multikiezer"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Fotoinformatieweergave"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Functieknop toewijzen"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Commandokiezer aanpassen"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Diafragma-instelling"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Knoppen en kiezers"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Geen CF-kaart uitworp"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Centrale knop zoomfactor"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Functieknop 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Normale AF aan"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Beeldsensor schoonmaken"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Beeldcommentaartekst"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Beeldcommentaar-inschakeling"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Beeldrotatie"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 #, fuzzy
 msgid "Movie Microphone"
 msgstr "Microfoon uit"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 #, fuzzy
 msgid "Movie Card Slot"
 msgstr "Beeldkwaliteit"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "Belichting reeksopname"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "Belichting reeksopname (bracketing)"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "Nikon witbalansstap"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "Nikon witbalansstap"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Lens-ID"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Lenssoort"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Lenstype"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Min. focuslengte"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Max. focuslengte"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Max. diafragmaopening bij min. focuslengte"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Max. diafragmaopening bij max. focuslengte"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 #, fuzzy
 msgid "Finder ISO Display"
 msgstr "Beeldzoekerraster"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "Tijd tot automatische uitschakeling"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "Tijd tot automatische uitschakeling"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "Tijd tot automatische uitschakeling"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "Zelfontspannertijd"
 
 # Originele string lijkt me fout.
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 #, fuzzy
 msgid "Vignette Control"
 msgstr "Hoog contrast"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "Belichtingstijd"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 #, fuzzy
 msgid "Warning Status"
 msgstr "Kaartstatus:\t\t"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Top modus 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Actieve AF-sensor"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Belichtingsmeter"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "USB-snelheid"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "CCD-serienummer"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "F-nummer"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Diafragma belichtingsvergrendeling"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "TV A/V-instellingen"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "TV A/V-instellingen"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "Beeldinstellingen"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "Focuspunt"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Externe flits aangesloten"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Externe flitsstatus"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Externe flitssoort"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Externe flitsmodus"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Externe flitscompensatie"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "ZW-vuleffect"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "ZW-scherpte"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "ZW-contrast"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "ZW-instellingstype"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Soort TL-licht"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Bijstelling van kleurtemperatuur"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Bijstelling 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Bijstelling 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Bijstelling 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Bijstelling 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Bijstelling 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Autofocusmodus"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Autofocushulplicht"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Auto ISO P/A/DVP-instelling"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Beeldzoekerraster"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "Auto"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Waarschuwingsweergave"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Soort accucellen"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Continu, hoge snelheid"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "Flitsinstelling"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 #, fuzzy
 msgid "Preview Button"
 msgstr "Voorproefknop"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 #, fuzzy
 msgid "Preview Button 2"
 msgstr "Voorproefknop 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 #, fuzzy
 msgid "AEAF Lock Button 2"
 msgstr "Alleen belichtingsvergrendeling"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "Flitscompensatie"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 #, fuzzy
 msgid "Flash MRepeat Interval"
 msgstr "Tijdspanne-interval"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Camerafabrikant"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "Comprimering"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Toestelcertificaat"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Herroepingsinfo"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Synchronisatiepartner"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Gewone toestelnaam"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Volumeniveau"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Toestelpictogram"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Gedetecteerd toesteltype"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Afspeelsnelheid"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Afspeelobject"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Afspeelcontainerindex"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Afspeelpositie"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "PlaysForSure-ID"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Kwaliteit"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Focuszones"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr ""
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Focuspunt"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "Beeldgrootte"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Sluitertijd"
 
-#: camlibs/ptp2/ptp.c:5436
-#, fuzzy
-msgid "Color temperature"
-msgstr "Kleurtemperatuur"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Focuszones"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "Belichtingstijd"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "Volledig beeld"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Dichtbij 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "AF-zonepunt"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Datum en tijd"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f-stapjes"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Normaal"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Basis"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Gloeilamp"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Handmatige focus"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automatische macro (close-up)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Centrumgericht gemiddelde"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Middelpunt"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Automatische flits"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatische rodeogenreductie"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Antirodeogen-invulflits"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "Power Wind"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "alleen AF-vergrendeling"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Flitsvergrendeling"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Focuspunt terugzetten op centrum"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Actieve focuspunt aangeven"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "ongebruikt"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SD-RAM"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "LCD-achtergrondlicht"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "LCD-achtergrondlicht en infoweergave"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Donker op licht"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Licht op donker"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Lithium-ion"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nikkel-metaalhydride"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nikkel-cadmium"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkaline"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Waarschuwingsniveau 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Dringend"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Waarschuwingsniveau 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Economisch"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Superfijn"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Rodeogenreductie"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Langzame synchronisatie"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Auto + rodeogenreductie"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Aan + rodeogenreductie"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Veraf"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Korte sluitertijd"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Lange sluitertijd"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Nacht"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Grijswaarden"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Brede focus"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Enkel-frames opnamemodus"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Continue opnamemodus"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 #, fuzzy
 msgid "Timer (Single) Shooting"
 msgstr "Enkele opname"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Centrumgerichte meting"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Puntsmeting"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Gemiddelde meting"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Evaluerende meting"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Gedeeltelijke meting"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Centrumgerichte gemiddelde meting"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Puntsmeting gecombineerd met AF-frame"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Meerpuntsmeting"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Lange-sluitertijdfunctie is niet beschikbaar"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Laag 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Hoog 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Standaardontwikkelingsparameters"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Ontwikkelingsparameters 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Ontwikkelingsparameters 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Ontwikkelingsparameters 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Ongedefinieerde audio"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Ongedefinieerde video"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Ongedefinieerde verzameling"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "WPL-afspeellijst"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "M3U-afspeellijst"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "MPL-afspeellijst"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "ASX-afspeellijst"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "PLS-afspeellijst"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Ongedefinieerd document"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstract document"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "XML-document"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word-document"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "MHT-gecompileerd HTML-document"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Microsoft Excel-spreadsheet (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Ongedefinieerd bericht"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstract bericht"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Ongedefinieerd contact"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstract contact"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Ongedefinieerd kalenderitem"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstract kalenderitem"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "ongedefinieerd uitvoerbaar Windows-bestand"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sectie"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Onbekend (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 #, fuzzy
 msgid "Get device info"
 msgstr "Toestelinfo ophalen"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Sessie openen"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Sessie sluiten"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Opslag-ID's ophalen"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Opslaginfo ophalen"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Aantal objecten ophalen"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Objecthandvatten ophalen"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Objectinfo ophalen"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Object ophalen"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Miniatuur ophalen"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Object verwijderen"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Objectinfo versturen"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Object versturen"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Opname starten"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Opslag formatteren"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Toestel resetten"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Toestelzelftest uitvoeren"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Objectbescherming instellen"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Toestel uitschakelen"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Open opname beëindigen"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Object verplaatsen"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Object kopiëren"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Gedeeltelijk object ophalen"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Open opname starten"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 #, fuzzy
 msgid "Get Vendor Device Info"
 msgstr "Toestelinfo ophalen"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 #, fuzzy
 msgid "Get Filesystem Manifest"
 msgstr "Snel bestandssysteem"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 #, fuzzy
 msgid "Get Stream Info"
 msgstr "Opslaginfo ophalen"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Objectreferenties ophalen"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Objectreferenties instellen"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Firmware van toestel bijwerken"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Mediasessie openen"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Mediasessie sluiten"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Volgende gegevensblok ophalen"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "WFC-object verwerken"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Gedeeltelijk object ophalen (64-bits offset)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Gedeeltelijk object verzenden"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Object afkappen"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Begin van bewerkingsobject"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Einde van bewerkingsobject"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "onbekend %d"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "PTP: Onbekende leverancierscode"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Onbekende waarde"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Downloaden van film..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Downloaden van geluid..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Downloaden van EXIF-gegevens..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Geen EXIF-gegevens beschikbaar voor %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Kan het bestand niet verwijderen."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Kan de map niet verwijderen."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Kan de map niet aanmaken."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versie: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTC-status:%d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Cameratijd: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Camera-ID:%s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Geen SD-kaart aanwezig.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD-kaart-ID: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Foto's op camera: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD-geheugen: %d MB totaal, %d MB vrij.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Intern geheugen: %d MB totaal, %d MB vrij.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10617,7 +13143,7 @@
 "Omgekeerd ontwikkeld met gebruik van USB Snoopy, kijkend\n"
 "naar de bijwerking van het basissoftwarebeeld en wild gokkend.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10629,12 +13155,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "gebaseerd op Bob Paauwe's sturprogramma\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "onbekend (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10643,189 +13169,189 @@
 "Model: %s\n"
 "Geheugen: %d byte(s) van %d beschikbaar"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Buiten"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximaal"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimaal"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Teken"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Geluid"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Beeld & geluid"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Teken & geluid"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Algemeen"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright (max 20 tekens)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Afbeeldingen"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Witniveau"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Opnamemodus"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Comprimering"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Snelheid %i wordt niet ondersteund!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Verwachtte %i, ontving %i.  Rapporteer deze fout aan %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Verwachtte %i bytes, ontving %i.  Rapporteer deze fout aan %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "0x%x werd verwacht, maar 0x%x ontvangen.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Onjuiste tekens (0x%x, 0x%x).  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Camera is bezig.  Indien het probleem blijft, neem dan contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Zelfs na drie pogingen onderbroken.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Zelfs na drie pogingen een communicatiefout.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Camera in verkeerde modus.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "De camera weigert de parameters.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Er is een onbekende fout opgetreden.  Neem contact op met %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "De bestandsnaam mag uit maximaal 12 tekens bestaan ('%s' heeft er %i)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10837,109 +13363,109 @@
 "Mueller <lutz@users.sourceforge.net>. Marcus Meissner <marcus@jet.franken."
 "de> repareerde en verbeterde de port."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Resolutie plus grootte"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Datum en tijd (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Diafragma-instellingen"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Kleurmodus"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Rodeogenreductie"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Flitsinstellingen"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "PC-stroomspaarmodus (seconden)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Camera-stroomspaarmodus (seconden)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Lensmodus"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreaans"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Engels"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Frans"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Duits"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italiaans"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japans"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Spaans"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Afbeeldingsinstellingen"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10951,34 +13477,34 @@
 "  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Geen geheugenkaart aanwezig"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Kan de accucapaciteit niet bepalen"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Het accuniveau van de camera is te laag (%d%%).  De actie is gestopt."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Kan de hoeveelheid resterend geheugen niet bepalen"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "De camera weigerde drie maal om een verbinding open te houden."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "De eerste ontvangen byte (0x%x) is niet geldig."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -10986,49 +13512,49 @@
 "De transmissie van het pakket werd, zelfs na %i pogingen, onderbroken.\n"
 "Neem contact op met %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Kan het pakket, zelfs na meerdere pogingen, niet overbrengen."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Het pakket werd door de camera verworpen.  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Kan het pakket niet overbrengen (foutcode %i).  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Transmissie is zelfs na drie pogingen mislukt.  Gestopt..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Kreeg onverwacht resultaat 0x%x.  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Ontving onverwacht antwoord (%i).  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Kan register %i niet ophalen.  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Te veel pogingen zijn mislukt."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Verzenden van data..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -11036,145 +13562,141 @@
 "Recursieve aanroepen worden door het sierra-stuurprogramma niet "
 "ondersteund.  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Kan stringregister %i niet ophalen.  Neem contact op met %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Verwachtte 32 bytes, ontving %i.  Neem contact op met %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Sluitertijd in microseconden (0=auto)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Sluitertijd (in seconden)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Zwart-wit"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Antirodeogenflits"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Slow-sync"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Contrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Contrast-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Helderheid+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Helderheid-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Beeldaanpassing"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Knipperen"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED-modus"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Oneindig"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Miniatuurvoorbeeld"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Volgende"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Vorige"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Actiemodus"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCD-helderheid"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD-zelfuitschakeling (seconden)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Centrumgericht"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Spot-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Belichtingsmeting"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (in millimeters)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "geen"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "AE-vergrendeling"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Visoog"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Breedte"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Overige belichtings-/lensinstellingen"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Auto-belichtingsvergrendeling"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11203,7 +13725,7 @@
 "        Zet de camera in 'M'-modus om de\n"
 "        sluitertijd in te stellen.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11222,67 +13744,63 @@
 "\n"
 "    Het downloaden van foto's zou correct moeten werken.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Witte achtergrond"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Zwarte achtergrond"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Kleur- of functiemodus"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Slow-sync"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Antirodeogen-invulflits"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "TL-licht-1-huis-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "TL-licht-2-bureau-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "TL-licht-3-kantoor-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Schemering"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Beeldscherm"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD-modus"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digitale zoom"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Focuspositie"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Tijdsopmaak"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11316,7 +13834,7 @@
 "    toestand terechtkomt, dient u de camera opnieuw te\n"
 "    verbinden met de PC en de LCD op 'UIT' te zetten."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11344,7 +13862,7 @@
 "    toestand terechtkomt, dient u de camera opnieuw te\n"
 "    verbinden met de PC en de LCD op 'UIT' te zetten."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11372,105 +13890,110 @@
 "    van een volledige configuratie, neem dan contact op\n"
 "    met de mailinglijst voor ontwikkelaars.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (onbekend)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Het te uploaden bestand heeft lengte nul"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Onvoldoende ruimte beschikbaar op de geheugenkaart"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kan de naam van de map met afbeeldingen niet bepalen"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Uploaden wordt alleen ondersteund naar de map '%s'"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Best"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (onbekend)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Sluitertijd (microseconden, 0=auto)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Zwart-wit"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Witte achtergrond"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Zwarte achtergrond"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Helderheid/contrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Helderheid+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Helderheid-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Daglicht"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Oneindig/visoog"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Puntsmetingsmodus"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1,6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2,5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Auto-uit (verbonden) (in seconden)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11478,12 +14001,12 @@
 "Hoe lang het duurt voor de camera zichzelf uitschakelt als deze met de "
 "computer verbonden is."
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Auto-uit (los) (in seconden)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11491,115 +14014,115 @@
 "Hoe lang het duurt voor de camera zichzelf uitschakelt als deze niet met de "
 "computer verbonden is."
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD auto-uit (in seconden)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Opname-instellingen"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "Standaard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "Kleur"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "Zwart-wit"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Opmerking: geen geheugenkaart aanwezig, sommige waarden kunnen ongeldig "
 "zijn\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Cameramodel: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Serienummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Softwarerevisie: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Opgenomen frames: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Resterende frames: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Accuniveau: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Resterend geheugen: %i bytes\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Datum: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Geen camerahandleiding beschikbaar.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11620,7 +14143,7 @@
 "  Als uw camera zich anders gedraagt, stuur dan een e-mail\n"
 "  naar %s (in het Engels).\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11654,7 +14177,7 @@
 "    toestand terechtkomt, dient u de camera opnieuw te\n"
 "    verbinden met de PC en de LCD op 'UIT' te zetten."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11674,12 +14197,7 @@
 "voor het gebruik van hun Olympus C-3030Z voor de\n"
 "implementatie van USB-ondersteuning."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (onbekend)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11689,11 +14207,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Kan de USB-instellingen niet doorvoeren"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11714,7 +14232,7 @@
 "Stuurprogramma voor toegang tot de Smal Ultrapocket-camera,\n"
 "en de OEM-versies (slimshot)."
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11729,7 +14247,7 @@
 "Sonix-camera.\n"
 "Er staan %i foto's op.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11744,7 +14262,7 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11752,7 +14270,7 @@
 "Sonix-camerabibliotheek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11765,7 +14283,7 @@
 "Gebaseerd op de 'chotplay CLI'-interface van Ken-ichi Hayashi.\n"
 "Overgezet naar Gphoto2 door Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11777,7 +14295,7 @@
 "Oorspronkelijk geschreven door Mark Davies <mdavies@dial.pipex.com>,\n"
 "overgezet naar gPhoto2 door Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11790,12 +14308,12 @@
 "Totaal geheugen: %i kB\n"
 "Vrij geheugen:   %i kB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Firmware-revisie: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11803,7 +14321,7 @@
 "Soundvision-stuurprogramma\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11812,7 +14330,7 @@
 "FLASH:\n"
 " Bestanden: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11829,7 +14347,7 @@
 "Gebruikte ruimte: %8d\n"
 "Vrije ruimte: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x-bibliotheek v"
 
@@ -11893,12 +14411,12 @@
 "Algemeen sq905-stuurprogramma\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Uw USB-fotoframe heeft een ST2205-chipset\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11908,7 +14426,7 @@
 "Het gphoto-stuurprogramma voor deze apparaten kan foto's van het\n"
 "fotoframe downloaden, ernaar uploaden, en ervan verwijderen."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11920,11 +14438,7 @@
 "Dit stuurprogramma kan foto's van het fotoframe downloaden,\n"
 "ernaar uploaden, en ervan verwijderen."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Oriëntatie"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11936,110 +14450,110 @@
 "Stuurprogramma voor camera's die de STV0674-processor gebruiken.\n"
 "Het protocol werd ontrafeld met behulp van SnoopyPro.\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Slechte belichting (waarschijnlijk niet genoeg licht)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informatie over op STV0680-gebaseerde camera:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Firmware-revisie: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC-revisie: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Sensor-ID: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "De camera is ingesteld voor lampen die flikkeren met %d Hz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Geheugen in camera: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Camera ondersteunt miniatuurvoorbeelden.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Camera ondersteunt video.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Camera-afbeeldingen zijn monochroom.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Camera heeft geheugen.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Camera ondersteunt videoformaten: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Leveranciers-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Product-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Aantal beelden: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Maximum aantal beelden: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Beeldbreedte: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Beeldhoogte: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Beeldgrootte: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Breedte van miniatuur: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Hoogte van miniatuur: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Grootte van miniatuur: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12055,12 +14569,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Uitgebreid voor Aiptek PenCam en andere STM USB dualmodus-camera's."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Ophalen van informatie over %i bestanden..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12072,19 +14586,19 @@
 "Foutrapportages en commentaren zijn welkom.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z is alleen USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Stuurprogramma-instellingen"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Turbomodus"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12092,12 +14606,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Downloaden van %s..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12107,39 +14621,68 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Stuurprogramma voor Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Uw USB-fotoframe heeft een ST2205-chipset\n"
+
+#: camlibs/tp6801/library.c:93
+#, fuzzy
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Fotoframes met een ST2205-chip kunnen allerlei resoluties hebben.\n"
+"Het gphoto-stuurprogramma voor deze apparaten kan foto's van het\n"
+"fotoframe downloaden, ernaar uploaden, en ervan verwijderen."
+
+#: camlibs/tp6801/library.c:106
+#, fuzzy
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"ST2205-stuurprogramma voor USB-fotoframes\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Dit stuurprogramma kan foto's van het fotoframe downloaden,\n"
+"ernaar uploaden, en ervan verwijderen."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "**Interne fout** bij zoeken naar 'camlibs' -- padnamen te lang?"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Laden van camerastuurprogramma's uit '%s'..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Er is een fout opgetreden in de invoer-/uitvoerbibliotheek ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Kan geen camera detecteren"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Kan geen camera detecteren op poort %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "U dient de poort in te stellen vóór de initialisatie van de camera."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Kan het vereiste stuurprogramma '%s' (%s) niet laden."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "In stuurprogramma '%s' ontbreekt de 'camera_init'-funtie."
@@ -12177,12 +14720,12 @@
 msgid "This camera can not capture previews."
 msgstr "Deze camera kan geen voorbeeldopnames maken."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Het pad '%s' is niet absoluut."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12191,22 +14734,22 @@
 "U probeerde '%s' uit map '%s' te verwijderen, maar het bestandssyteem "
 "ondersteunt het verwijderen van bestanden niet."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Map '%s/%s', die u probeert te verwijderen, bevat nog submappen."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Map '%s/%s', die u probeert te verwijderen, bevat nog bestanden."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Het bestandssysteem ondersteunt het uploaden van bestanden niet."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12214,101 +14757,117 @@
 "Map '%s' bevat slechts %i bestanden, maar u vroeg om een bestand met nummer "
 "%i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Bestand '%s' kan niet worden gevonden in map '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kan het bestand '%s' niet vinden."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Het bestandssysteem ondersteunt het ophalen van bestanden niet"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Onbekend bestandstype %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Het bestandssyteem ondersteunt het ophalen van bestandsinformatie niet"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Het bestandssysteem ondersteunt het instellen van bestandsinformatie niet"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Bestandseigenschappen zoals hoogte en breedte kunnen allen worden gelezen en "
 "niet worden gewijzigd."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Het bestandssyteem ondersteunt het ophalen van opslaginformatie niet"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Beschadigde gegevens"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Bestand bestaat al"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Onbekend model"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Map niet gevonden"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Map bestaat al"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Camera is bezig"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Pad is niet absoluut"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Actie is geannuleerd"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Camera kon de actie niet voltooien"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Besturingssysteemfout in communicatie met camera"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Niet genoeg vrije ruimte"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Onbekende fout in camerabibliotheek"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Onbekende waarde %04d"
+
+#~ msgid "Setting 4"
+#~ msgstr "Instelling 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Instelling 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Instelling 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Instelling 7"
+
 #~ msgid "Disabled"
 #~ msgstr "uitgezet"
 
@@ -12336,12 +14895,18 @@
 #~ msgid "sRAW + Small Normal JPEG (S1 Normal)"
 #~ msgstr "sRAW + kleine, normale JPEG (S1 normaal)"
 
+#, fuzzy, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "Ruisonderdrukking bij lange belichting"
+
 #~ msgid "PTP Error: bad parameter"
 #~ msgstr "PTP-fout: onjuiste parameter"
 
+#, c-format
 #~ msgid "Canon Capture failed: 0x%04x"
 #~ msgstr "Canon-opname is mislukt: 0x%04x"
 
+#, c-format
 #~ msgid "No event received, error %x."
 #~ msgstr "Geen gebeurtenis ontvangen, fout %x."
 
@@ -12468,6 +15033,7 @@
 #~ msgid "PTP: Protocol error, response expected"
 #~ msgstr "PTP: Protocolfout, antwoord werd verwacht"
 
+#, c-format
 #~ msgid "Unknown (%04x)"
 #~ msgstr "Onbekend (%04x)"
 
@@ -12480,15 +15046,18 @@
 #~ msgid "Flourescent-3-office-4200K"
 #~ msgstr "TL-licht-3-kantoor-4200K"
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "Kan geen stuurprogramma vinden voor '%s'"
 
 #~ msgid "No additional information available."
 #~ msgstr "Geen verdere informatie beschikbaar."
 
+#, c-format
 #~ msgid "Deleting '%s' from folder '%s'..."
 #~ msgstr "Verwijderen van '%s' uit map '%s'..."
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "Downloaden van '%s' uit map '%s'..."
 
@@ -12682,9 +15251,6 @@
 #~ msgid "spot"
 #~ msgstr "Puntmeting"
 
-#~ msgid "Center"
-#~ msgstr "Centraal"
-
 #~ msgid "Default"
 #~ msgstr "Standaard"
 
@@ -12750,12 +15316,6 @@
 #~ msgid "super fine"
 #~ msgstr "superfijn"
 
-#~ msgid "Date Time"
-#~ msgstr "Datum en tijd"
-
-#~ msgid "ShutterSpeed"
-#~ msgstr "Sluitertijd"
-
 #~ msgid "Max. Shots"
 #~ msgstr "Max. aantal opnames"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/pl.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/pl.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/pl.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/pl.po Changed

@@ -1,14 +1,14 @@
 # Polish translation for libgphoto2.
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2006-2017.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2006-2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.13\n"
+"Project-Id-Version: libgphoto2 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2017-04-10 17:20+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2022-01-04 21:15+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -27,7 +27,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -36,12 +36,12 @@
 "Wygląda na to, że aparat nie przechowuje danych na CompactFlashu.\n"
 "Niestety nie jest to jeszcze obsługiwane :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "Aparat wykonał %d zdjęć i przechowuje dane na CompactFlashu.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -74,12 +74,12 @@
 "Ogólny sterownik Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Ramka cyfrowa USB ma układ AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -89,7 +89,7 @@
 "Sterownik gphoto dla tych urządzeń pozwala ściągać,\n"
 "przesyłać i usuwać zdjęcia z ramki cyfrowej."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -101,16 +101,18 @@
 "Ten sterownik umożliwia ściąganie, przesyłanie i usuwanie zdjęć\n"
 "z ramki cyfrowej."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Konfiguracja ramki cyfrowej"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Synchronizacja daty i czasu ramki z PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -119,7 +121,7 @@
 "Liczba zdjęć: %i\n"
 "Wersja firmware'u: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -143,26 +145,26 @@
 "Zaimplementowano z użyciem dokumentacji\n"
 "dostępnej na WWW za zgodą Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Nie udało się utworzyć katalogu %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Nie udało się usunąć katalogu %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "zablokowanie klawiszy nie powiodło się."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*NIEZNANY*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -171,7 +173,7 @@
 "canon_int_capture_image: początkowe canon_usb_list_all_dirs() nie powiodło "
 "się ze stanem %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -180,19 +182,19 @@
 "canon_int_capture_image: końcowe canon_usb_list_all_dirs() nie powiodło się "
 "ze stanem %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Nazwa '%s' (%li znaków) jest zbyt długa, dozwolone jest maksymalnie 30 "
 "znaków."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Małe litery w %s nie są dopuszczalne."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -200,7 +202,7 @@
 "canon_int_list_directory: BŁĄD: początkowy komunikat zbyt krótki (%i < "
 "minimum %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -208,15 +210,15 @@
 "canon_int_list_directory: Osiągnięto koniec pakietu przed sprawdzeniem "
 "pierwszego dirent"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: napotkano ucięty wpis katalogu"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Plik zabezpieczony."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -224,11 +226,11 @@
 "canon_int_get_info_func: BŁĄD: początkowy komunikat zbyt krótki (%i < "
 "minimum %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Nie udało się wyciągnąć miniaturki JPEG z danych: Brak początku/końca"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Nie udało się wyciągnąć miniaturki JPEG z danych: Dane nie są JFIF"
 
@@ -237,7 +239,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parametr NULL \"%s\" w %s w linii %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -245,17 +247,17 @@
 "Nie wiem jak obsłużyć wartość camera->port->type %i czyli 0x%x w %s w linii "
 "%i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "BŁĄD KRYTYCZNY: nieznana początkowa wartość CRC dla długości %d\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "nie udało się odgadnąć początkowej wartości CRC\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -264,290 +266,301 @@
 "uwaga: nie sprawdzono CRC (dodać długość %d, wartość 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Tryb kompatybilności"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniaturka"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Pełny obraz"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Żarówka"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofocus: jedno zdjęcie"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofocus: serwo AI"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Autofocus: ogniskowa AI"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Ręczna ogniskowa"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Piszczyk wyłączony"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Piszczyk włączony"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Flesz wyłączony"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Flesz włączony"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Flesz automatyczny"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Ręczny 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Scena daleka"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Szybka migawka"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Wolna migawka"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Scena nocna"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Skala szarości"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepia"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Portret"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "Cz/B"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "PanFocus"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Vivid"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Długa migawka"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Super makro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Roślinność"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Wnętrze"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Fajerwerki"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Plaża"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Podwodne"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Śnieg"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Dzieci i zwierzęta"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Nocny widok"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Makro cyfrowe"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "Moje Kolory"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Zdjęcie w filmie"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Mały normalny JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Mały dobry JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Średni normalny JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Średni dobry JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Duży normalny JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Duży dobry JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + mały normalny JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + mały dobry JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + średni normalny JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + średni dobry JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + duży normalny JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + duży dobry JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -577,44 +590,44 @@
 "57600. Jeśli będzie występować dużo błędów transmisji szeregowej, należy\n"
 "spróbować możliwie najmniej obciążać komputer (bez pracy dysku).\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Aparat niedostępny: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Wyłączanie aparatu"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Błąd podczas pobierania obrazu"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Nie udało się uzyskać nazwy dysku: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Przyczyna niedostępna"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Nie udało się uzyskać informacji o dysku: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Błąd wewnętrzny #1 w get_file_func() (%s w linii %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Nie znaleziono pliku z dźwiękiem dla %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -625,35 +638,35 @@
 "  %11s bajtów w sumie\n"
 "  %11s bajtów dostępnych"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "zasilacz AC"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "na baterii"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "zasilanie w porządku"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "zasilanie nieprawidłowe"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "niedostępne: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (czas hosta %s%i sekund)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -680,7 +693,7 @@
 "\n"
 "Czas: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -703,26 +716,26 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Błąd podczas usuwania pliku"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Błąd podczas usuwania powiązanego pliku miniaturki"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Prędkości większe niż 57600 nie są obsługiwane przy wczytywaniu danych do "
 "tego aparatu"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Nie udało się uzyskać litery dysku flash"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -730,376 +743,398 @@
 "Nie udało się przesłać danych do aparatu - brak wolnych nazw folderów!\n"
 "Istnieje nazwa folderu 999CANON i zawiera obrazek AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Nie udało się utworzyć katalogu \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Nie udało się utworzyć katalogu docelowego."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguracja aparatu i sterownika"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Ustawienia aparatu"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Nazwa właściciela"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Klasa rozmiaru zdjęcia"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Czułość ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Tryb robienia zdjęcia"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Prędkość migawki"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Powiększenie"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Przysłona"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Kompensacja ekspozycji"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Format zdjęć"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Tryb flesza"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Piszczyk"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Czynności aparatu"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Synchronizacja daty i czasu z PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Informacja o stanie aparatu"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Model aparatu"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Data i czas"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Błąd"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Wersja firmware'u"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Zasilanie"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Sterownik"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Wypisanie listy wszystkich plików"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Zachowywanie nazwy pliku przy przesyłaniu do aparatu"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Aparat niedostępny"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Nazwa właściciela zmieniona"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "nie udało się zmienić nazwy właściciela"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Zmieniono klasę rozmiaru zdjęcia"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Błędne ustawienie klasy rozmiaru zdjęcia"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Błędne ustawienie czułości ISO"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Zmieniono czułość ISO"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Nie udało się zmienić czułości ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Błędne ustawienie trybu robienia zdjęcia"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Zmieniono tryb robienia zdjęcia"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Nie udało się zmienić trybu robienia zdjęcia"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Błędne ustawienie prędkości migawki"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Zmieniono prędkość migawki"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Nie udało się zmienić prędkości migawki"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Błędne ustawienie przysłony"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Zmieniono przysłonę"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Nie udało się zmienić przysłony"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Błędne ustawienie kompensacji ekspozycji"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Kompensacja ekspozycji zmieniona"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Nie udało się zmienić kompensacji ekspozycji"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Błędne ustawienie formatu zdjęć"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Format zdjęć zmieniony"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Nie udało się zmienić formatu zdjęć"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Błędne ustawienie trybu ogniskowania"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Zmieniono tryb ogniskowania"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Nie udało się zmienić trybu ogniskowania"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Błędne ustawienie trybu piszczyka"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Zmieniono tryb piszczyka"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Nie udało się zmienić trybu piszczyka"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Zmieniono stopień powiększenia"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Nie udało się zmienić stopnia powiększenia"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Błędne ustawienie trybu flesza"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Zmieniono tryb flesza"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Nie udało się zmienić trybu flesza"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "czas ustawiony"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "nie udało się ustawić czasu"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
-"Podano nieobsługiwany rodzaj portu %i = 0x%x. Inicjalizacja niemożliwa."
+"Podano nie obsługiwany rodzaj portu %i = 0x%x. Inicjalizacja niemożliwa."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Bateria wyczerpana, aparat wyłączony."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "BŁĄD: nieoczekiwany komunikat"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "BŁĄD: przepełnienie komunikatu"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "BŁĄD: utrata kolejności."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "BŁĄD: nieoczekiwany rodzaj pakietu."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "BŁĄD: błąd formatu komunikatu."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "BŁĄD: nieoczekiwany komunikat2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Przesyłanie pliku do aparatu..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Pobieranie pliku..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1107,7 +1142,7 @@
 "canon_serial_get_dirents: w canon_serial_dialogue nie udało się pobrać "
 "wpisów katalogu"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1115,141 +1150,141 @@
 "canon_serial_get_dirents: Początkowy pakiet dirent zbyt krótki (tylko %i "
 "bajtów)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Nie udało się przydzielić %i bajtów pamięci"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: Nie udało się odczytać kolejnego wpisu katalogu"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Odebrano ucięty wpis katalogu"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: Zbyt dużo wpisów dirent, musi być pętla."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Nie udało się zmienić rozmiaru bufora dirent na %i "
 "bajtów"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Błąd podczas zmiany prędkości."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Resetowanie protokołu..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Aparat w porządku."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Szukanie aparatu..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Próba kontaktu z aparatem..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Błąd komunikacji 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Brak odpowiedzi od aparatu"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Nierozpoznana odpowiedź"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Wykryto \"%s\" czyli \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Nieznany model \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Zły EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Błąd komunikacji 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Błąd komunikacji 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Zmiana prędkości... oczekiwanie..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Błąd podczas zmiany prędkości"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Błąd podczas oczekiwania na ACK przy inicjalizacji, ponowna próba"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Błąd podczas oczekiwania na ACK przy inicjalizacji"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Połączono z aparatem"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "BŁĄD: wykryto błąd krytyczny, nie można kontynuować"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "BŁĄD: %d to za dużo"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Pobieranie miniaturki..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "NIE ROZPOZNANO"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Nie udało się ustanowić początkowego połączenia z aparatem"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Aparat już był aktywny"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Aparat został obudzony"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Nierozpoznana początkowa odpowiedź aparatu '%c'"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1258,7 +1293,7 @@
 "Krok #2 inicjalizacji nie powiódł się: (\"%s\" przy odczycie %i) Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1267,7 +1302,7 @@
 "Krok #2 inicjalizacji nie powiódł się! (zwrócono %i bajtów, oczekiwano %i). "
 "Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1276,7 +1311,7 @@
 "Krok #3 inicjalizacji nie powiódł się: \"%s\" przy odczycie %i. Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1285,7 +1320,7 @@
 "Krok #3 inicjalizacji nie powiódł się! (zwrócono %i, oczekiwano %i). Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1294,46 +1329,46 @@
 "Krok #3 inicjalizacji nie powiódł się: \"%s\" przy zapisie %i. Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Krok #4 nie powiódł się: \"%s\" przy odczycie %i. Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Krok #4 nie powiódł się (zwrócono %i, oczekiwano %i). Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
-"Aparat nie gotowy, wielokrotne żądania 'Identify camera' nie powiodły się: %s"
+"Aparat niegotowy, wielokrotne żądania 'Identify camera' nie powiodły się: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
-msgstr "Aparat nie gotowy, get_battery nie powiodło się: %s"
+msgstr "Aparat niegotowy, get_battery nie powiodło się: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
-"canon_usb_lock_keys: Nieoczekiwana długość zwrócona z funkcji \"lock keys"
-"\" (%i bajtów, oczekiwano %i)"
+"canon_usb_lock_keys: Nieoczekiwana długość zwrócona z funkcji \"lock "
+"keys\" (%i bajtów, oczekiwano %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Zwrócona nieoczekiwana długość (%i bajtów, oczekiwano "
 "%i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1341,7 +1376,7 @@
 "canon_usb_unlock_keys: Zwrócona nieoczekiwana długość (%i bajtów, oczekiwano "
 "%i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1350,20 +1385,20 @@
 "canon_usb_get_body_id: Zwrócona nieoczekiwana długość danych (%i bajtów, "
 "oczekiwano %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Odbieranie danych..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Brak pamięci: potrzeba %d bajtów."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue nie powiodło się"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1372,22 +1407,22 @@
 "Ostrzeżenie w canon_usb_set_file_attributes: canon_usb_dialogue zwróciło "
 "status błędu 0x%08x z aparatu"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Nie udało się odczytać z pliku \"%s\""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Brak pamięci: potrzeba %ld bajtów."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Przesłanie pliku do aparatu nie powiodło się."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1395,7 +1430,7 @@
 "Plik był zbyt duży. Może zajść potrzeba wyłączenia i włączenia aparatu przed "
 "przesyłaniem kolejnych plików."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1404,7 +1439,7 @@
 "canon_usb_get_dirents: Nie udało się zmieścić danych do bufora, "
 "'%.96s' (obcięte) zbyt długie."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1413,7 +1448,7 @@
 "canon_usb_get_dirents: w canon_usb_long_dialogue nie powiodło się pobranie "
 "wpisów katalogu, zwrócono %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1422,7 +1457,7 @@
 "canon_usb_list_all_dirs: Nie udało się zmieścić danych do bufora, "
 "'%.96s' (obcięte) zbyt długie."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1431,27 +1466,27 @@
 "canon_usb_list_all_dirs: w canon_usb_long_dialogue nie powiodło się pobranie "
 "wpisów katalogu, zwrócono %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Wykryto '%s'."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Nazwa \"%s\" z aparatu nie pasuje do żadnego znanego aparatu"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Typ obrazu %d nie jest obsługiwany"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Obraz %s jest zabezpieczony przed usunięciem."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1464,37 +1499,37 @@
 "<itojun@itojun.org>.\n"
 "Integracji QVplaya dokonał Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Poziom baterii: %.1f woltów. Wersja: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Konfiguracja aparatu"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Bateria"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Jasność"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Zbyt jasno"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Zbyt ciemno"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1595,16 +1630,16 @@
 "ogólny sterownik sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Typ obrazu nie jest obsługiwany"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Liczba zdjęć: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1612,31 +1647,31 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
 msgstr ""
 "Tylko główny folder jest obsługiwany - żądano listy plików dla folderu '%s'."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problem przy pobieraniu liczby zdjęć"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problem przy pobieraniu informacji o obrazie"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Typ ściągania nie jest obsługiwany"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (bateria jest w %d%% pełna)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1653,82 +1688,83 @@
 "Rozdzielczość jest ustawiona na %s.\n"
 "Aparat jest zasilany %s%s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Flesz"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Bez flesza"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dual Iris"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Bez Dual Iris"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Przełącznik rozdzielczości"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Bez przełącznika rozdzielczości"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Bez wskaźnika zasilania"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "WŁĄCZONY"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "WYŁĄCZONY"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "gotowy"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
-msgstr "Nie gotowy"
+msgstr "Niegotowy"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "w trybie wypełniającym"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Nie w trybie wypełniającym"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "niską (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "wysoką (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "zewnętrznie"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "wewnętrznie"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1746,7 +1782,7 @@
 "   konfigurowane ręcznie lub ustawione w trybie automatycznym.\n"
 " * Jakość obrazu jest teraz niższa niż mogłaby być.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1775,116 +1811,247 @@
 "     Informacje o protokole, format surowego obrazu,\n"
 "     port gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problem przy odczycie obrazu z pamięci flash"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Ściąganie obrazu..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problem przy ściąganiu obrazu"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Ściąganie przerwane przez użytkownika"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problem przy robieniu zdjęcia na żywo"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatyczne dostrajanie ekspozycji przy podglądzie"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Poziom ekspozycji przy podglądzie"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Automatyczny flesz przy robieniu zdjęcia"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problem przy otwieraniu portu"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problem przy resetowaniu aparatu"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problem przy ustawianiu prędkości komunikacji z aparatem"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Wygląda jak modem, a nie aparat"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Pobieranie listy plików w '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Pobieranie listy folderów w '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Nie udało się uzyskać informacji o '%s' (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Nie udało się uzyskać informacji o '%s' w '%s' (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Nie udało się zmienić czasu pliku '%s' w '%s' (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Nie udało się otworzyć '%s'."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Przeglądanie katalogu \"aparat\" pozwala indeksować zdjęcia na twardym dysku."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Tryb przeglądania katalogu - napisał Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Nie udało się usunąć pliku '%s' w folderze '%s' (kod błędu %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+msgid "Scanner Profile Configuration"
+msgstr "Konfiguracja profilu skanera"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+msgid "Mono mode"
+msgstr "Tryb monochromatyczny"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr "Głębia"
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr "Mono (cz/b)"
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr "Szarości (4bpp)"
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr "Szarości (8bpp)"
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+msgid "Lo Resolution"
+msgstr "Rozdzielczość niska"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr "100 DPI"
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr "200 DPI"
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+msgid "Hi Resolution"
+msgstr "Rozdzielczość wysoka"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr "400 DPI"
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+msgid "Color Document mode"
+msgstr "Tryb dokumentu kolorowego"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr "NQ (12bpp)"
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+msgid "Color Photo mode"
+msgstr "Tryb zdjęcia kolorowego"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr "HQ (24bpp)"
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+"Skaner Docupen nie potrafi pobierać/usuwać poszczególnych stron, jedynie\n"
+"wszystko naraz. Aby to obejść, tworzony jest plik pamięci podręcznej, w "
+"którym\n"
+"przechowywana jest kopia pamięci skanera. Wypełnienie jej jest wyzwalane "
+"przez\n"
+"pobranie dowolnego obrazu - więc pobieranie pierwszego obrazu potrwa długo,\n"
+"jeśli pamięć podręczna jest pusta lub unieważniona. Pamięć podręczna jest\n"
+"unieważniana automatycznie, jeśli jej rozmiar nie zgadza się z ilością "
+"użytej\n"
+"pamięci zgłaszanej przez skaner.\n"
+"Plik pamięci podręcznej mieści się w ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"Skaner ma bardzo krótki limit czasu automatycznego wyłączania zasilania -\n"
+"tylko 8 sekund - i obowiązuje on nawet podczas połączenia USB. Trzeba "
+"włączać\n"
+"go przed każdą operacją gphoto2. W niektórych sytuacjach może być potrzeba\n"
+"zapobiegnięcia wyłączeniu poprzez wciskanie któregokolwiek przycisku."
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+"Biblioteka skanera DocuPen RC800\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"w oparciu o narzędzia Docupen, których autorem jest Florian Heinz <fh@cronon-"
+"ag.de>"
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -1895,90 +2062,90 @@
 "Podziękowania dla załogi spca50x, łatwo było sportować wasz sterownik do "
 "tego aparatu! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Aparat wysłał tylko %i bajt(ów), ale potrzeba co najmniej %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Nie udało się skontaktować z aparatem"
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Odebrano nieoczekiwane dane (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Niewłaściwa sekwencja sterująca: oczekiwano 0x%02x, otrzymano 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Złe dane - otrzymano 0x%02x, oczekiwano 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Złe dane - otrzymano 0x%02x, oczekiwano 0x%02x lub 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Zła suma kontrolna - otrzymano 0x%02x, oczekiwano 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Aparat odrzucił polecenie."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Aparat zresetował się."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Aparat wysłał nieoczekiwany bajt 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Ściąganie..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Nie udało się przydzielić %i bajt(ów) do ściągnięcia miniaturki."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Nie udało się przydzielić %i bajt(ów) do ściągnięcia obrazu."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Aparat nie przyjął '%s' jako nazwy pliku."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
 "Nie udało się rozpocząć przesyłania do aparatu (aparat odpowiedział 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Aparat nie obsługuje prędkości %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Nie udało się ustawić prędkości %i (aparat odpowiedział %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1987,36 +2154,36 @@
 "Oparty o fujiplay, który napisał Thierry Bousch <bousch@topo.math.u-psud."
 "fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Prędkość %ld nie jest obsługiwana."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Konfiguracja aparatu FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Wersja: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Model: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Dostępna pamięć: "
 
@@ -2038,18 +2205,18 @@
 "udostępnionej przez Musteka.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
-"Nieobsługiwany rodzaj portu: %d. Ten sterownik działa tylko z aparatami "
+"Nie obsługiwany rodzaj portu: %d. Ten sterownik działa tylko z aparatami "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Nie udało się zresetować aparatu.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2058,7 +2225,7 @@
 "Ten aparat obsługuje tylko usuwanie ostatniego pliku z aparatu. W tym "
 "przypadku tym plikiem jest '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2073,7 +2240,7 @@
 "Wolnych obrazów na karcie: %d\n"
 "Poziom baterii: %d%%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2126,25 +2293,25 @@
 "Sterownik iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Wykonanych klatek: %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "biblioteka jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Ściąganie danych..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Ściąganie miniaturki..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2160,7 +2327,7 @@
 "   - miniaturek (64x48 w formacie PGM)\n"
 "   - pełnych obrazów (640x480 w formacie PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2172,31 +2339,31 @@
 "Sterownik dla aparatów Jenoptik JD11.\n"
 "Protokół wstecznie rozpracowany przy użyciu WINE i IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Konfiguracja JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Inne ustawienia"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Czas ekspozycji żarówki"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Ustawienia kolorów"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Czerwień"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Zieleń"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Błękit"
 
@@ -2270,11 +2437,11 @@
 "Biblioteka dla aparatów jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Karta CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2285,7 +2452,7 @@
 "oglądać obrazy ściągnięte z aparatu, potrzebny jest program \"kdc2tiff\". "
 "Jest on dostępny pod http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2296,13 +2463,13 @@
 "Scott Fritzinger <scottf@gphoto.net>\n"
 "(na ogólne zapotrzebowanie)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Pobieranie danych..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Oczekiwanie na zakończenie..."
 
@@ -2315,7 +2482,8 @@
 msgstr "Rodzaj pliku"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2328,7 +2496,7 @@
 msgstr "Rozdzielczość pliku"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2352,8 +2520,9 @@
 msgid "High (good quality)"
 msgstr "Wysoka (dobra jakość)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Zdjęcia"
 
@@ -2382,77 +2551,84 @@
 msgstr "Kompensacja ekspozycji"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Wymuszenie"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Brak"
 
@@ -2461,71 +2637,78 @@
 msgstr "Flesz z redukcją czerwonych oczu"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Włączono"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Wyłączono"
 
@@ -2541,7 +2724,7 @@
 msgid "Port speed"
 msgstr "Prędkość portu"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Nazwa albumu"
 
@@ -2760,58 +2943,58 @@
 "Biblioteka dla aparatów Kodak DC215.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parametr 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parametr 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parametr 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Model: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Wersja firmware'u: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Stan baterii: %s, zasilacz AC: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Liczba zdjęć: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Pozostałe miejsce: wysoka: %d, średnia: %d, niska: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Stan karty pamięci (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "W sumie wykonano zdjęć: %d, flesza użyto razy: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2825,45 +3008,46 @@
 "Biblioteka dla aparatów Kodak DC240, DC280, DC3400 i DC5000.\n"
 "Przepisano i uaktualniono dla gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Słabe"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Puste"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Nieprawidłowy"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Nie używany"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Używany"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Karta otwarta"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Karta nie otwarta"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Karta nie sformatowana"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Brak karty"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2871,12 +3055,12 @@
 "Aktualnie wykonuje się jakaś operacja. Ten aparat obsługuje tylko jedną "
 "operację w danej chwili. Proszę poczekać na zakończenie bieżącej operacji."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "aparat nieaktywny przez > 9 sekund, ponowna inicjalizacja.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2892,7 +3076,7 @@
 "aparat nie będzie odpowiadał, wystarczy ponownie wybrać aparat - spowoduje "
 "to ponowną inicjalizację."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2904,7 +3088,7 @@
 "\n"
 "Pytania i komentarze mile widziane."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2913,7 +3097,7 @@
 "Aparat USB to Kodak EZ200.\n"
 "Liczba zdjęć = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2921,107 +3105,107 @@
 "Sterownik Kodak EZ200\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Błąd ogniskowania."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Błąd Iris."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Błąd bramki."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Błąd sumy kontrolnej EEPROM-u."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Błąd wewnętrzny (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Błąd wewnętrzny (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Karta nie włożona."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Karta nie obsługiwana."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Karta usunięta podczas dostępu."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Liczba obrazów nieprawidłowa."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Zapis na kartę niemożliwy."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Karta jest zabezpieczona przed zapisem."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Nie ma miejsca na karcie."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Obraz zabezpieczony."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Oświetlenie zbyt ciemne."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Błąd autofocusu."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Błąd systemowy."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Niedozwolony parametr."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Polecenie nie może być przerwane."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Dane lokalizacyjne zbyt długie."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Dane lokalizacyjne uszkodzone."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
-msgstr "Nieobsługiwane polecenie."
+msgstr "Nie obsługiwane polecenie."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Wykonywane jest inne polecenie."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Błąd kolejności poleceń."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3032,15 +3216,15 @@
 "następujący raport na adres %s z dodatkowymi informacjami jak uzyskano ten "
 "błąd: (0x%x,0x%x). Z góry dziękuję!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Pobieranie listy plików..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Testowanie różnych prędkości..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3048,12 +3232,12 @@
 "Nie udało się skontaktować z aparatem. Proszę upewnić się, że jest "
 "podłączony do komputera i włączony."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i obrazów nie udało się usunąć ponieważ są zabezpieczone"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3072,7 +3256,7 @@
 "Nazwa: %s,\n"
 "Producent: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3082,400 +3266,409 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Obsługa wszystkich aparatów Konica i niektórych HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Pobieranie konfiguracji..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konfiguracja Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Ustawienia zachowywane"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Czy aparat ma piszczeć przy robieniu zdjęcia?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Czas samowyzwalacza"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Czas automatycznego wyłączania"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Odstęp między pokazywanymi slajdami"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Niska (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Średnia (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Wysoka (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Lokalizacja"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Język"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Nie wybrano"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Format wyjścia TV"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Nie wyświetlanie menu TV"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Format daty"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Miesiąc/Dzień/Rok"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Dzień/Miesiąc/Rok"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Rok/Miesiąc/Dzień"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Ustawienia stałe dla sesji"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Włączony, redukcja czerwonych oczu"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Automatyczny, redukcja czerwonych oczu"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Ogniskowa"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Stała"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Ustawienia ulotne"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Samowyzwalacz"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Samowyzwalacz (tylko dla następnego zdjęcia)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Zwykły"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Nie udało się odnaleźć danych lokalizacji pod '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Plik lokalizacji zbyt długi!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Ten podgląd nie istnieje."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Dane zostały uszkodzone."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr "Skompilowano bez obsługi EXIF, miniaturki niedostępne."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Typ obrazu %d nie jest obsługiwany przez ten aparat!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Nie można usunąć obrazu %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Nie można usunąć wszystkich obrazów."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Przesyłanie obrazu do aparatu..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Nie można przesłać tego obrazu do aparatu. Wystąpił błąd."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Do wykonywania zdjęć musi być włączony tryb nagrywania."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Brak wolnego miejsca aby zrobić nowe zdjęcie. Trzeba usunąć trochę obrazów."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Nie można zrobić zdjęcia. Nieznany błąd"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Brak odpowiedzi od aparatu."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Niska"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Średnia"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Wysoka"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikony"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Balans bieli"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Biuro"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Światło dzienne"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Ostrość"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Ostra"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Miękka"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Kolor"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Jasny"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Głęboki"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Czarno-biały"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Pojedyncze"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Sekwencja 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Wyświetlanie daty"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Nigdy"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "W trybie odtwarzania"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "W trybie nagrywania"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Zawsze"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Odtwarzanie"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Nagrywanie"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/RRRR"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "RRRR/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/RRRR"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3496,7 +3689,7 @@
 "Wyświetlanie daty: %s\n"
 "Data i czas: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3511,7 +3704,7 @@
 "http://www.ap2c.com\n"
 "Obsługa francuskich aparatów Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3530,7 +3723,7 @@
 "W przypadku problemów z tym sterownikiem proszę pisać\n"
 "na adres autorów tego sterownika.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3538,7 +3731,7 @@
 "Sterownik Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3549,7 +3742,7 @@
 "Firmware: %s\n"
 "Wersja firmware'u: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3557,7 +3750,94 @@
 "Ogólny sterownik LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+msgid "Lumix Configuration"
+msgstr "Konfiguracja Lumix"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr "Zegar"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr "Prędkość migawki"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Jakość"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Jakość filmu"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Film"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Tryb autofocus"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr "Rozmiar Liveview"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr "Nazwa urządzenia"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr "Asysta MF"
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr "Powiększenie asysty MF"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr "Ex Teleconv"
+
+#: camlibs/lumix/lumix.c:1217
+msgid "Lens"
+msgstr "Obiektyw"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr "Zdolność"
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr "Całość menu"
+
+#: camlibs/lumix/lumix.c:1244
+msgid "Cur Menu"
+msgstr "Obecne menu"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+"Biblioteka Lumix WiFi\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Łączy się z aparatami Lumix po WiFi\n"
+"przy użyciu poleceń HTTP GET."
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3575,7 +3855,7 @@
 "Aparat Mars MR97310.\n"
 "Zawiera %i zdjęć.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3600,7 +3880,7 @@
 "jako kolejne nieruchome zdjęcia.\n"
 "Więcej szczegółów można znaleźć w libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3608,7 +3888,7 @@
 "Biblioteka dla aparatów Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3619,7 +3899,7 @@
 "Wersja sprzętu:\t%s\n"
 "Wersja firmware'u:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3646,61 +3926,63 @@
 "ID karty:                      %d\n"
 "Tryb flesza:                   "
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Zdalny"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokalny"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Tak"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nie"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Dobra"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Normalna"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Auto\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Wymuszenie flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Zakazanie flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Niepoprawna wartość (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3717,74 +3999,74 @@
 "Ładowanie flesza:              %s\n"
 "Stan obiektywu:                "
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Niepełne"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Pełne"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Zajęty"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Wolny"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Ładowany"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Gotowy"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normalny\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Kierunek obiektywu nie zgadza się ze światłem flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Obiektyw nie podłączony\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Zła wartość stanu obiektywu %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Stan karty:                    "
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Zabezpieczona przed zapisem"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Niepasująca"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Zła wartość stanu karty %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3797,63 +4079,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Specjalne podziękowania dla Minolty za specyfikację."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Flesz : Auto (redukcja czerwonych oczu)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Flesz : Auto"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Flesz : Włączony (redukcja czerwonych oczu)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Flesz : Włączony"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Flesz : Wyłączony"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Flesz : nieokreślony"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Opis aparatu Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "stan nie zgłoszony."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Wykryto kartę Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Nie wykryto karty Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Bieżący tryb: tryb aparatu\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Bieżący tryb: tryb odtwarzania\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Baterie są w porządku."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Baterie są na wyczerpaniu"
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3865,25 +4147,25 @@
 "Do gphoto2 sportował Marcus Meissner <marcus@jet.franken.de>\n"
 "Obsługuje protokół szeregowy i USB."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "biblioteka coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Odłączanie aparatu."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Ściąganie obrazu %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Przesyłanie obrazu do aparatu: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3892,17 +4174,17 @@
 "Rozmiar pliku to %ld bajtów. Rozmiar największego możliwego pliku, jaki da "
 "się przesłać to %i bajtów."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Przesyłanie..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Usuwanie obrazu %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3918,12 +4200,12 @@
 "Fredrik Roubert <roubert@df.lth.se>\n"
 "i Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Ściąganie %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3939,12 +4221,12 @@
 "Fredrik Roubert <roubert@df.lth.se>\n"
 "i Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Ściąganie '%s'..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3964,7 +4246,7 @@
 "(320x240) i FINE (640x480). Urządzenie CCD odczytujące obraz z obiektywu ma "
 "tylko 300K punktów, więc jest w stanie tworzyć tylko zdjęcia niskiej jakości."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3980,7 +4262,7 @@
 "zwłaszcza jeśli wystąpi problem, a aparat nie zostanie właściwie wyłączony "
 "przy prędkościach większych niż 9600."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3988,7 +4270,7 @@
 "Sterownik do urządzeń Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3999,7 +4281,7 @@
 " Wolna pamięć to     %8d bajtów.\n"
 " Liczba plików: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4013,11 +4295,11 @@
 "i Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Ściąganie pliku..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4025,32 +4307,136 @@
 "Creative PC-CAM600\n"
 "Autor: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Oczekiwano > %d bloków, otrzymano %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: otrzymano indeks %d, ale oczekiwano > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: zwrócono wartość %d zamiast %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Oczekiwano %d bloków, otrzymano %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr "pccam600 init: Nieoczekiwany błąd: gp_port_read zwróciło %d zamiast %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+"Sterownik zdjęć Pentax K DSLR.\n"
+"Wykorzystuje kod z pktriggercord, którego autorem jest Andras Salamon.\n"
+"Zebrane informacje o stanie:\n"
+"%s"
+
+#: camlibs/pentax/library.c:634
+msgid "Model"
+msgstr "Model"
+
+#: camlibs/pentax/library.c:651
+#, c-format
+msgid "Unknown format %d"
+msgstr "Nieznany format %d"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Rozmiar obrazu"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Jakość obrazu"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Przysłona przy minimalnej ogniskowej obiektywu"
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Przysłna przy maksymalnej ogniskowej obiektywu"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Tryb robienia zdjęcia"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr "ZIELONY"
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr "SV"
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr "TAV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr "B"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr "X"
+
+#: camlibs/pentax/library.c:788
+#, c-format
+msgid "Unknown mode %d"
+msgstr "Nieznany tryb %d"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+"Do ekspozycji ręcznej konieczne jest przestawienie trybu zdjęć lub aparatu "
+"na 'B'."
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4064,12 +4450,12 @@
 "<lutz@users.sf.net>.\n"
 "Testowanie Polaroida 640SE wykonał Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Model: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4083,110 +4469,98 @@
 "aparatów Jenoptik JD350e napisał Michael Trawny <trawny99@users.sourceforge."
 "net>. Poprawek błędów dokonał Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Jakość obrazu"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Rozmiar obrazu"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Ustawienie flesza"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automatyczne wyłączanie (w minutach)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Informacje"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normalna"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "dobra"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "bardzo dobra"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "włączono"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "wyłączono"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "odtwarzanie"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "nagrywanie"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "menu"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "bateria"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "zasilacz AC"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Odebrano nieoczekiwany nagłówek (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Odebrano nieoczekiwaną odpowiedź"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Błąd sumy kontrolnej"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Aparat nie przyjął polecenia."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Aparat wysłał więcej bajtów niż oczekiwano (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4195,7 +4569,7 @@
 "Żądano informacji o zdjęciu %i (= 0x%x), ale otrzymano informacje o zdjęciu "
 "%i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4204,7 +4578,7 @@
 "Odebrano %i bajtów w nieznanym formacie obrazu. Proszę napisać pod %s z "
 "prośbą o pomoc."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4214,19 +4588,20 @@
 "go Ryan Lantzer <rlantzer@umr.edu> dla gphoto-4.x. Do gphoto2 zaadaptował "
 "Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Aparat"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Jak długo aparat ma czekać przed wyłączeniem?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Obraz"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4259,3469 +4634,5341 @@
 "Automatyczne wyłączanie: %i minut\n"
 "Źródło zasilania: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Żądany rodzaj portu (%i) nie jest obsługiwany przez ten sterownik."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr "Silnik lua CHDK zgłasza błąd: %s"
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+"Sterownik PTP2 / CHDK\n"
+"(c) 2015-%d Marcus Meissner <marcus@jet.franken.de>.\n"
+"Jest to podsterownik PTP, obsługujący CHDK przy użyciu aparatów Canon.\n"
+"\n"
+"Udanej zabawy!"
+
+#: camlibs/ptp2/chdk.c:489
+#, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "CHDK %d.%d Stan:\n"
+
+#: camlibs/ptp2/chdk.c:492
+#, c-format
+msgid "Mode: %d\n"
+msgstr "Tryb: %d\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr "SV96: %d, ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "TV96: %d, prędkość migawki: %f\n"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr "AV96: %d, przysłona: %f\n"
+
+#: camlibs/ptp2/chdk.c:500
+#, c-format
+msgid "Focus: %d\n"
+msgstr "Ogniskowa: %d\n"
+
+#: camlibs/ptp2/chdk.c:502
+#, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Tryb ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, c-format
+msgid "Zoom: %d\n"
+msgstr "Powiększenie: %d\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Temperatura optyczna: %d\n"
+
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Temperatura CCD: %d\n"
+
+#: camlibs/ptp2/chdk.c:511
+#, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Temperatura baterii: %d\n"
+
+#: camlibs/ptp2/chdk.c:514
+#, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Tryb flesza: %d\n"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr "Surowe ISO"
+
+#: camlibs/ptp2/chdk.c:1031
+msgid "Press"
+msgstr "Wciśnięcie"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Zwolnienie"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr "Klikanie"
+
+#: camlibs/ptp2/chdk.c:1034
+msgid "Capture Mode"
+msgstr "Tryb zdjęć"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Blokada AE"
+
+#: camlibs/ptp2/chdk.c:1036
+msgid "AF Lock"
+msgstr "Blokada AF"
+
+#: camlibs/ptp2/chdk.c:1037
+msgid "MF Lock"
+msgstr "Blokada MF"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientacja"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Ustawienia obrazu"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr "Pobieranie danych na żywo w CHDK nie powiodło się"
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+"Pobieranie danych na żywo w CHDK nie powiodło się: zwrócono niekompletne "
+"dane (%d B)"
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK nie opuścił trybu nagrywania."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Niestety ten aparat Canon nie obsługuje funkcji Canon capture"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Nieznana wartość %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Nieznana wartość %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "nieoczekiwany typ danych %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Wartość docelowa spoza zbioru."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr "Obecna wartość spoza zbioru."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 "Urządzenie Sony nie było w stanie ustawić na nową wartość, czy jest ona "
 "poprawna?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Ręczny"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Automatyczny One-push"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Światło fluorescencyjne"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Żarówka wolframowa"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Pochmurno"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Cień"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Temperatura koloru"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Predefiniowany"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Światło naturalne - automatyczny"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Światło fluorescencyjne 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Światło fluorescencyjne 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Światło fluorescencyjne 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Światło fluorescencyjne 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Światło fluorescencyjne 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Wybór temperatury koloru"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Własna predefiniowana 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Własna predefiniowana 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Własna predefiniowana 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Własna predefiniowana 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Własna predefiniowana 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Fluorescencyjne: ciepła biel"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Fluorescencyjne: zimna biel"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Fluorescencyjne: dzienna biel 1"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Fluorescencyjne: światło dzienne"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Predefiniowany 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Predefiniowany 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Predefiniowany 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Podwodne: Auto"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Żarówka wolframowa 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Fluorescencyjne: biel"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Fluorescencyjne: wolfram"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Predefiniowany 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Własne"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "Dobry JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "Normalny JPEG"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + JPEG dobrej jakości"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + JPEG normalnej jakości"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Duży dobry JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Duży normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Średni normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Mały normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Pojedyncza klatka"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Ciągły o małej szybkości"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Ciągły o dużej szybkości"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Samowyzwalacz"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Lustro podniesione"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr "PROVIA/Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr "Velvia/Vivid"
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr "ASTIA/Soft"
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr "PRO Neg.Hi"
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr "PRO Neg.Std"
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Czerń i biel"
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr "Czerń i biel+filtr Ye"
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr "Czerń i biel+filtr R"
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr "Czerń i biel+filtr G"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr "Klasyczny Chrome"
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr "ACROS"
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr "ACROS+filtr Ye"
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr "ACROS+filtr R"
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr "ACROS+filtr G"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr "ETERNA/Cinema"
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr "Klasyczny negatyw"
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr "ETERNA BLEACH BYPASS"
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr "USB"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "nieokreślony"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "ekonomiczny"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "bezstratny"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Własne"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Blokada"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Nocny portret"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sporty"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Pejzaż"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Zbliżenie"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Flesz wyłączony"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr "C2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr "C3"
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr "Twórczy automatyczny"
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr "Scena nocna z ręki"
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr "Sterowanie podświetleniem HDR"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr "SCN"
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Jedzenie"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr "Ziarniste cz/b"
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr "Miękka ostrość"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr "Efekt aparatu-zabawki"
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr "Efekt rybiego oka"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr "Efekt akwareli"
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Efekt miniatury"
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr "Sztuka HDR standardowa"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr "Sztuka HDR jaskrawa"
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr "Sztuka HDR uwyraźniona"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr "Sztuka HDR uwypuklona"
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr "Panning"
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr "HDR"
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr "Autoportret"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr "Automatyczny hybrydowy"
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr "Gładka skóra"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr "Fv"
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Standardowa (wyłączona przy ręcznej ekspozycji)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Niska (wyłączona przy ręcznej ekspozycji)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Wyłączona (wyłączona przy ręcznej ekspozycji)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Wysoka (wyłączona przy ręcznej ekspozycji)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "wypełniający"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "automatyczny, redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "włączony, redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Commander"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Powtarzalny"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Przysłona automatyczna"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Całkowicie ręczny"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr "QVGA"
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr "VGA"
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr "XGA"
+
+#: camlibs/ptp2/config.c:2174
+msgid "Application"
+msgstr "Aplikacja"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Duży"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Mały"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (stała)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (wybór)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "centralnie ważony"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Średnia"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Szacowany"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Częściowy"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Średnia centralnie ważona"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Pomiar punktowy powiązany z ramką AF"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Wielopunktowy"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Dokładny"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monochromatyczny"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Dobre szczegóły"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Zdefiniowany przez użytkownika 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Zdefiniowany przez użytkownika 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Zdefiniowany przez użytkownika 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Punkt ogniskowania tylko pośrodku, ręczny"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Punkt ogniskowania tylko pośrodku, automatyczny"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Wiele punktów ogniskowania (bez określenia), ręczny"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Wiele punktów ogniskowania, automatyczny"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Wiele punktów ogniskowania (prawo)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Wiele punktów ogniskowania (środek)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Wiele punktów ogniskowania (lewo)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Duży"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Średni 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Średni 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Średni 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Mały"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 sekund"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 sekundy"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Ustawienie 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Ustawienie 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Ustawienie 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Ustawienie 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "mobilne"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT + mobilne"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC + mobilne"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC + mobilne"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "mobilne 2"
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT + mobilne 2"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC + mobilne 2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC + mobilne 2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+#, fuzzy
+msgid "LiveMulti"
+msgstr "Wiele"
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Punkt AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Karta"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Wyjście obrazu"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Nieznany %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Ustawienie fabryczne"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Automatyczne ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRAW"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Mniejszy JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Malutki JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + duży dobry JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + duży dobry JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRAW + duży dobry JPEG"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + średni dobry JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + średni dobry JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRAW + średni dobry JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + mały dobry JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + mały dobry JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRAW + mały dobry JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + duży normalny JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + duży normalny JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRAW + duży normalny JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + średni normalny JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + średni normalny JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRAW + średni normalny JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + mały normalny JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + mały normalny JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRAW + mały normalny JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + mniejszy JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + mniejszy JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + mniejszy JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "cRAW + mniejszy JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + malutki JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + malutki JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + malutki JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Mały normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Średni 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Średni 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Duży dobry JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Mały normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Średni 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Średni 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Duży dobry JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Duży dobry JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Średni 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Średni 2"
+
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Mały normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Duży dobry JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Średni 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Średni 2"
+
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Mały normalny JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Ciągła"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr "Obraz"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr "Pojedyncze: ciche zdjęcie"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Samowyzwalacz ciągły"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Samowyzwalacz 10 s"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Samowyzwalacz 2 s"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr "Ciągłe zdjęcia z bardzo dużą szybkością"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Pojedyncze ciche"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Ciągłe ciche"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Automatyczne ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr "Ciągły cichy HS"
+
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr "Ciągły cichy LS"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Wieloklatkowa redukcja szumów przy auto ISO"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Aby działał tryb bulb, pokrętło trybu musi być przełączone na 'M', a "
+"szybkość migawki na 'bulb'"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "Wieloklatkowa redukcja szumów %d"
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr "Strzał"
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr "Lampa włączona"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr "Lampa wyłączona"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr "AF"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr "Anulowanie AF"
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Fuji Capture nie powiodło się: może brak auto-focusu?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 punktów (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 punktów (3D)"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 punktów (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 punktów (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Wieloklatkowa redukcja szumów"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Wieloklatkowa redukcja szumów przy auto ISO"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Czas"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Twórczy"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Akcja"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Nocny pejzaż"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Dzieci"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatyczny (bez flesza)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr "U3"
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Auto inteligentny"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Auto lepszy"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
-msgstr "Film"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr "Film (P)"
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr "Film (A)"
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr "Film (S)"
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr "Film (M)"
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr "Film (scena)"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Tele-zoom stały priorytet AE"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Przesuwana panorama"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Auto inteligentny bez flesza"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Akcja sportowa"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Wschód"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Scena nocna"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Z ręki o zmierzchu"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr "Zapobieganie rozmyciu ruchu"
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Efekt obrazu"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr "Zwolnienie/Przyspieszenie"
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Nocny pejzaż"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Impreza/wnętrze"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Plaża/śnieg"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Zmierzch"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Portret zwierzęcia"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Światło świecy"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Kwiecie"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Barwy jesieni"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Jedzenie"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Dziecko"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Zbliżenie"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Światło fluorescencyjne"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Woda"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr "1/3 EV"
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr "1/2 EV"
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr "2/3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Bardzo duża"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr "2 zdjęcia (zwykłe i poniżej)"
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr "2 zdjęcia (zwykłe i powyżej)"
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr "3 zdjęcia (zwykłe i 2 poniżej)"
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr "3 zdjęcia (zwykłe i 2 powyżej)"
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr "3 zdjęcia (zwykłe, poniżej i powyżej)"
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr "5 zdjęć (zwykłe, 2 poniżej i 2 powyżej)"
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr "7 zdjęć (zwykłe, 3 poniżej i 3 powyżej)"
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr "9 zdjęć (zwykłe, 4 poniżej i 4 powyżej)"
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr "0 zdjęć"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr "2 zdjęcia (brak -> ustawienie użytkownika)"
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr "3 zdjęcia (brak -> niski -> ustawienie użytkownika"
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr "4 zdjęcia (brak -> niski -> zwykły -> wysoki)"
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr "5 zdjęć (brak -> niski -> zwykły -> wysoki -> bardzo wysoki)"
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scena"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Efekty"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Światło tylne"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Wygładzanie"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Pochylenie-przesunięcie"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Wybór koloru"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Pojedyncze zdjęcie"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Seria"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Jednostka czasu"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Ciągła mała prędność"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Samowyzwalacz"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Lustro podniesione"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Pilot z szybką reakcją"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Pilot z opóźnieniem"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
-msgstr "Szybkie zwolnienie"
+msgstr "Ciche zwolnienie"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Ciągłe ciche zwolnienie"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Samowyzwalacz 2s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr "Samowyzwalacz 5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Samowyzwalacz 10s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Samowyzwalacz 10s, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Samowyzwalacz 10s, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Samowyzwalacz 5s, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Samowyzwalacz 5s, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Samowyzwalacz 2s, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Samowyzwalacz 2s, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr "Ciągła prędność wysoka+"
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr "Ciągła prędność średnia"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 0.3, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 0.3, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Kroki bracketingu C 0.3, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 0.5, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 0.5, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Kroki bracketingu C 0.5, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 0.7, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 0.7, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Kroki bracketingu C 0.7, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 1.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 1.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Kroki bracketingu C 1.0, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 2.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 2.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu C 3.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu C 3.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 0.3, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 0.3, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Kroki bracketingu S 0.3, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 0.5, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 0.3, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Kroki bracketingu S 0.3, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 0.7, 3 zdjęć"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 0.7, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Kroki bracketingu S 0.7, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 1.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 1.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Kroki bracketingu S 1.0, 9 zdjęć"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 2.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 2.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Kroki bracketingu S 3.0, 3 zdjęcia"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Kroki bracketingu S 3.0, 5 zdjęć"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Bracketing WB Lo"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr "Bracketing DRO Lo"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Bracketing WB Hi"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr "Bracketing DRO Hi"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Centralny punkt"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Wielopunktowy"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Pojedynczy obszar"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Najbliższy obiekt"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Dynamiczna grupa"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "AF dla pojedynczego obszaru"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "AF dla dynamicznego obszaru"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "AF dla dynamicznej grupy"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "AF dla dynamicznego obszaru z priorytetem najbliższego obiektu"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Obszar dynamiczny (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Obszar dynamiczny (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Obszar dynamiczny (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "Śledzenie 3D"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "AF dynamicznego obszaru (25 punktów)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "AF pojedynczego punktu"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "AF automatycznego obszaru"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "Śledzenie 3D"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "AF dynamicznego obszaru (72 punkty)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "AF dynamicznego obszaru (153 punkty)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "AF obszaru grupy"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "AF dynamicznego obszaru (9 punktów)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "AF przyszpilonego punktu"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "AF (S) szerokiego obszaru"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "AF (L) szerokiego obszaru"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "AF (S) szerokiego obszaru"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "AF (S) szerokiego obszaru"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (portret)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (natura)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Nieznana wartość 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Środek"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Góra"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Dół"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Lewo"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Prawo"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Szeroki"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "Środek"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Program elastyczny"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Program elastyczny"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Program elastyczny"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Centralnie ważony"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Wielopunktowy"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Centralny punkt"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Punkt+podświetlenia"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Punkt+cienie"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr "Wiele"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr "Średnia całego ekranu"
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr "Punkt standardowy"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr "Punkt duży"
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr "Podświetlenie"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Flesz automatyczny"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Flesz wypełniający"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Automatyczna redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Wypełniająca redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Synchronizacja zewnętrzna"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Automatyczna wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Synchronizacja tylnej migawki + wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Redukcja czerwonych oczu + wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Synchronizacja z pierwszą kurtyną"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Redukcja czerwonych oczu + wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Wolna synchronizacja z drugą kurtyną"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Synchronizacja z drugą kurtyną"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Synchronizacja z drugą kurtyną"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Synchronizacja bezprzewodowa"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Wolna synchronizacja"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Czerń i biel"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Wizja nocna"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Szkic barwny"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Efekt miniatury"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Barwa selektywna"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Sylwetka"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Klucz wysoki"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Klucz niski"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "nieskończoność"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "nieskończoność"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Złożona"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "bulb"
+
+#: camlibs/ptp2/config.c:5050
+msgid "Sync"
+msgstr "Synchronizacja"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "AF z priorytetem twarzy"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "AF dla szerokiego obszaru"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "AF dla normalnego obszaru"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "AF śledzący przedmiot"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr "AF obszaru punktu"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr "Cały wyświetlacz"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200%"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr "33%"
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr "66%"
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Pojedynczy AF"
 
-#: camlibs/ptp2/config.c:4078
-msgid "Full-time-servo AF"
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
 msgstr "Ciągły AF"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
-msgstr "Ręczna ogniskowa"
+#: camlibs/ptp2/config.c:5650
+msgid "Full-time-servo AF"
+msgstr "Ciągły AF cały czas"
+
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr "Ręczna ogniskowa (ustalona)"
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
+msgstr "Ręczna ogniskowa (wybór)"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Blokada AE/AF"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Blokada AE"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Blokada AF"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Utrzymanie blokady AF"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF włączony"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Blokada poziomu flesza"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 sekund"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minut"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 sekund"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 mm"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "bulb"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30 s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25 s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20 s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15 s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13 s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10 s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8 s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6 s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5 s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4 s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3 s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5 s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2 s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1.6 s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1.3 s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1 s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1.3 s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1.6 s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2 s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5 s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3 s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4 s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5 s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6 s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8 s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10 s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13 s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15 s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20 s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25 s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30 s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40 s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50 s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60 s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80 s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100 s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125 s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160 s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200 s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250 s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320 s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400 s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500 s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640 s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800 s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000 s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250 s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600 s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000 s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500 s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200 s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000 s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000 s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400 s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000 s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Ostrzej"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Łagodniej"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Bezpośredni wydruk"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Średnio niski"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Średnio wysoki"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Średnio wysoki"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Wysoka kontrola"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Ogniskowanie strefowe (zbliżenie)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Ogniskowanie strefowe (bardzo bliskie)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Ogniskowanie strefowe (bliskie)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Ogniskowanie strefowe (średnie)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Ogniskowanie strefowe (dalekie)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Ogniskowanie strefowe (zarezerwowane 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Ogniskowanie strefowe (zarezerwowane 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Ogniskowanie strefowe (zarezerwowane 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Ogniskowanie strefowe (zarezerwowane 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatyczny makro"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Pojedynczy AF"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Ciągły AF"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Pojedyncze zdjęcie"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "Serwo AI"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "AI Focus"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 sekundy"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 sekund"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Wstrzymanie"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Światło fluorescencyjne H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Balans bieli własny PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Balans bieli własny PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Balans bieli własny PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Brak liczby"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Cień"
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
-msgstr "Własny WB 2"
-
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
-msgstr "Własny WB 3"
-
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
-msgstr "Własny WB 4"
-
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
-msgstr "Własny WB 5"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr "Własny balans bieli: PC-1"
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
+msgstr "Własny balans bieli: PC-2"
+
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
+msgstr "Własny balans bieli: PC-3"
+
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
+msgstr "Ręczny 3"
+
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
+msgstr "Ręczny 4"
+
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr "Ręczny 5"
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr "Własny balans bieli: PC-4"
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr "Własny balans bieli: PC-5"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "Biel AWB"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Niskie wyostrzenie"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Czerń i biel"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr "Bracketing AE"
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr "Bracketing ISO"
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr "Bracketing WB"
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr "Bracketing FE"
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr "Bracketing wyłączony"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr "domyślne auto"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE i flesz"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "tylko AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Tylko flesz"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Bracketing WB"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "Bracketing ADL"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Przy włączaniu"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Przy wyłączaniu"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Przy włączaniu i wyłączaniu"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Szybka reakcja"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Lustro podniesione zdalnie"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Tryb aplikacji 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Tryb aplikacji 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Umiarkowany"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Rozszerzony"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > Pod"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Pod > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Czułość automatyczna"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Czułość wysoka"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Czułość średnia"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Czułość niska"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Mikrofon wyłączony"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hi 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hi 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Flesz/szybkość"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Flesz/szybkość/przysłona"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Flesz/przysłona"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "Podstawowy JPEG"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Dobra"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Surowy)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+Podstawowa"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Zwykła"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "JPEG Podstawowa*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "JPEG Normalna*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "JPEG Dobra*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF+Podstawowa*"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF+Zwykła*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF+Dobra*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Bardzo dobra"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG (standardowy)"
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG (standardowy)"
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW+JPEG (dobrej jakości)"
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr "(RAW+JPEG (b.dobrej jakości)"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Dobra"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "(RAW+JPEG (b.dobrej jakości)"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "RAW+JPEG (standardowy)"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "RAW+JPEG (standardowy)"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW+JPEG (dobrej jakości)"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "(RAW+JPEG (b.dobrej jakości)"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
 #, fuzzy
+msgid "X.Fine"
+msgstr "Dobra"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "Dobry JPEG"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
-msgstr "Wielopunktowy"
+msgstr "Wielokrotne zdjęcie"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 sekund"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 sekund"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 sekund"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Bezstratna"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Stratna"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Klucz wysoki"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Priorytet rozmiaru"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optymalna jakość"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (Auto FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Zwolnienie"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Zwolnienie + ogniskowanie"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 punktów"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 punktów"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 punktów"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 punktów (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (długa)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (zwykła)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (krótka)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Migawka/AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Blokada AE/AF"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Blokada tylko AE"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Blokada AE (wyłączenie przy zwolnieniu)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Blokada AE (utrzymanie)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Blokada tylko AF"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Bez przypisania"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Podgląd"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "Blokada FV"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "Blokada AE (utrzymanie)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Seria z bracketingiem"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Pomiar macierzowy"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Pomiar centralnie ważony"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Pomiar punktowy"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Dostęp do górnego elementu MOJEGO MENU"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (surowy)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Siatka"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Aktywne D-Lighting"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 krok migawki/przysłony"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Wybór nieautomatycznego obiektywu"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Wirtualny horyzont Viewfindera"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Rozpoczęcie nagrywania filmu"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Włączone (poza oceną zdjęcia)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
+msgstr "Wykrywanie twarzy"
+
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr "Wykrywanie twarzy i źrenic"
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr "Wykrywanie zwierząt"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
-
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Nieznana wartość"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Funkcja Nikona changeafarea działa tylko w trybie LiveView."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Napęd autofocus Nikona nie ustawił ostrości."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Ręczne ogniskowanie Nikona działa tylko w trybie LiveView."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Ręczne ogniskowanie Nikona na granicy."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Krok ręcznego ogniskowania Nikona jest zbyt mały."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Wciśnięcie do połowy"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Wciśnięcie do końca"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Zwolnienie do połowy"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Zwolnienie do końca"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Natychmiast"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Wciśnięcie 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Wciśnięcie 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Wciśnięcie 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Zwolnienie 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Zwolnienie 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Zwolnienie 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Bliska 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Bliska 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Bliska 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Daleka 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Daleka 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Daleka 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Bliska %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Daleka %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
-msgstr "Włączenie trybu Nikon LiveView nie powiodło się"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr "Nie można uruchomić Liveview: bateria wyczerpana"
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr "Nie można uruchomić Liveview: temperatura zbyt duża"
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr "Nie można uruchomić Liveview: błąd TTL"
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr "Nie można uruchomić Liveview: podniesione lustro"
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr "Nie można uruchomić Liveview: wycofywanie obiektywu"
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr "Nie można uruchomić Liveview: ostrzeżenie o minimalnej przesłonie"
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr "Nie można uruchomić Liveview: przetwarzanie zdjęcia"
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr "Nie można uruchomić Liveview: błąd sekwencji"
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+"Nie można uruchomić Liveview: tryb programu ekspozycji inny niż P/A/S/M"
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr "Nie można uruchomić Liveview: ostrzeżenie o lampie"
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr "Nie można uruchomić Liveview: karta nie sformatowana"
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr "Nie można uruchomić Liveview: błąd karty"
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr "Nie można uruchomić Liveview: karta zabezpieczona"
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
 msgstr ""
-"Aby działał tryb bulb, pokrętło trybu musi być przełączone na 'M', a "
-"szybkość migawki na 'bulb'"
+"Nie można uruchomić Liveview: zapis na kartę, ale karty brak lub jest "
+"zabezpieczona"
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr "Nie można uruchomić Liveview: oczekujący nieodtworzony obraz SDRAM"
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr "Nie można uruchomić Liveview: przycisk całkowicie wciśnięty"
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr "Nie można uruchomić Liveview: kod 0x%08x"
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr "Włączenie trybu Nikon Liveview nie powiodło się"
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr "Warunki zakazania filmowania: "
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr "Nie w trybie aplikacji"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr "Włączony wybór Liveview"
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+msgid "In enlarged liveview"
+msgstr "W powiększonym Liveview"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr "Karta zabezpieczona"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr "Już trwa nagrywanie filmu"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr "Zdjęcia/filmy jeszcze nie zapisane w buforze."
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr "Karta pełna"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr "Karta nie sformatowana"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr "Błąd karty"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr "Brak warunków zakazania filmowania"
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr "Warunki zakazania Live View: "
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr "Błąd sekwencji"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr "Przycisk całkowicie wciśnięty"
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr "Ostrzeżenie o minimalnej przesłonie"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr "Bateria wyczerpana"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr "Błąd TTL"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr "Oczekujący nieodtworzony obraz SDRAM"
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr "Zapis na kartę, ale karty brak lub jest zabezpieczona"
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr "Przetwarzanie zdjęcia"
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr "Temperatura zbyt wysoka"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr "Karta nie sformatowana"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr "Ostrzeżenie o lampie"
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr "Podniesione lustro"
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr "Wycofywanie obiektywu"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Tryb programu ekspozycji inny niż P/A/S/M"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr "Liveview nie powinien być zakazany"
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr "Nie można uruchomić nagrywania filmu: %s."
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr "Aparat nie jest w trybie aplikacji"
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr "Nie można uruchomić nagrywania filmu: kod 0x%08x."
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Światło fluorescencyjne"
+
+#: camlibs/ptp2/config.c:9152
+msgid "White set"
+msgstr "Biel ustawiona"
+
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr "Czerń i biel"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Temperatura 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Temperatura 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Temperatura 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Temperatura 4"
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr "Automatyczna zimna"
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr "Automatyczna ciepła"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Nieznany 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Super makro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Daleka 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Daleka 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Bliska 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Blisko-daleko"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+#, fuzzy
+msgid "S"
+msgstr "SV"
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Normalna"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Nagrywanie"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Odtwarzanie"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Inne ustawienia"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Redukcja szumów przy dużym ISO"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Nie wyświetlanie menu TV"
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+"\n"
+"Strumienie:"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "duży"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Nieznana wartość rozmiaru miniatury '%s'."
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Wewnętrzny RAM"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Karta pamięci"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Wyświetlacz"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Data utworzenia: %s, data ustatniego użycia: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Usuń"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bitowe"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bitowe"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Zarządzany"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Nazwa profilu"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "Adres IP (pusty dla DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Maska sieci"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Domyślna bramka"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Tryb dostępu"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Kanał WIFI"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Klucz szyfrowania (hex)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Zapisz"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Wypisz profile Wifi"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Utwórz profil Wifi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Synchronizacja daty i czasu aparatu z PC (UTC)"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Auto-Focus"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Ręczna ogniskowa"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Wyłączenie"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Blokada ogniskowej"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Tryb żarówki"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Blokada UI"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Flesz wyskakujący"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Prowadzenie autofocusu Nikon DSLR"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Prowadzenie autofocusu Canon DSLR"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr "Prowadzenie autofocusu Fuji"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Prowadzenie ręczne ostrości Nikon DSLR"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Ustawienie obszaru autofocusu Nikona"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Ustawienie trybu sterowania Nikona"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Prowadzenie ręczne ostrości Canon DSLR"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Anulowanie autofocusu Canon DSLR"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Prowadzenie ręczne ostrości Olympus OMD"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Prowadzenie ręczne ostrości Parasonic"
+
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr "Prowadzenie autofocusu Fuji"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Pozycja początkowa EZoom"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Powiększenie Canon EOS"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Pozycja powiększenia Canon EOS"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Canon EOS Viewfinder"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Panasonic Viewfinder"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon Viewfinder"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Zdalne zwalnianie Canon EOS"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "Skrypt CHDK"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Nagranie filmu"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+msgid "Movie Mode"
+msgstr "Tryb filmowania"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Informacje o ogniskowaniu"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Informacje o ogniskowaniu"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Informacje o ogniskowaniu"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Jasność punktu ogniskowania"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "Kod operacji PTP"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Producent aparatu"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Wersja urządzenia"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Rozszerzenie producenta"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Wersja PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Wersja DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Zasilanie AC"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Flesz zewnętrzny"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Poziom baterii"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr "Stan podniesienia lustra"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Lustro podniesione"
+
+#: camlibs/ptp2/config.c:10742
+#, fuzzy
+msgid "Mirror Lock Status"
+msgstr "Stan podniesienia lustra"
+
+#: camlibs/ptp2/config.c:10743
+#, fuzzy
+msgid "Mirror Down Status"
+msgstr "Stan podniesienia lustra"
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr "Licznik zdjęć z podniesionym lustrem"
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr "Licznik ciągłych zdjęć"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Orientacja aparatu"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Flesz otwarty"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr "Aktywny folder"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Flesz ładowany"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Nazwa obiektywu"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Licznik migawki"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Dostępne zdjęcia"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Minimalna długość ogniskowej"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Maksymalna długość ogniskowej"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Maksymalna przysłona przy minimalnej ogniskowej"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Maksymalna przysłona przy maksymalnej ogniskowej"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Niskie światło"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Pomiar światła"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Blokada AF"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "Blokada AE"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "Blokada FV"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+msgid "Movie Switch"
+msgstr "Przełącznik filmowania"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr "Warunek zakazania filmowania"
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr "Warunek zakazania Liveview"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Data i czas aparatu"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Tryb piszczyka"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Komentarz do zdjęcia"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "WLAN GUID"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Włączenie komentarza do zdjęcia"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Czas wyłączania LCD"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Nośnik nagrywania"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Czas szybkiego podglądu"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Menu CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Odwrotna tarcza poleceń"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Wyjście aparatu"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Miejsce zapisu nagrywania"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Tryb EVF"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Autor"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Numer CCD"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr "Pseudonim"
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Czyszczenie sensora"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Redukcja migotania"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Funkcje Własne Ex"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Informacje o ogniskowaniu"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Obszar ogniskowania"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr "Odpalanie stroboskopowe"
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr "Stan ładowania flesza"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr "Pojedyncze zdjęcie surowe"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Automatyczne wyłączanie"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Głębia ostrości"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menu i odtwarzanie"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr "Zewnętrzne sterowanie nagrywaniem"
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr "Akcja aparatu"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+msgid "Priority Mode"
+msgstr "Tryb priorytetu"
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr "Rozmiar miniatur"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Szybki system plików"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Obiekt zdjęcia"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Auto-Focus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Tryb zdalnego sterowania"
+
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr "Tryb zdarzenia"
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Format zdjęć SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Format zdjęć CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Format zdjęć Ext HD"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr "Symulacja filmu"
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr "Rozmiar surowych zdjęć"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Czułość ISO dla filmu"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "Auto ISO"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Balans bieli"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Korekta balansu bieli A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Korekta balansu bieli B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Balans bieli X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Balans bieli X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Efekt fotograficzny"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Model kolorów"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Przestrzeń kolorów"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Format filmu"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Rozdzielczość filmu"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Szybkość klatek filmu"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Kontrast filmu"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Jasność filmu"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Format dźwięku"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Przepływność dźwięku"
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr "Częstotliwość próbkowania dźwięku"
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr "Liczba bitów na próbkę dźwięku"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Głośność dźwięku"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Redukcja szumów przy długiej ekspozycji"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Tryb autofocus 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Prędkość przybliżania"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Światło pomocnicze"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Flaga obrotu"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+msgid "Movie Exposure Compensation"
+msgstr "Kompensacja ekspozycji filmu"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Balans bieli"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Temperatura koloru"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Tryb AF"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Asysta MF"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Rozpoczęcie nagrywania filmu"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Kompensacja flesza"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "Kompensacja ekspozycji AEB"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Tryb flesza Nikona"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Tryb zarządzania fleszem"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Zasilanie zarządzania fleszem"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Kanał sterowania fleszem"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Tryb własny sterowania fleszem"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Kompensacja własna sterowania fleszem"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Wartość własna sterowania fleszem"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Tryb sterowania fleszem A"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Kompensacja sterowania fleszem A"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Wartość sterowania fleszem A"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Tryb sterowania fleszem B"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Kompensacja sterowania fleszem B"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Wartość sterowania fleszem B"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "Obszar rozjaśnienia AF"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "Tryb piszczyka AF"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Liczba F"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr "Rozmiar Live View"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Liczba F dla filmu"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Program elastyczny"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Jakość"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Rozmiar surowych zdjęć"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Format zdjęć"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Odległość ogniskowej"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Ogniskowa"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Tryb ogniskowania 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Ciągły AF"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Tryb efektu"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Program ekspozycji"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+msgid "User Mode"
+msgstr "Tryb użytkownika"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Tryb sceny"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Proporcje obrazu"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "Tryb AF"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Wykaz urządzeń z danymi:\n"
+msgstr "Urzędzenie z danymi"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Redukcja szumów przy dużym ISO"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "Tryb HDR"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "Duża dynamika HDR"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "Wygładzanie HDR"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Tryb zdjęć nieruchomych"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Tryb robienia zdjęcia Canona"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Tryb automatyczej ekspozycji Canona"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Wywołanie trybu automatyczej ekspozycji Canona"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Tryb prowadzenia"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Styl zdjęcia"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Tryb pomiaru ogniskowej"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Tryb pomiaru ekspozycji"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV otwarty"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV maksymalny"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr "Przysłona 2"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Punkt ogniskowania"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Opóźnienie przed zdjęciem"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Prędkość migawki 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Prędkość migawki 2 dla filmu"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Tryb pomiaru"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Odległość AF"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Zapętlenie obszaru ogniskowania"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Tryb opóźnienia ekspozycji"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Blokada ekspozycji"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Tryb AE-L/AF-L"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Tryb AF dla Live View"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Ogniskowanie AF dla Live View"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr "Podgląd ekspozycji Live View"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Współczynnik powiększenia Live View"
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr "Balans bieli Live View"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Rozmiar Live View"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Sekwencyjne numerowanie plików"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Znak flesza"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Flesz modelujący"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Podziałka Viewfindera"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Ocena zdjęcia"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Flaga obrotu obrazu"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Wyzwolenie bez karty CF"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Ręczne zasilanie w trybie flesza"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Obszar autofocusu"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Kompensacja ekspozycji flesza"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Bracketing"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Tryb bracketingu"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Krok EV"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Tryb bracket"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Kolejność w trybie bracket"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr "Krok bracketingu AE"
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr "Krok bracketingu WB"
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr "Wzór bracketingu AE"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr "Wzór bracketingu WB"
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr "Liczba zdjęć bracketingu AE"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr "Wzór bracketingu ADL"
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr "Krok bracketingu ADL"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr "Komentarz predefiniowanego WB 1"
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr "Komentarz predefiniowanego WB 2"
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr "Komentarz predefiniowanego WB 3"
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr "Komentarz predefiniowanego WB 4"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr "Komentarz predefiniowanego WB 4"
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr "Komentarz predefiniowanego WB 6"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Liczba serii"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Odstęp serii"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Maksymalna liczba zdjęć"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Automatyczne przesunięcie balansu bieli"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla światła żarówki wolframowej"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla światła fluorescencyjnego"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla światła dziennego"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla flesza"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla pogody pochmurnej"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Przesunięcie balansu bieli dla cienia"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Przesunięcie balansu bieli dla światła naturalnego"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Przesunięcie balansu bieli Nr"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Przesunięcie balansu bieli 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Przesunięcie balansu bieli 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Przesunięcie balansu bieli 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Przesunięcie balansu bieli 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Przesunięcie balansu bieli 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Opóźnienie samowyzwalacza"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Obszar centralnie ważony"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Prędkość migawki z fleszem"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Zdalny limit czasu"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Tryb zdalnego sterowania"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Tryb aplikacji"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Optymalizacja zdjęcia"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Wyostrzanie"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Kompensacja tonów"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Regulacja barwy"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Automatyczny bracketing ekspozycji"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Automatyczna optymalizacja oświetlenia"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Dźwięk filmu"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Ręczne ustawienia filmu"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Odwrotne identyfikatory"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Automatyczna kontrola zniekształceń"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr "Korekcja winietowania"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Tryb obrazu"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Przycięcie matrycy"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr "Głębia danych wyjścia HDMI"
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr "Wykrywanie twarzy"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr "AF serwomechanizmu filmowania"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Czas wyłączania pomiaru"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Przypisanie przycisku funkcyjnego"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Przypisanie przycisku podglądu"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Jakość filmu"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Minimalna prędkość migawki"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Szybkość wolnego trybu ciągłych zdjęć"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Rozdzielczość filmu"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Szybkość wolnego trybu ciągłych zdjęć"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Minimalna prędkość migawki"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Jakość filmu"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Górne ograniczenie Auto ISO"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Prędkość synchronizacji z fleszem"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Pomiar ogniskowej"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Szybkość szybkiego trybu ciągłych zdjęć"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Tryb kompresji JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "Priorytet trybu AF-C"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "Priorytet trybu AF-S"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "Włączenie AF"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Obszar dynamicznego AF"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Blokada AF"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "Punkt obszaru AF"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "Przycisk AF On"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Redukcja szumów przy dużym ISO dla filmu"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Maksymalne ciągłe zwolnienie"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr "Długość pętli filmu"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Kompresja surowa"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Jakość obrazu 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Ustawienia obrazu"
-
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr "Obszar powiększenia Live View"
+
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Ustawienia zdjęcia"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Profile WIFI"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Inne ustawienia urządzenia PTP"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "Ustawienie PTP 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Niestety właściwość '%s' / 0x%04x jest aktualnie tylko do odczytu."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Właściwość '%s' / 0x%04x nie została ustawiona (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Właściwość '%s' / 0x%04x nie została ustawiona (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr "Analiza wartości kontrolki '%s' / 0x%04x nie powiodła się - błąd %d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Nie odnaleziono własności '%s'."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Należy podać folder rozpoczynający się od /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7740,183 +9987,205 @@
 "\n"
 "Miłej zabawy!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "Niestety ten aparat Nikon nie zwraca obrazów JPEG w trybie LiveView"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Włączenie trybu Canon Viewfinder nie powiodło się"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Pobranie obrazu Canon Viewfinder nie powiodło się"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Niestety ten aparat Canon nie obsługuje trybu Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Niestety ten aparat Nikon nie obsługuje trybu LiveView"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "Niestety ten aparat Nikon nie zwraca obrazów JPEG w trybie LiveView"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr "Nie można uruchomić Liveview: %s"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
-msgstr "Wyłączenie trybu Nikon LiveView nie powiodło się"
+msgstr "Wyłączenie trybu Nikon Liveview nie powiodło się"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Niestety ten aparat Sony nie zwraca obrazów JPEG w trybie LiveView"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Niestety ten aparat Panasonic nie zwraca obrazów JPEG w trybie LiveView"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Niestety ten aparat nie obsługuje pobierania obrazu w trybie Nikon"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
-"Nie udało się włączyć trybu Nikon 1 LiveView, ale jest to wymagane do "
+"Nie udało się włączyć trybu Nikon 1 Liveview, ale jest to wymagane do "
 "zrobienia zdjęcia"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Niestety ten aparat Canon nie obsługuje funkcji Canon EOS capture"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS Get Changes nie powiodło się"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Niestety ten aparat Canon nie obsługuje inicjalizacji Canon Capture"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Wyłączenie trybu Canon Viewfinder nie powiodło się"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Canon Capture nie powiodło się"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr "Zrobienie zdjęcia nie powiodło się: brak ogniskowania."
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Niestety ten aparat nie obsługuje zwykłego robienia zdjęć"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr "Karta pamięci aparatu zapełniła się podczas robienia zdjęcia."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Canon EOS Half-Press nie powiodło się"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Canon EOS Capture nie powiodło się: może brak ostrości?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Canon EOS Half-Release nie powiodło się"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Canon EOS Full-Press nie powiodło się"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Canon EOS Full-Release nie powiodło się"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Canon EOS Full-Press nie powiodło się"
+msgstr "Canon EOS M Full-Press nie powiodło się"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr "Canon EOS Capture nie powiodło się: może brak ostrości?"
+msgstr "Canon EOS M Capture nie powiodło się: może brak ostrości?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Canon EOS Full-Release nie powiodło się"
+msgstr "Canon EOS M Full-Release nie powiodło się"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS Capture nie powiodło się"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS Capture nie powiodło się: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Canon EOS Capture nie powiodło się: może lustro podniesione?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr "Canon EOS Capture nie powiodło się: może brak pamięci na karcie?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS Capture nie powiodło się: karta tylko do odczytu?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr "Canon EOS Capture nie powiodło się: nienznay błąd %d, proszę zgłosić."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr "Niestety inicjalizacja aparatu nie zadziałała. Proszę to zgłosić."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Producent: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Model: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Wersja: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Numer seryjny: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "ID rozszerzenia producenta: 0x%x(%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Opis rozszerzenia producenta: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Wersja standardu PTP: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Tryb działania: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7924,20 +10193,32 @@
 "\n"
 "Formaty zdjęć: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Formaty wyświetlania: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+"\n"
+"Strumienie:"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Obsługiwane własności obiektów MTP:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " Błąd PTP %04x przy zapytaniu"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7945,87 +10226,87 @@
 "\n"
 "Możliwości urządzenia:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tŚciąganie plików, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Usuwanie plików, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Bez usuwania plików, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Przesyłanie plików do aparatu\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Bez przesyłania plików do aparatu\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tOgólne pobieranie obrazu, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tBez pobierania obrazu, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Zdjęcia w trybie otwartym, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Bez zdjęć w trybie otwartym, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Zdjęcia w trybie Canon, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Zdjęcia w trybie Canon EOS, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Zdjęcia w trybie Canon EOS 2, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Zdjęcie w trybie Nikon 1, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "Zdjęcia w trybie Nikon 2, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "Zdjęcia w trybie Nikon 3, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Zdjęcia w trybie Sony, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr "Zdjęcia w trybie Olympus E XML, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Bez zdjęć w trybie producenta\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tObsługa Nikon Wifi\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tObsługa Canon Wifi\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8033,93 +10314,93 @@
 "\n"
 "Wykaz urządzeń z danymi:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tOpis urządzenia: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tEtykieta wolumenu: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Wbudowany ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Wyciągalny ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Wbudowany RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Wyciągalny RAM (karta pamięci)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Nieznany: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tTyp urządzenia: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Ogólny płaski"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Ogólny hierarchiczny"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Układ dla aparatów cyfrowych (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTyp systemu plików: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Odczyt i zapis"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Tylko odczyt"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Tylko odczyt z usuwaniem obiektów"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tMożliwość dostępu: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaksymalna pojemność: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tWolne miejsce (bajty): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tWolne miejsce (klatki): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8127,47 +10408,47 @@
 "\n"
 "Wykaz własności urządzenia:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " nie odczytano.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "nie można odpytać.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "tylko odczyt"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "odczyt i zapis"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " błąd %x przy zapytaniu"
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Plik '%s/%s' nie istnieje."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Metadane obsługiwane tylko dla urządzeń MTP."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "To urządzenie nie obsługuje ustawiania zabezpieczenia obiektu."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Urządzeniu nie udało się ustawić zabezpieczenia obiektu na %d"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8176,7 +10457,7 @@
 "PTP jest obecnie zaimplementowane tylko dla aparatów USB i PTP/IP, rodzaj "
 "portu %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8184,2235 +10465,2312 @@
 "Obsługa opakowania XML Olympusa jest dostępna tylko przy wbudowanej obsłudze "
 "libxml2."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP: Niezdefiniowany błąd"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PGP: Ogólny błąd"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP: Sesja nie otwarta"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP: Nieprawidłowy identyfikator transakcji"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
-msgstr "PTP: Nieobsługiwana operacja"
+msgstr "PTP: Nie obsługiwana operacja"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
-msgstr "PTP: Nieobsługiwany parametr"
+msgstr "PTP: Nie obsługiwany parametr"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP: Niepełna transmisja"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP: Nieprawidłowy identyfikator danych"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP: Nieprawidłowy uchwyt obiektu"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
-msgstr "PTP: Nieobsługiwane ustawienie urządzenia"
+msgstr "PTP: Nie obsługiwane ustawienie urządzenia"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP: Nieprawidłowy kod formatu obiektu"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP: Brak miejsca"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP: Obiekt zabezpieczony przed zapisem"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP: Dane tylko do odczytu"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP: Brak dostępu"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP: Brak miniaturki"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP: Własny test nie powiódł się"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP: Częściowe usunięcie"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP: Dane niedostępne"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
-msgstr "PTP: Nieobsługiwana specyfikacja przez format"
+msgstr "PTP: Nie obsługiwana specyfikacja przez format"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP: Brak prawidłowych informacji o obiekcie"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP: Nieprawidłowy format kodu"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP: Nieznany kod producenta"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP: Robienie zdjęcia już zakończone"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP: Urządzenie zajęte"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP: Nieprawidłowy obiekt macierzysty"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP: Nieprawidłowy format ustawienia urządzenia"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP: Nieprawidłowa wartość ustawienia urządzenia"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP: Nieprawidłowy parametr"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP: Sesja już otwarta"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP: Transakcja anulowana"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
-msgstr "PTP: Nieobsługiwana specyfikacja celu"
+msgstr "PTP: Nie obsługiwana specyfikacja celu"
+
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr "Błędny uchwyt enum"
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr "Brak włączonego strumienia"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr "Nieprawidłowy zbiór danych"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Wymagana nazwa pliku"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Konflikt nazwy pliku"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Nieprawidłowa nazwa pliku"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Błąd sprzętowy"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Brak ostrości"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Zmiana trybu aparatu nie powiodła się"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Nieprawidłowy status"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Ustawianie właściwości nie obsługiwane"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Błąd zerowania ustawienia balansu bieli"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Błąd odniesienia kurzu"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Prędkość migawki w trybie bulb"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Sekwencja podnoszenia lustra"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Tryb aparatu bez korekty ogniskowej"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Nie w trybie Liveview"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Koniec kroku MF"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Niewystarczający krok MF"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Anulowano transfer rozszerzony"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr "Brak pełnego HD"
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr "Błąd nośnika"
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr "Nośnik nie sformatowany"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr "Zwolnienie lampy w trakcie"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr "Ciche zwolnienie w trakcie"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr "Zwolnienie MovieFrame w trakcie"
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr "Czas migawki"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr "Oczekiwanie na 2. zwolnienie"
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr "MirrorUpCapture już rozpoczęte"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr "Nieprawidłowa wartość SBAttribute"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Nieznane polecenie"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Operacja odrzucona"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Obiektyw zasłonięty"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Bateria słaba"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Aparat niegotowy"
 
-#: camlibs/ptp2/ptp.c:4708
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr "Osłona obiektywu zamknięta"
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr "Niski stan baterii"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr "Obiekt niegotowy"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr "Nie można utworzyć obiektu"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr "Stan pamięci niegotowy"
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr "Błędny ObjectPropCode"
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr "Błędny format ObjectProp"
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr "Błędna wartość ObjectProp"
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr "Błędne ObjectReference"
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr "Błędny zbiór danych"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr "Nie obsługiwana specyfikacja przez grupę"
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr "Nie obsługiwana specyfikacja przez głębię"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr "Obiekt zbyt duży"
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr "Nie obsługiwany ObjectProp"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr "Błędny ID sesji nośnika"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr "Osiądnięto limit sesji nośnika"
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr "Nie ma więcej danych"
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr "Błędna składnia WFC"
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr "Nie obsługiwana wersja WFC"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "PTP: Urządzenie zajęte"
+msgstr "PTP: Brak urządzenia"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "Limit czasu PTP"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "Żądanie anulowania PTP"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "PTP: Błąd protokołu, oczekiwano odpowiedzi"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "PTP: oczekiwano danych"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "PTP: Błąd wejścia/wyjścia"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Tryb działania"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Ustawienie kompresji"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Balans bieli"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Wzmocnienie RGB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Czas ekspozycji"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Tryb programu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Indeks ekspozycji (czułość ISO filmu)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Kompensacja odchylenia ekspozycji"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Opóźnienie przed zdjęciem"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Powiększenie cyfrowe"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Liczba w jednostce czasu"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Odstęp w jednostce czasu"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL do przesyłania"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Informacje o prawach autorskich"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Obsługiwane strumienie"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Strumienie włączone"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Format filmu"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Rozdzielczość filmu"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Jakość filmu"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Szybkość klatek filmu"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Kontrast filmu"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Jasność filmu"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Format dźwięku"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Przepływność dźwięku"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Częstotliwość próbkowania dźwięku"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Liczba bitów na próbkę dźwięku"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Głośność dźwięku"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Format znacznika czasu"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Wyjście obrazu"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Oszczędzanie energii"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Język interfejsu użytkownika"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Rodzaj baterii"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Tryb baterii"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "UILockType"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Tryb aparatu"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Format pliku pełnego widoku"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Czas własny"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Tryb robienia zdjęcia"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Tryb obrazu"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Ustawienie wolnej migawki"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Tryb AF"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Stabilizacja obrazu"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Wzmocnienie kolorów"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Czułość"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Ustawienie parametrów"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Av otwarty"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Av maksymalny"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Ogniskowa teleobiektywu"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Ogniskowa szerokiego kątu"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Mianownik ogniskowej"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Tryb przesyłania zdjęcia"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Prefiks nazwy"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Tryb rozmiaru/jakości"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Obsługiwane rozmiary miniaturek"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Rozmiar danych wyjściowych z aparatu"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Rozmiar danych wejściowych do aparatu"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Zdalna wersja API"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Właściciel aparatu"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Czas uniksowy"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "ID korpusu aparatu"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av z otwartym wierzchołkiem"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Powiększenie cyfrowe"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Pozycja punktu Ml"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Disp Av maksymalne"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av z maksymalnym wierzchołkiem"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "Pozycja początkowa EZoom"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "Rozmiar EZoom teleobiektywu"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Liczba błysków flesza"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Kąt obrotu"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Obrót sceny"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Tryb emulacji zdarzeń"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Rodzaj pokazu slajdów"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Średnie rozmiary plików"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "ID modelu"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr "Przełącznik ustalonego filmowania EOS"
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Bank zdjęć"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Bank zdjęć A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Bank zdjęć B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Bank zdjęć C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Bank zdjęć D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Reset banku 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Temperatura kolorów dla balansu bieli"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Numer predefiniowanego balansu bieli"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Nazwa ustawień balansu bieli 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Nazwa ustawień balansu bieli 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Nazwa ustawień balansu bieli 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Nazwa ustawień balansu bieli 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Nazwa ustawień balansu bieli 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Wartość balansu bieli 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Wartość balansu bieli 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Wartość balansu bieli 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Wartość balansu bieli 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Wartość balansu bieli 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Ogniskowa obiektywu (nie CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Maksymalne światło obiektywu (nie CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Automatyczne przycięcie DX"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Bank menu A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Bank menu B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Bank menu C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Bank menu D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Reset banku menu"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Pionowy AF włączony"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Strefa obszaru ogniskowania"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Włączenie praw autorskich"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Krok ekspozycji ISO"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Krok ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Kompensacja ekspozycji (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Obszar centralnie ważony"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Macierz podstawy ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Środek podstawy ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Punkt podstawy ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Obszar AF dla Live View"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Czas automatycznego wyłączania pomiaru"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Opóźnienie samowyzwalacza"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Czas konfiguracji zdjęcia"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Stopery automatycznego wyłączania"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Poziom kąta"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Prędkość robienia zdjęcia"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Tryb opóźnienia ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Redukcja szumów przy długiej ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Podświetlenie LCD"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Redukcja szumów przy dużym ISO"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Podpowiedzi na ekranie"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Nazwa autora"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Informacje o prawach autorskich"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Flesz modelujący"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Bracketing w trybie ręcznym"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Automatyczny wybór w trybie bracket"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "Ustawienie autobracketingu NIKON"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Tryb zdjęć z przyciskiem centrowania"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Tryb odtwarzania z przyciskiem centrowania"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Wielokrotny wybór"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Odtwarzanie informacji o zdjęciach"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Przycisk przypisania funkcji"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Konfiguracja tarcz poleceń"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Ustawienie przysłony"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Przyciski i tarcze"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Nie zwolniono karty CF"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Współczynnik powiększenia przycisku centrowania"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Przycisk funkcyjny 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Nornalny AF włączony"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Czyszczenie matrycy"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Łańcuch opisujący obraz"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Włączenie komentarza do zdjęcia"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Obrót obrazu"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Ręczne ustawienie obiektywu"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Rozmiar ekranu dla filmu"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Głos filmu"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Mikrofon do filmów"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Gniazdo kart do filmów"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Opóźnienie wyłączania monitora"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Włączenie bracketingu"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Krok bracketingu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Program bracketingu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Automatyczny licznik bracketingu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Krok bracketingu balansu bieli"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Program bracketingu balansu bieli"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "ID obiektywu"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Rodzaj obiektywu"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Typ obiektyw"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Minimalna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Maksymalna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Maksymalna jasność przy minimalnej ogniskowej"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Maksymalna jasność przy maksymalnej ogniskowej"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Wyświetlanie ISO w trybie Finder"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Automatyczne wyłączanie w trybie zdjęć"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Automatyczne wyłączanie w trybie menu"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Automatyczne wyłączanie w trybie informacji"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Liczba zdjęć dla samowyzwalacza"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Kontrola winietowania"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Czas ekspozycji Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Stan ostrzeżenia"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Top Mode 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Aktywny sensor AF"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Miernik ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Prędkość USB"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Numer seryjny CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Rodzaj PTN grupy"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Blokada liczby F"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Blokada przysłony/ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Ustawienie blokady TV"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "Ustawienie blokady AV"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Ustawienie podświetlenia"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Jasność punktu ogniskowania"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Podłączony zewnętrzny flesz"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Stan zewnętrznego flesza"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Rodzaj zewnętrznego flesza"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Tryb zewnętrznego flesza"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Kompensacja zewnętrznego flesza"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "Efekt wypełnienia BW"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "Ostrość BW"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "Kontrast BW"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "Rodzaj ustawienia BW"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Tryb zapisu slotu 2"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Tryb zapisu surowych bitów"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
-msgstr "Rodzaj światła fluorescencyjnego"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
+msgstr "Typ świetlówki"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Dostrojenie temperatury kolorów"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Dostrojenie 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Dostrojenie 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Dostrojenie 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Dostrojenie 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Dostrojenie 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Tryb autofocus"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Lampa pomocnicza AF"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Automatyczne ustawianie ISO P/A/DVP"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Wyświetlanie siatki w trybie Viewfinder"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Zasilanie zarządzania zewnętrznego flesza"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Auto FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Wyświetlanie ostrzeżeń"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Rodzaj baterii"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Górne ograniczenie Auto ISO"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Ciągła duża prędność"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Ustawienie wyświetlania informacji"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Przycisk podglądu"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Przycisk podlądu 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "Przycisk blokady AEAF 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Wyświetlanie identyfikatora"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Kolejność rodzaju baterii"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Klatki i kroki bracketingu"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Tryb Live View"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Tryb prowadzenia Live View"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Stan Live View"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Współczynnik powiększenia Live View"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
-msgstr "Warunek wyłączenia Live View"
+msgstr "Warunek zakazania Live View"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Stan wyświetlania ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Stan wskaźnika ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Stan błędów wyświetlania informacji"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Podświetlenie wskaźnika ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Wartość MRepeat flesza"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Liczba MRepeat flesza"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Odstęp MRepeat flesza"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Uaktywnienie Pic Ctrl"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Zmiana Pic Ctrl"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr "Język aparatu"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr "Wyzwolenie bez karty SD"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Kompresja obrazu"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Czas bezpieczny"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Certyfikat urządzenia"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Informacja o unieważnieniu"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Partner synchronizacji"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Przyjazna nazwa urządzenia"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Etykieta wolumenu"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Ikona urządzenia"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Informacja o rozpoczęciu sesji"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Stwierdzony rodzaj urządzenia"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Szybkość odtwarzania"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Obiekt odtwarzania"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Indeks kontenera odtwarzania"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Pozycja odtwarznia"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "ID PlaysForSure"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Jakość"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Tryb zwalniania"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Obszary ogniskowania"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Blokada AE"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
+msgstr "Punkt ogniskowania"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Rozmiar obrazu"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Prędkość migawki"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Temperatura koloru"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "Stan ogniskowania"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr "Obiekty w pamięci"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Indeks ekspozycji"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "Filtr AB"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Obraz nieruchomy"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr "Blisko-daleko"
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr "Pozycja obszaru AF"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Data i czas"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f kroków"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG podstawowy"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Światło żarzące się"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Ręczna ogniskowa"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automatyczny makro (zbliżenie)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Średnia centralnie ważona"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Centralny punkt"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Flesz automatyczny"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatyczna redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Wypełniająca redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Silny wiatr"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Samowyzwalacz + zdalny"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Blokada AF"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Blokada flesza"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Powrót punktu ogniskowania na środek"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Podświetlenie aktualnego punktu ogniskowania"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Nieużywany"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRam"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "Podświetlenie LCD"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "Podświetlenie LCD i wyśw. informacji"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Ciemny na jasnym"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Jasny na ciemnym"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "litowo-jonowa"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "niklowa hybrydowa"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "niklowo-kadmowa"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "alkaliczno-magnezowa"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Poziom ostrzeżenia 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Na wyczerpaniu"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Poziom ostrzeżenia 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Ekonomiczna"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Bardzo dobra"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Synchronizacja z niską prędkością"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Automatyczny, redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Włączony, redukcja czerwowych oczu"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Widok odległy"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Migawka szybka"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Migawka powolna"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Widok nocny"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Skala szarości"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Pan Focus"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Pojedyncze zdjęcie"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Ciągłe zdjęcia"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Wyzwalacz (pojedyncze zdjęcie)"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Ciągłe zdjęcia z małą prędkością"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Ciągłe zdjęcia z dużą prędkością"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Gładka"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Pomiar centralnie ważony"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Pomiar punktowy"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Pomiar średni"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Pomiar oceniający"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Pomiar częściowy"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Pomiar średni centralnie ważony"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Pomiar punktowy powiązany z ramką AF"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Pomiar wielopunktowy"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Funkcja powolnej migawki niedostępna"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Niska 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Wysoka 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Wyższa 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Wyższa 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Standardowe parametry rozwojowe"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Parametry rozwojowe 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Parametry rozwojowe 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Parametry rozwojowe 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MlSpotPosCenter"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MlSpotPosAfLink"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Media Card"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Media Card Group"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Windows Image Format"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Niezdefiniowany dźwięk"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Kodek audible.com"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Playlista Samsung"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Niezdefiniowany film"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Niezdefiniowana kolekcja"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Abstrakcyjny album multimedialny"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Abstrakcyjny album zdjęć"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Abstrakcyjny album dźwięków"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Abstrakcyjny album filmów"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Abstrakcyjna playlista dźwięków i filmów"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Abstrakcyjna grupa kontaktów"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Abstrakcyjny folder wiadomości"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Abstrakcyjny produkt z rozdziałami"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Abstrakcyjna playlista dźwięków"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Abstrakcyjna playlista filmów"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstrakcyjna obsada"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "Playlista WPL"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "Playlista M3U"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "Playlista MPL"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "Playlista ASX"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "Playlista PLS"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Niezdefiniowany dokument"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstrakcyjny dokument"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Dokument XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Dokument Microsoft Worda"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "Skompilowany dokument HTML (MHT)"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Arkusz kalkulacyjny Microsoft Excela (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Prezentacja Microsoft Powerpointa (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Niezdefiniowana wiadomość"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstrakcyjna wiadomość"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Niezdefiniowany kontakt"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstrakcyjny kontakt"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Niezdefiniowany element kalendarza"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstrakcyjny element kalendarza"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Niezdefiniowany plik wykonywalny Windows"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Media Cast"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Sekcja"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Nieznany(%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Pobranie informacji o urządzeniu"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Otwarcie sesji"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Zamknięcie sesji"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Pobranie ID nośnika"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Pobranie informacji o nośniku"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Pobranie liczby obiektów"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Pobranie uchwytów obiektów"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Pobranie informacji o obiekcie"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Pobranie obiektu"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Pobranie miniaturki"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Usunięcie obiektu"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Wysłanie informacji o obiekcie"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Wysłanie obiektu"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Zainicjowanie robienia zdjęć"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Formatowanie nośnika"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Reset urządzenia"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Test własny urządzenia"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Zabezpieczenie obiektu"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Wyłączenie urządzenia"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Pobranie opisu właściwości urządzenia"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Pobranie wartości właściwości urządzenia"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Ustawienie wartości właściwości urządzenia"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Przywrócenie wartości właściwości urządzenia"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Zakończenie otwartego robienia zdjęć"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Przeniesienie obiektu"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Skopiowanie obiektu"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Pobranie częściowego obiektu"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Zainicjowanie otwartego robienia zdjęć"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Rozpoczęcie numerowania uchwytów"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Numerowanie uchwytów"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Zakończenie numerowania uchwytów"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Pobranie map rozszerzeń producenta"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Pobranie informacji producenta o urządzeniu"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Pobranie obiektu obrazu po zmianie rozmiaru"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Pobranie manifestu systemu plików"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Pobranie informacji o strumieniu"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Pobranie strumienia"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Pobranie obsługiwanych właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Pobranie opisu właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Pobranie wartości właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Ustawienie wartości właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Pobranie listy właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Ustawienie listy właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Pobranie opisu niezależnej właściwości"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Wysłanie listy właściwości obiektu"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Pobranie odniesień do obiektu"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Ustawienie odniesień do obiektu"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Uaktualnienie firmware'u urządzenia"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Przejście do następnej pozycji w playliście"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Pobranie wywołania bezpiecznego czasu"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Pobranie odpowiedzi bezpiecznego czasu"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Ustawienie odpowiedzi licencji"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Pobranie listy synchronizacji"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Wysłanie zapytania wywołania pomiaru"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Pobranie wywołania pomiaru"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Pobranie odpowiedzi pomiaru"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Wyczyszczenie nośnika danych"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Pobranie stanu licencji"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Wysłanie polecenia WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Wysłanie żądania WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Informacja o dodanych/usuniętych elementach"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Informacja o uzyskanych elementach"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Pobranie możliwych rodzajów list odtwarzania"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Wysłanie żądania aplikacji WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Pobranie odpowiedzi aplikacji WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Włączenie zaufanych operacji na plikach"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Wyłączenie zaufanych operacji na plikach"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Zakończenie sesji zaufanej aplikacji"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Otwarcie sesji multimedialnej"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Zamknięcie sesji multimedialnej"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Pobranie następnego bloku danych"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Ustawienie aktualnej pozycji czasu"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Wysłanie żądania rejestracji"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Pobranie odpowiedzi na rejestrację"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Pobranie wyzwania bliskości"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Wysłanie odpowiedzi bliskości"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Wysłanie żądania licencji WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Pobranie odpowiedzi licencji WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Przetworzenie obiektu WFC"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Pobranie częściowego obiektu (offset 64-bitowy)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Wysłanie częściowego obiektu"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Obcięcie obiektu"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Rozpoczęcie edycji obiektu"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Zakończenie edycji obiektu"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Nieznany PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Nieznane VendorExtensionID"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Nieznana wartość"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Ściąganie filmu..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Ściąganie dźwięku..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Ściąganie danych EXIF..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Brak dostępnych danych EXIF dla %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Nie udało się usunąć pliku."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Nie udało się usunąć katalogu."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Nie udało się utworzyć katalogu."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Wersja: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Status RTC: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Czas aparatu: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "ID aparatu: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Brak włożonej karty SD.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "ID karty SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Zdjęć w aparacie: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Pamięć SD: %d MB w sumie, %d MB wolne.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Pamięć wewnętrzna: %d MB w sumie, %d MB wolne.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10424,7 +12782,7 @@
 "Rozpracowano wstecznie przy użyciu USB Snoopy, patrząc\n"
 "na obraz uaktualnienia firmware'u i zgadując.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10436,12 +12794,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "w oparciu o sterownik Boba Paauwe\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "nieznany (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10450,191 +12808,191 @@
 "Model: %s\n"
 "Pamięć: %d bajt(ów) z %d dostępnych"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Na zewnątrz"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maksymalna"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimalna"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Znak"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Obraz i dźwięk"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Znak i dźwięk"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Ogólna"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Prawa autorskie (maksymalnie 20 znaków)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Zdjęcia"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Poziom bieli"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Tryb nagrywania"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Kompresja"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Prędkość %i nie jest obsługiwana!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Oczekiwano %i, otrzymano %i. Proszę zgłosić ten błąd pod adres %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Oczekiwano %i bajtów, otrzymano %i. Proszę zgłosić ten błąd pod adres %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Oczekiwano 0x%x, ale odebrano 0x%x. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Złe znaki (0x%x, 0x%x). Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Aparat zajęty. Jeśli problem nie minie, proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Przekroczony limit czasu nawet po 2 próbach. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Błąd komunikacji nawet po 2 próbach. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Aparat jest w niewłaściwym trybie. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Aparat nie przyjął parametrów. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Wystąpił nieznany błąd. Proszę skontaktować się z %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr ""
 "Długość nazwy pliku nie może przekraczać 12 znaków ('%s' ma %i znaków)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10646,108 +13004,108 @@
 "gphoto2. Marcus Meissner <marcus@jet.franken.de> poprawił i rozszerzył ten "
 "port."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Rozdzielczość i rozmiar"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Data i czas (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Ustawienia przysłony"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Tryb koloru"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Ustawienia flesza"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Oszczędzanie energii hosta (sekundy)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Oszczędzanie energii aparatu (sekundy)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Tryb obiektywu"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreański"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Angielski"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Francuski"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Niemiecki"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Włoski"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japoński"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Ustawienia zdjęcia"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10767,34 +13125,34 @@
 "  PhotoPC 3000z, jeśli aparat zachowuje się inaczej, proszę\n"
 "  wysłać list na listę dyskusyjną programistów gphoto (po angielsku)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Brak karty pamięci"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Nie można odczytać pojemności baterii"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Poziom baterii aparatu jest zbyt niski (%d%%). Operacja przerwana."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Nie można odczytać pozostałej ilości pamięci"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Aparat 3 razy odrzucił próbę utrzymania połączenia."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Pierwszy odebrany bajt (0x%x) jest nieprawidłowy."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -10802,49 +13160,49 @@
 "Upłynął limit czasu przy transmisji pakietu po %i próbach. Proszę "
 "skontaktować się z %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Nie udało się przesłać pakietu nawet po kilku próbach."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Pakiet odrzucony przez aparat. Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Nie udało się przesłać pakietu (kod błędu %i). Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Upłynął limit czasu przy transmisji po 2 próbach. Poddaję się..."
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Otrzymano nieoczekiwany wynik 0x%x. Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Odebrano nieoczekiwaną odpowiedź (%i). Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Nie udało się uzyskać rejestru %i. Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Zbyt dużo prób nie powiodło się."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Wysyłanie danych..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -10852,146 +13210,142 @@
 "wywołania rekurencyjne nie są obsługiwane przez sterownik sierra! Proszę "
 "skontaktować się z %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Nie udało się uzyskać rejestru łańcuchowego %i. Proszę skontaktować się z %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Oczekiwano 32 bajtów, otrzymano %i. Proszę skontaktować się z %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Prędkość migawki w mikrosekundach (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Prędkość migawki (w sekundach)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Cz/B"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Powolna synchronizacja"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontrast-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Jasność+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Jasność-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Regulacja obrazu"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Miganie"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Tryb LED"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Nieskończoność"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Podgląd miniaturki"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Następne"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Poprzednie"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Tryb działania"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Jasność LCD"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Automatyczne wyłączenie LCD (sekundy)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Centralnie ważony"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Macierz"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Punkt AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Pomiar ekspozycji"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Powiększenie (w milimetrach)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "brak"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Blokada AE"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Rybie oko"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Szeroki"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Różne ustawienia ekspozycji/obiektywu"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Automatyczna blokada ekspozycji"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11020,7 +13374,7 @@
 "        Aby ustawić prędkość migawki należy ustawić\n"
 "        aparat w tryb 'M'.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11039,67 +13393,63 @@
 "\n"
 "    Ściąganie zdjęć powinno działać poprawnie.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Biała tablica"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Czarna tablica"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Tryb koloru lub funkcji"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Wolny"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Wypełnienie przeciwko czerwonym oczom"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluorescencyjne-1-dom-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluorescencyjne-2-biurko-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Fluorescencyjne-3-biuro-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Zmierzch"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Tryb LCD"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Powiększenie cyfrowe"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Położenie ogniska"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Format czasu"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11134,7 +13484,7 @@
 "    ponownie podłączyć aparat do komputera i przełączyć\n"
 "    LCD na 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11164,7 +13514,7 @@
 "    ponownie podłączyć aparat do komputera i przełączyć\n"
 "    LCD na 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11193,117 +13543,122 @@
 "    konfigurację, proszę skontaktować się z listą\n"
 "    dyskusyjną programistów gphoto.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (nieznany)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Plik do przesłania ma zerową długość"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Za mało dostępnej pamięci na karcie pamięci"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Nie można uzyskać nazwy folderu zawierającego zdjęcia"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Przesyłanie do aparatu jest obsługiwane tylko w folderze '%s'"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Najlepsza"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (nieznany)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Prędkość migawki (mikrosekundy, 0 auto)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Czarno-biały"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Biała tablica"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Czarna tablica"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Jasność/kontrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Jasność+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Jasność-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Skylight"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Nieskończoność/Rybie oko"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Tryb pomiaru punktu"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Automatyczne wyłączanie (host) (w sekundach)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 "Po jakim czasie aparat ma się wyłączać kiedy jest podłączony do komputera?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Automatyczne wyłączanie (pole) (w sekundach)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11311,113 +13666,113 @@
 "Po jakim czasie aparat ma się wyłączać kiedy nie jest podłączony do "
 "komputera?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Automatyczne wyłączanie LCD (w sekundach)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Ustawienia zdjęć"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "normalna"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "Najwyższa"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "kolor"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "czerń i biel"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "Uwaga: brak karty pamięci, niektóre wartości mogą być nieprawidłowe\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Model aparatu: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Numer seryjny: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Wersja oprogramowania: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Wykonanych zdjęć: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Pozostało zdjęć: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Czas życia baterii: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Pozostało pamięci: %i bajtów\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Data: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Podręcznik do aparatu niedostępny.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11438,7 +13793,7 @@
 "  PhotoPC 3000z, jeśli aparat zachowuje się inaczej, proszę\n"
 "  wysłać list na adres %s (po angielsku)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11474,7 +13829,7 @@
 "    ponownie podłączyć aparat do komputera i przełączyć\n"
 "    LCD na 'Off'."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11494,12 +13849,7 @@
 "za wykorzystanie ich Olympusa C-3030Z do implementacji\n"
 "obsługi USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (nieznany)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11509,11 +13859,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Nie udało się zastosować ustawień USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11533,7 +13883,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Sterownik dostępu do aparatów Smal Ultrapocket i wersji OEM (slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11551,7 +13901,7 @@
 "Aparat Sonix.\n"
 "Zawiera %i zdjęć. \n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11578,7 +13928,7 @@
 "klatki.\n"
 "Nie można usuwać pojedynczych zdjęć z wyjątkiem ostatniego.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11586,7 +13936,7 @@
 "Biblioteka dla aparatów Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11600,7 +13950,7 @@
 "który napisał Ken-ichi Hayashi\n"
 "Port Gphoto2 wykonał Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11612,7 +13962,7 @@
 "Oryginalnie napisał Mark Davies <mdavies@dial.pipex.com>\n"
 "Port gPhoto2 wykonał Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11625,12 +13975,12 @@
 "Cała pamięć:  %ikB\n"
 "Wolna pamięć: %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Wersja firmware'u: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11638,7 +13988,7 @@
 "Sterownik Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11647,7 +13997,7 @@
 "FLASH:\n"
 " Plików: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11664,7 +14014,7 @@
 "Miejsce użyte: %8d\n"
 "Miejsce wolne: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "Biblioteka spca50x v"
 
@@ -11730,12 +14080,12 @@
 "Ogólny sterownik sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Ramka cyfrowa USB ma układ ST2205\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11745,7 +14095,7 @@
 "Sterownik gphoto dla tych urządzeń pozwala ściągać,\n"
 "przesyłać i usuwać zdjęcia z ramki cyfrowej."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11757,11 +14107,7 @@
 "Ten sterownik umożliwia ściąganie, przesyłanie i usuwanie zdjęć\n"
 "z ramki cyfrowej."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientacja"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11773,111 +14119,111 @@
 "Sterownik do aparatów używających procesora ASIC STV0674.\n"
 "Protokół wstecznie rozpracowany przy użyciu SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Zła ekspozycja (prawdopodobnie za mało światła)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Informacje dla aparatu opartego o STV0680:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Wersja firmware'u: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Wersja ASIC: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "ID sensora: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr ""
 "Aparat jest skonfigurowany dla świateł migających z częstotliwością %dHz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Pamięć w aparacie: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Aparat obsługuje miniaturki.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Aparat obsługuje filmy.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Zdjęcia z aparatu są monochromatyczne.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Aparat ma pamięć.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Aparat obsługuje formaty obrazu: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "ID producenta: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "ID produktu: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Liczba zdjęć: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Maksymalna liczba zdjęć: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Szerokość obrazu: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Wysokość obrazu: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Rozmiar obrazu: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Szerokość miniaturki: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Wysokość miniaturki: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Rozmiar miniaturki: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11893,12 +14239,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Rozszerzono dla aparatów Aiptek PenCam oraz innych STM USB Dual-mode."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Pobieranie informacji o %i plikach..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11911,19 +14257,19 @@
 "Proszę wysyłać raporty błędów i komentarze.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z jest tylko na USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Ustawienia sterownika"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Tryb turbo"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11935,12 +14281,12 @@
 "Biblioteka do ściągania / przesyłania plików z urządzeń Topfield PVR.\n"
 "Przeniesiono z puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Ściąganie %s..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -11950,39 +14296,66 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Sterownik Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Ramka cyfrowa USB ma układ TP6801\n"
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Ramki cyfrowe oparte na TP6801 są w różnych rozdzielczościach.\n"
+"Sterownik gphoto dla tych urządzeń pozwala ściągać,\n"
+"przesyłać i usuwać zdjęcia z ramki cyfrowej."
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Sterownik ramki cyfrowej USB TP6081\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Ten sterownik umożliwia ściąganie, przesyłanie i usuwanie zdjęć\n"
+"z ramki cyfrowej."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "Błąd wewnętrzny przy szukaniu camlibów (ścieżka zbyt długa?)."
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Wczytywanie sterowników do aparatów z '%s'..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Wystąpił błąd w bibliotece io ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Nie udało się wykryć żadnego aparatu"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Nie udało się wykryć żadnego aparatu na porcie %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Trzeba ustawić port przed inicjalizacją aparatu."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Nie udało się wczytać wymaganego sterownika aparatu '%s' (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Sterownik aparatu '%s' nie ma funkcji 'camera_init'."
@@ -12020,12 +14393,12 @@
 msgid "This camera can not capture previews."
 msgstr "Ten aparat nie może robić podglądu zdjęcia."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Ścieżka '%s' nie jest bezwzględna."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12034,122 +14407,116 @@
 "Próbowano usunąć '%s' z folderu '%s', ale system plików nie obsługuje "
 "usuwania plików."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Nadal istnieją podkatalogi w folderze '%s/%s', który próbowano usunąć."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Nadal istnieją pliki w folderze '%s/%s', który próbowano usunąć."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "System plików nie obsługuje przesyłania plików do aparatu."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr "Folder '%s' zawiera tylko %i plików, a żądano pliku o numerze %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Nie udało się odnaleźć pliku '%s' w folderze '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Nie udało się odnaleźć pliku '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "System plików nie obsługuje pobierania plików"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Nieznany rodzaj pliku %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "System plików nie obsługuje pobierania informacji o plikach"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "System plików nie obsługuje ustawiania informacji o plikach"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Atrybutów tylko do odczytu, jak szerokość i wysokość, nie można zmienić."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "System plików nie obsługuje pobierania informacji o nośniku"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Dane uszkodzone"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Plik istnieje"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Nieznany model"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Nie odnaleziono katalogu"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Katalog istnieje"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Trwa operacja wejścia/wyjścia"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Ścieżka nie jest bezwzględna"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Aparat nie zakończył operacji"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Błąd systemu operacyjnego podczas komunikacji z aparatem"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Za mało wolnego miejsca"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Nieznany błąd biblioteki aparatu"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Nieznany błąd"
-
-#~ msgid "Canon EOS Trigger Capture failed: 0x%x"
-#~ msgstr "Canon EOS Trigger Capture nie powiodło się: 0x%x"
-
-#~ msgid "Initializing Camera"
-#~ msgstr "Inicjalizacja aparatu"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/ru.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/ru.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/ru.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/ru.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.4.13\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2012-03-30 14:41+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -26,19 +26,19 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -71,19 +71,19 @@
 "Базовый драйвер Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -91,17 +91,19 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 #, fuzzy
 msgid "Picture Frame Configuration"
 msgstr "Конфигурация фотоаппарата"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -110,7 +112,7 @@
 "Количество изображений: %i\n"
 "Версия прошивки: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -134,80 +136,80 @@
 "Реализовано благодаря документации доступной в\n"
 "Интернете с согласия Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Невозможно создать каталог %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Невозможно удалить каталог %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*НЕИЗВЕСТНО*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
 "%i"
 msgstr ""
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Нельзя использовать строчные буквы в %s."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Файл защищен."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Невозможно получить миниатюру JPEG: Отсутствует начало/конец"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Невозможно получить миниатюру JPEG: Данные не соответствуют формату JFIF"
@@ -217,23 +219,23 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -242,311 +244,322 @@
 "внимание: контрольная сумма не проверена (+ длина %d, значение 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr ""
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 #, fuzzy
 msgid "Thumbnail"
 msgstr "Размер миниатюры: %d\n"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 #, fuzzy
 msgid "Full Image"
 msgstr "Изображение"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 #, fuzzy
 msgid "Auto focus: one-shot"
 msgstr "Ошибка автофокусировки"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 #, fuzzy
 msgid "Auto focus: AI servo"
 msgstr "Ошибка автофокусировки"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 #, fuzzy
 msgid "Auto focus: AI focus"
 msgstr "Ошибка автофокусировки"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 #, fuzzy
 msgid "Manual focus"
 msgstr "Ручной"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 #, fuzzy
 msgid "Beep off"
 msgstr "Сигнал"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 #, fuzzy
 msgid "Beep on"
 msgstr "Сигнал"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 #, fuzzy
 msgid "Flash off"
 msgstr "Режим вспышки"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 #, fuzzy
 msgid "Flash on"
 msgstr "Режим вспышки"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 #, fuzzy
 msgid "Flash auto"
 msgstr "Режим вспышки"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 #, fuzzy
 msgid "Manual 2"
 msgstr "Ручной"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 #, fuzzy
 msgid "Far scene"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr ""
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr ""
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Сепия"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 #, fuzzy
 msgid "Portrait"
 msgstr "Контраст"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Точечный"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Макро"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 #, fuzzy
 msgid "BW"
 msgstr "Ч/Б"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 #, fuzzy
 msgid "PanFocus"
 msgstr "Фокус"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 #, fuzzy
 msgid "Neutral"
 msgstr "Норм."
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 #, fuzzy
 msgid "Long shutter"
 msgstr "Фокусное расстояние"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 #, fuzzy
 msgid "Indoor"
 msgstr "Солнечный"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr ""
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr ""
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr ""
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr ""
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr ""
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr ""
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 #, fuzzy
 msgid "Digital macro"
 msgstr "Цифровое увеличение"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 #, fuzzy
 msgid "MyColors"
 msgstr "Цвет"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -563,44 +576,44 @@
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Фотоаппарат недоступен"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Фотоаппарат выключается"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Ошибка захвата изображения"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Невозможно получить имя диска: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Причина неизвестна"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Невозможно получить информацию о диске: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Внутренняя ошибка 1 в функции get_file_func() (%s строка %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Не найден файл звукозаписи для %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -611,35 +624,35 @@
 "  %11s байт всего\n"
 "  %11s байт свободно"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "блок питания"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "аккумулятор"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "питание ОК"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "сбой питания"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "нет данных: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (время компьютера %s%i секунд)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -666,7 +679,7 @@
 "\n"
 "Время: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -687,746 +700,768 @@
 "добавление A5 - Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Ошибка удаления файла"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Ошибка удаления связанного файла миниатюры"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Превышающие 57600 скорости не поддерживаются при загрузке в этот фотоаппарат"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Невозможно получить букву устройства карты памяти"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
 msgstr ""
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Невозможно создать каталог \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Невозможно создать целевой каталог"
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Конфигурация фотоаппарата и драйвера "
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr ""
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 #, fuzzy
 msgid "Owner Name"
 msgstr "Имя владельца"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr ""
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 #, fuzzy
 msgid "Shooting mode"
 msgstr "Скорость ISO"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Приближение"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Диафрагма"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 #, fuzzy
 msgid "Image Format"
 msgstr "Формат даты"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Режим фокусировки"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Сигнал"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 #, fuzzy
 msgid "Camera Actions"
 msgstr "Прочие параметры"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 #, fuzzy
 msgid "Camera Status Information"
 msgstr "Конфигурация фотоаппарата"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Ошибка"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Версия прошивки: %8s"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 #, fuzzy
 msgid "Power"
 msgstr "Экономия энергии"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Драйвер"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Показатьсписок всех файлов"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Сохранить имя файла при закачке"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Фотоаппарат недоступен"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Имя владельца изменено"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 #, fuzzy
 msgid "ISO speed changed"
 msgstr "Имя владельца изменено"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 #, fuzzy
 msgid "Could not change ISO speed"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 #, fuzzy
 msgid "Shooting mode changed"
 msgstr "Скорость ISO"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 #, fuzzy
 msgid "Could not change shooting mode"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 #, fuzzy
 msgid "Shutter speed changed"
 msgstr "Скорость ISO"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 #, fuzzy
 msgid "Could not change shutter speed"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 #, fuzzy
 msgid "Invalid aperture setting"
 msgstr "Параметры диафрагмы"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 #, fuzzy
 msgid "Aperture changed"
 msgstr "Параметры диафрагмы"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 #, fuzzy
 msgid "Could not change aperture"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 #, fuzzy
 msgid "Invalid exposure compensation setting"
 msgstr "Компенсация выдержки"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 #, fuzzy
 msgid "Exposure compensation changed"
 msgstr "Компенсация выдержки"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 #, fuzzy
 msgid "Could not change exposure compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 #, fuzzy
 msgid "Invalid image format setting"
 msgstr "Прочие параметры"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 #, fuzzy
 msgid "Image format changed"
 msgstr "Изображение защищено."
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 #, fuzzy
 msgid "Could not change image format"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 #, fuzzy
 msgid "Focus mode changed"
 msgstr "Режим фокусировки"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 #, fuzzy
 msgid "Could not change focus mode"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 #, fuzzy
 msgid "Beep mode changed"
 msgstr "Имя владельца изменено"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 #, fuzzy
 msgid "Could not change beep mode"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 #, fuzzy
 msgid "Could not change zoom level"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 #, fuzzy
 msgid "Flash mode changed"
 msgstr "Карта CompactFlash"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 #, fuzzy
 msgid "Could not change flash mode"
 msgstr "Невозможно получить букву устройства карты памяти"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "время установлено"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "невозможно установить время"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Получен неподдерживаемый тип порта %i = 0x%x. Инициализация невозможна."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Акуумулятор разряжен, фотоаппарат выключен."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "ОШИБКА: неожиданное сообщение"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "ОШИБКА: наслоение сообщений"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "ОШИБКА: нарушение последовательности"
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "ОШИБКА: неожиданный тип пакета"
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "ОШИБКА: неверный формат сообщения"
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "ОШИБКА: неожиданное сообщение2"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Закачка файла..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Получение файла..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Ошибка изменения скорости."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Сброс протокола..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 #, fuzzy
 msgid "Camera OK."
 msgstr "Фотоаппарат ОК.\n"
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Поиск фотоаппарата..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Установление связи с фотоаппаратом..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Ошибка связи 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Нет ответа от фотоаппарата"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Нераспознанный ответ"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Обнаружен \"%s\" или \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Неизвестная модель \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr ""
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Ошибка связи 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Ошибка связи 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Изменение скорости... подождите..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Ошибка изменения скорости"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 #, fuzzy
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Ошибка ожидания сигнала ACK во время повторной инициализации"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Ошибка ожидания сигнала ACK во время инициализации"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Фотоаппарат подключен"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "ОШИБКА: обнаружены признаки неисправимой ошибки. Невозможно продолжать"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ОШИБКА: %d слишком велик"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Получение миниатюры..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "НЕ РАСПОЗНАНО"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Невозможно установить соединение с фотоаппаратом"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Фотоаппарат уже был активен"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Фотоаппарат выведен из спящего режима"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "не распознан начальный ответ фотоаппарата %c/'%s')"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Фотоаппарат не готов, несколько запросов идентификации завершились ошибкой: "
 "%s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Фотоаппарат не готов, %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
 "%i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Принимаются данные..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Недостаточно памяти: необходимо %d байт(ов)."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Невозможно прочесть файл \"%s\""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Недостаточно памяти: необходимо %ld байт(ов)."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Закачка файла не удалась."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Обнаружен '%s'."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Сообщаемого фооаппаратом названия \"%s\" нет среди известных моделей"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, fuzzy, c-format
 msgid "Image type %d not supported"
 msgstr "Данный формат изображения не поддерживается"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Изображение %s защищено от удаления."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1434,40 +1469,40 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Конфигурация фотоаппарата"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Аккумулятор"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 #, fuzzy
 msgid "Brightness"
 msgstr "Яркость-"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 #, fuzzy
 msgid "Too bright"
 msgstr "Copyright"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 #, fuzzy
 msgid "Too dark"
 msgstr "Недостаточное освещение"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "ОК"
 
@@ -1536,16 +1571,16 @@
 "Базовый драйвер sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Данный формат изображения не поддерживается"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Количество изображений: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1553,7 +1588,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1561,24 +1596,24 @@
 "Поддерживается обращения только в корневую папку - запрошен список файлов "
 "папки '%s'."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Проблема получения числа изображений"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Проблема получения сведений об изображении"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Неподдерживаемый метод съёмки"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (аккумулятор заряжен на %d%%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, fuzzy, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1595,88 +1630,89 @@
 "Выбрано разрешение %s\n"
 "Тип питания: %s, %s\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Вспышка"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 #, fuzzy
 msgid "No Flash"
 msgstr "БЕЗ вспышки"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Двойная ирисовая диафрагма"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 #, fuzzy
 msgid "No Dual Iris"
 msgstr "БЕЗ двойной ирисовой диафрагмы"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Переключение разрешения"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 #, fuzzy
 msgid "No Resolution Switch"
 msgstr "БЕЗ переключения разрешения"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 #, fuzzy
 msgid "No Power Light"
 msgstr "БЕЗ индикатора питания"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "ВКЛ"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "ВЫКЛ"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "готов"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 #, fuzzy
 msgid "Not ready"
 msgstr "НЕ готов"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "в режиме заполнения"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 #, fuzzy
 msgid "Not in fill mode"
 msgstr "НЕ в режиме заполнения"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "низкое (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "высокое  (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "снаружи"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "внутри"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1694,7 +1730,7 @@
 "  или определяться автоматически.\n"
 "* Пока что качество изображений уступает возможному.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1724,114 +1760,230 @@
 "     Информация о протоколе обмена, формате исходных данных,\n"
 "     портирование для gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Ошибка чтения изображения с карты памяти"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Копируется изображение..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Проблема копирования изображения"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Копирование прервано пользователем"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Ошибка съёмки"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Выдержка"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Автоматическая настройка выдержки во время предварительного просмотра"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Длительность выдержки во время предварительного просмотра"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Автовспышка при съёмке"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Ошибка открытия порта"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Ошибка сброса состояния фотоаппарата"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Проблема установки скорости обмена данными с фотоаппаратом"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Похоже, что это модем, а не фотоаппарат"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Составление списка файлов в '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Получение списка папок в '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Невозможно получить сведения о '%s' (%m)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, fuzzy, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Невозможно получить сведения о '%s' в '%s' (%m)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Невозможно изменить время файла '%s' в '%s' (%m)"
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Невозможно открыть '%s'."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, fuzzy, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Невозможно удалить файл '%s' в папке '%s' (код ошибки %i: %m)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Конфигурация фотоаппарата и драйвера "
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Скорость ISO"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Разрешение"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Разрешение"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Режим цвета"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Режим цвета"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 #, fuzzy
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
@@ -1842,89 +1994,89 @@
 "<olivier@aixmarseille.com>, сделана на основе драйвера spca50x.Спасибо "
 "авторам spca50x! Адаптировать ваш драйвер для этого аппарата было нетрудно! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Невозможно установить соединение с фотоаппаратом."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Фотоаппарат отклонил команду."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Самопроизвольный сброс состояния фотоаппарата."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Копирование..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Фотоаппарат не поддерживает скорость %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr ""
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1932,36 +2084,36 @@
 "Matthew G. Martin\n"
 "На основе fujiplay от Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Битовая скорость %ld не поддерживается."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr ""
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Дата и время"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Версия:"
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Модель:"
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Доступная память:"
 
@@ -1983,16 +2135,16 @@
 "любезно предоставлены фирмой Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Невозможно сбросить состояние фотоаппарата.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2001,7 +2153,7 @@
 "Фотоаппарат позволяет удалить только последний файл. В данном случае это "
 "файл '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2011,7 +2163,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2051,25 +2203,25 @@
 "Базовый драйвер Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Сделано снимков     : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr ""
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Копируются данные..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Копируется миниатюра..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2085,7 +2237,7 @@
 "   - миниатюры (64x48, формат PGM )\n"
 "   - фотографии (640x480, формат PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2097,32 +2249,32 @@
 "Драйвер фотоаппарата Jenoptik JD11.\n"
 "Для исследования протокола применялись WINE и IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 #, fuzzy
 msgid "JD11 Configuration"
 msgstr "Конфигурация"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Прочие параметры"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Продолжительность сверхдлинной выдержки"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Настройки цвета"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Красный"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Зелёный"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Синий"
 
@@ -2180,11 +2332,11 @@
 "Библиотека для фотоаппарата Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Карта CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2192,10 +2344,10 @@
 "sourceforge.net"
 msgstr ""
 "Фотоаппарат Kodak DC120 использует формат KDC для записи изображений. Для "
-"просмотра полученных из аппарата изображений понадобится программа \"kdc2tiff"
-"\". Её можно загрузить по адресу http://kdc2tiff.sourceforge.net"
+"просмотра полученных из аппарата изображений понадобится программа "
+"\"kdc2tiff\". Её можно загрузить по адресу http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2207,13 +2359,13 @@
 "Библиотека для работы с фотоаппаратом Kodak DC120.\n"
 "(по многочисленным требованиям)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Получение данных..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr ""
 
@@ -2226,7 +2378,8 @@
 msgstr "Тип файла"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2239,7 +2392,7 @@
 msgstr "Разрешение"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2263,8 +2416,9 @@
 msgid "High (good quality)"
 msgstr "высокое (хорошее качество)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Съёмка"
 
@@ -2293,77 +2447,84 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Нет"
 
@@ -2372,71 +2533,78 @@
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Вкл"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Выкл"
 
@@ -2452,7 +2620,7 @@
 msgid "Port speed"
 msgstr "Скорость порта"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Название альбома"
 
@@ -2665,58 +2833,58 @@
 "Библиотека для фотоаппарата Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Параметр 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Параметр 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Параметр 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Модель: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Версия прошивки: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Состояние аккумулятора: %s, Блок питания: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Количество изображений: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr ""
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2730,45 +2898,46 @@
 "Библиотека для фотоаппаратов Kodak DC240, DC280, DC3400 и DC5000.\n"
 "Обновлено и переписано для gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Слабая"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Пусто"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Ошибка"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Отсоединён"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Подсоединён"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Карта памяти вынута"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Карта памяти не открыта"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Карта памяти не отформатирована"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Нет карты памяти"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2776,12 +2945,12 @@
 "Выполняется действие. Данный фотоаппарат не поддерживает одновременное "
 "выполнение нескольких команд. Дождитесь окончания текущей операции.."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr ""
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2797,7 +2966,7 @@
 "реагировать, просто заново выберите его. При этом произойдёт новая "
 "инициализация."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2809,7 +2978,7 @@
 "\n"
 "Вопросы и отзывы принимаются с благодарностью."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2818,7 +2987,7 @@
 "Модель вашего USB-фотоаппарата - Kodak EZ200.\n"
 "Число изображений = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2826,107 +2995,107 @@
 "Драйвер Kodak EZ200\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Ошибка фокусировки."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Ошибка ирисовой диафрагмы"
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr ""
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Ошибка контрольной суммы ППЗУ"
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Внутренняя ошибка (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Внутренняя ошибка (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Нет карты памяти."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Неподдерживаемая карта памяти"
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr ""
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr ""
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr ""
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Карта памяти защищена от записи"
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr ""
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Изображение защищено."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Недостаточное освещение"
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Ошибка автофокусировки"
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Системная ошибка."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Недопустимый параметр:"
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr ""
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr ""
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr ""
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Неподдерживаемая команда."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr ""
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr ""
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -2934,18 +3103,18 @@
 "error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "Фотоаппарат только что сообщил об нераспознанной ошибке. Пожалуйста, "
-"сообщите об этом %s и опишите, как и когда произошла эта ошибка: (0x%x,0x"
-"%x). Большое спасибо!"
+"сообщите об этом %s и опишите, как и когда произошла эта ошибка: "
+"(0x%x,0x%x). Большое спасибо!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Получение списка файлов..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr ""
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -2954,12 +3123,12 @@
 "Невозможно установить связь с фотоаппаратом. Убедитесь, что он включён и "
 "подсоединён к компьютеру."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr ""
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2978,7 +3147,7 @@
 "Название: %s,\n"
 "Производитель: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -2988,399 +3157,408 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Поддержка всех аппаратов Konica и некоторых моделей HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Получение конфигурации..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Настройка Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Постоянные настройки"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr ""
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Время автоспуска"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Время автовыключения"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Интервал между слайдами"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "высокое (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "среднее (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "высокое (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Локализация"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Язык"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Не выбран"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Формат вывода на ТВ"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Не показывать ТВ меню"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Формат даты"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Месяц/День/Год"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "День/Месяц/Год"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Год/Месяц/День"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr ""
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Вкл, уменьшение красноты глаз"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Фокус"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Фикс."
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Временные настройки"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Автоспуск"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Автоспуск (след. снимок только)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Норм."
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Не найдены данные локализации в '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Слишком длинный файл локализации!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr ""
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Данные повреждены."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Формат изображения %d не поддерживается фотоаппаратом !"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr ""
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Закачка изображения..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr ""
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Нет ответа от фотоаппарата."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Низк."
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Средн."
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Высок."
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "ЖК"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Значки"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Баланс белого"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Офис"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Дневной свет"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Чёткость"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Резко"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Мягко"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Цвет"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Светлый"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Глубокий"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Чёрно-белый"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Одиночный кадр"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Последовательность 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Отображение даты"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Где угодно"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Режим воспроизведения"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Режим записи"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Везде"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "Блок питания"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Воспроизв."
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Запись"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "ДД/ММ/ГГГГ"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, fuzzy, c-format
 msgid "YYYY/MM/DD"
 msgstr "ГГГГ/ММ/ДД"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "ММ/ДД/ГГГГ"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, fuzzy, c-format
 msgid ""
 "Model: %s\n"
@@ -3401,7 +3579,7 @@
 "Отображение даты: %s\n"
 "Дата и время: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3416,7 +3594,7 @@
 "http://www.ap2c.com\n"
 "Поддержка французской версии Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, fuzzy, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3437,7 +3615,7 @@
 "\n"
 "Спасибо за использование GPhoto2 и ОС UNIX/Linux.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3448,7 +3626,7 @@
 "\n"
 "Поддержка фотоаппарата Largan Lmini.\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3456,13 +3634,110 @@
 "Firmware Version: %s\n"
 msgstr ""
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Конфигурация"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Фиксация выдержки"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Скорость ISO"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+#, fuzzy
+msgid "Quality"
+msgstr "Качество изображения"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "Качество изображения"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+#, fuzzy
+msgid "Movie"
+msgstr "Звук"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+#, fuzzy
+msgid "Autofocus Mode"
+msgstr "Режим фокусировки"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "Режим видоискателя"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Режим объектива"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Вспомогательное освещение"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Вспомогательное освещение"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Режим объектива"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Ручной"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Режим цвета"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, fuzzy, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3477,7 +3752,7 @@
 "Фотоаппарат Mars MR97310.\n"
 "Содержит %i снимков. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 #, fuzzy
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
@@ -3502,7 +3777,7 @@
 "Если фотоаппарат хранит видеозаписи, то отдельные кадры можно получить\n"
 "в виде последовательности неподвижных фотографий.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3510,7 +3785,7 @@
 "Библиотека для фотоаппарата Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3521,7 +3796,7 @@
 "Версия устройства:\t%s\n"
 "Версия прошивки:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3548,61 +3823,63 @@
 "ID карты:\t\t%d\n"
 "Режим вспышки:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Автономный"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Подключённый"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Да"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Нет"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Улучшенный"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Стандартный"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Автомат\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Принудительная вспышка\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Запрет вспышки\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3619,74 +3896,74 @@
 "Зарядка вспышки:\t\t%s\n"
 "Состояние объектива:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Неполная"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Полная"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Занято"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Свободно"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Зарядка"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Готов"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Нормальный\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Состояние карты:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Защищена от записи"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Несовместимая карта"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3699,63 +3976,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Особо благодарю фирму Minolta за предоставленные спецификации."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Вспышка: Авто (Против красных глаз)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Вспышка : Авто"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Вспышка : Вкл. (Против красных глаз)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Вспышка : Вкл."
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Вспышка : Выкл."
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Вспышка : не определено"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr ""
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Заряд аккумулятора в норме."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Заряд аккумулятора недостаточен."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 #, fuzzy
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
@@ -3768,25 +4045,25 @@
 "Адаптация для gphoto2 - Marcus Meissner <marcus@jet.franken.de>\n"
 "Поддерживает последовательный и USB протоколы."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "Библиотека coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Отключение фотоаппарата."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Копируется изображение %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Закачка изображения: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3795,17 +4072,17 @@
 "Размер файла составляет %ld байт. Максимально возможный размер для закачки: "
 "%i байт."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Закачка..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Удаляется изображение %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3821,12 +4098,12 @@
 "Fredrik Roubert <roubert@df.lth.se> и\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Копируется %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 #, fuzzy
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
@@ -3843,12 +4120,12 @@
 "Fredrik Roubert <roubert@df.lth.se> и\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Копируется '%s'..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -3870,7 +4147,7 @@
 "равно лишь 300 тысячам пикселей, поэтому качество получаемых снимков "
 "оставляет желатьлучшего."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3886,7 +4163,7 @@
 "таких положений, особенно, если проблема возникает при скоростях больших чем "
 "9600 и аппарат не выключается полностью."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3894,7 +4171,7 @@
 "Драйвер Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3905,7 +4182,7 @@
 " Свободно памяти %8d байт.\n"
 " Число файлов: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3919,11 +4196,11 @@
 "и: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Копируется файл..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 #, fuzzy
 msgid ""
 "Creative PC-CAM600\n"
@@ -3933,32 +4210,133 @@
 " Автор: Peter Kajberg\n"
 " э-почта: <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Модель:"
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Неизвестная модель"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Размер изображения"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Качество изображения"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "Скорость ISO"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr ""
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr ""
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr ""
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "Ч/Б"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Неизвестная модель"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -3972,12 +4350,12 @@
 "<lutz@users.sf.net>.\n"
 "Тестирование Polaroid 640SE - Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Модель: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 #, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
@@ -3993,124 +4371,112 @@
 "sourceforge.net>.Исправление ошибок - Marcus Meissner <marcus@jet.franken."
 "de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Качество изображения"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Размер изображения"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Параметры вспышки"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Автоматическое отключение (минуты)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "нормальное"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "высокое"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "наилучшее"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "авто"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "вкл"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "выкл"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "воспроизведение"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "запись"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "меню"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "аккумулятор"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "блок питания"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Получен неожиданный ответ"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Ошибка контрольной суммы"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
 "picture %i back"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
 "and ask for assistance."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4120,19 +4486,20 @@
 "- Ryan Lantzer <rlantzer@umr.edu> для gphoto-4.x. Адаптация для gphoto2 - "
 "Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Фотоаппарат"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Изображение"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4165,3800 +4532,5760 @@
 "Автоматическое выключение: %i минут\n"
 "Источник питания: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Состояние карты:\t\t"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Модель:"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Модель:"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Приближение"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Режим вспышки"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Шаблон"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Съёмка"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+#, fuzzy
+msgid "AE Lock"
+msgstr "Выдержка"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "Прочие параметры"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Неизвестный тип файла %i."
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, fuzzy, c-format
-msgid "Unknown value %04d"
-msgstr "Неизвестный тип файла %i."
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "неожиданный тип данных %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Ручной"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 #, fuzzy
 msgid "Automatic"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Вольфрамовая лампа"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Облачность"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 #, fuzzy
 msgid "Shade"
 msgstr "Резко"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 #, fuzzy
 msgid "Fluorescent Lamp 1"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 #, fuzzy
 msgid "Fluorescent Lamp 2"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 #, fuzzy
 msgid "Fluorescent Lamp 3"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 #, fuzzy
 msgid "Fluorescent Lamp 4"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 #, fuzzy
 msgid "Fluorescent Lamp 5"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 #, fuzzy
 msgid "Choose Color Temperature"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "Вольфрамовая лампа"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Шаблон"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Пользовательский"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 #, fuzzy
 msgid "RAW + JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 #, fuzzy
 msgid "RAW + JPEG Normal"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 #, fuzzy
 msgid "Single frame"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 #, fuzzy
 msgid "Self-timer"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Стандартный"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2035
 #, fuzzy
 msgid "undefined"
 msgstr "наилучшее"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 #, fuzzy
 msgid "Undefined"
 msgstr "высокое"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Пользовательский"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 #, fuzzy
 msgid "Sports"
 msgstr "Точечный"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 #, fuzzy
 msgid "Flash Off"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Яркость ЖК-экрана"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Недостаточно памяти"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Рыбий глаз"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "Стандартный"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Контраст"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1x"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 #, fuzzy
 msgid "red eye suppression"
 msgstr "Вкл, уменьшение красноты глаз"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 #, fuzzy
 msgid "auto + red eye suppression"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 #, fuzzy
 msgid "on + red eye suppression"
 msgstr "Вкл, уменьшение красноты глаз"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 #, fuzzy
 msgid "Auto Aperture"
 msgstr "Диафрагма"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 #, fuzzy
 msgid "Full Manual"
 msgstr "Ручной"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Локализация"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+#, fuzzy
+msgid "Large"
+msgstr "Изображение"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 #, fuzzy
 msgid "MF (fixed)"
 msgstr "Фикс."
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 #, fuzzy
 msgid "Center-weighted"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 #, fuzzy
 msgid "User defined 1"
 msgstr "наилучшее"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 #, fuzzy
 msgid "User defined 2"
 msgstr "наилучшее"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 #, fuzzy
 msgid "User defined 3"
 msgstr "наилучшее"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 #, fuzzy
 msgid "Multiple Focusing Points, Auto"
 msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-#, fuzzy
-msgid "Large"
-msgstr "Изображение"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 #, fuzzy
 msgid "Medium 1"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 #, fuzzy
 msgid "Medium 2"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 #, fuzzy
 msgid "Medium 3"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2244
-#, fuzzy
-msgid "Setting 4"
-msgstr "Параметры вспышки"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2245
-#, fuzzy
-msgid "Setting 5"
-msgstr "Параметры вспышки"
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2246
-#, fuzzy
-msgid "Setting 6"
-msgstr "Параметры вспышки"
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2247
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
 #, fuzzy
-msgid "Setting 7"
-msgstr "Параметры вспышки"
+msgid "LiveSpotAF"
+msgstr "Точечный автофокус"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, fuzzy, c-format
 msgid "Unknown %d"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 #, fuzzy
 msgid "Factory Default"
 msgstr "Дневной"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, fuzzy, c-format
+msgid "Auto ISO"
+msgstr "Авто"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 #, fuzzy
 msgid "mRAW + Large Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 #, fuzzy
 msgid "sRAW + Large Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:2733
 #, fuzzy
 msgid "mRAW + Medium Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 #, fuzzy
 msgid "sRAW + Medium Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 #, fuzzy
 msgid "mRAW + Small Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 #, fuzzy
 msgid "sRAW + Small Normal JPEG"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:2743
 #, fuzzy
 msgid "RAW + Smaller JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 #, fuzzy
 msgid "RAW + Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 #, fuzzy
 msgid "mRAW + Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 #, fuzzy
 msgid "sRAW + Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+msgid "Small + RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Изображение"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Средн."
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Режим видоискателя"
+
+#: camlibs/ptp2/config.c:2801
 #, fuzzy
 msgid "Single: Silent shooting"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Режим замера"
+
+#: camlibs/ptp2/config.c:2803
 #, fuzzy
 msgid "Timer 10 sec"
 msgstr "Автономный"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 #, fuzzy
 msgid "Timer 2 sec"
 msgstr "Автономный"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 #, fuzzy
 msgid "Super high speed continuous shooting"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 #, fuzzy
 msgid "Single silent"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 #, fuzzy
 msgid "Continuous silent"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, fuzzy, c-format
-msgid "Auto ISO"
-msgstr "Авто"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Экспокоррекция"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 #, fuzzy
 msgid "Automatic (No Flash)"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+#, fuzzy
+msgid "U1"
+msgstr "1x"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+#, fuzzy
+msgid "U2"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
+#: camlibs/ptp2/config.c:3840
 #, fuzzy
-msgid "Movie"
+msgid "Movie (P)"
+msgstr "Звук"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Звук"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "Звук"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
 msgstr "Звук"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Звук"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 #, fuzzy
 msgid "Sports Action"
 msgstr "Точечный"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 #, fuzzy
 msgid "Night Scene"
 msgstr "Светлый"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 #, fuzzy
 msgid "Hand-held Twilight"
 msgstr "Дневной свет"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "Настройки изображения"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "Контраст"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 #, fuzzy
 msgid "Candlelight"
 msgstr "Дневной свет"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "Флуоресцентная лампа"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
-msgid "Effects"
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3256
-#, fuzzy
-msgid "U1"
-msgstr "1x"
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:3257
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
 #, fuzzy
-msgid "U2"
-msgstr "2x"
+msgid "0 image"
+msgstr "Изображение"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
 
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
+msgid "Effects"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "Яркость ЖК-экрана"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 #, fuzzy
 msgid "Single Shot"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 #, fuzzy
 msgid "Timer"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 #, fuzzy
 msgid "Delayed Remote"
 msgstr "Автономный"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Автоспуск (только след. снимок)"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Скорость ISO"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Скорость ISO"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 #, fuzzy
 msgid "Bracketing WB Lo"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 #, fuzzy
 msgid "Bracketing DRO Lo"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 #, fuzzy
 msgid "Bracketing WB Hi"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 #, fuzzy
 msgid "Bracketing DRO Hi"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 #, fuzzy
 msgid "Centre-spot"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 #, fuzzy
 msgid "Single Area"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 #, fuzzy
 msgid "Single-area AF"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 #, fuzzy
 msgid "3D Tracking"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+#, fuzzy
+msgid "Wide-area AF (S)"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:4260
+#, fuzzy
+msgid "Wide-area AF (L)"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:4267
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Контраст"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 #, fuzzy
 msgid "Centre"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 #, fuzzy
 msgid "Bottom"
 msgstr "Приближение"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 #, fuzzy
 msgid "Right"
 msgstr "Светлый"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Широкоугольный"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Съёмка"
+
+#: camlibs/ptp2/config.c:4353
+msgid "Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4354
+msgid "Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4355
+msgid "Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 #, fuzzy
 msgid "Center Spot"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "Резко"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Стандартный"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Изображение"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Высок."
+
+#: camlibs/ptp2/config.c:4387
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 #, fuzzy
 msgid "Fill flash"
 msgstr "Вспышка"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 #, fuzzy
 msgid "External sync"
 msgstr "снаружи"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Чёрно-белый"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 #, fuzzy
 msgid "Color sketch"
 msgstr "Режим цвета"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
 msgstr "Высок."
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
+#, c-format
+msgid "%d mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
 #, fuzzy
 msgid "infinite"
 msgstr "Бесконечность"
 
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
-msgid "%d mm"
+msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
-#, c-format
-msgid "x 200"
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Сжатие"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Замедленная синхронизация"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Точечный автофокус"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Отображение даты"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 #, fuzzy
 msgid "Single-servo AF"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
+#: camlibs/ptp2/config.c:5651
 #, fuzzy
-msgid "Manual Focus"
+msgid "Manual Focus (fixed)"
 msgstr "Ручной"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "Ручной"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 #, fuzzy
 msgid "1 minute"
 msgstr "41 мм"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 мм"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 #, fuzzy
 msgid "8 mm"
 msgstr "58 мм"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 #, fuzzy
 msgid "2"
 msgstr "2x"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 #, fuzzy
 msgid "4"
 msgstr "4x"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 #, fuzzy
 msgid "8"
 msgstr "8x"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 #, fuzzy
 msgid "15"
 msgstr "1,5"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 #, fuzzy
 msgid "20s"
 msgstr "2,0"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 #, fuzzy
 msgid "15s"
 msgstr "1,5"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 #, fuzzy
 msgid "10s"
 msgstr "1,0"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 мм"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 #, fuzzy
 msgid "Sharper"
 msgstr "Резко"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 #, fuzzy
 msgid "Softer"
 msgstr "Мягко"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 #, fuzzy
 msgid "Direct Print"
 msgstr "Каталог существует"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 #, fuzzy
 msgid "Low contrast"
 msgstr "Контраст"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "Средн."
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 #, fuzzy
 msgid "Single-Servo AF"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 #, fuzzy
 msgid "One Shot"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "Фокус"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 #, fuzzy
 msgid "Shadow"
 msgstr "Резко"
 
-#: camlibs/ptp2/config.c:4366
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Пользовательский"
+msgid "Custom Whitebalance: PC-1"
+msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4367
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Пользовательский"
+msgid "Custom Whitebalance: PC-2"
+msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Пользовательский"
+msgid "Custom Whitebalance: PC-3"
+msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:4369
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "Пользовательский"
+msgid "Manual 3"
+msgstr "Ручной"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Ручной"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Ручной"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Зарядка"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 #, fuzzy
 msgid "Black & white"
 msgstr "Чёрно-белый"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Макрорежим"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 #, fuzzy
 msgid "AE & Flash"
 msgstr "БЕЗ вспышки"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 #, fuzzy
 msgid "AE only"
 msgstr "только для чтения"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 #, fuzzy
 msgid "Flash only"
 msgstr "Память ППЗУ"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 #, fuzzy
 msgid "Remote Mirror Up"
 msgstr "Дата Время"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "Режим работы"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "Режим работы"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "слабое (наилучшее качество)"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 #, fuzzy
 msgid "Flash/aperture"
 msgstr "Диафрагма"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 #, fuzzy
 msgid "NEF+Fine"
 msgstr "Улучшенный"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 #, fuzzy
 msgid "NEF+Normal"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "Норм."
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "Улучшенный"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "Улучшенный"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Улучшенный"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6922
+msgid "RAW Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "Точечный режим замера"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Высок."
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 #, fuzzy
 msgid "Optimal quality"
 msgstr "Качество изображения"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 #, fuzzy
 msgid "1/320s (Auto FP)"
 msgstr "Авто"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 #, fuzzy
 msgid "3 (Normal)"
 msgstr "Норм."
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 #, fuzzy
 msgid "AE/AF lock"
 msgstr "Фиксация выдержки"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 #, fuzzy
 msgid "AE lock only"
 msgstr "Фиксация выдержки"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 #, fuzzy
 msgid "Preview"
 msgstr "Предыдущий"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 #, fuzzy
 msgid "FV lock"
 msgstr "Фиксация выдержки"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 #, fuzzy
 msgid "AE lock (hold)"
 msgstr "Фиксация выдержки"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 #, fuzzy
 msgid "Matrix metering"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 #, fuzzy
 msgid "Center-weighted metering"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "Точечный режим замера"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "Воспроизв."
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 #, fuzzy
 msgid "1 step spd/aperture"
 msgstr "Диафрагма"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 #, fuzzy
 msgid "Viewfinder virtual horizont"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr ""
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Разрешение"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5271
-msgid "75%"
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
+#: camlibs/ptp2/config.c:7312
+msgid "75%"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 #, fuzzy
 msgid "Unknown value"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 #, fuzzy
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Фотоаппарат не поддерживает скорость %i."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 #, fuzzy
 msgid "Release Half"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 #, fuzzy
 msgid "Release Full"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 #, fuzzy
 msgid "Release 1"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 #, fuzzy
 msgid "Release 2"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 #, fuzzy
 msgid "Release 3"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "НЕ в режиме заполнения"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Размер изображения"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Карта памяти защищена от записи"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Карта памяти не отформатирована"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Ошибка ирисовой диафрагмы"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Последовательность 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Параметры диафрагмы"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Акуумулятор разряжен, фотоаппарат выключен."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "Ошибка ирисовой диафрагмы"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Параметры диафрагмы"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Карта памяти не отформатирована"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Параметры вспышки"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Режим программируемой выдержки"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "Флуоресцентная лампа"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "время установлено"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Чёрно-белый"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Автомат\n"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Автомат\n"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Неизвестно"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Макро"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Блок питания"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Стандартный"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Запись"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Воспроизв."
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Прочие параметры"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Экспокоррекция"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Не показывать ТВ меню"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Изображение"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Неизвестный тип файла %i."
+
+#: camlibs/ptp2/config.c:9970
 #, fuzzy
 msgid "Internal RAM"
 msgstr "внутри"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 #, fuzzy
 msgid "Memory card"
 msgstr "Нет карты памяти"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 #, fuzzy
 msgid "Display"
 msgstr "Отображение даты"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 #, fuzzy
 msgid "Default gateway"
 msgstr "Дневной"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 #, fuzzy
 msgid "List Wifi profiles"
 msgstr "Показатьсписок всех файлов"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "Недостаточно памяти"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Ручной"
+
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "Экономия энергии"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 #, fuzzy
 msgid "Bulb Mode"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "БЕЗ вспышки"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 #, fuzzy
 msgid "Set Nikon Autofocus area"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 #, fuzzy
 msgid "Set Nikon Control Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Ручной"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+msgid "Fuji Zoom Position"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 #, fuzzy
 msgid "Nikon Viewfinder"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Звук"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+msgid "Focus Magnify Up"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Точка фокусировки"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 #, fuzzy
 msgid "Serial Number"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 #, fuzzy
 msgid "Camera Manufacturer"
 msgstr "%sПроизводитель: %s\n"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 #, fuzzy
 msgid "Device Version"
 msgstr "Версия:"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 #, fuzzy
 msgid "PTP Version"
 msgstr "Версия:"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 #, fuzzy
 msgid "DPOF Version"
 msgstr "Версия:"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 #, fuzzy
 msgid "AC Power"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 #, fuzzy
 msgid "External Flash"
 msgstr "снаружи"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Зарядка аккумулятора"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Режим замера"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 #, fuzzy
 msgid "Camera Orientation"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 #, fuzzy
 msgid "Flash Open"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Светодиод"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 #, fuzzy
 msgid "Flash Charged"
 msgstr "Карта CompactFlash"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 #, fuzzy
 msgid "Lens Name"
 msgstr "Режим объектива"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 #, fuzzy
 msgid "Shutter Counter"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 #, fuzzy
 msgid "Available Shots"
 msgstr "Доступная память:"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 #, fuzzy
 msgid "Focal Length Minimum"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 #, fuzzy
 msgid "Focal Length Maximum"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "Светлый"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "Светлый"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 #, fuzzy
 msgid "AF Locked"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Качество изображения"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 #, fuzzy
 msgid "Camera Date and Time"
 msgstr "Дата и время"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 #, fuzzy
 msgid "Image Comment"
 msgstr "Изображение защищено."
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 #, fuzzy
 msgid "Enable Image Comment"
 msgstr "Изображение защищено."
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "Режим записи"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 #, fuzzy
 msgid "Camera Output"
 msgstr "Фотоаппарат ОК.\n"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 #, fuzzy
 msgid "Recording Destination"
 msgstr "Режим записи"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "Светодиод"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Автор"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 #, fuzzy
 msgid "CCD Number"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 #, fuzzy
 msgid "Flicker Reduction"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Карта CompactFlash"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "Автоматическое отключение (минуты)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Прочие параметры"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Светодиод"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Допустимые значения"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 #, fuzzy
 msgid "Capture Target"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "Режим записи"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Режим объектива"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "Формат даты"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "Формат даты"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "Формат даты"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Разрешение"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Размер изображения"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "Авто"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 #, fuzzy
 msgid "WhiteBalance X A"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 #, fuzzy
 msgid "WhiteBalance X B"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 #, fuzzy
 msgid "Color Model"
 msgstr "Режим цвета"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 #, fuzzy
 msgid "Color Space"
 msgstr "Режим цвета"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "Формат даты"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "Разрешение"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "Контраст"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "Яркость-"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "Формат даты"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 #, fuzzy
 msgid "Auto Focus Mode 2"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Скорость ISO"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Вспомогательное освещение"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Компенсация выдержки"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+#, fuzzy
+msgid "Color temperature"
+msgstr "Цветовая температура"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+#, fuzzy
+msgid "AF Mode"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/config.c:10926
+msgid "MF Adjust"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Число F"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "Режим видоискателя"
+
+#: camlibs/ptp2/config.c:10955
 #, fuzzy
 msgid "Movie F-Number"
 msgstr "Число F"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Качество изображения"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Размер изображения"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Формат даты"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Фокусное расстояние"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 #, fuzzy
 msgid "Continuous AF"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Режим программируемой выдержки"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Модель фотоаппарата"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "Режим объектива"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Режим фокусировки"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr "Размер изображения"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "Светодиод"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "Запоминание настроек выдержки"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Запоминание настроек выдержки"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 #, fuzzy
 msgid "Drive Mode"
 msgstr "Светодиод"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
 msgstr "Настройки изображения"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Режим экспозамера"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Диафрагма"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 #, fuzzy
 msgid "Capture Delay"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 #, fuzzy
 msgid "AF Distance"
 msgstr "Фокусное расстояние"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "Режим программируемой выдержки"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Выдержка"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "Режим видоискателя"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Параметры вспышки"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "Принудительная вспышка\n"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "Размер изображения"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Макрорежим"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 #, fuzzy
 msgid "EV Step"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Режим экспозамера"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Экспозамер"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Баланс белого"
+
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Время автоспуска"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Дата Время"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "Режим записи"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "Режим работы"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 #, fuzzy
 msgid "Sharpening"
 msgstr "Зарядка"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 #, fuzzy
 msgid "Saturation"
 msgstr "Конфигурация"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "Звук"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 #, fuzzy
 msgid "Video Mode"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Разрешение"
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "Одиночный кадр"
+
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-#, fuzzy
-msgid "Movie Quality"
-msgstr "Качество изображения"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Minimum Shutter Speed"
+msgid "Continuous Shooting Speed Slow"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "Разрешение"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
+msgid "Minimum Shutter Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+#, fuzzy
+msgid "Movie Quality"
+msgstr "Качество изображения"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "Точечный режим замера"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 #, fuzzy
 msgid "JPEG Compression Policy"
 msgstr "Сжатие"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 #, fuzzy
 msgid "AF Lock On"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Длина фокуса"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 #, fuzzy
 msgid "Raw Compression"
 msgstr "Сжатие"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Качество изображения"
 
-#: camlibs/ptp2/config.c:7543
+#: camlibs/ptp2/config.c:11288
 #, fuzzy
-msgid "Image Settings"
-msgstr "Прочие параметры"
+msgid "Live View Zoom Area"
+msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "Каталог не найден"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7970,2870 +10297,2987 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 #, fuzzy
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Фотоаппарат не поддерживает скорость %i."
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Фотоаппарат не поддерживает скорость %i."
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "Фотоаппарат не поддерживает скорость %i."
+
+#: camlibs/ptp2/library.c:4128
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Фотоаппарат не поддерживает скорость %i."
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 #, fuzzy
 msgid "Canon Capture failed"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr ""
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 #, fuzzy
 msgid "Canon EOS Capture failed"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, fuzzy, c-format
 msgid "Manufacturer: %s\n"
 msgstr "%sПроизводитель: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, fuzzy, c-format
 msgid "Model: %s\n"
 msgstr "Модель:"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, fuzzy, c-format
 msgid "  Version: %s\n"
 msgstr "Версия: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, fuzzy, c-format
 msgid "  Serial Number: %s\n"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Версия прошивки: %d.%02d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 #, fuzzy
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Формат даты"
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 #, fuzzy
 msgid "Display Formats: "
 msgstr "Формат даты"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 #, fuzzy
 msgid "File Deletion, "
 msgstr "Разрешение"
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 #, fuzzy
 msgid "No File Deletion, "
 msgstr "Разрешение"
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 #, fuzzy
 msgid "File Upload\n"
 msgstr "Закачка файла не удалась."
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 #, fuzzy
 msgid "Open Capture, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 #, fuzzy
 msgid "Canon EOS Capture, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 #, fuzzy
 msgid "Canon EOS Capture 2, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 #, fuzzy
 msgid "Nikon Capture 1, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 #, fuzzy
 msgid "Nikon Capture 2, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 #, fuzzy
 msgid "Nikon Capture 3, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 #, fuzzy
 msgid "Olympus E XML Capture, "
 msgstr "Съёмка"
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 #, fuzzy
 msgid "\tCanon Wifi support\n"
 msgstr "Неподдерживаемая карта памяти"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 #, fuzzy
 msgid "Read-Write"
 msgstr "чтение и запись"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 #, fuzzy
 msgid "Read-Only"
 msgstr "Готов"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Количество изображений: %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "только для чтения"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "чтение и запись"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "Файловая система не поддерживает изменение сведений о файле"
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, fuzzy, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Файловая система не поддерживает изменение сведений о файле"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Параметр не поддерживается"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Причина неизвестна"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Причина неизвестна"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Ошибка"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 #, fuzzy
 msgid "Filename Invalid"
 msgstr "Ошибка"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 #, fuzzy
 msgid "Out of Focus"
 msgstr "Недостаточно памяти"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 #, fuzzy
 msgid "Change Camera Mode Failed"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 #, fuzzy
 msgid "Invalid Status"
 msgstr "Ошибка"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "PTP Параметр не поддерживается"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Системная ошибка."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Карта памяти не отформатирована"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Скорость ISO"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Ошибка"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Неизвестная модель"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "Действие отменено"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 #, fuzzy
 msgid "Lens Cover Present"
 msgstr "Нет карты памяти."
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "Аккумулятор"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "Модель фотоаппарата (только для чтения)"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Нет карты памяти."
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Аккумулятор"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "НЕ готов"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Ошибка"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "PTP Параметр не поддерживается"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Ошибка"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP Параметр не поддерживается"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 #, fuzzy
 msgid "PTP Timeout"
 msgstr "Дата Время"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Параметры сжатия"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Баланс белого"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Усиление RGB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Режим программируемой выдержки"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Индекс выдержки (ISO скорость плёнки)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Контраст"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Цифровое увеличение"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Сведения о Copyright"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 #, fuzzy
 msgid "Supported Streams"
 msgstr "Допустимые значения"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 #, fuzzy
 msgid "Enabled Streams"
 msgstr "Ошибка"
 
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "Формат даты"
-
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "Разрешение"
-
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "Качество изображения"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "Контраст"
-
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "Яркость-"
-
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "Формат даты"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Экономия энергии"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Язык интерфейса"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 #, fuzzy
 msgid "Battery Type"
 msgstr "Аккумулятор"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 #, fuzzy
 msgid "Battery Mode"
 msgstr "Аккумулятор"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 #, fuzzy
 msgid "Camera Mode"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 #, fuzzy
 msgid "Self Time"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-#, fuzzy
-msgid "Shooting Mode"
-msgstr "Скорость ISO"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 #, fuzzy
 msgid "Image Mode"
 msgstr "Размер изображения"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 #, fuzzy
 msgid "Slow Shutter Setting"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/ptp.c:4825
-#, fuzzy
-msgid "AF Mode"
-msgstr "Режим фокусировки"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 #, fuzzy
 msgid "Color Gain"
 msgstr "Настройки цвета"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 #, fuzzy
 msgid "Parameter Set"
 msgstr "Параметр 1"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 #, fuzzy
 msgid "Focal Length Tele"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 #, fuzzy
 msgid "Focal Length Wide"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 #, fuzzy
 msgid "Focal Length Denominator"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 #, fuzzy
 msgid "Capture Transfer Mode"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 #, fuzzy
 msgid "Supported Thumb Size"
 msgstr "Допустимые значения"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Владелец фотоаппарата"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Время UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 #, fuzzy
 msgid "Camera Body ID"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Цифровое увеличение"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 #, fuzzy
 msgid "Model ID"
 msgstr "Модель:"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 #, fuzzy
 msgid "White Balance Preset Number"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 #, fuzzy
 msgid "White Balance Preset Name 0"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 #, fuzzy
 msgid "White Balance Preset Name 1"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 #, fuzzy
 msgid "White Balance Preset Name 2"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 #, fuzzy
 msgid "White Balance Preset Name 3"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 #, fuzzy
 msgid "White Balance Preset Name 4"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 #, fuzzy
 msgid "White Balance Preset Value 0"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 #, fuzzy
 msgid "White Balance Preset Value 1"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 #, fuzzy
 msgid "White Balance Preset Value 2"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 #, fuzzy
 msgid "White Balance Preset Value 3"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 #, fuzzy
 msgid "White Balance Preset Value 4"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 #, fuzzy
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 #, fuzzy
 msgid "Focus Area Zone"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 #, fuzzy
 msgid "Enable Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Время автоспуска"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "Режим программируемой выдержки"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 #, fuzzy
 msgid "Artist Name"
 msgstr "Автор"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 #, fuzzy
 msgid "Copyright Information"
 msgstr "Сведения о Copyright"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Принудительная вспышка\n"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Параметры диафрагмы"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "Норм."
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 #, fuzzy
 msgid "Clean Image Sensor"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Изображение защищено."
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "Изображение защищено."
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 #, fuzzy
 msgid "Movie Card Slot"
 msgstr "Качество изображения"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "Режим экспозамера"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 #, fuzzy
 msgid "Lens ID"
 msgstr "Режим объектива"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 #, fuzzy
 msgid "Lens Sort"
 msgstr "Режим объектива"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 #, fuzzy
 msgid "Lens Type"
 msgstr "Режим объектива"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "Длина фокуса"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 #, fuzzy
 msgid "Finder ISO Display"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "Время автовыключения"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "Время автоспуска"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 #, fuzzy
 msgid "Warning Status"
 msgstr "Состояние карты:\t\t"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Режим ЖК экрана"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 #, fuzzy
 msgid "USB Speed"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 #, fuzzy
 msgid "CCD Serial Number"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "Число F"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Режим экспозамера"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "Настройка ТВ A/V·вывода"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "Настройка ТВ A/V·вывода"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "Экспокоррекция"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 #, fuzzy
 msgid "BW Sharpness"
 msgstr "Чёткость"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 #, fuzzy
 msgid "BW Contrast"
 msgstr "Контраст"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5251
+#: camlibs/ptp2/ptp.c:6951
 #, fuzzy
-msgid "Flourescent Type"
+msgid "Fluorescent Type"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 #, fuzzy
 msgid "Tune Colour Temperature"
 msgstr "Цветовая температура"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 #, fuzzy
 msgid "Tune Preset 0"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 #, fuzzy
 msgid "Tune Preset 1"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 #, fuzzy
 msgid "Tune Preset 2"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 #, fuzzy
 msgid "Tune Preset 3"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 #, fuzzy
 msgid "Tune Preset 4"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/ptp.c:5267
-#, fuzzy
-msgid "Autofocus Mode"
-msgstr "Режим фокусировки"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "Вспомогательное освещение"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Настройка ТВ A/V·вывода"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "Авто"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 #, fuzzy
 msgid "Battery Cell Kind"
 msgstr "Зарядка аккумулятора"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "Параметры вспышки"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 #, fuzzy
 msgid "Indicator Display"
 msgstr "Отображение даты"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 #, fuzzy
 msgid "Live View Drive Mode"
 msgstr "Режим видоискателя"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 #, fuzzy
 msgid "Exposure Display Status"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 #, fuzzy
 msgid "Info Display Error Status"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Язык"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "Сжатие"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "Качество изображения"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 #, fuzzy
 msgid "Release Mode"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 #, fuzzy
 msgid "Focus Areas"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/ptp.c:5422
+#: camlibs/ptp2/ptp.c:7326
 #, fuzzy
-msgid "AE Lock"
-msgstr "Выдержка"
+msgid "Focus Point"
+msgstr "Точка фокусировки"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "Размер изображения"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "Скорость ISO"
 
-#: camlibs/ptp2/ptp.c:5436
-#, fuzzy
-msgid "Color temperature"
-msgstr "Цветовая температура"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "Режим фокусировки"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "Недостаточно памяти"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "Время выдержки"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "Изображение"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Дата Время"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Лампа накаливания"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Ручной"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 #, fuzzy
 msgid "Center Weighted Average"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 #, fuzzy
 msgid "Center-spot"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 #, fuzzy
 msgid "Automatic flash"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "Экономия энергии"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Автономный"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Режим вспышки"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "Яркость ЖК-экрана"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 #, fuzzy
 msgid "1 min"
 msgstr "41 мм"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 #, fuzzy
 msgid "Dark on light"
 msgstr "Дневной свет"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 #, fuzzy
 msgid "Light on dark"
 msgstr "Недостаточное освещение"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 #, fuzzy
 msgid "Auto + Red Eye Suppression"
 msgstr "Авто, уменьшение красноты глаз"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
 msgstr "Ручной"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 #, fuzzy
 msgid "Single-Frame Shooting"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "Режим замера"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 #, fuzzy
 msgid "Timer (Single) Shooting"
 msgstr "Одиночный кадр"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 #, fuzzy
 msgid "Center-weighted Metering"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "Точечный режим замера"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "Экспозамер"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "Точечный режим замера"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 #, fuzzy
 msgid "High 2"
 msgstr "Высок."
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "Параметр 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "Параметр 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "Параметр 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 #, fuzzy
 msgid "Encounter"
 msgstr "Съёмка"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 #, fuzzy
 msgid "Open session"
 msgstr "Сжатие"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 #, fuzzy
 msgid "Close session"
 msgstr "Сжатие"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 #, fuzzy
 msgid "Get thumbnail"
 msgstr "Получение миниатюры..."
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "Нераспознанный ответ"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 #, fuzzy
 msgid "Get meter response"
 msgstr "Получен неожиданный ответ"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 #, fuzzy
 msgid "Unknown PTP_OC"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Неизвестно"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Копируется видеозапись..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Копируется звукопись..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Копируется данные EXIF..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Нет данных EXIF для %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Невозможно удалить файл."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Невозможно удалить каталог."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Невозможно создать каталог."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Версия: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "ID фотоаппарата: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10845,7 +13289,7 @@
 "Исследование протокола проведено с помощью USB Snoopy,\n"
 "декомпиляции прошивки и интуиции.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10857,12 +13301,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "на основе драйвера от Bob Paauwe\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr ""
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10871,188 +13315,188 @@
 "Модель: %s\n"
 "Память: %d байт(ов) из %d доступных"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2,0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1,5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1,0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0,5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0,0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0,5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1,0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1,5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2,0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Солнечный"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Макс."
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Мин."
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Текст"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Звук"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Изображение и звук"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Character & Sound"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr ""
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright (макс.. 20 знаков)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Изображения"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Уровень белого"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Режим записи"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Сжатие"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Скорость %i не поддерживается!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr ""
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -11064,110 +13508,110 @@
 "gphoto2. Marcus Meissner <marcus@jet.franken.de> исправлял ошибки и вносил "
 "усовершенствования."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Разрешение плюс размер"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Дата и время (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 #, fuzzy
 msgid "Aperture Settings"
 msgstr "Параметры диафрагмы"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Режим цвета"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Уменьшение эффекта красных глаз"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Время до перехода компьютера в спящий режим (секунд)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Время до перехода фотоаппарата в спящий режим (секунд)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Режим объектива"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Корейский"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Английский"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Французский"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Немецкий"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Итальянский"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Японский"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Испанский"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 #, fuzzy
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Настройки изображения"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -11187,227 +13631,223 @@
 "  PhotoPC 3000z, если ваш аппарат работает иначе, напишите\n"
 "  об этом в список рассылки для разработчиков gphoto (по английски)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Нет карты памяти"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr ""
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "Слишком слабый заряд аккумулятора фотоаппарата (%d%%). Действие прервано."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr ""
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr ""
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Невозможно получить значение регистра %i. Пожалуйста, свяжитесь с %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Передача данных..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Ч/Б"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Против красных глаз"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Контраст+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Контраст-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Яркость+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Яркость-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Мигать"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Светодиод"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Бесконечность"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Следующий"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Режим работы"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Яркость ЖК-экрана"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Автоматическое отключение ЖК (сек.)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Центрально-взвешенный"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Матричный"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Точечный автофокус"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Экспозамер"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Приближение (в миллиметрах)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "нет"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Фиксация выдержки"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Рыбий глаз"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Широкоугольный"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "Настройки изображения"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Запоминание настроек выдержки"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11437,7 +13877,7 @@
 "        Переведите аппарат в режим 'M', если хотите\n"
 "        задать скорость затвора.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11456,72 +13896,68 @@
 "\n"
 "    Копирование снимков должно работать верно.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Белая доска"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Чёрная доска"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "Режим цвета"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 #, fuzzy
 msgid "Anti-redeye Fill"
 msgstr "Против красных глаз"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Монитор"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Режим ЖК экрана"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Цифровое увеличение"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Формат времени"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -11558,7 +13994,7 @@
 "    таком положении, нужно заново подключить аппарат к \n"
 "    компьютеру и переключить параметр в 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -11589,7 +14025,7 @@
 "    таком положении, нужно заново подключить аппарат к \n"
 "    компьютеру и переключить параметр в 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11619,105 +14055,110 @@
 "    всех имеющихся параметров, напишите, пожа-\n"
 "    луйста в список рассылки для разработчиков.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Лучшее"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Чёрный/белый"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Белая доска"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Чёрная доска"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Дневной свет"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Бесконечность/Рыбий глаз"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Точечный режим замера"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1,6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2,5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Автоматическое отключение (компьютер) (в секундах)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11725,12 +14166,12 @@
 "Сколько времени пройдёт до автоматического выключения фотоаппарата,когда он "
 "подключён к компьютеру?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Автовыключение (автономн.) (в секундах)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11738,114 +14179,114 @@
 "Сколько времени пройдёт до автоматического выключения фотоаппарата,когда он "
 "не подключён к компьютеру?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2,3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2,8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5,6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 #, fuzzy
 msgid "standard"
 msgstr "Стандартный"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "цвет"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, fuzzy, c-format
 msgid "Camera Model: %s\n"
 msgstr "%sМодель фотоаппарата: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, fuzzy, c-format
 msgid "Serial Number: %s\n"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, fuzzy, c-format
 msgid "Software Rev.: %s\n"
 msgstr "%sВерсия ПО: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, fuzzy, c-format
 msgid "Frames Taken: %i\n"
 msgstr "%sСнято кадров: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, fuzzy, c-format
 msgid "Frames Left: %i\n"
 msgstr "%sОсталось кадров: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, fuzzy, c-format
 msgid "Battery Life: %i\n"
 msgstr "%sРабота от аккумулятора: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, fuzzy, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "%sОсталось памяти: %i байт\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, fuzzy, c-format
 msgid "Date: %s"
 msgstr "%sДата: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Руководство пользователя фотоаппарата недоступно.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11866,7 +14307,7 @@
 "  PhotoPC 3000z. Если ваш аппарат работает иначе, напишите,\n"
 "  пожалуйста по адресу %s (по английски)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -11903,7 +14344,7 @@
 "    таком положении, нужно заново подключить аппарат к \n"
 "    компьютеру и переключить параметр в 'Off'."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -11924,12 +14365,7 @@
 "за предоставление Olympus C-3030Z для реализации\n"
 "поддержки USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11939,11 +14375,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Невозможно применить конфигурацию USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11963,7 +14399,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Драйвер доступа к аппарату Smal Ultrapocket и его OEM вариантам (slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, fuzzy, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11978,7 +14414,7 @@
 "Фотоаппарат Mars MR97310.\n"
 "Содержит %i снимков. \n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11993,7 +14429,7 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 #, fuzzy
 msgid ""
 "Sonix camera library\n"
@@ -12002,7 +14438,7 @@
 "Библиотека для фотоаппарата Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -12016,7 +14452,7 @@
 "Кен-Ичи Хайяши\n"
 "Портирование в Gphoto2 выполнил Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -12028,7 +14464,7 @@
 "Изначально написана Mark Davies <mdavies@dial.pipex.com>\n"
 "Адаптация к gPhoto2 - Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -12041,12 +14477,12 @@
 "Всего памяти: %iкб\n"
 "Свободно памяти:  %iкб\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Версия прошивки: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -12054,7 +14490,7 @@
 "Драйвер Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -12063,7 +14499,7 @@
 "ППЗУ:\n"
 " Файлов: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -12080,7 +14516,7 @@
 "Занято: %8d\n"
 "Свободно: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr ""
 
@@ -12145,19 +14581,19 @@
 "Базовый драйвер sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -12165,11 +14601,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -12181,110 +14613,110 @@
 "Драйвер для фотоаппаратов с процессором STV0674.\n"
 "Для исследование протокола использовался SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr ""
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Версия прошивки: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "ID сенсора: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Фотоаппарат имеет память.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr ""
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "ID производителя: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "ID продукта: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Количество изображений: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr ""
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Размер миниатюры: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -12300,12 +14732,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Расширено для  Aiptek PenCam и других двурежимных USB фотоаппаратов STM."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Получение сведений о %i файлах..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -12318,20 +14750,20 @@
 "Сообщения об ошибках и отзывы шлите по адресу:\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 #, fuzzy
 msgid "Driver Settings"
 msgstr "Прочие параметры"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12339,12 +14771,12 @@
 "Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, fuzzy, c-format
 msgid "Downloading %s..."
 msgstr "Копируется '%s'..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12354,39 +14786,59 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Драйвер Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Фотоаппарат не обнаружен"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, fuzzy, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Фотоаппарат не обнаружен"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Невозможно загрузить драйвер фотоаппарата '%s' (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr ""
@@ -12425,134 +14877,135 @@
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Файловая система не поддерживает закачку файлов."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, fuzzy, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 "Папка '%s' содержит лишь %i файлов, однако был запрошен файл с номером %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Файла '%s' нет в папке '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Невозможно найти файл '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Файловая система не поддерживает получение файлов"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Неизвестный тип файла %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Файловая система не поддерживает изменение сведений о файле"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 #, fuzzy
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Файловая система не поддерживает изменение сведений о файле"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Данные повреждены"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Файл существует"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Неизвестная модель"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Каталог не найден"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Каталог существует"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Выполняется операция ввода-вывода"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Неабсолютный путь"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Действие отменено"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 #, fuzzy
 msgid "OS error in camera communication"
 msgstr "Проблема установки скорости обмена данными с фотоаппаратом"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr ""
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Неизвестная ошибка драйвера фотоаппарата"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
+#, c-format
 #~ msgid "%s is a file type for which no thumbnail is provided"
 #~ msgstr "%s относится к одному из типов файлов, не имеющих миниатюр"
 
@@ -12563,6 +15016,10 @@
 #~ msgid "Unknown (some kind of error)"
 #~ msgstr "Неизвестно что (какая-то ошибка))"
 
+#, fuzzy, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Неизвестный тип файла %i."
+
 #~ msgid "Initializing Camera"
 #~ msgstr "Инициализация фотоаппарата"
 
@@ -12574,20 +15031,22 @@
 #~ msgid "ISO Auto Time"
 #~ msgstr "Время автовыключения"
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Unknown (%04x)"
 #~ msgstr "Неизвестно"
 
+#, c-format
 #~ msgid "Could not find any driver for '%s'"
 #~ msgstr "Не найден драйвер для '%s'"
 
 #~ msgid "No additional information available."
 #~ msgstr "Нет дополнительных сведений."
 
-#, fuzzy
+#, fuzzy, c-format
 #~ msgid "Deleting '%s' from folder '%s'..."
 #~ msgstr "Копирование '%s' из папки '%s'..."
 
+#, c-format
 #~ msgid "Downloading '%s' from folder '%s'..."
 #~ msgstr "Копирование '%s' из папки '%s'..."
 
@@ -12714,13 +15173,6 @@
 #~ msgid "Current value"
 #~ msgstr "Текущее значение"
 
-#~ msgid "Date Time"
-#~ msgstr "Дата Время"
-
-#, fuzzy
-#~ msgid "Colour Mode"
-#~ msgstr "Режим цвета"
-
 #, fuzzy
 #~ msgid "Exposure Bracketing Distance"
 #~ msgstr "Режим экспозамера"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/sv.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/sv.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/sv.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/sv.po Changed

@@ -1,26 +1,26 @@
 # Swedish translation of gPhoto
-# Copyright © 2000, 2002, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright © 2000, 2002, 2015, 2016, 2017, 2018, 2019, 2020, 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgphoto2 package.
 # Andreas Hyden <a.hyden@cyberpoint.se> 2000.
 # Stefan Björnelund <stefanb@update.uu.se> 2002.
 # Sverker Wiberg <sverkerw@update.uu.se> 2002.
-# Sebastian Rasmussen <sebras@gmail.com> 2015, 2016, 2017.
+# Sebastian Rasmussen <sebras@gmail.com> 2015, 2016, 2017, 2018, 2019, 2020, 2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.13\n"
+"Project-Id-Version: libgphoto2 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2017-05-21 19:19+0800\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2022-10-24 18:05+0200\n"
 "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -30,7 +30,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -39,12 +39,12 @@
 "Kameran verkar inte använda CompactFlash-lagring\n"
 "Tyvärr saknar vi stöd för detta för tillfället :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "Kameran har tagit %d bilder, och använder CompactFlash-lagring.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -77,12 +77,12 @@
 "Aox generisk drivrutin\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Din USB-bildram har ett AX203-chip\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -92,7 +92,7 @@
 "Gphoto-drivrutinen för dessa enheter låter dig hämta,\n"
 "sända upp och ta bort bilder från bildramen."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -104,16 +104,18 @@
 "Denna drivrutin låter dig hämta, sända upp och ta bort bilder\n"
 "från bildramen."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Bildramskonfiguration"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Synkronisera bilddata och tid med PC"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -122,7 +124,7 @@
 "Antal bilder: %i\n"
 "Version av fast programvara: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -146,26 +148,26 @@
 "Implementerat med hjälp av dokument från\n"
 "nätet. Med tillstånd från Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Kunde inte skapa katalogen %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunde inte ta bort katalogen %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "låsning av nycklar misslyckades."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*OKÄND*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -174,7 +176,7 @@
 "canon_int_capture_image: första canon_usb_list_all_dirs() misslyckades med "
 "status %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -183,24 +185,24 @@
 "canon_int_capture_image: sista canon_usb_list_all_dirs() misslyckades med "
 "status %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Namnet ”%s” (%li tecken) är för långt, maximalt 30 tecken tillåts."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Gemena bokstäver i %s ej tillåtna."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: FEL: första meddelande för kort (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -208,26 +210,26 @@
 "canon_int_list_directory: Nådde slutet på paket medan första katalogposten "
 "undersöktes"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: trunkerad katalogpost anträffad"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Filen skyddad."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_get_info_func: FEL: första meddelande för kort (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Kunde inte extrahera JPEG-miniatyrbild från data: Ingen början/slut"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Kunde inte extrahera JPEG-miniatyrbild från data: Data är inte JFIF"
 
@@ -236,24 +238,24 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL-parameter ”%s” i %s rad %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 "Vet inte hur camera->port->type-värde %i aka 0x%x på %s rad %i ska hanteras."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "FATALT FEL: initialt CRC-värde för längd %d okänd\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "kan ej gissa initialt CRC-värde\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -262,290 +264,301 @@
 "varning: CRC ej kontrollerad (lägg till längd %d, värde 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Kompatibilitetsläge"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Miniatyrbild"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Fullständig bild"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Långtidsexponering"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Autofokus: enkelbildstagning"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Autofokus: AI-servo"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Autofokus: AI-fokus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Manuell fokus"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Pip av"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Pip på"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Blixt av"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Blixt på"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Blixt auto"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "AUTO"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Manuell 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Avlägsen scen"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Snabb slutare"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Långsam slutare"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Nattscen"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Gråskala"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Sepiabrunt"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Porträtt"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "BW"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "PanFokus"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Livfull"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Långsam slutare"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Supermakro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Lövverk"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Inomhus"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Fyrverkerier"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Strand"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Under vatten"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Snö"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Barn och husdjur"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Nattlig ögonblicksbild"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Digital makro"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "MinaFärger"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
-msgstr "Foto i film"
+msgstr "Foto i video"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Liten normal JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Liten detaljerad JPEG"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Medium normal JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Medium detaljerad JPEG"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Stor normal JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Stor detaljerad JPEG"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + Liten normal JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + Liten detaljerad JPEG"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + Medium normal JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + Medium detaljerad JPEG"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + Stor normal JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + Stor detaljerad JPEG"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -577,44 +590,44 @@
 "Om du upplever många seriella överföringsfel, prova att låta din dator\n"
 " vara så inaktiv som möjligt (d.v.s. ingen diskaktivitet)\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kameran ej tillgänglig: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Stänger av kameran"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Fel vid fotografering"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kunde inte få tag på disknamn: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Ingen anledning tillgänglig"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Kunde inte få tag på disk info: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Internt fel #1 i get_file_func() (%s rad %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Ingen ljudfil kunde hittas för %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -625,35 +638,35 @@
 "  %11s byte totalt\n"
 "  %11s byte tillgängliga"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Nätadapter"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "på batteri"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "ström OK"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "ström dålig"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "ej tillgänglig: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (värdtid %s%i sekunder)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -680,7 +693,7 @@
 "\n"
 "Tid: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -702,24 +715,24 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Fel vid filradering"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Fel vid radering av associerad miniatyrbild till fil"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Kameran stöder inte hastigheter överstigande 57600 vid sändning"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Kunde inte få tag på flash-enhetens enhetsbokstav"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -727,375 +740,397 @@
 "Kunde inte sända, inget ledigt mappnamn tillgängligt!\n"
 "Mappnamnet 999CANON existerar och har en bild AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Kamerainställningar"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Ägarnamn"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Bildstorleksklass"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO-hastighet"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Okänd"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Bildtagningsläge"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Slutarhastighet"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Bländare"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Bildformat"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Fokusläge"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Blixtläge"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Pip"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Kameraåtgärder"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Synkronisera kameradatum och -tid med PC"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Information om kamerastatus"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Kameramodell"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Datum och Tid"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Fel"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Version av fast programvara"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Ström"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Drivrutin"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Lista alla filer"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Behåll filnamnet vid sändning"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Kameran ej tillgänglig"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Ägarnamnet ändrat"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "kunde inte ändra ägarnamnet"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Klass för bildtagningsstorlek ändrad"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Ogiltig klassinställning för bildtagningsstorlek"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Ogiltig inställning för ISO-hastighet"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "ISO-hastighet ändrad"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Kunde inte ändra ISO-hastighet"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Ogiltig inställning för bildtagningsläge"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Bildtagningsläge ändrat"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Kunde inte ändra bildtagningsläge"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Ogiltig inställning för slutarhastighet"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Slutarhastighet ändrad"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Kunde inte ändra slutarhastighet"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Ogiltig bländarinställning"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Bländare ändrad"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Kunde inte ändra bländare"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Ogiltig inställning för exponeringskompensation"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Exponeringskompensation ändrad"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Kunde inte ändra exponeringskompensation"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Ogiltig inställning för bildformat"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Bildformat ändrat"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Kunde inte ändra bildformat"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Ogiltig inställning för fokusläge"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Fokusläge ändrat"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Kunde inte ändra fokusläge"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Ogiltig inställning för pipläge"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Pipläge ändrat"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Kunde inte ändra pipläge"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Zoomnivå ändrad"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Kunde inte ändra zoomnivå"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Ogiltig inställning för blixtläge"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Blixtläge ändrat"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Kunde inte ändra blixtläge"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "tiden inställd"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "kunde inte ställa in tiden"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ej stödd port typ %i = 0x%x given. Initiering omöjlig."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Batteriet slut, kameran avstängd."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "FEL: oväntat meddelande"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "FEL: meddelande överkört"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "FEL: ej i sekvens."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "FEL: oväntad pakettyp."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "FEL: formatfel i meddelande."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "FEL: oväntat meddelande2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Sänder fil…"
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Hämtar fil…"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1103,7 +1138,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue misslyckades med att hämta "
 "katalogposter"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1111,142 +1146,142 @@
 "canon_serial_get_dirents: Första paket med katalogposter för kort (bara %i "
 "byte)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Kunde inte allokera %i byte minne"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: Misslyckades med att läsa ytterligare en "
 "katalogpost"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Trunkerad katalogpost mottagen"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: För många katalogposter, vi måste ha loopat."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Kunde inte ändra storlek på katalogpost buffert "
 "till %i byte"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Fel vid ändring av hastighet."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Nollställer protokoll…"
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Kamera OK."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Söker efter kamera …"
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Försöker kontakta kamera…"
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Kommunikationsfel 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Ingen svar från kamera"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Ej igenkänd respons"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Detekterade ett ”%s”, också känt som ”%s”"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Okänd modell ”%s”"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Felaktig EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Kommunikationsfel 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Kommunikationsfel 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Ändrar hastighet… vänta…"
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Fel vid ändring av hastighet"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Fel vid väntande på ACK under initiering, försöker igen"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Fel väntande ACK under initiering"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Ansluten till kamera"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FEL: ett fatalt felvillkor detekterades, kan inte fortsätta "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FEL: %d is för stort"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Hämtar miniatyrbild…"
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "EJ IGENKÄND"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Kunde inte etablera inledande kontakt med kamera"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Kamera var redan aktiv"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Kamera väcktes upp"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Initialt kamerasvar ”%c” okänt"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1255,7 +1290,7 @@
 "Steg #2 av initieringen misslyckades: (”%s” vid läsning av %i). Kamera inte "
 "i drift"
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1264,7 +1299,7 @@
 "Steg #2 av initiering misslyckades! (returnerade %i byte, %i förväntades). "
 "Kamera ej i drift"
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1272,7 +1307,7 @@
 msgstr ""
 "Steg #3 av initiering misslyckades: ”%s” vid läsning av %i. Kamera ej i drift"
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1281,7 +1316,7 @@
 "Steg #3 av initiering misslyckades! (returnerade %i, %i förväntades). Kamera "
 "ej i drift"
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1290,29 +1325,29 @@
 "Steg #3 av initiering misslyckades: ”%s” vid skrivning av %i. Kamera ej i "
 "drift"
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Steg #4 misslyckades: ”%s” vid läsning av %i. Kamera ej i drift"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 "Steg #4 misslyckades (returnerade %i, %i förväntades). Kamera ej i drift"
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera ej redo, flera ”Identifiera kamera”-förfrågningar misslyckades: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera ej redo, get_battery misslyckades: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1321,20 +1356,20 @@
 "canon_usb_lock_keys: Oväntad längd returnerad från ”lock keys”-funktion (%i "
 "byte, %i förväntades)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Oväntad längd returnerad (%i byte, %i förväntades)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: Oväntad längd returnerad (%i byte, %i förväntades)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1342,20 +1377,20 @@
 msgstr ""
 "canon_usb_get_body_id: Oväntad datalängd returnerad (%i byte, %i förväntades)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Tar emot data…"
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Slut på minne: %d byte behövs."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue misslyckades"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1364,22 +1399,22 @@
 "Verning i canon_usb_set_file_attributes: canon_usb_dialogue returnerade "
 "felstatus 0x%08x från kamera"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunde inte läsa från fil ”%s”"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Slut på minne: %ld byte behövs."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Filsändning misslyckades."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1387,7 +1422,7 @@
 "Filen var för stor. Du kan behöva stänga av kameran och slå på den ingen "
 "innan du kan sända fler filer."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1396,7 +1431,7 @@
 "canon_usb_get_dirents: Kunde inte få plats med nyttolast i buffert, "
 "”%.96s” (trunkerad) för lång."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1405,7 +1440,7 @@
 "canon_usb_get_dirents: canon_usb_long_dialogue misslyckades att hämta "
 "katalogposter, returnerade %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1414,7 +1449,7 @@
 "canon_usb_list_all_dirs: Kunde inte få plats med nyttolast i buffert, "
 "”%.96s” (trunkerad) för lång."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1423,27 +1458,27 @@
 "canon_usb_list_all_dirs: canon_usb_long_dialogue misslyckades att hämta "
 "katalogposter, returnerade %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detekterade ett ”%s”."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Namn ”%s” från kamera matchar inte någon känd kamera"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Bildtyp %d stöds ej"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Bild %s är borttagningsskyddad."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1455,37 +1490,37 @@
 "hys@asahi-net.or.jp> och Jun-ichiro ”itojun” Itoh <itojun@itojun.org>.\n"
 "Integration av QVPlay gjord av Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Batterinivå: %.1f Volt. Version: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Kamerakonfiguration"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Batteri"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "För ljus"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "För mörk"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "OK"
 
@@ -1584,16 +1619,16 @@
 "sq905C generisk drivrutin\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Bildtypen stöds ej"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Antal bilder: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1601,30 +1636,30 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
 msgstr "Enbart rot-mappen stöds - du begärde en fillistning för mappen ”%s”."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Problem med att hämta antalet bilder"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Problem att hämta bildinformation"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Tagningstypen stöds ej"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (batteriet är %d%% fullt)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1642,82 +1677,83 @@
 "Upplösningen är satt till %s\n"
 "Kamera är %s strömsatt %s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Blixt"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Ingen blixt"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Dubbel bländare"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Ingen dubbelbländare"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Upplösningsknapp"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Ingen upplösningsknapp"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Ej extraljus"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "PÅ"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "AV"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "redo"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Ej redo"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "i fyll läge"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Ej i fyll-läge"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "låg (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "hög (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "externt"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "internt"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1735,7 +1771,7 @@
 "  manuellt eller ställas in på automatiskt läge.\n"
 "* Bildkvalitén är för närvarande lägre än den kunde vara.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1764,114 +1800,241 @@
 "     Information om protokoll, råa bildformatet,\n"
 "     gphoto2-portering\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Problem med att läsa bild från flashminne"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Hämtar bild…"
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Problem med hämtningen av bild"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Användare avbröt hämtningen"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Problem med att ta aktuell bild"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Exponering"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Automatisk exponeringsjustering för förhandsgranskning"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Exponeringsnivå vid förhandsgranskning"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Automatisk blixt vid tagning"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Problem med att öppna port"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Problem med att nollställa kamera"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Problem att ställa in kamerans kommunikationshastighet"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Ser ut som ett modem, inte en kamera"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listar filer i ”%s”…"
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listar mappar i ”%s”…"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Kunde inte hämta information om ”%s” (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Kunde inte hämta information om ”%s” i ”%s” (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Kunde inte ändra tiden på fil ”%s” i ”%s” (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kunde inte öppna ”%s”."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "Katalogbläddring ”camera” låter dig indexera bilderna på din hårddisk."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Katalogbläddring - skrivet av Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Kunde inte radera filen ”%s” i mappen ”%s” (felkod %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+msgid "Scanner Profile Configuration"
+msgstr "Skannerprofilkonfiguration"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+msgid "Mono mode"
+msgstr "Monokromläge"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr "Djup"
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr "Monokrom (s/v)"
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr "Grå (4bpp)"
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr "Grå (8bpp)"
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+msgid "Lo Resolution"
+msgstr "Lågupplösning"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr "100 DPI"
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr "200 DPI"
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+msgid "Hi Resolution"
+msgstr "Högupplösning"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr "400 DPI"
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+msgid "Color Document mode"
+msgstr "Färgdokumentsläge"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr "NQ (12bpp)"
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+msgid "Color Photo mode"
+msgstr "Färgfotoläge"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr "HQ (24bpp)"
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+"Docupen-skanner kan inte hämta ned/ta bort individuella bilder, endast\n"
+"alla bilder tillsammans. För att komma runt detta skapas en cachefil där en\n"
+"kopia av skannerns minne lagras. Cachefyllnad utlöses genom att hämta en\n"
+"bild - så hämtning av den första bilden kommer att ta lång tid om cache är\n"
+"tomt eller ogiltig. Cachen invalideras automatiskt när mängden använt minne\n"
+"rapporterat av skannern inte matchar cachestorleken.\n"
+"Cachfilen lagras i ~/.cache/docupen-SERIAL-NO.bin\n"
+"\n"
+"Skannern har en väldigt kort tidsgräns för självavstängning - endast 8 "
+"sekunder - och\n"
+"den är i bruk även vid anslutning via USB. Du måste stänga av den innan "
+"varje\n"
+"gphoto2-åtgärd. I vissa situationer kan du behöva förhindra den från\n"
+"att stänga av genom att upprepade gånger trycka på någon av knapparna."
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+"DocuPen RC800-skannerbiblotek\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"baserat på Docupen-verktygen av Floria Heinz <fh@cronon-ag.de>"
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -1881,89 +2044,89 @@
 "och anpassat från spca50x-drivrutinen. Tack spca50x-gruppen, det var enkelt "
 "att portera din drivrutin till denna kamera! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kameran skickade bara %i byte, men vi behöver minst %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Kunde inte kontakta kameran."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Mottog oväntat data (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Fel kontrollsekvens: förväntade 0x%02x, fick 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Felaktig data - fick 0x%02x, förväntade 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Felaktig data - fick 0x%02x, förväntade 0x%02x eller 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Felaktig kontrollsumma - fick 0x%02x, förväntade 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Kameran avvisade kommandot."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Kameran återställde sig själv."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kameran skickade oväntad byte 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Hämtar…"
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Kunde inte allokera %i byte för hämtning av miniatyrbild."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Kunde inte allokera %i byte för hämtning av bilden."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Kameran accepterar inte ”%s” som filnamn."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Kunde inte initiera sändning (kameran svarade med 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Kameran stöder inte hastigheten %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Kunde inte ställa in hastigheten till %i (kameran svarade med %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1971,36 +2134,36 @@
 "Matthew G. Martin\n"
 "Baserad på fujiplay av Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Bithastighet %ld stöds ej."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Konfiguration för din FUJI kamera"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Datum & Tid"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Version: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Modell: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Tillgängligt minne: "
 
@@ -2022,17 +2185,17 @@
 "vänligen tillhandahållits av Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Porttypen stöds ej: %d. Denna drivrutin fungerar bara med USB-kameror.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Kunde inte nollställa kameran.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2041,7 +2204,7 @@
 "Din kamera stöder endast borttagning av den senaste filen på kameran. I "
 "detta fall, detta är fil ”%s”."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2056,7 +2219,7 @@
 "Ledigt utrymme (Bilder): %d\n"
 "Batterinivå: %d %%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2110,25 +2273,25 @@
 "iClick 5X-drivrutin\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Bilder tagna     : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam bibliotek v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Hämtar data…"
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Hämtar miniatyrbild…"
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2144,7 +2307,7 @@
 "   - miniatyrbilder (64x48 PGM-format)\n"
 "   - hela bilder (640x480 PPM-format)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2156,31 +2319,31 @@
 "Drivrutin för Jenoptik JD11 kameror.\n"
 "Protokoll reverse engineered m.h.a. WINE och IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "JD11-konfiguration"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Andra inställningar"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Färginställningar"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Röd"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Grön"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Blå"
 
@@ -2255,11 +2418,11 @@
 "jl2005bcd-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "CompactFlash kort"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2270,7 +2433,7 @@
 "vill visa bilderna du hämtade från din kamera, behöver du hämta programmet "
 "”kdc2tiff”. Det finns tillgängligt på http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2282,13 +2445,13 @@
 "Kamera-bibliotek för Kodak DC120-kameror.\n"
 "(på allmän begäran)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Hämtar data…"
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Väntar på att bli klar…"
 
@@ -2301,7 +2464,8 @@
 msgstr "Filtyp"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2314,7 +2478,7 @@
 msgstr "Filupplösning"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2338,8 +2502,9 @@
 msgid "High (good quality)"
 msgstr "Hög (god kvalité)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Foto"
 
@@ -2368,77 +2533,84 @@
 msgstr "Exponeringskompensation"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Tvinga"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Ingen"
 
@@ -2447,71 +2619,78 @@
 msgstr "Röda ögon-reduktion"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "På"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Av"
 
@@ -2527,7 +2706,7 @@
 msgid "Port speed"
 msgstr "Porthastighet"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Albumnamn"
 
@@ -2747,58 +2926,58 @@
 "Kamera bibliotek för Kodak DC215 Zoom kameror.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Väntar…"
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Parameter 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Parameter 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Parameter 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Modell: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Version av fast programvara: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Batteristatus: %s, Nätadapter: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Utrymme kvar: Hög: %d, Medium: %d, Låg: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Minneskortets status (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Totalt bilder tagna: %d, Blixtar avfyrade: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2812,59 +2991,59 @@
 "Kamera-bibliotek för Kodak DC240, DC280, DC3400 och DC5000 kameror.\n"
 "Omskriven och uppdaterad för gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Svag"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Tomt"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Ogiltigt"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Inte använt"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "I bruk"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Kortet är öppet"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Kortet inte öppet"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Kortet är inte formaterat"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Inget kort"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
 msgstr ""
-"Det finns pågår för närvarande en operation. Denna kamera klarar endast att "
-"utföra en operation i taget. Vänta tills den nuvarande operationen har "
-"avslutats."
+"En åtgärd pågår för närvarande. Denna kamera klarar endast att utföra en "
+"åtgärd i taget. Vänta tills den nuvarande åtgärden har avslutats."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "kameran inaktiv för > 9 sekunder, återinitieras.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2880,7 +3059,7 @@
 "svarar, så behöver du bara välja om kameran. Detta kommer orsaka att den "
 "återinitieras."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2892,7 +3071,7 @@
 "\n"
 "Frågor och kommentarer uppskattas."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2901,7 +3080,7 @@
 "Din USB-kamera är en Kodak EZ200.\n"
 "Antal BILDer = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2909,107 +3088,107 @@
 "Kodak EZ200-drivrutin\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Fokuseringsfel."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Bländarfel."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Blixtfel."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Fel i EEPROM-kontrollsumma."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Internt fel (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Internt fel (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Inget kort isatt."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Kort stöds ej."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Kort borttaget under åtkomst."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Bildnummer ej giltigt."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Kortet kan ej skrivas."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Kortet är skrivskyddat."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Ingen plats kvar på kortet."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Filen skyddad."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Ljuset för mörkt."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Autofokusfel."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Systemfel."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Ogiltig parameter."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Kommandot kan ej avbrytas."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Lokaliseringsdata för lång."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Lokaliseringsdata korrupt."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Kommando stöds ej."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Annat kommando utförs redan."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Kommandoordningsfel."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3020,15 +3199,15 @@
 "Rapportera följande till %s med ytterligare information om hur du fick "
 "felet: (0x%x,0x%x). Tack så mycket!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Hämtar fillista…"
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
-msgstr "Testar olika hastigheter"
+msgstr "Testar olika hastigheter…"
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3036,12 +3215,12 @@
 "Kameran kunde inte kontaktas. Kontrollera att den ansluten till datorn och "
 "påslagen."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i bilder kunde inte raderas eftersom de är skrivskyddade"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3060,7 +3239,7 @@
 "Namn: %s,\n"
 "Tillverkare: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3070,400 +3249,409 @@
 "Lutz Müller <lutz@users.sf.net>\n"
 "Stöd för alla Konica och flera HP kameror."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Hämtar konfiguration…"
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Konica konfiguration"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Persistenta inställningar"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Skall kameran pipa när den tar en bild?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Självutlösningstid"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Auto av tid"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Bildspelsintervall"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Låg (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Medium (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Hög (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Lokalisering"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Språk"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Inget valt"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "TV utdataformat"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Visa inte TV-menyn"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Datumformat"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Månad/Dag/År"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Dag/Månad/År"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "År/Månad/Dag"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Sessionspersistenta inställningar"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "På, röda ögon-reduktion"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Auto, röda ögon-reduktion"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Fokus"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Fast"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Flyktiga inställningar"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Självutlösare"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Självutlösare (nästa bild endast)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Kunde inte finna lokaliseringsdata vid ”%s”"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Lokaliseringsfil för lång!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Denna förhandsgranskning existerar inte."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Data har blivit korrupt."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr "Kompilerat utan EXIF-stöd, inga miniatyrbilder tillgängliga."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Bildtyp %d stöds inte av denna kamera !"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Kan inte ta bort bild %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Kan inte ta bort alla bilder."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Sänder bild…"
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Kan inte skicka upp denna bild till kameran. Ett fel har inträffat."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Du måste vara i inspelningsläge för att ta bilder."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Inget ledigt utrymme för att ta nya bilder. Du måste ta bort några bilder."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Kan inte ta nya bilder. Okänt fel"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Ingen svar från kameran."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Låg"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Medium"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Hög"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Ikoner"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2.0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0.5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0.1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Vitbalans"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Kontor"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Dagsljus"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Skarphet"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Skarp"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Mjuk"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Färger"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Ljus"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Djup"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Svartvit"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Enstaka"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Sekvens 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Datumvisning"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Var som helst"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Uppspelningsläge"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Inspelningsläge"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Överallt"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Spela upp"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Spela in"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/ÅÅÅÅ"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "ÅÅÅÅ/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/ÅÅÅÅ"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3484,7 +3672,7 @@
 "Datumvisning: %s\n"
 "Datum och tid: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3499,7 +3687,7 @@
 "http://www.ap2c.com\n"
 "Stöd för den franska Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3519,7 +3707,7 @@
 "Om du har några problem med denna drivrutin, skicka e-post till dess "
 "upphovsmän.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3527,7 +3715,7 @@
 "Largan-drivrutin\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3538,7 +3726,7 @@
 "Fast programvara: %s\n"
 "Version av fast programvara: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3546,7 +3734,94 @@
 "LG GSM generisk drivrutin\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+msgid "Lumix Configuration"
+msgstr "Lumix-konfiguration"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr "Klocka"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr "Slutarhastighet"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Videokvalitet"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Film"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Autofokusläge"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr "Livevisningsstorlek"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr "Enhetsnamn"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr "MF-assistans"
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr "MF-assistans mag"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr "Ex Teleconv"
+
+#: camlibs/lumix/lumix.c:1217
+msgid "Lens"
+msgstr "Objektiv"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr "Förmåga"
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr "Alla menyer"
+
+#: camlibs/lumix/lumix.c:1244
+msgid "Cur Menu"
+msgstr "Aktuellt meny"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+"Lumix WiFi-bibliotek\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Ansluter till Lumix-kameror över Wifi.\n"
+"använder http GET-kommandon."
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3561,7 +3836,7 @@
 "Mars MR97310 kamera.\n"
 "Det finns %i bilder i den.\n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3585,7 +3860,7 @@
 "som konsekutiva stillbilder.\n"
 "För vidare detaljer konsultera libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3593,7 +3868,7 @@
 "Mars MR97310-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3604,7 +3879,7 @@
 "Version av hårdvara:\t%s\n"
 "Version av fast programvara:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3631,61 +3906,63 @@
 "Kort-ID:\t\t%d\n"
 "Blixtläge:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Fjärr"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Lokal"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Nej"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisk\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Alltid blixt\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Aldrig blixt\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ogiltigt värde ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3702,74 +3979,74 @@
 "Blixten laddar:\t\t%s\n"
 "Objektivsstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Inte full"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Full"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Upptagen"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Ledig"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Laddar"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Klar"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Objektivriktningen överensstämmer inte med blixtljuset\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objektivet är inte anslutet\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Felaktigt värde för objektivstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kortstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Skrivskyddad"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Olämpligt kort"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Felaktigt värde för kortstatus %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3782,63 +4059,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Speciellt tack till Minolta för specifikationen."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Blixt : Auto (röda ögon-reduktion)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Blixt : Auto"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Blixt : På (röda ögon-reduktion)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Blixt : På"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Blixt : Av"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Blixt : odefinierat"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Summering för Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "ingen status rapporterad."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "CompactFlash kort detekterat\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Inget CompactFlash kort detekterat\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Nuvarande läge: Kameraläge\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Nuvarande läge: Uppspelningsläge\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Batterierna är ok."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Batterierna är låga."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3850,42 +4127,42 @@
 "Konverterat till gphoto2 av Marcus Meissner <marcus@jet.franken.de>\n"
 "Stöder seriella and USB protokoll."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot library v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Frånkopplar kamera."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Hämtar bild %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Uppsändning av bild: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
 "%i bytes."
 msgstr "Filstorleken är %ld byte. Den största fil som kan sändas är: %i byte."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Sänder…"
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Raderar bilden %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3901,12 +4178,12 @@
 "Fredrik Roubert <roubert@df.lth.se> och\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Hämtar %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3922,12 +4199,12 @@
 "Fredrik Roubert <roubert@df.lth.se> och\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Hämtar ”%s”…"
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3947,7 +4224,7 @@
 "och FIN är 640x480. CCD-enheten som tar bilderna från objektivet är endast "
 "300K och producerar därför endast bilder med låg kvalité."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3963,7 +4240,7 @@
 "om problem uppstår och kameran inte är korrekt avstängd vid hastigheter över "
 "9600 bps."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3971,7 +4248,7 @@
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-drivrutin\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3982,7 +4259,7 @@
 " Ledig minne är  %8d byte.\n"
 " Antal filer: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -3996,11 +4273,11 @@
 "och: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Hämtar fil…"
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4008,33 +4285,136 @@
 "Creative PC-CAM600\n"
 "Upphovsman: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Förväntade > %d block, fick %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file:fick index %d men förväntade index > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: returvärde var %d istället för %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Förväntade %d block, fick  %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: Oväntat fel: gp_port_read returnerade %d istället för %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+"Pentax K DSLR-tagningsdrivrutin\n"
+"Använder kod från pktriggercord av Andras Salamon.\n"
+"Insamlad statusinformation:\n"
+"%s"
+
+#: camlibs/pentax/library.c:634
+msgid "Model"
+msgstr "Modell"
+
+#: camlibs/pentax/library.c:651
+#, c-format
+msgid "Unknown format %d"
+msgstr "Okänt format %d"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Bildstorlek"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Bildkvalitet"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Bländare vid objektivs minsta brännvidd"
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Bländare vid objektivs största brännvidd"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Bildtagningsläge"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr "GRÖN"
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr "SV"
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr "TAV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr "B"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr "X"
+
+#: camlibs/pentax/library.c:788
+#, c-format
+msgid "Unknown mode %d"
+msgstr "Okänt läge %d"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+"Du måste växla till tagningsläget eller kameran till ”B” för blixtexponering."
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4048,12 +4428,12 @@
 "sf.net>.\n"
 "Polaroid 640SE-testning gjordes av Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Modell: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4067,110 +4447,98 @@
 "JD350e av Michael Trawny <trawny99@users.sourceforge.net>. Programfelsfixar "
 "av Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Bildkvalitet"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Bildstorlek"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Blixtinställning"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Automatisk avstängning (minuter)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "fin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "extrafin"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "auto"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "på"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "av"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "spela upp"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "spela in"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "meny"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "batteri"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "nätadapter"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Mottog oväntat huvud (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Mottog oväntat svar"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Fel i kontrollsumma"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Kameran accepterade inte kommandot."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Kameran skickade fler byte än förväntat (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4179,7 +4547,7 @@
 "Begärde informationen om bild %i (= 0x%x), men fick information om bild %i "
 "tillbaka"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4188,7 +4556,7 @@
 "%i byte från ett okänd bildformat har mottagits. Skriv till %s och be om "
 "hjälp."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4198,19 +4566,20 @@
 "Lantzer <rlantzer@umr.edu> för gphoto-4.x. Anpassat för gphoto2 av Lutz "
 "Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Hur lång tid det tar innan kameran stängs av?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Bild"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4243,3475 +4612,5345 @@
 "Auto avstängning: %i minuter\n"
 "Strömkälla: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den begärda porttypen (%i) stöds ej av denna drivrutin."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr "CHDK lua-motor rapporterar fel: %s"
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+"PTP2 / CHDK-drivrutin\n"
+"(c) 2015-%d av Marcus Meissner <marcus@jet.franken.de>.\n"
+"Detta är en PTP-underdrivrutin som har stöd för CHDK på Canon-kameror\n"
+"\n"
+"Ha det bra!"
+
+#: camlibs/ptp2/chdk.c:489
+#, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "CHDK %d.%d Status:\n"
+
+#: camlibs/ptp2/chdk.c:492
+#, c-format
+msgid "Mode: %d\n"
+msgstr "Läge: %d\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr "SV96: %d, ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "TV96: %d, slutarhastighet: %f\n"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr "AV96: %d, Bländare: %f\n"
+
+#: camlibs/ptp2/chdk.c:500
+#, c-format
+msgid "Focus: %d\n"
+msgstr "Fokus: %d\n"
+
+#: camlibs/ptp2/chdk.c:502
+#, c-format
+msgid "ISO Mode: %d\n"
+msgstr "ISO-läge: %d\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, c-format
+msgid "Zoom: %d\n"
+msgstr "Zoom: %d\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Optisk temperatur: %d\n"
+
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "CCD-temperatur: %d\n"
+
+#: camlibs/ptp2/chdk.c:511
+#, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Batteritemperatur: %d\n"
+
+#: camlibs/ptp2/chdk.c:514
+#, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Blixtläge: %d\n"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr "Rå ISO"
+
+#: camlibs/ptp2/chdk.c:1031
+msgid "Press"
+msgstr "Tryck"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Utlös"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr "Klick"
+
+#: camlibs/ptp2/chdk.c:1034
+msgid "Capture Mode"
+msgstr "Tagningsläge"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "AE-lås"
+
+#: camlibs/ptp2/chdk.c:1036
+msgid "AF Lock"
+msgstr "AF-lås"
+
+#: camlibs/ptp2/chdk.c:1037
+msgid "MF Lock"
+msgstr "MF-lås"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Orientering"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Bildinställningar"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr "CHDK hämta livedata misslyckades"
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+"CHDK hämta livedata misslyckades: inkomplett data (%d byte) returnerade"
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK lämnade inte inspelningsläget."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Tyvärr, din Canon-kamera saknar stöd för Canon-tagning"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Okänt värde %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Okänt värde %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "oväntad datatyp %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Målvärde finns inte med i uppräkning."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr "Nuvärde finns inte med i uppräkning."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr "Sony kunde inte ställa in det nya värdet, är det giltigt?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Manuell"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "En-trycks-automatisk"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Lysrör"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Glödlampa"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Mulet"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Skugga"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Färgtemperatur"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Förinställning"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Naturligt ljus auto"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Lysrörslampa 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Lysrörslampa 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Lysrörslampa 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Lysrörslampa 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Lysrörslampa 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Välj färgtemperatur"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Anpassad förinställning 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Anpassad förinställning 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Anpassad förinställning 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Anpassad förinställning 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Anpassad förinställning 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Lysrör: Varmt vitt"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Lysrör: Kallt vitt"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Lysrör: Dagsljus vitt"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Lysrör: Dagsljus"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Förinställning 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Förinställning 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Förinställning 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Under vatten: Automatisk"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Glödlampa 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Lysrör: Vitt"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Lysrör: Glödlampa"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Förinställning 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Annan"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG detaljerad"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG normal"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + JPEG detaljerad"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + JPEG normal"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Stor detaljerad JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Stor normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Medium normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Liten normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Enkelbild"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Kontinuerlig låg hastighet"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Kontinuerlig hög hastighet"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Självutlösare"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Sup spegel upp"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr "PROVIA/Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr "Velvia/Livfull"
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr "ASTIA/Mjuk"
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr "Pro Neg.Hög"
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr "Pro Neg.Stnd"
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Svartvit"
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr "Svartvit+Ye-filter"
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr "Svartvit+R-filter"
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr "Svartvit+G-filter"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr "Klassisk krom"
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr "ACROS"
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr "ACROS+Ye-filter"
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr "ACROS+R-filter,"
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr "ACROS+G-filter"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr "ETERNA/Film"
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr "Klassiskt negativ"
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr "FÖRBIKOPPLING AV ETERNA BLEKNING"
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr "USB"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "odefinierad"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "ekonomi"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "förlustfri"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Annan"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Lås"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Nattporträtt"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Landskap"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Närbild"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Blixt av"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr "C2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr "C3"
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr "Kreativ auto"
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr "Handhållen nattscen"
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr "HDR bakgrundsljuskontroll"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr "SCN"
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Mat"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr "Kornig s/v"
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr "Mjukfokus"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr "Leksakskameraeffekt"
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr "Fiskögaeffekt"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr "Vattenmålningseffekt"
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Miniatyreffekt"
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr "HDR-konst standard"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr "HDR-konst livfull"
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr "HDR-konst djärv"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr "HDR-konst relief"
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr "Panorering"
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr "HDR"
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr "Självporträtt"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr "Hybrid auto"
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr "Hudutjämning"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr "Fv"
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Standard (inaktiverad vid manuell expoering)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Låg (inaktiverad vid manuell exponering)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Av (inaktiverad vid manuell exponering)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Hög (inaktiverad vid manuell exponering)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "röda ögon-reduktion"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "fyll i"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "auto + röda ögon-reduktion"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "på + röda ögon-reduktion"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Kommendör"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Repeterande"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Autobländare"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Helt manuell"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr "QVGA"
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr "VGA"
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr "XGA"
+
+#: camlibs/ptp2/config.c:2174
+msgid "Application"
+msgstr "Applikation"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Stor"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Liten"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (fast)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (val)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Centrumviktad"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Medelvärde"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Utvärderande"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Partiell"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Centrumviktat medelvärde"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Punktmätning sammanvävd med AF-ram"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Fler-punkters"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Trogen"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Monokrom"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Fina detaljer"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Användardefinierad 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Användardefinierad 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Användardefinierad 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Fokuspunkt endast i centrum, Manuell"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Fokuspunkt endast i centrum, Auto"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Multipla fokuspunkter (ingen specifikation), Manuell"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Flera fokuspunkter, auto"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Flera fokuspunkter (höger)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Multipla fokuspunkter (centrum)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Flera fokuspunkter (vänster)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Stor"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Medium 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Medium 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Medium 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Liten"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 sekunder"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 sekunder"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "PC"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + PC"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Inställning 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Inställning 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Inställning 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Inställning 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "MOBIL"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT + MOBIL"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC + MOBIL"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC + MOBIL"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "MOBIL2"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT + MOBIL2"
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC + MOBIL2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC + MOBIL2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+#, fuzzy
+msgid "LiveMulti"
+msgstr "Flera"
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Punkt-AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Kort"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Video-UT"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Okänd %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Fabriksstandard"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Auto-ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRAW"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Mindre JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Liten JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + stor detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + stor detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRAW + Stor detaljerad JPEG"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + medium detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + medium detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRAW + Medium detaljerad JPEG"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + liten detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + liten detaljerad JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRAW + Liten detaljerad JPEG"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + stor normal JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + stor normal JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRAW + Stor normal JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + medium normal JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + medium normal JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRAW + Medium normal JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + liten normal JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + liten normal JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRAW + Liten normal JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + mindre JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + mindre JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + mindre JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "cRAW + mindre JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + liten JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + liten JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + liten JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Liten normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Stor detaljerad JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Liten normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Stor detaljerad JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Stor detaljerad JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Liten normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Stor detaljerad JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Medium 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Medium 2"
+
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Liten normal JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Kontinuerlig"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr "Video"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr "Enkel: Tyst tagning"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Kontinuerlig tidtagare"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Självutlösare 10 sek"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Självutlösare 2 sek"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr "Superhögastighets kontinuerlig bildtagning"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Enstaka tyst"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Kontinuerlig tyst"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Auto-ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr "Tyst HS kontinuerlig"
+
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr "Tyst LS kontinuerlig"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Auto ISO flerbildersbrusreducering"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"För att blixttagning ska fungera, säkerställ att lägesratten är inställt på "
+"”M” och ställ in ”slutarhastighet” på ”blixt”."
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "%d flerbildersbrusreducering"
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr "Tagning"
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr "Blixt på"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr "Blixt av"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr "AF"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr "Avbryt AF"
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Fuji-tagning misslyckades: Kanske ingen autofokus?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 punkter (3D)"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 punkter (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 punkter (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 punkter (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Flerbildersbrusreducering"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Auto ISO flerbildersbrusreducering"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Tid"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Kreativt"
 
 # sebras: bättre översättning?
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Action"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Nattlandskap"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Barn"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Automatisk (Ingen blixt)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr "U3"
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Intelligent auto"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Överlägsen auto"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
-msgstr "Film"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr "Film (P)"
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr "Film (A)"
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr "Film (S)"
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr "Film (M)"
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr "Film (Scen)"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Tele-zoom kont. prioritera AE"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Panoramasvep"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Intelligent auto blixt av"
 
 # sebras: bättre översättning?
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Idrottsutövning"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Skymning"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Nattscen"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Handhållen skymning"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr "Antirörelseoskärpa"
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Bildeffekt"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr "S&Q"
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Nattlandskap"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Party/inomhus"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Strand/snö"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Skymning/gryning"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Husdjursporträtt"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Stearinljus"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Blomning"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Höstfärger"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Mat"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Bern"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Närbild"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Lysrör"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Vatten"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr "1/3 EV"
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr "1/2 EV"
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr "2/3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Extra hög"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr "2 bilder (normal och under)"
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr "2 bilder (normal och över)"
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr "3 bilder (normal och två under)"
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr "3 bilder (normal och två över)"
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr "3 bilder (normal, under och över)"
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr "5 bilder (normal, 2 under och 2 över)"
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr "7 bilder (normal, 3 under och 3 över)"
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr "9 bilder (normal, 4 under och 4 över)"
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr "0 bildre"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr "2 tagningar (Av -> Användarinställningar)"
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr "3 tagningar (Av -> Låg -> Användarinställningar)"
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr "4 tagningar (Av -> Låg -> Normal -> Hög)"
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr "5 tagningar (Av -> Låg -> Normal -> Hög -> Extra hög)"
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Scen"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Effekter"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Motljus"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Panorama"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Utjämning"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Tilt-Shift"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Välj färg"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Enkelbildstagning"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Sekvens"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Tidsintervall"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Kontinuerlig låg hastighet"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Självutlösare"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Spegel upp"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Snabbreagerande fjärrkontroll"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Fördröjd fjärrkontroll"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Tyst utlösare"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Kontinuerlig tyst utlösare"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Självutlösare 2s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr "Självutlösare 5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Självutlösare 10s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Självutlösare 10s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Självutlösare 10s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Självutlösare 5s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Självutlösare 5s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Självutlösare 2s 3 Bilder"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Självutlösare 2s 5 Bilder"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr "Kontinuerlig Hög+ hastighet"
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr "Kontinuerlig medelhastighet"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Gaffling C 0.3 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Gaffling C 0.3 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Gaffling C 0.3 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Gaffling C 0.3 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Gaffling C 0.3 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Gaffling C 0.3 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Gaffling C 0.7 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Gaffling C 0.7 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Gaffling C 0.7 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Gaffling C 1.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Gaffling C 1.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Gaffling C 1.0 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Gaffling C 2.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Gaffling C 2.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Gaffling C 3.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Gaffling C 3.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Gaffling S 0.3 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Gaffling S 0.3 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Gaffling S 0.3 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Gaffling S 0.3 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Gaffling S 0.3 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Gaffling S 0.3 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Gaffling S 0.7 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Gaffling S 0.7 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Gaffling S 0.7 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Gaffling S 1.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Gaffling S 1.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Gaffling S 1.0 steg 9 Bilder"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Gaffling S 2.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Gaffling S 2.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Gaffling S 3.0 steg 3 Bilder"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Gaffling S 3.0 steg 5 Bilder"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Gaffling WB låg"
 
 # So this is likely refering to "D-Range Optimizer", should this be translated?
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr "Gaffling DRO låg"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Gaffling WB hög"
 
 # So this is likely refering to "D-Range Optimizer", should this be translated?
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr "Gaffling DRO hög"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Centrumpunkt"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Fler-punkters"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "En-områdes"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Närmast objektet"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Gruppdynamik"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "Enkelområdes-AF"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "Dynamisk-områdes-AF"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "Gruppdynamisk AF"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "Dynamisk-områdes AF med prioritet för närmaste objekt"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Dynamiskt område (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Dynamiskt område (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Dynamiskt område (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "3D-spårning"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "Dynamisk-områdes-AF (25 punkter)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "Enkel-punkts AF"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "Auto-områdes AF"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "3D-spårning"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "Dynamisk-områdes-AF (72 punkter)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "Dynamisk-områdes-AF (153 punkter)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "Grupparea-AF"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "Dynamisk-områdes-AF (9 punkter)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "Knappnåls-AF"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "Vidsträckt-områdes-AF (S)"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "Vidsträckt-områdes-AF (L)"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "Vidsträckt-områdes-AF (S)"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "Vidsträckt-områdes-AF (S)"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (porträtt)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (natur)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Okänt värde 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Centrum"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Topp"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Botten"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Vänster"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Höger"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Bred"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "Centrum"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Flexibelt program"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Flexibelt program"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Flexibelt program"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Centrumviktad"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Flerpunkters"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Centrumpunkts"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Punkt+Högdagrar"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Punkt+Skugga"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr "Flera"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr "Genomsnitt av hela skärmen"
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr "Punkt standard"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr "Punkt stor"
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr "Högdager"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Automatisk blixt"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Upplättningsblixt"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Röda ögon-automatisk"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Röda ögon-upplättning"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Extern synk"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Auto långsam synk"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Bakre ridå synk + långsam synk"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Röda ögon-reduktion + långsam synk"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Främre ridå synk"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Röda ögon-reduktion"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Röda ögon-reduktion med långsam synk"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Långsam synk"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Bakre ridå med långsam synk"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Bakre ridå synk"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Bakre ridå synk"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Trådlös synk"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Långsam synk"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Svartvit"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Mörkerseende"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Färgskiss"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Miniatyreffekt"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Selektiv färg"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Siluett"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Hög nyckel"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Lågmäld"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "oändlig"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "oändlig"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Komposit"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "långtidsexponering"
+
+#: camlibs/ptp2/config.c:5050
+msgid "Sync"
+msgstr "Synk"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "Ansiktsprioriterande AF"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "Vidsträckt-områdes-AF"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "Normal-område AF"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "Objektföljande AF"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr "Punktområdes AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr "Hela skärmen"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200%"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr "33%"
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr "66%"
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Enkel-servo AF"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr "Kontinuerlig-servo AF"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Fulltids-servo AF"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
-msgstr "Manuell fokus"
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr "Manuell fokus (fast)"
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
+msgstr "Manuell fokus (val)"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "AE/AF-lås"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Endast AE-Lås"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Endast AF-Lås"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "AF-lås håll"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF på"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Blixtnivå lås"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 sekunder"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 minut"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 minuter"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 minuter"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 sekunder"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 mm"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "långtidsexponering"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "30s"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20s"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15s"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13s"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10s"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8s"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6s"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5s"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4s"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3s"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2.5s"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2s"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1.6s"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1.3s"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1s"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1.3s"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1.6s"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2s"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2.5s"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3s"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4s"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5s"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6s"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8s"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10s"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13s"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15s"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20s"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25s"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30s"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40s"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50s"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60s"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80s"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100s"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125s"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160s"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200s"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250s"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320s"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400s"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500s"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640s"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800s"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000s"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250s"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600s"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000s"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500s"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200s"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000s"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000s"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400s"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000s"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Skärper"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Mjukare"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Utskrift direkt"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Medium låg"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Medium hög"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Låg kontrast"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Medium hög"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Hög kontroll"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Zonfokus (närbild)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Zonfokus (väldig nära)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Zonfokus (nära)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Zonfokus (medium)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Zonfokus (avlägset)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Zonfokus (reserverad 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Zonfokus (reserverad 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 "Zonfokus (reserverad 3\n"
 ")"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Zonfokus (reserverad 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Automatisk makro"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Enkel-servo AF"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Kontinuerlig-servo AF"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Enkelbildstagning"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "AI-servo"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "AI-fokus"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 sekunder"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 sekunder"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Håll"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Lysrör H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Anpassad vitbalans PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Anpassad vitbalans PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Anpassad vitbalans PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Saknat nummer"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Skugga"
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
-msgstr "Anpassad VB 2"
-
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
-msgstr "Anpassad VB 3"
-
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
-msgstr "Anpassad VB 4"
-
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
-msgstr "Anpassad VB 5"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr "Anpassad vitbalans: PC-1"
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
+msgstr "Anpassad vitbalans: PC-2"
+
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
+msgstr "Anpassad vitbalans: PC-3"
+
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
+msgstr "Manuell 3"
+
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
+msgstr "Manuell 4"
+
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr "Manuell 5"
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr "Anpassad vitbalans: PC-4"
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr "Anpassad vitbalans: PC-5"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "AWB-vitt"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Låg skärpning"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr "AE-gaffling"
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr "ISO-gaffling"
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr "VB-gaffling"
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr "FE-gaffling"
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr "Gaffling av"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr "implicit automatisk"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE & blixt"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "Enbart AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Enbart blixt"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "VB-gaffling"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "ADL-gaffling"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Uppstart"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Nedstängning"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Uppstart och nedstängning"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Snabbrespons"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Fjärrspegel upp"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Applikationsläge 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Applikationsläge 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Moderat"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Förbättrad"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > Under"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Under > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Autokänslighet"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Hög känslighet"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Medium känslighet"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Låg känslighet"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Mikrofon av"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hi 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hi 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Blixt/hastighet"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Blixt/hastighet/bländare"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Blixt/bländare"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG grundläggande"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Detaljerad"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+grundläggande"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Normal"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "JPEG grundläggande*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "JPEG normal*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "JPEG detaljerad*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF+grundläggande*"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF+Normal*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF+Detaljerad*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Extra fin"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + JPEG (Detaljerad)"
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + JPEG (Extra detaljerad)"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Detaljerad"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "RAW + JPEG (Extra detaljerad)"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "RAW+JPEG (Standard)"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + JPEG (Detaljerad)"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + JPEG (Extra detaljerad)"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Fin"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG detaljerad"
+
+#: camlibs/ptp2/config.c:6922
 #, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
-msgstr "Fler-punkters"
+msgstr "Flerbildstagning"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 sekunder"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 sekunder"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Förlustfri"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Icke-förlustfri"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Hög nyckel"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Storleksprioritet"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Optimal kvalitet"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (Auto-FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (Auto-FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Utlös"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Utlös + fokus"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 punkter"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 punkter"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 punkter"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 punkter (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (Lång)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Normal)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (Kort)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Slutare/AF-PÅ"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "AE/AF-lås"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Endast AE-lås"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "AE-lås (Återställ vid utlösning)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "AE-lås (Håll)"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Endast AF-lås"
 
 # sebras: bps? bildrutorpersekund?
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Otilldelad"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "FV-lås"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "AE-lås (håll)"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Gafflingssekvens"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Matrismätning"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Centrumviktad mätning"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Punktmätning"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Spela upp"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Kom åt översta objektet i MIN MENY"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEW (RAW)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Hjälplinjer"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Aktivt D-ljus"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 steg hast./bländare"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Använd icke-CPU objektivnummer"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Sökare virtuell horisont"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
-msgstr "Starta filminspelning"
+msgstr "Starta videoinspelning"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "På (bildgransknings exkluderad)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
-
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
+msgstr "Ansiktsdetektering"
+
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr "Ansikts- och pupilldektetering"
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr "Djurdetektering"
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Okänt värde"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Nikon changeafarea fungerar bara i LiveView-läge."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Nikon autofokuskörning fokuserade inte."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Nikon manuell fokus fungerar bara i LiveView-läge."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Nikos manuell fokus på gränsen."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Nikon manuella fokussteg för små."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Tryck halvvägs"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Tryck ner fullständigt"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Släpp halvvägs"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Släpp helt"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Omedelbart"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Tryck 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Tryck 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Tryck 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Utlösare 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Utlösare 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Utlösare 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Nära 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Nära 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Nära 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Fjärran 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Fjärran 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Fjärran 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Nära %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Fjärran %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr "Livevisning kan inte starta: Batteriet uttömt"
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr "Livevisning kan inte starta: Temperatur för hög"
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr "Livevisning kan inte starta: TTL-fel"
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr "Livevisning kan inte starta: I spegel-upp-åtgärd"
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr "Livevisning kan inte starta: Objektiv dras in"
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr "Livevisning kan inte starta: Varning för minsta bländare"
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr "Livevisning kan inte starta: Behandlar tagningsåtgärd"
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr "Livevisning kan inte starta: Sekvensfel"
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr "Livevisning kan inte starta: Exponeringsprogramläge är inte P/A/S/M"
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr "Livevisning kan inte starta: Blixtvarning"
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr "Livevisning kan inte starta: Kort oformaterat"
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr "Livevisning kan inte starta: Kortfel"
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr "Livevisning kan inte starta: Kort skyddat"
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+"Livevisning kan inte starta: Inspelningsdestination är på kort, men kort är "
+"skyddat eller saknas"
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr "Livevisning kan inte starta: Väntande ohämtad SDRAM-bild"
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr "Livevisning kan inte starta: Helt nedtryckt knapp"
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr "Livevisning kan inte starta: kod 0x%08x"
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Nikon aktivera livevisning misslyckades"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr "Förhindervillkor för video: "
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr "Inte i applikationsläge"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr "Ställ in livevisningsväljaren är aktiverad"
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+msgid "In enlarged liveview"
+msgstr "I förstorad livevisning"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr "Kort skyddat"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr "Redan i videoinspelning"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr "Bilder / videor ännu inte inspelade i buffert"
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr "Kort fullt"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr "Kort inte formaterat"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr "Kortfel"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr "Förhindervillkor för video"
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr "Förhindervillkor för livevisning: "
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr "Sekvensfel"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr "Helt nedtryckt knapp"
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr "Varning för minsta bländare"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr "Batteriet slut"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr "TTL-fel"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr "Väntande ohämtad SDRAM-bild"
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr "Inspelningsdestination är på kort, men kort är skyddat eller saknas"
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr "Behandlar tagningsåtgärd"
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr "Temperatur för hög"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr "Kort oformaterat"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr "Blixtvarning"
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr "I spegel-upp-åtgärd"
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr "Objektiv dras in"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Exponeringsprogramläge är inte P/A/S/M"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr "Livevisning bör inte vara förbjudet"
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr "Videoinspelning kan inte starta: %s."
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr "Kamera inte i applikationsläge"
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr "Videoinspelning kan inte starta: kod 0x%08x."
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Lysrör"
+
+#: camlibs/ptp2/config.c:9152
+msgid "White set"
+msgstr "Vitinställning"
+
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr "Svartvit"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Temperatur 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Temperatur 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Temperatur 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Temperatur 4"
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr "Automatisk kall"
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr "Automatisk varm"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
 msgstr ""
-"För att blixttagning ska fungera, säkerställ att lägesratten är inställt på "
-"”M” och ställ in ”slutarhastighet” på ”blixt”."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Okänd 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Supermakro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Fjärran 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Fjärran 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Nära 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Nära fjärran"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+#, fuzzy
+msgid "S"
+msgstr "SV"
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Standard"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Spela in"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Spela upp"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Andra inställningar"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Hög ISO-brusreducering"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Visa inte TV-menyn"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+"\n"
+"Strömmar:"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "stor"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Okänt värde för miniatyrstorlek ”%s”."
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Internt RAM"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Minneskort"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Skärm"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Skapelsedatum: %s, Senast använda datum: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Ta bort"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Hanterad"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Profilnamn"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP-adress (tom för DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Nätmask"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Standard gateway"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Åtkomstläge"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "WIFI-kanal"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Krypteringsnyckel (hex)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Skriv"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Lista trådlösa profiler"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Skapa Wifi-profil"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Synkronisera kameradatum och -tid med PC (UTC)"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Autofokus"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Manuell fokus"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Stäng av"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Fokuslås"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Blixtläge"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "UI-Lås"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Popupp blixt"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Kör Nikon DSLR autofokus"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Driv Canon DSLR autofokus"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr "Kör Fuji autofokus"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Kör Nikon DSLR manuell fokus"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Ställ in Nikon autofokusområde"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Ställ in Nikon kontrolläge"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Driv Canon DSLR manuell fokus"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Avbryt Canon DSLR autofokus"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Kör Olympus OMD manuell fokus"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Driv Panasonic manuell fokus"
+
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr "Kör Fuji autofokus"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "EZoom startposition"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Canon EOS zoom"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Canon EOS zoomposition"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Canon EOS-sökare"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Panasonic-sökare"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Nikon-sökare"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Canon EOS fjärrutlösare"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "CHDK-skript"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Filmtagning"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+msgid "Movie Mode"
+msgstr "Filmläge"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Fokusinformation"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Fokuspunkt ljus"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "PTP-opkod"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Kameratillverkare"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Enhetsversion"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Tillverkarutökning"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "PTP-version"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "DPOF-version"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "AC-ström"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Extern blixt"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Batterinivå"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr "Spegel upp-status"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Spegel upp"
+
+#: camlibs/ptp2/config.c:10742
+#, fuzzy
+msgid "Mirror Lock Status"
+msgstr "Spegel upp-status"
+
+#: camlibs/ptp2/config.c:10743
+#, fuzzy
+msgid "Mirror Down Status"
+msgstr "Spegel upp-status"
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr "Spegel upp-tagningsantal"
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr "Kontinuerlig tagningsantal"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Kameraorientering"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Blixt öppen"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr "Aktiv mapp"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Blixt laddad"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Objektivnamn"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Slutarräknare"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Tillgängliga bildtagningar"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Brännvidd minimum"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Brännvidd maximum"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Maximum bländare vid minimal brännvidd"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Maximum bländare vid maximal brännvidd"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Dämpat ljus"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Ljusmätare"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "AF låst"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "AE låst"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "FV låst"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+msgid "Movie Switch"
+msgstr "Filmknapp"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr "Förhindervillkor för livevisning"
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr "Förhindervillkor för livevisning"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Kameradatum och -tid"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Pipläge"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Bildkommentar"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "WLAN GUID"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Aktivera bildkommentar"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "LCD-avstängningstid"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Inspelningsmedia"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Förhandsgranskningstid"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "CSM-meny"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Omvänd kommandoratt"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Kamerautgång"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Inspelningsdestination"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "EVF-läge"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Artist"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "CCD-nummer"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Copyright"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Rengör sensor"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Blinkningsreduktion"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Anpassa funktioner Ex"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Fokusinformation"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Fokusområdet"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr "Strobutlösning"
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr "Blixtladdningstillstånd"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr "Enkelbildstagning rå på"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Automatisk avstängning"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Skärpedjup"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Menyer och uppspelning"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr "Extern inspelningskontroll"
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr "Kameraåtgärd"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+msgid "Priority Mode"
+msgstr "Prioritetsläge"
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr "Miniatyrbildsstorlek"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Snabbt filsystem"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Tagningsmål"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Autofokus"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Fjärrläge"
+
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr "Händelseläge"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Bildformat SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Bildformat CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Bildformat Ext HD"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr "Filmsimulering"
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr "Råbildsstorlek"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Film ISO-hastighet"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "ISO Auto"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Vitbalans justering A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Vitbalans justering B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Vitbalans X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Vitbalans X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Fotoeffekt"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Färgmodell"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Färgrymd"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Videoformat"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Videoupplösning"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Video bildhastighet"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Videokontrast"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Ljusstyrka för video"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Ljudformat"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Ljud bithastighet"
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr "Ljud samplingshastighet"
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr "Ljud bitar per sampel"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Ljudvolym"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Lång exponering brusreducering"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Autofokusläge 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Zoomhastighet"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Hjälpljus"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Rotationsflagga"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+msgid "Movie Exposure Compensation"
+msgstr "Videoexponeringskompensation"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Färgtemperatur"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "AF-läge"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "MF-assistans"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Starta videoinspelning"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Blixtkompensation"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "AEB-exponeringskompensation"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Nikon blixtläge"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Blixt kommandoläge"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Blixt kommando ström"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Blixtkommandokanal"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Blixt kommando självläge"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Blixt kommando självkompensation"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Blixtkommando självvärde"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Blixt kommando A-läge"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Blixt kommando A-kompensation"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Blixtkommando A-värde"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Blixt kommando B-läge"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Blixt kommando B-kompensation"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Blixtkommando B-värde"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "AF-områdes belysning"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "AF pipläge"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "F-nummer"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr "Livevisningsstorlek"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Film f-nummer"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Flexibelt program"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kvalitet"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Råbildsstorlek"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Bildformat"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Fokusavstånd"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Brännvidd"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Fokusläge 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Kontinuerlig AF"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Effektläge"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Exponeringsprogram"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+msgid "User Mode"
+msgstr "Användarläge"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Scenläge"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Bildförhållande"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "AF-läge"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Sammanfattning om lagringsenheter:\n"
+msgstr "Lagringsenhet"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Hög ISO-brusreducering"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "HDR-läge"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "HDR hög dynamik"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "HDR utjämning"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Tagningsläge för stillbilder"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Canon bildtagningsläge"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Canon autoexponeringsläge"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Canon autoexponeringslägesskiva"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Körläge"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Bildstil"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Fokusmätningsläge"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Exponeringsmätningsläge"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV öppen"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV max"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr "Bländare 2"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Fokuspunkt"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Tagningsfördröjning"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Slutarhastighet 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Film slutarhastighet 2"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Mätningsläge"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "AF-avstånd"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Fokusområdesomslutning"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Exponeringsfördröjningsläge"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Exponeringslås"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "AE-L/AF-L-läge"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "AF-läge för livevisning"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "AF-fokus för livevisning"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr "Förhandsgranskning av livevy-exponering"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Bildzoomsförhållande för livevisning"
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr "Förhandsgranskning av livevy-vitbalans"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Livevisningsstorlek"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Sekvensiering av filnummer"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Blixttecken"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Modellerande blixt"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Hjälplinjer för sökare"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Bildgranskning"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Bildrotationsflagga"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Utlös utan CF-kort"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Blixtläge manuell ström"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Autofokusområde"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Blixtexponeringskompensation"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Gaffling"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Gafflingsläge"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "EV-steg"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Gafflingsinställning"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Gafflingsordning"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr "AE-gafflingssteg"
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr "VB-gafflingssteg"
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr "AE-gafflingsmönster"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr "VB-gafflingsmönster"
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr "AE-gafflingsantal"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr "ADL-gafflingsmönster"
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr "ADL-gafflingssteg"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr "VB-förinställnings kommentar 1"
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr "VB-förinställnings kommentar 2"
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr "VB-förinställnings kommentar 3"
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr "VB-förinställnings kommentar 4"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr "VB-förinställnings kommentar 5"
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr "VB-förinställnings kommentar 6"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Sekvensnummer"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Sekvensintervall"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Maximalt antal bilder"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Auto vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Glödlampa vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Lysrör vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Dagsljus vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Blixt vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Molnigt vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Skuggigt vitbalansnivå"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Naturligt jus auto vitbalansnivå"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Vitbalans nivå förinställning Nummer"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Vitbalansnivå förinställning 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Vitbalansnivå förinställning 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Vitbalansnivå förinställning 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Vitbalansnivå förinställning 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Vitbalansnivå förinställning 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Självutlösningsfördröjning"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Centrumviktat område"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Blixt slutartid"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Fjärrtidsgräns"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Fjärrläge"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Applikationsläge"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Optimera bild"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Skärpning"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Tonkompensering"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Mättnad"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Nyansjustering"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Auto exponeringsgaffling"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Automatisk ljusättningsoptimering"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Filmljud"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
-msgstr "Manuell filminställning"
+msgstr "Manuell videoinställning"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Omvänd indikatorer"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Automatisk förvrängningskontroll"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr "Inledningskorrigering"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Videoläge"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Sensorsbeskärning"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr "Datadjup för HDMI-utgång"
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr "Ansiktsdetektering"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr "Video-servo AF"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Mätar av tid"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Tilldela funk-knapp"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Tilldela förhandsgranskningsknapp"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Filmkvalitet"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Minimal slutarhastighet"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Kontinuerlig bildtagning hastighet långsam"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Filmupplösning"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Kontinuerlig bildtagning hastighet långsam"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Minimal slutarhastighet"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Filmkvalitet"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "ISO auto hög gräns"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Blixt synk.-hastighet"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Fokusmätning"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Kontinuerlig bildtagning hastighet hög"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "JPEG-komprimeringspolicy"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "AF-C-lägesprioritet"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "AF-S-lägesprioritet"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "AF-aktivering"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Dynamiskt-AF-område"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "AF-lås på"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "AF-områdespunkt"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "AF på-knapp"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Film hög ISO-brusreducering"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Maximal kontinuerlig utlösare"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr "Videolooplängd"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Rå komprimering"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Bildkvalitet 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Bildinställningar"
-
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr "Livevisning zoomområde"
+
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Tagningsinställningar"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "WIFI-profiler"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Andra PTP-enhetsegenskaper"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "PTP-egenskap 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Egenskapen ”%s” / 0x%04x är för närvarande skrivskyddad."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Egenskapen ”%s” / 0x%04x var inte inställd (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Egenskapen ”%s” / 0x%04x var inte inställd (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 "Tolkningen av värdet för komponenten ”%s” / 0x%04x misslyckades med %d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Egenskapen ”%s” hittades inte."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Du måste ange en mapp som börjar med /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7731,187 +9970,209 @@
 "\n"
 "Mycket nöje!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "Din Nikon-kamera verkar inte returnera en JPEG-bild i LiveView-läge"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Canon aktivering av sökare misslyckades"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Canon hämta sökarbild misslyckades"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Tyvärr, din Canon-kamera saknar stöd för Canon sökarläge"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Din Nikon-kamera stöder inte LiveView-läge"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "Din Nikon-kamera verkar inte returnera en JPEG-bild i LiveView-läge"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr "Livevisning kan inte starta: %s"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Nikon inaktivera livevisning misslyckades"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "Din Sony-kamera verkar inte returnera en JPEG-bild i LiveView-läge"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Din Panasonic-kamera verkar inte returnera en JPEG-bild i LiveView-läge"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Din kamera stöder inte Nikon-tagning"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 "Misslyckades att aktivera livevisning på en Nikon 1, men det behövs för "
 "tagning"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Tyvärr, din Canon-kamera saknar stöd för Canon EOS-tagning"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS Hämta förändringar misslyckades"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Tyvärr, din Canon-kamera saknar stöd för Canon-tagningsinitiering"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Canon inaktivera sökare misslyckades"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Canon-tagning misslyckades"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr "Tagning misslyckades: Ingen fokus."
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Din kamera stöder inte allmän tagning"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr "Kamerans minneskort blev fullt under tagning."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Canon EOS Halv-nedtryck misslyckades"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Canon EOS-tagning misslyckades med att utlösa: Kanske inte i fokus?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Canon EOS Halv-utlösare misslyckades"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Canon EOS Full-nedtryck misslyckades"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Canon EOS Full-utlösare misslyckades"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Canon EOS Full-nedtryck misslyckades"
+msgstr "Canon EOS M Fullt-nedtryck misslyckades"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr "Canon EOS-tagning misslyckades med att utlösa: Kanske inte i fokus?"
+msgstr "Canon EOS M-tagning misslyckades: Kanske inte i fokus?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Canon EOS Full-utlösare misslyckades"
+msgstr "Canon EOS M Full-utlösare misslyckades"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS-tagning misslyckades"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS-tagning misslyckades: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Canon EOS-tagning misslyckades med att utlösa: Kanske är spegeln uppe?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 "Canon EOS-tagning misslyckades med att utlösa: Kanske kortet har slut på "
 "minne?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS-tagning misslyckades med att utlösa: Kortet skrivskyddat?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Canon EOS-tagning misslyckades med att utlösa: Okänt fel %d, rapportera "
 "detta."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr "Initieringen av din kamera fungerade inte. Rapportera detta."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Tillverkare: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Modell: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Version: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Serienummer: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Tillverkarutöknings-ID: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Beskrivning av tillverkarutökning: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "PTP-standardversion: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Funktionsläge: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7919,20 +10180,32 @@
 "\n"
 "Tagningsformat: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Visningsformat: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+"\n"
+"Strömmar:"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "Ljud"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "MTP-objektegenskaper som stöds:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP-fel %04x vid förfrågan"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7940,87 +10213,87 @@
 "\n"
 "Enhetsegenskaper:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tFilhämtning, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Fil borttagning, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Ingen filborttagning, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Filsändning\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Ingen filsändning\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tGenerisk bildtagning, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tIngen bildtagning, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Öppen tagning, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Ingen öppen tagning, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Canon-tagning, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Canon EOS-tagning, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Canon EOS-tagning 2, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Nikon-tagning 1, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "%sNikon-tagning 2, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "%sNikon-tagning 3, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Sony-tagning, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr "Olympus E XML-tagning, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Ingen tillverkarspecifik tagning\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon Wifi-stöd\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon Wifi-stöd\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8028,93 +10301,93 @@
 "\n"
 "Sammanfattning om lagringsenheter:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tLagringsbeskrivning: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tVolymetikett: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Inbyggt ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Flyttbart ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Inbyggt RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Flyttbart RAM (minneskort)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Okänd: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tLagringstyp: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Generell platt"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Allmänt hierarkisk"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Digitalkamera utplacering (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tFilsystemstyp: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Läs-skriv"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Skrivskyddad"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Skrivskyddat med objektborttagning"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tTillgångs möjlighet: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaximal tillgänglighet: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tLedigt utrymme (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tLedig utrymme (bilder): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8122,47 +10395,47 @@
 "\n"
 "Sammanfattning om enhetsegenskaper:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " inte utlästa.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "kan ej frågas.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "skrivskyddad"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "lässkriv"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " fel %x i förfrågan."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Filen “%s/%s“ existerar inte."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Metadata stöds endast för MTP-enheter."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Enheten stöder inte inställning av objektsskydd."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Enhet misslyckades att ställa in objektsskydd till att vara %d"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8171,7 +10444,7 @@
 "För närvarande är PTP endast implementerat för USB- och PTP/IP-kameror, "
 "porttyp %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8179,2235 +10452,2312 @@
 "Olympus stöd för inkapslad XML finns för närvarande bara tillgänglig om "
 "libxml2-stöd har byggts in."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP sessionen inte öppen"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
-msgstr "PTP operationen stöds ej"
+msgstr "PTP-åtgärd stöds ej"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter stöds ej"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ofullständig överföring"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ogiltig lagrings-ID"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ogiltigt objekt handtag"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhet egenskap stöds ej"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP åtkomst nekad"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen miniatyrbild tillgänglig"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP självtest misslyckades"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP lagring inte tillgänglig"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation av format stöds ej"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen giltig objektinformation"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP ogiltigt kodformat"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP okänd tillverkarkod"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP-enhet upptagen"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ogiltigt föräldraobjekt"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ogiltigt format för enhetsparameter"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhetsparametervärde"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP sessionen redan öppen"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare stöds ej"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr "Ogiltigt Enum-handtag"
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr "Ingen ström aktiverad"
+
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr "Ogiltig datamängd"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Filnamn krävs"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Filnamn skapar konflikt"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Ogiltigt filnamn"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Hårdvarufel"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Ej fokuserad"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Ändring av kameraläge misslyckades"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Ogiltig status"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Inställd egenskap stöds ej"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Återställningsfel för vitbalans"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Dammreferensfel"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Slutarhastighet Blixt"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Spegel upp-sekvens"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Kameraläge inte justera f-nummer"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Inte i liveström"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "MF drivstegsslut"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Mf drivstegsotillräcklighet"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Avbrott för avancerad överföring"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr "Ingen förinställning för full-HD"
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr "Lagringsfel"
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr "Lagring oformatterad"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr "Blixtutlösare upptagen"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr "Tyst utlösare upptagen"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr "Videoramsutlösning upptagen"
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr "Slutarhastighetstid"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr "Väntar på andra utlösningen"
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr "MirrorUpCapture redan påbörjad"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr "Ogiltigt SBAttribute-värde"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Okänt kommando"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Operation avböjd"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Objektivskydd närvarande"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Lågt batteri"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Kamera inte redo"
 
-#: camlibs/ptp2/ptp.c:4708
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr "Objektivskydd stängt"
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr "Lågt batteri"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr "Objekt inte redo"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr "Kan inte skapa objekt"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr "Minnesstatus inte redo"
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr "Ogiltig ObjectPropCode"
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr "Ogiltigt ObjectProp-format"
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr "Ogiltigt ObjectProp-värde"
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr "Ogiltig ObjectReference"
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr "Ogiltig datamängd"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr "Specifikation efter grupp stöds ej"
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr "Specifikation efter djup stöds ej"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr "Objekt för stort"
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr "ObjectProp stöds ej"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr "Ogiltigt mediasessions-ID"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr "Begränsning för mediasessioner uppnådd"
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr "Slut på data"
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr "Ogiltig WFC-syntax"
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr "WFC-version stöds ej"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "PTP-enhet upptagen"
+msgstr "PTP Ingen enhet"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "PTP-tidsgräns"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "PTP avbrottsbegäran"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "PTP-svar förväntat"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "PTP-data förväntad"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "PTP I/O-fel"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Odefinierad PTP-egenskap"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Funktionsläge"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Komprimeringsinställning"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Vitbalans"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "RGB-förstärkning"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Exponeringstid"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Programläge för exponering"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Exponeringsindex (filmhastighet ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Kompensation för exponeringsnivå"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Fördröjning för förtagning"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Digital zoom"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Nummer för tidsintervall"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Intervall för tidsintervall"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "Sändnings-URL"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Copyright-info"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Strömmar som stöds"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Aktiverade strömmar"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Videoformat"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Videoupplösning"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Videokvalitet"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Video bildhastighet"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Videokontrast"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Ljusstyrka för video"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Ljudformat"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Ljud bithastighet"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Ljud samplingshastighet"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Ljud bitar per sampel"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Ljudvolym"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Format för datum- och tidsstämpel"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Video-ut"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Strömspar"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Gränssnittsspråk"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Batterityp"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Batteriläge"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "Låstyp för gränssnitt"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Kameraläge"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Filformat för fullständig vy"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Självutlösare"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Bildtagningsläge"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Bildläge"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Långsam slutarinställning"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "AF-läge"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Bildstabilisering"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Färgförstärkning"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Känslighet"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Parameterinställning"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Av öppen"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Av max"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Brännvidd tele"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Brännvidd vidsträckt"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Brännvidd nämnare"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Överföringsläge för tagning"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Namnprefix"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Storlekskvalitetsläge"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Miniatyrbildsstorlek som stöds"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Storlek för utmatningsdata från kamera"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Storlek för inmatningsdata till kamera"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Fjärr-API-version"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Kameraägare"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "UNIX-tid"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Kamerahus-ID"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Skärm av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av öppen topp"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Digital zoom-förstoring"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Ml punktposition"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Skärm av max"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av max topp"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "EZoom startposition"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "EZoom storlek för tele"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Blixt kvantitetsmängd"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Rotationsvinkel"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Rotationsscen"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Emuleringsläge för händelse"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Typ av bildspel"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Genomsnittliga filstorlekar"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Modell-ID"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr "EOS fixerad videoknapp"
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Bildtagningsbank"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Bildtagningsbank namn A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Bildtagningsbank namn B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Bildtagningsbank namn C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Bildtagningsbank namn D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Återställ bank 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Färgtemperatur för vitbalans"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Vitbalans förinställningsnummer"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Vitbalans förinställningsnamn 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Vitbalans förinställningsnamn 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Vitbalans förinställningsnamn 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Vitbalans förinställningsnamn 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Vitbalans förinställningsnamn 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Vitbalans förinställningsvärde 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Vitbalans förinställningsvärde 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Vitbalans förinställningsvärde 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Vitbalans förinställningsvärde 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Vitbalans förinställningsvärde 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Objektivbrännvidd (icke-CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Objektiv maximal bländare (icke-CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Auto DX-beskärning"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Menybank namn A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Menybank namn B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Menybank namn C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Menybank namn D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Återställ menybank"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Vertikal AF på"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Fokusområdeszon"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Aktivera upphovsrättsskydd"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Exponering ISO-steg"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Exponeringssteg"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Exponeringskompensation (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Centrumviktsområde"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Basmatris för exponering"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Bascentrum för exponering"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Baspunkt för exponering"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Livevisning AF-område"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Auto mätning av tid"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Självutlösningsfördröjning"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Bildkonfigurationstid"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Auto av tidsutlösare"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Vinkelnivå"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Bildtagningshastighet"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Exponeringsfördröjningsläge"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Lång exponering brusreducering"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "LCD-belysning"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Hög ISO-brusreducering"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Tips på skärmen"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Artistnamn"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Copyright-information"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Modelleringsblixt"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Manuellägesgaffling"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Auto gafflingsval"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "NIKON autogafflingsinställning"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Bildtagningsläge för mittknapp"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Uppspelningsläge för mittknapp"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Flerväljare"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Fotoinformationsuppspelning"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Tilldela funk.-knapp"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Anpassa kommandorattar"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Bländarinställning"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Knappar och rattar"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Ingen utlösare för CF-kort"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Zoom-förhållande för mittknapp"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Funktionsknapp 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Normal AF på"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Rengör bildsensor"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Bildkommentarssträng"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Bildkommentar aktiverad"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Bildrotation"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Manuell inställning av objektivnummer"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Film skärmstorlek"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Film röst"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Film mikrofon"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Film kortlucka"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Fördröjning för avstängning av skärm"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Gaffling aktiverad"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Exponeringsgafflingssteg"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Exponeringsgafflingsprogram"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Auto exponering gafflingsantal"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Vitbalans gafflingssteg"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Vitbalans gafflingsprogram"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Objektiv-ID"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Objektivsortering"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Objektivtyp"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Min. brännvidd"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Max. brännvidd"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Max. bländare vid min. brännvidd"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Max. bländare vid max. brännvidd"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "ISO-visning i sökare"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Auto-av foto"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Auto-av meny"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Auto-av info"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Tagningsnummer för självutlösare"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Inledningskontroll"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Nikon exponeringstid"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Varningsstatus"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD toppläge 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Aktiv AF-sensor"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Exponeringsmätare"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "USB-hastighet"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Serienummer för CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Grupp PTN-typ"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Lås för f-nummer"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Exponeringsbländarlås"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "TV-låsinställning"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "AV-låsinställning"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Belysningsinställning"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Fokuspunkt ljus"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Extern blixt ansluten"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Extern blixtstatus"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Extern blixt sortering"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Extern-blixtläge"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Extern-blixtkompensation"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "SV fyllnadseffekt"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "SV skärpning"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "Svartvit kontrast"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "SV inställningstyp"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Lucka 2 sparläge"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Råbitsläge"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
 msgstr "Lysrörstyp"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Justera färgtemperatur"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Förinställning 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Förinställning 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Förinställning 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Förinställning 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Förinställning 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Autofokusläge"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "AF-hjälpljus"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Auto ISO P/A/DVP-inställning"
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Visning av hjälplinjer i sökare"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Blixtläge kommendörsström"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Auto FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Varningsvisning"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Battericellstyp"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "ISO auto hög begränsning"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Kontinuerlig hastighet hög"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Info-visningsinställning"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Attached"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Förhandsgranskningsknapp 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "AEAF-lås knapp 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Indikatorvisning"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Celltypsprioritet"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Gafflande bilder och steg"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Livevisningsläge"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Livevisningskörläge"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Livevisningsstatus"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Bildzoomsförhållande för livevisning"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Förhindervillkor för livevisning"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Exponering skärmstatus"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Exponeringsindikationsstatus"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Felstatus för infoskärm"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Exponering indikations upplysning"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Blixt M-repetitionsvärde"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Blixt m-repetitionsantal"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Blixt M-repetitionsintervall"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Aktivt Pic Ctrl-objekt"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Ändra Pic Ctrl-objekt"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr "Kameraspråk"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr "Utlös utan SD-kort"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Bildkomprimering"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Säker tid"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Enhetscertifikat"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Återkallelseinformation"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Synkroniseringspartner"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Läsbart enhetsnamn"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Volymnivå"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Enhetsikon"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Info om sessionsinledning"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Upplevd enhetstyp"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Uppspelningshastighet"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Uppspelningsobjekt"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Behållarindex för uppspelning"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Uppspelningsposition"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "PaysForSure-ID"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Kvalitet"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Utlösningsläge"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Fokusområden"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "AE-lås"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
+msgstr "Fokuspunkt"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Bildstorlek"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Slutarhastighet"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Färgtemperatur"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "Fokusstatus"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr "Objekt i minne"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Exponeringsindex"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "AB-filter"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Stillbild"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr "Nära fjärran"
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr "AF-områdesposition"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Datum tid"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG norm"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG grundläggande"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Glödlampa"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Manuell fokus"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Automatisk makro (närbild)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Centrumviktat medelvärde"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Centrumpunkt"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Automatisk blixt"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Automatisk röda ögon-reduktion"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Röda ögon-upplättningsblixt"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Strömvind"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Timer + fjärr"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Endast AF-lås"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Blixtlås"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Återställ fokuspunkt till centrum"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Markera aktiv fokuspunkt"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Oanvänd"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRam"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "LCD-ljusstyrka"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "LCD-bakgrundsbelysning och informationsskärm"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Mörk på ljus"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Ljus på mörk"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Litium-jon"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Nickel-hydrit"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Nickel-kadmium"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Alkalium-mangan"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Varning nivå 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Nödläge"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Varning nivå 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Ekonomi"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "SuperFin"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Röda ögon-reduktion"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Låghastighetssynkronisering"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Auto + röda ögon-reduktion"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "På + röda ögon-reduktion"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Vidsträckt vy"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Höghastighetsslutare"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Låghastighetsslutare"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Nattvy"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Gråskala"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Panoreringsfokus"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Enkelbildstagning"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Kontinuerlig Bildtagning"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Självutlösande (enkel) bildtagning"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Kontinuerlig långsam bildtagning"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Kontinuerlig höghastighet bildtagning"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Jämn"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Centrumviktad mätning"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Punktmätning"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Medelvärdesmätning"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Utvärderande mätning"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Partiell mätning"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Centrumviktad medelvärdesmätning"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Punktmätning sammanvävd med AF-ram"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Flerpunktsmätning"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Låghastighetsslutarfunktion inte tillgänglig"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Låg 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Hög 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Övre 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Övre 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Parametrar för standardutveckling"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Utvecklingsparametrar 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Utvecklingsparametrar 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Utvecklingsparametrar 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MlSpotPosCenter"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MlSpotPosAfLink"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Mediakort"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Mediakortsgrupp"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Sammanträffande"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Mötesbox"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Fast programvara"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Windows-bildformat"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Odefinierat ljud"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Audible.com-kodek"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Samsung-spellista"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Odefinierad video"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Odefinierad samling"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Abstrakt multimediaalbum"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Abstrakt bildalbum"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Abstrakt ljudalbum"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Abstrakt videoalbum"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Abstrakt audio/video-spellista"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Abstrakt kontaktgrupp"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Abstrakt meddelandefolder"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Abstrakt kapitelindelad produktion"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Abstrakt ljud spellista"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Abstrakt video spellista"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstrakt mediautsändning"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "WPL-spellista"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "M3U-spellista"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "MPL-spellista"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "ASX-spellista"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "PLS-spellista"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Odefinierat dokument"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Abstrakt dokument"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "XML-dokument"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word-dokument"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "MHT kompilerat HTML-dokument"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Microsoft Excel-kalkylblad (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Odefinierat meddelande"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Abstrakt meddelande"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Odefinierad kontakt"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Abstrakt kontakt"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Odefinierat kalenderobjekt"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Abstrakt kalenderobjekt"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Odefinierad körbar fil för Windows"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Mediasändning"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Avsnitt"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Okänd (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Hämta enhetsinfo"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Öppna session"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Stäng session"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Hämta lagrings-ID:n"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Hämta lagringsinformation"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Hämta antal objekt"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Hämta objekthandtag"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Hämta objektinformation"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Hämta objekt"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Hämta miniatyrbild"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Ta bort objekt"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Skicka objektinformation"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Skicka objekt"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Inled tagning"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Formatera lagring"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Återställ enhet"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Självtesta enhet"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Ställ in objektsskydd"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Stäng av enhet"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Hämta beskrivning för enhetsegenskap"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Hämta värde för enhetsegenskap"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Ställ in värde för enhetsegenskap"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Återställ värde för enhetsegenskap"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Avsluta öppen tagning"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Flytta objekt"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Kopiera objekt"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Hämta ofullständigt objekt"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Inled öppen tagning"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Börja räkna upp handtag"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Räkna upp handtag"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Sluta räkna upp handtag"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Hämta tillverkarutökningsmappningar"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Hämta tillverkarenhetsinfo"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Hämta bildobjekt som ändrat storlek"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Hämta filsystemsmanifest"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Hämta ströminfo"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Hämta ström"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Hämta lista över objektegenskaper som stöds"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Hämta beskrivning för objektegenskap"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Hämta värde för objektegenskap"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Ställ in värde för objektegenskap"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Hämta lista över objektegenskaper"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Ställ in lista över objektegenskaper"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Hämta beskrivning för korsberoende egenskaper"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Skicka lista över objektegenskaper"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Hämta objektreferenser"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Ställ in objektreferenser"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Uppdatera enhetens fasta programvara"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Hoppa vidare till nästa position i spellistan"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Hämta säker-tidsutmaning"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Hämta säker-tidssvar"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Ställ in licenssvar"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Hämta synkroniseringslista"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Skicka mätarutmaningsfråga"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Hämta mätarutmaning"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Hämta mätarsvar"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Rensa datalagring"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Hämta licenstillstånd"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Skicka WMDRM-PD-kommando"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Skicka WMDRM-PD-begäran"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Rapportera tillagda/borttagna objekt"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Rapportera förvärvade objekt"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Hämta överförbara spellisttyper"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Skicka WMDRM-PD-programbegäran"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Hämta WMDRM-PD-programsvar"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
-msgstr "Aktivera pålitliga filoperationer"
+msgstr "Aktivera pålitliga filåtgärder"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
-msgstr "Inaktivera pålitliga filoperationer"
+msgstr "Inaktivera pålitliga filåtgärder"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Avsluta pålitlig programsession"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Öppna mediasession"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Stäng mediasession"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Hämta nästa datablock"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Ställ in nuvarande tidsposition"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Skicka registreringsbegäran"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Hämta registreringssvar"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Hämta närhetsutmaning"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Skicka närhetssvar"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Skicka WMDRM-ND-licensbegäran"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Hämta WMDRM-ND-licenssvar"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Hantera WFC-objekt"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Hämta partiellt objekt (64-bitars offset)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Skicka partiellt objekt"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Trunkera objekt"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Börja redigera objekt"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Sluta redigera objekt"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Okänd PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Okänt tillverkarutöknings-ID"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Okänt värde"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
-msgstr "Hämtar film…"
+msgstr "Hämtar video…"
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Hämtar ljud…"
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Hämtar EXIF-data…"
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Ingen EXIF-data finns tillgänglig för %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Kunde inte ta bort fil."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Kunde inte ta bort katalogen."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Kunde inte skapa katalogen."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Version: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "RTC-status: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Kameratid: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Kamera-ID: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Inget SD-kort isatt.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "SD-korts-ID: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Foto i kamera: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "SD-minne: %d MB totalt, %d MB ledigt.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Internt minne: %d MB totalt, %d MB ledigt.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10419,7 +12769,7 @@
 "Framställd via omvänd ingenjörskonst med USB Snoopy, studier\n"
 "av avbild för uppdatering av fast programvara och vilda gissningar.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10431,12 +12781,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "baserat på Bob Paauwes drivrutin\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "okänd (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10445,188 +12795,188 @@
 "Modell: %s\n"
 "Minne: %d byte av %d tillgängliga"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "128 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Utomhus"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Maximal"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Minimal"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Karaktär"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Ljud"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Bild & Ljud"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Karaktär & Ljud"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Generellt"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Copyright (max. 20 tecken)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Bilder"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Vitbalans"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Inspelningsläge"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Komprimering"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Hastighet %i stöds ej!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Förväntade %i byte, fick %i. Rapportera felet till %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Förväntade %i byte, fick %i. Rapportera detta felet till %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Vi förväntade 0x%x men mottog 0x%x. Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Felaktiga tecken (0x%x 0x%x). Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Kameran upptagen. Om problemet kvarstår, kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Tidsgräns även efter 2 försök.  Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Kommunikationsfel även efter 2 försök. Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Kameran är i fel läge. Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Kameran accepterade inte parametrarna.  Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Ett okänt fel uppstod. Kontakta %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "Filnamnets längd kan inte överstiga 12 tecken (”%s” har %i tecken)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10638,108 +12988,108 @@
 "konverterade den till gphoto2. Marcus Meïssner <marcus@jet.franken.de> "
 "fixade och förbättrade konverteringen."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Upplösning plus Storlek"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Datum och Tid (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Bländarinställningar"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Färgläge"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Röda ögon-reduktion"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Blixtinställningar"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Värd strömbesparing (sekunder)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Kamera strömbesparing (sekunder)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Objektivläge"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Koreanska"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Engelska"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Franska"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Tyska"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Italienska"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Japanska"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Spanska"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Bildinställningar"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10759,225 +13109,221 @@
 "  en PhotoPC 3000z, om din kamera beter sig annorlunda\n"
 "  skriv ett brev till %s (på Engelska)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Inget minnes kort isatt"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Kan inte hämta batterikapaciteten"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Batterinivån hos kameran är för låg (%d%%). Operationen avbröts."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Kan inte hämta hur mycket tillgängligt minne som finns kvar"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Kameran vägrade att hålla förbindelsen öppen tre gånger."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Den första byten mottogs (0x%x) är inte giltig."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr "Överföringen av paketet löpte ut även efter %i försök. Kontakta %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Kunde inte skicka paketet även efter flera försök."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Paketet blev avvisat av kameran. Kontakta %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Kunde inte överföra paket (felkod %i).  Kontakta %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Överföringen tog för lång tid och avbröts efter %i försök. Ger upp…"
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Fick oväntat resultat 0x%x. Kontakta %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Mottog oväntat resultat %i.  Kontakta %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Kunde inte hämta register %i.  Kontakta %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "För många försök misslyckades."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Hämtar data…"
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr "rekursiva anrop stöds ej av sierra-drivrutinen! Kontakta %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Kunde inte hämta strängregister %i. Kontakta %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Förväntade 32 byte, fick %i.  Kontakta %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Slutartid mikrosekunder (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "B/W"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Anti-röda ögon"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Långsam synk"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Kontrast-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Ljusstyrka+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Ljusstyrka-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Bildjustering"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Blinka"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED-läge"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Oändlighet"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Förhandsgranskningsbild"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Nästa"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Föregående"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Operationsläge"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCD-ljusstyrka"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD automatisk avstängning (sekunder)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Centrumviktad"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Matris"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Punkt-AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Exponeringsmätning"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (i millimeter)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "ingen"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "AE-lås"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Fisköga"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Bred"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Diverse exponerings-/objektivinställningar"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Auto exponeringslås"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11007,7 +13353,7 @@
 "        Sätt kameran i ”M”-läge för att ställa in\n"
 "        slutarhastigheten.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11026,67 +13372,63 @@
 "\n"
 "    Hämtningen bör fungera korrekt.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "White board"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Black board"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Färg eller funktionsläge"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Långsam"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Anti-röda ögon-utfyllnad"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Lysrör-1-hemma-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Lysrör-2-skrivbord-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Lysrör-3-kontor-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Skymning"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Skärm"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD-läge"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Digital zoom"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Fokusläge"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Tidsformat"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11119,7 +13461,7 @@
 "    kamerans knappar. Om du hamnar i detta läge, bör du \n"
 "    återansluta kameran till PC:n och ändra LCD till ”Av”."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11149,7 +13491,7 @@
 "    återansluta kameran till PC:n och ändra LCD till\n"
 "    ”Av”."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11179,105 +13521,110 @@
 "    med kod för att stödja en komplett konfiguration,\n"
 "    kontakta utvecklarnas sändlista.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (okänd)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Filen som skall sändas har längd noll"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Inte tillräckligt med minne tillgängligt på minneskortet"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kan inte hämta namnet på mappen som innehåller bilderna"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Sändning stöds endast till ”%s” mappen"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Bäst"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (okänd)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Slutartid (mikrosekunder, 0 auto)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Svartvitt"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Vit tavla"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Svart tavla"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Ljusstyrka/Kontrast"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Ljus+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Ljus-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Dagsljus"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Oändlighet/fiskögeobjektiv"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Auto av (värd) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11285,12 +13632,12 @@
 "Hur lång tid tar det tills kameran stänger av sig när den är ansluten till "
 "datorn?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Auto av (fält) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11298,114 +13645,114 @@
 "Hur lång tid tar det tills kameran stänger av sig när den inte ansluten till "
 "datorn?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Auto av (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Foto-inställningar"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "standard"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "färger"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "svartvitt"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Notera: inget minneskort tillgängligt, vissa värden kan vara ogiltiga\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Kameramodell: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Serienummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Version av programvara: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Bilder tagna: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Bilder kvar: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Batteritid: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Minne kvar: %i byte\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Datum: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Ingen kameramanual tillgänglig.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11426,7 +13773,7 @@
 "  en PhotoPC 3000z, om din kamera beter sig annorlunda\n"
 "  skriv ett brev till %s (på Engelska)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11460,7 +13807,7 @@
 "    läge, bör du återansluta kameran till PC:n och\n"
 "    ändra LCD till ”Av”."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11480,12 +13827,7 @@
 "för användningen av deras Olympus C-3030Z under\n"
 "implementationen av USB-stödet."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (okänd)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11495,11 +13837,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Kunde inte applicera USB inställningar"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11520,7 +13862,7 @@
 "Drivrutin för att använda kameran Smal Ultrapocket, och OEM-versioner "
 "(slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11535,7 +13877,7 @@
 "Sonix-kamera.\n"
 "Det finns %i foton i den.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11561,7 +13903,7 @@
 "Miniatyrbilder för AVI:er är stillbilder som görs från den första bilden.\n"
 "En enstaka bild kan inte tas bort om det inte är den senaste.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11569,7 +13911,7 @@
 "Sonix-kamerabibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11583,7 +13925,7 @@
 "Ken-ichi Hayashi\n"
 "Gphoto2-portering av Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11595,7 +13937,7 @@
 "Ursprungligen skriven av Mark Davies <mdavies@dial.pipex.com>\n"
 "gPhoto2-anpassning av Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11608,12 +13950,12 @@
 "Minne totalt: %ikB\n"
 "Minne ledigt:  %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Version av fast programvara: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11621,7 +13963,7 @@
 "Soundvision-drivrutin\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11630,7 +13972,7 @@
 "FLASH:\n"
 " Filer: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11647,7 +13989,7 @@
 "Utrymme använt: %8d\n"
 "Utrymme ledigt: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "spca50x-bibliotek v"
 
@@ -11713,22 +14055,22 @@
 "sq905 generisk drivrutin\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Din USB-bildram har ett ST2205-chip\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 "ST2205-baserad bildram har ett urval av upplösningar.\n"
-"gphot-drivrutinen för dessa enheter låter dig hämta,\n"
+"gphoto-drivrutinen för dessa enheter låter dig hämta,\n"
 "skicka upp och ta bort bilder från bildramen."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11740,11 +14082,7 @@
 "Denna drivrutin låter dig hämta, skicka upp och ta bort bilder\n"
 "från bildramen."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Orientering"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11756,110 +14094,110 @@
 "Drivrutin för kameror som använder STV0674-processor ASIC:en.\n"
 "SnoopyPro användes då avkodades\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Dålig exponering (inte tillräckligt med ljus troligen)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Information om STV0680-baserad kamera:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Version av fast programvara: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "ASIC-version: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Sensor-ID: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Kameran är konfigurerad för blinkande ljus med %dHz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Minne i kameran: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Kameran stöder miniatyrbilder.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Kameran stöder Video.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Kamerabilder är svartvita.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Kameran har minne.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Kameran stöder videoformaten: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Tillverkar-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Produkt-ID: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Maximalt antal bilder: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Bildbredd: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Bildhöjd: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Bildstorlek: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Bredd på miniatyrbild: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Höjd på miniatyrbild: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Storlek på miniatyrbild: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11875,12 +14213,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Utökad för Aiptek PenCam och andra STM USB dubbel-läges kameror."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Hämtar information om %i filer…"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11892,19 +14230,19 @@
 "Skicka felrapporter och kommentarer.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z är USB enbart"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Drivrutinsinställningar"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Turbo-läge"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11916,12 +14254,12 @@
 "Bibliotek för att hämta / sända upp filer från en Topfield PVR.\n"
 "Porterat från puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Hämtar %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -11931,39 +14269,66 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11-drivrutin.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Din USB-bildram har ett TP6801-chip\n"
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"TP6801-baserade bildramar har ett urval av upplösningar.\n"
+"gphoto-drivrutinen för dessa enheter låter dig hämta,\n"
+"skicka upp och ta bort bilder från bildramen."
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"TP6801 USB-bildramsdrivrutin\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Denna drivrutin låter dig hämta, skicka upp och ta bort bilder\n"
+"från bildramen."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "Internt fel vid sökning efter camlibs. (sökvägsnamn för långt?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Läser in kamera-drivrutiner från ”%s”…"
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Ett fel uppstod i io-biblioteket (”%s”): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Kunde inte detektera någon kamera"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Kunde inte detektera någon kamera vid port %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Du måste ställa in porten innan du initierar kameran."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Kunde inte läsa in nödvändig kameradrivrutin ”%s” (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Kameradrivrutinen ”%s” saknar ”camera_init”-funktionen."
@@ -12001,12 +14366,12 @@
 msgid "This camera can not capture previews."
 msgstr "Denna kamera kan inte ta förhandsgranskningsbilder."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Sökvägen ”%s” är inte absolut."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12015,121 +14380,172 @@
 "Du har försökt att radera ”%s” från mappen ”%s”, men filsystemet stöder inte "
 "radering av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "Det finns fortfarande undermappar i mappen ”%s/%s” som du försöker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Det finns fortfarande filer i mappen ”%s/%s” som du försöker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet stöder inte sändning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 "Mappen ”%s” innehåller endast %i filer, men du begärde en fil med nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Filen ”%s” kunde inte hittas i mappen ”%s”."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunde inte hitta filen ”%s”."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet stöder inte hämtning av filer"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Okänd filtyp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Filsystemet har inget stöd för att hämta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Filsystemet har inget stöd för att sätta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivskyddade filattribut som bredd och höjd kan inte ändras."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Filsystemet har inget stöd för att hämta lagringsinformation"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Skadade data"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Filen finns"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Okänd modell"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Katalogen inte funnen"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Filen inte funnen"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Katalogen finns"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "I/O pågår"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Sökvägen är inte absolut"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Operationen avbruten"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Kamera kunde inte avsluta funktionen"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "OS-fel i kamerakommunikationen"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Inte tillräckligt med ledigt utrymme"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Okänt kamerabiblioteksfel"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Okänt fel"
 
+#~ msgid "Unknown value %04d"
+#~ msgstr "Okänt värde %04d"
+
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "%d flerbildersbrusreducering"
+
+#~ msgid "Movie recording cannot start: In enlarged liewview."
+#~ msgstr "Videoinspelning kan inte starta: I förstorad livevy."
+
+#~ msgid "Movie recording cannot start: Already in movie recording."
+#~ msgstr "Videoinspelning kan inte starta: Spelar redan in film."
+
+#~ msgid "Movie recording cannot start: Card full."
+#~ msgstr "Videoinspelning kan inte starta: Kort fullt."
+
+#~ msgid "Movie recording cannot start: Card not formatted."
+#~ msgstr "Videoinspelning kan inte starta: Kort ej formatterat."
+
+#~ msgid "Movie recording cannot start: Card error."
+#~ msgstr "Videoinspelning kan inte starta: Kortfel."
+
+#~ msgid "Custom WB 2"
+#~ msgstr "Anpassad VB 2"
+
+#~ msgid "Custom WB 3"
+#~ msgstr "Anpassad VB 3"
+
+#~ msgid "Custom WB 4"
+#~ msgstr "Anpassad VB 4"
+
+#~ msgid "Custom WB 5"
+#~ msgstr "Anpassad VB 5"
+
+#~ msgid "Unknown Event"
+#~ msgstr "Okänd händelse"
+
+#~ msgid "Now value is not in enumeration."
+#~ msgstr "Nuvärde finns inte med i uppräkning."
+
+#~ msgid "Setting 4"
+#~ msgstr "Inställning 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Inställning 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Inställning 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Inställning 7"
+
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x"
 #~ msgstr "Canon EOS-utlösartagning misslyckades: 0x%x"
 
@@ -12407,10 +14823,6 @@
 #~ msgstr "PTP EK filnamn ogiltigt"
 
 #, fuzzy
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP I/O fel"
-
-#, fuzzy
 #~ msgid "PTP: Error: bad parameter"
 #~ msgstr "PTP fel: felaktig parameter"
 
@@ -12423,10 +14835,6 @@
 #~ msgstr "PTP protokollfel, svar förväntat"
 
 #, fuzzy
-#~ msgid "Date Time"
-#~ msgstr "Datum & Tid"
-
-#, fuzzy
 #~ msgid "ShutterSpeed"
 #~ msgstr "Slutartid sekunder (0 auto)"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/uk.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/uk.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/uk.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/uk.po Changed

@@ -4,23 +4,23 @@
 #
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2005-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.13\n"
+"Project-Id-Version: libgphoto2 2.5.28\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2017-04-10 20:32+0300\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2022-01-04 15:37+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 20.12.0\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -30,7 +30,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -39,14 +39,14 @@
 "Здається, фотоапарат не використовує носій даних CompactFlash.\n"
 "На жаль, у поточній версії підтримки таких фотоапаратів не передбачено :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 "Фотоапаратом було знято %d фотографій. Фотоапарат використовує носій даних "
 "CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -56,7 +56,7 @@
 "agfa_cl20\n"
 "Розробники драйвера Agfa CL20 для Linux!\n"
 "     Ел. адреса cl20@poeml.de    \n"
-" Веб-адреса http://cl20.poeml.de "
+" Вебадреса http://cl20.poeml.de "
 
 #: camlibs/aox/library.c:109
 #, c-format
@@ -79,12 +79,12 @@
 "Базовий драйвер для Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Вашу картинну рамку USB засновано на наборі мікросхем AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -95,7 +95,7 @@
 "таких пристроїв ви зможете звантажувати, вивантажувати і вилучати\n"
 "файли з картинної рамки."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -107,16 +107,18 @@
 "За допомогою цього драйвера можна отримувати, вивантажувати та\n"
 "вилучати файли з картинної рамки."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Налаштування рамки зображення"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
-msgstr "Синхронізувати дані і часові позначки рамки з комп’ютером"
+msgstr "Синхронізувати дані і часові позначки рамки з комп'ютером"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -125,7 +127,7 @@
 "Кількість зображень: %i\n"
 "Версія мікропрограми: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -149,26 +151,26 @@
 "Реалізовано використовуючи документацію з\n"
 "Інтернет за згодою Vision."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Не вдалося створити каталог %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Не вдалося видалити каталог %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "помилка блокування клавіш."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*Невідомо*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -177,7 +179,7 @@
 "canon_int_capture_image: перша функція canon_usb_list_all_dirs() завершилась "
 "помилкою з кодом %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -186,18 +188,18 @@
 "canon_int_capture_image: остання функція canon_usb_list_all_dirs() "
 "завершилась помилкою з кодом %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Надто довга назва '%s' (%li символів), допускається максимум 30 символів."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Символи нижнього регістру у %s не допускаються."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -205,7 +207,7 @@
 "canon_int_list_directory: ERROR: початкове повідомлення надто коротке (%i < "
 "мінімум %i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -213,15 +215,15 @@
 "canon_int_list_directory: Досягнуто кінець пакету при аналізі першого "
 "елементу каталогу"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: обрізано запис каталогу"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Файл захищений."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -229,11 +231,11 @@
 "canon_int_get_info_func: ПОМИЛКА: початкове повідомлення надто коротке (%i < "
 "мінімум %i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Не вдалося отримати мініатюру JPEG: відсутній початок/кінець"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Не вдалося отримати мініатюру JPEG: дані не у форматі JFIF"
 
@@ -242,25 +244,25 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "параметр NULL \"%s\" у %s рядок %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
-"Невідомо як працювати із значеннями camera->port->type, що дорівнюють %i 0x"
-"%x у %s, рядок %i."
+"Невідомо як працювати із значеннями camera->port->type, що дорівнюють %i "
+"0x%x у %s, рядок %i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "КРИТИЧНА ПОМИЛКА: невідоме значення контрольної суми для довжини %d\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "не вдається обчислити значення контрольної суми\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -269,290 +271,301 @@
 "попередження: CRC не перевірено (+ довжина %d, значення 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Режим сумісності"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Мініатюра"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Повне зображення"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
-msgstr "Кнопка"
+msgstr "Лампа"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Автофокус: one-shot"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Автофокус: AI servo"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Автофокус: AI focus"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Ручний фокус"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Сигнал вимкнено"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Сигнал увімкнено"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Спалах вимкнено"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Спалах увімкнено"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Автоспалах"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "АВТО"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "П"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Вручну 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Дальня сцена"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Швидкий затвор"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Повільний затвор"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Нічне освітлення"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Тони сірого"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Сепія"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Портрет"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Точковий"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Макро"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "ЧБ"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "ПанФокус"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Жвавий"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Нейтральний"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Повільна зйомка"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Надзбільшення"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Листя"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "У приміщенні"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Феєрверк"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Пляж"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Під водою"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Сніг"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Діти і тваринки"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Нічний знімок"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Цифрове збільшення"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "МоїКольори"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Фото у відео"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "Маленький звичайний JPEG"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "Маленький JPEG доброї якості"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "Середній звичайний JPEG"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "Середній JPEG доброї якості"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "Великий звичайний JPEG"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "Великий JPEG доброї якості"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + маленький звичайний JPEG"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + маленький JPEG доброї якості"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + середній звичайний JPEG"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + середній JPEG доброї якості"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + великий звичайний JPEG"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + великий JPEG доброї якості"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -584,44 +597,44 @@
 "спробуйте\n"
 " зменшити активність комп'ютера (наприклад, дискову активність)\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Фотоапарат недоступний: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Вимикання фотоапарата"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Помилка отримання знімка"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Не вдалося отримати назву диска: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Причина невідома"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Не вдалося отримати інформацію про диск: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Внутрішня помилка 1 у get_file_func() (%s рядок %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Не знайдено звуковий файл для %s "
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -632,35 +645,35 @@
 "  %11s всього байтів\n"
 "  %11s доступно байтів"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "блок живлення"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "акумулятор"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "нормальне живлення"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "збій живлення"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "немає даних: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (час комп'ютера %s%i секунд)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -687,7 +700,7 @@
 "\n"
 "Час: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -709,26 +722,26 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Помилка видалення файла «%s»: %s"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Помилка видалення пов'язаного файла мініатюри"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Швидкості, що перевищують 57600 не підтримуються при завантаженні у цей "
 "фотоапарат"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Не вдалось отримати букву пристрою карти пам'яті"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -736,375 +749,397 @@
 "Не вдалося вивантажити, немає вільної назви теки!\n"
 "Тека з назвою 999CANON вже існує та містить зображення AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Не вдалося створити каталог \\DCIM"
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Не вдалося створити цільовий каталог."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Налаштовування фотоапарата та драйвера"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Параметри фотоапарата"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
-msgstr "Ім’я власника"
+msgstr "Ім'я власника"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Клас розміру захоплення"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Швидкість ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Режим знімання"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Швидкість затвора"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Масштаб"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Діафрагма"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Компенсація експозиції"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Формат зображення"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Режим фокусування"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Режим спалаху"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Сигнал"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Дії фотоапарата"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Синхронізувати дату і час фотоапарата з ПК"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Дані щодо стану фотоапарата"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Модель фотоапарата"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Дата та час"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Помилка"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Версія мікропрограми"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Степенева"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Драйвер"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Перелік усіх файлів"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Зберігати назву файла при вивантаженні"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Фотоапарат недоступний"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Ім'я власника змінено"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "не вдається змінити ім'я власника"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Змінено клас розміру захоплення"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Неправильний параметр класу розміру захоплення"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Неправильний параметр величини ISO"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Швидкість ISO змінено"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Не вдалося встановити швидкість ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Некоректні параметри режиму знімання"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Змінено режим знімання"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Не вдалося змінити режим знімання"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Неправильний параметр швидкості затвора"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Швидкість затвора змінено"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Не вдалося змінити швидкість затвора"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "некоректне значення діафрагми"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Діафрагму змінено"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Не вдалося змінити діафрагму"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Некоректний параметр виправлення експозиції"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Змінено виправлення експозиції"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Не вдалося змінити виправлення експозиції"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Некоректний параметр формату зображення"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Формат зображення змінено"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Не вдалося змінити формат зображення"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Некоректний режим фокусування"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Режим фокусування змінено"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "не вдається змінити режим фокусування"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Некоректний параметр режиму сигналу"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Режим сигналу змінено"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Не вдалося змінити режим сигналу"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Масштаб змінено"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Не вдалося змінити масштаб"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Некоректний параметр режим спалаху"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Режим спалаху змінено"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Не вдалося змінити режим спалаху"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "час встановлено"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "не вдається встановити час"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Вказано непідтримуваний тип порту %i = 0x%x. Ініціалізація неможлива."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Акумулятор розряджений, фотоапарат вимкнений."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "ПОМИЛКА: несподіване повідомлення"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "ПОМИЛКА: накладка повідомлень"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "ПОМИЛКА: порушення черговості"
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "ПОМИЛКА: неочікуваний тип пакету."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "ПОМИЛКА: неправильний формат повідомлення."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "ПОМИЛКА: неочікуване повідомлення2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Вивантаження файлу..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Отримання файлу"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1112,7 +1147,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue не вдається отримати "
 "елементи каталогу"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1120,143 +1155,143 @@
 "canon_serial_get_dirents: внутрішній пакет елементу каталогу надто короткий "
 "(лише %i байтів)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Не вдалося виділити %i байтів пам'яті"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: не вдається прочитати інший запис каталогу"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: отримано обрізаний елемент каталогу"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: надто багато елементів каталогу, треба проходити "
 "циклом."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Не вдалося змінити розмір буферу елементів "
 "каталогу на %i байтів"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Помилка зміни швидкості."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Скидання протоколу..."
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Фотоапарат ГАРАЗД."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Пошук фотоапарата ..."
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Спроба зв'язатись з фотоапаратом..."
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Помилка зв'язку 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Немає відповіді від фотоапарата"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Не розпізнана відповідь"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Виявлено \"%s\" або \"%s\""
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Невідома модель \"%s\""
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "Неправильний EOT"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Помилка зв'язку 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Помилка зв'язку 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Зміна швидкості ... зачекайте..."
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Помилка зміни швидкості"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr ""
 "Помилка очікування сигналу ACK під час ініціалізації, робимо повторну спробу"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Помилка очікування ACK при ініціалізації"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Фотоапарат підключений"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "ПОМИЛКА: критична помилка. Продовжувати неможливо"
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ПОМИЛКА: %d надто великий"
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Отримання мініатюри..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "НЕ РОЗПІЗНАНО"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Не вдалося встановити з'єднання з фотоапаратом"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Фотоапарат вже активний"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Фотоапарат виведений з режиму сну"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Нерозпізнана відповідь фотоапарата '%c'"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
@@ -1265,7 +1300,7 @@
 "Помилка кроку 2 ініціалізації: («%s» при читанні %i). Фотоапарат не "
 "працюватиме."
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1274,7 +1309,7 @@
 "Помилка кроку 2 ініціалізації! Повернуто %i байтів замість %i. Фотоапарат не "
 "працюватиме."
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
@@ -1283,7 +1318,7 @@
 "Помилка кроку 3 ініціалізації: «%s» при читанні %i. Фотоапарат не "
 "працюватиме."
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
@@ -1292,7 +1327,7 @@
 "Помилка кроку 3 ініціалізації! Повернуто %i замість %i. Фотоапарат не "
 "працюватиме."
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
@@ -1301,29 +1336,29 @@
 "Помилка кроку 3 ініціалізації: «%s» під час запису %i. Фотоапарат не "
 "працюватиме."
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Помилка кроку 4: \"%s\" при читанні %i. Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr "Помилка кроку 4! (повернуто %i замість %i). Фотоапарат не працюватиме."
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Фотоапарат неготовий, численні помилки на запит 'Ідентифікація фотоапарата': "
 "%s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Фотоапарат не готовий, помилка get_battery: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1332,14 +1367,14 @@
 "canon_usb_lock_keys: Неочікувана довжина результату функції \"блокувати "
 "клавіші\" (%i байтів, очікувалось %i)"
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Результат неочікуваної довжини (%i байтів, очікувалось "
 "%i)"
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -1347,7 +1382,7 @@
 "canon_usb_unlock_keys: Результат неочікуваної довжини (%i байтів, "
 "очікувалось %i)"
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1356,20 +1391,20 @@
 "canon_usb_get_body_id: Результат неочікуваної довжини (%i байтів, "
 "очікувалось %i)"
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Отримання даних ..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Скінчилась пам'ять: потрібно %d байтів."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: помилка canon_usb_dialogue"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1378,22 +1413,22 @@
 "Попередження canon_usb_set_file_attributes: у canon_usb_dialogue помилка "
 "статусу фотоапарата 0x%08x"
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Не вдалося прочитати файл \"%s\""
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Скінчилась пам'ять: потрібно %ld байтів."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Помилка вивантаження файлу."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1401,7 +1436,7 @@
 "Файл надто великий. Перш ніж вивантажувати інші файли слід вимкнути "
 "фотоапарат та увімкнути знову."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1410,7 +1445,7 @@
 "canon_usb_get_dirents: Не вдалося розмістити файл у буфер, "
 "'%.96s' (обрізано) надто довгий."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1419,7 +1454,7 @@
 "canon_usb_get_dirents: не вдається отримати елементи каталогу "
 "canon_usb_long_dialogue, отримано %i"
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1428,7 +1463,7 @@
 "canon_usb_list_all_dirs: пакет не уміщається у буфер, '%.96s' (обрізано) "
 "надто довгий."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1437,27 +1472,27 @@
 "canon_usb_list_all_dirs: помилка отримання елементів каталогу "
 "canon_usb_long_dialogue, отримано %i"
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Виявлено '%s'."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Назва \"%s\" з фотоапарата не відповідає відомому фотоапарата"
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Зображення типу %d не підтримується"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Зображення %s захищене від видалення."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1469,37 +1504,37 @@
 "net.or.jp> та Jun-ichiro \"itojun\" Itoh <itojun@itojun.org>.\n"
 "Інтеграцію QVplay виконав Michael Haardt <michael@moria.de>."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Заряд акумулятора: %.1f Вольт. Ревізія: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Конфігурація камери"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Акумулятор"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Яскравість"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Дуже яскравий"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Дуже темний"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "Гаразд"
 
@@ -1541,7 +1576,7 @@
 "підтримуються апаратно:\n"
 "\tВилучення окремих чи позначених фотографій (gphoto2 -d)\n"
 "\tЗахоплення (gphoto2 --capture чи --capture-image)\n"
-"Проте, для захоплення можна використовувати інтерфейс веб-камери,\n"
+"Проте, для захоплення можна використовувати інтерфейс вебкамери,\n"
 "що підтримується модулем ядра spca50x.\n"
 "Перевірено роботу через графічний інтерфейс gtkam. Проте,\n"
 "на фотоапарат не передбачено створення окремих мініатюр. Оскільки файли\n"
@@ -1585,13 +1620,13 @@
 "фотографій, на інших — ні. На жодному з підтримуваних фотоапаратів не "
 "можливе\n"
 "програмне знімання. На всіх фотоапаратах можливий попередній перегляд\n"
-"зображення (отримання і надсилання зображення на комп’ютер).\n"
+"зображення (отримання і надсилання зображення на комп'ютер).\n"
 "Якщо для вашого фотоапарата можливе вилучення усіх знімків, попереднє\n"
 "захоплення зображення призводитиме до вилучення зображень з фотоапарата.\n"
 "\n"
 "Вивантаження даних на такі фотоапарати не передбачено. Крім того, на\n"
 "жодному з підтримуваних фотоапаратів не можна вилучати окремі фотографії\n"
-"за допомогою певної команди, відданої з комп’ютера.\n"
+"за допомогою певної команди, відданої з комп'ютера.\n"
 
 #: camlibs/digigr8/library.c:170
 msgid ""
@@ -1601,16 +1636,16 @@
 "Базовий драйвер sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Зображення цього типу не підтримуються"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Кількість зображень: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1618,7 +1653,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1626,24 +1661,24 @@
 "Підтримується лише звернення до кореневої теки - ви запитали список файлів з "
 "теки '%s'."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Помилка отримання кількості зображень"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Помилка отримання інформації про зображення"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Зйомка цього типу не підтримується"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (акумулятор заряджений на %d%%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1661,82 +1696,83 @@
 "Вибрано роздільну здатність %s.\n"
 "Фотоапарат %s на основі %s\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Спалах"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Без спалаху"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Подвійна ірисова діаграма"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Без подвійної ірисової діаграми"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Перемикання роздільної здатності"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Без перемикання роздільної здатності"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Без індикатора живлення"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "УВІМК"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "ВИМК"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "готовий"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Неготовий"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "у режимі заповнення"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Не у режимі заповнення"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "низька (320x240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "висока (640x480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "зовні"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "всередині"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1754,7 +1790,7 @@
 "  або визначатись автоматично.\n"
 "* Поки що якість зображень поступається можливій якості.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1784,115 +1820,241 @@
 "     Інформація про протокол обміну, формат вихідних даних,\n"
 "     перенос для gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Помилка читання зображення з карти"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Копіюється зображення..."
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Помилка завантаження зображення"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Користувач скасував завантаження"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Помилка зйомки"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Експозиція"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Автоматичне налаштовування витримки під час попереднього перегляду"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Тривалість експозиції при попередньому перегляді"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Автоматичний спалах при зйомці"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Помилка відкривання порту"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Помилка скидання стану камери"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Помилка встановлення швидкості обміну даними з фотоапаратом"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Схоже, що це модем, а не фотоапарат"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Створення переліку файлів у '%s'..."
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Отримання списку тек у '%s'..."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Не вдалося отримати інформацію щодо «%s» (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Не вдалося отримати інформацію щодо «%s» у «%s» (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Не вдалося змінити час зміни файла «%s» у «%s» (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Не вдалося відкрити '%s'."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "При перегляді каталогу \"camera\" виводиться список фотографій на диску."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Режим перегляду каталогу - Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Не вдалося вилучити файл «%s» у теці '%s' (код помилки %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+msgid "Scanner Profile Configuration"
+msgstr "Налаштування профілю сканера"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+msgid "Mono mode"
+msgstr "Монорежим"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr "Глибина"
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr "Моно (ч/б)"
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr "Сірий (4б/пк)"
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr "Сірий (8б/пк)"
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+msgid "Lo Resolution"
+msgstr "Низька роздільна здатність"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr "100 т/дюйм"
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr "200 т/дюйм"
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+msgid "Hi Resolution"
+msgstr "Висока роздільна здатність"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr "400 т/дюйм"
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+msgid "Color Document mode"
+msgstr "Режим кольорового документа"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr "NQ (12б/пк)"
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+msgid "Color Photo mode"
+msgstr "Режим кольорового фото"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr "HQ (24б/пк)"
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+"Сканер Docupen не може отримувати/вилучати окремі зображення — лише усі\n"
+"одразу. Щоб обійти це обмеження, програма створює файл кешу, де "
+"зберігається\n"
+"копія пам'яті сканера. Заповнення кешу вмикається отримання будь-якого\n"
+"зображення — тому отримання першого зображення триватиме довго, якщо кеш\n"
+"є порожнім або втратив чинність. Кеш автоматично втрачає чинність, якщо\n"
+"повідомлений сканером розмір використаної пам'яті не збігається із розміром\n"
+"кешу. Файл кешу зберігається у ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"Сканер має дуже короткий період автоматичного вимикання — лише 8 секунд —\n"
+"він є чинним, навіть при з'єднанні з USB. Сканер доведеться вмикати перед\n"
+"кожною дією gphoto2. У певних ситуаціях вам доведеться запобігати вимиканню\n"
+"постійним натисканням кнопок на сканері."
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+"Бібліотека для сканера DocuPen RC800\n"
+"Авторські права належать Ondrej Zary <ondrej@zary.sk>, 2020\n"
+"Засновано на інструментах Docupen, автор — Florian Heinz <fh@cronon-ag.de>"
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -1902,90 +2064,90 @@
 "<olivier@aixmarseille.com>, створена на основі драйвера spca50x. Подяка "
 "авторам spca50x! Адаптувати ваш драйвер для цього апарата було нескладно! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Фотоапарат надіслав лише %i байтів, але потрібно принаймні %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Не вдалося зв'язатись з фотоапаратом."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Отримано неочікувані дані (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Неправильна escape-послідовність: очікувалось 0x%02x, отримано 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Неправильні дані - отримано 0x%02x, очікувалось 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Неправильні дані - отримано 0x%02x, очікувалось 0x%02x або 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Неправильна контрольна сума - отримано 0x%02x, очікувалось 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Фотоапарат відкинув команду."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Самовільне скидання стану фотоапарата."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Фотоапарат надіслав неочікувані дані 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Завантаження..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Не вдалося виділити %i байтів для завантаження мініатюри."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Не вдалося виділити %i байтів для завантаження малюнку."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Фотоапарат не приймає '%s' як назву файла."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr ""
 "Не вдалося ініціалізувати вивантаження (фотоапарат повернув код 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Фотоапарат не підтримує швидкість %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Не вдалося встановити швидкість %i (фотоапарат повернув код %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1993,36 +2155,36 @@
 "Matthew G. Martin\n"
 "Побудовано на  fujiplay від Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Бітова швидкість %ld не підтримується."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Параметри фотоапарата FUJI"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Дата та час"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Версія: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Модель: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Доступна пам'ять: "
 
@@ -2044,17 +2206,17 @@
 "фірмою Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Непідтримуваний тип порту: %d. Цей драйвер працює лише з фотоапаратами USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Не вдалося скинути стан фотоапарата.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2063,7 +2225,7 @@
 "Ваш фотоапарат підтримує видалення лише останнього файла на фотоапараті. "
 "Тобто, це файл '%s'."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2078,7 +2240,7 @@
 "Вільного місця на картці для зображень: %d\n"
 "Заряд батареї: %d%%."
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2132,25 +2294,25 @@
 "iClick 5X driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Отримано знімків : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "Бібліотека jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Копіюються дані..."
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Копіюється мініатюра..."
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2166,7 +2328,7 @@
 "   - мініатюри (64x48, формат PGM )\n"
 "   - фотографії (640x480, формат PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2178,31 +2340,31 @@
 "Драйвер фотоапарата Jenoptik JD11.\n"
 "Для дослідження протоколу використовувались WINE та IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Параметри JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Інші параметри"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Тривалість наддовгої експозиції"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Параметри кольорів"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Червоний"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Зелений"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Синій"
 
@@ -2282,11 +2444,11 @@
 "Бібліотека для фотоапарата jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Карта CompactFlash"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2297,7 +2459,7 @@
 "перегляду отриманих з апарата зображень знадобиться програма \"kdc2tiff\". "
 "Її можна завантажити з сайту http://kdc2tiff.sourceforge.net"
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2309,13 +2471,13 @@
 "Бібліотека для роботи з фотоапаратом Kodak DC120.\n"
 "(за чисельними вимогами)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Отримання даних..."
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Очікування завершення..."
 
@@ -2328,7 +2490,8 @@
 msgstr "Тип файлу"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2341,7 +2504,7 @@
 msgstr "Роздільна здатність"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2365,8 +2528,9 @@
 msgid "High (good quality)"
 msgstr "Високе (добра якість)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Зйомка"
 
@@ -2395,77 +2559,84 @@
 msgstr "Компенсація експозиції"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Примусово"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Немає"
 
@@ -2474,71 +2645,78 @@
 msgstr "Запобігання червоним очам"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Увімк"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Вимкн"
 
@@ -2554,7 +2732,7 @@
 msgid "Port speed"
 msgstr "Швидкість порту"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Назва альбому"
 
@@ -2773,58 +2951,58 @@
 "Бібліотека для фотоапарата Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Параметр 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Параметр 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Параметр 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Модель: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Версія мікропрограми: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Стан акумулятора: %s, Блок живлення: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Кількість зображень: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Залишилось простору для: Висок: %d, Середн: %d, Низьк: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Стан картки пам'яті (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Знято локальних знімків: %d, Спалахів: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2838,45 +3016,46 @@
 "Бібліотека для фотоапаратів Kodak DC240, DC280, DC3400 та DC5000.\n"
 "Оновлено та переписано для gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Слабка"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Пусто"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Помилка"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Від'єднаний"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Приєднаний"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Картка пам'яті витягнута"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Картка пам'яті не відкрита"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Картка пам'яті не форматована"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Немає карти пам'яті"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2884,12 +3063,12 @@
 "Виконується дія. Цей фотоапарат не підтримує одночасне виконання кількох "
 "команд. Дочекайтесь завершення поточної операції."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "фотоапарат неактивний більше ніж 9 секунд, повторна ініціалізація.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2904,7 +3083,7 @@
 "аут та знадобиться повторна ініціалізація. Якщо апарат перестає реагувати, "
 "просто заново виберіть його. При цьому відбудеться нова ініціалізація."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2916,7 +3095,7 @@
 "\n"
 "Запитання та відгуки приймаються із вдячністю."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2925,7 +3104,7 @@
 "Модель вашого USB-фотоапарата - Kodak EZ200.\n"
 "Число зображень = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2933,107 +3112,107 @@
 "Драйвер Kodak EZ200\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Помилка фокусування."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Помилка ірисової діаграми."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Помилка джерела світла."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Помилка в контрольній сумі ППЗУ."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Внутрішня помилка (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Внутрішня помилка (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Немає карти пам'яті."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Картка не підтримується."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Картку видалено в процесі роботи."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Неправильний номер зображення."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Запис на картку пам'яті неможливий."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Картка захищена від запису."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Відсутній вільний простір на карті пам'яті."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Зображення захищене."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Недостатнє освітлення."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Помилка автофокусування."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Системна помилка."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Недопустимий параметр."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Операцію неможливо скасувати."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Дані локалізації надто довгі."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Пошкоджені дані локалізації."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Команда не підтримується."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Виконується інша команда."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Помилка порядку виконання команд."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Невідома помилка."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3043,15 +3222,15 @@
 "Фотоапарат щойно повідомив про невідому помилку. Сповістіть про це %s, та "
 "вкажіть коли виникла ця помилка: (0x%x,0x%x). Дуже дякуємо!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Отримання списку файлів..."
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Перевіряються різні швидкості..."
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3059,12 +3238,12 @@
 "Не вдалося зв'язатись з фотоапаратом.Перевірте, що він увімкнений та "
 "з'єднаний з комп'ютером."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "%i зображень не вдалось видалити, тому що вони захищені"
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3083,7 +3262,7 @@
 "Назва: %s,\n"
 "Виробник: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3093,400 +3272,409 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Підтримка усіх апаратів Konica та деяких моделей HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Отримується інформація..."
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Параметра Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Постійні параметри"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Чи подавати звуковий сигнал при отриманні знімка?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Час автоспуску"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Час автовимикання"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Інтервал між слайдами"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Роздільна здатність"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Низька (576 x 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Середня (1152 x 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Висока (1152 x 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Локалізація"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Мова"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Не вибрано"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Формат виводу на ТБ"
 
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Не показувати меню ТБ"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Формат дати"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Місяць/День/Рік"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "День/Місяць/Рік"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Рік/Місяць/День"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Постійні параметри сеансу"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Увімк, зменшення червоності очей"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Авто, зменшення червоності очей"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Фокус"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Фіксований"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Тимчасові параметри"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Автоспуск"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Автоспуск (лише наступний знімок)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Звичайний"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Не вдалося знайти дані локалізації у '%s'"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Надто великий файл локалізації!"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Попередній перегляд не існує."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Дані зіпсовані!"
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr "Зібрано без підтримки EXIF, отже мініатюри недоступні."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Зображення формату %d не підтримуються фотоапаратом !"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Не вдалося видалити зображення %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Не вдалося виділити усі зображення."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Вивантажується зображення..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Не вдалося відвантажити це зображення у фотоапарат. Виникла помилка."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Щоб зробити знімок, треба перейти у режим запису."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 "Недостатньо місця для нових знімків. Слід вилучити декілька старих зображень."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Захоплення нових зображень неможливе. Невідома помилка."
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Немає відповіді від фотоапарата."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Низька"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Середня"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Висока"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Значки"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2,0 м"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0,5 м"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0,1 м"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Баланс білого"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Офіс"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Денне світло"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Чіткість"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Різко"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "М'яко"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Колір"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Світло"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Глибина"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Чорно-білий"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Одиночний кадр"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Послідовність 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Показати дату?"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Будь-де"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
-msgstr "Hежим відтворення"
+msgstr "Режим відтворення"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Режим запису"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Всюди"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "Блок живлення"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Відтворення"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Запис"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "ДД/ММ/РРРР"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "РРРР/ММ/ДД"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "ММ/ДД/РРРР"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3507,7 +3695,7 @@
 "Показ дати: %s\n"
 "Дата і час: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3522,7 +3710,7 @@
 "http://www.ap2c.com\n"
 "Підтримка французької версії Konica Q-M150."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3541,7 +3729,7 @@
 "Якщо під час роботи з цим драйвером у вас виникнуть проблеми, будь ласка,\n"
 "зверніться електронною поштою до його авторів.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3549,7 +3737,7 @@
 "Драйвер Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3560,7 +3748,7 @@
 "Мікропрограма: %s\n"
 "Версія мікропрограми: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3568,7 +3756,94 @@
 "Базовий драйвер для LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+msgid "Lumix Configuration"
+msgstr "Налаштування Lumix"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr "Годинник"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+msgid "Shutterspeed"
+msgstr "Швидкість затвора"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Якість"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Якість відео"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Кіно"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Режим автофокусування"
+
+#: camlibs/lumix/lumix.c:1187
+msgid "Liveview Size"
+msgstr "Розмір інтерактивного перегляду"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+msgid "Device Name"
+msgstr "Назва пристрою"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr "Допоміжна MF"
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr "Допоміжне збільшення MF"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr "Ex Teleconv"
+
+#: camlibs/lumix/lumix.c:1217
+msgid "Lens"
+msgstr "Об’єктив"
+
+#: camlibs/lumix/lumix.c:1233
+msgid "Capability"
+msgstr "Можливість"
+
+#: camlibs/lumix/lumix.c:1239
+msgid "All Menu"
+msgstr "Усе меню"
+
+#: camlibs/lumix/lumix.c:1244
+msgid "Cur Menu"
+msgstr "Пот. меню"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+"Бібліотека Lumix WiFi\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"З'єднується із камерами Lumix за допомогою WiFi.\n"
+"Використано команди GET http."
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3586,7 +3861,7 @@
 "Фотоапарат Mars MR97310.\n"
 "Містить %i знімків. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3610,7 +3885,7 @@
 "у форматі послідовності знімків.\n"
 "Докладніша інформація наведена у libgphoto2/camlibs/README.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3618,7 +3893,7 @@
 "Бібліотека для фотоапарата Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3629,7 +3904,7 @@
 "Версія пристрою:\t%s\n"
 "Версія мікропрограми:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3656,61 +3931,63 @@
 "ID карти:\t\t%d\n"
 "Режим спалаху:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Автономний"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Локальний"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Так"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Ні"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Вдосконалений"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Стандартний"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Автомат\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Примусовий спалах\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Заборона спалаху\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Неправильне значення ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3727,74 +4004,74 @@
 "Зарядка спалаху:\t\t%s\n"
 "Стан об'єктива:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Неповний"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Повний"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Зайнято"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Бездіяльний"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Заряджається"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Готовий"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Звичайний\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Напрямок об'єктива не відповідає напрямку світла\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Об'єктив не підключено\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Неправильне значення стану об'єктива %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Стан карти:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Захист від запису"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Несумісна карта"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Неправильне значення стану карти %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3807,63 +4084,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Особлива подяка фірмі Minolta за надані специфікації."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Спалах: Авто (Проти червоних очей)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Спалах: Авто"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Спалах: Увімкн (Проти червоних очей)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Спалах: Увімкн"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Спалах: Вимкн"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Спалах: не визначено"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Зведення для Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "немає інформації про стан."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Виявлено картку Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Не виявлено картки Compact Flash\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Поточний режим: режим відтворення\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Поточний режим: режим відтворення\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Заряд акумулятора у нормі."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Заряд акумулятора недостатній."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3875,25 +4152,25 @@
 "Адаптація для gphoto2 - Marcus Meissner <marcus@jet.franken.de>\n"
 "Підтримує послідовний та USB-протоколи."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "Бібліотека coolshot v"
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Вимкнення фотоапарата."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Копіюється зображення %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Завантаження зображення: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3902,17 +4179,17 @@
 "Розмір файла складає %ld байт. Максимально можливий розмір для завантаження: "
 "%i байт."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Завантаження..."
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Видаляється зображення %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3928,12 +4205,12 @@
 "Fredrik Roubert <roubert@df.lth.se> і\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Копіюється %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3949,12 +4226,12 @@
 "Fredrik Roubert <roubert@df.lth.se> і\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Копіюється '%s'..."
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3975,7 +4252,7 @@
 "здатність ПЗС матриці дорівнює лише 300 тисячам точок, тому якість знімків "
 "досить низька."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3991,7 +4268,7 @@
 "стану, особливо, якщо проблема виникає при швидкостях більших за 9600 та "
 "апарат не вимикається повністю."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3999,7 +4276,7 @@
 "Драйвер Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -4010,7 +4287,7 @@
 " Вільно пам'яті %8d байт.\n"
 " Кількість файлів: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4024,11 +4301,11 @@
 "та: Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Копіюється файл..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4036,34 +4313,138 @@
 "Creative PC-CAM600\n"
 "Автор: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: очікувалося більше %d блоків, отримано %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file:отримано індекс %d але очікувався індекс > %d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: повернуто значення %d замість %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: очікувалося %d блоків, отримано %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 "pccam600 init: неочікувана помилка: функція gp_port_read повернула %d "
 "замість %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+"Драйвер захоплення зображення для цифрових дзеркальних камер Pentax K.\n"
+"Використано код з pktriggercord, автором якого є Andras Salamon.\n"
+"Зібрані дані щодо стану:\n"
+"%s"
+
+#: camlibs/pentax/library.c:634
+msgid "Model"
+msgstr "Модель"
+
+#: camlibs/pentax/library.c:651
+#, c-format
+msgid "Unknown format %d"
+msgstr "Невідомий формат %d"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Розмір зображення"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Якість зображення"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Діафрагма при мін. фокусній відстані об'єктива"
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Діафрагма при макс. фокусній відстані об'єктива"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Режим затвора"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr "ЗЕЛЕНИЙ"
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr "SV"
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "Телебачення"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr "TAV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr "B"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr "X"
+
+#: camlibs/pentax/library.c:788
+#, c-format
+msgid "Unknown mode %d"
+msgstr "Невідомий режим %d"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+"Вам слід перемкнутися на режим знімання або перемкнути камеру у «B» для "
+"експонування за кнопкою."
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4077,12 +4458,12 @@
 "net>.\n"
 "Тестування Polaroid 640SE - Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Модель: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4097,110 +4478,98 @@
 "sourceforge.net>. Виправлення помилок - Marcus Meissner <marcus@jet.franken."
 "de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Якість зображення"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Розмір зображення"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Параметри спалаху"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Автоматичне вимикання (хвилин)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Інформація"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "звичайна"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "висока"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "досить висока"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "авто"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "увімк"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "вимк"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "відтворення"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "запис"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "меню"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "акумулятор"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "блок живлення"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Отримано непередбачені дані (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Отримано неочікувану відповідь"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Помилка в контрольній сумі"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Фотоапарат не відповідає на команду."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Фотоапарат надіслав більше байтів ніж очікується (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4209,7 +4578,7 @@
 "Очікувана інформація про зображення %i (= 0x%x), але назад отримано "
 "інформацію про зображення %i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4218,7 +4587,7 @@
 "Отримано %i байтів про невідомий формат зображення. Запишіть у %s та "
 "попросіть про допомогу."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4228,19 +4597,20 @@
 "написана - Ryan Lantzer <rlantzer@umr.edu> для gphoto-4.x. Адаптація для "
 "gphoto2 - Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Фотоапарат"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Скільки часу займе вимикання живлення фотоапарата?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Зображення"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4273,3470 +4643,5355 @@
 "Автоматичне вимикання: %i хвилин\n"
 "Джерело живлення: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Запитаний діапазон портів (%i) не підтримується цим драйвером."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr "Рушій lua CHDK повідомляє про помилку: %s"
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+"Драйвер PTP2 / CHDK\n"
+"(c) 2015-%d, Marcus Meissner <marcus@jet.franken.de>.\n"
+"Це підлеглий драйвер PTP, у якому реалізовано підтримку CHDK з використанням "
+"камер Canon.\n"
+"\n"
+"Насолоджуйтесь!"
+
+#: camlibs/ptp2/chdk.c:489
+#, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "CHDK %d.%d, стан:\n"
+
+#: camlibs/ptp2/chdk.c:492
+#, c-format
+msgid "Mode: %d\n"
+msgstr "Режим: %d\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr "SV96: %d, ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:496
+#, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "TV96: %d, швидкість затвора: %f\n"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr "AV96: %d, діафрагма: %f\n"
+
+#: camlibs/ptp2/chdk.c:500
+#, c-format
+msgid "Focus: %d\n"
+msgstr "Фокус: %d\n"
+
+#: camlibs/ptp2/chdk.c:502
+#, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Режим ISO: %d\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, c-format
+msgid "Zoom: %d\n"
+msgstr "Масштаб: %d\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Оптична температура: %d\n"
+
+#: camlibs/ptp2/chdk.c:509
+#, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Температура ПЗЗ: %d\n"
+
+#: camlibs/ptp2/chdk.c:511
+#, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Температура акумулятора: %d\n"
+
+#: camlibs/ptp2/chdk.c:514
+#, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Режим спалаху: %d\n"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr "Необроблений ISO"
+
+#: camlibs/ptp2/chdk.c:1031
+msgid "Press"
+msgstr "Натискання"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Спуск"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr "Клацання"
+
+#: camlibs/ptp2/chdk.c:1034
+msgid "Capture Mode"
+msgstr "Режим захоплення"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Блокування AE"
+
+#: camlibs/ptp2/chdk.c:1036
+msgid "AF Lock"
+msgstr "Блокування АФ"
+
+#: camlibs/ptp2/chdk.c:1037
+msgid "MF Lock"
+msgstr "Блокування MF"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Орієнтація"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Параметри зображення"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr "Помилка отримання інтерактивних даних CHDK"
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+"Не вдалося отримати інтерактивні дані CHDK: повернуто неповні дані (%d "
+"байтів)"
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK не вивів з режиму запису."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Ваш фотоапарат Canon не підтримує режим захоплення Canon"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Невідоме значення %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Невідоме значення %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "несподіваний тип даних %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Цільового значення немає у переліку."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr "Тепер значення немає у переліку."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr "Sony не вдалося встановити нове значення. Чи є значення коректним?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Ручний"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Автомат у один дотик"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Флуоресцентна лампа"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Лампа розжарювання"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Хмарно"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Різко"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Кольорова температура"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr "Природне освітлення, авто"
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Флуоресцентна лампа 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Флуоресцентна лампа 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Флуоресцентна лампа 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Флуоресцентна лампа 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Флуоресцентна лампа 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Виберіть кольорову температуру"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Нетиповий набір параметрів 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Нетиповий набір параметрів 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Нетиповий набір параметрів 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Нетиповий набір параметрів 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Нетиповий набір параметрів 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Флуоресцентна лампа: тепле біле світло"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Флуоресцентна лампа: холодне біле світло"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Флуоресцентна лампа: денне біле світло"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Флуоресцентна лампа: денне світло"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Шаблон 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Шаблон 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Шаблон 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Під водою: авто"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Лампа розжарювання 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Флуоресцентна лампа: біле світло"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Флуоресцентна лампа: лампа розжарювання"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+msgid "Preset 4"
+msgstr "Шаблон 4"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Інший"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "Покращений JPEG"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "Звичайний JPEG"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + покращений JPEG"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + звичайний JPEG"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr "Великий JPEG+RAW доброї якості"
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr "Великий звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr "Середній звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr "Маленький звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Окремий кадр"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Неперервно з повільною швидкістю"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Неперервно з високою швидкістю"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Автоспуск"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Mup (віддзеркалення вгору)"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+msgid "PROVIA/Standard"
+msgstr "PROVIA/Standard"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr "Velvia/Vivid"
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr "ASTIA/Soft"
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr "PRO Neg.Hi"
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr "PRO Neg.Std"
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Чорно-білий"
+
+#: camlibs/ptp2/config.c:1562
+msgid "Black & White+Ye Filter"
+msgstr "Чорно-білий+жовтий фільтр"
+
+#: camlibs/ptp2/config.c:1563
+msgid "Black & White+R Filter"
+msgstr "Чорно-білий+червоний фільтр"
+
+#: camlibs/ptp2/config.c:1564
+msgid "Black & White+G Filter"
+msgstr "Чорно-білий+зелений фільтр"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr "Класичний хром"
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr "ACROS"
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr "ACROS+жовтий фільтр"
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr "ACROS+червоний фільтр,"
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr "ACROS+зелений фільтр"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr "ETERNA/Кінематографічна"
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr "Класичний негатив"
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr "ETERNA BLEACH BYPASS"
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr "USB"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "не визначено"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "економно"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "без втрат"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Не визначено"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "Телебачення"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Інший"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Заблокувати"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Нічний портрет"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Спорт"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Пейзаж"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Знімання зблизька"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Спалах вимкнено"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+msgid "C2"
+msgstr "C2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr "C3"
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr "Творче авто"
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr "Нічна сцена з рук"
+
+#: camlibs/ptp2/config.c:2088
+msgid "HDR Backlight Control"
+msgstr "Висока роздільність із керуванням підсвічуванням"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr "SCN"
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Їжа"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr "Зерниста Ч/Б"
+
+#: camlibs/ptp2/config.c:2092
+msgid "Soft focus"
+msgstr "Програмне фокусування"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr "Ефект іграшкової камери"
+
+#: camlibs/ptp2/config.c:2094
+msgid "Fish-eye effect"
+msgstr "Ефект «Риб'яче око»"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr "Ефект акварелі"
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Ефект мініатюри"
+
+#: camlibs/ptp2/config.c:2097
+msgid "HDR art standard"
+msgstr "Високороздільне мистецтво, стандартний"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr "Високороздільне мистецтво, яскравість"
+
+#: camlibs/ptp2/config.c:2099
+msgid "HDR art bold"
+msgstr "Високороздільне мистецтво, рельєфність"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr "Високороздільне мистецтво, тиснення"
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr "Панорамування"
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr "HDR"
+
+#: camlibs/ptp2/config.c:2103
+msgid "Self Portrait"
+msgstr "Автопортрет"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr "Гібридний автомат"
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr "Гладка шкіра"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr "Fv"
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr "Стандартна (вимкнено при експонуванні вручну)"
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr "Низька (вимкнено при експонуванні вручну)"
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr "Вимкнено (вимкнено при експонуванні вручну)"
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr "Висока (вимкнено при експонуванні вручну)"
+
+#: camlibs/ptp2/config.c:2119
+msgid "x1"
+msgstr "x1"
+
+#: camlibs/ptp2/config.c:2120
+msgid "x2"
+msgstr "x2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr "x3"
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "придушення ефекту червоних очей"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "заповнення"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "авто + придушення ефекту червоних очей"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "увімкнено + придушення ефекту червоних очей"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Командувач"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Повторення"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Автодіафрагма"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Повністю вручну"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr "QVGA"
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr "VGA"
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr "XGA"
+
+#: camlibs/ptp2/config.c:2174
+msgid "Application"
+msgstr "Програма"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Великий"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Малий"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (фіксовано)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (вибір)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Центрально-зважений"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Середній"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Оціночний"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Частковий"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Середній відносно центру"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Вимірювання на основі меж автофокусування"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Мульти-пляма"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Надійний"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Чорно-біле"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr "Деталізація"
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Визначений користувачем 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Визначений користувачем 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Визначений користувачем 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Точка фокусування лише у центрі, вручну"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Точка фокусування лише у центрі, автоматично"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Декілька точок фокусування (без уточнення), вручну"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Декілька точок фокусування, авто"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Декілька точок фокусування (праворуч)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Декілька точок фокусування (центр)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Декілька точок фокусування (ліворуч)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Великий"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Середній 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Середній 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Середній 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Малий"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 секунд"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 секунди"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "ПК"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + ПК"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Набір параметрів 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Набір параметрів 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Набір параметрів 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Набір параметрів 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr "MOBILE"
+
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr "TFT + MOBILE"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr "PC + MOBILE"
+
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + PC + MOBILE"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr "MOBILE2"
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr "TFT + MOBILE2"
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr "PC + MOBILE2"
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + PC + MOBILE2"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+#, fuzzy
+msgid "LiveMulti"
+msgstr "Декілька"
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Точковий автофокус"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Картка"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Вивід відео"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Невідомий %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Заводські параметри"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Автоматично визначати ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr "cRAW"
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Менший JPEG"
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Малюсінький JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + великий покращений JPEG"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + великий покращений JPEG"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr "cRAW + великий JPEG доброї якості"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + середній покращений JPEG"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + середній покращений JPEG"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr "cRAW + середній JPEG доброї якості"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + маленький покращений JPEG"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + маленький покращений JPEG"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr "cRAW + маленький JPEG доброї якості"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "mRAW + великий звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + великий звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+msgid "cRAW + Large Normal JPEG"
+msgstr "cRAW + великий звичайний JPEG"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "mRAW + середній звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + середній звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+msgid "cRAW + Medium Normal JPEG"
+msgstr "cRAW + середній звичайний JPEG"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + маленький звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + малий звичайний JPEG"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+msgid "cRAW + Small Normal JPEG"
+msgstr "cRAW + маленький звичайний JPEG"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + менший JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + менший JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + менший JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr "cRAW + менший JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + малюсінький JPEG"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + малюсінький JPEG"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + малюсінький JPEG"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Маленький звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Середній 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Середній 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Великий JPEG+RAW доброї якості"
+
+#: camlibs/ptp2/config.c:2761
+#, fuzzy
+msgid "Small + cRAW"
+msgstr "Маленький звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Середній 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Середній 2"
+
+#: camlibs/ptp2/config.c:2764
+#, fuzzy
+msgid "Large + cRAW"
+msgstr "Великий JPEG+RAW доброї якості"
+
+#: camlibs/ptp2/config.c:2767
+#, fuzzy
+msgid "Large + mRAW"
+msgstr "Великий JPEG+RAW доброї якості"
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Середній 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Середній 2"
+
+#: camlibs/ptp2/config.c:2770
+#, fuzzy
+msgid "Small + mRAW"
+msgstr "Маленький звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2771
+#, fuzzy
+msgid "Large + sRAW"
+msgstr "Великий JPEG+RAW доброї якості"
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Середній 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Середній 2"
+
+#: camlibs/ptp2/config.c:2774
+#, fuzzy
+msgid "Small + sRAW"
+msgstr "Маленький звичайний JPEG+RAW"
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Неперервний"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+msgid "Video"
+msgstr "Відео"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr "Однокадрове знімання: тихе знімання"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+msgid "Continuous timer"
+msgstr "Неперервний відлік"
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Таймер 10 сек."
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Таймер 2 сек."
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr "Надвисокошвидкісне неперервне знімання"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Одинарний без сповіщень"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Неперервний без сповіщень"
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Автоматично визначати ISO"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr "HS без сповіщень є неперервним"
+
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr "LS без сповіщень є неперервним"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Автоматичне багатокадрове вилучення шумів ISO"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Для захоплення за натисканням кнопки перемкніть режим на «M» і встановіть "
+"швидкість затвора на «bulb»."
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "Багатокадрове вилучення шумів %d"
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr "Знімок"
+
+#: camlibs/ptp2/config.c:2895
+msgid "Bulb On"
+msgstr "Лампу увімкнено"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr "Лампу вимкнено"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr "АФ"
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr "Скасувати АФ"
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr "Не вдалося виконати знімок Fuji: можливо, немає автофокусування?"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 точка (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 точка (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 точка (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 точка (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Багатокадрове вилучення шумів"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Автоматичне багатокадрове вилучення шумів ISO"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Час"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4f с"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Творчість"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Дія"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Нічний пейзаж"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Діти"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Автоматика (без спалаху)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr "U3"
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Кмітливе авто"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Відмінне авто"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
-msgstr "Кіно"
+#: camlibs/ptp2/config.c:3840
+msgid "Movie (P)"
+msgstr "Фільм (P)"
+
+#: camlibs/ptp2/config.c:3841
+msgid "Movie (A)"
+msgstr "Фільм (A)"
+
+#: camlibs/ptp2/config.c:3842
+msgid "Movie (S)"
+msgstr "Фільм (S)"
+
+#: camlibs/ptp2/config.c:3843
+msgid "Movie (M)"
+msgstr "Фільм (M)"
+
+#: camlibs/ptp2/config.c:3844
+msgid "Movie (Scene)"
+msgstr "Фільм (сцена)"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Телемасштаб. неперерв. пріор. АЕ"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Автопанорама"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Кмітливе вимикання автоспалаху"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Спорт"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Захід"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Нічна сцена"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Мобільне притлумлення"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr "Запобігання розмиванню рухом"
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Ефект зображення"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr "Повільний/Швидкий"
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Нічний пейзаж"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Вечірка/У приміщенні"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Пляж/На снігу"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Світанок/Сутінки"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Знімок домашнього улюбленця"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Світло свічок"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Цвітіння"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Кольри осені"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Їжа"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Діти"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Знімання зблизька"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Флуоресцентне освітлення"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Вода"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 ЗЕ"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 ЗЕ"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 ЗЕ"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr "1/3 EV"
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr "1/2 EV"
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr "2/3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Дуже високий"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr "2 зображення (звичайне і нижнє)"
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr "2 зображення (звичайне і верхнє)"
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr "3 зображення (звичайне і 2 нижніх)"
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr "3 зображення (звичайне і 3 верхніх)"
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr "3 зображення (звичайне, верхнє і нижнє)"
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr "5 зображень (звичайне, 2 нижніх і 2 верхніх)"
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr "7 зображень (звичайне, 3 нижніх і 3 верхніх)"
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr "9 зображень (звичайне, 4 нижніх і 4 верхніх)"
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+msgid "0 image"
+msgstr "0 зображень"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr "2 знімка (Вимкнути -> Встановлено користувачем)"
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr "3 знімка (Вимкнути -> Нижнє -> Встановлено користувачем)"
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr "4 знімки (Вимкнути -> Нижнє -> Звичайне -> Верхнє)"
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr "5 знімків (Вимкнути -> Нижнє -> Звичайне -> Верхнє -> Над верхнім)"
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Сцена"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Ефекти"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Підсвічування"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Панорама"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Згладжування"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Нахил-зсув"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Вибір кольору"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Знімок екрана"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Спалах"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Проміжок часу"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Неперервно з повільною швидкістю"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Таймер"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Віддзеркалення вгору"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Віддалене керування з швидким доступом"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Віддалене керування з запізненням"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Тихий спуск"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr "Неперервний тихий спуск"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Автоспуск 2 с"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr "Автоспуск 5 с"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Автоспуск 10 с"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Автоспуск 10 с, 3 знімки"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Автоспуск 10 с, 5 знімків"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Автоспуск 5 с, 3 знімки"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Автоспуск 5 с, 5 знімків"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Автоспуск 2 с, 3 знімки"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Автоспуск 2 с, 5 знімків"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+msgid "Continuous Hi+ Speed"
+msgstr "Неперервно з Hi+-швидкістю"
+
+#: camlibs/ptp2/config.c:4170
+msgid "Continuous Med Speed"
+msgstr "Неперервно з середньою швидкістю"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 0.3, 3 знімки"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 0.3, 5 знімків"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Кроки «вилки» C 0.3, 9 знімків"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 0.5, 3 знімки"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 0.5, 5 знімків"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Кроки «вилки» C 0.5, 9 знімків"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 0.7, 3 знімки"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 0.7, 5 знімків"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Кроки «вилки» C 0.7, 9 знімків"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 1.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 1.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Кроки «вилки» C 1.0, 9 знімків"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 2.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 2.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» C 3.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» C 3.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 0.3, 3 знімки"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 0.3, 5 знімків"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Кроки «вилки» S 0.3, 9 знімків"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 0.5, 3 знімки"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 0.5, 5 знімків"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Кроки «вилки» S 0.5, 9 знімків"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 0.7, 3 знімки"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 0.7, 5 знімків"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Кроки «вилки» S 0.7, 9 знімків"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 1.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 1.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Кроки «вилки» S 1.0, 9 знімків"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 2.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 2.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Кроки «вилки» S 3.0, 3 знімки"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Кроки «вилки» S 3.0, 5 знімків"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Вилка експонування WB Lo"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr "Вилка експонування DRO Lo"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Вилка експонування WB Hi"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr "Вилка експонування DRO Hi"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Центральна пляма"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Мультипляма"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Одиночна область"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Найближча тема"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Динаміка групи"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "АФ за одиночною областю"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "АФ за динамічною областю"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "АФ за динамікою групи"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
-msgstr "АФ за динамічною областю з пріоритетом найближчого об’єкта"
+msgstr "АФ за динамічною областю з пріоритетом найближчого об'єкта"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Динамічна область (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Динамічна область (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Динамічна область (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "Просторове стеження"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr "АФ за динамічною областю (25 точок)"
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr "АФ за однією точкою"
+
+#: camlibs/ptp2/config.c:4251
+msgid "Auto-area AF"
+msgstr "АФ за автообластю"
+
+#: camlibs/ptp2/config.c:4252
+msgid "3D-tracking"
+msgstr "Просторове стеження"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr "АФ за динамічною областю (72 точки)"
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr "АФ за динамічною областю (153 точки)"
+
+#: camlibs/ptp2/config.c:4255
+msgid "Group-area AF"
+msgstr "АФ за груповою областю"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr "АФ за динамічною областю (9 точок)"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr "АФ за контрольною точкою"
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr "АФ за широкою областю (S)"
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr "АФ за широкою областю (L)"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "АФ за широкою областю (S)"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "АФ за широкою областю (S)"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (портрет)"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (природа)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Невідоме значення 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "За центром"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Згори"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Знизу"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Зліва"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Справа"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Ширококутовий"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+msgid "Center"
+msgstr "За центром"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Гнучка програма"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Гнучка програма"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Гнучка програма"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Центрально-зважений"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Декілька точок"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Центральна точка"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr "Світла пляма+Виблиски"
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr "Світла пляма+Тінь"
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr "Декілька"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr "Середнє за усім екраном"
+
+#: camlibs/ptp2/config.c:4380
+msgid "Spot Standard"
+msgstr "Стандартний фрагмент"
+
+#: camlibs/ptp2/config.c:4381
+msgid "Spot Large"
+msgstr "Великий фрагмент"
+
+#: camlibs/ptp2/config.c:4382
+msgid "Highlight"
+msgstr "Підсвічування"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Автоматичний спалах"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Спалах"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Автоматично протидія червоним очам"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Запобігання червоним очам"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Зовнішня синхронізація"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Автоуповільнена синхр."
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Задній фронт синхр. + уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Запобігання червоним очам + уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Синхронізація за передньою завісою"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Коригування ефекту «Червоних очей»"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Запобігання червоним очам + уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Задній фронт синхр. + уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Задній фронт синхр."
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Задній фронт синхр."
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Бездротова синхронізація"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Уповільнена синхр."
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Чорно-білий"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Нічне бачення"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Кольоровий ескіз"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Ефект мініатюри"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Вибірковий колір"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Силует"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Темне"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Яскраве"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "нескінченна"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d мм"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "нескінченна"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, c-format
+msgid "Composite"
+msgstr "Суміщення"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "лампа"
+
+#: camlibs/ptp2/config.c:5050
+msgid "Sync"
+msgstr "Синхронізація"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "АФ з пріоритетом облич"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "АФ за широкою областю"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "АФ за звичайною областю"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
-msgstr "АФ зі стеженням за об’єктом"
+msgstr "АФ зі стеженням за об'єктом"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+msgid "Spot-area AF"
+msgstr "АФ за областю вибору"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+msgid "Entire Display"
+msgstr "Увесь дисплей"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200%"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr "33%"
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr "66%"
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "Одноприводне АФ"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+msgid "Continuous-servo AF"
+msgstr "Неперервно-приводове АФ"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "Постійноприводове АФ"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
-msgstr "Ручний фокус"
+#: camlibs/ptp2/config.c:5651
+msgid "Manual Focus (fixed)"
+msgstr "Фокусування вручну (фіксоване)"
+
+#: camlibs/ptp2/config.c:5652
+msgid "Manual Focus (selection)"
+msgstr "Фокусування вручну (вибір)"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Блокування AE/AF"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Лише блокування AE"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Лише блокування АФ"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Блокування АФ із затримкою"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF увімкнено"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Рівень блокування спалаху"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 секунд"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 хвилина"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 хвилин"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 хвилин"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 секунд"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 мм"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 мм"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 мм"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 мм"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr "15 мм"
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr "20 мм"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "кнопка"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30 с"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25 с"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20 с"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15 с"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13 с"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10 с"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8 с"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6 с"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5 с"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4 с"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3 с"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2,5 с"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2 с"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1,6 с"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1,3 с"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1 с"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1,3 с"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1,6 с"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2 с"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2,5 с"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3 с"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4 с"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5 с"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6 с"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8 с"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10 с"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13 с"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15 с"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20 с"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25 с"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30 с"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40 с"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50 с"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60 с"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80 с"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100 с"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125 с"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160 с"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200 с"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250 с"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320 с"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400 с"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500 с"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640 с"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800 с"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000 с"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250 с"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600 с"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000 с"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500 с"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200 с"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000 с"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000 с"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400 с"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000 с"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 хвилин"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Різкіше"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "М'якше"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "Прямий друк"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Помірно низький"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Помірно високий"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Низька контрастність"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Помірно висока"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Високий"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Зонне фокусування (наближення)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Зонне фокусування (дуже близько)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Зонне фокусування (близько)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Зонне фокусування (середня відстань)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Зонне фокусування (здалеку)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Зонне фокусування (зарезервовано 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Зонне фокусування (зарезервовано 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Зонне фокусування (зарезервовано 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Зонне фокусування (зарезервовано 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Автоматично режим макро"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "Одноприводне АФ"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "Неперервно-приводове АФ"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr "C-AF"
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr "S-AF+MF"
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Один знімок"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "ШІ-привод"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "ШІ-фокус"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 секунди"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 секунд"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Утримання"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Флуоресцентний H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Нетиповий баланс білого PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Нетиповий баланс білого PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Нетиповий баланс білого PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Не вказано числа"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Тінь"
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
-msgstr "Нетиповий ББ 2"
-
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
-msgstr "Нетиповий ББ 3"
-
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
-msgstr "Нетиповий ББ 4"
-
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
-msgstr "Нетиповий ББ 5"
+#: camlibs/ptp2/config.c:6026
+msgid "Custom Whitebalance: PC-1"
+msgstr "Нетиповий баланс білого: PC-1"
+
+#: camlibs/ptp2/config.c:6027
+msgid "Custom Whitebalance: PC-2"
+msgstr "Нетиповий баланс білого: PC-2"
+
+#: camlibs/ptp2/config.c:6028
+msgid "Custom Whitebalance: PC-3"
+msgstr "Нетиповий баланс білого: PC-3"
+
+#: camlibs/ptp2/config.c:6030
+msgid "Manual 3"
+msgstr "Ручний 3"
+
+#: camlibs/ptp2/config.c:6031
+msgid "Manual 4"
+msgstr "Ручний 4"
+
+#: camlibs/ptp2/config.c:6032
+msgid "Manual 5"
+msgstr "Ручний 5"
+
+#: camlibs/ptp2/config.c:6033
+msgid "Custom Whitebalance: PC-4"
+msgstr "Нетиповий баланс білого: PC-4"
+
+#: camlibs/ptp2/config.c:6034
+msgid "Custom Whitebalance: PC-5"
+msgstr "Нетиповий баланс білого: PC-5"
+
+#: camlibs/ptp2/config.c:6035
+msgid "AWB White"
+msgstr "Білий AWB"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Низька різкість"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Чорно-білий"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+msgid "AE bracket"
+msgstr "Автовилка ADL"
+
+#: camlibs/ptp2/config.c:6132
+msgid "ISO bracket"
+msgstr "Виделка ISO"
+
+#: camlibs/ptp2/config.c:6133
+msgid "WB bracket"
+msgstr "Вилка балансу білого"
+
+#: camlibs/ptp2/config.c:6134
+msgid "FE bracket"
+msgstr "Вилка FE"
+
+#: camlibs/ptp2/config.c:6135
+msgid "Bracket off"
+msgstr "Вилку вимкнено"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr "неявне авто"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE та спалах"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "лише AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Лише спалах"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "WB дужка"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "Автовилка ADL"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Запуск"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Вимкнення"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Запуск і вимкнення"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Гц"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Гц"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Швидка відповідь"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Віддалене віддзеркалення вгору"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Режим роботи 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Режим роботи 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Середня"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Покращена"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > Under"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Under > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Авточутливість"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Висока чутливість"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Середня чутливість"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Низька чутливість"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Мікрофон вимкнено"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Високий 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Високий 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Спалах/Швидкість"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Спалах/Швидкість/Діафрагма"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Спалах/Діафрагма"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "Базовий JPEG"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Fine"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+Основа"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Звичайний"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+msgid "JPEG Basic*"
+msgstr "Базовий JPEG*"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+msgid "JPEG Normal*"
+msgstr "Звичайний JPEG*"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+msgid "JPEG Fine*"
+msgstr "Покращений JPEG*"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr "TIFF"
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr "NEF+Базовий*"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+msgid "NEF+Normal*"
+msgstr "NEF+Звичайний*"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+msgid "NEF+Fine*"
+msgstr "NEF+Покращений*"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Надвисокоякісний"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG (стандартний)"
+
+#: camlibs/ptp2/config.c:6873
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG (стандартний)"
+
+#: camlibs/ptp2/config.c:6874
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW+JPEG (покращений)"
+
+#: camlibs/ptp2/config.c:6875
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW+JPEG (X.Fine)"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Fine"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "RAW+JPEG (X.Fine)"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "RAW+JPEG (стандартний)"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "RAW+JPEG (стандартний)"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW+JPEG (покращений)"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW+JPEG (X.Fine)"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
 #, fuzzy
+msgid "X.Fine"
+msgstr "Вдосконалений"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "Покращений JPEG"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 msgid "Multi-Shot"
-msgstr "Мультипляма"
+msgstr "Мультизнімання"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 секунд"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 секунд"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 секунд"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 хвилин"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Без втрат"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "З втратами"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Темне"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Пріоритет розміру"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Оптимальна якість"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250 с (авто-FP)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320 с (авто-FP)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Спуск"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Спуск + фокусування"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 точок"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 точка"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 точка"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 точка (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (довгий)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (звичайний)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (короткий)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Затвор/AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "AF-ON"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Блокування AE/AF"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Лише блокування AE"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Блокування AE (скидання під час спуску)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "Блокування АФ із затримкою"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Лише блокування АФ"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 кд/с"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 кд/с"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 кд/с"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 кд/с"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 кд/с"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 кд/с"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 кд/с"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 кд/с"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 кд/с"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 кд/с"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 кд/с"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Не призначено"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Перегляд"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "Блокування FV"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "Блокування АФ із затримкою"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Розбиття автовилки"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Матричне вимірювання"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Центрально-зважене вимірювання"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Точкове вимірювання"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Відтворити"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Отримати доступ до верхнього пункту у МОЄМУ МЕНЮ"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (RAW)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Рамкова сітка"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Активний D-Lighting"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 крок шв./діафрагма"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
-msgstr "Вибрати число об’єктива без процесора"
+msgstr "Вибрати число об'єктива без процесора"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Віртуальний горизонт видошукача"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Розпочати запис відео"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Увімкн. (перегляд зображення вимкнено)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+msgid "Face detection"
+msgstr "Виявлення облич"
+
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr "Визначення обличчя і відбитка"
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr "Визначення тварин"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
-
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Невідоме значення"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 "Зміна області автоматичного фокусування Nikon працює лише у режимі LiveView."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Мотор автофокусування Nikon не виконав фокусування."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Фокусування вручну Nikon працює лише у режимі LiveView."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Граничне значення фокусування вручну Nikon."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Кроки фокусування вручну Nikon є надто малими."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Натиснуто наполовину"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Повністю натиснуто"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Відпущено наполовину"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Повністю відпущено"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Негайно"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Натиснути 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Натиснути 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Натиснути 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Відпустити 1"
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Відпустити 2"
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Відпустити 3"
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Близько 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Близько 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Близько 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Далеко 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Далеко 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Далеко 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Близько %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Далеко %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: заряд акумулятора вичерпано"
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr "Не вдалося розпочати інтерактивний перегляд: надто висока температура"
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr "Не вдалося розпочати інтерактивний перегляд: помилка TTL"
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: виконуємо дію із віддзеркалення "
+"вгору"
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr "Не вдалося розпочати інтерактивний перегляд: об'єктив втягується"
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: попередження щодо мінімальної "
+"діафрагми"
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: обробляємо дію зі знімання"
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr "Не вдалося розпочати інтерактивний перегляд: помилка у послідовності"
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: режимом запрограмованого "
+"експонування не є P/A/S/M"
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr "Не вдалося розпочати інтерактивний перегляд: попередження щодо лампи"
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr "Не вдалося розпочати інтерактивний перегляд: картку не форматовано"
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: помилка при роботі з карткою"
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: картку захищено від запису"
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+"Не вдалося запустити Liveview: запис на картку призначення, але картки немає "
+"або картку захищено від запису"
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+"Не вдалося розпочати інтерактивний перегляд: у черзі неотримане зображення "
+"SDRAM"
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr "Не вдалося розпочати інтерактивний перегляд: кнопку повністю натиснено"
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr "Не вдалося розпочати інтерактивний перегляд: код 0x%08x"
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Не вдалося увімкнути liveview Nikon"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr "Умови заборони відео: "
+
+#: camlibs/ptp2/config.c:8555
+msgid "Not in application mode"
+msgstr "Не у режимі програми"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr "увімкнено встановлення вибору інтерактивного перегляду"
+
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+msgid "In enlarged liveview"
+msgstr "У збільшеному liveview"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+msgid "Card protected"
+msgstr "Картку захищено від запису"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr "Вже виконується запис відео"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr "Зображення або відео ще не записано до буфера"
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr "Картка заповнено"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+msgid "Card not formatted"
+msgstr "Картку пам'яті не форматовано"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+msgid "Card error"
+msgstr "Помилка під час роботи з карткою"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr "Немає умов заборони відео"
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr "Умови заборони Live View: "
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr "Помилка у послідовності"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr "Кнопку повністю натиснено"
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+msgid "Minimum aperture warning"
+msgstr "Попередження щодо мінімальної діафрагми"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+msgid "Battery exhausted"
+msgstr "Акумулятор розряджений"
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+msgid "TTL error"
+msgstr "Помилка TTL"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr "У черзі неотримане зображення SDRAM"
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+"Запис на картку призначення, але картки немає або картку захищено від запису"
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr "Обробка дії зі знімання"
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+msgid "Temperature too high"
+msgstr "Надто висока температура"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+msgid "Card unformatted"
+msgstr "Картку пам'яті не форматовано"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr "Попередження щодо лампи"
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr "Виконання дії із віддзеркалення вгору"
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+msgid "Lens is retracting"
+msgstr "Об'єктив втягується"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Режимом запрограмованого експонування не є P/A/S/M"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr "Liveview має бути дозволено"
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr "Не вдалося розпочати запис фільму: %s."
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr "Камера працює не у режимі програми"
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr "Не вдалося розпочати запис відео: код 0x%08x."
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Флуоресцентне освітлення"
+
+#: camlibs/ptp2/config.c:9152
+msgid "White set"
+msgstr "Встановлений білий"
+
+#: camlibs/ptp2/config.c:9153
+msgid "Black White"
+msgstr "Чорно-білий"
+
+#: camlibs/ptp2/config.c:9159
+msgid "Temperature 1"
+msgstr "Температура 1"
+
+#: camlibs/ptp2/config.c:9160
+msgid "Temperature 2"
+msgstr "Температура 2"
+
+#: camlibs/ptp2/config.c:9161
+msgid "Temperature 3"
+msgstr "Температура 3"
+
+#: camlibs/ptp2/config.c:9162
+msgid "Temperature 4"
+msgstr "Температура 4"
+
+#: camlibs/ptp2/config.c:9163
+msgid "Automatic Cool"
+msgstr "Автоматичне охолодження"
+
+#: camlibs/ptp2/config.c:9164
+msgid "Automatic Warm"
+msgstr "Автоматичне нагрівання"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, c-format
+msgid "Unknown 0x%04x"
+msgstr "Невідоме 0x%04x"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Надзбільшення"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
 msgstr ""
-"Для захоплення за натисканням кнопки перемкніть режим на «M» і встановіть "
-"швидкість затвора на «bulb»."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Далеко 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Далеко 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Близько 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Близько-далеко"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+#, fuzzy
+msgid "S"
+msgstr "SV"
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Стандартний"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Запис"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Відтворення"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Інші параметри"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Потужне усування шуму ISO"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Не показувати меню ТБ"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr ""
+"\n"
+"Потоки:"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+msgid "large"
+msgstr "великий"
+
+#: camlibs/ptp2/config.c:9962
+#, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Невідоме значення розміру мініатюр, «%s»."
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "Внутрішня пам'ять"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Картка пам'яті"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Відображення"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Дата створення: %s, дата останнього використання: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Видалити"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-біт"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-біт"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Керований"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Спеціальний"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Назва профілю"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "IP адреса (порожня для DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Маска мережі"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Типовий шлюз"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Режим доступу"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Канал WIFI"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Ключ шифрування (шістн)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Запис"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Перелік профілів Wifi"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Створити профіль Wifi"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Синхронізувати дату і час фотоапарата з ПК (UTC)"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Автофокусування"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+msgid "Manual-Focus"
+msgstr "Фокусування вручну"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Вимикання живлення"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Блокування фокусування"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Режим кнопки"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Блокування інтерфейсу"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+msgid "Popup Flash"
+msgstr "Висувний спалах"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Моторне автофокусування дзеркальних фотоапаратів Nikon"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Моторне автофокусування дзеркальних фотоапаратів Canon"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+msgid "Drive Fuji Autofocus"
+msgstr "Автофокусування Drive Fuji"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Фокусування вручну дзеркальних фотоапаратів Nikon"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Встановити область автофокусування Nikon"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Встановити режим керування Nikon"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Фокусування вручну дзеркальних фотоапаратів Canon"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Скасувати автофокусування дзеркальних фотоапаратів Canon"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Фокусування вручну Olympus OMD"
+
+#: camlibs/ptp2/config.c:10695
+msgid "Drive Panasonic Manual focus"
+msgstr "Фокусування вручну Drive Panasonic"
+
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr "Автофокусування Drive Fuji"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Початкова позиція EZoom"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Масштаб Canon EOS"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Позиція масштабування Canon EOS"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Видошукач Canon EOS"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr "Видошукач Panasonic"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Видошукач Nikon"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Віддалений спуск Canon EOS"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "Скрипт CHDK"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Знімання відео"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+msgid "Movie Mode"
+msgstr "Режим відео"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Дані фокусування"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Дані фокусування"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Дані фокусування"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Яскравість точки фокусування"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "Код операції PTP"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Серійний номер"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Виробник фотоапарата"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Версія пристрою"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Розширення виробника"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Версія PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Версія DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "У мережі живлення"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Зовнішній спалах"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Рівень заряду батареї"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr "Стан віддзеркалення вгору"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Віддзеркалення вгору"
+
+#: camlibs/ptp2/config.c:10742
+#, fuzzy
+msgid "Mirror Lock Status"
+msgstr "Стан віддзеркалення вгору"
+
+#: camlibs/ptp2/config.c:10743
+#, fuzzy
+msgid "Mirror Down Status"
+msgstr "Стан віддзеркалення вгору"
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr "Кількість знімків із віддзеркаленням вгору"
+
+#: camlibs/ptp2/config.c:10745
+msgid "Continuous Shooting Count"
+msgstr "Кількість знімків неперервному зніманні"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Орієнтація фотоапарата"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Спалах підключений"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+msgid "Active Folder"
+msgstr "Активна тека"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Спалах заряджається"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Назва об'єктива"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Лічильник затвора"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Доступні знімки"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Мінімальна фокусна відстань"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Максимальна фокусна відстань"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Макс. діафрагма при мін. фокусній відстані"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Макс. діафрагма при макс. фокусній відстані"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Слабе світло"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Датчик світла"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Блокування АФ"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "Блокування AE"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "Блокування FV"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+msgid "Movie Switch"
+msgstr "Перемикач відео"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr "Умова заборони відео"
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr "Умова заборони Liveview"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Дата та час на фотоапараті"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Режим сигналу"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Коментар до зображення"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "GUID WLAN"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Увімкнути коментар до зображення"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Час вимикання LCD"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Запис мультимедійних даних"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Тривалість швидкого перегляду"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Меню CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Реверсивна команда набору"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Дані, виведені фотоапаратом"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Результат запису"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Режим EVF"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Виконавець"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Номер ПЗЗ"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Авторське право"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr "Прізвисько"
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Очистити датчик"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Усування блимання"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Додаткові нетипові функції"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Дані фокусування"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Область фокусування"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr "Стробо-запалення"
+
+#: camlibs/ptp2/config.c:10812
+msgid "Flash Charging State"
+msgstr "Стан заряджання спалаху"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr "Увімкнено один простий знімок"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Автоматичне вимикання"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Глибина поля"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Меню та відтворення"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr "Керування зовнішнім записом"
+
+#: camlibs/ptp2/config.c:10818
+msgid "Camera Action"
+msgstr "Дія фотоапарата"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+msgid "Priority Mode"
+msgstr "Режим пріоритетності"
+
+#: camlibs/ptp2/config.c:10823
+msgid "Thumb Size"
+msgstr "Розмір мініатюр"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Швидка файлова система"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Ціль зйомки"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Автофокусування"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Віддалений режим"
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10833
+msgid "Event Mode"
+msgstr "Режим подій"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "Формат зображення SD"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "Формат зображення CF"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Формат зображення розширеного HD"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+msgid "Film Simulation"
+msgstr "Імітація плівки"
+
+#: camlibs/ptp2/config.c:10851
+msgid "Raw Image Size"
+msgstr "Розмір цифрового негатива"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Швидкість ISO відео"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "Авто ISO"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Баланс білого"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Коригування балансу білого A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Коригування балансу білого B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Баланс білого X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Баланс білого X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Фотоефект"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Режим кольору"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Простір кольорів"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Формат відео"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Роздільна здатність відео"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Частота кадрів відео"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Контрастність відео"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Яскравість відео"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Формат звукових даних"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Бітова швидкість звуку"
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr "Частота дискретизації звуку"
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr "Кількість бітів на семпл для звуку"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Гучність звуку"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Зменшення шумів при довгій експозиції"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Режим автофокусування 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+msgid "Zoom Speed"
+msgstr "Швидкість масштабування"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Допоміжне світло"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Ознака обертання"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+msgid "Movie Exposure Compensation"
+msgstr "Компенсація експозиції фільму"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Баланс білого"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Кольорова температура"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Режим АФ"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Допоміжна MF"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Розпочати запис відео"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Компенсація спалаху"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "Компенсація експозиції AEB"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Режим спалаху Nikon"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Режим керування спалахом"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Живлення керування спалахом"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Команда каналу спалаху"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Команда автоматичного режиму спалаху"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Команда автоматичної компенсації спалаху"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Значення команди Self спалаху"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Команда A-режиму спалаху"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Команда A-компенсації спалаху"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Значення команди A спалаху"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Команда B-режиму спалаху"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Команда B-компенсації спалаху"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Значення команди B спалаху"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "Область освітлення АФ"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "Режим звукового сигналу АФ"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Число F"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+msgid "Live View Size"
+msgstr "Розмір Live View"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Число F відео"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Гнучка програма"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Якість"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Розмір цифрового негатива"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Формат зображення"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Фокусна відстань"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Фокусна відстань"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Режим фокусування 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Неперервне АФ"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Режим ефектів"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Програма експозиції"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+msgid "User Mode"
+msgstr "Режим користувача"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Режим сцени"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Співвідношення розмірів"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
 #, fuzzy
+msgid "AF Method"
+msgstr "Режим АФ"
+
+#: camlibs/ptp2/config.c:10982
 msgid "Storage Device"
-msgstr ""
-"\n"
-"Зведена інформація про накопичувачі:\n"
+msgstr "Пристрій зберігання даних"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Потужне усування шуму ISO"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "Режим HDR"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "Високодинамічний HDR"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "HDR-згладжування"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Тихий режим зйомки"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Режим знімання Canon"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Режим автоекспонування Canon"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Набирання режиму автоекспонування Canon"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Режим мотора"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Стиль зображення"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Режим вимірювання фокуса"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Режим виміру експозиції"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "Пріоритет відкритої діафрагми"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "Максимум діафрагми"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+msgid "Aperture 2"
+msgstr "Діафрагма 2"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Точка фокусування"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Затримка захоплення"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Швидкість затвора 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Швидкість затвора 2 відео"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Баланс білого"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Відстань АФ"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Область фокусування"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Режим затримки експонування"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Блокування експозиції"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Режим AE-L/AF-L"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Режим АФ Live View"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Фокусування АФ Live View"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+msgid "Live View Exposure Preview"
+msgstr "Попередній перегляд експозиції режиму інтерактивного перегляду"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Масштаб зображення Live View"
+
+#: camlibs/ptp2/config.c:11038
+msgid "Live View White Balance"
+msgstr "Баланс білого інтерактивного перегляду"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Розмір Live View"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Впорядкування номерів файлів"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Знак спалаху"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Моделювання спалаху"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Сітка видошукача"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Огляд зображення"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Ознака обертання зображення"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Відпускання без картки CF"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Ручне встановлення потужності спалаху"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Область автофокусування"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Компенсація витримки спалаху"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Автовилка"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Режим вилки"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Крок значення експозиції"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Встановлено дужку"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Порядок вилки"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+msgid "AE Bracketing Step"
+msgstr "Крок вилки автоекспонування"
+
+#: camlibs/ptp2/config.c:11061
+msgid "WB Bracketing Step"
+msgstr "Крок вилки балансу білого"
+
+#: camlibs/ptp2/config.c:11062
+msgid "AE Bracketing Pattern"
+msgstr "Взірець автовилки експонування"
+
+#: camlibs/ptp2/config.c:11063
+msgid "WB Bracketing Pattern"
+msgstr "Взірець вилки балансу білого"
+
+#: camlibs/ptp2/config.c:11064
+msgid "AE Bracketing Count"
+msgstr "Кількість для вилки автоекспонування"
+
+#: camlibs/ptp2/config.c:11065
+msgid "ADL Bracketing Pattern"
+msgstr "Взірець вилки ADL"
+
+#: camlibs/ptp2/config.c:11066
+msgid "ADL Bracketing Step"
+msgstr "Крок вилки ADL"
+
+#: camlibs/ptp2/config.c:11067
+msgid "WB Preset Comment 1"
+msgstr "Коментар 1 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11068
+msgid "WB Preset Comment 2"
+msgstr "Коментар 2 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11069
+msgid "WB Preset Comment 3"
+msgstr "Коментар 3 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11070
+msgid "WB Preset Comment 4"
+msgstr "Коментар 4 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr "Коментар 5 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr "Коментар 6 набору балансу білого"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Кількість спалахів"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Інтервал між спалахами"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Максимум знімків"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Автоматичний баланс білого"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Вольфрамовий баланс білого"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Флуоресцентний баланс білого"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Баланс білого денного світла"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Баланс білого спалаху"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Туманний баланс білого"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Тінистий баланс білого"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+msgid "Natural light auto White Balance Bias"
+msgstr "Природне освітлення, автоухил на баланс білого"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Номер набору коригування балансу білого"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Коригування балансу білого (набір 0)"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Коригування балансу білого (набір 1)"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Коригування балансу білого (набір 2)"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Коригування балансу білого (набір 3)"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Коригування балансу білого (набір 4)"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Затримка власного таймера"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Область центру мас"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Швидкість затвора при спалаху"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Віддалений тайм-аут"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Віддалений режим"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Режим роботи"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Оптимізація зображення"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Підвищення різкості"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Компенсація тону"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Насиченість"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Коригування відтінку"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Автоекспонування «вилки»"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
-msgstr ""
+msgstr "Оптимізація автопідсвічування"
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Звук до відео"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Параметр відео вручну"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Мікрофон"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Реверсивні індикатори"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Керування автовикривленням"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+msgid "Vignette Correction"
+msgstr "Виправлення віньєтування"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Відеорежим"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr "Сенсорне обрізання"
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr "Глибина даних виведення HDMI"
+
+#: camlibs/ptp2/config.c:11124
+msgid "Face Detection"
+msgstr "Виявлення облич"
+
+#: camlibs/ptp2/config.c:11125
+msgid "Movie Servo AF"
+msgstr "Приводне АФ для фільму"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Лічильник часу у вимкненому стані"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Призначити кнопку функції"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Призначити кнопку попереднього перегляду"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Якість відеозображення"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Мінімальна швидкість затвора"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Повільна швидкість неперервного знімання"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Роздільна здатність відео"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Повільна швидкість неперервного знімання"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Мінімальна швидкість затвора"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Якість відеозображення"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Автоматичний верхній рівень ISO"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Швидкість синхронізації спалаху"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Вимірювання фокуса"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Висока швидкість неперервного знімання"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Правила стискання JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "Пріоритетність режиму AF-C"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "Пріоритетність режиму AF-S"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "Активування АФ"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Область динамічного АФ"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Блокування АФ"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "Точка області АФ"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "Кнопка вмикання АФ"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Потужне усування шуму ISO відео"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Максимальна неперервна послідовність спусків"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr "Тривалість циклу відео"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Стиснення негатива"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Якість зображення 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Параметри зображення"
-
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11288
+msgid "Live View Zoom Area"
+msgstr "Область масштабування Live View"
+
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Параметри зйомки"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Профілі WiFi"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Інші властивості PTP пристрою"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "Властивість PTP 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Вибачте, зараз можливе лише читання властивості «%s» / 0x%04x."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Властивість «%s» / 0x%04x не було встановлено (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Властивість «%s» / 0x%04x не було встановлено (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 "Спроба обробки значення віджета «%s» / 0x%04x завершилася помилкою з номером "
 "%d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Властивості «%s» не знайдено."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Треба вказати теку, що починається з /store_xxxxxxxxx/"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7755,194 +10010,217 @@
 "\n"
 "Насолоджуйтесь!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Вибачте, здається, ваш фотоапарат Nikon не повертає зображення JPEG у режимі "
+"LiveView"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Не вдалося увімкнути видошукача Canon"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Не вдалося отримати зображення видошукача Canon"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Ваш фотоапарат Canon не підтримує режим видошукача Canon"
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr ""
 "Вибачте, у вашому фотоапараті Nikon не передбачено підтримки режиму LiveView"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr ""
-"Вибачте, здається, ваш фотоапарат Nikon не повертає зображення JPEG у режимі "
-"LiveView"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr "Не вдалося запустити Liveview: %s"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Не вдалося вимкнути liveview для фотоапарата Nikon"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 "Вибачте, здається, ваш фотоапарат Sony не повертає зображення JPEG у режимі "
 "LiveView"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Вибачте, здається, ваш фотоапарат Panasonic не повертає зображення JPEG у "
+"режимі LiveView"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Ваш фотоапарат не підтримує захоплення Nikon"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
-"Не вдалося увімкнути liveview на Nikon 1, хоча ця можливість є обов’язковою "
+"Не вдалося увімкнути liveview на Nikon 1, хоча ця можливість є обов'язковою "
 "для захоплення зображення"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Ваш фотоапарат Canon не підтримує режим захоплення EOS Canon"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Помилка під час спроби отримання внесених змін Canon EOS"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Ваш фотоапарат Canon не підтримує ініціалізацію Canon Capture"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Помилка вимикання видошукача Canon"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Помилка захоплення Canon"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr "Не вдалося захопити: немає фокусування."
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Ваш фотоапарат не підтримує загальне захоплення"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
-msgstr "Картку пам’яті фотоапарата було заповнено під час знімання."
+msgstr "Картку пам'яті фотоапарата було заповнено під час знімання."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Помилка під час обробки напівнатискання Canon EOS"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr "Не вдалося увімкнути знімання Canon EOS: можливо, немає фокусування?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Помилка під час обробки напіввідпускання Canon EOS"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Помилка під час обробки повного натискання Canon EOS"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Помилка під час обробки повного відпускання Canon EOS"
 
-#: camlibs/ptp2/library.c:4459
-#, fuzzy
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
-msgstr "Помилка під час обробки повного натискання Canon EOS"
+msgstr "Помилка під час обробки повного натискання Canon EOS M"
 
-#: camlibs/ptp2/library.c:4486
-#, fuzzy
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
-msgstr "Не вдалося увімкнути знімання Canon EOS: можливо, немає фокусування?"
+msgstr "Не вдалося увімкнути знімання Canon EOS M: можливо, немає фокусування?"
 
-#: camlibs/ptp2/library.c:4493
-#, fuzzy
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
-msgstr "Помилка під час обробки повного відпускання Canon EOS"
+msgstr "Помилка під час обробки повного відпускання Canon EOS M"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Не вдалося виконати захоплення Canon EOS"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Не вдалося виконати захоплення Canon EOS: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 "Не вдалося увімкнути знімання Canon EOS: можливо, перевернуте зображення?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 "Не вдалося увімкнути знімання Canon EOS: можливо, на картці не залишилося "
 "вільного місця?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 "Не вдалося увімкнути знімання Canon EOS: можливо, запис на картку заборонено?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Механізм захоплення зображення Canon EOS не зміг здійснити спускання: "
 "невідома помилка %d, будь ласка, повідомте авторам програми."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr "Не вдалося ініціалізувати фотоапарат. Сповістіть про це."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Виробник: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Модель: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Версія: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Серійний номер: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Ідентифікатор розширення виробника: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Опис розширення виробника: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Версія стандарту PTP: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Режим роботи: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7950,20 +10228,32 @@
 "\n"
 "Формати захоплення: "
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Формати відображення: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+"\n"
+"Потоки:"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "Звук"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Підтримувані властивості об'єкта MTP:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " Помилка PTP %04x при запиті"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7971,87 +10261,87 @@
 "\n"
 "Можливості пристрою:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tЗавантаження файлів, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Видалення файлів, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Немає видалення файлів, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Відвантаження файлів\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Немає відвантаження файлів\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tЗагальне захоплення зображень, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tНемає захоплення зображень, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Відкрите захоплення, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Немає відкритого захоплення, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Захоплення Canon, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Захоплення EOS Canon, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Захоплення EOS Canon, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Захоплення Nikon 1, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "Захоплення Nikon 2, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "Захоплення Nikon 3, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Захоплення Sony, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr "XML-захоплення Olympus E, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Без залежного від виробника захоплення\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tПідтримка Nikon Wifi\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tПідтримка Canon Wifi\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8059,93 +10349,93 @@
 "\n"
 "Зведена інформація про накопичувачі:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tОпис накопичувача: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tМітка тому: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "Вбудована ROM"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "Змінна ROM"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "Вбудована RAM"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "Змінна RAM (картка пам'яті)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Невідомо: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tТип носія: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Загальний плоский"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Загальний ієрархічний"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Digital Camera Layout (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tТип Файлової системи: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "читання-запис"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Лише читання"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Лише читання з видаленням об'єктів'"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tДоступна ємність: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tМаксимальна ємність: %llu (%lu МБ)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tВільний простір (байтів): %llu (%lu МБ)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tВільний простір (зображень): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8153,47 +10443,47 @@
 "\n"
 "Інформація про властивості пристрою:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " не прочитано.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "не можна отримати.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "лише для читання"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "читання та запис"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " помилка %x у запиті."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Файл '%s/%s' не існує."
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Метадані підтримуються лише для пристроїв MTP."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
-msgstr "У пристрої не передбачено встановлення захисту об’єкта."
+msgstr "У пристрої не передбачено встановлення захисту об'єкта."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
-msgstr "Пристрою не вдалося встановити режим захисту об’єкта %d"
+msgstr "Пристрою не вдалося встановити режим захисту об'єкта %d"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8202,7 +10492,7 @@
 "У поточній версії PTP реалізовано лише для фотоапаратів з протоколами USB і "
 "PTP/IP, тип порту %x"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8210,2235 +10500,2312 @@
 "Підтримка згорнутого XML у Olympus у поточній версії доступна лише, якщо "
 "вбудовано підтримку libxml2."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "Невідома помилка PTP"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "Внутрішня помилка PTP"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "Сеанс PTP не відкритий"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "Неправильний ідентифікатор транзакції"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "Операція PTP не підтримується"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "Параметр PTP не підтримуються"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "неповна передача PTP"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP неправильний ідентифікатор сховища"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "Неправильний дескриптор об'єкта PTP"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "Властивість пристрою PTP не підтримується"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "Неправильний код формату об'єкта PTP"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "Сховище PTP переповнене"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "Об'єкт PTP захищений від запису"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "Сховище PTP лише для читання"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "Доступ до PTP заборонено"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "Мініатюра PTP відсутня"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "Помилка самотестування PTP"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "Часткове видалення PTP"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "Недоступне сховище PTP"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "Непідтримувана специфікація формату PTP"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "Відсутня правильна інформація про об'єкт PTP"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "Неправильний формат коду PTP"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "Невідомий код виробника PTP"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "Зйомку PTP вже перервано"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "Пристрій PTP зайнятий"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "Невідомий батьківський об'єкт PTP"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "Неправильний формат властивості пристрою PTP"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "Неправильне значення пристрою PTP"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "Неправильний параметр PTP"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "Сеанс PTP вже відкритий"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "Транзакцію PTP скасовано"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Непідтримувана специфікація цілі PTP"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+msgid "Invalid Enum Handle"
+msgstr "Некоректний дескриптор переліку"
+
+#: camlibs/ptp2/ptp.c:6114
+msgid "No Stream Enabled"
+msgstr "Немає увімкнених потоків"
+
+#: camlibs/ptp2/ptp.c:6115
+msgid "Invalid Data Set"
+msgstr "Некоректний набір даних"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Слід вказати назву файла"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Конфлікт назв файлів"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Некоректна назва файла"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Апаратна помилка"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Поза фокусом"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Помилка під час спроби змінити режим фотоапарата"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Некоректний стан"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Підтримки встановлення властивості не передбачено"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Помилка під час спроби відновити початковий баланс білого"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Помилка пошуку еталона пилу"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
-msgstr "Кнопка швидкості затвора"
+msgstr "Лампа швидкості затвора"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Послідовність віддзеркалення вгору"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Режим фотоапарата не коригує числа F"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Не у Liveview"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Кінець кроку мотора Mf"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Недостатність кроку мотора Mf"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Скасування розширеного передавання"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+msgid "No Full HD Present"
+msgstr "Немає режиму Full HD"
+
+#: camlibs/ptp2/ptp.c:6136
+msgid "Store Error"
+msgstr "Помилка зберігання"
+
+#: camlibs/ptp2/ptp.c:6137
+msgid "Store Unformatted"
+msgstr "Сховище даних не форматовано"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr "Кнопку спуску зайнято"
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr "Тихий спуск зайнято"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr "Спуск MovieFrame зайнято"
+
+#: camlibs/ptp2/ptp.c:6141
+msgid "Shutter Speed Time"
+msgstr "Час швидкості затвора"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr "Очікуємо на другий спуск"
+
+#: camlibs/ptp2/ptp.c:6143
+msgid "MirrorUpCapture Already Started"
+msgstr "MirrorUpCapture вже розпочато"
+
+#: camlibs/ptp2/ptp.c:6144
+msgid "Invalid SBAttribute Value"
+msgstr "Некоректне значення SBAttribute"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Невідома команда"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Відмовлено у виконанні дії"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
-msgstr "Об’єктив закрито кришкою"
+msgstr "Об'єктив закрито кришкою"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Низький рівень заряду"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Фотоапарат не готовий"
 
-#: camlibs/ptp2/ptp.c:4708
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr "Об'єктив закрито кришкою"
+
+#: camlibs/ptp2/ptp.c:6154
+msgid "Low Battery"
+msgstr "Низький заряд"
+
+#: camlibs/ptp2/ptp.c:6155
+msgid "Object Not Ready"
+msgstr "Об'єкт не готовий"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr "Не вдалося створити об'єкт"
+
+#: camlibs/ptp2/ptp.c:6157
+msgid "Memory Status Not Ready"
+msgstr "Стан пам'яті — неготова"
+
+#: camlibs/ptp2/ptp.c:6160
+msgid "Invalid ObjectPropCode"
+msgstr "Некоректний ObjectPropCode"
+
+#: camlibs/ptp2/ptp.c:6161
+msgid "Invalid ObjectProp Format"
+msgstr "Некоректний формат ObjectProp"
+
+#: camlibs/ptp2/ptp.c:6162
+msgid "Invalid ObjectProp Value"
+msgstr "Некоректне значення ObjectProp"
+
+#: camlibs/ptp2/ptp.c:6163
+msgid "Invalid ObjectReference"
+msgstr "Некоректне ObjectReference"
+
+#: camlibs/ptp2/ptp.c:6164
+msgid "Invalid Dataset"
+msgstr "Некоректний набір даних (Dataset)"
+
+#: camlibs/ptp2/ptp.c:6165
+msgid "Specification By Group Unsupported"
+msgstr "Підтримки специфікації за групою не передбачено"
+
+#: camlibs/ptp2/ptp.c:6166
+msgid "Specification By Depth Unsupported"
+msgstr "Підтримки специфікації за глибиною не передбачено"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr "Об'єкт є надто великим"
+
+#: camlibs/ptp2/ptp.c:6168
+msgid "ObjectProp Not Supported"
+msgstr "Підтримки ObjectProp не передбачено"
+
+#: camlibs/ptp2/ptp.c:6169
+msgid "Invalid Media Session ID"
+msgstr "Некоректний ідентифікатор мультимедійного сеансу"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr "Досягнуто обмеження мультимедійного сеансу"
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr "Дані завершено"
+
+#: camlibs/ptp2/ptp.c:6172
+msgid "Invalid WFC Syntax"
+msgstr "Некоректний синтаксис WFC"
+
+#: camlibs/ptp2/ptp.c:6173
+msgid "WFC Version Not Supported"
+msgstr "Підтримки версії WFC не передбачено"
+
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "Пристрій PTP зайнятий"
+msgstr "Немає пристрою PTP"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "Затримка PTP"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "Запит щодо скасування PTP"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "Мало бути надано відповідь PTP"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "Мало бути надано дані PTP"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "помилка введення-виведення PTP"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "Невизначена властивість PTP"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Режим функціонування"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Параметри стиснення"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Баланс білого"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Підсилення RGB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Час експозиції"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Режим програмованої експозиції"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Індекс експозиції (швидкість за ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Корекція експозиції"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Затримка перед знімком"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Контрастність"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Цифрове збільшення"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Кількість проміжків часу"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Інтервал між проміжками часу"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL закачування"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Інформація про авторські права"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Підтримувані потоки"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Увімкнені потоки"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Формат відео"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Роздільна здатність відео"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Якість відео"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Частота кадрів відео"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Контрастність відео"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Яскравість відео"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Формат звукових даних"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Бітова швидкість звуку"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Частота дискретизації звуку"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Кількість бітів на семпл для звуку"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Гучність звуку"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Формат штампу дати та часу"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Вивід відео"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Економія енергії"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Мова інтерфейсу"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Тип акумулятора"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Режим акумулятора"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "UILockType"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Режим фотоапарата"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Формат файлів перегляду у повному розмірі"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Власний час"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Режим затвора"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Режим зображення"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Параметр повільного затвора"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Режим АФ"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Стабілізація зображення"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Підсилення кольору"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Чутливість"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Набір параметрів"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "Пріоритет відкритої діафрагми"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "Максимум діафрагми"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
-msgstr "Фокусна відстань телеоб’єктива"
+msgstr "Фокусна відстань телеоб'єктива"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Широка фокусна відстань"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Знаменник фокусної відстані"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Режим передавання результатів зйомки"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Префікс назви"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Режим якості розміру"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Підтримуваний розмір мініатюр"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Розмір вихідних даних з фотоапарата"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Розмір вхідних для фотоапарата даних"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Версія віддаленого API"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Власник фотоапарата"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Час UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Ідентифікатор основи фотоапарата"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Показати значення діафрагми"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Максимум відкритої діафрагми"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Цифрове збільшення"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Розташування плями Ml"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Показати максимальне значення діафрагми"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Пріоритет максимуму діафрагми"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "Початкова позиція EZoom"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
-msgstr "Розмір EZoom для телеоб’єктива"
+msgstr "Розмір EZoom для телеоб'єктива"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Кількість спалахів"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Кут обертання"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Поворот сцени"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Режим імітації подій"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Тип показу слайдів"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Середні розміри файлів"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Ідентифікатор моделі"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr "Перемикач виправлено відео EOS"
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Сховище знімків"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Назва сховища знімків A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Назва сховища знімків B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Назва сховища знімків C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Назва сховища знімків D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Скинути банк 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Температура білого кольору"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Номер набору балансу білого"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Назва типового балансу білого 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Назва типового балансу білого 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Назва типового балансу білого 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Назва типового балансу білого 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Назва типового балансу білого 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Типове значення балансу білого 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Типове значення балансу білого 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Типове значення балансу білого 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Типове значення балансу білого 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Типове значення балансу білого 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Фокальна довжина об'єктива (Не CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Максимальна діафрагма об'єктива (без CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Автообрізання DX"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Назва банку A у меню"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Назва банку B у меню"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Назва банку C у меню"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Назва банку D у меню"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Скинути банк меню"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "Вмикання вертикального АФ"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Зона області фокусування"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Увімкнути додавання авторських прав"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Крок експонування ISO"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Крок експозиції"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Компенсація експозиції (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "область центру мас"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Матриця основи експонування"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Центр основи експонування"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Пляма основи експонування"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Область автофокусування Live View"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Автоматичний лічильник часу у вимкненому стані"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Затримка власного таймера"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Налаштування дати зображення"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Таймери автовимикання"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Рівень кута"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Швидкість затвора"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Режим затримки експонування"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Зменшення шумів при довгій експозиції"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Підсвічування РК-дисплея"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Потужне усування шуму ISO"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Підказки на екрані"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
-msgstr "Ім’я художника"
+msgstr "Ім'я художника"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Відомості щодо авторських прав"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Моделювання спалаху"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Ручний режим автовилки"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Автоматичний вибір вилки"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "Набір автовилки NIKON"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Режим спуску середньою кнопкою"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Режим відтворення середньою кнопкою"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Множинний вибір"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Відтворення інформації про фотографію"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Призначити кнопку функції"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Власні команди набору"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Параметри діафрагми"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Кнопки та набір"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Картка CF не відпущена"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Масштаб для центральної кнопки"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Функціональна кнопка 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "Вмикання звичайного АФ"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Очистити датчик зображення"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Рядок коментаря до зображення"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Вмикання коментаря до зображення"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Обертання зображення"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
-msgstr "Встановлення числа об’єктива вручну"
+msgstr "Встановлення числа об'єктива вручну"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Розмір екрана для відео"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Голос з відео"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Мікрофон відео"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Слот картки для відео"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Затримка вимикання монітора"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Автовилку увімкнено"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Крок автовилки експонування"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Програма автовилки експонування"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Кількість позицій автоекспонування «вилки»"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Крок вилки балансу білого"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Програма вилки балансу білого"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Ідентифікатор об'єктива"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
-msgstr "Сорт об’єктива"
+msgstr "Сорт об'єктива"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
-msgstr "Тип об’єктива"
+msgstr "Тип об'єктива"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Мінімальна фокусна відстань"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Максимальна фокусна відстань"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Макс. діафрагма при мін. фокусній відстані"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Макс. діафрагма при макс. фокусній відстані"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Дисплей видошукача ISO"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Автоматичне вимикання"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Меню автовимикання"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Дані щодо автовимикання"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Кількість знімків за таймером"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Керування віньєтуванням"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Час експозиції Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Стан попередження"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD верхній режим 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Активний сенсор АФ"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Лічильник експозиції"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Швидкість USB"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Серійний номер ПЗЗ"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Тип групи PTN"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Блокування числа F"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Блокування діафрагми експозиції"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Режим блокування TV"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "Параметр блокування AV"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Параметр освітлення"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Яскравість точки фокусування"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
-msgstr "Зовнішній спалах з’єднано з фотоапаратом"
+msgstr "Зовнішній спалах з'єднано з фотоапаратом"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Стан зовнішнього спалаху"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Тип зовнішнього спалаху"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Режим зовнішнього спалаху"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Зовнішня корекція експозиції"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "Ефект заповнення ЧБ"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "Чіткість ЧБ"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "Контрастність ЧБ"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "Тип параметра ЧБ"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Режим запису слоту 2"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Бітовий режим Raw"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+msgid "Fluorescent Type"
 msgstr "Тип флуоресцентного освітлення"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Коригування температури кольорів"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Набір коригування 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Набір коригування 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Набір коригування 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Набір коригування 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Набір коригування 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Режим автофокусування"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Допоміжна лампа АФ"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Автоматичні параметри ISO P/A/DVP "
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Відображення сітки у видошукачі"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Живлення керування режимом спалаху"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Авто FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Показ попереджень"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Стан акумуляторів"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Автоматичний верхній рівень ISO"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Висока неперервна швидкість"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Параметр інфодисплея"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Кнопка попереднього перегляду"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Кнопка попереднього перегляду 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "Кнопка блокування AEAF 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Дисплей індикатора"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Пріоритетність стану акумулятора"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Кадри і кроки «вилки»"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Режим Live View"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Режим мотора Live View"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Стан Live View"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Масштаб зображення Live View"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Умова заборони Live View"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Стан показу експонування"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Стан індикатора експонування"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Стан помилки інфодисплея"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Лампочка індикатора експонування"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Значення MRepeat спалаху"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Кількість MRepeat спалаху"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Інтервал MRepeat спалаху"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Активний запис Pic Ctrl"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Зміна запису Pic Ctrl"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+msgid "Camera Language"
+msgstr "Мова фотоапарата"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
+msgstr "Відпускання без картки SD"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Стискання зображення"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Безпечний час"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Сертифікат пристрою"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Дані щодо відкликання"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Партнер синхронізації"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Зрозуміла назва пристрою"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Рівень звуку"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Значок пристрою"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Дані щодо ініціатора сеансу"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Видимий тип пристрою"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Частота відтворення"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Об'єкт відтворення"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Індекс контейнера відтворення"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Положення відтворення"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "Ід. PlaysForSure"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Якість"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Режим спуску"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Області фокусування"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Блокування AE"
+#: camlibs/ptp2/ptp.c:7326
+msgid "Focus Point"
+msgstr "Точка фокусування"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Розмір зображення"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Швидкість затвора"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Кольорова температура"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "Стан фокусування"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
-msgstr "Об’єкти у пам'яті"
+msgstr "Об'єкти у пам'яті"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Індекс експозиції"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "AB-фільтр"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Нерухоме зображення"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr "Близько-далеко"
+
+#: camlibs/ptp2/ptp.c:7567
+msgid "AF Area Position"
+msgstr "Позиція області АФ"
+
+#: camlibs/ptp2/ptp.c:7568
+msgid "Date Time"
+msgstr "Дата і час"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f зупинок"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "Звичайний JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + основний JPEG"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Лампа накалювання"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Ручний фокус"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Автоматично режим макро (зблизька)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Середнє відносно центру"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Центральна точка"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Автоматичний спалах"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Автозменшення червоності очей"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Спалах з запобіганням червоним очам"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Потужний вітер"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Таймер + віддалене керування"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Лише блокування АФ"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Блокування спалаху"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Повернути точку фокусування на центр"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Підсвічувати активну точку фокусування"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Не використовується"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRam"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "Підсвічування РК-екрана"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "Підсвічування РК-екрана та інфодисплей"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 хвилина"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 хвилин"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 хвилин"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 хвилин"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Темне на світлому"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Світле на темному"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Літій-іонний"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Нікелевий гібридний"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Нікель-кадмієвий"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Лужно-марганцевий"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Рівень попередження 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Критичний стан"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Рівень попередження 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Економний друк"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Дуже якісний"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Придушення ефекту червоних очей"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Низькошвидкісна синхронізація"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Авто + придушення ефекту червоних очей"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Увімкнено + придушення ефекту червоних очей"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "На відстані"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Високошвидкісний затвор"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Низькошвидкісний затвор"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Нічне бачення"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Тони сірого"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Панорамне фокусування"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Однокадрове знімання"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Неперервне знімання"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Знімок за таймером"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Неперервне низькошвидкісне знімання"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Неперервне високошвидкісне знімання"
 
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Згладити"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Центрально-зважене вимірювання"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Точкове вимірювання"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Середнє вимірювання"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Оціночне вимірювання"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Часткове вимірювання"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Центрально-зважене осереднене вимінювання"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Вимірювання на основі меж автофокусування"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Вимірювання за мультиплямами"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Функція повільного затвора недоступна"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Низька 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Висока 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Вища 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Вища 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Стандартні параметри для розробників"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Параметри для розробників 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Параметри для розробників 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Параметри для розробників 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MlSpotPosCenter"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MlSpotPosAfLink"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Media Card"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Media Card Group"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Мікропрограма"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Формат зображень Windows"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Невизначений звуковий"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Кодек Audible.com"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Список відтворення Samsung"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Невизначений відео"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Невизначена колекція"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Абстрактний мультимедійний альбом"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Абстрактний альбом зображень"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Абстрактний звуковий альбом"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Абстрактний відеоальбом"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Абстрактний аудіо-відео список відтворення"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Абстрактна група контактів"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Абстрактний тека повідомлень"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Абстрактний продукт з главами"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Абстрактний звуковий список відтворення"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Абстрактний список відтворення відео"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Абстрактна медіатрансляція"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "Список відтворення WPL"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "Список відтворення M3U"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "Список відтворення MPL"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "Список відтворення ASX"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "Список відтворення PLS"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Невизначений документ"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Абстрактний документ"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Документ XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Документ Microsoft Word"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "Компільований до MHT документ HTML"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Електронні таблиці Microsoft Excel (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Microsoft Powerpoint (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Невизначене повідомлення"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Абстрактне повідомлення"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Невизначений контакт"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Абстрактний контакт"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Невизначений пункт календаря"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Абстрактний пункт календаря"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Невизначений виконуваний файл Windows"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Медіатрансляція"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Розділ"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Невідомо(%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Отримати дані щодо пристрою"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Відкрити сеанс"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Закрити сеанс"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Отримати ID носія"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Отримати інформацію про носій"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Отримати кількість об'єктів"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Отримати дескриптори об'єктів'"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Отримати інформацію про об'єкт"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Отримати об'єкт"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Отримання мініатюру"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Видалити об'єкт"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Надіслати інформацію про об'єкт"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Надіслати об'єкт"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Ініціалізувати захоплення"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Форматувати носій"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Скинути пристрій"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Самотестування пристрою"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Встановити захист об'єкта"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Вимкнути живлення пристрою"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Отримати опис властивості пристрою"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Отримати значення властивості пристрою"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Встановити значення властивості пристрою"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Скинути значення властивості пристрою"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Припинити відкрите захоплення"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Перемістити об'єкт"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Копіювати об'єкт'"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Отримати частковий об'єкт"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Ініціювати відкрите захоплення"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Почати нумерацію елементів керування"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Нумерація елементів керування"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Припинити нумерацію елементів керування"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Отримати карти розширень виробника"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Отримати дані щодо виробника пристрою"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
-msgstr "Отримати об’єкт зображення зі зміненими розмірами"
+msgstr "Отримати об'єкт зображення зі зміненими розмірами"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Отримати маніфест файлової системи"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Отримати дані щодо потоку даних"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Отримати потік даних"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Отримати підтримувані властивості об'єкта'"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Отримати опис властивості об'єкта"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Отримати значення властивості об'єкта"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Встановити значення властивості об'єкта"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Отримати список властивостей об'єкта"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Встановити список властивостей об'єкта"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Отримати незалежний опис властивості"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Надіслати список властивостей об'єкта"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Отримати посилання на об'єкт"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Встановити посилання на об'єкт"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Оновити мікропрограму пристрою"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Пропустити наступну позицію у списку відтворення"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Отримати безпечний виклик часу"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Отримати безпечну відповідь часу"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Встановити відповідь щодо ліцензії"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Отримати синхронний список"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Надіслати запит лічильнику викликів"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Отримати виклик лічильника"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Отримати відповідь лічильника"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Очистити носій даних"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Отримати статус ліцензії"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Надіслати команду WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Надіслати запит WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Повідомляти про додані і вилучені записи"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Повідомляти про створені записи"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Отримати типи придатних до передавання списків відтворення"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Надіслати запит щодо WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Отримати відповідь WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Увімкнути довірені дії з файлами"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Вимкнути довірені дії з файлами"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Завершити довірений сеанс роботи з програмою"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Відрити сеанс"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Закрити сеанс"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Отримати наступний блок даних"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Встановити поточну мітку часу"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Надіслати запит щодо реєстрації"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Отримати відповідь щодо реєстрації"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Отримувати виклик наближення"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Надіслати відповідь щодо близькості"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Надіслати запити щодо ліцензування WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Отримати відповідь щодо ліцензування WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
-msgstr "Обробити об’єкт WFC"
+msgstr "Обробити об'єкт WFC"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
-msgstr "Отримати частковий об’єкт (з відступом у 64 бітів)"
+msgstr "Отримати частковий об'єкт (з відступом у 64 бітів)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
-msgstr "Надіслати частковий об’єкт"
+msgstr "Надіслати частковий об'єкт"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
-msgstr "Обрізати об’єкт"
+msgstr "Обрізати об'єкт"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
-msgstr "Початок редагування об’єкта"
+msgstr "Початок редагування об'єкта"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
-msgstr "Кінець редагування об’єкта"
+msgstr "Кінець редагування об'єкта"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Невідоме PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Невідоме VendorExtensionID"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Невідоме значення"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Копіюється відео..."
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Копіюється звук..."
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Копіюються дані EXIF..."
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Немає даних EXIF для %s"
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Не вдалося видалити файл."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Не вдалося видалити каталог."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Не вдалося створити каталог."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Версія: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Стан RTC: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Час фотоапарата: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "ID фотоапарата: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Не вставлена картка SD.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "ID картки SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Фотознімків на фотоапараті: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Пам'ять SD: всього %d Мб , вільно %d Мб.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Внутрішня пам'ять SD: всього %d Мб , вільно %d Мб.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10450,7 +12817,7 @@
 "Дослідження протоколу проведено з використанням USB Snoopy,\n"
 "декомпіляції мікропрограми та інтуїції.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10462,12 +12829,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "на основі драйвера от Bob Paauwe\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "невідомо (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10476,184 +12843,184 @@
 "Модель: %s\n"
 "Пам'ять: %d байт з %d доступних"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "На вулиці"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Максимальний"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Мінімальний"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Текст"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Звук"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Зображення та звук"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Текст та звук"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Налаштовування"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Загальне"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Авторське право (макс. 20 символів)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Зображення"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Рівень білого"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Режим запису"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Стиснення"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Швидкість %i не підтримується!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Очікувалось  %i, отримано %i. Повідомте про цю помилку за адресою %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Очікувалось %i байтів, отримано %i. Повідомте про цю помилку за адресою %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Очікувалось 0x%x, отримано 0x%x. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Неправильні символи (0x%x, 0x%x). Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Фотоапарат зайнятий. Якщо ця проблема виникає постійно, зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Тайм-аут навіть після 2 спроб. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Помилка зв'язку навіть після 2 спроб. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Фотоапарат у неправильному режимі. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Фотоапарат не приймає параметри. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Невідома помилка. Зв'яжіться з %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -10661,7 +13028,7 @@
 "Довжина назви файла не повинна перевищувати 12 символів ('%s' має %i "
 "символів)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10673,108 +13040,108 @@
 "gphoto2. Marcus Meissner <marcus@jet.franken.de> виправляв помилки та вносив "
 "вдосконалення."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Роздільна здатність та розмір"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Дата й час (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Параметри діафрагми"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Режим кольору"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Запобігання червоним очам"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Параметри спалаху"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
-msgstr "Час до переходу у сплячий режим (з'єднаний з комп’ютером) (секунд)"
+msgstr "Час до переходу у сплячий режим (з'єднаний з комп'ютером) (секунд)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Час до переходу фотоапарата у сплячий режим (секунд)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Режим об'єктива"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Корейська"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Англійська"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Французька"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Німецька"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Італійська"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Японська"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Параметри зображення"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10794,227 +13161,223 @@
 "  PhotoPC 3000z, якщо ваш апарат працює інакше, напишіть\n"
 "  про це у список розсилки для розробників gphoto (англійською)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Відсутня картка пам'яті"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Не вдалося отримати дані про ємність акумулятора"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr ""
 "Заряд акумулятора фотоапарата надто низький (%d%%). Операцію скасовано."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Не вдалося отримати інформацію про доступну пам'ять"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Фотоапарат 3 рази відмовляється відкрити з'єднання."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Отримано перший байт (0x%x), який є неправильним."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr "Тайм-аут при передачі пакету, навіть після %i спроб. Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Не вдалося передати пакет, навіть після кількох спроб."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Пакет відхилено фотоапаратом. Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Не вдалося передати пакет (код помилки %i). Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Тайм-аут передачі навіть після 2 спроб. "
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Отримано неочікуваний результат 0x%x. Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Отримано неочікувану відповідь (%i). Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Не вдалося отримати регістр %i. Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Надто багато спроб закінчились помилкою."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Передача даних..."
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "рекурсивні виклики не підтримуються драйвером фотоапарата! Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Не вдалося отримати рядок регістру %i. Зв'яжіться з %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Очікувалось 32 байти, отримано %i. Зв'яжіться з %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Швидкість затвора у мікросекундах (0 автоматично)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Швидкість затвора (у секундах)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Ч/Б"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Проти червоних очей"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Уповільнена синхронізація"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Контраст+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Контраст-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Яскравість+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Яскравість-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Коригування зображення"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Блимання"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Світлодіод"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Нескінченість"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Попередній перегляд мініатюр"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Наступний"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Попередній"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Режим роботи"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Яскравість РК-екрана"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Автоматичне вимикання РК (секунд)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Центрально-зважений"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Матриця"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Точковий автофокус"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Замір експозиції"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Наближення (в міліметрах)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "немає"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Фіксація експозиції"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Риб'яче око"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Ширококутовий"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Інші параметри експозиції/об'єктива"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Запам'ятовування значень витримки"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11044,7 +13407,7 @@
 "        Переведіть апарат у режим 'M', якщо хочете\n"
 "        задати швидкість затвора.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11063,67 +13426,63 @@
 "\n"
 "    Копіювання знімків має працювати правильно.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Біла дошка"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Чорна дошка"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Колір або режим роботи"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Повільно"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Заповнення проти червоних очей"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Флуоресцентна-1-дім-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Флуоресцентна-2-стільн-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Флуоресцентна-3-офіс-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Сутінки"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Монітор"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Режим РК-екрана"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Цифрове збільшення"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Позиція фокусування"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Формат часу"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11156,10 +13515,10 @@
 "    або 'Normal', не забудьте повернути його назад у 'Off'\n"
 "    перед вимиканням. У іншому випадку ви не зможете\n"
 "    використовувати кнопки фотоапарата. Якщо це станеться,\n"
-"    треба знову з’єднати фотоапарат з комп'ютером\n"
+"    треба знову з'єднати фотоапарат з комп'ютером\n"
 "    і перемикнути параметр LCD у 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11177,19 +13536,19 @@
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ має режим керування через USB.\n"
 "    Щоб перемкнутися у режим керування за допомогою USB\n"
-"    з комп’ютера, увімкніть фотоапарат, відкрийте кришку\n"
+"    з комп'ютера, увімкніть фотоапарат, відкрийте кришку\n"
 "    відсіку карти пам'яті, потім натисніть і утримуйте\n"
 "    кнопки «OK» і «quickview», доки не з'явиться\n"
 "    меню керування. Перемкніть фотоапарат у режим\n"
 "    керування (control).\n"
 "(2) Якщо ви зміните значення пункту «Режим РК-екрана» на\n"
 "    «Монітор» або «Звичайний», не забудьте перемкнути його\n"
-"    на «Вимкнути» до від’єднання фотоапарата, інакше ви не\n"
+"    на «Вимкнути» до від'єднання фотоапарата, інакше ви не\n"
 "    зможете використовувати кнопки фотоапарата. Якщо таке\n"
-"    все ж станеться, треба знову з’єднати апарат з\n"
+"    все ж станеться, треба знову з'єднати апарат з\n"
 "    комп'ютером і перемкнути параметр у значення «Вимкнути»."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11219,105 +13578,110 @@
 "    усіх наявних параметрів, напишіть у список\n"
 "    розсилки для розробників.\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (невідомо)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Файл, який буде відвантажуватись має нульову довжину"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Недостатньо пам'яті на карті пам'яті"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Не вдалося отримати назву теки, що містить зображення"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Відвантаження підтримується лише у теку '%s'"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Найкраще"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (невідомо)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Швидкість затвора (мікросекунд, 0 автоматично)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Чорно/білий"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Біла дошка"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Чорна дошка"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Яскравість/контраст"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Яскравість+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Яскравість-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Денне світло"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Нескінченість/Риб'яче око"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Точковий режим виміру"
 
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Автоматичне вимикання (комп'ютер) (у секундах)"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -11325,12 +13689,12 @@
 "Скільки часу мине до автоматичного вимикання фотоапарата, коли він з'єднаний "
 "з комп'ютером?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Автовимикання (автономно) (у секундах)"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -11338,114 +13702,114 @@
 "Скільки часу мине до автоматичного вимикання фотоапарата, коли він не "
 "з'єднаний з комп'ютером?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Автовимикання (у секундах)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Параметри отримання знімків"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "стандартний"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "Високої якості"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "колір"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "чорно-білий"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Зауваження: немає картки пам'яті, деякі значення можуть бути некоректними\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Модель фотоапарата: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Серійний номер: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Версія прошивки: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Знято кадрів: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Лишилось кадрів: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Робота від акумулятора: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Залишилось пам'яті: %i байтів\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Дата: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Посібник користувача фотоапарата недоступний.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11466,7 +13830,7 @@
 "  PhotoPC 3000z. Якщо ваш апарат працює інакше, напишіть,\n"
 "  за адресою %s (англійською)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11499,10 +13863,10 @@
 "    або 'Normal', не забудьте повернути його назад у 'Off'\n"
 "    перед вимиканням. У іншому випадку ви не зможете\n"
 "    використовувати кнопки фотоапарата. Якщо це станеться,\n"
-"    треба знову з’єднати фотоапарат з комп'ютером\n"
+"    треба знову з'єднати фотоапарат з комп'ютером\n"
 "    і перемикнути параметр LCD у 'Off'."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11522,12 +13886,7 @@
 "за наданий Olympus C-3030Z для реалізації\n"
 "підтримки USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (невідомо)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11537,11 +13896,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Не вдалося застосувати параметри USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11549,7 +13908,7 @@
 msgstr ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
-"Драйвер доступу до веб-камери SiPix Web2."
+"Драйвер доступу до вебкамери SiPix Web2."
 
 #: camlibs/smal/smal.c:165
 msgid ""
@@ -11561,7 +13920,7 @@
 "Lee Benfield <lee@benf.org>\n"
 "Драйвер доступу до апарату Smal Ultrapocket та його OEM-варіантам (slimshot)"
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11579,7 +13938,7 @@
 "Фотоапарат Sonix.\n"
 "Містить %i знімків. \n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11606,7 +13965,7 @@
 "Мініатюри для AVI-файлів створюються на основі першого кадру ролика.\n"
 "Окреме зображення не можна вилучати, якщо воно не є останнім.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11614,7 +13973,7 @@
 "Бібліотека для фотоапарата Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11628,7 +13987,7 @@
 "Кен-Ичи Хайяши\n"
 "перенос у Gphoto2 виконав Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11640,7 +13999,7 @@
 "Початково написана Mark Davies <mdavies@dial.pipex.com>\n"
 "Адаптація до gPhoto2 - Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11653,12 +14012,12 @@
 "Всього пам'яті:  %iкб\n"
 "Вільної пам'яті: %iкб\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Версія мікропрограми: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11666,7 +14025,7 @@
 "Драйвер Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11675,7 +14034,7 @@
 "ППЗУ:\n"
 " Файлів: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11692,7 +14051,7 @@
 "Зайнято: %8d\n"
 "Вільно: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "бібліотека spca50x v"
 
@@ -11757,12 +14116,12 @@
 "Базовий драйвер sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Вашу картинну рамку USB засновано на наборі мікросхем ST2205\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11773,7 +14132,7 @@
 "таких пристроїв ви зможете звантажувати, вивантажувати і вилучати\n"
 "файли з картинної рамки."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11785,11 +14144,7 @@
 "За допомогою цього драйвера можна отримувати, вивантажувати та\n"
 "вилучати файли з картинної рамки."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Орієнтація"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11801,111 +14156,111 @@
 "Драйвер для фотоапаратів з процесором STV0674.\n"
 "Для дослідження протоколу використовувався SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Неправильна експозиція (можливо бракує освітлення)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Інформація про фотоапарат типу STV0680:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Версія мікропрограми: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Версія ASIC: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "ID сенсора: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr ""
 "Фотоапарат налаштовано на пульсування джерела світла з частотою %d Гц.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Пам'яті у фотоапараті: %d Мбіт.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Фотоапарат не підтримує мініатюри.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Фотоапарат підтримує відео.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Знімки фотоапарата монохромні.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Фотоапарат має пам'ять.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Фотоапарат підтримує відеоформати:"
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "ID виробника: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "ID продукту: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Кількість зображень: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Максимальна кількість зображень: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Ширина зображення: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Висота зображення: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Розмір зображення: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Ширина мініатюри: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Висота мініатюри: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Розмір мініатюри: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11921,12 +14276,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Розширено для Aiptek PenCam та інших USB фотоапаратів STM з двома режимами."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Отримання інформації про %i файлів"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11939,19 +14294,19 @@
 "Повідомлення про помилки та відгуки надсилайте за адресою:\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z лише для USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Параметри драйвера"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Турбо-режим"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11963,12 +14318,12 @@
 "Бібліотека для отримання і вивантаження файлів на Topfield PVR.\n"
 "Портовано з puppy, (c) Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Звантаження %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -11978,39 +14333,67 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Драйвер Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Вашу картинну рамку USB засновано на наборі мікросхем TP6801\n"
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Засновані на TP6801 картинні рамки можуть працювати у широкому\n"
+"спектрі роздільних здатностей. За допомогою драйвера gphoto для\n"
+"таких пристроїв ви зможете звантажувати, вивантажувати і вилучати\n"
+"файли з картинної рамки."
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Драйвер картинних рамок TP6801 USB\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"За допомогою цього драйвера можна отримувати, вивантажувати та\n"
+"вилучати файли з картинної рамки."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "Внутрішня помилка пошуку camlibs. (назви шляхів надто довгі?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Завантажуються драйвери фотоапарата з '%s'..."
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Помилка у бібліотеці вводу-виводу ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Фотоапарат не виявлено"
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Не вдалося виявити фотоапаратів на порту %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Перед ініціалізацією фотоапарата слід встановити порт."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Не вдалося завантажити драйвер фотоапарата '%s' (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "У драйвері фотоапарата '%s' відсутня функція 'camera_init'."
@@ -12048,12 +14431,12 @@
 msgid "This camera can not capture previews."
 msgstr "Фотоапарат не підтримує попереднє захоплення."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Шлях \"%s\" не є абсолютним."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12062,23 +14445,23 @@
 "Ви намагаєтесь видалити '%s' з теки '%s', але файлова система не підтримує "
 "видалення файлів."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "У теці, яку ви намагаєтеся вилучити, %s/%s, містяться підтеки."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr ""
 "У теці, яку ви намагаєтесь вилучити, «%s/%s», ще зберігаються якісь файли."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Файлова система не підтримує закачування файлів."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
@@ -12086,100 +14469,170 @@
 "У теці %s зберігається лише %i файлів, вм ж надіслали запит щодо файл з "
 "номером %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Не вдалося знайти файл '%s' у теці '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Не вдалося знайти файл '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Файлова система не підтримує отримання файлів"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Невідомий тип файла %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Файлова система не підтримує отриманні відомостей про файл"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Файлова система не підтримує встановлення інформації про файл"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Не можна змінювати атрибути, такі як ширина та висота"
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr ""
 "Файловою системою не передбачено отримання даних щодо параметрів сховища "
 "даних"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Дані пошкоджені"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Файл існує"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Невідома модель"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Каталог не знайдено"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Каталог існує"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Виконується операція вводу-виводу"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Шлях не є абсолютним"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Фотоапарат не може скасувати операцію"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Помилка ОС при зв'язку з фотоапаратом"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Недостатньо вільного місця"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Невідома помилка драйвера фотоапарата"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "Багатокадрове вилучення шумів %d"
+
+#~ msgid "Movie recording cannot start: Camera is not in application mode."
+#~ msgstr ""
+#~ "Не вдалося розпочати запис відео: камера працює не у режимі програми."
+
+#~ msgid "Movie recording cannot start: Set liveview selector is enabled."
+#~ msgstr ""
+#~ "Не вдалося розпочати запис відео: увімкнено встановлення вибору "
+#~ "інтерактивного перегляду."
+
+#~ msgid "Movie recording cannot start: In enlarged liveview."
+#~ msgstr ""
+#~ "Не вдалося розпочати запис відео: перебуваємо у режимі збільшеного "
+#~ "інтерактивного перегляду."
+
+#~ msgid "Movie recording cannot start: Card protected."
+#~ msgstr "Не вдалося розпочати запис відео: картку захищено."
+
+#~ msgid "Movie recording cannot start: Already in movie recording."
+#~ msgstr "Не вдалося розпочати запис відео: вже виконуємо запис відео."
+
+#~ msgid ""
+#~ "Movie recording cannot start: Images / movies not yet record in buffer."
+#~ msgstr ""
+#~ "Не вдалося розпочати запис відео: у буфері ще немає зображень або відео."
+
+#~ msgid "Movie recording cannot start: Card full."
+#~ msgstr "Не вдалося розпочати запис відео: картку переповнено."
+
+#~ msgid "Movie recording cannot start: Card not formatted."
+#~ msgstr "Не вдалося розпочати запис відео: картку не форматовано."
+
+#~ msgid "Movie recording cannot start: Card error."
+#~ msgstr "Не вдалося розпочати запис відео: помилка картки."
+
+#~ msgid "Unknown value %04d"
+#~ msgstr "Невідоме значення %04d"
+
+#~ msgid "Custom WB 2"
+#~ msgstr "Нетиповий ББ 2"
+
+#~ msgid "Custom WB 3"
+#~ msgstr "Нетиповий ББ 3"
+
+#~ msgid "Custom WB 4"
+#~ msgstr "Нетиповий ББ 4"
+
+#~ msgid "Custom WB 5"
+#~ msgstr "Нетиповий ББ 5"
+
+#~ msgid "Unknown Event"
+#~ msgstr "Невідома подія"
+
+#~ msgid "Now value is not in enumeration."
+#~ msgstr "Тепер значення немає у переліку."
+
+#~ msgid "Setting 4"
+#~ msgstr "Набір параметрів 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Набір параметрів 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Набір параметрів 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Набір параметрів 7"
+
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x"
 #~ msgstr "Не вдалося увімкнути знімання Canon EOS: 0x%x"
 
@@ -12375,9 +14828,6 @@
 #~ msgid "PTP: EK Filename Invalid"
 #~ msgstr "PTP: неправильна назва файлу EK"
 
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP: помилка вводу-виводу"
-
 #~ msgid "PTP: Error: bad parameter"
 #~ msgstr "PTP: помилка: неправильний параметр"
 
@@ -12419,8 +14869,8 @@
 #~ "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, "
 #~ "\"%s\""
 #~ msgstr ""
-#~ "canon_usb_poll_interrupt_multiple: читання перервано після %i спроб, \"%s"
-#~ "\""
+#~ "canon_usb_poll_interrupt_multiple: читання перервано після %i спроб, "
+#~ "\"%s\""
 
 #~ msgid ""
 #~ "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/vi.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/vi.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/vi.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/vi.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.5.13\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
 "PO-Revision-Date: 2017-04-11 08:22+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
@@ -40,12 +40,12 @@
 "Có vẻ là máy ảnh không sử dụng đĩa CompactFlash.\n"
 "Không may là phần mềm này hiện tại không hỗ trợ nó tại thời điểm này :-(\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr "Máy đã chụp %d ảnh, và đang dùng bộ nhớ CompactFlash.\n"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -78,12 +78,12 @@
 "Trình điều khiển đa dụng Aox\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr "Khung ảnh USB của bạn có một bộ chíp điều khiển AX203\n"
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -93,7 +93,7 @@
 "Trình điều khiển gphoto dành cho thiết bị này cho phép bạn\n"
 "tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -105,16 +105,18 @@
 "Trình điều khiển này cho phép bạn\n"
 "tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
 
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 msgid "Picture Frame Configuration"
 msgstr "Cấu hình khung ảnh"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr "Đồng bộ hóa ngày giờ khung với máy tính"
 
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -123,7 +125,7 @@
 "Số lượng ảnh: %i\n"
 "Phiên bản Firmware: %s"
 
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -147,26 +149,26 @@
 "Thực hiện dùng các tài liệu trên Web.\n"
 "Vision cho phép."
 
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Không thể tạo thư mục %s."
 
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Không thể gỡ bỏ thư mục %s."
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr "gặp lỗi khi khóa các khóa."
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*KHÔNG HIỂU*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -175,7 +177,7 @@
 "canon_int_capture_image: tiến trình canon_usb_list_all_dirs() (liêt kê mọi "
 "thư mục) đầu tiên đã thất bại với trạng thái %li"
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -184,17 +186,17 @@
 "canon_int_capture_image: tiến trình canon_usb_list_all_dirs() (liêt kê mọi "
 "thư mục) cuối cùng đã thất bại với trạng thái %i"
 
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Tên “%s” (%li ký tự) quá dài, chỉ cho phép tối đa 30 ký tự."
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Không cho phép chữ thường trong %s."
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -202,7 +204,7 @@
 "canon_int_list_directory: LỖI: thông điệp đầu tiên quá ngắn (%i < tối thiểu "
 "%i)"
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -210,15 +212,15 @@
 "canon_int_list_directory: Tới kết thúc gói trong khi kiểm tra mục tin thư "
 "mục thứ nhất"
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: gặp mục tin thư mục bị cắt ngắn"
 
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "Tập tin đã bảo vệ."
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
@@ -226,11 +228,11 @@
 "canon_int_get_info_func: LỖI: thông điệp khởi tạo quá ngắn (%i < tối thiểu "
 "%i)"
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Không thể trích ảnh mẫu JPEG từ dữ liệu: không có đầu/cuối"
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Không thể trích ảnh mẫu JPEG từ dữ liệu: dữ liệu không phải JFIF"
 
@@ -239,7 +241,7 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Tham số không có giá trị “%s” trong %s dòng %i"
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
@@ -247,17 +249,17 @@
 "Tiến trình này không biết cách xử lý giá trị máy_ảnh->cổng->kiểu %i cũng "
 "được biết như là 0x%x trong %s dòng %i."
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr "LỖI NGHIÊM TRỌNG: không rõ giá trị CRC đầu tiên cho độ dài %d\n"
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr "không thể đoán giá trị CRC đầu tiên\n"
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -266,290 +268,301 @@
 "cảnh báo: chưa kiểm CRC (thêm độ dài %d, giá trị 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "Chế độ Tương thích"
 
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "Ảnh thu nhỏ"
 
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 msgid "Full Image"
 msgstr "Ảnh đầy đủ"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr "Bóng đèn dây tóc"
 
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 msgid "Auto focus: one-shot"
 msgstr "Tự động lấy nét: chụp một"
 
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 msgid "Auto focus: AI servo"
 msgstr "Tự động lấy nét: động cơ se-vô AI"
 
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 msgid "Auto focus: AI focus"
 msgstr "Tự động lấy nét: lấy nét AI"
 
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 msgid "Manual focus"
 msgstr "Lấy nét bằng tay"
 
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 msgid "Beep off"
 msgstr "Tắt bíp"
 
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 msgid "Beep on"
 msgstr "Bật bíp"
 
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 msgid "Flash off"
 msgstr "Tắt Đèn nháy"
 
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 msgid "Flash on"
 msgstr "Bật Đèn nháy"
 
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 msgid "Flash auto"
 msgstr "Đèn nháy ở chế độ tự động"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr "TỰ_ĐỘNG"
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr "P"
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr "Tv"
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr "Av"
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr "M"
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 msgid "Manual 2"
 msgstr "Bằng tay 2"
 
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 msgid "Far scene"
 msgstr "Cảnh ở xa"
 
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 msgid "Fast shutter"
 msgstr "Chập nhanh"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr "Chập chậm"
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr "Cảnh đêm"
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
 msgstr "Mức xám"
 
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "Kiểu nâu đen"
 
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 msgid "Portrait"
 msgstr "Chân dung"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr "Chấm"
 
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "Macro"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr "ĐTr"
 
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 msgid "PanFocus"
 msgstr "Tiêu điểm kéo ngang"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr "Sặc sỡ"
 
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 msgid "Neutral"
 msgstr "Trung lập"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 msgid "Long shutter"
 msgstr "Chập dài"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr "Siêu macro"
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr "Hoa lá"
 
-#: camlibs/canon/library.c:284
+#: camlibs/canon/library.c:268
 msgid "Indoor"
 msgstr "Trong nhà"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
 msgstr "Pháo hoa"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
 msgstr "Biển"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
 msgstr "Dưới nước"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
 msgstr "Tuyết"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
 msgstr "Trẻ em và động vật"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr "Chụp ảnh trong đêm"
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 msgid "Digital macro"
 msgstr "Chụp macro kỹ thuật số"
 
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 msgid "MyColors"
 msgstr "MàuMình"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr "Ảnh chụp trong phim"
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr "RAW 2"
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr "JPEG chuẩn nhỏ"
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr "JPEG Tốt nhỏ"
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr "JPEG chuẩn vừa"
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr "JPEG Tốt vừa"
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr "JPEG chuẩn lớn"
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr "JPEG Tốt lớn"
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr "RAW + JPEG chuẩn nhỏ"
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr "RAW + JPEG Tốt nhỏ"
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr "RAW + JPEG chuẩn vừa"
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr "RAW + JPEG Tốt vừa"
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr "RAW + JPEG chuẩn lớn"
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr "RAW + JPEG Tốt lớn"
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -579,44 +592,44 @@
 "Nếu bạn gặp nhiều lỗi truyền nối tiếp, hãy giữ máy tính càng nghỉ càng\n"
 "có thể (tức là đĩa không hoạt động).\n"
 
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Máy ảnh không sẵn sàng: %s"
 
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "Đang tắt máy ảnh"
 
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "Gặp lỗi khi chụp ảnh"
 
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Không thể lấy tên đĩa: %s"
 
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "Không có lý do"
 
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Không thể lấy thông tin về đĩa: %s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "lỗi nội bộ #1 trong hàm lấy tập tin get_file_func() (%s dòng %i)"
 
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Không tìm thấy tập tin âm thanh cho %s"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -627,35 +640,35 @@
 "  %11s byte tổng\n"
 "  %11s byte sẵn còn có thể sử dụng"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "Bộ chuyển đổi nguồn điện xoay chiều"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "dùng pin"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "nguồn điện tốt"
 
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "nguồn điện hỏng"
 
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "không sẵn sàng: %s"
 
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (thời gian máy chủ %s%i giây)"
 
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +695,7 @@
 "\n"
 "Thời gian: %s\n"
 
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -704,24 +717,24 @@
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "Gặp lỗi khi xóa tập tin"
 
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "Gặp lỗi khi xóa ảnh mẫu liên quan"
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Không hỗ trợ tốc độ hơn 57600 bps để tải lên máy ảnh"
 
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "Không thể lấy chữ đĩa cực nhanh"
 
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -729,375 +742,397 @@
 "Không thể tải lên, không có tên thư mục còn trống.\n"
 "Tên thư mục 999CANON tồn tại và chứa một ảnh AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "Không thể tạo thư mục \\DCIM."
 
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "Không thể tạo thư mục đích."
 
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "Cấu hình máy ảnh và trình điều khiển"
 
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "Cài đặt máy ảnh"
 
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "Tên Chủ sở hữu"
 
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 msgid "Capture Size Class"
 msgstr "Lớp kích cỡ Chụp"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "Tốc độ ISO"
 
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
 #, c-format
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 msgid "Shooting mode"
 msgstr "Chế độ chụp"
 
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
 msgstr "Tốc độ màn trập"
 
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "Thu phóng"
 
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "Khẩu độ"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "Bù Phơi sáng"
 
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 msgid "Image Format"
 msgstr "Định dạng Ảnh"
 
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "Chế độ Lấy nét"
 
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "Chế độ Đèn nháy"
 
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "Bíp"
 
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 msgid "Camera Actions"
 msgstr "Hành vi Máy ảnh"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr "Đồng bộ hóa ngày giờ máy ảnh với máy tính"
 
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 msgid "Camera Status Information"
 msgstr "Thông tin Trạng thái Máy ảnh"
 
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 msgid "Camera Model"
 msgstr "Mô hình Máy ảnh"
 
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "Ngày và Giờ"
 
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "Lỗi"
 
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 msgid "Firmware Version"
 msgstr "Phiên bản Firmware"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 msgid "Power"
 msgstr "Điện"
 
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "Trình điều khiển"
 
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "Liệt kê mọi tập tin"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "Giữ tên tập tin khi tải lên"
 
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "Máy ảnh không sẵn sàng"
 
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "Tên người sở hữu bị thay đổi"
 
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "không thể thay đổi tên người sở hữu"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr "Lớp kích cỡ chụp bị thay đổi"
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr "Cài đặt lớp kích cỡ chụp không hợp lệ"
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr "Cài đặt tốc độ ISO không hợp lệ"
 
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 msgid "ISO speed changed"
 msgstr "Tốc độ ISO bị thay đổi"
 
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 msgid "Could not change ISO speed"
 msgstr "Không thể thay đổi tốc độ ISO"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr "Sai đặt chế độ chụp ảnh"
 
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 msgid "Shooting mode changed"
 msgstr "Chế độ chụp ảnh bị thay đổi"
 
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 msgid "Could not change shooting mode"
 msgstr "Không thể thay đổi chế độ chụp ảnh"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr "Cài đặt tốc độ chập không hợp lệ"
 
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 msgid "Shutter speed changed"
 msgstr "Tốc độ chập bị thay đổi"
 
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 msgid "Could not change shutter speed"
 msgstr "Không thể thay đổi tốc độ chập"
 
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 msgid "Invalid aperture setting"
 msgstr "Cài đặt độ mở không hợp lệ"
 
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 msgid "Aperture changed"
 msgstr "Độ mở bị thay đổi"
 
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 msgid "Could not change aperture"
 msgstr "Không thể thay đổi độ mở"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 msgid "Invalid exposure compensation setting"
 msgstr "Cài đặt bù phơi sáng không hợp lệ"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 msgid "Exposure compensation changed"
 msgstr "Sự bù phơi sáng đã thay đổi"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 msgid "Could not change exposure compensation"
 msgstr "Không thể thay đổi sự bù phơi sáng"
 
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 msgid "Invalid image format setting"
 msgstr "Cài đặt định dạng ảnh không hợp lệ"
 
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 msgid "Image format changed"
 msgstr "Định dạng ảnh đã thay đổi"
 
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 msgid "Could not change image format"
 msgstr "Không thể thay đổi định dạng ảnh"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr "Cài đặt chế độ lấy nét không hợp lệ"
 
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 msgid "Focus mode changed"
 msgstr "Chế độ lấy nét bị thay đổi"
 
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 msgid "Could not change focus mode"
 msgstr "Không thể thay đổi chế độ lấy nét"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr "Sai đặt chế độ bíp"
 
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 msgid "Beep mode changed"
 msgstr "Chế độ bíp bị thay đổi"
 
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 msgid "Could not change beep mode"
 msgstr "Không thể thay đổi chế độ bíp"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr "Mức phóng to bị thay đổi"
 
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 msgid "Could not change zoom level"
 msgstr "Không thể thay đổi mức phóng to"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr "Sai đặt chế độ đèn nháy"
 
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 msgid "Flash mode changed"
 msgstr "Chế độ đèn nháy bị thay đổi"
 
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 msgid "Could not change flash mode"
 msgstr "Không thể thay đổi chế độ đèn nháy"
 
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "đặt giờ"
 
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "không thể đặt giờ"
 
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Đưa ra kiểu cổng không được hỗ trợ %i = 0x%x nên không thể khởi tạo."
 
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "Hết pin hoàn toàn nên máy ảnh bị tắt."
 
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "LỖI: thông điệp bất thường"
 
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "LỖI: tràn thông điệp"
 
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "LỖI: sai thứ tự."
 
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "LỖI: kiểu gói tin bất thường."
 
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "LỖI: lỗi định dạng thông điệp."
 
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "LỖI: thông điệp bất thường 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "Đang tải lên tập tin…"
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "Đang lấy tập tin…"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -1105,7 +1140,7 @@
 "canon_serial_get_dirents: canon_serial_dialogue không lấy được các mục tin "
 "thư mục"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -1113,147 +1148,147 @@
 "canon_serial_get_dirents: Gói tin mục tin thư mục đầu tiên quá ngắn (chỉ %i "
 "byte)"
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Không thể cấp phát %i byte bộ nhớ"
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Gặp lỗi khi đọc mục tin thư mục khác"
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Nhận mục tin thư mục bị cắt ngắn"
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: Quá nhiều mục tin thư mục, chắc là vòng lặp."
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Không thể thay đổi kích cỡ của bộ đệm mục tin thư "
 "mục thành %i byte"
 
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "Gặp lỗi khi thay đổi tốc độ."
 
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "Đang đặt lại giao thức…"
 
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 msgid "Camera OK."
 msgstr "Máy ảnh Tốt."
 
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "Đang tìm máy ảnh…"
 
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "Đang thử liên lạc với máy ảnh…"
 
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "Lỗi liên lạc 1"
 
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "Máy ảnh không đáp ứng"
 
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "Đáp ứng không được nhận ra"
 
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Phát hiện một “%s” cũng được biết như là “%s”"
 
-#: camlibs/canon/serial.c:1383
+#: camlibs/canon/serial.c:1368
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Không rõ mô hình “%s”"
 
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "EOT sai"
 
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "Lỗi liên lạc 2"
 
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "Lỗi liên lạc 3"
 
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "Đang thay đổi tốc độ… vui lòng đợi…"
 
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "Gặp lỗi khi thay đổi tốc độ"
 
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "Lỗi đợi xác nhận trong khi khởi tạo, đang thử lại"
 
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "Lỗi đợi xác nhận trong khi khởi tạo"
 
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "Đã kết nối tới máy ảnh"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "LỖI: phát hiện điều kiện lỗi nghiêm trọng nên không thể tiếp tục "
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "LỖI: %d là quá quá lớn."
 
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "Đang lấy ảnh mẫu…"
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "KHÔNG NHẬN RA"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 msgid "Could not establish initial contact with camera"
 msgstr "Không thể thiết lập liên lạc khởi tạo với máy ảnh"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr "Máy ảnh đã hoạt động"
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr "Máy ảnh đã được kích hoạt"
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Không nhận ra đáp ứng máy ảnh đầu tiên “%c”"
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr "Bước 2 khởi tạo bị lỗi (”%s” khi đọc %i). Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
@@ -1262,48 +1297,48 @@
 "Bước 2 khởi tạo bị lỗi (trả về %i byte, cần %i byte). Máy ảnh không hoạt "
 "động."
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr "Bước 3 khởi tạo bị lỗi: “%s” khi đọc %i. Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr "Bước 3 khởi tạo bị lỗi (trả về %i, cần %i). Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr "Bước 3 khởi tạo bị lỗi: “%s” khi ghi %i. Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Bước 4 bị lỗi: “%s” khi đọc %i. Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr "Bước 4 bị lỗi (trả về %i, cần %i). Máy ảnh không hoạt động."
 
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr "Máy ảnh chưa sẵn sàng, nhiều yêu cầu “nhận diện máy ảnh” bị lỗi: %s"
 
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Máy ảnh chưa sẵn sàng, hàm get_battery (lấy pin) bị lỗi: %s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -1312,19 +1347,19 @@
 "canon_usb_lock_keys: độ dài bất thường được trả lại từ hàm “khóa các "
 "khóa” (%i byte, cần %i)."
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr "canon_usb_lock_keys: độ dài bất thường được trả lại (%i byte, cần %i)."
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: độ dài bất thường được trả lại (%i byte, cần %i)."
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1333,20 +1368,20 @@
 "canon_usb_get_body_id: độ dài dữ liệu bất thường được trả lại (%i byte, cần "
 "%i)."
 
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "Đang nhận dữ liệu…"
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Hết bộ nhớ: cần thiết %d byte."
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: hộp thoại USB canon_usb_dialogue bị lỗi"
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1355,22 +1390,22 @@
 "Cảnh báo trong hàm đặt các thuộc tính tập tin canon_usb_set_file_attributes: "
 "hộp thoại canon_usb_dialogue đã trả lại trạng thái lỗi 0x%08x từ máy ảnh."
 
-#: camlibs/canon/usb.c:2262
+#: camlibs/canon/usb.c:2241
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Không thể đọc tập tin “%s”"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Hết bộ nhớ: cần %ld byte."
 
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
 msgstr "Lỗi tải lên tập tin."
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1378,7 +1413,7 @@
 "Tập tin quá lớn. Có lẽ bạn cần phải tắt máy ảnh, rồi mở lại trước khi tải "
 "lên tập tin thêm."
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1387,7 +1422,7 @@
 "canon_usb_get_dirents: không thể vừa trọng tải trong bộ đệm, “%.96s” (bị cắt "
 "ngắn) quá dài."
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1396,7 +1431,7 @@
 "canon_usb_get_dirents: hộp thoại canon_usb_long_dialogue không lấy được các "
 "mục tin thư mục, trả lại %i."
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1405,7 +1440,7 @@
 "canon_usb_list_all_dirs: không thể vừa trọng tải trong bộ đệm, “%.96s” (bị "
 "cắt ngắn) quá dài."
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1414,27 +1449,27 @@
 "canon_usb_list_all_dirs: hộp thoại canon_usb_long_dialogue không lấy được "
 "các mục tin thư mục, trả lại %i."
 
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Phát hiện một “%s”."
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Tên “%s” từ máy ảnh không tương ứng với máy ảnh đã biết."
 
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, c-format
 msgid "Image type %d not supported"
 msgstr "Không hỗ trợ kiểu ảnh %d"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, c-format
 msgid "Image %s is delete protected."
 msgstr "Ảnh %s bị bảo vệ chống xóa."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1446,37 +1481,37 @@
 "hys@asahi-net.or.jp> và Jun-ichiro “itojun” Itoh <itojun@itojun.org>.\n"
 "QVplay được Michael Haardt <michael@moria.de> hợp nhất."
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr "Mức pin: %.1f Vôn. Bản sửa đổi: %08x."
 
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "Cấu hình máy ảnh"
 
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "Pin"
 
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "Độ sáng"
 
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 msgid "Too bright"
 msgstr "Quá sáng"
 
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 msgid "Too dark"
 msgstr "Quá tối"
 
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "Đồng ý"
 
@@ -1580,16 +1615,16 @@
 "Trình điều khiển chung sq905C\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "Kiểu ảnh không được hỗ trợ"
 
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "Số lượng ảnh: %d"
 
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1597,7 +1632,7 @@
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
@@ -1605,24 +1640,24 @@
 "Chỉ hỗ trợ thư mục gốc: bạn đã yêu cầu danh sách các tập tin của thư mục "
 "“%s”."
 
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "Gặp lỗi khi lấy tổng số ảnh"
 
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "Gặp lỗi khi lấy thông tin về ảnh"
 
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "Không hỗ trợ kiểu chụp"
 
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (pin còn %d%%)"
 
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1639,82 +1674,83 @@
 "Độ phân giải được đặt thành %s\n"
 "Máy ảnh chạy bằng %s %s.\n"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "Nháy đèn"
 
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 msgid "No Flash"
 msgstr "Không đèn nháy"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "Mống mắt đôi"
 
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "No Dual Iris"
 msgstr "Không mống mắt đôi"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "Chuyển đổi độ phân giải"
 
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "No Resolution Switch"
 msgstr "Không chuyển đổi độ phân giải"
 
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 msgid "No Power Light"
 msgstr "Không đèn có điện"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "BẬT"
 
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "TẮT"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "sẵn sàng"
 
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "Chưa sẵn sàng"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "trong chế độ tô đầy"
 
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "Not in fill mode"
 msgstr "Không trong chế độ tô đầy"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "thấp (320×240)"
 
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "cao (640×480)"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "bên ngoài"
 
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "trên máy"
 
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 msgid ""
 "* Image glitches or problems communicating are\n"
 "  often caused by a low battery.\n"
@@ -1733,7 +1769,7 @@
 "\thay đặt thành chế độ tự động.\n"
 " * Chất lượng ảnh hiện tại dưới mức độ có thể.\n"
 
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1761,115 +1797,231 @@
 "     Thông tin về giao thức, định dạng ảnh thô,\n"
 "     chuyển sang gphoto2\n"
 
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "Gặp lỗi khi đọc ảnh từ bộ nhớ cực nhanh"
 
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "Hết bộ nhớ"
 
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "Đang tài về ảnh…"
 
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "Gặp lỗi khi tải về ảnh"
 
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "Người dùng đã thôi tải về"
 
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "Gặp lỗi khi lấy ảnh trực tiếp"
 
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "Phơi sáng"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr "Tự động điều chỉnh phơi sáng khi xem thử"
 
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 msgid "Exposure level on preview"
 msgstr "Độ phơi sáng khi xem thử"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr "Tự động nháy đèn khi chụp"
 
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "Lỗi mở bản chuyển"
 
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "Gặp lỗi khi đặt lại máy ảnh"
 
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "Gặp lỗi khi đặt lại tốc độ liên lạc với máy ảnh"
 
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "Hình như bộ điều giải, không phải máy ảnh"
 
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Đang liệt kê các tập tin trong “%s”…"
 
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Đang liệt kê các thư mục trong “%s” …"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "Không thể lấy thông tin về “%s” (%s)."
 
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "Không thể lấy thông tin về “%s” trong “%s” (%s)."
 
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "Không thể thay đổi giờ của tập tin “%s” trong “%s” (%s)."
 
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Không thể mở “%s”."
 
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "“Máy ảnh” duyệt qua thư mục thì cho bạn mục lục các ảnh trên đĩa cứng."
 
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Chế độ Duyệt qua Thư mục — được tạo bởi Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "Không thể xóa tập tin “%s” trong thư mục “%s”. (mã lỗi %i: %s)."
 
-#: camlibs/enigma13/enigma13.c:69
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "Cấu hình máy ảnh và trình điều khiển"
+
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "Chế độ chụp"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "Độ phân giải"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "Độ phân giải"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "Chế độ Màu hay Chức năng"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "Chế độ màu"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -1879,89 +2031,89 @@
 "com>, được thích nghi từ trình điều khiển spca50x. Cám ơn nhóm spca50x vì dễ "
 "chuyển trình điều khiển sang máy ảnh này! "
 
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Máy ảnh đã gửi chỉ %i byte, còn cần ít nhất %i."
 
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "Không thể liên lạc với máy ảnh."
 
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "Nhận được dữ liệu bất thường (0x%02x, 0x%02x)."
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "Dãy thoát không đúng: cần 0x%02x, nhưng lại nhận 0x%02x."
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "Dữ liệu sai: nhận 0x%02x, cần 0x%02x."
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "Dữ liệu sai: nhận 0x%02x, cần 0x%02x hay 0x%02x."
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "Sai tổng kiểm: nhận 0x%02x, cần 0x%02x."
 
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "Máy ảnh đã từ chối lệnh."
 
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "Máy ảnh đã tự đặt lại."
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Máy ảnh đã gửi bất thường byte 0x%02x."
 
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "Đang tải về…"
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "Không thể cấp phát %i byte để tải về ảnh mẫu."
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "Không thể cấp phát %i byte để tải về ảnh."
 
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "Máy ảnh không chấp nhận “%s” là tên tập tin."
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "Không thể khởi tạo tiến trình tải lên (máy ảnh đã đáp ứng 0x%02x)."
 
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "Máy ảnh không hỗ trợ tốc độ %i."
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "Không thể đặt tốc độ thành %i (máy ảnh đã đáp ứng %i)."
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -1969,36 +2121,36 @@
 "Matthew G. Martin\n"
 "Dựa vào fujiplay của Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
 
-#: camlibs/fuji/library.c:319
+#: camlibs/fuji/library.c:303
 #, c-format
 msgid "Bit rate %ld is not supported."
 msgstr "Không hỗ trợ tốc độ bit %ld."
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "Cấu hình cho máy ảnh FUJI của bạn"
 
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "Ngày và Giờ"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "MÃ SỐ"
 
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "Phiên bản: "
 
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "Mô hình: "
 
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "Bộ nhớ còn lại: "
 
@@ -2020,18 +2172,18 @@
 "và các đặt tả được cung cấp thân ái bởi Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Không hỗ trợ kiểu cổng: %d. Trình điều khiển này chỉ chạy được với máy ảnh "
 "kiểu USB.\n"
 
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "Không thể đặt lại máy ảnh.\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
@@ -2040,7 +2192,7 @@
 "Máy ảnh của bạn chỉ hỗ trợ khả năng xóa tập tin cuối cùng trên máy ảnh. "
 "Trong trường hợp này, đây là tập tin “%s”."
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2055,7 +2207,7 @@
 "Vùng trống (ảnh): %d\n"
 "Mức pin: %d %%"
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2108,25 +2260,25 @@
 "Trình điều khiển iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "Khung đã chụp    : %4d\n"
 
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "Thư viện jamcam v"
 
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "Đang tải về dữ liệu…"
 
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "Đang tải về ảnh mẫu…"
 
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2142,7 +2294,7 @@
 "   * ảnh mẫu (64×48 định dạng PGM)\n"
 "   * ảnh đầy đủ (640×480 định dạng PPM)\n"
 
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2154,31 +2306,31 @@
 "Trình điều khiển cho máy ảnh Jenoptik JD11.\n"
 "Giao diện được thiết kế đối chiếu dùng WINE và IDA."
 
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 msgid "JD11 Configuration"
 msgstr "Cấu hình JD11"
 
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "Cài đặt khác"
 
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "Thời gian phơi sáng bóng đèn"
 
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "Cài đặt màu"
 
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "Đỏ"
 
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "Lục"
 
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "Xanh"
 
@@ -2263,11 +2415,11 @@
 "Thư viện máy ảnh jl2005bcd\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "Thẻ nhớ CompactFlash (CF)"
 
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2278,7 +2430,7 @@
 "Muốn xem những ảnh được tải xuống máy ảnh thì bạn cũng cần phải tải xuống "
 "chương trình “kdc2tiff”. Có thể lấy nó ở “http://kdc2tiff.sourceforge.net”."
 
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2290,13 +2442,13 @@
 "Thư viện máy ảnh cho máy ảnh Kodak DC120.\n"
 "(được nhiều người yêu cầu)."
 
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "Đang lấy dữ liệu…"
 
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "Đang đợi hoàn tất…"
 
@@ -2310,7 +2462,8 @@
 
 # Name: don't translate / Tên: đừng dịch
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2323,7 +2476,7 @@
 msgstr "Độ phân giải tập tin"
 
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2347,8 +2500,9 @@
 msgid "High (good quality)"
 msgstr "Cao (chất lượng tốt)"
 
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "Chụp"
 
@@ -2377,77 +2531,84 @@
 msgstr "Bù phơi sáng"
 
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "Tự động"
 
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "Ép buộc"
 
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "Không có"
 
@@ -2456,71 +2617,78 @@
 msgstr "Đèn nháy chống mắt đỏ"
 
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "Bật"
 
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "Tắt"
 
@@ -2536,7 +2704,7 @@
 msgid "Port speed"
 msgstr "Tốc độ cổng"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "Tên tập ảnh"
 
@@ -2755,58 +2923,58 @@
 "Thư viện máy ảnh cho máy ảnh Kodak DC215 Zoom.\n"
 "Michael Koltan <koltan@gmx.de>\n"
 
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "Đang chờ…"
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "Tham số 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "Tham số 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "Tham số 3"
 
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "Mô hình: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "Phiên bản Firmware: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "Tình trạng pin: %s, Bộ sạc điện: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "Số ảnh: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "Chỗ còn trống: Cao: %d, Vừa: %d, Thấp: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "Trạng thái thẻ nhớ (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "Tổng ảnh chụp: %d, Lần nháy đèn: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2820,45 +2988,46 @@
 "Thư viện máy ảnh cho các máy ảnh Kodak DC240, DC280, DC3400 và DC5000.\n"
 "Được tạo lại và cập nhật cho gPhoto2."
 
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "Yếu"
 
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "Rỗng"
 
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "Không hợp lệ"
 
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "Không dùng"
 
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "Đang dùng"
 
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "Thẻ nhớ mở"
 
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "Thẻ nhớ không mở"
 
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "Chưa định dạng thẻ nhớ"
 
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "Không có thẻ nhớ"
 
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -2866,12 +3035,12 @@
 "Một thao tác đang chạy. Máy ảnh này chỉ hỗ trợ chạy một thao tác mỗi lần. "
 "Hãy đợi kết thúc thao tác này."
 
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "máy ảnh đã nghỉ trong >9 giây nên khởi tạo lại.\n"
 
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -2886,7 +3055,7 @@
 "thời nên phải được khởi tạo lại. Bạn thấy máy ảnh không đáp ứng thì đơn giản "
 "chọn nó lần nữa: hành động này sẽ gây ra nó khởi tạo lại."
 
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -2898,7 +3067,7 @@
 "\n"
 "Mời bạn hỏi câu và ghi chú."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2907,7 +3076,7 @@
 "Máy ảnh USB của bạn là Kodak EZ200.\n"
 "Tổng ảnh = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
@@ -2915,107 +3084,107 @@
 "Trình điều khiển Kodak EZ200\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "Lỗi lấy nét."
 
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "Lỗi màn trập."
 
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "Lỗi đầu đo."
 
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "Lỗi tổng kiểm EEPROM."
 
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "Lỗi nội bộ (1)."
 
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "Lỗi nội bộ (2)."
 
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "Không có thẻ nhớ."
 
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "Thẻ nhớ không được hỗ trợ."
 
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "Thẻ nhớ bị gỡ bỏ trong khi truy cập."
 
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "Số hiệu ảnh không hợp lệ."
 
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "Không thể ghi vào thẻ nhớ."
 
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "Thẻ nhớ bị bảo vệ chống ghi."
 
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "Không còn có chỗ trống trên thẻ nhớ."
 
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "Ảnh bị bảo vệ."
 
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "Ánh sáng quá tối."
 
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "Lỗi lấy nét tự động."
 
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "Lỗi hệ thống."
 
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "Tham số cấm."
 
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "Không thể hủy bỏ lệnh này."
 
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "Dữ liệu bản địa hóa quá dài."
 
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "Dữ liệu bản địa hóa bị hỏng."
 
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "Lệnh không được hỗ trợ."
 
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "Lệnh khác đang chạy."
 
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "Lỗi thứ tự lệnh."
 
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "Lỗi lạ."
 
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
@@ -3026,15 +3195,15 @@
 "thông tin này với thông tin thêm về cách tạo lỗi đó: (0x%x,0x%x). Cám ơn "
 "nhiều!"
 
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "Đang lấy danh sách tập tin…"
 
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "Đang thử các tốc độ khác nhau…"
 
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
 "computer and turned on."
@@ -3042,12 +3211,12 @@
 "Không thể liên lạc với máy ảnh. Hãy kiểm tra xem nó được kết nối đến máy "
 "ảnh, và được mở."
 
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "Không thể xóa %i ảnh vì chúng bị bảo vệ."
 
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3066,7 +3235,7 @@
 "Tên: %s,\n"
 "Hãng chế tạo: %s\n"
 
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3076,403 +3245,412 @@
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
 "Hỗ trợ mọi máy ảnh Konica và vài máy ảnh HP."
 
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "Đang lấy cấu hình…"
 
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "Cấu hình Konica"
 
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "Cài đặt cố định"
 
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "Máy ảnh nên kêu bíp khi chụp ảnh không?"
 
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "Giờ tự hẹn giờ"
 
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "Giờ tự động tắt"
 
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "Thời gian chiếu ảnh"
 
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "Độ phân giải"
 
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "Thấp (576 × 436)"
 
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "Vừa (1152 × 872)"
 
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "Cao (1152 × 872)"
 
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "Bản địa hóa"
 
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "Chưa chọn gì"
 
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "Định dạng Xuất ra TV"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "Không hiển thị trình đơn TV"
 
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "Định dạng ngày"
 
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "Tháng/Ngày/Năm"
 
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "Ngày/Tháng/Năm"
 
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "Năm/Tháng/Ngày"
 
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "Cài đặt vĩnh cửu trong phiên chạy"
 
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "Bật, giảm mắt đỏ"
 
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "Tự động, giảm mặt đỏ"
 
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "Tiêu điểm"
 
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "Cố định"
 
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "Cài đặt hay thay đổi"
 
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "Tự hẹn giờ"
 
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "Tự hẹn giờ (chỉ ảnh kế)"
 
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "Chuẩn"
 
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "Không tìm thấy dữ liệu bản địa hóa ở “%s”"
 
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "Tập tin bản địa hóa quá dài."
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr "Ô xem thử này không tồn tại."
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr "Dữ liệu bị hỏng."
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 "Được biên dịch mà không có sự hỗ trợ EXIF, nên không có ảnh thu nhỏ nào sẵn "
 "sàng."
 
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "Kiểu ảnh %d không được máy ảnh này hỗ trợ!"
 
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, c-format
 msgid "Can't delete image %s."
 msgstr "Không thể xóa ảnh %s."
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr "Không thể xóa mọi ảnh."
 
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 msgid "Uploading image..."
 msgstr "Đang tải lên ảnh…"
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr "Không thể tải ảnh này lên máy ảnh. Gặp lỗi."
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr "Bạn phải dùng chế độ thu để chụp ảnh."
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr "Không có chỗ còn trống để chụp ảnh mới. Bạn cần phải xóa một số ảnh."
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr "Không thể chụp ảnh mới. Lỗi không rõ"
 
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "Máy ảnh không trả lời."
 
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "Thấp"
 
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "Vừa"
 
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "Cao"
 
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr "Biểu tượng"
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr "2,0 m"
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr "0,5 m"
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr "0,1 m"
 
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 msgid "White balance"
 msgstr "Cân bằng trắng"
 
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 msgid "Office"
 msgstr "Văn phòng"
 
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 msgid "Daylight"
 msgstr "Ánh sáng ban ngày"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr "Độ sắc"
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr "Sắc"
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr "Mềm"
 
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 msgid "Color"
 msgstr "Màu"
 
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 msgid "Light"
 msgstr "Nhẹ"
 
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 msgid "Deep"
 msgstr "Sâu"
 
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 msgid "Black and White"
 msgstr "Đen trắng"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr "Đơn"
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr "Dãy 9"
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr "Hiển thị ngày"
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr "Bất cứ nơi nào"
 
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 msgid "Play mode"
 msgstr "Chế độ phát"
 
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 msgid "Record mode"
 msgstr "Chế độ thu"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr "Mọi nơi"
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr "ĐIện chính"
 
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "Phát"
 
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "Thu"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/YYYY"
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr "YYYY/MM/DD"
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/YYYY"
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3493,7 +3671,7 @@
 "Hiện ngày: %s\n"
 "Ngày và Giờ: %s\n"
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3508,7 +3686,7 @@
 "http://www.ap2c.com\n"
 "Hỗ trợ máy ảnh Konica Q-M150 Pháp."
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3527,7 +3705,7 @@
 "Gặp khó khăn trong việc sử dụng trình điều khiển này\n"
 "thì xin hãy gửi thư cho tác giả.\n"
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3535,7 +3713,7 @@
 "Trình điều khiển Largan\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
@@ -3546,7 +3724,7 @@
 "Firmware: %s\n"
 "Phiên bản Firmware: %s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
@@ -3554,7 +3732,101 @@
 "Trình điều khiển chung LG GSM\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "Cấu hình"
+
+#: camlibs/lumix/lumix.c:1106
+#, fuzzy
+msgid "Clock"
+msgstr "Khóa F"
+
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "Tốc độ màn trập"
+
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+msgid "Quality"
+msgstr "Chất lượng"
+
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+msgid "Video Quality"
+msgstr "Chất lượng phim"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr "ISO"
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr "Phim"
+
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+msgid "Autofocus Mode"
+msgstr "Chế độ tự động lấy nét"
+
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "Chế độ xem trực tiếp"
+
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "Tên thiết bị thân thiện"
+
+#: camlibs/lumix/lumix.c:1202
+#, fuzzy
+msgid "MF Assist"
+msgstr "Đèn giúp AF"
+
+#: camlibs/lumix/lumix.c:1207
+#, fuzzy
+msgid "MF Assist Mag"
+msgstr "Đèn giúp AF"
+
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "Mã số ống kính"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "Chế độ Tương thích"
+
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "Toàn thủ công"
+
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "Trình đơn CSM"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3566,7 +3838,7 @@
 "Máy ảnh Mars MR97310.\n"
 "Nó chứa %i ảnh. \n"
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3597,7 +3869,7 @@
 "\n"
 "Để tìm chi tiết, xem tài liệu Đọc Đi “libgphoto2/camlibs/README”.\n"
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -3605,7 +3877,7 @@
 "Thư viện máy ảnh Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3616,7 +3888,7 @@
 "Bản sửa đổi phần cứng: %s\n"
 "Bản sửa đổi Firmware: %s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3643,61 +3915,63 @@
 "ID thẻ nhớ: %d\n"
 "Chế độ nháy đèn: "
 
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "Từ xa"
 
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "Cục bộ"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "Có"
 
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "Không"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "Tốt"
 
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "Chuẩn"
 
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "Tự động\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "Buộc nháy đèn\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Cấm nháy đèn\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Giá trị không hợp lệ (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3714,74 +3988,74 @@
 "Đèn nháy đang sạc: %s\n"
 "Trạng thái ống kính: "
 
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "Không đầy"
 
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "Đầy"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "Bận"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "Nghỉ"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "Đang sạc"
 
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "Sẵn sàng"
 
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "Chuẩn\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Hướng ống kính không tương ứng với đèn nháy\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Chưa kết nối ống kính\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Giá trị sai đối với trạng thái ống kính %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Trạng thái thẻ nhớ:"
 
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "Bảo vệ chống ghi"
 
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "Thẻ nhớ không thích hợp"
 
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, c-format
 msgid "Bad value for card status %d"
 msgstr "Giá trị sai đối với trạng thái thẻ nhớ %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3794,63 +4068,63 @@
 "Gus Hartmann <gphoto@gus-the-cat.org>\n"
 "Cám ơn đặc biệt Minolta đã cung cấp đặc tả."
 
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "Đèn nháy : tự động (giảm mặt đỏ)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "Đèn nháy : Tự động"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "Đèn nháy : Bật (giảm mắt đỏ)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "Đèn nháy : Bật"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "Đèn nháy : Tắt"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "Đèn nháy : chưa định nghĩa"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "Tóm tắt Mustek MDC800:\n"
 
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "chưa báo báo trạng thái."
 
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "Phát hiện thẻ nhớ cực nhanh gọn (CF)\n"
 
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "Không phát hiện thẻ nhớ cực nhanh gọn (CF)\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "Chế độ hiện tại: chế độ máy ảnh\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "Chế độ hiện tại: chế độ phát lại\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "Pin tốt."
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "Pin yếu."
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
 "Henning Zabel <henning@uni-paderborn.de>\n"
@@ -3862,25 +4136,25 @@
 "Chuyển sang gphoto2 bởi Marcus Meissner <marcus@jet.franken.de>\n"
 "Hỗ trợ cả hai giao thức nối tiếp và USB."
 
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "thư viện coolshot phiên bản "
 
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "Đang ngắt kết nối tới máy ảnh."
 
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "Đang tải về ảnh %s."
 
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "Đang tải lên ảnh: %s."
 
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -3889,17 +4163,17 @@
 "Kích cỡ tập tin: %ld byte.\n"
 "Kích cỡ của tập tin lớn nhất có thể tải lên: %i byte."
 
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "Đang tải lên…"
 
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "Đang xóa ảnh %s."
 
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3915,12 +4189,12 @@
 "Fredrik Roubert <roubert@df.lth.se> và\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "Đang tải về %s."
 
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -3936,12 +4210,12 @@
 "Fredrik Roubert <roubert@df.lth.se> và\n"
 "Galen Brooks <galen@nine.com>."
 
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "Đang tải về “%s”…"
 
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "\n"
@@ -3963,7 +4237,7 @@
 "bị CCD mà chụp ảnh từ ống kính chỉ có khả năng 300K thì tạo chỉ ảnh chất "
 "lượng thấp."
 
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3979,7 +4253,7 @@
 "gặp khó khăn và máy ảnh không được tắt đúng ở tốc độ truyền nhanh hơn 9600 "
 "bps."
 
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -3988,7 +4262,7 @@
 "Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -3999,7 +4273,7 @@
 " Bộ nhớ còn trống: %8d byte\n"
 " Tổng số tập tin: %d"
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4013,11 +4287,11 @@
 "và Miah Gregory\n"
 " <mace@darksilence.net>"
 
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "Đang tải về tập tin…"
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 msgid ""
 "Creative PC-CAM600\n"
 "Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
@@ -4025,32 +4299,135 @@
 "Creative PC-CAM600\n"
 "Tác giả: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr "pccam600_init: Cần >%d khối nhưng chỉ nhận được %d"
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr "pccam600_get_file: nhận chỉ mục %d nhưng cần chỉ mục >%d"
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr "pccam600_close: giá trị trả về là %d thay vì %d"
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr "pccam600_init: Cần %d khối nhưng chỉ nhận %d"
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr "khởi tạo pccam600: Gặp lỗi bất ngờ: gp_port_read trả về %d thay vì %d"
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "Mô hình: "
+
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "Lệnh lạ"
+
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "Cỡ ảnh"
+
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "Chất lượng ảnh"
+
+#: camlibs/pentax/library.c:720
+#, fuzzy
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr "Độ mở cực đại ở tiêu cự nhỏ nhất"
+
+#: camlibs/pentax/library.c:736
+#, fuzzy
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr "Độ mở cực đại ở tiêu cự lớn nhất"
+
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+msgid "Shooting Mode"
+msgstr "Chế độ chụp"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr "AV"
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+#, fuzzy
+msgid "TAV"
+msgstr "TV"
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+#, fuzzy
+msgid "B"
+msgstr "ĐTr"
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "Không hiểu mô hình"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4065,12 +4442,12 @@
 "net> và Lutz Mueller <lutz@users.sf.net>.\n"
 "Polaroid 640SE được thử ra bởi Michael Golden <naugrim@juno.com>."
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr "Mô hình: %x, %x, %x, %x"
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4084,110 +4461,98 @@
 "Jenoptik JD350e bởi Michael Trawny <trawny99@users.sourceforge.net>. Các lỗi "
 "được sửa chữa bởi Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "Chất lượng ảnh"
-
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "Cỡ ảnh"
-
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "Cài đặt đèn nháy"
 
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "Tự động tắt điện (phút)"
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "Thông tin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "chuẩn"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "tốt"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "cực tốt"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "tự động"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "bật"
 
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "tắt"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "phát"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "thu"
 
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "trình đơn"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "pin"
 
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "bộ tiếp hợp điện chính"
 
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "Nhận được phần đầu bất thường (%i)"
 
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "Nhận được đáp ứng bất thường"
 
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "Lỗi tổng kiểm tra"
 
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "Máy ảnh không chấp nhận lệnh đó."
 
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Máy ảnh đã gửi nhiều byte hơn số cần (%i)"
 
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4195,7 +4560,7 @@
 msgstr ""
 "Đã yêu cầu thông tin về ảnh %i (= 0x%x), còn nhận được thông tin về ảnh %i"
 
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4204,7 +4569,7 @@
 "Nhận được %i byte theo định dạng ảnh không rõ. Hãy gửi thư cho %s để yêu cầu "
 "sự giúp đỡ."
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4215,19 +4580,20 @@
 "Tạo gốc bởi Ryan Lantzer <rlantzer@umr.edu> cho gphoto-4.x.\n"
 "Thích nghị với gphoto2 bởi Lutz Mueller <lutz@users.sf.net>."
 
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "Máy ảnh"
 
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "Bao nhiêu phút trước khi máy ảnh tắt điện?"
 
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "Ảnh"
 
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4260,3470 +4626,5509 @@
 "Tự động tắt nguồn: %i phút\n"
 "Nguồn điện: %s"
 
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Kiểu cổng đã yêu cầu (%i) không được hỗ trợ bởi trình điều khiển này."
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "Trạng thái thẻ nhớ:"
+
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "Mẫu: %s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "Tốc độ màn trập"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "Chế độ Lấy nét"
+
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "Mẫu: %s\n"
+
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "Thu phóng: 58 mm\n"
+
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "Chế độ Đèn nháy"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "Nhấn 1"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr "Bấm máy"
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "Chế độ chụp tĩnh"
+
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+msgid "AE Lock"
+msgstr "Khóa AE"
+
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "Khóa AF"
+
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "Khóa AF"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr "Hướng"
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr "CHDK"
+
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+msgid "Image Settings"
+msgstr "Cài đặt ảnh"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr "CHDK đã không từ bỏ chế độ ghi."
 
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Tiếc là máy ảnh Canon của bạn không hỗ trợ khả năng chụp kiểu Canon"
 
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Giá trị không rõ %04x"
 
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, c-format
-msgid "Unknown value %04d"
-msgstr "Giá trị không rõ %04d"
-
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "kiểu dữ liệu bất thường %i"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr "Giá trị đích không phải là kiểu kiểm đếm."
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr "Hiện giờ giá trị không phải là kiểu kiểm đếm."
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr "Sony không thể đặt giá trị mới, nó có hợp lệ không vậy?"
 
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
 msgstr "Bằng tay"
 
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "Tự động"
 
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 msgid "One-push Automatic"
 msgstr "Tự động bấm một"
 
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "Huỳnh quang"
 
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "Dây tóc"
 
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "Đầy mây"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr "Bóng"
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr "Nhiệt độ màu"
 
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 msgid "Preset"
 msgstr "Định sẵn"
 
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1471
 msgid "Fluorescent Lamp 1"
 msgstr "Đèn huỳnh quang 1"
 
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 msgid "Fluorescent Lamp 2"
 msgstr "Đèn huỳnh quang 2"
 
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 msgid "Fluorescent Lamp 3"
 msgstr "Đèn huỳnh quang 3"
 
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 msgid "Fluorescent Lamp 4"
 msgstr "Đèn huỳnh quang 4"
 
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 msgid "Fluorescent Lamp 5"
 msgstr "Đèn huỳnh quang 5"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr "Chọn nhiệt độ màu"
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr "Định sẵn riêng 1"
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr "Định sẵn riêng 2"
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr "Định sẵn riêng 3"
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr "Định sẵn riêng 4"
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr "Định sẵn riêng 5"
 
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 msgid "Fluorescent: Warm White"
 msgstr "Huỳnh quang: Trắng ấm"
 
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 msgid "Fluorescent: Cold White"
 msgstr "Huỳnh quang: Trắng lạnh"
 
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 msgid "Fluorescent: Day White"
 msgstr "Huỳnh quang: Trắng ngày"
 
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 msgid "Fluorescent: Daylight"
 msgstr "Huỳnh quang: Ánh sáng ban ngày"
 
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 msgid "Preset 1"
 msgstr "Định sẵn 1"
 
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 msgid "Preset 2"
 msgstr "Định sẵn 2"
 
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 msgid "Preset 3"
 msgstr "Định sẵn 3"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr "Dưới nước: Tự động"
 
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 msgid "Tungsten 2"
 msgstr "Dây tóc 2"
 
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 msgid "Fluorescent: White"
 msgstr "Huỳnh quang: Trắng"
 
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 msgid "Fluorescent: Tungsten"
 msgstr "Huỳnh quang: Dây tóc"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "Định sẵn 1"
+
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "Tự chọn"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 msgid "JPEG Fine"
 msgstr "JPEG tốt"
 
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 msgid "JPEG Normal"
 msgstr "JPEG chuẩn"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 msgid "RAW + JPEG Fine"
 msgstr "RAW + JPEG tốt"
 
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 msgid "RAW + JPEG Normal"
 msgstr "RAW + JPEG chuẩn"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+#, fuzzy
+msgid "Large Fine JPEG+RAW"
+msgstr "JPEG Tốt lớn"
+
+#: camlibs/ptp2/config.c:1540
+#, fuzzy
+msgid "Large Normal JPEG+RAW"
+msgstr "JPEG chuẩn lớn"
+
+#: camlibs/ptp2/config.c:1541
+#, fuzzy
+msgid "Medium Normal JPEG+RAW"
+msgstr "JPEG chuẩn vừa"
+
+#: camlibs/ptp2/config.c:1542
+#, fuzzy
+msgid "Small Normal JPEG+RAW"
+msgstr "JPEG chuẩn nhỏ"
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr "Khung đơn"
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr "Tốc độ thấp liên tục"
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr "Tốc độ cao liên tục"
 
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 msgid "Self-timer"
 msgstr "Tự hẹn giờ"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr "Mup Lên nhân bản"
 
-#: camlibs/ptp2/config.c:1878
+#: camlibs/ptp2/config.c:1556
+#, fuzzy
+msgid "PROVIA/Standard"
+msgstr "Chuẩn"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+#, fuzzy
+msgid "ACROS+Ye Filter"
+msgstr "Bộ lọc AB"
+
+#: camlibs/ptp2/config.c:1569
+#, fuzzy
+msgid "ACROS+R Filter,"
+msgstr "Bộ lọc AB"
+
+#: camlibs/ptp2/config.c:1570
+#, fuzzy
+msgid "ACROS+G Filter"
+msgstr "Bộ lọc AB"
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+#, fuzzy
+msgid "USB"
+msgstr "USB 1.1"
+
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
 msgstr "chưa xác định"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr "kinh tế"
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
 msgstr "không mất gì"
 
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 msgid "Undefined"
 msgstr "Chưa định nghĩa"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr "CRW"
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr "TV"
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr "AV"
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr "A_DEP"
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr "M_DEP"
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr "DEP"
 
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "Tự chọn"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr "Khóa"
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr "Chân dung đêm"
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr "Thể thao"
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr "Phong cảnh"
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr "Cận cảnh"
 
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 msgid "Flash Off"
 msgstr "Đèn nháy tắt"
 
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Creative Auto"
+msgstr "Sáng tạo"
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Handheld Night Scene"
+msgstr "Cảnh đêm"
+
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "Điều khiển cao"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr "Thức ăn"
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "Không thể lấy nét"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "Mắt cá"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr "Hiệu ứng thu nhỏ"
+
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "chuẩn"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "Chế độ HDR"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Chân dung động vật"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+#, fuzzy
+msgid "Smooth skin"
+msgstr "Làm mượt"
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1"
+
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2129
 msgid "red eye suppression"
 msgstr "giảm mắt đỏ"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr "tô đầy vào"
 
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 msgid "auto + red eye suppression"
 msgstr "tự động, giảm mặt đỏ"
 
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 msgid "on + red eye suppression"
 msgstr "bật, giảm mắt đỏ"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 msgid "Commander"
 msgstr "Commander"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr "Lặp lại"
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr "TTL"
 
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 msgid "Auto Aperture"
 msgstr "Tự động đặt độ mở"
 
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 msgid "Full Manual"
 msgstr "Toàn thủ công"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "Chế độ ứng dụng"
+
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+msgid "Large"
+msgstr "Lớn"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr "Nhỏ"
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr "AF-A"
 
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 msgid "MF (fixed)"
 msgstr "MF (cố định)"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr "MF (vùng chọn)"
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr "Nặng giữa"
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr "Trung bình"
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr "Đánh giá"
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr "Bộ phận"
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr "Trung bình nặng giữa"
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr "Đo ít cũng khóa chuyển với khung AF"
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr "Đa điểm"
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr "Trung thực"
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr "Đơn sắc"
 
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2376
 msgid "User defined 1"
 msgstr "Tự xác định 1"
 
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 msgid "User defined 2"
 msgstr "Tự xác định 2"
 
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 msgid "User defined 3"
 msgstr "Tự xác định 3"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr "Điểm tiêu chỉ ở tâm, thủ công"
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr "Lấy nét ở điểm trung tâm, tự động"
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr "Lấy nét nhiều điểm tiêu (Chưa có đặc tả), Bằng tay"
 
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 msgid "Multiple Focusing Points, Auto"
 msgstr "Lấy nét nhiều điểm tiêu, Tự động"
 
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 msgid "Multiple Focusing Points (Right)"
 msgstr "Lấy nét nhiều điểm tiêu (Phải)"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr "Lấy nét nhiều điểm tiêu (tâm)"
 
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 msgid "Multiple Focusing Points (Left)"
 msgstr "Lấy nét nhiều điểm tiêu (Trái)"
 
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-msgid "Large"
-msgstr "Lớn"
-
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 msgid "Medium 1"
 msgstr "Vừa 1"
 
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 msgid "Medium 2"
 msgstr "Vừa 2"
 
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 msgid "Medium 3"
 msgstr "Vừa 3"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr "Nhỏ"
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10 giây"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2 giây"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr "TFT"
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr "máy tính"
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr "TFT + máy tính"
 
-#: camlibs/ptp2/config.c:2244
-msgid "Setting 4"
-msgstr "Cài đặt 4"
-
-#: camlibs/ptp2/config.c:2245
-msgid "Setting 5"
-msgstr "Cài đặt 5"
-
-#: camlibs/ptp2/config.c:2246
-msgid "Setting 6"
-msgstr "Cài đặt 6"
-
-#: camlibs/ptp2/config.c:2247
-msgid "Setting 7"
-msgstr "Cài đặt 7"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2530
+#, fuzzy
+msgid "TFT + MOBILE"
+msgstr "TFT + máy tính"
+
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2532
+#, fuzzy
+msgid "TFT + PC + MOBILE"
+msgstr "TFT + máy tính"
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+#, fuzzy
+msgid "TFT + PC + MOBILE2"
+msgstr "TFT + máy tính"
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2551
+#, fuzzy
+msgid "LiveSpotAF"
+msgstr "Chấm AF"
+
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr "Thẻ"
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr "Phim RA"
 
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
 #, c-format
 msgid "Unknown %d"
 msgstr "Không hiểu %d"
 
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 msgid "Factory Default"
 msgstr "Mặc định của hãng"
 
-#: camlibs/ptp2/config.c:2390
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, c-format
+msgid "Auto ISO"
+msgstr "Tự động ISO"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr "mRAW"
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr "sRAW"
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr "Nhỏ hơn JPEG"
 
 # Name: don't translate / Tên: đừng dịch
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 msgid "Tiny JPEG"
 msgstr "Tiny JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr "mRAW + JPEG Lớn Đẹp"
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr "sRAW + JPEG Lớn Đẹp"
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+#, fuzzy
+msgid "cRAW + Large Fine JPEG"
+msgstr "RAW + JPEG Tốt lớn"
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr "mRAW + JPEG Vừa Đẹp"
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr "sRAW + JPEG Vừa Đẹp"
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+#, fuzzy
+msgid "cRAW + Medium Fine JPEG"
+msgstr "RAW + JPEG Tốt vừa"
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr "mRAW + JPEG Nhỏ Đẹp"
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr "sRAW + JPEG Nhỏ Đẹp"
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+#, fuzzy
+msgid "cRAW + Small Fine JPEG"
+msgstr "RAW + JPEG Tốt nhỏ"
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr "RAW + JPEG Thường Lớn"
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr "sRAW + JPEG Thường Lớn"
 
-#: camlibs/ptp2/config.c:2418
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "RAW + JPEG chuẩn lớn"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr "RAW + JPEG Thường Vừa"
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr "sRAW + JPEG Thường Vừa"
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "RAW + JPEG chuẩn vừa"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr "mRAW + JPEG Nhỏ Thường"
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr "sRAW + JPEG Nhỏ Thường"
 
-#: camlibs/ptp2/config.c:2426
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "RAW + JPEG chuẩn nhỏ"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr "RAW + Nhỏ hơn JPEG"
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr "mRAW + Nhỏ hơn JPEG"
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr "sRAW + Nhỏ hơn JPEG"
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+#, fuzzy
+msgid "cRAW + Smaller JPEG"
+msgstr "RAW + Nhỏ hơn JPEG"
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr "RAW + JPEG nhỏ"
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr "mRAW + JPEG nhỏ"
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr "sRAW + JPEG nhỏ"
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+#, fuzzy
+msgid "Small + RAW"
+msgstr "Nhỏ"
+
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "Vừa 1"
+
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "Vừa 2"
+
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "Lớn"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "Vừa 1"
+
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "Vừa 2"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "Vừa 1"
+
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "Vừa 2"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "Vừa 1"
+
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "Vừa 2"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr "Liên tiếp"
 
-#: camlibs/ptp2/config.c:2467
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "Phim RA"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr "Đon: chụp yên lặng"
 
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "Im lặng liên tục "
+
+#: camlibs/ptp2/config.c:2803
 msgid "Timer 10 sec"
 msgstr "Hẹn giờ 10 giây"
 
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 msgid "Timer 2 sec"
 msgstr "Hẹn giờ 2 giây"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr "Chụp liên tiếp tốc độ siêu cao"
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr "Im lặng đơn"
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr "Im lặng liên tục "
 
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, c-format
-msgid "Auto ISO"
-msgstr "Tự động ISO"
+#: camlibs/ptp2/config.c:2808
+#, fuzzy
+msgid "Silent HS continuous"
+msgstr "Liên tiếp"
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "Giảm nhiễu đa Khung ISO tự động"
+#: camlibs/ptp2/config.c:2809
+#, fuzzy
+msgid "Silent LS continuous"
+msgstr "Liên tiếp"
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
-#, c-format
-msgid "%d Multi Frame Noise Reduction"
-msgstr "%d giảm nhiễu đa Khung"
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+"Để chụp bằng bóng đèn, kiểm tra lại đĩa chế độ được quay đến “M” và đặt tốc "
+"độ cửa chập thành “bóng đèn”."
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "Bóng đèn dây tóc"
+
+#: camlibs/ptp2/config.c:2896
+#, fuzzy
+msgid "Bulb Off"
+msgstr "Bóng đèn dây tóc"
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+#, fuzzy
+msgid "AF"
+msgstr "AF-S"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+#, fuzzy
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+"Canon EOS Capture (Chụp) bấm máy gặp lỗi: có thể là không có tiêu điểm (chưa "
+"lấy được nét)?"
+
+#: camlibs/ptp2/config.c:2977
+#, fuzzy
+msgid "91 Points (7x13)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2978
+#, fuzzy
+msgid "325 Points (13x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2979
+#, fuzzy
+msgid "117 Points (9x13)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:2980
+#, fuzzy
+msgid "425 Points (17x25)"
+msgstr "51 points (3D)"
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
+#, c-format
 msgid "Multi Frame Noise Reduction"
 msgstr "Giảm nhiễu đa Khung"
 
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3205
+msgid "Auto ISO Multi Frame Noise Reduction"
+msgstr "Giảm nhiễu đa Khung ISO tự động"
+
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, c-format
 msgid "Time"
 msgstr "Thời gian"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr "%0.4fs"
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr "%d %d/%d"
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr "%d/%d"
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr "%f"
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr "Sáng tạo"
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr "Hành động"
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr "Phong cảnh đêm"
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr "Trẻ con"
 
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 msgid "Automatic (No Flash)"
 msgstr "Tự động (không nháy đèn)"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr "U1"
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr "U2"
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr "Tự động thông minh"
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr "Tự động cao cấp"
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "Phim"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "Phim"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "Phim"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
 msgstr "Phim"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "Kích cỡ màn hình phim"
+
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr "Tele-zoom cố định. Ưu tiên AE"
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr "Quét toàn cảnh"
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr "Tắt nháy đèn tự động thông minh"
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr "Hành động thể thao"
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr "Hoàng hôn"
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr "Cảnh đêm"
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr "Hoàng hôn cầm tay"
 
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 msgid "Picture Effect"
 msgstr "Hiệu ứng ảnh"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr "Phong cảnh đêm"
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr "Tiệc/Trong nhà"
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr "Bãi biển/Tuyết"
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr "Chạng vạng/Bình minh"
 
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 msgid "Pet Portrait"
 msgstr "Chân dung động vật"
 
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 msgid "Candlelight"
 msgstr "Ánh sáng nến"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr "Hoa"
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr "Màu sắc mùa thu"
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr "Thức ăn"
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr "Trẻ em"
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr "Cận cảnh"
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr "A6400 (160-6400)"
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr "A3200 (160-3200)"
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr "A800 (160-800)"
 
-#: camlibs/ptp2/config.c:3213
-msgid "Flourescent"
-msgstr "Huỳnh quang"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr "Nước"
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr "1 EV"
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr "2 EV"
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr "3 EV"
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+#, fuzzy
+msgid "1/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4030
+#, fuzzy
+msgid "1/2 EV"
+msgstr "2 EV"
+
+#: camlibs/ptp2/config.c:4031
+#, fuzzy
+msgid "2/3 EV"
+msgstr "3 EV"
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr "Cực cao"
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
+#, fuzzy
+msgid "0 image"
+msgstr "Ảnh"
+
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
 msgid "Scene"
 msgstr "Phông nền"
 
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
 msgid "Effects"
 msgstr "Hiệu ứng"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
-msgstr "U1"
-
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
-msgstr "U2"
-
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 msgid "Back Light"
 msgstr "Ánh sáng sau"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "Toàn cảnh"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr "Làm mượt"
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr "Dịch-nghiêng"
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr "Chọn màu"
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr "Chụp một"
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr "Loạt"
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr "Thời gian đã qua"
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr "Tốc độ thấp liên tục"
 
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 msgid "Timer"
 msgstr "Đồng hồ hẹn giờ"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr "Nhân bản lên"
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr "Đáp ứng nhanh từ xa"
 
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 msgid "Delayed Remote"
 msgstr "Từ xa trễ"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr "Bấm máy im lặng"
 
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4157
+#, fuzzy
+msgid "Continuous Quiet Release"
+msgstr "Bấm máy im lặng"
+
+#: camlibs/ptp2/config.c:4160
 msgid "Selftimer 2s"
 msgstr "Tự hẹn giờ 2s"
 
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 msgid "Selftimer 5s"
 msgstr "Tự hẹn giờ 5s"
 
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 msgid "Selftimer 10s"
 msgstr "Tự hẹn giờ 10s"
 
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 msgid "Selftimer 10s 3 Pictures"
 msgstr "Tự hẹn giờ 10s 3 ảnh"
 
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 msgid "Selftimer 10s 5 Pictures"
 msgstr "Tự hẹn giờ 10s 5 ảnh"
 
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 msgid "Selftimer 5s 3 Pictures"
 msgstr "Tự hẹn giờ 5s 3 ảnh"
 
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 msgid "Selftimer 5s 5 Pictures"
 msgstr "Tự hẹn giờ 5s 5 ảnh"
 
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 msgid "Selftimer 2s 3 Pictures"
 msgstr "Tự hẹn giờ 2s 3 ảnh"
 
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 msgid "Selftimer 2s 5 Pictures"
 msgstr "Tự hẹn giờ 2s 5 ảnh"
 
-#: camlibs/ptp2/config.c:3316
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "Tốc độ thấp liên tục"
+
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "Tốc độ thấp liên tục"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 0.3 3 ảnh"
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 0.3 5 ảnh"
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr "Chụp bủa vây C Bước 0.3 9 ảnh"
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 0.5 3 ảnh"
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 0.5 5 ảnh"
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr "Chụp bủa vây C Bước 0.5 9 ảnh"
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 0.7 3 ảnh"
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 0.7 5 ảnh"
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr "Chụp bủa vây C Bước 0.7 9 ảnh"
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 1.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 1.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr "Chụp bủa vây C Bước 1.0 9 ảnh"
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 2.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 2.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây C Bước 3.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây C Bước 3.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 0.3 3 ảnh"
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 0.3 5 ảnh"
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr "Chụp bủa vây S Bước 0.3 9 ảnh"
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 0.5 3 ảnh"
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 0.5 5 ảnh"
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr "Chụp bủa vây S Bước 0.5 9 ảnh"
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 0.7 3 ảnh"
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 0.7 5 ảnh"
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr "Chụp bủa vây S Bước 0.7 9 ảnh"
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 1.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 1.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr "Chụp bủa vây S Bước 1.0 9 ảnh"
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 2.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 2.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr "Chụp bủa vây S Bước 3.0 3 ảnh"
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr "Chụp bủa vây S Bước 3.0 5 ảnh"
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr "Cân Bằng Trắng Bủa vây Thấp"
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr "DRO Bủa vây Thấp"
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr "Cân Bằng Trắng Bủa vây Cao"
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr "DRO Bủa vây cao"
 
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 msgid "Centre-spot"
 msgstr "Điểm giữa"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr "Đa-điểm"
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr "Vùng đơn"
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr "Chủ thể gần nhất"
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr "Nhóm động"
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr "AF vùng đơn"
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr "AF vùng động"
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr "AF nhóm động"
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr "AF vùng năng động có độ ưu tiên chủ đề gần nhất"
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr "Vùng động (9)"
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr "Vùng động (21)"
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr "Vùng động (51)"
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr "Theo dõi 3D"
 
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4249
+#, fuzzy
+msgid "Dynamic-area AF (25 points)"
+msgstr "AF vùng động"
+
+#: camlibs/ptp2/config.c:4250
+#, fuzzy
+msgid "Single-point AF"
+msgstr "AF động cơ tùy động đơn"
+
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "AF vùng-bình-thường"
+
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "Theo dõi 3D"
+
+#: camlibs/ptp2/config.c:4253
+#, fuzzy
+msgid "Dynamic-area AF (72 points)"
+msgstr "AF vùng động"
+
+#: camlibs/ptp2/config.c:4254
+#, fuzzy
+msgid "Dynamic-area AF (153 points)"
+msgstr "AF vùng động"
+
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "AF nhóm động"
+
+#: camlibs/ptp2/config.c:4256
+#, fuzzy
+msgid "Dynamic-area AF (9 points)"
+msgstr "AF vùng động"
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+#, fuzzy
+msgid "Wide-area AF (S)"
+msgstr "AF phong cảnh"
+
+#: camlibs/ptp2/config.c:4260
+#, fuzzy
+msgid "Wide-area AF (L)"
+msgstr "AF phong cảnh"
+
+#: camlibs/ptp2/config.c:4261
+#, fuzzy
+msgid "Wide-area AF (C1)"
+msgstr "AF phong cảnh"
+
+#: camlibs/ptp2/config.c:4262
+#, fuzzy
+msgid "Wide-area AF (C2)"
+msgstr "AF phong cảnh"
+
+#: camlibs/ptp2/config.c:4267
 msgid "sRGB (portrait)"
 msgstr "sRGB (chân dung)"
 
 # Name: don't translate / Tên: đừng dịch
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr "sRGB (tự nhiên)"
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr "sRGB"
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, c-format
 msgid "Unknown value 0x%04x"
 msgstr "Giá trị không rõ 0x%04x"
 
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 msgid "Centre"
 msgstr "Giữa"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr "Trên"
 
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 msgid "Bottom"
 msgstr "Dưới"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr "Trái"
 
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 msgid "Right"
 msgstr "Phải"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr "Rộng"
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "Giữa"
+
+#: camlibs/ptp2/config.c:4353
+#, fuzzy
+msgid "Flexible Spot: S"
+msgstr "Chương trình mềm dẻo"
+
+#: camlibs/ptp2/config.c:4354
+#, fuzzy
+msgid "Flexible Spot: M"
+msgstr "Chương trình mềm dẻo"
+
+#: camlibs/ptp2/config.c:4355
+#, fuzzy
+msgid "Flexible Spot: L"
+msgstr "Chương trình mềm dẻo"
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr "Nặng giữa"
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr "Đa chấm"
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr "Chấm giữa"
 
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr "ESP"
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+#, fuzzy
+msgid "Spot+Shadows"
+msgstr "Bóng"
+
+#: camlibs/ptp2/config.c:4377
+#, fuzzy
+msgid "Multi"
+msgstr "Đa điểm"
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "Chuẩn"
+
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "Lớn"
+
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "Cao"
+
+#: camlibs/ptp2/config.c:4387
 msgid "Automatic Flash"
 msgstr "Tự động nháy đèn"
 
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 msgid "Fill flash"
 msgstr "Tô đầy nháy đèn"
 
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 msgid "Red-eye automatic"
 msgstr "Tự động mắt đỏ"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 msgid "Red-eye fill"
 msgstr "Tô đầy mắt đỏ"
 
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 msgid "External sync"
 msgstr "Đồng bộ bên ngoài"
 
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 msgid "Auto Slow Sync"
 msgstr "Tự động đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Đồng bộ mành sau + Đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Giảm mắt đỏ + Đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr "Đồng bộ mành trước"
 
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 msgid "Red-eye reduction"
 msgstr "Giảm mắt đỏ"
 
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 msgid "Red-eye reduction with slow sync"
 msgstr "Giảm mắt đỏ và đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 msgid "Slow sync"
 msgstr "Đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr "Mành sau và đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr "Đồng bộ mành sau"
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr "Đồng bộ mành sau"
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr "Đồng bộ wireless"
 
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "Đồng bộ chậm"
 
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Đen trắng"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr "Chụp ảnh đêm"
 
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 msgid "Color sketch"
 msgstr "Phác thảo màu"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr "Hiệu ứng thu nhỏ"
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr "Màu có chọn lọc"
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr "Bóng"
 
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 msgid "High key"
 msgstr "Phím cao"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr "Phím thấp"
 
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
-msgid "infinite"
-msgstr "vô hạn"
-
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
 #, c-format
 msgid "%d mm"
 msgstr "%d mm"
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
+msgid "infinite"
+msgstr "vô hạn"
+
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
 msgid "x 200"
 msgstr "x 200"
 
-#: camlibs/ptp2/config.c:4069
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "Nén"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
+msgstr "bóng đèn sợi đốt"
+
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "Đồng bộ chậm"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr "AF ưu tiên dò tìm khuôn mặt"
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr "AF phong cảnh"
 
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 msgid "Normal-area AF"
 msgstr "AF vùng-bình-thường"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr "AF theo-dấu-chủ-đề"
 
-#: camlibs/ptp2/config.c:4077
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "Chấm AF"
+
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "Hiển thị Chỉ báo"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr "AF động cơ tùy động đơn"
 
-#: camlibs/ptp2/config.c:4078
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "AF phụ liên tục"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr "AF động-cơ-tùy-động-toàn-thời-gian"
 
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
-msgid "Manual Focus"
+#: camlibs/ptp2/config.c:5651
+#, fuzzy
+msgid "Manual Focus (fixed)"
 msgstr "Lấy nét thủ công"
 
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
+msgstr "MF (vùng chọn)"
+
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 msgid "AE/AF Lock"
 msgstr "Khóa AE/AF"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr "Chỉ khóa AE"
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr "Chỉ khóa AF"
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr "Giữ khóa AE"
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr "AF bật"
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr "Khóa cấp nháy đèn"
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
 msgstr "20 giây"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
 msgstr "1 phút"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
 msgstr "5 phút"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
 msgstr "10 phút"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
 msgstr "5 giây"
 
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
-
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr "12 mm"
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+#, fuzzy
+msgid "15 mm"
+msgstr "15 phút"
+
+#: camlibs/ptp2/config.c:5711
+#, fuzzy
+msgid "20 mm"
+msgstr "10 mm"
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr "bóng đèn sợi đốt"
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr "30gy"
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr "25gy"
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 msgid "20s"
 msgstr "20gy"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 msgid "15s"
 msgstr "15gy"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr "13gy"
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 msgid "10s"
 msgstr "10gy"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr "8gy"
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr "6gy"
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr "5gy"
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr "4gy"
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr "3gy"
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr "2,5gy"
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr "2gy"
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr "1,6gy"
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr "1,3gy"
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr "1gy"
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr "1/1,3gy"
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr "1/1,6gy"
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr "1/2gy"
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr "1/2,5gy"
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr "1/3gy"
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr "1/4gy"
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr "1/5gy"
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr "1/6gy"
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr "1/8gy"
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr "1/10gy"
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr "1/13gy"
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr "1/15gy"
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr "1/20gy"
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr "1/25gy"
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr "1/30gy"
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr "1/40gy"
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr "1/50gy"
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr "1/60gy"
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr "1/80gy"
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr "1/100gy"
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr "1/125gy"
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr "1/160gy"
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr "1/200gy"
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr "1/250gy"
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr "1/320gy"
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr "1/400gy"
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr "1/500gy"
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr "1/640gy"
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr "1/800gy"
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr "1/1000gy"
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr "1/1250gy"
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr "1/1600gy"
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr "1/2000gy"
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr "1/2500gy"
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr "1/3200gy"
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr "1/4000gy"
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr "1/5000gy"
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr "1/6400gy"
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr "1/8000gy"
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 msgid "15 minutes"
 msgstr "15 phút"
 
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 msgid "Sharper"
 msgstr "Sắc hơn"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr "Mềm hơn"
 
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 msgid "Direct Print"
 msgstr "In trực tiếp"
 
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 msgid "Medium Low"
 msgstr "Vừa thấp"
 
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 msgid "Medium high"
 msgstr "Vừa cao"
 
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 msgid "Low contrast"
 msgstr "Tương phản thấp"
 
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 msgid "Medium High"
 msgstr "Vừa cao"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr "Điều khiển cao"
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr "Vùng lấy nét (Cận cảnh)"
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr "Vùng lấy nét (Rất gần)"
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr "Vùng lấy nét (Gần)"
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr "Vùng lấy nét (Vừa)"
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr "Vùng lấy nét (Xa)"
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr "Vùng lấy nét (dành riêng 1)"
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr "Vùng lấy nét (dành riêng 2)"
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr "Vùng lấy nét (dành riêng 3)"
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr "Vùng lấy nét (dành riêng 4)"
 
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 msgid "Automatic Macro"
 msgstr "Macro tự động"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr "AF phụ đơn"
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr "AF phụ liên tục"
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr "DMF"
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr "Chụp một"
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr "Động cơ Se-vô AI"
 
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 msgid "AI Focus"
 msgstr "Lấy nét AI"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr "4 giây"
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr "8 giây"
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr "Giữ"
 
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 msgid "Fluorescent H"
 msgstr "Huỳnh quang H"
 
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 msgid "Custom Whitebalance PC-1"
 msgstr "Cân trắng riêng PC-1"
 
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 msgid "Custom Whitebalance PC-2"
 msgstr "Cân trắng riêng PC-2"
 
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 msgid "Custom Whitebalance PC-3"
 msgstr "Cân trắng riêng PC-3"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr "Số thiếu"
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr "Bóng"
 
-#: camlibs/ptp2/config.c:4366
-msgid "Custom WB 2"
-msgstr "Cân bằng trắng Tự chọn 2"
-
-#: camlibs/ptp2/config.c:4367
-msgid "Custom WB 3"
-msgstr "Cân bằng trắng Tự chọn 3"
-
-#: camlibs/ptp2/config.c:4368
-msgid "Custom WB 4"
-msgstr "Cân bằng trắng Tự chọn 4"
-
-#: camlibs/ptp2/config.c:4369
-msgid "Custom WB 5"
-msgstr "Cân bằng trắng Tự chọn 5"
+#: camlibs/ptp2/config.c:6026
+#, fuzzy
+msgid "Custom Whitebalance: PC-1"
+msgstr "Cân trắng riêng PC-1"
+
+#: camlibs/ptp2/config.c:6027
+#, fuzzy
+msgid "Custom Whitebalance: PC-2"
+msgstr "Cân trắng riêng PC-2"
+
+#: camlibs/ptp2/config.c:6028
+#, fuzzy
+msgid "Custom Whitebalance: PC-3"
+msgstr "Cân trắng riêng PC-3"
+
+#: camlibs/ptp2/config.c:6030
+#, fuzzy
+msgid "Manual 3"
+msgstr "Bằng tay 2"
+
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "Bằng tay 2"
+
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "Bằng tay 2"
+
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "Cân trắng riêng PC-1"
 
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "Cân trắng riêng PC-1"
+
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:6122
 msgid "Low sharpening"
 msgstr "Mài sắc thấp"
 
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 msgid "Black & white"
 msgstr "Đen trắng"
 
-#: camlibs/ptp2/config.c:4464
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "Bủa vây ADL"
+
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "Cân bằng Trắng bủa vây"
+
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "Cân bằng Trắng bủa vây"
+
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "Cân bằng Trắng bủa vây"
+
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "Chế độ Bủa vây"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr "tự động ngầm định"
 
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 msgid "AE & Flash"
 msgstr "AE và nháy đèn"
 
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 msgid "AE only"
 msgstr "Chỉ AE"
 
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 msgid "Flash only"
 msgstr "Chỉ nháy đèn"
 
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 msgid "WB bracketing"
 msgstr "Cân bằng Trắng bủa vây"
 
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 msgid "ADL bracketing"
 msgstr "Bủa vây ADL"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr "Khởi động"
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr "Tắt máy"
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr "Khởi chạy và tắt máy"
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr "50 Hz"
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr "60 Hz"
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr "Đáp ứng nhanh"
 
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 msgid "Remote Mirror Up"
 msgstr "Điều khiển từ xa Nâng gương lật"
 
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 msgid "Application Mode 0"
 msgstr "Chế độ ứng dụng 0"
 
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 msgid "Application Mode 1"
 msgstr "Chế độ ứng dụng 1"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr "Giảm nhẹ"
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr "Tăng cường"
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr "MTR > bên dưới"
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr "Bên dưới > MTR"
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr "Độ nhạy tự động"
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr "Độ nhạy Cao"
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr "Độ nhạy Trung bình"
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 msgid "Low sensitivity"
 msgstr "Độ nhạy Thấp"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr "Tắt microphone"
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr "Hi 1"
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr "Hi 2"
 
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 msgid "Flash/speed"
 msgstr "Đèn/tốc độ"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr "Đèn/tốc độ/khẩu độ"
 
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 msgid "Flash/aperture"
 msgstr "Đèn/khẩu độ"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr "JPEG cơ bản"
 
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 msgid "NEF+Fine"
 msgstr "NEF+Tốt"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr "NEF (Thô)"
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr "NEF+Cơ bản"
 
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 msgid "NEF+Normal"
 msgstr "NEF+Chuẩn"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr "TIFF (RGB)"
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG cơ bản"
+
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "JPEG chuẩn"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG tốt"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+#, fuzzy
+msgid "NEF+Basic*"
+msgstr "NEF+Cơ bản"
+
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "NEF+Chuẩn"
+
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "NEF+Tốt"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 msgid "Extra Fine"
 msgstr "Cực tốt"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "RAW + JPEG tốt"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "RAW + JPEG tốt"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "NEF+Tốt"
+
+#: camlibs/ptp2/config.c:6880
+msgid "HEIF (X.Fine)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6881
+msgid "RAW+HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6882
+msgid "RAW+HEIF (Std)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "RAW + JPEG tốt"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "RAW + JPEG tốt"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "Tốt"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "M"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "RAW+JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG tốt"
+
+#: camlibs/ptp2/config.c:6922
+#, fuzzy
+msgid "RAW Only"
+msgstr "RAW 2"
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "Đa-điểm"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
 msgstr "6 giây"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
 msgstr "16 giây"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
 msgstr "30 giây"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
 msgstr "30 phút"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
 msgstr "Không mất"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
 msgstr "Mất"
 
-#: camlibs/ptp2/config.c:5001
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "Phím cao"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr "Ưu tiên kích thước"
 
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 msgid "Optimal quality"
 msgstr "Tối ưu hóa theo chất lượng"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr "1/250s (FP Tự động)"
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr "1/320s (FP Tự động)"
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr "Bấm máy"
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr "Bấm máy + Lấy nét"
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr "9 points"
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr "21 points"
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr "51 points"
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr "51 points (3D)"
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr "5 (Dài)"
 
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 msgid "3 (Normal)"
 msgstr "3 (Bình thường)"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr "1 (Ngắn)"
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr "Cửa-chớp/AF-ON"
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr "Bật-AF"
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr "AF51"
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr "AF11"
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr "Khóa AE/AF"
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr "Chỉ khóa AE"
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr "Khóa AE (Khởi động sau bấm máy)"
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr "(Giữ) khóa AE"
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr "Chỉ khóa AF"
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr "4 fps"
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr "3 fps"
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr "2 fps"
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr "1 fps"
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr "6 fps"
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr "5 fps"
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr "9 fps"
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr "8 fps"
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr "7 fps"
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr "11 fps"
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr "10 fps"
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr "Không xác định"
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr "Xem thử"
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr "Khóa F"
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr "(Giữ) khóa AE"
 
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 msgid "Bracketing burst"
 msgstr "Chớp sáng ở các mức sáng khác nhau"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr "Đo ma trận"
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr "Đo phần giữa"
 
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 msgid "Spot metering"
 msgstr "Đo điểm"
 
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 msgid "Playback"
 msgstr "Phát lại"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr "Truy cập mục cao nhất của TRÌNH ĐƠN CỦA TÔI"
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr "+NEF (THÔ)"
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr "Lưới khung"
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr "Kích hoạt D-Lighting"
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr "1 bước tốc độ/khẩu độ"
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr "Chọn số lượng kính không-CPU"
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr "Lưới kính ngắm ảo"
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr "Quay phim"
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr "Bật (xem xét lại ảnh bị loại trừ)"
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr "50%"
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "Giảm rung"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
-msgstr "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
+msgstr ""
+
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
+msgstr ""
 
-#: camlibs/ptp2/config.c:5271
+#: camlibs/ptp2/config.c:7312
 msgid "75%"
 msgstr "75%"
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
-msgstr "25%"
-
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 msgid "Unknown value"
 msgstr "Giá trị không rõ"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr "Tiếc changeafarea Nikon của bạn chỉ hỗ trợ chế độ ngắm Sống."
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr "Trình điều khiển tự động lấy nét của Nikon không làm việc."
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr "Lấy nét bằng tay trên máy Nikon chỉ làm việc trên chế độ Ngắm sống."
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr "Lấy nét bằng tay Nikon ở giới hạn."
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr "Bước lấy nét bằng tay Nikon quá nhỏ."
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr "Nhấn một nửa"
 
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 msgid "Press Full"
 msgstr "Nhấn hoàn toàn"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr "Nhả một nửa"
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr "Nhả hoàn toàn"
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr "Trực tiếp"
 
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 msgid "Press 1"
 msgstr "Nhấn 1"
 
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 msgid "Press 2"
 msgstr "Nhấn 2"
 
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 msgid "Press 3"
 msgstr "Nhấn 3"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr "Nhả "
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr "Nhả "
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr "Nhả "
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr "Gần 1"
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr "Gần 2"
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr "Gần 3"
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr "Xa 1"
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr "Xa 2"
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr "Xa 3"
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr "Gần %d"
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr "Xa %d"
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
+msgid ""
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
 msgid "Nikon enable liveview failed"
 msgstr "Gặp lỗi khi bật kính ngắm Nikon"
 
-#: camlibs/ptp2/config.c:6395
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+#: camlibs/ptp2/config.c:8547
+#, fuzzy
+msgid "Movie prohibit conditions: "
+msgstr "Điều kiện cấm xem trực tiếp"
+
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "Chế độ ứng dụng"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
 msgstr ""
-"Để chụp bằng bóng đèn, kiểm tra lại đĩa chế độ được quay đến “M” và đặt tốc "
-"độ cửa chập thành “bóng đèn”."
 
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "Gặp lỗi khi bật kính ngắm Nikon"
+
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "Thẻ nhớ bị bảo vệ chống ghi."
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+#, fuzzy
+msgid "Already in movie recording"
+msgstr "Quay phim"
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+#, fuzzy
+msgid "Card full"
+msgstr "Thẻ"
+
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "Chưa định dạng thẻ nhớ"
+
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "Lỗi màn trập."
+
+#: camlibs/ptp2/config.c:8569
+#, fuzzy
+msgid "No movie prohibit conditions"
+msgstr "Điều kiện cấm xem trực tiếp"
+
+#: camlibs/ptp2/config.c:8587
+#, fuzzy
+msgid "Live View prohibit conditions: "
+msgstr "Điều kiện cấm xem trực tiếp"
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+#, fuzzy
+msgid "Sequence error"
+msgstr "Dãy 9"
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "Cài đặt độ mở không hợp lệ"
+
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "Hết pin hoàn toàn nên máy ảnh bị tắt."
+
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP: lỗi V/R"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "Giá trị độ mở"
+
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "Chưa định dạng thẻ nhớ"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "Cài đặt Giải Thông tin"
+
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "Chế độ chương trình phơi sáng"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9149
+msgid "Flourescent"
+msgstr "Huỳnh quang"
+
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "đặt giờ"
+
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "Đen trắng"
+
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "Tự động"
+
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "Macro tự động"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "Không rõ: 0x%04x\n"
+
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "Siêu macro"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+#, fuzzy
+msgid "MF"
+msgstr "DMF"
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+#, fuzzy
+msgid "Far fast"
+msgstr "Xa 1"
+
+#: camlibs/ptp2/config.c:9381
+#, fuzzy
+msgid "Far slow"
+msgstr "Xa 1"
+
+#: camlibs/ptp2/config.c:9382
+#, fuzzy
+msgid "Near slow"
+msgstr "Gần 1"
+
+#: camlibs/ptp2/config.c:9383
+#, fuzzy
+msgid "Near fast"
+msgstr "Gần 1"
+
+#: camlibs/ptp2/config.c:9424
+#, fuzzy
+msgid "A"
+msgstr "Av"
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "Chuẩn"
+
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "Thu"
+
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "Phát"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "Cài đặt khác"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "Giảm nhiễu ISO cao"
+
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "Không hiển thị trình đơn TV"
+
+#: camlibs/ptp2/config.c:9501
+#, fuzzy
+msgid "Streaming"
+msgstr "Lấy luồng dữ liệu"
+
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "Lớn"
+
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "Giá trị không rõ %04x"
+
+#: camlibs/ptp2/config.c:9970
 msgid "Internal RAM"
 msgstr "RAM trên máy"
 
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 msgid "Memory card"
 msgstr "Thẻ nhớ"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr "ESSID"
 
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 msgid "Display"
 msgstr "Hiển thị"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr "Ngày tạo: %s. Ngày dùng cuối: %s"
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr "Xóa"
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr "WEP 64-bit"
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr "WEP 128-bit"
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr "Quản lý"
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr "Như thế"
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr "Tên hồ sơ"
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr "WIFI ESSID"
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr "Địa chỉ IP (rỗng để dùng DHCP)"
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr "Mặt nạ mạng"
 
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 msgid "Default gateway"
 msgstr "Cổng ra mặc định"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr "Chế độ truy cập"
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr "Kênh WIFI"
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr "Mật mã"
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr "Khóa mật mã (thập lục)"
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr "Ghi"
 
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 msgid "List Wifi profiles"
 msgstr "Liệt kê hồ sơ WIFI"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr "Tạo hồ sơ WIFI"
 
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10671
+#, fuzzy
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr "Đồng bộ hóa ngày giờ máy ảnh với máy tính"
+
+#: camlibs/ptp2/config.c:10674
 msgid "Auto-Focus"
 msgstr "Lấy nét tự động"
 
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "Lấy nét thủ công"
+
+#: camlibs/ptp2/config.c:10677
 msgid "Power Down"
 msgstr "Tắt máy"
 
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 msgid "Focus Lock"
 msgstr "Khóa lấy nét"
 
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 msgid "Bulb Mode"
 msgstr "Chế độ Bóng"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr "Khóa UI"
 
-#: camlibs/ptp2/config.c:7111
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "Không đèn nháy"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr "Đĩa Nikon DSLR tự động lấy nét"
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr "Ổ Canon DSLR tự động lấy nét"
 
-#: camlibs/ptp2/config.c:7113
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr "Đĩa Nikon DSLR tự động lấy nét"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr "Đĩa Nikon DSLR lấy nét bằng tay"
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr "Đặt vùng tự động lấy nét Nikon"
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr "Đặt Chế độ Điều khiển Nikon"
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr "Ổ Canon DSLR lấy nét bằng tay"
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr "Hủy Canon DSLR tự động lấy nét"
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+#, fuzzy
+msgid "Drive Olympus OMD Manual focus"
+msgstr "Đĩa Nikon DSLR lấy nét bằng tay"
+
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "Ổ Canon DSLR lấy nét bằng tay"
+
+#: camlibs/ptp2/config.c:10696
+msgid "Get Fuji focuspoint"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "Vị trí bắt đầu thu phóng EZoom"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr "Ống kính thu phóng Canon EOS"
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr "Canon EOS vị trí thu phóng"
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr "Canon EOS kính ngắm"
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+#, fuzzy
+msgid "Panasonic Viewfinder"
+msgstr "Canon EOS kính ngắm"
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr "Khung ngắm Nikon"
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr "Bấm máy Canon EOS bằng điều khiển từ xa"
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr "Ngôn ngữ kịch bản CHDK"
 
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 msgid "Movie Capture"
 msgstr "Quay phim"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "Âm thanh của phim"
+
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "Thông tin Lấy nét"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "Thông tin Lấy nét"
+
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "Thông tin Lấy nét"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "Điểm tiêu sáng"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr "Mã PTP"
 
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
 msgstr "Số sản xuất"
 
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 msgid "Camera Manufacturer"
 msgstr "Nhà sản xuất máy ảnh"
 
-#: camlibs/ptp2/config.c:7135
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
 msgstr "Phiên bản thiết bị"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr "Phần mở rộng nhà sản xuất"
 
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 msgid "PTP Version"
 msgstr "Phiên bản PTP"
 
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 msgid "DPOF Version"
 msgstr "Phiên bản DPOF"
 
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 msgid "AC Power"
 msgstr "Điện chính"
 
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 msgid "External Flash"
 msgstr "Đèn nháy ngoài"
 
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 msgid "Battery Level"
 msgstr "Cấp pin"
 
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10740
+#, fuzzy
+msgid "Mirror Up Status"
+msgstr "Nhân bản lên"
+
+#: camlibs/ptp2/config.c:10741
+#, fuzzy
+msgid "Mirror Lock"
+msgstr "Nhân bản lên"
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+#, fuzzy
+msgid "Mirror Up Shooting Count"
+msgstr "Thứ tự lên máy nhân"
+
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "Chụp liên tiếp"
+
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 msgid "Camera Orientation"
 msgstr "Hướng máy ảnh"
 
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 msgid "Flash Open"
 msgstr "Đèn nháy đã mở"
 
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "Máy nhạy AF hoạt động"
+
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 msgid "Flash Charged"
 msgstr "Đèn nháy đã sạc"
 
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 msgid "Lens Name"
 msgstr "Tên ống kính"
 
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 msgid "Shutter Counter"
 msgstr "Bộ đếm số lần chập"
 
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 msgid "Available Shots"
 msgstr "Lần chụp có sẵn"
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr "Tiêu cự nhỏ nhất"
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr "Tiêu cự lớn nhất"
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr "Độ mở đại ở tiêu cự tiểu"
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr "Độ mở đại ở tiêu cự tiểu"
 
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 msgid "Low Light"
 msgstr "Ít sáng"
 
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 msgid "Light Meter"
 msgstr "Đo sáng"
 
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 msgid "AF Locked"
 msgstr "Khóa AF"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr "Khóa AE"
 
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 msgid "FV Locked"
 msgstr "Khóa FV"
 
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "Tiếng nói phim"
+
+#: camlibs/ptp2/config.c:10771
+#, fuzzy
+msgid "Movie Prohibit Condition"
+msgstr "Điều kiện cấm xem trực tiếp"
+
+#: camlibs/ptp2/config.c:10772
+#, fuzzy
+msgid "Liveview Prohibit Condition"
+msgstr "Điều kiện cấm xem trực tiếp"
+
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 msgid "Camera Date and Time"
 msgstr "Ngày và Giờ máy ảnh"
 
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 msgid "Beep Mode"
 msgstr "Chế độ bíp"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 msgid "Image Comment"
 msgstr "Ghi chú ảnh"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr "WLAN GUID"
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 msgid "Enable Image Comment"
 msgstr "Bật ghi chú ảnh"
 
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 msgid "LCD Off Time"
 msgstr "Thời gian tắt LCD"
 
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 msgid "Recording Media"
 msgstr "Vật chứa thu"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr "Thời gian xem lại nhanh"
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr "Trình đơn CSM"
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr "Ngược lại đĩa lệnh"
 
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 msgid "Camera Output"
 msgstr "Kết xuất máy ảnh"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr "Đích ghi"
 
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 msgid "EVF Mode"
 msgstr "Chế độ EVF"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr "Số CCD"
 
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "Tác quyền"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr "Lau cảm biến"
 
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 msgid "Flicker Reduction"
 msgstr "Giảm rung"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr "Tùy chỉnh chức năng mở rộng"
 
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 msgid "Focus Info"
 msgstr "Thông tin Lấy nét"
 
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 msgid "Focus Area"
 msgstr "Vùng lấy nét"
 
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "Đèn nháy đã sạc"
+
+#: camlibs/ptp2/config.c:10813
+#, fuzzy
+msgid "One Shot Raw On"
+msgstr "Chụp một"
+
+#: camlibs/ptp2/config.c:10814
 msgid "Auto Power Off"
 msgstr "Tự động tắt điện"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr "Độ sâu của trường"
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr "Trình đơn và Phát lại"
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "Hành vi Máy ảnh"
+
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "Ưu tiên kích thước"
+
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "Kích cỡ ảnh mẫu đã hỗ trợ"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr "Hệ thống tập tin nhanh"
 
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 msgid "Capture Target"
 msgstr "Đích Chụp"
 
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 msgid "Autofocus"
 msgstr "Tự động lấy nét"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
-msgstr "CHDK"
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+msgid "Remote Mode"
+msgstr "Chế độ điều khiển từ xa"
+
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "Chế độ hiệu ứng"
 
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10844
 msgid "Image Format SD"
 msgstr "SD định dạng ảnh"
 
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 msgid "Image Format CF"
 msgstr "CF định dạng ảnh"
 
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 msgid "Image Format Ext HD"
 msgstr "Đĩa cứng ngoài định dạng ảnh"
 
-#: camlibs/ptp2/config.c:7230
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "Độ phân giải tập tin"
+
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "Cỡ ảnh"
+
+#: camlibs/ptp2/config.c:10858
 msgid "Movie ISO Speed"
 msgstr "Tốc độ ISO phim"
 
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 msgid "ISO Auto"
 msgstr "Tự động ISO"
 
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 msgid "WhiteBalance"
 msgstr "Cân bằng trắng"
 
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 msgid "WhiteBalance Adjust A"
 msgstr "Cân bằng trắng chỉnh A"
 
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 msgid "WhiteBalance Adjust B"
 msgstr "Cân bằng trắng chỉnh B"
 
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 msgid "WhiteBalance X A"
 msgstr "Cân bằng trắng X A"
 
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 msgid "WhiteBalance X B"
 msgstr "Cân bằng trắng X B"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr "Hiệu ứng ảnh chụp"
 
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 msgid "Color Model"
 msgstr "Mô hình màu"
 
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 msgid "Color Space"
 msgstr "Miền Màu"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+msgid "Video Format"
+msgstr "Định dạng phim"
+
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+msgid "Video Resolution"
+msgstr "Độ phân giải phim"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr "Tốc độ khung phim"
+
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+msgid "Video Contrast"
+msgstr "Tương phản phim"
+
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+msgid "Video Brightness"
+msgstr "Độ sáng phim"
+
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+msgid "Audio Format"
+msgstr "Định dạng âm thanh"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr "Tốc độ bít âm thanh"
+
+#: camlibs/ptp2/config.c:10894
+#, fuzzy
+msgid "Audio Sampling Rate"
+msgstr "Tốc độ lấy mẫu âm thanh"
+
+#: camlibs/ptp2/config.c:10895
+#, fuzzy
+msgid "Audio Bit per Sample"
+msgstr "Số bít âm thanh mỗi mẫu"
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr "Âm lượng âm thanh"
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr "Giảm nhiễu phơi sáng lâu"
 
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 msgid "Auto Focus Mode 2"
 msgstr "Chế độ lấy nét tự động 2"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "Tốc độ Chụp"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr "Giúp ánh sáng"
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr "Cờ xoay"
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "Bù Phơi sáng"
+
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "Cân bằng trắng"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr "Nhiệt độ màu"
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+msgid "AF Mode"
+msgstr "Chế độ AF"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "Điều chỉnh sắc độ"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+#, fuzzy
+msgid "Start/Stop recording"
+msgstr "Quay phim"
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 msgid "Flash Compensation"
 msgstr "Sự bù đèn nháy"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 msgid "AEB Exposure Compensation"
 msgstr "Sự bù phơi sáng AEB"
 
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 msgid "Nikon Flash Mode"
 msgstr "Chế độ Đèn nháy Nikon"
 
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 msgid "Flash Commander Mode"
 msgstr "Chế độ quản lý đèn nháy"
 
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 msgid "Flash Commander Power"
 msgstr "Điện quản lý đèn nháy"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr "Kênh câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 msgid "Flash Command Self Mode"
 msgstr "Chế độ tự làm câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 msgid "Flash Command Self Compensation"
 msgstr "Tự bù câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr "Tự đặt giá trị câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 msgid "Flash Command A Mode"
 msgstr "Chế độ A câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 msgid "Flash Command A Compensation"
 msgstr "Bù A câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr "Giá trị A câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 msgid "Flash Command B Mode"
 msgstr "Chế độ B câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 msgid "Flash Command B Compensation"
 msgstr "Bù B câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr "Giá trị B câu lệnh đèn nháy"
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr "Chiếu sáng vùng AF"
 
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 msgid "AF Beep Mode"
 msgstr "Chế độ bíp AF"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr "Số F"
 
-#: camlibs/ptp2/config.c:7289
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "Chế độ xem trực tiếp"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr "Số F phim"
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr "Chương trình mềm dẻo"
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Chất lượng"
+
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "Cỡ ảnh"
+
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "Định dạng Ảnh"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 msgid "Focus Distance"
 msgstr "Khoảng cách lấy nét"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr "Tiêu cự"
 
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 msgid "Focus Mode 2"
 msgstr "Chế độ Tiêu điểm 2"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr "Lấy nét liên tục"
 
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 msgid "Effect Mode"
 msgstr "Chế độ hiệu ứng"
 
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 msgid "Exposure Program"
 msgstr "Chương trình phơi sáng"
 
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "Chế độ máy ảnh"
+
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 msgid "Scene Mode"
 msgstr "Chế độ phông nền"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr "Tỷ lệ hình thể"
 
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "Chế độ AF"
+
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr ""
 "\n"
 "Tóm tắt các thiết bị chứa:\n"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 msgid "High ISO Noise Reduction"
 msgstr "Giảm nhiễu ISO cao"
 
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 msgid "HDR Mode"
 msgstr "Chế độ HDR"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr "Tùy động ở mức cao HDR"
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr "Làm mượt HDR"
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr "Chế độ chụp tĩnh"
 
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 msgid "Canon Shooting Mode"
 msgstr "Chế độ chụp Canon"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 msgid "Canon Auto Exposure Mode"
 msgstr "Chế độ tự động phơi sáng Canon"
 
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "Chế độ tự động phơi sáng Canon"
+
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 msgid "Drive Mode"
 msgstr "Chế độ ổ đĩa"
 
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 msgid "Picture Style"
 msgstr "Kiểu dáng ảnh"
 
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 msgid "Focus Metering Mode"
 msgstr "Chế độ đo tiêu điểm"
 
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 msgid "Exposure Metering Mode"
 msgstr "Chế độ đo phơi sáng"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr "AV mở"
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr "AV đại"
 
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "Khẩu độ"
+
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 msgid "Focusing Point"
 msgstr "Điểm tiêu"
 
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 msgid "Capture Delay"
 msgstr "Độ trễ chụp"
 
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 msgid "Shutter Speed 2"
 msgstr "Tốc độ chập 2"
 
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 msgid "Movie Shutter Speed 2"
 msgstr "Tốc độ màn chập 2 phim"
 
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 msgid "Metering Mode"
 msgstr "Chế độ đo"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 msgid "AF Distance"
 msgstr "Khoảng cách AF"
 
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 msgid "Focus Area Wrap"
 msgstr "Cuộn vùng lấy nét"
 
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 msgid "Exposure Delay Mode"
 msgstr "Chế độ phơi sáng trễ"
 
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 msgid "Exposure Lock"
 msgstr "Khóa phơi sáng"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr "Chế độ AE-L/AF-L"
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr "Xem trực tiếp Chế độ AF"
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr "Xem trực tiếp Lấy nét AF"
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "Chế độ chạy xem trực tiếp"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr "Tỷ lệ phóng to ảnh xem trực tiếp"
+
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "Cân bằng trắng"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+#, fuzzy
+msgid "Live View Setting Effect"
+msgstr "Trạng thái xem trực tiếp"
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr "Thứ tự số hiệu tập tin"
 
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 msgid "Flash Sign"
 msgstr "Dấu đèn nháy"
 
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 msgid "Modelling Flash"
 msgstr "Mô hình Đèn nháy ngoài"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr "Lưới kính ngắm"
 
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 msgid "Image Review"
 msgstr "Xem lại ảnh"
 
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 msgid "Image Rotation Flag"
 msgstr "Cờ xoay ảnh"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr "Bấm máy không có thẻ nhớ CF"
 
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 msgid "Flash Mode Manual Power"
 msgstr "Chế độ đèn nháy có điện thủ công"
 
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 msgid "Auto Focus Area"
 msgstr "Vùng tự động lấy nét"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 msgid "Flash Exposure Compensation"
 msgstr "Sự bù phơi sáng đèn nháy"
 
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 msgid "Bracketing"
 msgstr "Bủa vây"
 
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 msgid "Bracket Mode"
 msgstr "Chế độ Bủa vây"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 msgid "EV Step"
 msgstr "Bước EV"
 
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 msgid "Bracket Set"
 msgstr "Đặt Bủa vây"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr "Thứ tự Bủa vây"
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "Bước Phơi sáng Bủa vây"
+
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "Cân bằng Trắng bủa vây"
+
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "Bật Bủa vây"
+
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "Cân bằng Trắng bủa vây"
+
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "Chớp sáng ở các mức sáng khác nhau"
+
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "Bủa vây ADL"
+
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "Bủa vây ADL"
+
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "Định sẵn riêng 1"
+
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "Định sẵn riêng 2"
+
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "Định sẵn riêng 3"
+
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "Định sẵn riêng 4"
+
+#: camlibs/ptp2/config.c:11071
+#, fuzzy
+msgid "WB Preset Comment 5"
+msgstr "Định sẵn riêng 5"
+
+#: camlibs/ptp2/config.c:11072
+#, fuzzy
+msgid "WB Preset Comment 6"
+msgstr "Định sẵn riêng 1"
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr "Số loạt"
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr "Khoảng cách loạt"
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr "Lần chụp tối đa"
 
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 msgid "Auto White Balance Bias"
 msgstr "Khuynh hướng tự động cân bằng trắng"
 
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 msgid "Tungsten White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng bóng đèn dây tóc"
 
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 msgid "Fluorescent White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng huỳnh quang"
 
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 msgid "Daylight White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng ánh sáng ban ngày"
 
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 msgid "Flash White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng đèn nháy"
 
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 msgid "Cloudy White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng khi trời dầy mây"
 
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 msgid "Shady White Balance Bias"
 msgstr "Khuynh hướng cân bằng trắng có bóng"
 
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "Khuynh hướng cân bằng trắng ánh sáng ban ngày"
+
+#: camlibs/ptp2/config.c:11095
 msgid "White Balance Bias Preset Nr"
 msgstr "Số định sẵn bù cân bằng trắng"
 
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 msgid "White Balance Bias Preset 0"
 msgstr "Định sẵn bù cân bằng trắng 0"
 
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 msgid "White Balance Bias Preset 1"
 msgstr "Định sẵn bù cân bằng trắng 1"
 
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 msgid "White Balance Bias Preset 2"
 msgstr "Định sẵn bù cân bằng trắng 2"
 
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 msgid "White Balance Bias Preset 3"
 msgstr "Định sẵn bù cân bằng trắng 3"
 
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 msgid "White Balance Bias Preset 4"
 msgstr "Định sẵn bù cân bằng trắng 4"
 
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 msgid "Selftimer Delay"
 msgstr "Trễ tự kẹn giờ"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr "Vùng nặng giữa"
 
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 msgid "Flash Shutter Speed"
 msgstr "Tốc độ cửa chập đèn nháy"
 
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 msgid "Remote Timeout"
 msgstr "Quá thời từ xa"
 
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-msgid "Remote Mode"
-msgstr "Chế độ điều khiển từ xa"
-
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 msgid "Application Mode"
 msgstr "Chế độ ứng dụng"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr "Tối ưu hóa ảnh"
 
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 msgid "Sharpening"
 msgstr "Mài sắc"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 msgid "Tone Compensation"
 msgstr "Sự bù sắc màu"
 
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 msgid "Saturation"
 msgstr "Độ bão hòa"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 msgid "Hue Adjustment"
 msgstr "Điều chỉnh sắc độ"
 
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 msgid "Auto Exposure Bracketing"
 msgstr "Phơi sáng Bủa vây Tự động"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 msgid "Movie Sound"
 msgstr "Âm thanh của phim"
 
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 msgid "Manual Movie Setting"
 msgstr "Cài đặt quay phim thủ công"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr "Microphone"
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr "Những tín hiệu bị đảo ngược"
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr "Tự động điều chỉnh méo"
 
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "Điều khiển làm mờ nét ảnh"
+
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 msgid "Video Mode"
 msgstr "Chế độ phim"
 
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "Xóa tập tin, "
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "AF phụ đơn"
+
+#: camlibs/ptp2/config.c:11143
 msgid "Meter Off Time"
 msgstr "Thời gian tắt cái đo"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr "Gán nút chức năng"
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr "Gán Nút Xem thử"
 
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-msgid "Movie Quality"
-msgstr "Chất lượng rạp hát"
-
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
-msgid "Minimum Shutter Speed"
-msgstr "Tốc độ màn chập tối đa"
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
+msgid "Continuous Shooting Speed Slow"
+msgstr "Chụp chậm liên tục"
 
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 msgid "Movie Resolution"
 msgstr "Độ phân giải phim"
 
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
-msgid "Continuous Shooting Speed Slow"
-msgstr "Chụp chậm liên tục"
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
+msgid "Minimum Shutter Speed"
+msgstr "Tốc độ màn chập tối đa"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+msgid "Movie Quality"
+msgstr "Chất lượng rạp hát"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr "Tự động giới hạn cao ISO"
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr "Tốc độ đồng bộ nháy đèn"
 
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 msgid "Focus Metering"
 msgstr "Chế độ đo tiêu điểm"
 
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 msgid "Continuous Shooting Speed High"
 msgstr "Chụp cao tốc liên tiếp"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 msgid "JPEG Compression Policy"
 msgstr "Chính sách nén JPEG"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr "Ưu tiên chế độ AF-C"
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr "Ưu tiên chế độ AF-S"
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr "Kích hoạt AF"
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr "Vùng AF Động"
 
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 msgid "AF Lock On"
 msgstr "Bật khóa AF"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr "Điểm vùng AF"
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr "Nút bật AF"
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 msgid "Movie High ISO Noise Reduction"
 msgstr "Giảm nhiễu ISO cao cho phim"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr "Thời gian bấm máy liên tiếp tối đa"
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+#, fuzzy
+msgid "Movie Loop Length"
+msgstr "Tiêu cự nhỏ nhất"
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 msgid "Raw Compression"
 msgstr "Nén thô"
 
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 msgid "Image Quality 2"
 msgstr "Chất lượng ảnh 2"
 
-#: camlibs/ptp2/config.c:7543
-msgid "Image Settings"
-msgstr "Cài đặt ảnh"
+#: camlibs/ptp2/config.c:11288
+#, fuzzy
+msgid "Live View Zoom Area"
+msgstr "Xem trực tiếp vùng AF"
 
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 msgid "Capture Settings"
 msgstr "Cài đặt chụp"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr "Hồ sơ WIFI"
 
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 msgid "Other PTP Device Properties"
 msgstr "Thuộc tính Thiết bị PTP Khác"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr "Thuộc tính PTP 0x%04x"
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
-#, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
+#, fuzzy, c-format
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr "Tiếc là thuộc tính “%s” / 0x%04x hiện tại là chỉ-đọc."
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr "Thuộc tính “%s” / 0x%04x chưa được đặt (0x%04x: %s)"
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr "Thuộc tính “%s” / 0x%04x chưa được đặt (0x%04x: %s)."
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 "Gặp lỗi khi phân tích giá trị của ô điều khiển “%s” / 0x%04x bị lỗi với %d."
 
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, c-format
 msgid "Property '%s' not found."
 msgstr "Không tìm thấy thuộc tính “%s”."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr "Bạn cần xác định một thư mục bắt đầu với “ /store_xxxxxxxxx/”"
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -7745,195 +10150,222 @@
 "\n"
 "Chúc bạn vui vẻ!"
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr ""
+"Tiếc là máy ảnh Nikon của bạn không trả lại ảnh JPEG trong chế độ ngắm Sống"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr "Gặp lỗi khi bật kính ngắm Canon"
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr "Gặp lỗi khi lấy ảnh kính ngắm ảnh"
 
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 "Tiếc là máy ảnh Canon của bạn không hỗ trợ chế độ Kính Ngắm Canon (Canon "
 "Viewfinder)."
 
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "Tiếc là máy ảnh Nikon của bạn không hỗ trợ chế độ ngắm Sống"
 
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
 msgstr ""
-"Tiếc là máy ảnh Nikon của bạn không trả lại ảnh JPEG trong chế độ ngắm Sống"
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr "Gặp lỗi khi tắt chức năng kính ngắm Nikon"
 
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr ""
 "Tiếc là máy ảnh Sony của bạn không trả lại ảnh JPEG trong chế độ ngắm Sống"
 
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr ""
+"Tiếc là máy ảnh Sony của bạn không trả lại ảnh JPEG trong chế độ ngắm Sống"
+
+#: camlibs/ptp2/library.c:4128
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Tiếc là máy ảnh của bạn không hỗ trợ khả năng chụp của Nikon."
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 "Gặp lỗi khi bật kính ngắm trên Nikon 1, nhưng nó lại được yêu cầu để chụp"
 
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Tiếc là máy ảnh Canon của bạn không hỗ trợ khả năng chụp EOS Canon."
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr "Canon EOS Get Changes (lấy các thay đổi) bị lỗi"
 
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Tiếc là máy ảnh Canon của bạn không hỗ trợ khởi tạo khả năng chụp kiểu Canon "
 "(Canon Capture)."
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr "Gặp lỗi khi tắt kính ngắm Canon"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr "Canon Capture (chụp) gặp lỗi"
 
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5568
+#, fuzzy
+msgid "Capture failed: No focus."
+msgstr "Canon Capture (chụp) gặp lỗi"
+
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Tiếc là máy ảnh của bạn không hỗ trợ khả năng chụp chung"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr "Bộ nhớ của máy bị đầy khi đang chụp."
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr "Nhấn-nửa Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 "Canon EOS Capture (Chụp) bấm máy gặp lỗi: có thể là không có tiêu điểm (chưa "
 "lấy được nét)?"
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr "Nhả-nửa Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr "Nhấn-cả Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr "Nhả-cả Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 #, fuzzy
 msgid "Canon EOS M Full-Press failed"
 msgstr "Nhấn-cả Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 #, fuzzy
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 "Canon EOS Capture (Chụp) bấm máy gặp lỗi: có thể là không có tiêu điểm (chưa "
 "lấy được nét)?"
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 #, fuzzy
 msgid "Canon EOS M Full-Release failed"
 msgstr "Nhả-cả Canon EOS bị lỗi"
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr "Canon EOS Capture (chụp) bị lỗi"
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS Capture (chụp) bị lỗi: %x"
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr "Chụp Canon EOS gặp lỗi khi nhả: Có thể là do gương đang lật lên?"
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 "Canon EOS Capture (Chụp) không bấm máy được: có thể là không đủ bộ nhớ trên "
 "thẻ nhớ?"
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr "Canon EOS gặp lỗi khi thả: Thẻ nhớ chỉ cho đọc?"
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 "Canon EOS Capture (Chụp) không bấm máy được: Lỗi không rõ %d, hãy thông báo."
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr "Tiếc là không thể khởi tạo máy ảnh của bạn. Hãy thông báo."
 
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
 #, c-format
 msgid "Manufacturer: %s\n"
 msgstr "Hãng chế tạo: %s\n"
 
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "Mẫu: %s\n"
 
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "  Phiên bản: %s\n"
 
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  Số sản xuất: %s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr "Mã số phần mở rộng nhà sản xuất: 0x%x (%d.%d)\n"
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr "Mô tả phần mở rộng nhà sản xuất: %s\n"
 
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "Phiên bản tiêu chuẩn PTP: %d.%d\n"
 
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "Chế độ chức năng: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 msgid ""
 "\n"
 "Capture Formats: "
@@ -7941,20 +10373,31 @@
 "\n"
 "Định dạng chụp:"
 
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 msgid "Display Formats: "
 msgstr "Định dạng hiển thị: "
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+#, fuzzy
+msgid ""
+"\n"
+"Streams:"
+msgstr "Lấy luồng dữ liệu"
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr "Thuộc tính đối tượng MTP đã hỗ trợ:\n"
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP: lỗi %04x khi truy vấn"
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
@@ -7962,87 +10405,87 @@
 "\n"
 "Khả năng thiết bị:\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
 msgstr "\tTải về tập tin, "
 
-#: camlibs/ptp2/library.c:5717
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
 msgstr "Xóa tập tin, "
 
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 msgid "No File Deletion, "
 msgstr "Không xóa tập tin, "
 
-#: camlibs/ptp2/library.c:5722
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
 msgstr "Tải lên tập tin\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
 msgstr "Không tải lên tập tin\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr "\tChụp ảnh chung, "
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr "\tKhông ảnh chụp, "
 
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 msgid "Open Capture, "
 msgstr "Chụp mở, "
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr "Không chụp mở, "
 
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 msgid "Canon Capture, "
 msgstr "Chụp Canon, "
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr "Chụp Canon EOS, "
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr "Chụp Canon EOS 2, "
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr "Chụp Nikon 1, "
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr "Chụp Nikon 2, "
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr "Chụp Nikon 3, "
 
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 msgid "Sony Capture, "
 msgstr "Chụp Sony, "
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr "Chụp Olympus E XML, "
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr "Không chụp đặc trưng cho nhà sản xuất\n"
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr "\tHỗ trợ WIFI Nikon\n"
 
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 msgid "\tCanon Wifi support\n"
 msgstr "\tHỗ trợ WIFI Canon\n"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
@@ -8050,93 +10493,93 @@
 "\n"
 "Tóm tắt các thiết bị chứa:\n"
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tMô tả bộ nhớ: %s\n"
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tNhãn khối tin: %s\n"
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr "ROM có sẵn"
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr "ROM rời"
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr "RAM có sẵn"
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr "RAM rời (thẻ nhớ nhớ)"
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Không rõ: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tKiểu Bộ nhớ: %s\n"
 
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 msgid "Generic Flat"
 msgstr "Chung phẳng"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr "Chung phân cấp"
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Bố trí máy ảnh số (DCIM)"
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tKiểu hệ thống tập tin: %s\n"
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr "Đọc ghi"
 
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 msgid "Read-Only"
 msgstr "Chỉ đọc"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr "Chỉ đọc, có xóa đối tượng"
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tKhả năng truy cập: %s\n"
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tKhả năng tối đa: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tChỗ trống (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tChỗ trống (ảnh): %d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
@@ -8144,47 +10587,47 @@
 "\n"
 "Tóm tắt thuộc tính thiết bị:\n"
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr " không đọc ra.\n"
 
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 msgid "cannot be queried.\n"
 msgstr "không thể bị truy vấn.\n"
 
-#: camlibs/ptp2/library.c:5895
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
 msgstr "chỉ đọc"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr "đọc ghi"
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr " lỗi %x khi truy vấn."
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Tập tin “%s/%s” không tồn tại"
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr "Siêu dữ liệu chỉ được hỗ trợ cho thiết bị kiểu MTP."
 
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 msgid "Device does not support setting object protection."
 msgstr "Thiết bị này không hỗ trợ chức năng đặt mức bảo mật đối tượng."
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr "Thiết bị không đặt được  bảo mật đối tượng thành %d"
 
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -8193,7 +10636,7 @@
 "PTP hiện tại chỉ được thực hiện cho các máy ảnh kiểu USB và PTP/IP, kiểu "
 "cổng %x."
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
@@ -8201,2236 +10644,2348 @@
 "Olympus hỗ tr�� bao XML chỉ sẵn sàng khi được dịch sẵn cùng với hỗ trợ của "
 "thư viện libxml2."
 
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "Lỗi không xác định PTP"
 
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK !"
 
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "Lỗi chung PTP"
 
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP: buổi hợp chưa mở"
 
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP: mã hiệu giao dịch không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "PTP: thao tác không được hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "PTP: tham số không được hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "PTP: chưa truyền xong"
 
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "PTP: mã hiệu cất giữ không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "PTP: bộ quản lý đối tượng không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP: cái đỡ thiết bị không được hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP: mã định dạng đối tượng không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP: kho đầy"
 
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP: đối tượng bị bảo vệ chống ghi"
 
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "PTP: kho chỉ đọc"
 
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP: truy cập bị từ chối"
 
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "PTP: không có ảnh mẫu"
 
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP: lỗi tự thử"
 
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP: xóa bộ phận"
 
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP: kho không sẵn sàng"
 
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP: không hỗ trợ khả năng xác định theo định dạng"
 
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "PTP: không có thông tin đối tượng hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "PTP: định dạng mã không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP: mã nhà sản xuất lạ"
 
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP: tiến trình chụp đã kết thúc"
 
-#: camlibs/ptp2/ptp.c:4674
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
 msgstr "PTP: thiết bị đang bận"
 
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "PTP: đối tượng cha không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP: định dạng cái dỡ không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP: giá trị cái dỡ không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "PTP: tham số không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP: phiên chạy đã mở"
 
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP: giao dịch bị hủy bỏ"
 
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP: đặc tả của đích không được hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4683
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "PTP: bộ quản lý đối tượng không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "Không có lý do"
+
+#: camlibs/ptp2/ptp.c:6115
+#, fuzzy
+msgid "Invalid Data Set"
+msgstr "Trạng thái không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
 msgstr "Cần tên tập tin"
 
-#: camlibs/ptp2/ptp.c:4684
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
 msgstr "Xung đột tên tập tin"
 
-#: camlibs/ptp2/ptp.c:4685
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
 msgstr "Tên tập tin không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
 msgstr "Lỗi phần cứng"
 
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 msgid "Out of Focus"
 msgstr "Không thể lấy nét"
 
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 msgid "Change Camera Mode Failed"
 msgstr "Lỗi đổi chế độ máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4690
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
 msgstr "Trạng thái không hợp lệ"
 
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 msgid "Set Property Not Supported"
 msgstr "Không hỗ trợ tính năng đặt thuộc tính"
 
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 msgid "Whitebalance Reset Error"
 msgstr "Lỗi đặt lại cân bằng trắng"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr "Lỗi tham chiếu bụi"
 
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 msgid "Shutter Speed Bulb"
 msgstr "Bóng đèn tốc độ chập"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr "Thứ tự lên máy nhân"
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr "Chế độ máy ảnh không điều chỉnh Số F"
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr "Không phải dùng chức năng xem trực tiếp"
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr "Bước Đi Mf gặp kết thúc"
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr "Bước Đi Mf không đủ"
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr "Việc truyền cấp cao bị hủy bỏ"
 
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "PTP: không có ảnh mẫu"
+
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "Lỗi đầu đo."
+
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "Chưa định dạng thẻ nhớ"
+
+#: camlibs/ptp2/ptp.c:6138
+#, fuzzy
+msgid "Bulb Release Busy"
+msgstr "Bấm máy + Lấy nét"
+
+#: camlibs/ptp2/ptp.c:6139
+#, fuzzy
+msgid "Silent Release Busy"
+msgstr "Bấm máy im lặng"
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "Tốc độ chập 2"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP: tiến trình chụp đã kết thúc"
+
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "Trạng thái không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 msgid "Unknown Command"
 msgstr "Lệnh lạ"
 
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 msgid "Operation Refused"
 msgstr "Thao tác bị từ chối"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr "Ống kính còn đang đậy"
 
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 msgid "Battery Low"
 msgstr "Pin yếu"
 
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 msgid "Camera Not Ready"
 msgstr "Máy ảnh chưa sẵn sàng"
 
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+#, fuzzy
+msgid "Lens Cover Closed"
+msgstr "Ống kính còn đang đậy"
+
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "Pin"
+
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "Máy ảnh chưa sẵn sàng"
+
+#: camlibs/ptp2/ptp.c:6156
+#, fuzzy
+msgid "Cannot Make Object"
+msgstr "Xén ngắn Đối tượng"
+
+#: camlibs/ptp2/ptp.c:6157
+#, fuzzy
+msgid "Memory Status Not Ready"
+msgstr "Máy ảnh chưa sẵn sàng"
+
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "PTP: mã định dạng đối tượng không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "PTP: mã định dạng đối tượng không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "PTP: giá trị cái dỡ không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6163
+#, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "PTP: bộ quản lý đối tượng không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "Trạng thái không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "PTP: không hỗ trợ khả năng xác định theo định dạng"
+
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "PTP: không hỗ trợ khả năng xác định theo định dạng"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "Không hỗ trợ tính năng đặt thuộc tính"
+
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "Mở phiên chạy ảnh/nhạc"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "Trạng thái không hợp lệ"
+
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "PTP: thao tác không được hỗ trợ"
+
+#: camlibs/ptp2/ptp.c:6175
 #, fuzzy
 msgid "PTP No Device"
 msgstr "PTP: thiết bị đang bận"
 
-#: camlibs/ptp2/ptp.c:4709
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
 msgstr "Thời hạn PTP"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
 msgstr "PTP hủy yêu cầu"
 
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 msgid "PTP Response Expected"
 msgstr "Cần đáp ứng PTP"
 
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 msgid "PTP Data Expected"
 msgstr "Cần dữ liệu PTP"
 
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 msgid "PTP I/O Error"
 msgstr "lỗi V/R PTP"
 
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 msgid "Undefined PTP Property"
 msgstr "PTP: chưa định nghĩa thuộc tính"
 
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 msgid "Functional Mode"
 msgstr "Chế độ chức năng"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 msgid "Compression Setting"
 msgstr "Cài đặt nén"
 
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "Cân bằng trắng"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr "Khuếch đại RGB"
 
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 msgid "Exposure Time"
 msgstr "Thời gian phơi bày"
 
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 msgid "Exposure Program Mode"
 msgstr "Chế độ chương trình phơi sáng"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr "Số mũ phơi sáng (tốc độ phim ISO)"
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 msgid "Exposure Bias Compensation"
 msgstr "Sự bù khuynh hướng phơi sáng"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr "Độ trễ trước khi chụp"
 
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 msgid "Contrast"
 msgstr "Tương phản"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "Phóng to số"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr "Số khoảng thời gian"
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr "Khoảng thời gian"
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr "URL tải lên"
 
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 msgid "Copyright Info"
 msgstr "Thông tin tác quyền"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr "Các luồng dữ liệu đã hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr "Các luồng dữ liệu đã bật"
 
-#: camlibs/ptp2/ptp.c:4774
-msgid "Video Format"
-msgstr "Định dạng phim"
-
-#: camlibs/ptp2/ptp.c:4775
-msgid "Video Resolution"
-msgstr "Độ phân giải phim"
-
-#: camlibs/ptp2/ptp.c:4776
-msgid "Video Quality"
-msgstr "Chất lượng phim"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr "Tốc độ khung phim"
-
-#: camlibs/ptp2/ptp.c:4778
-msgid "Video Contrast"
-msgstr "Tương phản phim"
-
-#: camlibs/ptp2/ptp.c:4779
-msgid "Video Brightness"
-msgstr "Độ sáng phim"
-
-#: camlibs/ptp2/ptp.c:4780
-msgid "Audio Format"
-msgstr "Định dạng âm thanh"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr "Tốc độ bít âm thanh"
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr "Tốc độ lấy mẫu âm thanh"
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr "Số bít âm thanh mỗi mẫu"
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr "Âm lượng âm thanh"
-
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 msgid "Date Time Stamp Format"
 msgstr "Định dạng ghi Ngày/Giờ"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr "Phim ra"
 
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 msgid "Power Saving"
 msgstr "Tiết kiệm điện"
 
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 msgid "UI Language"
 msgstr "Ngôn ngữ Ui"
 
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 msgid "Battery Type"
 msgstr "Kiểu pin"
 
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 msgid "Battery Mode"
 msgstr "Chế độ pin"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr "Kiểu khóa UI"
 
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 msgid "Camera Mode"
 msgstr "Chế độ máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr "Định dạng tập tin xem đầy đủ"
 
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 msgid "Self Time"
 msgstr "Tự kẹn giờ"
 
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-msgid "Shooting Mode"
-msgstr "Chế độ chụp"
-
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 msgid "Image Mode"
 msgstr "Chế độ ảnh"
 
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 msgid "Slow Shutter Setting"
 msgstr "Cài đặt chập chậm"
 
-#: camlibs/ptp2/ptp.c:4825
-msgid "AF Mode"
-msgstr "Chế độ AF"
-
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 msgid "Image Stabilization"
 msgstr "Làm ổn định ảnh"
 
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 msgid "Color Gain"
 msgstr "Khuếch đại màu"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr "Độ nhạy"
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 msgid "Parameter Set"
 msgstr "Tham số đã đặt"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr "AV mở"
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr "AV tối đa"
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr "Tiêu cự kính viễn vọng"
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr "Tiêu cự rộng"
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr "Tiêu cự mẫu số"
 
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 msgid "Capture Transfer Mode"
 msgstr "Chế độ truyền chụp"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr "Tiền tố tên"
 
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 msgid "Size Quality Mode"
 msgstr "Chế độ chất lượng kích cỡ"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr "Kích cỡ ảnh mẫu đã hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr "Kích cỡ dữ liệu xuất ra máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr "Kích cỡ dữ liệu nhập vào máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr "Phiên bản API ở xa"
 
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 msgid "Camera Owner"
 msgstr "Người sở hữu máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
 msgstr "Giờ UNIX"
 
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 msgid "Camera Body ID"
 msgstr "Mã hiệu thân máy ảnh"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr "Disp Av"
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr "Av Open Apex"
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 msgid "Digital Zoom Magnification"
 msgstr "Phóng to điện số"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 msgid "Ml Spot Position"
 msgstr "Vị trí chấm MI"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr "Disp Av Max"
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr "Av Max Apex"
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr "Vị trí bắt đầu thu phóng EZoom"
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr "Cỡ kính viễn vọng EZoom"
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr "Đếm lần nháy đèn"
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr "Góc xoay"
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr "Cảnh xoay"
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr "Chế độ mô phỏng dữ kiện"
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr "Kiểu chiếu ảnh"
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr "Cỡ tập tin trung bình"
 
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 msgid "Model ID"
 msgstr "Mã hiệu mô hình"
 
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6585
 msgid "Shooting Bank"
 msgstr "Nhóm chụp"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr "Tên nhóm chụp A"
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr "Tên nhóm chụp B"
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr "Tên nhóm chụp C"
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr "Tên nhóm chụp D"
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr "Đặt lại nhóm 0"
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr "Nhiệt độ màu cân bằng trắng"
 
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 msgid "White Balance Preset Number"
 msgstr "Số định sẵn cân bằng trắng"
 
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 msgid "White Balance Preset Name 0"
 msgstr "Tên định sẵn cân bằng trắng 0"
 
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 msgid "White Balance Preset Name 1"
 msgstr "Tên định sẵn cân bằng trắng 1"
 
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 msgid "White Balance Preset Name 2"
 msgstr "Tên định sẵn cân bằng trắng 2"
 
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 msgid "White Balance Preset Name 3"
 msgstr "Tên định sẵn cân bằng trắng 3"
 
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 msgid "White Balance Preset Name 4"
 msgstr "Tên định sẵn cân bằng trắng 4"
 
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 msgid "White Balance Preset Value 0"
 msgstr "Giá trị định sẵn cân bằng trắng 0"
 
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 msgid "White Balance Preset Value 1"
 msgstr "Giá trị định sẵn cân bằng trắng 1"
 
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 msgid "White Balance Preset Value 2"
 msgstr "Giá trị định sẵn cân bằng trắng 2"
 
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 msgid "White Balance Preset Value 3"
 msgstr "Giá trị định sẵn cân bằng trắng 3"
 
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 msgid "White Balance Preset Value 4"
 msgstr "Giá trị định sẵn cân bằng trắng 4"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Tiêu cự ống kính (khác CPU)"
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr "Độ mở tối đa của ống kính (khác CPU)"
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr "Tự động xén DX"
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr "Tên nhóm trình đơn A"
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr "Tên nhóm trình đơn B"
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr "Tên nhóm trình đơn C"
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr "Tên nhóm trình đơn D"
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr "Đặt lại nhóm trình đơn"
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr "AF dọc đã bật"
 
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 msgid "Focus Area Zone"
 msgstr "Vùng lấy nét"
 
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 msgid "Enable Copyright"
 msgstr "Bật tác quyền"
 
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 msgid "Exposure ISO Step"
 msgstr "Bước ISO phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 msgid "Exposure Step"
 msgstr "Bước phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 msgid "Exposure Compensation (EV)"
 msgstr "Bù phơi sáng (EV)"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr "Vùng nặng giữa"
 
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 msgid "Exposure Base Matrix"
 msgstr "Ma trận Cơ bản Phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 msgid "Exposure Base Center"
 msgstr "Trung tâm Cơ bản Phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 msgid "Exposure Base Spot"
 msgstr "Chấm Cơ bản Phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr "Xem trực tiếp vùng AF"
 
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 msgid "Auto Meter Off Time"
 msgstr "Thời gian tự động tắt cái đo"
 
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 msgid "Self Timer Delay"
 msgstr "Trễ tự kẹn giờ"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr "Giờ cấu hình ảnh"
 
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 msgid "Auto Off Timers"
 msgstr "Giờ tự động tắt"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr "Mức Góc"
 
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 msgid "Shooting Speed"
 msgstr "Tốc độ Chụp"
 
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 msgid "Exposure delay mode"
 msgstr "Chế độ phơi sáng trễ"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 msgid "Long Exposure Noise Reduction"
 msgstr "Giảm nhiễu phơi sáng lâu"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr "Chiếu sáng LCD"
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 msgid "High ISO noise reduction"
 msgstr "Giảm nhiễu ISO cao"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr "Mẹo trên màn hình"
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr "Tên nghệ sĩ"
 
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 msgid "Copyright Information"
 msgstr "Thông tin Tác quyền"
 
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 msgid "Modeling Flash"
 msgstr "Làm mẫu đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr "Chế độ Bủa vây bằng tay"
 
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 msgid "Auto Bracket Selection"
 msgstr "Tự động Chọn Bủa vây"
 
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 msgid "NIKON Auto Bracketing Set"
 msgstr "NIKON: Tự động Bủa vây"
 
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 msgid "Center Button Shooting Mode"
 msgstr "Chế độ chụp bằng nút giữa"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 msgid "Center Button Playback Mode"
 msgstr "Chế độ phát lại bằng nút giữa"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr "Bộ đa chọn"
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr "Phát lại thông tin ảnh"
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr "Gán nút chức năng"
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr "Tùy chỉnh đĩa lệnh"
 
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 msgid "Aperture Setting"
 msgstr "Giá trị độ mở"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr "Nút và Hộp thoại"
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr "Không thẻ nhớ CF bấm máy"
 
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 msgid "Center Button Zoom Ratio"
 msgstr "Tỷ lệ phóng to bằng nút giữa"
 
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 msgid "Function Button 2"
 msgstr "Nút chức năng 2"
 
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 msgid "Normal AF On"
 msgstr "AF chuẩn đã bật"
 
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 msgid "Clean Image Sensor"
 msgstr "Lau cảm biến ảnh"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 msgid "Image Comment String"
 msgstr "Chuỗi ghi chú ảnh"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 msgid "Image Comment Enable"
 msgstr "Bật ghi chú ảnh"
 
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 msgid "Image Rotation"
 msgstr "Xoay ảnh"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr "Đặt số ống kính bằng tay"
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr "Kích cỡ màn hình phim"
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr "Tiếng nói phim"
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr "Mic quay phim"
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr "Khe thẻ nhớ Quay phim"
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr "Tắt theo dõi trễ"
 
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 msgid "Bracketing Enable"
 msgstr "Bật Bủa vây"
 
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 msgid "Exposure Bracketing Step"
 msgstr "Bước Phơi sáng Bủa vây"
 
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 msgid "Exposure Bracketing Program"
 msgstr "Trình đặt Phơi sáng Bủa vây"
 
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 msgid "Auto Exposure Bracket Count"
 msgstr "Số lượng Phơi sáng Bủa vây Tự động"
 
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 msgid "White Balance Bracket Step"
 msgstr "Bước Bủa vây cân bằng trắng"
 
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 msgid "White Balance Bracket Program"
 msgstr "Trình Bủa vây cân bằng trắng"
 
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 msgid "Lens ID"
 msgstr "Mã số ống kính"
 
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 msgid "Lens Sort"
 msgstr "Sắp xếp Ống kính"
 
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 msgid "Lens Type"
 msgstr "Kiểu ống kính"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr "Tiêu cự nhỏ nhất"
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr "Tiêu cự lớn nhất"
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Độ mở cực đại ở tiêu cự nhỏ nhất"
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Độ mở cực đại ở tiêu cự lớn nhất"
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr "Hiển thị ISO Tìm"
 
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 msgid "Auto Off Photo"
 msgstr "Tự động tắt ảnh chụp"
 
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 msgid "Auto Off Menu"
 msgstr "Tự động tắt trình đơn"
 
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 msgid "Auto Off Info"
 msgstr "Tự động tắt thông tin"
 
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 msgid "Self Timer Shot Number"
 msgstr "Số tự hẹn giờ lần chụp"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr "Điều khiển làm mờ nét ảnh"
 
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 msgid "Nikon Exposure Time"
 msgstr "Thời gian phơi sáng Nikon"
 
-#: camlibs/ptp2/ptp.c:5176
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
 msgstr "Trạng thái Cảnh báo"
 
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Chế độ đầu 2"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr "Máy nhạy AF hoạt động"
 
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 msgid "Exposure Meter"
 msgstr "Cái đo Phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 msgid "USB Speed"
 msgstr "Tốc độ USB"
 
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 msgid "CCD Serial Number"
 msgstr "Số Sê-ri CCD"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr "Loại PTN Nhóm"
 
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 msgid "FNumber Lock"
 msgstr "Khóa Số F"
 
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 msgid "Exposure Aperture Lock"
 msgstr "Khóa độ mở phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 msgid "TV Lock Setting"
 msgstr "Cài đặt khóa TV"
 
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 msgid "AV Lock Setting"
 msgstr "Cài đặt khóa AV"
 
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 msgid "Illum Setting"
 msgstr "Cài đặt chiếu sáng"
 
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 msgid "Focus Point Bright"
 msgstr "Điểm tiêu sáng"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr "Đèn nháy ngoài bị gắn nối"
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr "Trạng thái đèn nháy ngoài"
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr "Sắp xếp đèn nháy ngoài"
 
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 msgid "External Flash Mode"
 msgstr "Chế độ đèn nháy ngoài"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 msgid "External Flash Compensation"
 msgstr "Bù đèn nháy ngoài"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr "Hiệu ứng trám đầy ĐenTrắng"
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr "Độ sắc ĐenTrắng"
 
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 msgid "BW Contrast"
 msgstr "Tương phản ĐenTrắng"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr "Loại Cài đặt ĐenTrắng"
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr "Khe 2 chế độ Lưu"
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr "Chế độ bit thô"
 
-#: camlibs/ptp2/ptp.c:5251
-msgid "Flourescent Type"
+#: camlibs/ptp2/ptp.c:6951
+#, fuzzy
+msgid "Fluorescent Type"
 msgstr "Loại huỳnh quang"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr "Chỉnh nhiệt độ màu"
 
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 msgid "Tune Preset 0"
 msgstr "Chỉnh định sẵn 0"
 
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 msgid "Tune Preset 1"
 msgstr "Chỉnh định sẵn 1"
 
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 msgid "Tune Preset 2"
 msgstr "Chỉnh định sẵn 2"
 
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 msgid "Tune Preset 3"
 msgstr "Chỉnh định sẵn 3"
 
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 msgid "Tune Preset 4"
 msgstr "Chỉnh định sẵn 4"
 
-#: camlibs/ptp2/ptp.c:5267
-msgid "Autofocus Mode"
-msgstr "Chế độ tự động lấy nét"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr "Đèn giúp AF"
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Cài đặt ISO P/A/DVP tự động "
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr "Hiển thị lưới kính ngắm"
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr "Điện quản lý chế độ đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 msgid "Auto FP"
 msgstr "Tự động FP"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr "Hiển thị Cảnh báo"
 
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 msgid "Battery Cell Kind"
 msgstr "Loại bộ pin"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr "Tự động giới hạn cao ISO"
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr "Tốc độ Cao Liên tục"
 
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 msgid "Info Disp Setting"
 msgstr "Cài đặt Giải Thông tin"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr "Nút Xem thử"
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr "Nút Xem thử 2"
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr "Nút khóa AEAF 2"
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr "Hiển thị Chỉ báo"
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr "Ưu tiên kiểu pin"
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr "Khung bủa vây và Bước"
 
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 msgid "Live View Mode"
 msgstr "Chế độ xem trực tiếp"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr "Chế độ chạy xem trực tiếp"
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr "Trạng thái xem trực tiếp"
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr "Tỷ lệ phóng to ảnh xem trực tiếp"
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr "Điều kiện cấm xem trực tiếp"
 
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 msgid "Exposure Display Status"
 msgstr "Trạng thái hiển thị phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr "Trạng thái ngụ ý phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr "Trạng thái phần hiển thị lỗi"
 
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 msgid "Exposure Indicate Lightup"
 msgstr "Đèn ngụ ý phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr "Giá trị MRepeat đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 msgid "Flash MRepeat Count"
 msgstr "Đếm lần MRepeat đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr "Khoảng MRepeat đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr "Kích hoạt mục điều khiển ảnh"
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr "Đổi mục điều khiển ảnh"
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
-msgstr "ISO"
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "Nhà sản xuất máy ảnh"
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7090
+#, fuzzy
+msgid "Release without SD card"
+msgstr "Bấm máy không có thẻ nhớ CF"
+
+#: camlibs/ptp2/ptp.c:7098
 msgid "Image Compression"
 msgstr "Nén ảnh"
 
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 msgid "Secure Time"
 msgstr "Thời gian bảo mật"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr "Chứng nhận thiết bị"
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr "Thông tin hủy bỏ"
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr "Bên khác đồng bộ hóa"
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr "Tên thiết bị thân thiện"
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr "Mức âm lượng"
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
 msgstr "Biểu tượng thiết bị"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr "Thông tin khởi tạo phiên"
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr "Kiểu thiết bị đã thấy"
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr "Tốc độ phát lại"
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr "Đối tượng phát lại"
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr "Chỉ mục độ chứa phát lại"
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr "Vị trí phát lại"
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr "PlaysForSure ID"
 
-#: camlibs/ptp2/ptp.c:5419
-msgid "Quality"
-msgstr "Chất lượng"
-
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 msgid "Release Mode"
 msgstr "Chế độ bấm máy"
 
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 msgid "Focus Areas"
 msgstr "Vùng lấy nét"
 
-#: camlibs/ptp2/ptp.c:5422
-msgid "AE Lock"
-msgstr "Khóa AE"
+#: camlibs/ptp2/ptp.c:7326
+#, fuzzy
+msgid "Focus Point"
+msgstr "Điểm tiêu"
 
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 msgid "Image size"
 msgstr "Cỡ ảnh"
 
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 msgid "Shutter speed"
 msgstr "Tốc độ màn trập"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr "Nhiệt độ màu"
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 msgid "Focus status"
 msgstr "Tình trạng lấy nét"
 
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 msgid "Objects in memory"
 msgstr "Đối tượng trong bộ nhớ"
 
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 msgid "Expose Index"
 msgstr "Chỉ số phơi sáng"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr "Bộ lọc AB"
 
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 msgid "Still Image"
 msgstr "Ảnh Still"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+#, fuzzy
+msgid "Near Far"
+msgstr "Gần 1"
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "Điểm vùng AF"
+
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "Ngày và Giờ"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f bước"
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 msgid "JPEG Norm"
 msgstr "JPEG chuẩn"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG cơ bản"
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr "Nóng sáng"
 
-#: camlibs/ptp2/ptp.c:5632
+#: camlibs/ptp2/ptp.c:7846
+msgid "Manual Focus"
+msgstr "Lấy nét thủ công"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr "Vĩ lệnh tự động (gần)"
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr "Trung bình nặng giữa"
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr "Điểm giữa"
 
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 msgid "Automatic flash"
 msgstr "Tự động nháy đèn"
 
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 msgid "Automatic Red-eye Reduction"
 msgstr "Tự động giảm mắt đỏ"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 msgid "Red-eye fill flash"
 msgstr "Nháy đèn đầy mắt đỏ"
 
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 msgid "Power Wind"
 msgstr "Máy quay"
 
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 msgid "Timer + Remote"
 msgstr "Hẹn giờ + điều khiểm từ xa"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr "Chỉ khóa AF"
 
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 msgid "Flash Lock"
 msgstr "Khóa đèn nháy"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr "Đặt lại điểm tiêu về tâm"
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr "Tô sáng điểm tiêu hoạt động"
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr "Chưa dùng"
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr "SDRAM"
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr "USB 1.1"
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr "USB 2.0"
 
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 msgid "LCD Backlight"
 msgstr "Chiếu sáng mặt sau LCD"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr "Chiếu sáng mặt sau LCD và Hiển thị thông tin"
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 msgid "1 min"
 msgstr "1 phút"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr "5 phút"
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr "10 phút"
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr "15 phút"
 
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 msgid "Dark on light"
 msgstr "Tối trên sáng"
 
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 msgid "Light on dark"
 msgstr "Sáng trên tối"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr "Iôn Lithi"
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr "Ni hyddrua"
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr "Ni Cd"
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr "Kiềm Mn"
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr "Cảnh báo cấp 1"
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr "Khẩn cấp"
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr "Cảnh báo cấp 0"
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr "Ít mực"
 
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "Cực tốt"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr "Bỏ mắt đỏ"
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr "Đồng bộ hóa thấp tốc"
 
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 msgid "Auto + Red Eye Suppression"
 msgstr "Tự động, giảm mắt đỏ"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr "Bật, giảm mắt đỏ"
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr "Xem xa"
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr "Cửa chập cao tốc"
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr "Cửa chập thấp tốc"
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr "Xem đêm"
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr "Mức xám"
 
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 msgid "Pan Focus"
 msgstr "Tiêu điểm kéo ngang"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr "Chụp khung đơn"
 
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 msgid "Continuous Shooting"
 msgstr "Chụp liên tiếp"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr "Chụp hẹn giờ (đơn)"
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr "Chụp thấp tốc liên tục"
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr "Chụp cao tốc liên tiếp"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2×"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4×"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr "Mịn"
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr "Đo nặng giữa"
 
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 msgid "Spot Metering"
 msgstr "Đo ít"
 
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 msgid "Average Metering"
 msgstr "Đo trung bình"
 
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 msgid "Evaluative Metering"
 msgstr "Đo đánh giá"
 
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 msgid "Partial Metering"
 msgstr "Đo bộ phạn"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr "Đo trung bình nặng giữa"
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr "Đo ít cũng cũng khóa chuyển với khung AF"
 
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 msgid "Multi-Spot Metering"
 msgstr "Đo ít (nhiều điểm)"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr "Chức năng cửa chấp thấp cao không sẵn dùng"
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr "Thấp 2"
 
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 msgid "High 2"
 msgstr "Cao 2"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr "Trên 1"
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr "Trên 2"
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr "Tham số rửa phim ảnh tiêu chuẩn"
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 msgid "Development Parameters 1"
 msgstr "Tham số rửa phim ảnh 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 msgid "Development Parameters 2"
 msgstr "Tham số rửa phim ảnh 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 msgid "Development Parameters 3"
 msgstr "Tham số rửa phim ảnh 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr "MlSpotPosCenter"
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr "MlSpotPosAfLink"
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr "Thẻ nhớ ảnh/nhạc"
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr "Nhóm thẻ nhớ ảnh/nhạc"
 
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 msgid "Encounter"
 msgstr "Encounter"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr "Encounter Box"
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr "M4A"
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr "Định dạng ảnh Windows"
 
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 msgid "Undefined Audio"
 msgstr "Âm thanh chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr "Audible.com Codec"
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr "Danh mục nhạc Samsung"
 
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 msgid "Undefined Video"
 msgstr "Phim chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 msgid "Undefined Collection"
 msgstr "Tập hợp chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr "Tập ảnh/nhạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr "Tập ảnh Abstract"
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr "Tập nhạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr "Tập phim Abstract"
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr "Danh mục ảnh/nhạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr "Nhóm liên lạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr "Thư mục tin nhắn Abstract"
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr "Sự Trình Bày Tập Abstract"
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr "Danh mục nhạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr "Danh mục ảnh Abstract"
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr "Abstract Mediacast"
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr "Danh mục nhạc WPL"
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr "Danh mục nhạc M3U"
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr "Danh mục nhạc MPL"
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr "Danh mục nhạc ASX"
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr "Danh mục nhạc PLS"
 
-#: camlibs/ptp2/ptp.c:6314
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
 msgstr "Tài liệu chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr "Tài liệu Abstract"
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr "Tài liệu XML"
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr "Tài liệu Word của Microsoft™"
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr "Tài liệu HTML đã biên dịch MHT"
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr "Bảng tính Excel của Microsoft™ (.xls)"
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr "Trình diễn PowerPoint của Microsoft™ (.ppt)"
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
 msgstr "Tin nhắn chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr "Tin nhắn Abstract"
 
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 msgid "Undefined Contact"
 msgstr "Liên lạc chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr "Liên lạc Abstract"
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr "Mục lịch chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr "Mục lịch Abstract"
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr "Tập tin có khả năng thực hiện Windows chưa xác định"
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr "Quảng bá ảnh/nhạc"
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr "Phần"
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Không rõ (%04x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr "Lấy thông tin về thiết bị"
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 msgid "Open session"
 msgstr "Mở phiên chạy"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 msgid "Close session"
 msgstr "Đóng phiên chạy"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr "Lấy các mã hiệu cất giữ"
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr "Lấy thông tin cất giữ"
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr "Lấy số đối tượng"
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr "Lấy các móc đối tượng"
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr "Lấy thông tin về đối tượng"
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr "Lấy đối tượng"
 
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 msgid "Get thumbnail"
 msgstr "Lấy ảnh mẫu"
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
 msgstr "Xóa đối tượng"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
 msgstr "Gửi thông tin về đối tượng"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
 msgstr "Gửi đối tượng"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr "Bắt đầu chụp"
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
 msgstr "Định dạng kho"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr "Đặt lại thiết bị"
 
-#: camlibs/ptp2/ptp.c:6406
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
 msgstr "Tự thử thiết bị"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr "Đặt sự bảo vệ đối tượng"
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr "Tắt thiết bị"
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr "Lấy mô tả thuộc tính thiết bị"
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr "Lấy giá trị thuộc tính thiết bị"
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr "Đặt giá trị thuộc tính thiết bị"
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr "Đặt lại giá trị thuộc tính thiết bị"
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr "Kết thúc mở chụp"
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr "Chuyển đối tượng"
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr "Chép đối tượng"
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr "Lấy đối tượng bộ phạn"
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr "Khởi tạo chụp mở"
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr "Chạy các bộ xử lý đếm"
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr "Bộ xử lý đếm"
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr "Dừng các bộ xử lý đếm"
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr "Lấy bản đồ nhà sản xuất phần mở rộng"
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr "Lấy thông tin nhà sản xuất thiết bị"
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr "Lấy đối tượng ảnh đổi cỡ"
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr "Lấy Manifest Hệ thống tập tin"
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr "Lấy thông tin luồng dữ liệu"
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr "Lấy luồng dữ liệu"
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr "Lấy các thuộc tính đối tượng đã hỗ trợ"
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr "Lấy mô tả thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr "Lấy giá trị thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr "Đặt giá trị thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr "Lấy danh sách thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr "Đặt danh sách thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr "Lấy mô tả thuộc tính phụ thuộc vào nhau"
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr "Gửi danh sách thuộc tính đối tượng"
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr "Lấy các tham chiếu đối tượng"
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr "Đặt các tham chiếu đối tượng"
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr "Cập nhật Firmware thiết bị"
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr "Nhảy tới vị trí kế trong danh mục nhạc"
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr "Lấy yêu cầu giờ bảo mật"
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr "Lấy đáp ứng giờ bảo mật"
 
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 msgid "Set license response"
 msgstr "Đặt đáp ứng giấy phép"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
 msgstr "Lấy danh sách đồng bộ"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr "Gửi truy vấn yêu cầu cái đo"
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr "Lấy yêu cầu cái đo"
 
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 msgid "Get meter response"
 msgstr "Lấy đáp ứng cái đo"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
 msgstr "Xóa sạch kho dữ liệu"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr "Lấy tình trạng giấy phép"
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr "Gửi lệnh WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr "Gửi yêu cầu WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr "Thông báo các mục đã Thêm/Xóa"
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr "Thông báo các mục đã giành được"
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr "Lấy các kiểu danh mục phát có thể truyền"
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr "Gửi yêu cầu ứng dụng WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr "Lấy trả lời ứng dụng WMDRM-PD"
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr "Bật các thao tác tập tin đã tin cậy"
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr "Tắt các thao tác tập tin đã tin cậy"
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr "Kết thúc phiên chạy ứng dụng tin cậy"
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr "Mở phiên chạy ảnh/nhạc"
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr "Đóng buổi hợp ảnh/nhạc"
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr "Lấy khối dữ liệu kế"
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr "Đặt vị trí giờ hiện tại"
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr "Gửi yêu cầu đăng ký"
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr "Lấy đáp ứng đăng ký"
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr "Lấy yêu cầu trạng thái gần"
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr "Gửi đáp ứng trạng thái gần"
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr "Gửi yêu cầu giấy phép WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr "Lấy đáp ứng giấy phép WMDRM-ND"
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr "Xử lý đối tượng WFC"
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr "Lấy Đối tượng Riêng (64bit Offset)"
 
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 msgid "Send Partial Object"
 msgstr "Gửi Đối tượng Riêng"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr "Xén ngắn Đối tượng"
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr "Bắt đầu Sửa Đối tượng"
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr "Kết thúc Sửa Đối tượng"
 
-#: camlibs/ptp2/ptp.c:6737
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
 msgstr "Không hiểu PTP_OC"
 
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 msgid "Unknown VendorExtensionID"
 msgstr "Không hiểu Mã nhà sản xuất Phần mở rộng"
 
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "Giá trị không rõ"
-
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 msgid "Downloading movie..."
 msgstr "Đang tải về phim…"
 
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 msgid "Downloading audio..."
 msgstr "Đang tải về âm thanh…"
 
-#: camlibs/ricoh/g3.c:377
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
 msgstr "Đang tải về dữ liệu EXIF…"
 
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Không có dữ liệu EXIF sẵn sàng cho %s."
 
-#: camlibs/ricoh/g3.c:483
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
 msgstr "Không thể xóa tập tin."
 
-#: camlibs/ricoh/g3.c:511
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
 msgstr "Không thể gỡ bỏ thư mục."
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
 msgstr "Không thể tạo thư mục."
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:563
 #, c-format
 msgid "Version: %s\n"
 msgstr "Phiên bản: %s\n"
 
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr "Trạng thái RTC: %d\n"
 
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Giờ máy ảnh: %s %s\n"
 
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "Mã hiệu máy ảnh: %s\n"
 
-#: camlibs/ricoh/g3.c:581
+#: camlibs/ricoh/g3.c:586
 #, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Không có thẻ nhớ SD đã nạp.\n"
 
-#: camlibs/ricoh/g3.c:584
+#: camlibs/ricoh/g3.c:589
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr "Mã hiệu thẻ nhớ SD: %s\n"
 
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Ảnh trên máy ảnh: %d\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr "Bộ nhớ SD: %d MB tổng, %d MB trống.\n"
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr "Bộ nhớ nội bộ: %d MB tổng, %d MB trống.\n"
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -10442,7 +12997,7 @@
 "Thiết kế đối chiếu dùng USB Snoopy, xem lại\n"
 "ảnh cập nhật Firmware và đoán phóng túng.\n"
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -10454,12 +13009,12 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "dựa vào trình điều khiển của Bob Paauwe.\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "không rõ (0x%02x)"
 
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -10468,193 +13023,193 @@
 "Mô hình: %s\n"
 "Bộ nhớ: %d byte trên %d có thể sử dụng"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2,0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1,5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1,0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0,5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0,5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 × 960"
 
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "Ở ngoài"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "Tối đa"
 
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "Tối thiểu"
 
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "Ký tự"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "Ảnh và Âm thanh"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "Ký tự và Âm thanh"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "Chung"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "Tác quyền (tối đa 20 ký tự)"
 
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "Ảnh"
 
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "Lớp trắng:"
 
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "Chế độ thu"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "Nén"
 
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Không hỗ trợ tốc độ %i!"
 
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Cần %i, còn nhận %i. Hãy thông báo lỗi này cho %s."
 
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Cần %i byte, còn nhận %i. Hãy thông báo lỗi này cho %s."
 
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Cần 0x%x, còn nhận 0x%x. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Ký tự sai (0x%x, 0x%x). Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Máy ảnh đang bận. Cứ gặp khó khăn này thì liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Quá thời ngay cả sau hai lần thử lại. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Lỗi giao thông ngay cả sau hai lần thử lại. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Máy ảnh trong chế độ không đúng. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Máy ảnh đã không chấp nhận các tham số. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Gặp lỗi không rõ. Hãy liên lạc với %s."
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "Độ dài của tên tập tin không thể vượt quá 12 ký tự (”%s” có %i ký tự)."
 
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -10666,108 +13221,108 @@
 "Lutz Mueller <lutz@users.sourceforge.net> đã chuyển nó sang gphoto2.\n"
 "Marcus Meissner <marcus@jet.franken.de> đã sửa chữa và tăng cường bản chuyển."
 
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "Độ phân giải cộng với kích cỡ"
 
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "Ngày và giờ (GMT)"
 
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 msgid "Aperture Settings"
 msgstr "Cài đặt độ mở"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "Chế độ màu"
 
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "Giảm mắt đỏ"
 
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "Cài đặt đèn nháy"
 
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 msgid "Host power save (seconds)"
 msgstr "Tiết kiệm điện máy chủ (giây)"
 
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 msgid "Camera power save (seconds)"
 msgstr "Tiết kiệm điện máy ảnh (giây)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "Chế độ ống kính"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "Tiếng Hàn Quốc"
 
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "Tiếng Anh"
 
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "Tiếng Nhật"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "Tiếng Bồ Đào Nha"
 
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "Cài đặt ảnh"
 
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -10792,34 +13347,34 @@
 "(translation-team-vi@lists.sourceforge.net)\n"
 "và chúng tôi sẽ dịch cho bạn)\n"
 
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "Không có thẻ nhớ nào"
 
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "Không thể lấy dung lượng pin"
 
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "Máy ảnh có pin quá yếu (%d%%) nên thao tác bị hủy bỏ."
 
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "Không thể lấy bộ nhớ còn trống"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "Máy ảnh đã từ chối ba lần bảo tồn sự kết nối mở."
 
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Byte đầu tiên được nhận (0x%x) không phải hợp lệ."
 
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
@@ -10827,49 +13382,49 @@
 "Việc truyền gói tin đã quá thời, ngay cả sau %i lần thử lại. Hãy liên lạc "
 "với %s."
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "Không thể gửi gói tin, ngay cả sau vài lần thử lại."
 
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "Gói tin bị máy ảnh từ chối. Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Không thể gửi gói tin (mã lỗi %i). Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "Tiến trình gửi đã quá thời, ngay cả sau hai lần thử lại, nên chịu thua…"
 
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Nhận được kết quả bất thường 0x%x. Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Nhận được trả lời bất thường (%i). Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "Không thể lấy thanh ghi %i. Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "Quá nhiều lần thử lại đã không thành công."
 
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "Đang gửi dữ liệu…"
 
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -10877,145 +13432,141 @@
 "hàm gọi đệ qui không phải được trình điều khiển sierra hỗ trợ. Hãy liên lạc "
 "với %s."
 
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "Không thể lấy thanh ghi chuỗi %i. Hãy liên lạc với %s."
 
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "Cần 32 byte, nhưng lại nhận được %i. Hãy liên lạc với %s."
 
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Tốc độ của chập theo micrô-giây (0 tự động)"
 
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "Tốc độ chập (theo giây)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr "Đen/trắng"
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr "Chống mắt đỏ"
 
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 msgid "Slow-sync"
 msgstr "Đồng bộ chậm"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "Tương phản+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "Tương phản-"
 
-#: camlibs/sierra/nikon-desc.c:256
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
 msgstr "Độ sáng+"
 
-#: camlibs/sierra/nikon-desc.c:257
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
 msgstr "Độ sáng-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "Điều chỉnh ảnh"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr "Chớp"
 
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "Chế độ LED"
 
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 msgid "Infinity"
 msgstr "Vô hạn"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr "Xem thử ảnh mẫu"
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr "Kế tiếp"
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr "Kế trước"
 
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "Chế độ thao tác"
 
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "Độ sáng LCD"
 
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Tự động tắt LCD (giây)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr "Nặng giữa"
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr "Ma trận"
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr "Chấm AF"
 
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "Đo phơi sáng"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "Thu phóng (theo mili-mét)"
 
-#: camlibs/sierra/nikon-desc.c:543
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "không có"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr "Khóa AE"
 
-#: camlibs/sierra/nikon-desc.c:547
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
 msgstr "Mắt cá"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr "Rộng"
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 msgid "Misc exposure/lens settings"
 msgstr "Cài đặt phơi sáng/ống kính linh tinh"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "Khóa tự động phơi sáng"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -11044,7 +13595,7 @@
 "      \tHãy đặt máy ảnh trong chế độ “M”\n"
 "\tđể đặt tốc độ của chập.\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 msgid ""
 "Nikon Coolpix 995:\n"
 "    Camera configuration (preferences) for this\n"
@@ -11064,67 +13615,63 @@
 "\n"
 "    \tTiến trình tải xuống nên chạy được.\n"
 
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 msgid "White board"
 msgstr "Bảng trắng"
 
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 msgid "Black board"
 msgstr "Bảng đen"
 
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 msgid "Color or Function Mode"
 msgstr "Chế độ Màu hay Chức năng"
 
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 msgid "Slow"
 msgstr "Chậm"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr "Tô đầy chống mắt đỏ"
 
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 msgid "Fluorescent-1-home-6700K"
 msgstr "Fluorescent-1-home-6700K"
 
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 msgid "Fluorescent-2-desk-5000K"
 msgstr "Fluorescent-2-desk-5000K"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr "Fluorescent-3-office-4200K"
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr "Chạng vạng"
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr "Màn hình"
 
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "Chế độ LDC"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "Thu/phóng số"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "Vị trí lấy nét"
 
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "Định dạng thời gian"
 
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -11164,7 +13711,7 @@
 "    thì bạn nên tái kết nối máy ảnh đến máy tính,\n"
 "    rồi chuyển đổi LCD sang “Off” (tắt)."
 
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
 "(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
@@ -11196,7 +13743,7 @@
 "    thì bạn nên kết nối lại máy ảnh đến máy tính,\n"
 "    rồi chuyển đổi LCD sang “Off” (tắt)."
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -11225,229 +13772,234 @@
 "    mã nguồn để hỗ trợ cấu hình hoàn tất, hãy liên lạc\n"
 "    với hộp thư chung nhà phát triển (tiếng Anh).\n"
 
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (không rõ)"
+
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "Tập tin cần tải lên có độ dài vô giá trị"
 
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "Không đủ chỗ trên thẻ nhớ"
 
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Không thể lấy tên của thư mục chứa các ảnh"
 
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Chỉ hỗ trợ khả năng tải lên thư mục “%s”"
 
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "Tốt nhất"
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (không rõ)"
 
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Tốc độ chập (micrô-giây, 0 là tự động)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "Đen/Trắng"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "Bảng trắng"
 
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "Bảng đen"
 
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "Độ tương phản/sáng"
 
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "Sáng+"
 
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "Sáng-"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "Cửa sổ ở mái nhà"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "Vô hạn/Mắt cá"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "Chế độ đo chấm"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6×"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5×"
 
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "Tự động tắt (máy chủ) theo giây"
 
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr "Bao lâu đến khi máy ảnh tự tắt khi được kết nối đến máy tính?"
 
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "Tự động tắt (trường) theo giây"
 
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "Bao lâu đến khi máy ảnh tự tắt khi không được kết nối đến máy tính?"
 
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "Tự động tắt LCD (theo giây)"
 
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "Cài đặt chụp"
 
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "chuẩn"
 
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "màu"
 
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "đen trắng"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "Ghi chú: không có thẻ nhớ, một số giá trị có thể không hợp lệ\n"
 
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, c-format
 msgid "Camera Model: %s\n"
 msgstr "Mô hình máy ảnh: %s\n"
 
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, c-format
 msgid "Serial Number: %s\n"
 msgstr "Số sản xuất: %s\n"
 
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, c-format
 msgid "Software Rev.: %s\n"
 msgstr "Bản sửa đổi phần mềm: %s\n"
 
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, c-format
 msgid "Frames Taken: %i\n"
 msgstr "Khung đã chụp: %i\n"
 
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, c-format
 msgid "Frames Left: %i\n"
 msgstr "Khung còn lại: %i\n"
 
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, c-format
 msgid "Battery Life: %i\n"
 msgstr "Thời gian pin: %i\n"
 
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "Bộ nhớ còn lại: %i byte\n"
 
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, c-format
 msgid "Date: %s"
 msgstr "Ngày: %s"
 
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 msgid "No camera manual available.\n"
 msgstr "Không có sẵn sổ tay máy ảnh.\n"
 
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -11473,7 +14025,7 @@
 "(translation-team-vi@lists.sourceforge.net)\n"
 "và chúng tôi sẽ dịch cho bạn)\n"
 
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -11513,7 +14065,7 @@
 "    thì bạn nên tái kết nối máy ảnh đến máy tính,\n"
 "    rồi chuyển đổi LCD sang “Off” (tắt)."
 
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -11533,12 +14085,7 @@
 "đã cho phép dùng sự thực hiện hỗ trợ\n"
 "Olympus C-3030Z của họ cho USB."
 
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (không rõ)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11548,11 +14095,11 @@
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "Không thể áp dụng Cài đặt USB"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11573,7 +14120,7 @@
 "Trình điều khiển để truy cập máy ảnh Smal Ultrapocket, và các phiên bản OEM "
 "(slimshot)."
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -11585,7 +14132,7 @@
 "Máy ảnh Sonix.\n"
 "Chứa %i ảnh.\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -11620,7 +14167,7 @@
 "Không thể xóa một ảnh riêng lẻ\n"
 "nếu nó không phải là ảnh cuối cùng.\n"
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -11628,7 +14175,7 @@
 "Thư viện máy ảnh Sonix\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -11644,7 +14191,7 @@
 "\n"
 "Chuyển sang Gphoto2 bởi Bart van Leeuwen <bart@netage.nl>"
 
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -11657,7 +14204,7 @@
 "Tạo gốc bởi Mark Davies <mdavies@dial.pipex.com>\n"
 "Chuyển sang Gphoto2 bởi Raymond Penners <raymond@dotsphinx.com>"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -11670,12 +14217,12 @@
 "Tổng bộ nhớ:          %ikB\n"
 "Bộ nhớ còn trống:     %ikB\n"
 
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "Bản sửa đổi Firmware: %8s"
 
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -11683,7 +14230,7 @@
 "Trình điều khiển Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
@@ -11692,7 +14239,7 @@
 "CỰC NHANH:\n"
 " Tập tin: %d\n"
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -11709,7 +14256,7 @@
 "  Đã dùng: %8d\n"
 "Chỗ trống: %8d\n"
 
-#: camlibs/spca50x/library.c:295
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
 msgstr "Thư viện spca50x phiên bản v"
 
@@ -11780,12 +14327,12 @@
 "Trình điều khiển chung sq905\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr "Khung ảnh USB của bạn có một bộ chíp điều khiển ST2005\n"
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
@@ -11795,7 +14342,7 @@
 "Trình điều khiển gphoto dành cho thiết bị này cho phép bạn\n"
 "tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -11807,11 +14354,7 @@
 "Trình điều khiển này cho phép bạn\n"
 "tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr "Hướng"
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -11823,110 +14366,110 @@
 "Trình điều khiển cho các máy ảnh dùng bộ xử lý STV0674 ASIC.\n"
 "Giao thức được thiết kế đối chiếu dùng SnoopyPro\n"
 
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "Phơi sáng sai (rất có thể không đủ ánh sáng)"
 
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 msgid "Information on STV0680-based camera:\n"
 msgstr "Thông tin về máy ảnh dựa vào STV0680:\n"
 
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "Bản sửa đổi Firmware: %d.%d\n"
 
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "Bản sửa đổi ASIC: %d.%d\n"
 
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "Mã hiệu máy nhạy: %d.%d\n"
 
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "Máy ảnh được cấu hình cho ánh sáng nhấp nháy theo %dHz.\n"
 
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "Bộ nhớ máy ảnh: %d Mbit.\n"
 
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "Máy ảnh hỗ trợ ảnh mẫu.\n"
 
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "Máy ảnh hỗ trợ phim.\n"
 
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "Máy ảnh có ảnh đơn sắc.\n"
 
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "Máy ảnh có bộ nhớ.\n"
 
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "Máy ảnh hỗ trợ định dạng phim: "
 
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "Mã hiệu nhà sản xuất: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "Mã hiệu sản phẩm: %02x%02x\n"
 
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "Số lượng ảnh: %d\n"
 
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "Số ảnh tối đa: %d\n"
 
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "Độ rộng ảnh: %d\n"
 
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "Độ cao ảnh: %d\n"
 
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "Kích cỡ ảnh: %d\n"
 
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "Độ rộng ảnh thu nhỏ: %d\n"
 
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "Độ cao ảnh thu nhỏ: %d\n"
 
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "Kích cỡ ảnh thu nhỏ: %d\n"
 
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -11942,12 +14485,12 @@
 "Carsten Weinholz <c.weinholz@netcologne.de>\n"
 "Được mở rộng cho máy Aiptek PenCam và các máy ảnh STM USB chế độ đôi khác."
 
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "Đang lấy thông tin về %i tập tin…"
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -11961,19 +14504,19 @@
 "Mời bạn gửi báo cáo lỗi và ghi chú.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z chỉ dùng USB"
 
-#: camlibs/topfield/puppy.c:552
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
 msgstr "Cài đặt trình điều khiển"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr "Chế độ Tăng tốc"
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -11985,12 +14528,12 @@
 "Thư viện để tải xuống/lên tập tin từ một Topfield PVR.\n"
 "Chuyển từ puppy © Peter Urbanec <toppy at urbanec.net>\n"
 
-#: camlibs/topfield/puppy.c:659
+#: camlibs/topfield/puppy.c:647
 #, c-format
 msgid "Downloading %s..."
 msgstr "Đang tải về %s…"
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -12000,39 +14543,68 @@
 "David Hogue <david@jawa.gotdns.org>\n"
 "Trình điều khiển Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: camlibs/tp6801/library.c:84
+#, fuzzy, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr "Khung ảnh USB của bạn có một bộ chíp điều khiển ST2005\n"
+
+#: camlibs/tp6801/library.c:93
+#, fuzzy
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+"Khung ảnh dựa vào ST2205 có sẵn vài bộ phân giải khác nhau.\n"
+"Trình điều khiển gphoto dành cho thiết bị này cho phép bạn\n"
+"tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
+
+#: camlibs/tp6801/library.c:106
+#, fuzzy
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
+msgstr ""
+"Trình điều khiển khung ảnh USB ST2205\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"Trình điều khiển này cho phép bạn\n"
+"tải về, tải lên và xóa bỏ ảnh từ khung ảnh."
+
+#: libgphoto2/gphoto2-abilities-list.c:223
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr "Gặp lỗi nội bộ khi tìm các thư viện máy ảnh (tên đường dẫn quá dài ?)"
 
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Đang nạp các trình điều khiển máy ảnh từ “%s”…"
 
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Gặp lỗi trong thư viện V/R (”%s”): %s"
 
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "Không dò thấy máy ảnh."
 
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "Không phát hiện ra máy ảnh nào trên cổng %s"
 
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "Bạn cần phải đặt cổng trước khi khởi tạo máy ảnh."
 
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Không thể nạp trình điều khiển máy ảnh cần thiết “%s” (%s)."
 
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr ""
@@ -12072,12 +14644,12 @@
 msgid "This camera can not capture previews."
 msgstr "Máy ảnh này không thể ô xem thử chụp."
 
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Đường dẫn “%s” không phải tuyệt đối."
 
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -12086,120 +14658,156 @@
 "Bạn đã thử xóa “%s” khỏi thư mục “%s”, nhưng mà hệ thống tập tin không hỗ "
 "trợ khả năng xóa tập tin."
 
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "Vẫn còn có thư mục con trong thư mục “%s/%s” bạn đang thử gỡ bỏ."
 
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "Vẫn còn có tập tin trong thư mục “%s/%s” bạn đang thử gỡ bỏ."
 
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "Hệ thống tập tin này không hỗ trợ khả năng tải lên tập tin."
 
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr ""
 "Thư mục “%s” chỉ chứa %i tập tin, còn bạn đã yêu cầu một tập tin có số %i."
 
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Không tìm thấy tập tin “%s” trong thư mục “%s”."
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Không tìm thấy tập tin “%s”."
 
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "Hệ thống tập tin này không hỗ trợ khả năng lấy tập tin"
 
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Không rõ kiểu tập tin %i."
 
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "Hệ thống tập tin này không hỗ trợ khả năng lấy thông tin về tập tin"
 
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "Hệ thống tập tin này không hỗ trợ khả năng đặt thông tin về tập tin"
 
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Không thể thay đổi thuộc tính tập tin chỉ đọc như độ rộng/cao."
 
-#: libgphoto2/gphoto2-filesys.c:2457
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
 msgstr "Hệ thống tập tin này không hỗ trợ khả năng lấy thông tin cất giữ"
 
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "Dữ liệu bị hỏng"
 
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "Tập tin đã có"
 
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "Không hiểu mô hình"
 
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "Không tìm thấy thư mục"
 
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "Không tìm thấy tập tin"
 
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "Thư mục đã có"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
 msgstr "Đang xử lý vào/ra"
 
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "Đường dẫn không phải tuyệt đối"
 
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
 msgstr "Máy ảnh không thể chạy xong thao tác"
 
-#: libgphoto2/gphoto2-result.c:57
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
 msgstr "Lỗi HĐH khi liên lạc với máy ảnh"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "Không đủ chỗ chứa trống"
 
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "Lỗi thư viện máy ảnh không rõ"
 
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
+#, c-format
+#~ msgid "Unknown value %04d"
+#~ msgstr "Giá trị không rõ %04d"
+
+#~ msgid "Now value is not in enumeration."
+#~ msgstr "Hiện giờ giá trị không phải là kiểu kiểm đếm."
+
+#~ msgid "Setting 4"
+#~ msgstr "Cài đặt 4"
+
+#~ msgid "Setting 5"
+#~ msgstr "Cài đặt 5"
+
+#~ msgid "Setting 6"
+#~ msgstr "Cài đặt 6"
+
+#~ msgid "Setting 7"
+#~ msgstr "Cài đặt 7"
+
+#, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "%d giảm nhiễu đa Khung"
+
+#~ msgid "Custom WB 2"
+#~ msgstr "Cân bằng trắng Tự chọn 2"
+
+#~ msgid "Custom WB 3"
+#~ msgstr "Cân bằng trắng Tự chọn 3"
+
+#~ msgid "Custom WB 4"
+#~ msgstr "Cân bằng trắng Tự chọn 4"
+
+#~ msgid "Custom WB 5"
+#~ msgstr "Cân bằng trắng Tự chọn 5"
+
+#, c-format
 #~ msgid "Canon EOS Trigger Capture failed: 0x%x"
 #~ msgstr "Canon EOS Trigger Capture (Chụp) gặp lỗi: 0x%x"
 
@@ -12395,9 +15003,6 @@
 #~ msgid "PTP: EK Filename Invalid"
 #~ msgstr "PTP: tên tập tin EK không hợp lệ"
 
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP: lỗi V/R"
-
 #~ msgid "PTP: Error: bad parameter"
 #~ msgstr "PTP: lỗi: tham số sai"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/zh_CN.gmo -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/zh_CN.gmo Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/po/zh_CN.po -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/po/zh_CN.po Changed

@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgphoto2 2.5.13\n"
+"Project-Id-Version: libgphoto2 2.5.25\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2018-05-13 18:13+0200\n"
-"PO-Revision-Date: 2017-12-18 15:50+0800\n"
+"POT-Creation-Date: 2023-09-02 11:22+0200\n"
+"PO-Revision-Date: 2020-05-29 09:44-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 2.3.1\n"
 
 #: camlibs/adc65/adc65.c:242
 msgid ""
@@ -28,19 +28,19 @@
 "Adc65\n"
 "Benjamin Moos <benjamin@psnw.com>"
 
-#: camlibs/agfa-cl20/agfa_cl20.c:528
+#: camlibs/agfa-cl20/agfa_cl20.c:546
 #, c-format
 msgid ""
 "Camera appears to not be using CompactFlash storage\n"
 "Unfortunately we do not support that at the moment :-(\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:531
+#: camlibs/agfa-cl20/agfa_cl20.c:549
 #, c-format
 msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
 msgstr ""
 
-#: camlibs/agfa-cl20/agfa_cl20.c:539
+#: camlibs/agfa-cl20/agfa_cl20.c:557
 msgid ""
 "agfa_cl20\n"
 "The Agfa CL20 Linux Driver People!\n"
@@ -63,19 +63,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:99
+#: camlibs/ax203/library.c:88
 #, c-format
 msgid "Your USB picture frame has a AX203 chipset\n"
 msgstr ""
 
-#: camlibs/ax203/library.c:108
+#: camlibs/ax203/library.c:97
 msgid ""
 "AX203 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/ax203/library.c:121
+#: camlibs/ax203/library.c:110
 msgid ""
 "AX203 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -85,18 +85,20 @@
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/ax203/library.c:443 camlibs/st2205/library.c:542
+#: camlibs/ax203/library.c:432 camlibs/st2205/library.c:532
+#: camlibs/tp6801/library.c:427
 #, fuzzy
 msgid "Picture Frame Configuration"
 msgstr "相机配置"
 
-#: camlibs/ax203/library.c:446 camlibs/ax203/library.c:462
-#: camlibs/st2205/library.c:545 camlibs/st2205/library.c:569
+#: camlibs/ax203/library.c:435 camlibs/ax203/library.c:451
+#: camlibs/st2205/library.c:535 camlibs/st2205/library.c:559
+#: camlibs/tp6801/library.c:430 camlibs/tp6801/library.c:446
 msgid "Synchronize frame data and time with PC"
 msgstr ""
 
 # camlibs/barbie/barbie.c:149
-#: camlibs/barbie/barbie.c:359
+#: camlibs/barbie/barbie.c:349
 #, c-format
 msgid ""
 "Number of pictures: %i\n"
@@ -106,7 +108,7 @@
 "固件版本：%s"
 
 # camlibs/barbie/barbie.c:159
-#: camlibs/barbie/barbie.c:367
+#: camlibs/barbie/barbie.c:357
 msgid ""
 "Barbie/HotWheels/WWF\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -131,34 +133,34 @@
 " 授权。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:644
+#: camlibs/canon/canon.c:630
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:647
+#: camlibs/canon/canon.c:633
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
-#: camlibs/canon/canon.c:1210 camlibs/canon/canon.c:1597
-#: camlibs/canon/usb.c:559
+#: camlibs/canon/canon.c:1196 camlibs/canon/canon.c:1592
+#: camlibs/canon/usb.c:540
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1306 camlibs/canon/canon.c:1307
+#: camlibs/canon/canon.c:1297 camlibs/canon/canon.c:1298
 msgid "*UNKNOWN*"
 msgstr "*未知*"
 
-#: camlibs/canon/canon.c:1489
+#: camlibs/canon/canon.c:1484
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1632
+#: camlibs/canon/canon.c:1627
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
@@ -166,48 +168,48 @@
 msgstr ""
 
 # camlibs/canon/canon.c:651
-#: camlibs/canon/canon.c:2571
+#: camlibs/canon/canon.c:2567
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "名称“%s”(%i 个字符)太长(%i 个字符)，最多允许 30 个字符。"
 
-#: camlibs/canon/canon.c:2987
+#: camlibs/canon/canon.c:2983
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:3167
+#: camlibs/canon/canon.c:3163
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:3189
+#: camlibs/canon/canon.c:3185
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:3274
+#: camlibs/canon/canon.c:3270
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
 # camlibs/canon/canon.c:1490
-#: camlibs/canon/canon.c:3633
+#: camlibs/canon/canon.c:3629
 msgid "File protected."
 msgstr "文件已受到保护。"
 
-#: camlibs/canon/canon.c:3734
+#: camlibs/canon/canon.c:3730
 #, c-format
 msgid ""
 "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:4038
+#: camlibs/canon/canon.c:4034
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:4127
+#: camlibs/canon/canon.c:4123
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
@@ -216,68 +218,71 @@
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:638
+#: camlibs/canon/canon.h:640
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:222
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:247
+#: camlibs/canon/crc.c:235
 #, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:274
+#: camlibs/canon/crc.c:262
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1608
+#: camlibs/canon/library.c:80 camlibs/canon/library.c:1592
 msgid "Compatibility Mode"
 msgstr "兼容模式"
 
 # camlibs/stv0680/library.c:590
-#: camlibs/canon/library.c:97
+#: camlibs/canon/library.c:81
 msgid "Thumbnail"
 msgstr "缩略"
 
 # camlibs/polaroid/pdc700.c:999
-#: camlibs/canon/library.c:98
+#: camlibs/canon/library.c:82
 #, fuzzy
 msgid "Full Image"
 msgstr "图像"
 
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1901 camlibs/ptp2/config.c:1912
-#: camlibs/ptp2/config.c:2812 camlibs/ptp2/config.c:2840
-#: camlibs/ptp2/config.c:3680 camlibs/ptp2/config.c:3725
-#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:3866
-#: camlibs/ptp2/ptp.c:6030
+#: camlibs/canon/library.c:106 camlibs/canon/library.c:249
+#: camlibs/lumix/lumix.c:1170 camlibs/pentax/library.c:794
+#: camlibs/pentax/library.c:964 camlibs/ptp2/config.c:2058
+#: camlibs/ptp2/config.c:2069 camlibs/ptp2/config.c:3531
+#: camlibs/ptp2/config.c:3559 camlibs/ptp2/config.c:4632
+#: camlibs/ptp2/config.c:4677 camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:4771 camlibs/ptp2/config.c:5241
+#: camlibs/ptp2/config.c:5254 camlibs/ptp2/config.c:5258
+#: camlibs/ptp2/config.c:5301 camlibs/ptp2/ptp.c:8248
 #, c-format
 msgid "Bulb"
 msgstr ""
 
 # camlibs/konica/konica.c:107
-#: camlibs/canon/library.c:215
+#: camlibs/canon/library.c:199
 #, fuzzy
 msgid "Auto focus: one-shot"
 msgstr "自动聚焦错误。"
 
 # camlibs/konica/konica.c:107
-#: camlibs/canon/library.c:216
+#: camlibs/canon/library.c:200
 #, fuzzy
 msgid "Auto focus: AI servo"
 msgstr "自动聚焦错误。"
 
 # camlibs/konica/konica.c:107
-#: camlibs/canon/library.c:217
+#: camlibs/canon/library.c:201
 #, fuzzy
 msgid "Auto focus: AI focus"
 msgstr "自动聚焦错误。"
@@ -290,74 +295,78 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/canon/library.c:218
+#: camlibs/canon/library.c:202
 #, fuzzy
 msgid "Manual focus"
 msgstr "无手册"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/canon/library.c:223
+#: camlibs/canon/library.c:207
 #, fuzzy
 msgid "Beep off"
 msgstr "LED 模式"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/canon/library.c:224
+#: camlibs/canon/library.c:208
 #, fuzzy
 msgid "Beep on"
 msgstr "LED 模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:3490 camlibs/ptp2/config.c:5147
-#: camlibs/ptp2/ptp.c:5642
+#: camlibs/canon/library.c:213 camlibs/canon/library.c:264
+#: camlibs/ptp2/config.c:4388 camlibs/ptp2/config.c:7174
+#: camlibs/ptp2/ptp.c:7858
 #, fuzzy
 msgid "Flash off"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:230
+#: camlibs/canon/library.c:214
 #, fuzzy
 msgid "Flash on"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:231
+#: camlibs/canon/library.c:215
 #, fuzzy
 msgid "Flash auto"
 msgstr "闪光灯模式"
 
-#: camlibs/canon/library.c:258
+#: camlibs/canon/library.c:242
 msgid "AUTO"
 msgstr ""
 
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1908
-#: camlibs/ptp2/ptp.c:6024
+#: camlibs/canon/library.c:243 camlibs/pentax/library.c:769
+#: camlibs/pentax/library.c:780 camlibs/pentax/library.c:851
+#: camlibs/ptp2/config.c:2065 camlibs/ptp2/config.c:9423
+#: camlibs/ptp2/ptp.c:8242
 msgid "P"
 msgstr ""
 
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:6025
+#: camlibs/canon/library.c:244 camlibs/ptp2/ptp.c:8243
 msgid "Tv"
 msgstr ""
 
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:6026
+#: camlibs/canon/library.c:245 camlibs/ptp2/ptp.c:8244
 msgid "Av"
 msgstr ""
 
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:6027
+#: camlibs/canon/library.c:246 camlibs/pentax/library.c:774
+#: camlibs/pentax/library.c:779 camlibs/pentax/library.c:849
+#: camlibs/ptp2/config.c:9426 camlibs/ptp2/ptp.c:8245
 msgid "M"
 msgstr ""
 
-#: camlibs/canon/library.c:263
+#: camlibs/canon/library.c:247
 msgid "A-DEP"
 msgstr ""
 
-#: camlibs/canon/library.c:264
+#: camlibs/canon/library.c:248
 msgid "M-DEP"
 msgstr ""
 
@@ -369,94 +378,94 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/canon/library.c:266
+#: camlibs/canon/library.c:250 camlibs/ptp2/config.c:6029
 #, fuzzy
 msgid "Manual 2"
 msgstr "无手册"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/canon/library.c:267
+#: camlibs/canon/library.c:251
 #, fuzzy
 msgid "Far scene"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:268
+#: camlibs/canon/library.c:252
 #, fuzzy
 msgid "Fast shutter"
 msgstr "快门速度 (秒)"
 
-#: camlibs/canon/library.c:269
+#: camlibs/canon/library.c:253
 msgid "Slow shutter"
 msgstr ""
 
-#: camlibs/canon/library.c:270
+#: camlibs/canon/library.c:254
 msgid "Night scene"
 msgstr ""
 
-#: camlibs/canon/library.c:271
+#: camlibs/canon/library.c:255
 msgid "Gray scale"
-msgstr ""
+msgstr "灰度"
 
 # camlibs/sierra/sierra.c:858 camlibs/sierra/sierra.c:867
 # camlibs/sierra/sierra.c:1173
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:1014
-#: camlibs/konica/qm150.c:1030 camlibs/ptp2/config.c:3515
-#: camlibs/ptp2/config.c:4457 camlibs/ptp2/ptp.c:6040 camlibs/ptp2/ptp.c:6175
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1314
+#: camlibs/canon/library.c:256 camlibs/konica/qm150.c:1003
+#: camlibs/konica/qm150.c:1019 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:4413 camlibs/ptp2/config.c:6123
+#: camlibs/ptp2/ptp.c:8258 camlibs/ptp2/ptp.c:8393 camlibs/ricoh/library.c:315
+#: camlibs/sierra/olympus-desc.c:475 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:991 camlibs/sierra/sierra.c:1301
 msgid "Sepia"
 msgstr "棕褐色"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1920
-#: camlibs/ptp2/config.c:2084 camlibs/ptp2/config.c:3040
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3080
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/config.c:3267
-#: camlibs/ptp2/config.c:4225 camlibs/ptp2/ptp.c:5656 camlibs/ptp2/ptp.c:5855
-#: camlibs/ptp2/ptp.c:6041 camlibs/st2205/library.c:515
-#: camlibs/st2205/library.c:528
+#: camlibs/canon/library.c:257 camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2369 camlibs/ptp2/config.c:3824
+#: camlibs/ptp2/config.c:3826 camlibs/ptp2/config.c:3873
+#: camlibs/ptp2/config.c:4091 camlibs/ptp2/config.c:4110
+#: camlibs/ptp2/config.c:5882 camlibs/ptp2/ptp.c:7872 camlibs/ptp2/ptp.c:8073
+#: camlibs/ptp2/ptp.c:8259 camlibs/st2205/library.c:505
+#: camlibs/st2205/library.c:518
 #, fuzzy
 msgid "Portrait"
 msgstr "对比度-"
 
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:2072
-#: camlibs/ptp2/config.c:3483 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
+#: camlibs/canon/library.c:258 camlibs/ptp2/config.c:2357
+#: camlibs/ptp2/config.c:4372 camlibs/sierra/nikon-desc.c:479
+#: camlibs/sierra/olympus-desc.c:768 camlibs/sierra/olympus-desc.c:784
 msgid "Spot"
 msgstr ""
 
 # camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:983
 # camlibs/sierra/sierra.c:1254 camlibs/sierra/sierra.c:1450
 # camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:243
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1035
-#: camlibs/ptp2/config.c:3044 camlibs/ptp2/config.c:3058
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/config.c:3269
-#: camlibs/ptp2/ptp.c:5658 camlibs/ptp2/ptp.c:6043 camlibs/ricoh/library.c:502
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1115
-#: camlibs/sierra/sierra.c:1120 camlibs/sierra/sierra.c:1399
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/canon/library.c:259 camlibs/kodak/dc210/dc210.c:243
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/konica/qm150.c:1024
+#: camlibs/ptp2/config.c:3828 camlibs/ptp2/config.c:3849
+#: camlibs/ptp2/config.c:4093 camlibs/ptp2/config.c:4112
+#: camlibs/ptp2/ptp.c:7874 camlibs/ptp2/ptp.c:8261 camlibs/ricoh/library.c:486
+#: camlibs/sierra/epson-desc.c:204 camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/olympus-desc.c:630 camlibs/sierra/sierra.c:1102
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/sierra.c:1808
 msgid "Macro"
 msgstr "巨大"
 
-#: camlibs/canon/library.c:276
+#: camlibs/canon/library.c:260
 msgid "BW"
 msgstr ""
 
 # camlibs/konica/library.c:777 camlibs/konica/library.c:1010
-#: camlibs/canon/library.c:277
+#: camlibs/canon/library.c:261
 #, fuzzy
 msgid "PanFocus"
 msgstr "聚焦"
 
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:4221
-#: camlibs/ptp2/config.c:4454 camlibs/ptp2/ptp.c:5851 camlibs/ptp2/ptp.c:6172
+#: camlibs/canon/library.c:262 camlibs/ptp2/config.c:5878
+#: camlibs/ptp2/config.c:6120 camlibs/ptp2/ptp.c:8069 camlibs/ptp2/ptp.c:8390
 msgid "Vivid"
 msgstr ""
 
@@ -468,135 +477,138 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:2086
-#: camlibs/ptp2/config.c:4455 camlibs/ptp2/ptp.c:6046 camlibs/ptp2/ptp.c:6173
+#: camlibs/canon/library.c:263 camlibs/ptp2/config.c:2371
+#: camlibs/ptp2/config.c:6121 camlibs/ptp2/ptp.c:8264 camlibs/ptp2/ptp.c:8391
 #, fuzzy
 msgid "Neutral"
 msgstr "普通"
 
-#: camlibs/canon/library.c:281
+#: camlibs/canon/library.c:265
 #, fuzzy
 msgid "Long shutter"
 msgstr "聚焦位置"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:266
 msgid "Super macro"
 msgstr ""
 
-#: camlibs/canon/library.c:283
+#: camlibs/canon/library.c:267
 msgid "Foliage"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
-#: camlibs/canon/library.c:284
-#, fuzzy
+#: camlibs/canon/library.c:268
 msgid "Indoor"
-msgstr "户外"
+msgstr "室内"
 
-#: camlibs/canon/library.c:285
+#: camlibs/canon/library.c:269
 msgid "Fireworks"
-msgstr ""
+msgstr "焰火"
 
-#: camlibs/canon/library.c:286
+#: camlibs/canon/library.c:270
 msgid "Beach"
-msgstr ""
+msgstr "沙滩"
 
-#: camlibs/canon/library.c:287
+#: camlibs/canon/library.c:271 camlibs/ptp2/config.c:1514
 msgid "Underwater"
-msgstr ""
+msgstr "水下"
 
-#: camlibs/canon/library.c:288
+#: camlibs/canon/library.c:272
 msgid "Snow"
-msgstr ""
+msgstr "雪地"
 
-#: camlibs/canon/library.c:289
+#: camlibs/canon/library.c:273
 msgid "Kids and pets"
-msgstr ""
+msgstr "孩童和宠物"
 
-#: camlibs/canon/library.c:290
+#: camlibs/canon/library.c:274
 msgid "Night snapshot"
 msgstr ""
 
-#: camlibs/canon/library.c:291
+#: camlibs/canon/library.c:275
 #, fuzzy
 msgid "Digital macro"
 msgstr "数字缩放"
 
 # camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
 # camlibs/sierra/sierra.c:1698
-#: camlibs/canon/library.c:292
+#: camlibs/canon/library.c:276
 #, fuzzy
 msgid "MyColors"
 msgstr "彩色"
 
-#: camlibs/canon/library.c:293
+#: camlibs/canon/library.c:277
 msgid "Photo in movie"
 msgstr ""
 
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1572
-#: camlibs/ptp2/config.c:2389 camlibs/ptp2/config.c:4923
-#: camlibs/ptp2/ptp.c:5617
+#: camlibs/canon/library.c:283 camlibs/ptp2/config.c:1525
+#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:2699
+#: camlibs/ptp2/config.c:6871 camlibs/ptp2/config.c:6889
+#: camlibs/ptp2/config.c:6908 camlibs/ptp2/ptp.c:7833
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:301
+#: camlibs/canon/library.c:285
 msgid "RAW 2"
 msgstr ""
 
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2397
-#: camlibs/ptp2/config.c:2399
+#: camlibs/canon/library.c:287 camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:2708 camlibs/ptp2/config.c:2710
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2396
-#: camlibs/ptp2/config.c:2398
+#: camlibs/canon/library.c:289 camlibs/ptp2/config.c:2707
+#: camlibs/ptp2/config.c:2709
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2395
+#: camlibs/canon/library.c:291 camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:2706
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2394
+#: camlibs/canon/library.c:293 camlibs/ptp2/config.c:2705
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2393
+#: camlibs/canon/library.c:295 camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:2704
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2392
+#: camlibs/canon/library.c:297 camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:2703
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2420
-#: camlibs/ptp2/config.c:2421
+#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:2736
+#: camlibs/ptp2/config.c:2737
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2408
-#: camlibs/ptp2/config.c:2409
+#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:2721
+#: camlibs/ptp2/config.c:2722
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2417
+#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2732
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2405
+#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2717
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2414
+#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2728
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2402
+#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2713
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:367
+#: camlibs/canon/library.c:351
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -615,51 +627,51 @@
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/canon/library.c:489
+#: camlibs/canon/library.c:473
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "相机不可用"
 
 # camlibs/canon/library.c:176
-#: camlibs/canon/library.c:509
+#: camlibs/canon/library.c:493
 msgid "Switching Camera Off"
 msgstr "关闭相机"
 
 # camlibs/canon/library.c:232
-#: camlibs/canon/library.c:579 camlibs/canon/library.c:613
+#: camlibs/canon/library.c:563 camlibs/canon/library.c:597
 msgid "Error capturing image"
 msgstr "捕获图像出错"
 
 # camlibs/canon/library.c:267
-#: camlibs/canon/library.c:669 camlibs/canon/library.c:1102
+#: camlibs/canon/library.c:653 camlibs/canon/library.c:1086
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "无法获取磁盘名：%s"
 
 # camlibs/canon/library.c:268
-#: camlibs/canon/library.c:670 camlibs/canon/library.c:1103
+#: camlibs/canon/library.c:654 camlibs/canon/library.c:1087
 msgid "No reason available"
 msgstr "不知缘由"
 
 # camlibs/canon/library.c:275
-#: camlibs/canon/library.c:677
+#: camlibs/canon/library.c:661
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "无法获取磁盘信息：%s"
 
-#: camlibs/canon/library.c:746
+#: camlibs/canon/library.c:730
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: camlibs/canon/library.c:769
+#: camlibs/canon/library.c:753
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # camlibs/canon/library.c:568
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1009
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -672,42 +684,42 @@
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "AC adapter"
 msgstr "交流变压器"
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1039
-#: camlibs/canon/library.c:1940 camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:1017 camlibs/canon/library.c:1023
+#: camlibs/canon/library.c:1927 camlibs/canon/library.c:1933
 msgid "on battery"
 msgstr "使用电池"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power OK"
 msgstr "电力充足"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:1035 camlibs/canon/library.c:1942
+#: camlibs/canon/library.c:1019 camlibs/canon/library.c:1929
 msgid "power bad"
 msgstr "电力不足"
 
 # camlibs/canon/library.c:586
-#: camlibs/canon/library.c:1043
+#: camlibs/canon/library.c:1027
 #, c-format
 msgid "not available: %s"
 msgstr "不可用：%s"
 
 # camlibs/canon/library.c:598
-#: camlibs/canon/library.c:1069
+#: camlibs/canon/library.c:1053
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (主机时间 %s%i 秒)"
 
 # camlibs/canon/library.c:608
-#: camlibs/canon/library.c:1079
+#: camlibs/canon/library.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -735,7 +747,7 @@
 "时间：%s\n"
 
 # camlibs/canon/library.c:625
-#: camlibs/canon/library.c:1137
+#: camlibs/canon/library.c:1121
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -757,28 +769,28 @@
 "Holger Klemm 添加\n"
 
 # camlibs/canon/library.c:664
-#: camlibs/canon/library.c:1181
+#: camlibs/canon/library.c:1165
 msgid "Error deleting file"
 msgstr "删除文件出错"
 
 # camlibs/canon/library.c:680
-#: camlibs/canon/library.c:1197
+#: camlibs/canon/library.c:1181
 msgid "Error deleting associated thumbnail file"
 msgstr "删除相关缩略图文件出错"
 
 # camlibs/canon/library.c:713
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1464
+#: camlibs/canon/library.c:1315 camlibs/canon/library.c:1448
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "该相机不支持高于 57600 的速度的上载"
 
 # camlibs/canon/library.c:730
-#: camlibs/canon/library.c:1348 camlibs/canon/library.c:1482
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1466
 msgid "Could not get flash drive letter"
 msgstr "无法获取闪存驱动字符"
 
 # camlibs/canon/library.c:754
-#: camlibs/canon/library.c:1390 camlibs/canon/library.c:1505
+#: camlibs/canon/library.c:1374 camlibs/canon/library.c:1489
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -787,53 +799,57 @@
 "已有 999 个佳能文件夹名称存在而且每个文件夹中都有照片 AUT_9999.JPG。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/library.c:1412 camlibs/canon/library.c:1525
+#: camlibs/canon/library.c:1396 camlibs/canon/library.c:1509
 msgid "Could not create \\DCIM directory."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:780
-#: camlibs/canon/library.c:1418 camlibs/canon/library.c:1531
+#: camlibs/canon/library.c:1402 camlibs/canon/library.c:1515
 msgid "Could not create destination directory."
 msgstr "无法创建目标目录。"
 
 # camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1578 camlibs/ptp2/config.c:7603
-#: camlibs/ptp2/config.c:8003
+#: camlibs/canon/library.c:1562 camlibs/pentax/library.c:627
+#: camlibs/ptp2/chdk.c:1054 camlibs/ptp2/config.c:11382
+#: camlibs/ptp2/config.c:11826
 msgid "Camera and Driver Configuration"
 msgstr "相机及驱动器配置"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/canon/library.c:1581 camlibs/ptp2/config.c:7535
-#: camlibs/ptp2/config.c:7536 camlibs/ptp2/config.c:7537
-#: camlibs/ptp2/config.c:7538 camlibs/ptp2/config.c:7539
-#: camlibs/ptp2/config.c:7540 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1185
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/canon/library.c:1565 camlibs/lumix/lumix.c:1102
+#: camlibs/pentax/library.c:630 camlibs/ptp2/config.c:11297
+#: camlibs/ptp2/config.c:11298 camlibs/ptp2/config.c:11299
+#: camlibs/ptp2/config.c:11300 camlibs/ptp2/config.c:11301
+#: camlibs/ptp2/config.c:11302 camlibs/sierra/epson-desc.c:268
+#: camlibs/sierra/nikon-desc.c:682 camlibs/sierra/nikon-desc.c:693
+#: camlibs/sierra/nikon-desc.c:704 camlibs/sierra/olympus-desc.c:1012
+#: camlibs/sierra/olympus-desc.c:1111 camlibs/sierra/olympus-desc.c:1122
+#: camlibs/sierra/olympus-desc.c:1135 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1648
 msgid "Camera Settings"
 msgstr "相机设置"
 
 # camlibs/canon/library.c:815 camlibs/canon/library.c:885
-#: camlibs/canon/library.c:1585 camlibs/canon/library.c:1988
-#: camlibs/ptp2/config.c:7189 camlibs/ptp2/config.c:7190
-#, fuzzy
+#: camlibs/canon/library.c:1569 camlibs/canon/library.c:1976
+#: camlibs/ptp2/config.c:10797 camlibs/ptp2/config.c:10798
 msgid "Owner Name"
 msgstr "所有者姓名"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/canon/library.c:1591 camlibs/canon/library.c:2002
+#: camlibs/canon/library.c:1575 camlibs/canon/library.c:1990
 #, fuzzy
 msgid "Capture Size Class"
 msgstr "照片设置"
 
-#: camlibs/canon/library.c:1630 camlibs/canon/library.c:2029
-#: camlibs/ptp2/config.c:7228 camlibs/ptp2/config.c:7229
-#: camlibs/ptp2/config.c:7231 camlibs/ptp2/config.c:7232
-#: camlibs/ptp2/config.c:7233 camlibs/ptp2/config.c:7420
-#: camlibs/ptp2/config.c:7424 camlibs/ptp2/ptp.c:4832
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
+#: camlibs/canon/library.c:1614 camlibs/canon/library.c:2017
+#: camlibs/ptp2/config.c:10855 camlibs/ptp2/config.c:10856
+#: camlibs/ptp2/config.c:10857 camlibs/ptp2/config.c:10859
+#: camlibs/ptp2/config.c:10860 camlibs/ptp2/config.c:10862
+#: camlibs/ptp2/config.c:10863 camlibs/ptp2/config.c:10864
+#: camlibs/ptp2/config.c:10865 camlibs/ptp2/config.c:10866
+#: camlibs/ptp2/config.c:11134 camlibs/ptp2/config.c:11138
+#: camlibs/ptp2/ptp.c:6299 camlibs/sierra/olympus-desc.c:876
+#: camlibs/sierra/olympus-desc.c:894
 msgid "ISO Speed"
 msgstr "ISO 速度"
 
@@ -845,124 +861,140 @@
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1650
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1677
-#: camlibs/canon/library.c:1703 camlibs/canon/library.c:1704
-#: camlibs/canon/library.c:1743 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1770 camlibs/canon/library.c:1771
-#: camlibs/canon/library.c:1801 camlibs/canon/library.c:1802
-#: camlibs/canon/library.c:1829 camlibs/canon/library.c:1830
-#: camlibs/canon/library.c:1857 camlibs/canon/library.c:1858
-#: camlibs/canon/library.c:1885 camlibs/canon/library.c:1886
-#: camlibs/ptp2/config.c:4256 camlibs/ptp2/config.c:4608
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/library.c:5897
-#: camlibs/ptp2/ptp.c:5801 camlibs/ptp2/ptp.c:5981 camlibs/ptp2/ptp.c:6071
-#, fuzzy, c-format
+#: camlibs/canon/library.c:1633 camlibs/canon/library.c:1634
+#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:1688
+#: camlibs/canon/library.c:1727 camlibs/canon/library.c:1728
+#: camlibs/canon/library.c:1754 camlibs/canon/library.c:1755
+#: camlibs/canon/library.c:1785 camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1813 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1841 camlibs/canon/library.c:1842
+#: camlibs/canon/library.c:1869 camlibs/canon/library.c:1870
+#: camlibs/pentax/library.c:673 camlibs/ptp2/config.c:5913
+#: camlibs/ptp2/config.c:6433 camlibs/ptp2/config.c:7296
+#: camlibs/ptp2/library.c:7921 camlibs/ptp2/ptp.c:8019 camlibs/ptp2/ptp.c:8199
+#: camlibs/ptp2/ptp.c:8289
+#, c-format
 msgid "Unknown"
-msgstr "%i (未知)"
+msgstr "未知"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:1657 camlibs/canon/library.c:2059
+#: camlibs/canon/library.c:1641 camlibs/canon/library.c:2047
 #, fuzzy
 msgid "Shooting mode"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:1684 camlibs/canon/library.c:2089
-#: camlibs/ptp2/config.c:7329 camlibs/ptp2/config.c:7330
-#: camlibs/ptp2/config.c:7334 camlibs/ptp2/config.c:7335
-#: camlibs/ptp2/config.c:7336 camlibs/ptp2/config.c:7337
-#: camlibs/ptp2/ptp.c:4834 camlibs/ptp2/ptp.c:5424
-#, fuzzy
+#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2077
+#: camlibs/pentax/library.c:699 camlibs/pentax/library.c:909
+#: camlibs/ptp2/config.c:11010 camlibs/ptp2/config.c:11011
+#: camlibs/ptp2/config.c:11012 camlibs/ptp2/config.c:11013
+#: camlibs/ptp2/config.c:11018 camlibs/ptp2/config.c:11019
+#: camlibs/ptp2/config.c:11020 camlibs/ptp2/config.c:11021
+#: camlibs/ptp2/config.c:11022 camlibs/ptp2/config.c:11023
+#: camlibs/ptp2/config.c:11024 camlibs/ptp2/ptp.c:6301 camlibs/ptp2/ptp.c:7325
 msgid "Shutter Speed"
-msgstr "快门速度 (秒)"
+msgstr "快门速度"
 
 # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
-#: camlibs/canon/library.c:1714 camlibs/canon/library.c:2269
+#: camlibs/canon/library.c:1698 camlibs/canon/library.c:2257
 #: camlibs/kodak/dc210/dc210.c:236 camlibs/kodak/dc210/dc210.c:398
-#: camlibs/konica/qm150.c:1049 camlibs/ptp2/config.c:7257
-#: camlibs/ptp2/ptp.c:4819 camlibs/ptp2/ptp.c:4845 camlibs/ricoh/library.c:503
-#: camlibs/sierra/sierra.c:1160 camlibs/sierra/sierra.c:1429
+#: camlibs/konica/qm150.c:1038 camlibs/lumix/lumix.c:1222
+#: camlibs/pentax/library.c:752 camlibs/ptp2/chdk.c:1030
+#: camlibs/ptp2/config.c:10904 camlibs/ptp2/config.c:10905
+#: camlibs/ptp2/config.c:10906 camlibs/ptp2/ptp.c:6286 camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:7564 camlibs/ricoh/library.c:487
+#: camlibs/sierra/sierra.c:1147 camlibs/sierra/sierra.c:1416
 msgid "Zoom"
 msgstr "缩放"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/canon/library.c:1724 camlibs/canon/library.c:2118
-#: camlibs/canon/library.c:2287 camlibs/ptp2/config.c:7321
-#: camlibs/ptp2/config.c:7322 camlibs/ptp2/config.c:7325
-#: camlibs/ptp2/ptp.c:4833 camlibs/ptp2/ptp.c:5423 camlibs/sierra/sierra.c:962
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1512
-#: camlibs/sierra/sierra.c:1753
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:2106
+#: camlibs/canon/library.c:2275 camlibs/lumix/lumix.c:1140
+#: camlibs/pentax/library.c:705 camlibs/pentax/library.c:931
+#: camlibs/ptp2/chdk.c:1027 camlibs/ptp2/config.c:10997
+#: camlibs/ptp2/config.c:10998 camlibs/ptp2/config.c:10999
+#: camlibs/ptp2/config.c:11002 camlibs/ptp2/config.c:11003
+#: camlibs/ptp2/config.c:11025 camlibs/ptp2/ptp.c:6300 camlibs/ptp2/ptp.c:7076
+#: camlibs/ptp2/ptp.c:7078 camlibs/ptp2/ptp.c:7324 camlibs/ptp2/ptp.c:7551
+#: camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:1272
+#: camlibs/sierra/sierra.c:1499 camlibs/sierra/sierra.c:1740
 msgid "Aperture"
 msgstr "光圈"
 
-#: camlibs/canon/library.c:1750 camlibs/canon/library.c:2146
-#: camlibs/ptp2/config.c:7262 camlibs/ptp2/config.c:7263
-#: camlibs/ptp2/config.c:7264 camlibs/ptp2/config.c:7265
-#: camlibs/ptp2/config.c:7267 camlibs/ptp2/ptp.c:4835 camlibs/ptp2/ptp.c:5009
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
+#: camlibs/canon/library.c:1734 camlibs/canon/library.c:2134
+#: camlibs/pentax/library.c:759 camlibs/pentax/library.c:880
+#: camlibs/ptp2/chdk.c:1038 camlibs/ptp2/config.c:10912
+#: camlibs/ptp2/config.c:10913 camlibs/ptp2/config.c:10914
+#: camlibs/ptp2/config.c:10915 camlibs/ptp2/config.c:10916
+#: camlibs/ptp2/config.c:10918 camlibs/ptp2/config.c:10919
+#: camlibs/ptp2/config.c:10920 camlibs/ptp2/config.c:10930
+#: camlibs/ptp2/ptp.c:6302 camlibs/ptp2/ptp.c:6709
+#: camlibs/sierra/nikon-desc.c:446 camlibs/sierra/nikon-desc.c:469
+#: camlibs/sierra/olympus-desc.c:759
 msgid "Exposure Compensation"
 msgstr "曝光补偿"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:2177
-#: camlibs/ptp2/config.c:7218 camlibs/ptp2/config.c:7219
-#: camlibs/ptp2/config.c:7222
+#: camlibs/canon/library.c:1761 camlibs/canon/library.c:2165
+#: camlibs/pentax/library.c:640 camlibs/ptp2/config.c:10841
+#: camlibs/ptp2/config.c:10842 camlibs/ptp2/config.c:10843
+#: camlibs/ptp2/config.c:10846 camlibs/ptp2/config.c:10847
 #, fuzzy
 msgid "Image Format"
 msgstr "日期格式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:1809 camlibs/canon/library.c:2206
-#: camlibs/ptp2/config.c:7295 camlibs/ptp2/config.c:7296
-#: camlibs/ptp2/config.c:7299 camlibs/ptp2/ptp.c:4748
-#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:644
+#: camlibs/canon/library.c:1793 camlibs/canon/library.c:2194
+#: camlibs/lumix/lumix.c:1197 camlibs/ptp2/config.c:10965
+#: camlibs/ptp2/config.c:10966 camlibs/ptp2/config.c:10967
+#: camlibs/ptp2/config.c:10970 camlibs/ptp2/ptp.c:6215
+#: camlibs/sierra/nikon-desc.c:318 camlibs/sierra/olympus-desc.c:637
 msgid "Focus Mode"
 msgstr "聚焦模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:1837 camlibs/canon/library.c:2317
-#: camlibs/ptp2/config.c:7270 camlibs/ptp2/config.c:7271
-#: camlibs/ptp2/ptp.c:4750 camlibs/ptp2/ptp.c:4814 camlibs/ptp2/ptp.c:5067
-#: camlibs/ptp2/ptp.c:5277 camlibs/sierra/sierra.c:1022
-#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/canon/library.c:1821 camlibs/canon/library.c:2305
+#: camlibs/ptp2/config.c:10933 camlibs/ptp2/config.c:10934
+#: camlibs/ptp2/ptp.c:6217 camlibs/ptp2/ptp.c:6281 camlibs/ptp2/ptp.c:6767
+#: camlibs/ptp2/ptp.c:6977 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1765
 msgid "Flash Mode"
 msgstr "闪光灯模式"
 
 # camlibs/konica/library.c:647 camlibs/konica/library.c:858
-#: camlibs/canon/library.c:1865 camlibs/canon/library.c:2236
-#: camlibs/konica/library.c:668 camlibs/konica/library.c:884
-#: camlibs/ptp2/ptp.c:4815
+#: camlibs/canon/library.c:1849 camlibs/canon/library.c:2224
+#: camlibs/konica/library.c:654 camlibs/konica/library.c:870
+#: camlibs/ptp2/ptp.c:6282
 msgid "Beep"
 msgstr "鸣笛"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/canon/library.c:1896 camlibs/ptp2/config.c:7533
+#: camlibs/canon/library.c:1880 camlibs/ptp2/config.c:11295
 #, fuzzy
 msgid "Camera Actions"
 msgstr "相机设置"
 
-#: camlibs/canon/library.c:1900 camlibs/canon/library.c:2347
-#: camlibs/ptp2/config.c:7100 camlibs/ptp2/config.c:7101
+#: camlibs/canon/library.c:1884 camlibs/canon/library.c:2335
+#: camlibs/ptp2/config.c:10672
 msgid "Synchronize camera date and time with PC"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/canon/library.c:1907 camlibs/ptp2/config.c:7542
+#: camlibs/canon/library.c:1891 camlibs/ptp2/config.c:11304
 #, fuzzy
 msgid "Camera Status Information"
 msgstr "相机配置"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/canon/library.c:1911 camlibs/ptp2/config.c:7134
-#: camlibs/ptp2/config.c:7138 camlibs/ptp2/config.c:7139
-#: camlibs/ptp2/ptp.c:4853
+#: camlibs/canon/library.c:1895 camlibs/ptp2/config.c:10726
+#: camlibs/ptp2/config.c:10730 camlibs/ptp2/config.c:10731
+#: camlibs/ptp2/ptp.c:6320
 #, fuzzy
 msgid "Camera Model"
 msgstr "%s相机型号：%s\n"
@@ -970,538 +1002,538 @@
 # camlibs/konica/library.c:633 camlibs/konica/library.c:844
 # camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
 # camlibs/polaroid/pdc700.c:1088
-#: camlibs/canon/library.c:1916 camlibs/konica/library.c:654
-#: camlibs/konica/library.c:866 camlibs/konica/qm150.c:774
-#: camlibs/polaroid/pdc700.c:1006 camlibs/polaroid/pdc700.c:1019
-#: camlibs/polaroid/pdc700.c:1091
+#: camlibs/canon/library.c:1901 camlibs/konica/library.c:640
+#: camlibs/konica/library.c:852 camlibs/konica/qm150.c:763
+#: camlibs/polaroid/pdc700.c:994 camlibs/polaroid/pdc700.c:1007
+#: camlibs/polaroid/pdc700.c:1079
 msgid "Date and Time"
 msgstr "日期和时间"
 
 # camlibs/canon/library.c:827
-#: camlibs/canon/library.c:1924
+#: camlibs/canon/library.c:1909
 msgid "Error"
 msgstr "错误"
 
 # camlibs/stv0680/library.c:525
-#: camlibs/canon/library.c:1928 camlibs/ptp2/config.c:7140
-#: camlibs/ptp2/ptp.c:4852
+#: camlibs/canon/library.c:1914 camlibs/ptp2/config.c:10732
+#: camlibs/ptp2/ptp.c:6319
 #, fuzzy
 msgid "Firmware Version"
 msgstr "固件版本：%d.%d\n"
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:1935
 #, fuzzy
 msgid "Power"
 msgstr "无电源指示灯"
 
 # camlibs/canon/library.c:867
-#: camlibs/canon/library.c:1956
+#: camlibs/canon/library.c:1944
 msgid "Driver"
 msgstr "驱动器"
 
 # camlibs/canon/library.c:870 camlibs/canon/library.c:912
-#: camlibs/canon/library.c:1960 camlibs/canon/library.c:2362
+#: camlibs/canon/library.c:1948 camlibs/canon/library.c:2350
 msgid "List all files"
 msgstr "列出所有文件"
 
-#: camlibs/canon/library.c:1966 camlibs/canon/library.c:2376
+#: camlibs/canon/library.c:1954 camlibs/canon/library.c:2364
 msgid "Keep filename on upload"
 msgstr "上传时保持文件名"
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2034
-#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2094
-#: camlibs/canon/library.c:2123 camlibs/canon/library.c:2153
-#: camlibs/canon/library.c:2182 camlibs/canon/library.c:2211
-#: camlibs/canon/library.c:2241 camlibs/canon/library.c:2276
-#: camlibs/canon/library.c:2292 camlibs/canon/library.c:2322
-#: camlibs/canon/library.c:2352
+#: camlibs/canon/library.c:1981 camlibs/canon/library.c:2022
+#: camlibs/canon/library.c:2052 camlibs/canon/library.c:2082
+#: camlibs/canon/library.c:2111 camlibs/canon/library.c:2141
+#: camlibs/canon/library.c:2170 camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2229 camlibs/canon/library.c:2264
+#: camlibs/canon/library.c:2280 camlibs/canon/library.c:2310
+#: camlibs/canon/library.c:2340
 msgid "Camera unavailable"
 msgstr "相机不可用"
 
 # camlibs/canon/library.c:892
-#: camlibs/canon/library.c:1996
+#: camlibs/canon/library.c:1984
 msgid "Owner name changed"
 msgstr "所有者姓名已改变"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:1998
+#: camlibs/canon/library.c:1986
 msgid "could not change owner name"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2011
+#: camlibs/canon/library.c:1999
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:2018
+#: camlibs/canon/library.c:2006
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:2048
+#: camlibs/canon/library.c:2036
 msgid "Invalid ISO speed setting"
 msgstr ""
 
 # camlibs/canon/library.c:892
-#: camlibs/canon/library.c:2051
+#: camlibs/canon/library.c:2039
 #, fuzzy
 msgid "ISO speed changed"
 msgstr "所有者姓名已改变"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2053
+#: camlibs/canon/library.c:2041
 #, fuzzy
 msgid "Could not change ISO speed"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2078
+#: camlibs/canon/library.c:2066
 msgid "Invalid shooting mode setting"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:2081
+#: camlibs/canon/library.c:2069
 #, fuzzy
 msgid "Shooting mode changed"
 msgstr "快门速度 (秒)"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2083
+#: camlibs/canon/library.c:2071
 #, fuzzy
 msgid "Could not change shooting mode"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2108
+#: camlibs/canon/library.c:2096
 msgid "Invalid shutter speed setting"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:2111
+#: camlibs/canon/library.c:2099
 #, fuzzy
 msgid "Shutter speed changed"
 msgstr "快门速度 (秒)"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2113
+#: camlibs/canon/library.c:2101
 #, fuzzy
 msgid "Could not change shutter speed"
 msgstr "无法改变所有者姓名"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/canon/library.c:2137 camlibs/canon/library.c:2306
+#: camlibs/canon/library.c:2125 camlibs/canon/library.c:2294
 #, fuzzy
 msgid "Invalid aperture setting"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/canon/library.c:2140 camlibs/canon/library.c:2309
+#: camlibs/canon/library.c:2128 camlibs/canon/library.c:2297
 #, fuzzy
 msgid "Aperture changed"
 msgstr "照片设置"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2142 camlibs/canon/library.c:2311
+#: camlibs/canon/library.c:2130 camlibs/canon/library.c:2299
 #, fuzzy
 msgid "Could not change aperture"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2167
+#: camlibs/canon/library.c:2155
 #, fuzzy
 msgid "Invalid exposure compensation setting"
 msgstr "曝光补偿"
 
-#: camlibs/canon/library.c:2170
+#: camlibs/canon/library.c:2158
 #, fuzzy
 msgid "Exposure compensation changed"
 msgstr "曝光补偿"
 
-#: camlibs/canon/library.c:2172
+#: camlibs/canon/library.c:2160
 #, fuzzy
 msgid "Could not change exposure compensation"
 msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/canon/library.c:2195
+#: camlibs/canon/library.c:2183
 #, fuzzy
 msgid "Invalid image format setting"
 msgstr "相机设置"
 
 # camlibs/konica/konica.c:101
-#: camlibs/canon/library.c:2199
+#: camlibs/canon/library.c:2187
 #, fuzzy
 msgid "Image format changed"
 msgstr "图像已受到保护。"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2201
+#: camlibs/canon/library.c:2189
 #, fuzzy
 msgid "Could not change image format"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2225
+#: camlibs/canon/library.c:2213
 msgid "Invalid focus mode setting"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:2228
+#: camlibs/canon/library.c:2216
 #, fuzzy
 msgid "Focus mode changed"
 msgstr "聚焦模式"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2230
+#: camlibs/canon/library.c:2218
 #, fuzzy
 msgid "Could not change focus mode"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2255
+#: camlibs/canon/library.c:2243
 msgid "Invalid beep mode setting"
 msgstr ""
 
 # camlibs/canon/library.c:892
-#: camlibs/canon/library.c:2258
+#: camlibs/canon/library.c:2246
 #, fuzzy
 msgid "Beep mode changed"
 msgstr "所有者姓名已改变"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2260
+#: camlibs/canon/library.c:2248
 #, fuzzy
 msgid "Could not change beep mode"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2279
+#: camlibs/canon/library.c:2267
 msgid "Zoom level changed"
 msgstr ""
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2281
+#: camlibs/canon/library.c:2269
 #, fuzzy
 msgid "Could not change zoom level"
 msgstr "无法改变所有者姓名"
 
-#: camlibs/canon/library.c:2336
+#: camlibs/canon/library.c:2324
 msgid "Invalid flash mode setting"
 msgstr ""
 
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/canon/library.c:2339
+#: camlibs/canon/library.c:2327
 #, fuzzy
 msgid "Flash mode changed"
 msgstr "闪存卡"
 
 # camlibs/canon/library.c:730
-#: camlibs/canon/library.c:2341
+#: camlibs/canon/library.c:2329
 #, fuzzy
 msgid "Could not change flash mode"
 msgstr "无法获取闪存驱动字符"
 
 # camlibs/canon/library.c:905
-#: camlibs/canon/library.c:2355
+#: camlibs/canon/library.c:2343
 msgid "time set"
 msgstr "时间设置"
 
 # camlibs/canon/library.c:907
-#: camlibs/canon/library.c:2357
+#: camlibs/canon/library.c:2345
 msgid "could not set time"
 msgstr "无法设置时间"
 
 # camlibs/canon/library.c:1107
-#: camlibs/canon/library.c:2590
+#: camlibs/canon/library.c:2578
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "给出未知端口类型 %i = 0x%x。不可能初始化。"
 
 # camlibs/canon/serial.c:625 camlibs/canon/serial.c:690
-#: camlibs/canon/serial.c:705 camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:690 camlibs/canon/serial.c:753
 msgid "Battery exhausted, camera off."
 msgstr "电池没电，关闭相机。"
 
 # camlibs/canon/serial.c:628
-#: camlibs/canon/serial.c:708
+#: camlibs/canon/serial.c:693
 msgid "ERROR: unexpected message"
 msgstr "错误：未预期的消息"
 
 # camlibs/canon/serial.c:638
-#: camlibs/canon/serial.c:718
+#: camlibs/canon/serial.c:703
 msgid "ERROR: message overrun"
 msgstr "错误：过多的消息"
 
 # camlibs/canon/serial.c:667
-#: camlibs/canon/serial.c:745
+#: camlibs/canon/serial.c:730
 msgid "ERROR: out of sequence."
 msgstr "错误：顺序错误。"
 
 # camlibs/canon/serial.c:672
-#: camlibs/canon/serial.c:750
+#: camlibs/canon/serial.c:735
 msgid "ERROR: unexpected packet type."
 msgstr "错误：未预期的包类型。"
 
 # camlibs/canon/serial.c:682
-#: camlibs/canon/serial.c:760
+#: camlibs/canon/serial.c:745
 msgid "ERROR: message format error."
 msgstr "错误：消息格式错误。"
 
 # camlibs/canon/serial.c:694
-#: camlibs/canon/serial.c:772
+#: camlibs/canon/serial.c:757
 msgid "ERROR: unexpected message2."
 msgstr "错误：未预期的消息2。"
 
 # camlibs/canon/serial.c:888
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:967
 msgid "Uploading file..."
 msgstr "正在上载文件..."
 
 # camlibs/canon/serial.c:946 camlibs/digita/digita.c:256
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:261
-#: camlibs/directory/directory.c:575
+#: camlibs/canon/serial.c:1038 camlibs/digita/digita.c:247
+#: camlibs/directory/directory.c:553
 msgid "Getting file..."
 msgstr "正在获取文件..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1108
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1116
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1149
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1169
+#: camlibs/canon/serial.c:1154
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1185
+#: camlibs/canon/serial.c:1170
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1213
+#: camlibs/canon/serial.c:1198
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1223
+#: camlibs/canon/serial.c:1208
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
 # camlibs/canon/serial.c:1172
-#: camlibs/canon/serial.c:1292
+#: camlibs/canon/serial.c:1277
 msgid "Error changing speed."
 msgstr "改变速度出错。"
 
 # camlibs/canon/serial.c:1181
-#: camlibs/canon/serial.c:1301
+#: camlibs/canon/serial.c:1286
 msgid "Resetting protocol..."
 msgstr "正在重置协议..."
 
 # camlibs/canon/serial.c:1190
-#: camlibs/canon/serial.c:1310
+#: camlibs/canon/serial.c:1295
 #, fuzzy
 msgid "Camera OK."
 msgstr "相机就绪。\n"
 
 # camlibs/canon/serial.c:1203
-#: camlibs/canon/serial.c:1323
+#: camlibs/canon/serial.c:1308
 msgid "Looking for camera ..."
 msgstr "正在寻找相机..."
 
 # camlibs/canon/serial.c:1213
-#: camlibs/canon/serial.c:1333
+#: camlibs/canon/serial.c:1318
 msgid "Trying to contact camera..."
 msgstr "正试图与相机联络..."
 
 # camlibs/canon/serial.c:1217
-#: camlibs/canon/serial.c:1337
+#: camlibs/canon/serial.c:1322
 msgid "Communication error 1"
 msgstr "通讯错误 1"
 
 # camlibs/canon/serial.c:1227 camlibs/canon/serial.c:1231
 # camlibs/dimera/dimera3500.c:970
-#: camlibs/canon/serial.c:1347 camlibs/canon/serial.c:1351
-#: camlibs/dimera/dimera3500.c:997
+#: camlibs/canon/serial.c:1332 camlibs/canon/serial.c:1336
+#: camlibs/dimera/dimera3500.c:986
 msgid "No response from camera"
 msgstr "相机无应答"
 
 # camlibs/canon/serial.c:1235
-#: camlibs/canon/serial.c:1355
+#: camlibs/canon/serial.c:1340
 msgid "Unrecognized response"
 msgstr "不可识别的应答"
 
 # camlibs/canon/usb.c:871
-#: camlibs/canon/serial.c:1375
+#: camlibs/canon/serial.c:1360
 #, fuzzy, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "已监测到一个“%s”。"
 
 # libgphoto2/gphoto2-result.c:46
-#: camlibs/canon/serial.c:1383
-#, fuzzy, c-format
+#: camlibs/canon/serial.c:1368
+#, c-format
 msgid "Unknown model \"%s\""
-msgstr "未知型号"
+msgstr "未知型号“%s”"
 
 # camlibs/canon/serial.c:1278
-#: camlibs/canon/serial.c:1404
+#: camlibs/canon/serial.c:1389
 msgid "Bad EOT"
 msgstr "错误的 EOT"
 
 # camlibs/canon/serial.c:1284
-#: camlibs/canon/serial.c:1410
+#: camlibs/canon/serial.c:1395
 msgid "Communication error 2"
 msgstr "通讯错误 2"
 
 # camlibs/canon/serial.c:1307
-#: camlibs/canon/serial.c:1433
+#: camlibs/canon/serial.c:1418
 msgid "Communication error 3"
 msgstr "通讯错误 3"
 
 # camlibs/canon/serial.c:1311
-#: camlibs/canon/serial.c:1437
+#: camlibs/canon/serial.c:1422
 msgid "Changing speed... wait..."
 msgstr "正在改变速度... 请等待..."
 
 # camlibs/canon/serial.c:1316
-#: camlibs/canon/serial.c:1442
+#: camlibs/canon/serial.c:1427
 msgid "Error changing speed"
 msgstr "改变速度出错"
 
 # camlibs/canon/serial.c:1328
-#: camlibs/canon/serial.c:1453
+#: camlibs/canon/serial.c:1438
 #, fuzzy
 msgid "Error waiting for ACK during initialization, retrying"
 msgstr "初始化重试中等待 ACK 时出错"
 
 # camlibs/canon/serial.c:1334
-#: camlibs/canon/serial.c:1459
+#: camlibs/canon/serial.c:1444
 msgid "Error waiting ACK during initialization"
 msgstr "初始化中等待 ACK 时出错"
 
 # camlibs/canon/serial.c:1338
-#: camlibs/canon/serial.c:1463
+#: camlibs/canon/serial.c:1448
 msgid "Connected to camera"
 msgstr "已连接到相机"
 
-#: camlibs/canon/serial.c:1501
+#: camlibs/canon/serial.c:1486
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1517
+#: camlibs/canon/serial.c:1502
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "错误：%d 过大"
 
 # camlibs/canon/serial.c:1400
-#: camlibs/canon/serial.c:1527
+#: camlibs/canon/serial.c:1512
 msgid "Getting thumbnail..."
 msgstr "正在获取缩略图..."
 
-#: camlibs/canon/usb.c:220
+#: camlibs/canon/usb.c:201
 msgid "NOT RECOGNIZED"
 msgstr "未识别"
 
 # camlibs/ricoh/library.c:242
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:216
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "无法检测到任何相机。"
 
-#: camlibs/canon/usb.c:243
+#: camlibs/canon/usb.c:224
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:246
+#: camlibs/canon/usb.c:227
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:251
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:263
+#: camlibs/canon/usb.c:244
 #, c-format
 msgid ""
 "Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:268
+#: camlibs/canon/usb.c:249
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:287
+#: camlibs/canon/usb.c:268
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
+#: camlibs/canon/usb.c:275 camlibs/canon/usb.c:302
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i). Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:314
+#: camlibs/canon/usb.c:295
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
+#: camlibs/canon/usb.c:333 camlibs/canon/usb.c:374
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
+#: camlibs/canon/usb.c:340 camlibs/canon/usb.c:381
 #, c-format
 msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
 msgstr ""
 
 # camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:512
+#: camlibs/canon/usb.c:493
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr "相机未就绪，多个“鉴别相机”请求均失败：%s"
 
 # camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
+#: camlibs/canon/usb.c:531 camlibs/canon/usb.c:547
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "相机未就绪，多个“鉴别相机”请求均失败：%s"
 
-#: camlibs/canon/usb.c:631
+#: camlibs/canon/usb.c:612
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
+#: camlibs/canon/usb.c:634 camlibs/canon/usb.c:660 camlibs/canon/usb.c:700
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
+#: camlibs/canon/usb.c:743 camlibs/canon/usb.c:759
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
+#: camlibs/canon/usb.c:815 camlibs/canon/usb.c:834
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
@@ -1509,20 +1541,20 @@
 msgstr ""
 
 # camlibs/canon/usb.c:640
-#: camlibs/canon/usb.c:1717
+#: camlibs/canon/usb.c:1696
 msgid "Receiving data..."
 msgstr "正在接收数据..."
 
-#: camlibs/canon/usb.c:2101 camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2080 camlibs/canon/usb.c:2226
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2165
+#: camlibs/canon/usb.c:2144
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:2172
+#: camlibs/canon/usb.c:2151
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1530,51 +1562,50 @@
 msgstr ""
 
 # camlibs/canon/library.c:275
-#: camlibs/canon/usb.c:2262
-#, fuzzy, c-format
+#: camlibs/canon/usb.c:2241
+#, c-format
 msgid "Couldn't read from file \"%s\""
-msgstr "无法获取磁盘信息：%s"
+msgstr "无法从文件“%s”读取"
 
-#: camlibs/canon/usb.c:2272
+#: camlibs/canon/usb.c:2251
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "内存耗尽：需要 %ld 字节。"
 
 # camlibs/canon/serial.c:888
-#: camlibs/canon/usb.c:2305 camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2352
-#: camlibs/canon/usb.c:2366 camlibs/canon/usb.c:2380
-#, fuzzy
+#: camlibs/canon/usb.c:2284 camlibs/canon/usb.c:2295 camlibs/canon/usb.c:2331
+#: camlibs/canon/usb.c:2345 camlibs/canon/usb.c:2359
 msgid "File upload failed."
-msgstr "正在上载文件..."
+msgstr "文件上传失败。"
 
-#: camlibs/canon/usb.c:2406
+#: camlibs/canon/usb.c:2385
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr "文件太大。你可能需要将相机关闭再打开，才能上传更多文件。"
 
-#: camlibs/canon/usb.c:2453
+#: camlibs/canon/usb.c:2432
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2470
+#: camlibs/canon/usb.c:2449
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2524
+#: camlibs/canon/usb.c:2503
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2543
+#: camlibs/canon/usb.c:2522
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1582,29 +1613,29 @@
 msgstr ""
 
 # camlibs/canon/usb.c:871
-#: camlibs/canon/usb.c:2620
+#: camlibs/canon/usb.c:2599
 #, c-format
 msgid "Detected a '%s'."
 msgstr "已监测到一个“%s”。"
 
-#: camlibs/canon/usb.c:2626
+#: camlibs/canon/usb.c:2605
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:347
-#: camlibs/casio/casio-qv.c:151
+#: camlibs/casio/casio-qv.c:140
 #, fuzzy, c-format
 msgid "Image type %d not supported"
 msgstr "图像类型不支持"
 
 # camlibs/konica/konica.c:101
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:451
+#: camlibs/casio/casio-qv.c:163 camlibs/konica/qm150.c:439
 #, fuzzy, c-format
 msgid "Image %s is delete protected."
 msgstr "图像已受到保护。"
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:176
 msgid ""
 "Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
 "This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
@@ -1612,47 +1643,47 @@
 "Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:206
+#: camlibs/casio/casio-qv.c:195
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/casio/casio-qv.c:264 camlibs/dimera/dimera3500.c:838
-#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:982
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra-desc.c:206 camlibs/topfield/puppy.c:549
+#: camlibs/casio/casio-qv.c:253 camlibs/dimera/dimera3500.c:827
+#: camlibs/kodak/dc210/dc210.c:184 camlibs/polaroid/pdc700.c:970
+#: camlibs/sierra/sierra-desc.c:193 camlibs/sierra/sierra.c:899
+#: camlibs/sierra/sierra.c:1491 camlibs/topfield/puppy.c:537
 msgid "Camera Configuration"
 msgstr "相机配置"
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/casio/casio-qv.c:267 camlibs/konica/qm150.c:1151
+#: camlibs/casio/casio-qv.c:256 camlibs/konica/qm150.c:1140
 #, c-format
 msgid "Battery"
 msgstr "电池"
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/casio/casio-qv.c:274
+#: camlibs/casio/casio-qv.c:263
 msgid "Brightness"
 msgstr "亮度"
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/casio/casio-qv.c:276 camlibs/casio/casio-qv.c:279
+#: camlibs/casio/casio-qv.c:265 camlibs/casio/casio-qv.c:268
 #, fuzzy
 msgid "Too bright"
 msgstr "版权"
 
 # camlibs/konica/konica.c:104
-#: camlibs/casio/casio-qv.c:277 camlibs/casio/casio-qv.c:280
+#: camlibs/casio/casio-qv.c:266 camlibs/casio/casio-qv.c:269
 #, fuzzy
 msgid "Too dark"
 msgstr "光线太暗。"
 
 # camlibs/kodak/dc240/library.c:572
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-#: camlibs/kodak/dc240/library.c:573
+#: camlibs/casio/casio-qv.c:267 camlibs/casio/casio-qv.c:270
+#: camlibs/kodak/dc240/library.c:567
 msgid "OK"
 msgstr "确认"
 
@@ -1715,18 +1746,18 @@
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:347
-#: camlibs/digita/digita.c:337 camlibs/dimera/dimera3500.c:321
+#: camlibs/digita/digita.c:323 camlibs/dimera/dimera3500.c:310
 msgid "Image type is not supported"
 msgstr "图像类型不支持"
 
 # camlibs/agfa/agfa.c:221 camlibs/digita/digita.c:389
-#: camlibs/digita/digita.c:393
+#: camlibs/digita/digita.c:379
 #, c-format
 msgid "Number of pictures: %d"
 msgstr "照片数量：%d"
 
 # camlibs/digita/digita.c:396
-#: camlibs/digita/digita.c:400
+#: camlibs/digita/digita.c:386
 msgid ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"
@@ -1735,35 +1766,35 @@
 "Johannes Erdfelt <johannes@erdfelt.com>"
 
 # camlibs/dimera/dimera3500.c:295
-#: camlibs/dimera/dimera3500.c:161
+#: camlibs/dimera/dimera3500.c:150
 #, c-format
 msgid ""
 "Only root folder is supported - you requested a file listing for folder '%s'."
 msgstr "仅支持根文件夹 - 您请求文件“%s”的文件列表。"
 
 # camlibs/dimera/dimera3500.c:303 camlibs/dimera/dimera3500.c:497
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:430
+#: camlibs/dimera/dimera3500.c:158 camlibs/dimera/dimera3500.c:419
 msgid "Problem getting number of images"
 msgstr "获取图像数量时出问题"
 
 # camlibs/dimera/dimera3500.c:402 camlibs/dimera/dimera3500.c:648
-#: camlibs/dimera/dimera3500.c:339 camlibs/dimera/dimera3500.c:581
+#: camlibs/dimera/dimera3500.c:328 camlibs/dimera/dimera3500.c:570
 msgid "Problem getting image information"
 msgstr "获取图像信息时出问题"
 
 # camlibs/dimera/dimera3500.c:433
-#: camlibs/dimera/dimera3500.c:369
+#: camlibs/dimera/dimera3500.c:358
 msgid "Capture type is not supported"
 msgstr "不支持的捕捉类型"
 
 # camlibs/dimera/dimera3500.c:518
-#: camlibs/dimera/dimera3500.c:451
+#: camlibs/dimera/dimera3500.c:440
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (电池 %d%% 满)"
 
 # camlibs/dimera/dimera3500.c:522
-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:444
 #, fuzzy, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d.\n"
@@ -1782,105 +1813,105 @@
 
 # camlibs/dimera/dimera3500.c:533 camlibs/konica/library.c:744
 # camlibs/konica/library.c:984
-#: camlibs/dimera/dimera3500.c:466 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:455 camlibs/dimera/dimera3500.c:841
 #: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:443
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1016
-#: camlibs/konica/qm150.c:864 camlibs/ptp2/config.c:1529
-#: camlibs/ptp2/config.c:3215 camlibs/ptp2/config.c:4359
-#: camlibs/ptp2/ptp.c:5625 camlibs/ricoh/library.c:504
-#: camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/library.c:752 camlibs/konica/library.c:1002
+#: camlibs/konica/qm150.c:853 camlibs/ptp2/config.c:1463
+#: camlibs/ptp2/config.c:1515 camlibs/ptp2/config.c:4010
+#: camlibs/ptp2/config.c:6021 camlibs/ptp2/config.c:9150
+#: camlibs/ptp2/ptp.c:7841 camlibs/ricoh/library.c:488
+#: camlibs/sierra/nikon-desc.c:273
 msgid "Flash"
 msgstr "闪光灯"
 
 # camlibs/dimera/dimera3500.c:533
-#: camlibs/dimera/dimera3500.c:466 camlibs/ptp2/config.c:3252
-#: camlibs/ptp2/config.c:3271
+#: camlibs/dimera/dimera3500.c:455 camlibs/ptp2/config.c:4095
+#: camlibs/ptp2/config.c:4114
 #, fuzzy
 msgid "No Flash"
 msgstr "无闪光灯"
 
 # camlibs/dimera/dimera3500.c:535
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 msgid "Dual Iris"
 msgstr "双光圈"
 
 # camlibs/dimera/dimera3500.c:535
-#: camlibs/dimera/dimera3500.c:468
+#: camlibs/dimera/dimera3500.c:457
 #, fuzzy
 msgid "No Dual Iris"
 msgstr "非双光圈"
 
 # camlibs/dimera/dimera3500.c:537
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 msgid "Resolution Switch"
 msgstr "分辨率切换"
 
 # camlibs/dimera/dimera3500.c:537
-#: camlibs/dimera/dimera3500.c:470
+#: camlibs/dimera/dimera3500.c:459
 #, fuzzy
 msgid "No Resolution Switch"
 msgstr "无分辨率切换"
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/dimera/dimera3500.c:472
+#: camlibs/dimera/dimera3500.c:461
 #, fuzzy
 msgid "No Power Light"
 msgstr "无电源指示灯"
 
 # camlibs/dimera/dimera3500.c:541
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "ON"
 msgstr "开"
 
 # camlibs/dimera/dimera3500.c:541
-#: camlibs/dimera/dimera3500.c:474
+#: camlibs/dimera/dimera3500.c:463
 msgid "OFF"
 msgstr "关"
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/dimera/dimera3500.c:476
+#: camlibs/dimera/dimera3500.c:465
 msgid "ready"
 msgstr "就绪"
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/dimera/dimera3500.c:476
-#, fuzzy
+#: camlibs/dimera/dimera3500.c:465
 msgid "Not ready"
 msgstr "未就绪"
 
 # camlibs/dimera/dimera3500.c:545
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 msgid "in fill mode"
 msgstr "处于填充模式"
 
 # camlibs/dimera/dimera3500.c:545
-#: camlibs/dimera/dimera3500.c:478
+#: camlibs/dimera/dimera3500.c:467
 #, fuzzy
 msgid "Not in fill mode"
 msgstr "不处于填充模式"
 
 # camlibs/dimera/dimera3500.c:547
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "low (320x240)"
 msgstr "低 (320x240)"
 
 # camlibs/dimera/dimera3500.c:547
-#: camlibs/dimera/dimera3500.c:480
+#: camlibs/dimera/dimera3500.c:469
 msgid "high (640x480)"
 msgstr "高 (640x480)"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "externally"
 msgstr "外部"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/dimera/dimera3500.c:482
+#: camlibs/dimera/dimera3500.c:471
 msgid "internally"
 msgstr "内部"
 
 # camlibs/dimera/dimera3500.c:559
-#: camlibs/dimera/dimera3500.c:492
+#: camlibs/dimera/dimera3500.c:481
 #, fuzzy
 msgid ""
 "* Image glitches or problems communicating are\n"
@@ -1900,7 +1931,7 @@
 "* 当前图像质量比可能的图像质量低。\n"
 
 # camlibs/dimera/dimera3500.c:573
-#: camlibs/dimera/dimera3500.c:506
+#: camlibs/dimera/dimera3500.c:495
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -1931,137 +1962,265 @@
 "     移植到 gphoto2\n"
 
 # camlibs/dimera/dimera3500.c:666
-#: camlibs/dimera/dimera3500.c:599
+#: camlibs/dimera/dimera3500.c:588
 msgid "Problem reading image from flash"
 msgstr "从闪存读取图像出问题"
 
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
-#: camlibs/dimera/dimera3500.c:617 camlibs/dimera/dimera3500.c:783
-#: camlibs/dimera/dimera3500.c:936
+#: camlibs/dimera/dimera3500.c:606 camlibs/dimera/dimera3500.c:772
+#: camlibs/dimera/dimera3500.c:925
 msgid "Out of memory"
 msgstr "内存耗尽"
 
 # camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
 # camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/dimera/dimera3500.c:634 camlibs/dimera/dimera3500.c:670
-#: camlibs/konica/qm150.c:263 camlibs/panasonic/coolshot/library.c:402
-#: camlibs/ricoh/g3.c:360 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:173 camlibs/smal/ultrapocket.c:138
-#: camlibs/smal/ultrapocket.c:186
+#: camlibs/dimera/dimera3500.c:623 camlibs/dimera/dimera3500.c:659
+#: camlibs/konica/qm150.c:251 camlibs/panasonic/coolshot/library.c:387
+#: camlibs/ricoh/g3.c:365 camlibs/samsung/samsung.c:204
+#: camlibs/sipix/web2.c:163 camlibs/smal/ultrapocket.c:142
+#: camlibs/smal/ultrapocket.c:190
 msgid "Downloading image..."
 msgstr "正在下载图像..."
 
 # camlibs/dimera/dimera3500.c:723 camlibs/dimera/dimera3500.c:759
-#: camlibs/dimera/dimera3500.c:656 camlibs/dimera/dimera3500.c:692
+#: camlibs/dimera/dimera3500.c:645 camlibs/dimera/dimera3500.c:681
 msgid "Problem downloading image"
 msgstr "下载图像出问题"
 
 # camlibs/dimera/dimera3500.c:731
-#: camlibs/dimera/dimera3500.c:664
+#: camlibs/dimera/dimera3500.c:653
 msgid "User canceled download"
 msgstr "用户取消下载"
 
 # camlibs/dimera/dimera3500.c:865
-#: camlibs/dimera/dimera3500.c:798
+#: camlibs/dimera/dimera3500.c:787
 msgid "Problem taking live image"
 msgstr "获取现场图像有问题"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/dimera/dimera3500.c:840 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1035 camlibs/konica/qm150.c:892
-#: camlibs/ricoh/library.c:500
+#: camlibs/dimera/dimera3500.c:829 camlibs/konica/library.c:778
+#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:881
+#: camlibs/ricoh/library.c:484
 msgid "Exposure"
 msgstr "曝光"
 
-#: camlibs/dimera/dimera3500.c:843 camlibs/dimera/dimera3500.c:881
+#: camlibs/dimera/dimera3500.c:832 camlibs/dimera/dimera3500.c:870
 msgid "Automatic exposure adjustment on preview"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/dimera/dimera3500.c:847 camlibs/dimera/dimera3500.c:872
+#: camlibs/dimera/dimera3500.c:836 camlibs/dimera/dimera3500.c:861
 #, fuzzy
 msgid "Exposure level on preview"
 msgstr "曝光测定"
 
-#: camlibs/dimera/dimera3500.c:855 camlibs/dimera/dimera3500.c:891
+#: camlibs/dimera/dimera3500.c:844 camlibs/dimera/dimera3500.c:880
 msgid "Automatic flash on capture"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:937
-#: camlibs/dimera/dimera3500.c:964
+#: camlibs/dimera/dimera3500.c:953
 msgid "Problem opening port"
 msgstr "打开端口出问题"
 
 # camlibs/dimera/dimera3500.c:947
-#: camlibs/dimera/dimera3500.c:974
+#: camlibs/dimera/dimera3500.c:963
 msgid "Problem resetting camera"
 msgstr "重置相机出问题"
 
 # camlibs/dimera/dimera3500.c:957
-#: camlibs/dimera/dimera3500.c:984
+#: camlibs/dimera/dimera3500.c:973
 msgid "Problem setting camera communication speed"
 msgstr "设置相机通讯速度出问题"
 
 # camlibs/dimera/dimera3500.c:976
-#: camlibs/dimera/dimera3500.c:1003
+#: camlibs/dimera/dimera3500.c:992
 msgid "Looks like a modem, not a camera"
 msgstr "看起来象调制解调器，而不象相机"
 
 # camlibs/directory/directory.c:159
-#: camlibs/directory/directory.c:286
+#: camlibs/directory/directory.c:264
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "正在“%s”中列举文件..."
 
 # camlibs/directory/directory.c:228
-#: camlibs/directory/directory.c:360
+#: camlibs/directory/directory.c:338
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "正在“%s”中列举文件夹..."
 
 # camlibs/directory/directory.c:195
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:358
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%s)."
 msgstr "无法获取关于“%s”(%m) 的信息。"
 
 # camlibs/directory/directory.c:269
-#: camlibs/directory/directory.c:413
+#: camlibs/directory/directory.c:391
 #, fuzzy, c-format
 msgid "Could not get information about '%s' in '%s' (%s)."
 msgstr "无法从“%2$s”中获取关于“%1$s”的信息 (%3$m)。"
 
 # camlibs/directory/directory.c:340
-#: camlibs/directory/directory.c:461
+#: camlibs/directory/directory.c:439
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%s)."
 msgstr "无法改变“%2$s”中的文件“%1$s”的时间(%3$m)。"
 
 # camlibs/directory/directory.c:421
-#: camlibs/directory/directory.c:549
+#: camlibs/directory/directory.c:527
 #, c-format
 msgid "Could not open '%s'."
 msgstr "无法打开“%s”。"
 
 # camlibs/directory/directory.c:506
-#: camlibs/directory/directory.c:613
+#: camlibs/directory/directory.c:591
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "目录浏览“相机”允许您为您硬盘上的照片编制索引。"
 
 # camlibs/directory/directory.c:515
-#: camlibs/directory/directory.c:622
+#: camlibs/directory/directory.c:600
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "目录浏览模式 - 由 Scott Fritzinger <scottf@unr.edu> 编制。"
 
 # camlibs/directory/directory.c:562
-#: camlibs/directory/directory.c:670
+#: camlibs/directory/directory.c:648
 #, fuzzy, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %s)."
 msgstr "无法删除文件夹“%2$s”中的文件“%1$s”(错误码 %3$i：%4$m)。"
 
-#: camlibs/enigma13/enigma13.c:69
+# camlibs/canon/library.c:806
+#: camlibs/docupen/docupen.c:155
+#, fuzzy
+msgid "Scanner Profile Configuration"
+msgstr "相机及驱动器配置"
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/docupen/docupen.c:157 camlibs/docupen/docupen.c:256
+#, fuzzy
+msgid "Mono mode"
+msgstr "快门速度 (秒)"
+
+#: camlibs/docupen/docupen.c:160 camlibs/docupen/docupen.c:192
+#: camlibs/docupen/docupen.c:220 camlibs/docupen/docupen.c:257
+#: camlibs/docupen/docupen.c:290 camlibs/docupen/docupen.c:319
+msgid "Depth"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:162 camlibs/docupen/docupen.c:166
+#: camlibs/docupen/docupen.c:261
+msgid "Mono (b/w)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:163 camlibs/docupen/docupen.c:167
+#: camlibs/docupen/docupen.c:263
+msgid "Grey (4bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:164 camlibs/docupen/docupen.c:168
+#: camlibs/docupen/docupen.c:265
+msgid "Grey (8bpp)"
+msgstr ""
+
+# camlibs/konica/library.c:684 camlibs/konica/library.c:896
+# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
+# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
+#: camlibs/docupen/docupen.c:171 camlibs/docupen/docupen.c:199
+#: camlibs/docupen/docupen.c:227 camlibs/docupen/docupen.c:269
+#: camlibs/docupen/docupen.c:298 camlibs/docupen/docupen.c:327
+#, fuzzy
+msgid "Lo Resolution"
+msgstr "分辨率"
+
+#: camlibs/docupen/docupen.c:173 camlibs/docupen/docupen.c:176
+#: camlibs/docupen/docupen.c:201 camlibs/docupen/docupen.c:204
+#: camlibs/docupen/docupen.c:229 camlibs/docupen/docupen.c:232
+#: camlibs/docupen/docupen.c:273 camlibs/docupen/docupen.c:302
+#: camlibs/docupen/docupen.c:331
+msgid "100 DPI"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:174 camlibs/docupen/docupen.c:177
+#: camlibs/docupen/docupen.c:182 camlibs/docupen/docupen.c:185
+#: camlibs/docupen/docupen.c:202 camlibs/docupen/docupen.c:205
+#: camlibs/docupen/docupen.c:210 camlibs/docupen/docupen.c:213
+#: camlibs/docupen/docupen.c:230 camlibs/docupen/docupen.c:233
+#: camlibs/docupen/docupen.c:238 camlibs/docupen/docupen.c:241
+#: camlibs/docupen/docupen.c:275 camlibs/docupen/docupen.c:283
+#: camlibs/docupen/docupen.c:304 camlibs/docupen/docupen.c:312
+#: camlibs/docupen/docupen.c:333 camlibs/docupen/docupen.c:341
+msgid "200 DPI"
+msgstr ""
+
+# camlibs/konica/library.c:684 camlibs/konica/library.c:896
+# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
+# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
+#: camlibs/docupen/docupen.c:180 camlibs/docupen/docupen.c:208
+#: camlibs/docupen/docupen.c:236 camlibs/docupen/docupen.c:279
+#: camlibs/docupen/docupen.c:308 camlibs/docupen/docupen.c:337
+#, fuzzy
+msgid "Hi Resolution"
+msgstr "分辨率"
+
+#: camlibs/docupen/docupen.c:183 camlibs/docupen/docupen.c:186
+#: camlibs/docupen/docupen.c:211 camlibs/docupen/docupen.c:214
+#: camlibs/docupen/docupen.c:239 camlibs/docupen/docupen.c:242
+#: camlibs/docupen/docupen.c:285 camlibs/docupen/docupen.c:314
+#: camlibs/docupen/docupen.c:343
+msgid "400 DPI"
+msgstr ""
+
+# frontends/command-line/gphoto2-cmd-capture.c:218
+# libgphoto2/gphoto2-result.c:51
+#: camlibs/docupen/docupen.c:189 camlibs/docupen/docupen.c:289
+#, fuzzy
+msgid "Color Document mode"
+msgstr "操作模式"
+
+#: camlibs/docupen/docupen.c:194 camlibs/docupen/docupen.c:196
+#: camlibs/docupen/docupen.c:294
+msgid "NQ (12bpp)"
+msgstr ""
+
+# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
+# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
+#: camlibs/docupen/docupen.c:217 camlibs/docupen/docupen.c:318
+#, fuzzy
+msgid "Color Photo mode"
+msgstr "彩色模式"
+
+#: camlibs/docupen/docupen.c:222 camlibs/docupen/docupen.c:224
+#: camlibs/docupen/docupen.c:323
+msgid "HQ (24bpp)"
+msgstr ""
+
+#: camlibs/docupen/docupen.c:389
+msgid ""
+"Docupen scanner can't download/erase individual images, only everything\n"
+"at once. To work-around this, a cache file is created where a copy of the\n"
+"scanner's memory is stored. The cache fill is trigerred by downloading any\n"
+"image - so downloading the first image will take long time if the cache is\n"
+"empty or not valid. The cache is invalidated automatically when the amount\n"
+"of used memory reported by the scanner does not match cache size.\n"
+"The cache file is located at ~/.cache/docupen-SERIAL_NO.bin\n"
+"\n"
+"The scanner has a very short auto-power-off timeout - only 8 seconds - and\n"
+"it's effective even when connected by USB. You need to turn it on before\n"
+"each gphoto2 operation. In some situations, you might need to prevent it\n"
+"from turning off by repeatedly pressing any of the buttons."
+msgstr ""
+
+#: camlibs/docupen/docupen.c:412
+msgid ""
+"DocuPen RC800 scanner library\n"
+"Copyright 2020 Ondrej Zary <ondrej@zary.sk>\n"
+"based on Docupen tools by Florian Heinz <fh@cronon-ag.de>"
+msgstr ""
+
+#: camlibs/enigma13/enigma13.c:64
 msgid ""
 "Download program for Digital Dream Enigma 1.3. by <olivier@aixmarseille."
 "com>, and adapted from spca50x driver. Thank you, spca50x team, it was easy "
@@ -2069,97 +2228,97 @@
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:349
-#: camlibs/fuji/fuji.c:86
+#: camlibs/fuji/fuji.c:70
 #, c-format
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "相机只发送 %i 个字节，但我们至少需要 %i 个。"
 
 # camlibs/ricoh/library.c:242
-#: camlibs/fuji/fuji.c:129 camlibs/ricoh/library.c:563
+#: camlibs/fuji/fuji.c:113 camlibs/ricoh/library.c:547
 msgid "Could not contact camera."
 msgstr "无法检测到任何相机。"
 
 # camlibs/polaroid/pdc700.c:229
-#: camlibs/fuji/fuji.c:191
+#: camlibs/fuji/fuji.c:175
 #, c-format
 msgid "Received unexpected data (0x%02x, 0x%02x)."
 msgstr "收到意外的数据 (0x%02x，0x%02x)。"
 
-#: camlibs/fuji/fuji.c:217
+#: camlibs/fuji/fuji.c:201
 #, c-format
 msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
 msgstr "错误的 ESC 序列：应为 0x%02x，得到 0x%02x。"
 
-#: camlibs/fuji/fuji.c:234
+#: camlibs/fuji/fuji.c:218
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x."
 msgstr "错误的数据 - 得到 0x%02x，应为 0x%02x。"
 
-#: camlibs/fuji/fuji.c:247
+#: camlibs/fuji/fuji.c:231
 #, c-format
 msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
 msgstr "错误的数据 - 得到 0x%02x，应为 0x%02x 或 0x%02x。"
 
-#: camlibs/fuji/fuji.c:254
+#: camlibs/fuji/fuji.c:238
 #, c-format
 msgid "Bad checksum - got 0x%02x, expected 0x%02x."
 msgstr "错误的校验和 - 得到 0x%02x，应为 0x%02x。"
 
 # camlibs/polaroid/pdc700.c:296
-#: camlibs/fuji/fuji.c:292 camlibs/fuji/fuji.c:731
+#: camlibs/fuji/fuji.c:276 camlibs/fuji/fuji.c:715
 msgid "Camera rejected the command."
 msgstr "相机拒绝命令。"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/fuji/fuji.c:301 camlibs/fuji/fuji.c:740
+#: camlibs/fuji/fuji.c:285 camlibs/fuji/fuji.c:724
 msgid "Camera reset itself."
 msgstr "相机自行重置。"
 
-#: camlibs/fuji/fuji.c:305 camlibs/fuji/fuji.c:745
+#: camlibs/fuji/fuji.c:289 camlibs/fuji/fuji.c:729
 #, c-format
 msgid "Camera sent unexpected byte 0x%02x."
 msgstr "相机发送了意外的字节 0x%02x。"
 
 # camlibs/konica/lowlevel.c:382 camlibs/polaroid/pdc700.c:314
 # camlibs/sierra/library.c:989
-#: camlibs/fuji/fuji.c:320 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:316 camlibs/ricoh/g3.c:354
+#: camlibs/fuji/fuji.c:304 camlibs/konica/lowlevel.c:366
+#: camlibs/polaroid/pdc700.c:304 camlibs/ricoh/g3.c:359
 msgid "Downloading..."
 msgstr "正在下载..."
 
-#: camlibs/fuji/fuji.c:541
+#: camlibs/fuji/fuji.c:525
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the thumbnail."
 msgstr "无法为正在下载的缩略图分配 %i 个字节。"
 
-#: camlibs/fuji/fuji.c:575
+#: camlibs/fuji/fuji.c:559
 #, c-format
 msgid "Could not allocate %i byte(s) for downloading the picture."
 msgstr "无法为正在下载的图片分配 %i 个字节。"
 
 # camlibs/polaroid/pdc700.c:296
-#: camlibs/fuji/fuji.c:674
+#: camlibs/fuji/fuji.c:658
 #, c-format
 msgid "The camera does not accept '%s' as filename."
 msgstr "相机不接受作为文件名的“%s”。"
 
-#: camlibs/fuji/fuji.c:678
+#: camlibs/fuji/fuji.c:662
 #, c-format
 msgid "Could not initialize upload (camera responded with 0x%02x)."
 msgstr "无法初始化上载 (相机应答 0x%02x)。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/fuji/fuji.c:776
+#: camlibs/fuji/fuji.c:760
 #, c-format
 msgid "The camera does not support speed %i."
 msgstr "该相机不支持速度 %i。"
 
-#: camlibs/fuji/fuji.c:780
+#: camlibs/fuji/fuji.c:764
 #, c-format
 msgid "Could not set speed to %i (camera responded with %i)."
 msgstr "无法将速度设置为 %i (相机应答 %i)。"
 
-#: camlibs/fuji/library.c:155
+#: camlibs/fuji/library.c:139
 msgid ""
 "Matthew G. Martin\n"
 "Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
@@ -2168,40 +2327,40 @@
 "基于 Thierry Bousch <bousch@topo.math.u-psud.fr> 的 fujiplay\n"
 
 # camlibs/ricoh/library.c:252
-#: camlibs/fuji/library.c:319
-#, fuzzy, c-format
+#: camlibs/fuji/library.c:303
+#, c-format
 msgid "Bit rate %ld is not supported."
-msgstr "不支持位率 %i"
+msgstr "不支持位率 %ld。"
 
-#: camlibs/fuji/library.c:367
+#: camlibs/fuji/library.c:351
 msgid "Configuration for your FUJI camera"
 msgstr "配置您的 FUJI 相机"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/fuji/library.c:372 camlibs/fuji/library.c:405
-#: camlibs/ptp2/ptp.c:4757 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1732
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/fuji/library.c:356 camlibs/fuji/library.c:389
+#: camlibs/ptp2/ptp.c:6224 camlibs/ricoh/library.c:431
+#: camlibs/ricoh/library.c:433 camlibs/sierra/sierra.c:1719
+#: camlibs/sierra/sierra.c:1901
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: camlibs/fuji/library.c:387 camlibs/fuji/library.c:421
-#: camlibs/ptp2/config.c:6662
+#: camlibs/fuji/library.c:371 camlibs/fuji/library.c:405
+#: camlibs/ptp2/config.c:10233
 msgid "ID"
 msgstr "ID"
 
 # frontends/command-line/actions.c:159
-#: camlibs/fuji/library.c:442
+#: camlibs/fuji/library.c:426
 msgid "Version: "
 msgstr "版本："
 
 # frontends/command-line/main.c:384
-#: camlibs/fuji/library.c:448
+#: camlibs/fuji/library.c:432
 msgid "Model: "
 msgstr "型号："
 
 # frontends/command-line/shell.c:779
-#: camlibs/fuji/library.c:455
+#: camlibs/fuji/library.c:439
 msgid "Available memory: "
 msgstr "可用的内存："
 
@@ -2222,24 +2381,24 @@
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:566
+#: camlibs/gsmart300/library.c:210 camlibs/spca50x/library.c:561
 #, c-format
 msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
 
 # libgphoto2/gphoto2-camera.c:662
-#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:624
+#: camlibs/gsmart300/library.c:227 camlibs/spca50x/library.c:618
 msgid "Could not reset camera.\n"
 msgstr "无法重置相机。\n"
 
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:504
+#: camlibs/gsmart300/library.c:336 camlibs/spca50x/library.c:499
 #, fuzzy, c-format
 msgid ""
 "Your camera only supports deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr "您的相机只支持删除相机中的最后一个文件。在此情况下，这是文件“%s”。"
 
-#: camlibs/hp215/hp215.c:458
+#: camlibs/hp215/hp215.c:446
 #, c-format
 msgid ""
 "Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
@@ -2249,7 +2408,7 @@
 "Battery level: %d %%."
 msgstr ""
 
-#: camlibs/hp215/hp215.c:482
+#: camlibs/hp215/hp215.c:470
 msgid ""
 "hp215\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2285,29 +2444,29 @@
 msgstr ""
 
 # camlibs/sierra/sierra.c:1826
-#: camlibs/jamcam/jamcam.c:277
+#: camlibs/jamcam/jamcam.c:273
 #, fuzzy, c-format
 msgid "Frames Taken     : %4d\n"
 msgstr "%s已用帧：%i\n"
 
 # camlibs/jamcam/jamcam.c:280
-#: camlibs/jamcam/jamcam.c:288
+#: camlibs/jamcam/jamcam.c:284
 msgid "jamcam library v"
 msgstr "jamcam 库 v"
 
 # camlibs/jamcam/library.c:336 camlibs/jd11/serial.c:455
-#: camlibs/jamcam/library.c:340 camlibs/jd11/serial.c:473
-#: camlibs/sierra/library.c:1254 camlibs/sonydscf1/sonydscf1.c:270
+#: camlibs/jamcam/library.c:332 camlibs/jd11/serial.c:457
+#: camlibs/sierra/library.c:1251 camlibs/sonydscf1/sonydscf1.c:259
 msgid "Downloading data..."
 msgstr "正在下载数据..."
 
 # camlibs/jamcam/library.c:494 camlibs/jd11/serial.c:375
-#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:377
+#: camlibs/jamcam/library.c:500 camlibs/jd11/serial.c:360
 msgid "Downloading thumbnail..."
 msgstr "正在下载缩略图..."
 
 # camlibs/jd11/jd11.c:174
-#: camlibs/jd11/jd11.c:160
+#: camlibs/jd11/jd11.c:149
 msgid ""
 "The JD11 camera works rather well with this driver.\n"
 "An RS232 interface @ 115 kbit is required for image transfer.\n"
@@ -2324,7 +2483,7 @@
 "   - 全图 (640x480 PPM 格式)\n"
 
 # camlibs/jd11/jd11.c:187
-#: camlibs/jd11/jd11.c:173
+#: camlibs/jd11/jd11.c:162
 msgid ""
 "JD11\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2338,38 +2497,38 @@
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/jd11/jd11.c:186
+#: camlibs/jd11/jd11.c:175
 #, fuzzy
 msgid "JD11 Configuration"
 msgstr "配置"
 
 # camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:254
-#: camlibs/jd11/jd11.c:189 camlibs/jd11/jd11.c:242
+#: camlibs/jd11/jd11.c:178 camlibs/jd11/jd11.c:231
 msgid "Other Settings"
 msgstr "其它设置"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/jd11/jd11.c:194 camlibs/jd11/jd11.c:243
+#: camlibs/jd11/jd11.c:183 camlibs/jd11/jd11.c:232
 msgid "Bulb Exposure Time"
 msgstr "闪光灯闪光时间"
 
 # camlibs/jd11/jd11.c:215 camlibs/jd11/jd11.c:263
-#: camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:252
+#: camlibs/jd11/jd11.c:191 camlibs/jd11/jd11.c:241
 msgid "Color Settings"
 msgstr "色彩设置"
 
 # camlibs/jd11/jd11.c:221 camlibs/jd11/jd11.c:265
-#: camlibs/jd11/jd11.c:209 camlibs/jd11/jd11.c:254
+#: camlibs/jd11/jd11.c:198 camlibs/jd11/jd11.c:243
 msgid "Red"
 msgstr "红"
 
 # camlibs/jd11/jd11.c:228 camlibs/jd11/jd11.c:270
-#: camlibs/jd11/jd11.c:216 camlibs/jd11/jd11.c:260 camlibs/ptp2/config.c:1917
+#: camlibs/jd11/jd11.c:205 camlibs/jd11/jd11.c:249 camlibs/ptp2/config.c:2074
 msgid "Green"
 msgstr "绿"
 
 # camlibs/jd11/jd11.c:235 camlibs/jd11/jd11.c:275
-#: camlibs/jd11/jd11.c:223 camlibs/jd11/jd11.c:266
+#: camlibs/jd11/jd11.c:212 camlibs/jd11/jd11.c:255
 msgid "Blue"
 msgstr "蓝"
 
@@ -2422,12 +2581,12 @@
 msgstr ""
 
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/kodak/dc120/dc120.c:91 camlibs/kodak/dc120/dc120.c:167
+#: camlibs/kodak/dc120/dc120.c:79 camlibs/kodak/dc120/dc120.c:155
 msgid "CompactFlash Card"
 msgstr "闪存卡"
 
 # camlibs/kodak/dc120/dc120.c:364
-#: camlibs/kodak/dc120/dc120.c:382
+#: camlibs/kodak/dc120/dc120.c:370
 msgid ""
 "The Kodak DC120 camera uses the KDC file format for storing images. If you "
 "want to view the images you download from your camera, you will need to "
@@ -2439,7 +2598,7 @@
 "得到。"
 
 # camlibs/kodak/dc120/dc120.c:376
-#: camlibs/kodak/dc120/dc120.c:394
+#: camlibs/kodak/dc120/dc120.c:382
 msgid ""
 "Kodak DC120 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net>\n"
@@ -2453,14 +2612,14 @@
 
 # camlibs/kodak/dc120/library.c:122 camlibs/kodak/dc240/library.c:318
 # camlibs/panasonic/dc1000.c:424 camlibs/panasonic/dc1580.c:552
-#: camlibs/kodak/dc120/library.c:149 camlibs/kodak/dc210/library.c:455
-#: camlibs/kodak/dc240/library.c:326 camlibs/panasonic/dc1000.c:418
-#: camlibs/panasonic/dc1580.c:542
+#: camlibs/kodak/dc120/library.c:133 camlibs/kodak/dc210/library.c:439
+#: camlibs/kodak/dc240/library.c:317 camlibs/panasonic/dc1000.c:407
+#: camlibs/panasonic/dc1580.c:531
 msgid "Getting data..."
 msgstr "正在获取数据..."
 
 # camlibs/kodak/dc120/library.c:506
-#: camlibs/kodak/dc120/library.c:552
+#: camlibs/kodak/dc120/library.c:536
 msgid "Waiting for completion..."
 msgstr "等待完成..."
 
@@ -2475,7 +2634,8 @@
 msgstr "文件类型"
 
 #: camlibs/kodak/dc210/dc210.c:191 camlibs/kodak/dc210/dc210.c:196
-#: camlibs/ptp2/config.c:1889 camlibs/ptp2/ptp.c:6002
+#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:6891
+#: camlibs/ptp2/ptp.c:8220
 msgid "JPEG"
 msgstr "JPEG"
 
@@ -2495,7 +2655,7 @@
 
 # camlibs/polaroid/pdc700.c:175
 #: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:209
-#: camlibs/ricoh/library.c:318
+#: camlibs/ricoh/library.c:302
 msgid "640 x 480"
 msgstr "640 x 480"
 
@@ -2521,8 +2681,9 @@
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1063
-#: camlibs/ptp2/config.c:7104 camlibs/ptp2/config.c:7211
+#: camlibs/kodak/dc210/dc210.c:233 camlibs/konica/qm150.c:1052
+#: camlibs/ptp2/config.c:10676 camlibs/ptp2/config.c:10831
+#: camlibs/ptp2/ptp.c:7562
 msgid "Capture"
 msgstr "光圈"
 
@@ -2563,52 +2724,55 @@
 # camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
 # camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
 #: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/konica/library.c:771 camlibs/konica/library.c:787
-#: camlibs/konica/library.c:802 camlibs/konica/library.c:805
-#: camlibs/konica/library.c:1026 camlibs/konica/library.c:1059
-#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:887
-#: camlibs/konica/qm150.c:956 camlibs/konica/qm150.c:959
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:980
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1015 camlibs/konica/qm150.c:1018
-#: camlibs/ptp2/config.c:1895 camlibs/ptp2/config.c:2089
-#: camlibs/ptp2/config.c:2383 camlibs/ptp2/config.c:3041
-#: camlibs/ptp2/config.c:3211 camlibs/ptp2/config.c:3226
-#: camlibs/ptp2/config.c:3234 camlibs/ptp2/config.c:3247
-#: camlibs/ptp2/config.c:3266 camlibs/ptp2/config.c:3383
-#: camlibs/ptp2/config.c:3495 camlibs/ptp2/config.c:3766
-#: camlibs/ptp2/config.c:3803 camlibs/ptp2/config.c:4084
-#: camlibs/ptp2/config.c:4232 camlibs/ptp2/config.c:4243
-#: camlibs/ptp2/config.c:4255 camlibs/ptp2/config.c:4335
-#: camlibs/ptp2/config.c:4354 camlibs/ptp2/config.c:4575
-#: camlibs/ptp2/config.c:4865 camlibs/ptp2/ptp.c:5647 camlibs/ptp2/ptp.c:5655
-#: camlibs/ptp2/ptp.c:5678 camlibs/ptp2/ptp.c:5686 camlibs/ptp2/ptp.c:5889
-#: camlibs/ptp2/ptp.c:5940 camlibs/ptp2/ptp.c:6016 camlibs/ptp2/ptp.c:6023
-#: camlibs/ptp2/ptp.c:6033 camlibs/ptp2/ptp.c:6070 camlibs/ptp2/ptp.c:6087
-#: camlibs/ptp2/ptp.c:6141 camlibs/ricoh/library.c:311
-#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
-#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196
-#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289
-#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457
-#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515
-#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555
-#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593
-#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638
-#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890
-#: camlibs/sierra/sierra.c:923 camlibs/sierra/sierra.c:929
-#: camlibs/sierra/sierra.c:963 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1290
-#: camlibs/sierra/sierra.c:1332 camlibs/sierra/sierra.c:1377
-#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1553
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1782 camlibs/sierra/sierra.c:1803
-#: camlibs/st2205/library.c:511 camlibs/st2205/library.c:524
+#: camlibs/konica/library.c:757 camlibs/konica/library.c:773
+#: camlibs/konica/library.c:788 camlibs/konica/library.c:791
+#: camlibs/konica/library.c:1012 camlibs/konica/library.c:1045
+#: camlibs/konica/qm150.c:858 camlibs/konica/qm150.c:876
+#: camlibs/konica/qm150.c:945 camlibs/konica/qm150.c:948
+#: camlibs/konica/qm150.c:966 camlibs/konica/qm150.c:969
+#: camlibs/konica/qm150.c:984 camlibs/konica/qm150.c:987
+#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1007
+#: camlibs/ptp2/config.c:2052 camlibs/ptp2/config.c:2086
+#: camlibs/ptp2/config.c:2374 camlibs/ptp2/config.c:2692
+#: camlibs/ptp2/config.c:2828 camlibs/ptp2/config.c:2844
+#: camlibs/ptp2/config.c:3825 camlibs/ptp2/config.c:4006
+#: camlibs/ptp2/config.c:4021 camlibs/ptp2/config.c:4046
+#: camlibs/ptp2/config.c:4077 camlibs/ptp2/config.c:4090
+#: camlibs/ptp2/config.c:4109 camlibs/ptp2/config.c:4142
+#: camlibs/ptp2/config.c:4239 camlibs/ptp2/config.c:4393
+#: camlibs/ptp2/config.c:4814 camlibs/ptp2/config.c:4851
+#: camlibs/ptp2/config.c:5657 camlibs/ptp2/config.c:5889
+#: camlibs/ptp2/config.c:5900 camlibs/ptp2/config.c:5912
+#: camlibs/ptp2/config.c:5998 camlibs/ptp2/config.c:6016
+#: camlibs/ptp2/config.c:6400 camlibs/ptp2/config.c:6767
+#: camlibs/ptp2/config.c:6772 camlibs/ptp2/ptp.c:7863 camlibs/ptp2/ptp.c:7871
+#: camlibs/ptp2/ptp.c:7896 camlibs/ptp2/ptp.c:7904 camlibs/ptp2/ptp.c:8107
+#: camlibs/ptp2/ptp.c:8158 camlibs/ptp2/ptp.c:8234 camlibs/ptp2/ptp.c:8241
+#: camlibs/ptp2/ptp.c:8251 camlibs/ptp2/ptp.c:8288 camlibs/ptp2/ptp.c:8305
+#: camlibs/ptp2/ptp.c:8359 camlibs/ricoh/library.c:295
+#: camlibs/ricoh/library.c:310 camlibs/ricoh/library.c:351
+#: camlibs/sierra/epson-desc.c:137 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/nikon-desc.c:155 camlibs/sierra/nikon-desc.c:189
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/nikon-desc.c:239
+#: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/olympus-desc.c:184
+#: camlibs/sierra/olympus-desc.c:223 camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:361 camlibs/sierra/olympus-desc.c:393
+#: camlibs/sierra/olympus-desc.c:423 camlibs/sierra/olympus-desc.c:448
+#: camlibs/sierra/olympus-desc.c:491 camlibs/sierra/olympus-desc.c:508
+#: camlibs/sierra/olympus-desc.c:527 camlibs/sierra/olympus-desc.c:548
+#: camlibs/sierra/olympus-desc.c:567 camlibs/sierra/olympus-desc.c:586
+#: camlibs/sierra/olympus-desc.c:607 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/olympus-desc.c:868 camlibs/sierra/olympus-desc.c:885
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:916
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1017
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1277
+#: camlibs/sierra/sierra.c:1319 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1567
+#: camlibs/sierra/sierra.c:1769 camlibs/sierra/sierra.c:1790
+#: camlibs/st2205/library.c:501 camlibs/st2205/library.c:514
 #, c-format
 msgid "Auto"
 msgstr "自动"
@@ -2617,27 +2781,31 @@
 # camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1397
 # camlibs/sierra/sierra.c:1404 camlibs/sierra/sierra.c:1631
 #: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1334
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/epson-desc.c:138 camlibs/sierra/nikon-desc.c:222
+#: camlibs/sierra/olympus-desc.c:492 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:528 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1771
 msgid "Force"
 msgstr "强制"
 
 # frontends/command-line/actions.c:168
 #: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/ptp2/config.c:2252 camlibs/ptp2/config.c:4238
-#: camlibs/ptp2/config.c:4325 camlibs/ptp2/config.c:5581
-#: camlibs/ptp2/config.c:5594 camlibs/ptp2/config.c:5618
-#: camlibs/ptp2/config.c:5698 camlibs/ptp2/config.c:5703
-#: camlibs/ptp2/config.c:5717 camlibs/ptp2/config.c:6749
-#: camlibs/ptp2/config.c:7052 camlibs/ptp2/config.c:7062
-#: camlibs/ptp2/config.c:7072 camlibs/ptp2/config.c:7082
-#: camlibs/ptp2/config.c:7092 camlibs/ptp2/library.c:5801
-#: camlibs/ptp2/library.c:5804 camlibs/ptp2/ptp.c:5684
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:2556 camlibs/ptp2/config.c:5895
+#: camlibs/ptp2/config.c:5988 camlibs/ptp2/config.c:7648
+#: camlibs/ptp2/config.c:7661 camlibs/ptp2/config.c:7685
+#: camlibs/ptp2/config.c:7765 camlibs/ptp2/config.c:7770
+#: camlibs/ptp2/config.c:7784 camlibs/ptp2/config.c:7808
+#: camlibs/ptp2/config.c:7812 camlibs/ptp2/config.c:7826
+#: camlibs/ptp2/config.c:7843 camlibs/ptp2/config.c:7857
+#: camlibs/ptp2/config.c:7862 camlibs/ptp2/config.c:7878
+#: camlibs/ptp2/config.c:9414 camlibs/ptp2/config.c:10320
+#: camlibs/ptp2/config.c:10623 camlibs/ptp2/config.c:10633
+#: camlibs/ptp2/config.c:10643 camlibs/ptp2/config.c:10653
+#: camlibs/ptp2/config.c:10663 camlibs/ptp2/library.c:7825
+#: camlibs/ptp2/library.c:7828 camlibs/ptp2/ptp.c:7902
+#: camlibs/ricoh/library.c:330
 msgid "None"
 msgstr "无"
 
@@ -2650,29 +2818,31 @@
 # camlibs/konica/library.c:989 camlibs/sierra/sierra.c:1003
 # camlibs/sierra/sierra.c:1009 camlibs/sierra/sierra.c:1272
 #: camlibs/kodak/dc210/dc210.c:287 camlibs/kodak/dc210/dc210.c:291
-#: camlibs/konica/library.c:670 camlibs/konica/library.c:677
-#: camlibs/konica/library.c:769 camlibs/konica/library.c:778
-#: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:807
-#: camlibs/konica/qm150.c:811 camlibs/konica/qm150.c:821
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:867
-#: camlibs/konica/qm150.c:880 camlibs/konica/qm150.c:1037
-#: camlibs/konica/qm150.c:1044 camlibs/konica/qm150.c:1051
-#: camlibs/konica/qm150.c:1058 camlibs/ptp2/config.c:1339
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1350
-#: camlibs/ptp2/config.c:1369 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1380 camlibs/ptp2/config.c:1669
-#: camlibs/ptp2/config.c:1675 camlibs/ptp2/config.c:1682
-#: camlibs/ptp2/config.c:4086 camlibs/ptp2/config.c:4975
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5662
-#: camlibs/ptp2/config.c:5665 camlibs/ptp2/config.c:5683
-#: camlibs/ptp2/config.c:6511 camlibs/ptp2/config.c:6551
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5891 camlibs/ptp2/ptp.c:6017 camlibs/ptp2/ptp.c:6103
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1140
-#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1418
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:570
-#: camlibs/topfield/puppy.c:593
+#: camlibs/konica/library.c:656 camlibs/konica/library.c:663
+#: camlibs/konica/library.c:755 camlibs/konica/library.c:764
+#: camlibs/konica/library.c:1008 camlibs/konica/qm150.c:796
+#: camlibs/konica/qm150.c:800 camlibs/konica/qm150.c:810
+#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:856
+#: camlibs/konica/qm150.c:869 camlibs/konica/qm150.c:1026
+#: camlibs/konica/qm150.c:1033 camlibs/konica/qm150.c:1040
+#: camlibs/konica/qm150.c:1047 camlibs/ptp2/chdk.c:987
+#: camlibs/ptp2/config.c:1238 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1249 camlibs/ptp2/config.c:1268
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1279
+#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:1699
+#: camlibs/ptp2/config.c:1706 camlibs/ptp2/config.c:5659
+#: camlibs/ptp2/config.c:6930 camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:6988 camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:7222 camlibs/ptp2/config.c:7729
+#: camlibs/ptp2/config.c:7732 camlibs/ptp2/config.c:7750
+#: camlibs/ptp2/config.c:10082 camlibs/ptp2/config.c:10122
+#: camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777 camlibs/ptp2/ptp.c:7778
+#: camlibs/ptp2/ptp.c:8109 camlibs/ptp2/ptp.c:8235 camlibs/ptp2/ptp.c:8321
+#: camlibs/ricoh/library.c:322 camlibs/ricoh/library.c:353
+#: camlibs/sierra/nikon-desc.c:292 camlibs/sierra/sierra.c:1127
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1405
+#: camlibs/topfield/puppy.c:546 camlibs/topfield/puppy.c:558
+#: camlibs/topfield/puppy.c:581
 msgid "On"
 msgstr "开"
 
@@ -2685,44 +2855,49 @@
 # camlibs/sierra/sierra.c:1398 camlibs/sierra/sierra.c:1406
 # camlibs/sierra/sierra.c:1633
 #: camlibs/kodak/dc210/dc210.c:288 camlibs/kodak/dc210/dc210.c:293
-#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:671
-#: camlibs/konica/library.c:674 camlibs/konica/library.c:768
-#: camlibs/konica/library.c:775 camlibs/konica/library.c:888
-#: camlibs/konica/library.c:1020 camlibs/konica/qm150.c:808
-#: camlibs/konica/qm150.c:814 camlibs/konica/qm150.c:822
-#: camlibs/konica/qm150.c:828 camlibs/konica/qm150.c:866
-#: camlibs/konica/qm150.c:873 camlibs/konica/qm150.c:1038
-#: camlibs/konica/qm150.c:1041 camlibs/konica/qm150.c:1052
-#: camlibs/konica/qm150.c:1055 camlibs/ptp2/config.c:1340
-#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1354
-#: camlibs/ptp2/config.c:1370 camlibs/ptp2/config.c:1371
-#: camlibs/ptp2/config.c:1384 camlibs/ptp2/config.c:1670
-#: camlibs/ptp2/config.c:1676 camlibs/ptp2/config.c:1681
-#: camlibs/ptp2/config.c:1978 camlibs/ptp2/config.c:2039
-#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2269
-#: camlibs/ptp2/config.c:2295 camlibs/ptp2/config.c:2321
-#: camlibs/ptp2/config.c:4085 camlibs/ptp2/config.c:4453
-#: camlibs/ptp2/config.c:4565 camlibs/ptp2/config.c:4864
-#: camlibs/ptp2/config.c:4957 camlibs/ptp2/config.c:4967
-#: camlibs/ptp2/config.c:4976 camlibs/ptp2/config.c:5058
-#: camlibs/ptp2/config.c:5165 camlibs/ptp2/config.c:5661
-#: camlibs/ptp2/config.c:5664 camlibs/ptp2/config.c:5682
-#: camlibs/ptp2/config.c:6512 camlibs/ptp2/config.c:6552
-#: camlibs/ptp2/ptp.c:5564 camlibs/ptp2/ptp.c:5565 camlibs/ptp2/ptp.c:5566
-#: camlibs/ptp2/ptp.c:5890 camlibs/ptp2/ptp.c:6015 camlibs/ptp2/ptp.c:6055
-#: camlibs/ptp2/ptp.c:6101 camlibs/ptp2/ptp.c:6166 camlibs/ptp2/ptp.c:6171
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500
-#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536
-#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856
-#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1141
-#: camlibs/sierra/sierra.c:1144 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1557 camlibs/sierra/sierra.c:1786
-#: camlibs/topfield/puppy.c:559 camlibs/topfield/puppy.c:570
+#: camlibs/kodak/dc210/dc210.c:461 camlibs/konica/library.c:657
+#: camlibs/konica/library.c:660 camlibs/konica/library.c:754
+#: camlibs/konica/library.c:761 camlibs/konica/library.c:874
+#: camlibs/konica/library.c:1006 camlibs/konica/qm150.c:797
+#: camlibs/konica/qm150.c:803 camlibs/konica/qm150.c:811
+#: camlibs/konica/qm150.c:817 camlibs/konica/qm150.c:855
+#: camlibs/konica/qm150.c:862 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1030 camlibs/konica/qm150.c:1041
+#: camlibs/konica/qm150.c:1044 camlibs/ptp2/chdk.c:988
+#: camlibs/ptp2/config.c:1239 camlibs/ptp2/config.c:1240
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1269
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1283
+#: camlibs/ptp2/config.c:1468 camlibs/ptp2/config.c:1694
+#: camlibs/ptp2/config.c:1700 camlibs/ptp2/config.c:1705
+#: camlibs/ptp2/config.c:2115 camlibs/ptp2/config.c:2263
+#: camlibs/ptp2/config.c:2324 camlibs/ptp2/config.c:2525
+#: camlibs/ptp2/config.c:2574 camlibs/ptp2/config.c:2600
+#: camlibs/ptp2/config.c:2626 camlibs/ptp2/config.c:5658
+#: camlibs/ptp2/config.c:6119 camlibs/ptp2/config.c:6390
+#: camlibs/ptp2/config.c:6766 camlibs/ptp2/config.c:6773
+#: camlibs/ptp2/config.c:6929 camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:6970 camlibs/ptp2/config.c:6980
+#: camlibs/ptp2/config.c:6989 camlibs/ptp2/config.c:7073
+#: camlibs/ptp2/config.c:7192 camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:7213 camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:7728 camlibs/ptp2/config.c:7731
+#: camlibs/ptp2/config.c:7749 camlibs/ptp2/config.c:10083
+#: camlibs/ptp2/config.c:10123 camlibs/ptp2/ptp.c:7776 camlibs/ptp2/ptp.c:7777
+#: camlibs/ptp2/ptp.c:7778 camlibs/ptp2/ptp.c:8108 camlibs/ptp2/ptp.c:8233
+#: camlibs/ptp2/ptp.c:8273 camlibs/ptp2/ptp.c:8319 camlibs/ptp2/ptp.c:8384
+#: camlibs/ptp2/ptp.c:8389 camlibs/ricoh/library.c:323
+#: camlibs/ricoh/library.c:352 camlibs/ricoh/library.c:360
+#: camlibs/sierra/epson-desc.c:139 camlibs/sierra/nikon-desc.c:223
+#: camlibs/sierra/nikon-desc.c:291 camlibs/sierra/nikon-desc.c:346
+#: camlibs/sierra/olympus-desc.c:493 camlibs/sierra/olympus-desc.c:510
+#: camlibs/sierra/olympus-desc.c:529 camlibs/sierra/olympus-desc.c:651
+#: camlibs/sierra/olympus-desc.c:851 camlibs/sierra/olympus-desc.c:935
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1021
+#: camlibs/sierra/sierra.c:1128 camlibs/sierra/sierra.c:1131
+#: camlibs/sierra/sierra.c:1323 camlibs/sierra/sierra.c:1407
+#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1544
+#: camlibs/sierra/sierra.c:1773 camlibs/topfield/puppy.c:547
+#: camlibs/topfield/puppy.c:558
 msgid "Off"
 msgstr "关"
 
@@ -2740,7 +2915,7 @@
 msgid "Port speed"
 msgstr "端口速度"
 
-#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:711
+#: camlibs/kodak/dc210/dc210.c:316 camlibs/kodak/dc210/library.c:695
 msgid "Album name"
 msgstr "相册名称"
 
@@ -2803,9 +2978,9 @@
 
 # libgphoto2/gphoto2-result.c:45
 #: camlibs/kodak/dc210/dc210.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "Filetype: JPEG ("
-msgstr "文件类型"
+msgstr "文件类型： JPEG ("
 
 #: camlibs/kodak/dc210/dc210.c:529
 #, c-format
@@ -2969,66 +3144,66 @@
 "Michael Koltan <koltan@gmx.de>\n"
 
 # camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
-#: camlibs/kodak/dc210/library.c:363
+#: camlibs/kodak/dc210/library.c:347
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: camlibs/kodak/dc210/library.c:1383
+#: camlibs/kodak/dc210/library.c:1367
 msgid "Parameter 1"
 msgstr "参数 1"
 
-#: camlibs/kodak/dc210/library.c:1387
+#: camlibs/kodak/dc210/library.c:1371
 msgid "Parameter 2"
 msgstr "参数 2"
 
-#: camlibs/kodak/dc210/library.c:1391
+#: camlibs/kodak/dc210/library.c:1375
 msgid "Parameter 3"
 msgstr "参数 3"
 
 # camlibs/kodak/dc240/dc240.c:182
-#: camlibs/kodak/dc240/dc240.c:202
+#: camlibs/kodak/dc240/dc240.c:186
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "型号：柯达 %s\n"
 
 # camlibs/kodak/dc240/dc240.c:183
-#: camlibs/kodak/dc240/dc240.c:203
+#: camlibs/kodak/dc240/dc240.c:187
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "固件版本：%d.%02d\n"
 
 # camlibs/kodak/dc240/dc240.c:185
-#: camlibs/kodak/dc240/dc240.c:205
+#: camlibs/kodak/dc240/dc240.c:189
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "电池状态：%s，交流变压器：%s\n"
 
 # camlibs/kodak/dc240/dc240.c:189
-#: camlibs/kodak/dc240/dc240.c:209
+#: camlibs/kodak/dc240/dc240.c:193
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "照片数量：%d\n"
 
 # camlibs/kodak/dc240/dc240.c:191
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:195
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "剩余空间：高：%d，中：%d，低：%d\n"
 
 # camlibs/kodak/dc240/dc240.c:195
-#: camlibs/kodak/dc240/dc240.c:215
+#: camlibs/kodak/dc240/dc240.c:199
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "存储卡状态 (%d)：%s\n"
 
 # camlibs/kodak/dc240/dc240.c:199
-#: camlibs/kodak/dc240/dc240.c:219
+#: camlibs/kodak/dc240/dc240.c:203
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "捕获照片总数：%d，闪光灯闪光次数：%d\n"
 
 # camlibs/kodak/dc240/dc240.c:213
-#: camlibs/kodak/dc240/dc240.c:233
+#: camlibs/kodak/dc240/dc240.c:217
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -3043,54 +3218,55 @@
 "为 gPhoto2 重写并更新。"
 
 # camlibs/kodak/dc240/library.c:575
-#: camlibs/kodak/dc240/library.c:576
+#: camlibs/kodak/dc240/library.c:570
 msgid "Weak"
 msgstr "弱"
 
 # camlibs/kodak/dc240/library.c:578
-#: camlibs/kodak/dc240/library.c:579
+#: camlibs/kodak/dc240/library.c:573
 msgid "Empty"
 msgstr "空"
 
 # camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
-#: camlibs/kodak/dc240/library.c:584 camlibs/kodak/dc240/library.c:599
-#: camlibs/ptp2/config.c:5144 camlibs/ptp2/ptp.c:6078
+#: camlibs/kodak/dc240/library.c:578 camlibs/kodak/dc240/library.c:593
+#: camlibs/ptp2/config.c:7171 camlibs/ptp2/ptp.c:8296
 msgid "Invalid"
 msgstr "非法"
 
 # camlibs/kodak/dc240/library.c:590
-#: camlibs/kodak/dc240/library.c:591 camlibs/ptp2/config.c:2228
-#: camlibs/ptp2/ptp.c:6011
+#: camlibs/kodak/dc240/library.c:585 camlibs/ptp2/config.c:2517
+#: camlibs/ptp2/ptp.c:8229
 msgid "Not used"
 msgstr "未使用"
 
 # camlibs/kodak/dc240/library.c:593
-#: camlibs/kodak/dc240/library.c:594
+#: camlibs/kodak/dc240/library.c:588
 msgid "In use"
 msgstr "使用中"
 
 # camlibs/kodak/dc240/library.c:607
-#: camlibs/kodak/dc240/library.c:608
+#: camlibs/kodak/dc240/library.c:602
 msgid "Card is open"
 msgstr "卡已打开"
 
 # camlibs/kodak/dc240/library.c:610
-#: camlibs/kodak/dc240/library.c:609
+#: camlibs/kodak/dc240/library.c:603
 msgid "Card is not open"
 msgstr "卡未打开"
 
 # camlibs/kodak/dc240/library.c:614
-#: camlibs/kodak/dc240/library.c:611
+#: camlibs/kodak/dc240/library.c:605
 msgid "Card is not formatted"
 msgstr "卡尚未格式化"
 
 # camlibs/kodak/dc240/library.c:618
-#: camlibs/kodak/dc240/library.c:613
+#: camlibs/kodak/dc240/library.c:607 camlibs/ptp2/config.c:8565
+#: camlibs/ptp2/config.c:8679
 msgid "No card"
 msgstr "无卡"
 
 # camlibs/kodak/dc3200/dc3200.c:38
-#: camlibs/kodak/dc3200/dc3200.c:63
+#: camlibs/kodak/dc3200/dc3200.c:52
 msgid ""
 "There is currently an operation in progress. This camera only supports one "
 "operation at a time. Please wait until the current operation has finished."
@@ -3099,13 +3275,13 @@
 "成。"
 
 # camlibs/kodak/dc3200/dc3200.c:142
-#: camlibs/kodak/dc3200/dc3200.c:166
+#: camlibs/kodak/dc3200/dc3200.c:155
 #, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr "相机非活跃时间大于 9 秒，正在重新初始化。\n"
 
 # camlibs/kodak/dc3200/dc3200.c:431
-#: camlibs/kodak/dc3200/dc3200.c:455
+#: camlibs/kodak/dc3200/dc3200.c:446
 msgid ""
 "Known problems:\n"
 "\n"
@@ -3120,7 +3296,7 @@
 "化。如果您发现相机没有应答，请重新选择相机。这将导致相机重新初始化。"
 
 # camlibs/kodak/dc3200/dc3200.c:444
-#: camlibs/kodak/dc3200/dc3200.c:468
+#: camlibs/kodak/dc3200/dc3200.c:459
 msgid ""
 "Kodak DC3200 Driver\n"
 "Donn Morrison <dmorriso@gulf.uvic.ca>\n"
@@ -3132,167 +3308,168 @@
 "\n"
 "欢迎问题和评论。"
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:187
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:195
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
 msgstr ""
 
 # camlibs/konica/konica.c:62
-#: camlibs/konica/konica.c:62
+#: camlibs/konica/konica.c:46
 msgid "Focusing error."
 msgstr "聚焦错误。"
 
 # camlibs/konica/konica.c:65
-#: camlibs/konica/konica.c:65
+#: camlibs/konica/konica.c:49
 msgid "Iris error."
 msgstr "光圈错误。"
 
 # camlibs/konica/konica.c:68
-#: camlibs/konica/konica.c:68
+#: camlibs/konica/konica.c:52
 msgid "Strobe error."
 msgstr "闪光灯。"
 
 # camlibs/konica/konica.c:71
-#: camlibs/konica/konica.c:71
+#: camlibs/konica/konica.c:55
 msgid "EEPROM checksum error."
 msgstr "EEPROM 校验和错误。"
 
 # camlibs/konica/konica.c:74
-#: camlibs/konica/konica.c:74
+#: camlibs/konica/konica.c:58
 msgid "Internal error (1)."
 msgstr "内部错误 (1)。"
 
 # camlibs/konica/konica.c:77
-#: camlibs/konica/konica.c:77
+#: camlibs/konica/konica.c:61
 msgid "Internal error (2)."
 msgstr "内部错误 (2)。"
 
 # camlibs/konica/konica.c:80
-#: camlibs/konica/konica.c:80
+#: camlibs/konica/konica.c:64
 msgid "No card present."
 msgstr "未插卡。"
 
 # camlibs/konica/konica.c:83
-#: camlibs/konica/konica.c:83
+#: camlibs/konica/konica.c:67
 msgid "Card not supported."
 msgstr "不支持的卡。"
 
 # camlibs/konica/konica.c:86
-#: camlibs/konica/konica.c:86
+#: camlibs/konica/konica.c:70
 msgid "Card removed during access."
 msgstr "访问使取出卡。"
 
 # camlibs/konica/konica.c:89
-#: camlibs/konica/konica.c:89
+#: camlibs/konica/konica.c:73
 msgid "Image number not valid."
 msgstr "图像数量不合法。"
 
 # camlibs/konica/konica.c:92
-#: camlibs/konica/konica.c:92
+#: camlibs/konica/konica.c:76
 msgid "Card can not be written."
 msgstr "无法写入卡。"
 
 # camlibs/konica/konica.c:95
-#: camlibs/konica/konica.c:95
+#: camlibs/konica/konica.c:79
 msgid "Card is write protected."
 msgstr "卡已写保护。"
 
 # camlibs/konica/konica.c:98
-#: camlibs/konica/konica.c:98
+#: camlibs/konica/konica.c:82
 msgid "No space left on card."
 msgstr "卡上没有剩余空间。"
 
 # camlibs/konica/konica.c:101
-#: camlibs/konica/konica.c:101
+#: camlibs/konica/konica.c:85
 msgid "Image protected."
 msgstr "图像已受到保护。"
 
 # camlibs/konica/konica.c:104
-#: camlibs/konica/konica.c:104
+#: camlibs/konica/konica.c:88
 msgid "Light too dark."
 msgstr "光线太暗。"
 
 # camlibs/konica/konica.c:107
-#: camlibs/konica/konica.c:107
+#: camlibs/konica/konica.c:91
 msgid "Autofocus error."
 msgstr "自动聚焦错误。"
 
 # camlibs/konica/konica.c:110
-#: camlibs/konica/konica.c:110
+#: camlibs/konica/konica.c:94
 msgid "System error."
 msgstr "系统错误。"
 
 # camlibs/konica/konica.c:113
-#: camlibs/konica/konica.c:113
+#: camlibs/konica/konica.c:97
 msgid "Illegal parameter."
 msgstr "非法参数。"
 
 # camlibs/konica/konica.c:116
-#: camlibs/konica/konica.c:116
+#: camlibs/konica/konica.c:100
 msgid "Command can not be cancelled."
 msgstr "命令不能被取消。"
 
 # camlibs/konica/konica.c:119
-#: camlibs/konica/konica.c:119
+#: camlibs/konica/konica.c:103
 msgid "Localization data too long."
 msgstr "本地化数据太长。"
 
 # camlibs/konica/konica.c:122
-#: camlibs/konica/konica.c:122
+#: camlibs/konica/konica.c:106
 msgid "Localization data corrupt."
 msgstr "本地化数据崩溃。"
 
 # camlibs/konica/konica.c:125
-#: camlibs/konica/konica.c:125
+#: camlibs/konica/konica.c:109
 msgid "Unsupported command."
 msgstr "不支持的命令。"
 
 # camlibs/konica/konica.c:128
-#: camlibs/konica/konica.c:128
+#: camlibs/konica/konica.c:112
 msgid "Other command executing."
 msgstr "正在执行其它命令。"
 
 # camlibs/konica/konica.c:131
-#: camlibs/konica/konica.c:131
+#: camlibs/konica/konica.c:115
 msgid "Command order error."
 msgstr "命令顺序错误。"
 
 # camlibs/konica/konica.c:134
-#: camlibs/konica/konica.c:134
+#: camlibs/konica/konica.c:118
 msgid "Unknown error."
 msgstr "未知的错误。"
 
 # camlibs/konica/konica.c:137
-#: camlibs/konica/konica.c:137
+#: camlibs/konica/konica.c:121
 #, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
 "report the following to %s with additional information how you got this "
 "error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
-"相机刚刚送出了一个尚未发现的错误。请将以下内容以及您如何得到错误：(0x%x,0x"
-"%x) 的附加信息发送到 <gphoto-devel@lists.sourceforge.net>。非常感谢您！"
+"相机刚刚送出了一个尚未发现的错误。请将以下内容以及您如何得到错误："
+"(0x%x,0x%x) 的附加信息发送到 <gphoto-devel@lists.sourceforge.net>。非常感谢"
+"您！"
 
 # camlibs/konica/library.c:142
-#: camlibs/konica/library.c:157 camlibs/pccam300/library.c:118
+#: camlibs/konica/library.c:141 camlibs/pccam300/library.c:119
 msgid "Getting file list..."
 msgstr "正在获取文件列表..."
 
 # camlibs/konica/library.c:307
-#: camlibs/konica/library.c:323
+#: camlibs/konica/library.c:307
 msgid "Testing different speeds..."
 msgstr "正在测试不同的速度..."
 
 # camlibs/konica/library.c:321
-#: camlibs/konica/library.c:338
+#: camlibs/konica/library.c:322
 #, fuzzy
 msgid ""
 "The camera could not be contacted. Please make sure it is connected to the "
@@ -3300,13 +3477,13 @@
 msgstr "无法与相机联络。请确信相机已经连接到计算机并确认相机已打开。"
 
 # camlibs/konica/library.c:405
-#: camlibs/konica/library.c:422
+#: camlibs/konica/library.c:406
 #, c-format
 msgid "%i pictures could not be deleted because they are protected"
 msgstr "由于有 %i 个照片已被保护，所以无法被删除"
 
 # camlibs/konica/library.c:498
-#: camlibs/konica/library.c:522
+#: camlibs/konica/library.c:506
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3326,7 +3503,7 @@
 "制造商：%s\n"
 
 # camlibs/konica/library.c:589
-#: camlibs/konica/library.c:613
+#: camlibs/konica/library.c:599
 msgid ""
 "Konica library\n"
 "Lutz Mueller <lutz@users.sourceforge.net>\n"
@@ -3337,194 +3514,194 @@
 "支持所有柯尼卡相机和几种惠普相机。"
 
 # camlibs/konica/library.c:617
-#: camlibs/konica/library.c:638
+#: camlibs/konica/library.c:624
 msgid "Getting configuration..."
 msgstr "正在获取配置..."
 
 # camlibs/konica/library.c:624
-#: camlibs/konica/library.c:645 camlibs/konica/qm150.c:765
+#: camlibs/konica/library.c:631 camlibs/konica/qm150.c:754
 msgid "Konica Configuration"
 msgstr "柯尼卡配置"
 
 # camlibs/konica/library.c:629 camlibs/konica/library.c:840
-#: camlibs/konica/library.c:650 camlibs/konica/library.c:862
-#: camlibs/konica/qm150.c:770
+#: camlibs/konica/library.c:636 camlibs/konica/library.c:848
+#: camlibs/konica/qm150.c:759
 msgid "Persistent Settings"
 msgstr "永久设置"
 
 # camlibs/konica/library.c:659
-#: camlibs/konica/library.c:680
+#: camlibs/konica/library.c:666
 msgid "Shall the camera beep when taking a picture?"
 msgstr "相机是否要在拍摄一张照片时鸣笛？"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/konica/library.c:684 camlibs/konica/library.c:897
+#: camlibs/konica/library.c:670 camlibs/konica/library.c:883
 msgid "Self Timer Time"
 msgstr "自动定时器时间"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/konica/library.c:691 camlibs/konica/library.c:906
-#: camlibs/konica/qm150.c:779
+#: camlibs/konica/library.c:677 camlibs/konica/library.c:892
+#: camlibs/konica/qm150.c:768
 msgid "Auto Off Time"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:677 camlibs/konica/library.c:887
-#: camlibs/konica/library.c:698 camlibs/konica/library.c:915
+#: camlibs/konica/library.c:684 camlibs/konica/library.c:901
 msgid "Slide Show Interval"
 msgstr "幻灯片显示间隔"
 
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/konica/library.c:705 camlibs/konica/library.c:925
-#: camlibs/konica/qm150.c:787 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1254
-#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1832
+#: camlibs/konica/library.c:691 camlibs/konica/library.c:911
+#: camlibs/konica/qm150.c:776 camlibs/ricoh/library.c:483
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1241
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1819
 msgid "Resolution"
 msgstr "分辨率"
 
 # camlibs/konica/library.c:686 camlibs/konica/library.c:694
 # camlibs/konica/library.c:901
-#: camlibs/konica/library.c:707 camlibs/konica/library.c:715
-#: camlibs/konica/library.c:931
+#: camlibs/konica/library.c:693 camlibs/konica/library.c:701
+#: camlibs/konica/library.c:917
 msgid "Low (576 x 436)"
 msgstr "低 (576 x 436)"
 
 # camlibs/konica/library.c:687 camlibs/konica/library.c:697
-#: camlibs/konica/library.c:708 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:694 camlibs/konica/library.c:704
 msgid "Medium (1152 x 872)"
 msgstr "中 (1152 x 872)"
 
 # camlibs/konica/library.c:688 camlibs/konica/library.c:691
 # camlibs/konica/library.c:899
-#: camlibs/konica/library.c:709 camlibs/konica/library.c:712
-#: camlibs/konica/library.c:929
+#: camlibs/konica/library.c:695 camlibs/konica/library.c:698
+#: camlibs/konica/library.c:915
 msgid "High (1152 x 872)"
 msgstr "高 (1152 x 872)"
 
 # camlibs/konica/library.c:704 camlibs/konica/library.c:912
-#: camlibs/konica/library.c:725 camlibs/konica/library.c:942
-#: camlibs/konica/qm150.c:835
+#: camlibs/konica/library.c:711 camlibs/konica/library.c:928
+#: camlibs/konica/qm150.c:824
 msgid "Localization"
 msgstr "本地化"
 
 # camlibs/konica/library.c:710 camlibs/konica/library.c:915
 # camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
-#: camlibs/konica/library.c:731 camlibs/konica/library.c:945
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1695 camlibs/sierra/sierra.c:1887
+#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
+#: camlibs/sierra/epson-desc.c:232 camlibs/sierra/nikon-desc.c:421
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1874
 msgid "Language"
 msgstr "语言"
 
 # camlibs/konica/library.c:717 camlibs/konica/library.c:726
 # camlibs/konica/library.c:734 camlibs/konica/library.c:920
 # camlibs/konica/library.c:945 camlibs/konica/library.c:963
-#: camlibs/konica/library.c:738 camlibs/konica/library.c:748
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:976 camlibs/konica/library.c:995
+#: camlibs/konica/library.c:724 camlibs/konica/library.c:734
+#: camlibs/konica/library.c:742 camlibs/konica/library.c:936
+#: camlibs/konica/library.c:962 camlibs/konica/library.c:981
 msgid "None selected"
 msgstr "未选择"
 
 # camlibs/konica/library.c:721 camlibs/konica/library.c:942
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:972
+#: camlibs/konica/library.c:729 camlibs/konica/library.c:958
 msgid "TV Output Format"
 msgstr "电视输出格式"
 
 # camlibs/konica/library.c:723 camlibs/konica/library.c:946
-#: camlibs/konica/library.c:745 camlibs/konica/library.c:977
-#: camlibs/ptp2/config.c:2055
+#: camlibs/konica/library.c:731 camlibs/konica/library.c:963
+#: camlibs/ptp2/config.c:2340
 msgid "NTSC"
 msgstr "NTSC"
 
 # camlibs/konica/library.c:724 camlibs/konica/library.c:948
-#: camlibs/konica/library.c:746 camlibs/konica/library.c:979
-#: camlibs/ptp2/config.c:2056
+#: camlibs/konica/library.c:732 camlibs/konica/library.c:965
+#: camlibs/ptp2/config.c:2341
 msgid "PAL"
 msgstr "PAL"
 
 # camlibs/konica/library.c:725 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:747 camlibs/konica/library.c:981
+#: camlibs/konica/library.c:733 camlibs/konica/library.c:967
 msgid "Do not display TV menu"
 msgstr "请勿显示电视菜单"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/konica/library.c:751 camlibs/konica/library.c:991
-#: camlibs/konica/qm150.c:839
+#: camlibs/konica/library.c:737 camlibs/konica/library.c:977
+#: camlibs/konica/qm150.c:828
 msgid "Date Format"
 msgstr "日期格式"
 
 # camlibs/konica/library.c:731 camlibs/konica/library.c:964
-#: camlibs/konica/library.c:753 camlibs/konica/library.c:996
-#: camlibs/konica/qm150.c:841 camlibs/konica/qm150.c:846
+#: camlibs/konica/library.c:739 camlibs/konica/library.c:982
+#: camlibs/konica/qm150.c:830 camlibs/konica/qm150.c:835
 msgid "Month/Day/Year"
 msgstr "月/日/年"
 
 # camlibs/konica/library.c:732 camlibs/konica/library.c:966
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:842 camlibs/konica/qm150.c:849
+#: camlibs/konica/library.c:740 camlibs/konica/library.c:984
+#: camlibs/konica/qm150.c:831 camlibs/konica/qm150.c:838
 msgid "Day/Month/Year"
 msgstr "日/月/年"
 
 # camlibs/konica/library.c:733 camlibs/konica/library.c:968
-#: camlibs/konica/library.c:755 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:843 camlibs/konica/qm150.c:852
+#: camlibs/konica/library.c:741 camlibs/konica/library.c:986
+#: camlibs/konica/qm150.c:832 camlibs/konica/qm150.c:841
 msgid "Year/Month/Day"
 msgstr "年/月/日"
 
 # camlibs/konica/library.c:739 camlibs/konica/library.c:980
-#: camlibs/konica/library.c:761 camlibs/konica/library.c:1012
-#: camlibs/konica/qm150.c:859
+#: camlibs/konica/library.c:747 camlibs/konica/library.c:998
+#: camlibs/konica/qm150.c:848
 msgid "Session-persistent Settings"
 msgstr "会话永久设置"
 
 # camlibs/konica/library.c:748 camlibs/konica/library.c:759
 # camlibs/konica/library.c:991
-#: camlibs/konica/library.c:770 camlibs/konica/library.c:781
-#: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:868
-#: camlibs/konica/qm150.c:878
+#: camlibs/konica/library.c:756 camlibs/konica/library.c:767
+#: camlibs/konica/library.c:1010 camlibs/konica/qm150.c:857
+#: camlibs/konica/qm150.c:867
 msgid "On, red-eye reduction"
 msgstr "开，消红眼"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:784
-#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:885
+#: camlibs/konica/library.c:758 camlibs/konica/library.c:770
+#: camlibs/konica/qm150.c:859 camlibs/konica/qm150.c:874
 msgid "Auto, red-eye reduction"
 msgstr "自动，消红眼"
 
 # camlibs/konica/library.c:777 camlibs/konica/library.c:1010
-#: camlibs/konica/library.c:799 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:951 camlibs/ptp2/config.c:5034
-#: camlibs/ptp2/config.c:5040
+#: camlibs/konica/library.c:785 camlibs/konica/library.c:1030
+#: camlibs/konica/qm150.c:940 camlibs/ptp2/chdk.c:1029
+#: camlibs/ptp2/config.c:7049 camlibs/ptp2/config.c:7055
 msgid "Focus"
 msgstr "聚焦"
 
 # camlibs/konica/library.c:779 camlibs/konica/library.c:786
 # camlibs/sierra/sierra.c:1425 camlibs/sierra/sierra.c:1431
 # camlibs/sierra/sierra.c:1651
-#: camlibs/konica/library.c:801 camlibs/konica/library.c:808
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1576
-#: camlibs/sierra/sierra.c:1582 camlibs/sierra/sierra.c:1805
+#: camlibs/konica/library.c:787 camlibs/konica/library.c:794
+#: camlibs/sierra/epson-desc.c:156 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1792
 msgid "Fixed"
 msgstr "固定"
 
 # camlibs/konica/library.c:793 camlibs/konica/library.c:1015
-#: camlibs/konica/library.c:815 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1101
+#: camlibs/konica/library.c:801 camlibs/konica/library.c:1035
+#: camlibs/konica/qm150.c:1090
 msgid "Volatile Settings"
 msgstr "临时设定"
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/konica/library.c:819 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1105 camlibs/polaroid/pdc700.c:165
-#: camlibs/ptp2/config.c:7260
+#: camlibs/konica/library.c:805 camlibs/konica/library.c:1038
+#: camlibs/konica/qm150.c:1094 camlibs/polaroid/pdc700.c:149
+#: camlibs/ptp2/config.c:10910
 msgid "Self Timer"
 msgstr "自动定时"
 
 # camlibs/konica/library.c:803
-#: camlibs/konica/library.c:821 camlibs/konica/library.c:825
-#: camlibs/konica/library.c:1064 camlibs/konica/qm150.c:1107
-#: camlibs/konica/qm150.c:1111
+#: camlibs/konica/library.c:807 camlibs/konica/library.c:811
+#: camlibs/konica/library.c:1050 camlibs/konica/qm150.c:1096
+#: camlibs/konica/qm150.c:1100
 msgid "Self Timer (next picture only)"
 msgstr "自动定时 (仅用于下一张照片)"
 
@@ -3536,157 +3713,164 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/konica/library.c:822 camlibs/konica/library.c:829
-#: camlibs/konica/qm150.c:1108 camlibs/konica/qm150.c:1115
-#: camlibs/minolta/dimagev/dimagev.c:396 camlibs/ptp2/config.c:3236
-#: camlibs/ptp2/config.c:4220 camlibs/ptp2/config.c:4233
-#: camlibs/ptp2/config.c:4244 camlibs/ptp2/config.c:4593
-#: camlibs/ptp2/config.c:4862 camlibs/ptp2/config.c:4959
-#: camlibs/ptp2/config.c:4969 camlibs/ptp2/ptp.c:5679 camlibs/ptp2/ptp.c:5687
-#: camlibs/ptp2/ptp.c:5850 camlibs/ptp2/ptp.c:5859 camlibs/ptp2/ptp.c:5989
-#: camlibs/ptp2/ptp.c:5996 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:993
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1054
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1310
-#: camlibs/sierra/sierra.c:1355 camlibs/sierra/sierra.c:1401
-#: camlibs/sierra/sierra.c:1602 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1823
+#: camlibs/konica/library.c:808 camlibs/konica/library.c:815
+#: camlibs/konica/qm150.c:1097 camlibs/konica/qm150.c:1104
+#: camlibs/minolta/dimagev/dimagev.c:384 camlibs/ptp2/config.c:4048
+#: camlibs/ptp2/config.c:4079 camlibs/ptp2/config.c:5877
+#: camlibs/ptp2/config.c:5890 camlibs/ptp2/config.c:5901
+#: camlibs/ptp2/config.c:6418 camlibs/ptp2/config.c:6764
+#: camlibs/ptp2/config.c:6775 camlibs/ptp2/config.c:6972
+#: camlibs/ptp2/config.c:6982 camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/ptp.c:7897 camlibs/ptp2/ptp.c:7905 camlibs/ptp2/ptp.c:8068
+#: camlibs/ptp2/ptp.c:8077 camlibs/ptp2/ptp.c:8207 camlibs/ptp2/ptp.c:8214
+#: camlibs/ricoh/library.c:332 camlibs/sierra/epson-desc.c:205
+#: camlibs/sierra/nikon-desc.c:240 camlibs/sierra/nikon-desc.c:312
+#: camlibs/sierra/olympus-desc.c:473 camlibs/sierra/olympus-desc.c:653
+#: camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1048
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1109
+#: camlibs/sierra/sierra.c:1297 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1388 camlibs/sierra/sierra.c:1589
+#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1810
 #, c-format
 msgid "Normal"
 msgstr "普通"
 
 # camlibs/konica/library.c:1059
-#: camlibs/konica/library.c:1093
+#: camlibs/konica/library.c:1079
 #, c-format
 msgid "Could not find localization data at '%s'"
 msgstr "无法在“%s”找到本地化数据"
 
 # camlibs/konica/library.c:1123
-#: camlibs/konica/library.c:1160
+#: camlibs/konica/library.c:1146
 msgid "Localization file too long!"
 msgstr "本地化文件太大！"
 
-#: camlibs/konica/qm150.c:256
+#: camlibs/konica/qm150.c:244
 msgid "This preview doesn't exist."
 msgstr ""
 
-#: camlibs/konica/qm150.c:288
+#: camlibs/konica/qm150.c:276
 msgid "Data has been corrupted."
 msgstr ""
 
-#: camlibs/konica/qm150.c:398
+#: camlibs/konica/qm150.c:386
 msgid "Compiled without EXIF support, no thumbnails available."
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:347
-#: camlibs/konica/qm150.c:415
+#: camlibs/konica/qm150.c:403
 #, fuzzy, c-format
 msgid "Image type %d is not supported by this camera !"
 msgstr "图像类型不支持"
 
 # camlibs/panasonic/dc1000.c:503 camlibs/panasonic/dc1580.c:625
-#: camlibs/konica/qm150.c:469
+#: camlibs/konica/qm150.c:457
 #, fuzzy, c-format
 msgid "Can't delete image %s."
 msgstr "正在删除图像 %s。"
 
-#: camlibs/konica/qm150.c:500
+#: camlibs/konica/qm150.c:488
 msgid "Can't delete all images."
 msgstr ""
 
 # camlibs/canon/serial.c:888
-#: camlibs/konica/qm150.c:533
+#: camlibs/konica/qm150.c:522
 #, fuzzy
 msgid "Uploading image..."
 msgstr "正在上载文件..."
 
-#: camlibs/konica/qm150.c:543 camlibs/konica/qm150.c:608
+#: camlibs/konica/qm150.c:532 camlibs/konica/qm150.c:597
 msgid "Can't upload this image to the camera. An error has occurred."
 msgstr ""
 
-#: camlibs/konica/qm150.c:650
+#: camlibs/konica/qm150.c:639
 msgid "You must be in record mode to capture images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:653
+#: camlibs/konica/qm150.c:642
 msgid "No space available to capture new images. You must delete some images."
 msgstr ""
 
-#: camlibs/konica/qm150.c:657
+#: camlibs/konica/qm150.c:646
 msgid "Can't capture new images. Unknown error"
 msgstr ""
 
 # camlibs/canon/serial.c:1227 camlibs/canon/serial.c:1231
 # camlibs/dimera/dimera3500.c:970
-#: camlibs/konica/qm150.c:669
+#: camlibs/konica/qm150.c:658
 msgid "No answer from the camera."
 msgstr "相机无应答。"
 
 # camlibs/sierra/sierra.c:828 camlibs/sierra/sierra.c:835
 # camlibs/sierra/sierra.c:1152
-#: camlibs/konica/qm150.c:789 camlibs/konica/qm150.c:797
-#: camlibs/ptp2/config.c:3235 camlibs/ptp2/config.c:4234
-#: camlibs/ptp2/config.c:4863 camlibs/ptp2/config.c:4958
-#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:5268
-#: camlibs/ptp2/ptp.c:5680 camlibs/ptp2/ptp.c:6115 camlibs/ptp2/ptp.c:6121
-#: camlibs/ptp2/ptp.c:6127 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:971
-#: camlibs/sierra/sierra.c:1292
+#: camlibs/konica/qm150.c:778 camlibs/konica/qm150.c:786
+#: camlibs/ptp2/config.c:2113 camlibs/ptp2/config.c:2829
+#: camlibs/ptp2/config.c:2848 camlibs/ptp2/config.c:4047
+#: camlibs/ptp2/config.c:4078 camlibs/ptp2/config.c:5891
+#: camlibs/ptp2/config.c:6765 camlibs/ptp2/config.c:6774
+#: camlibs/ptp2/config.c:6971 camlibs/ptp2/config.c:6981
+#: camlibs/ptp2/config.c:7309 camlibs/ptp2/ptp.c:7898 camlibs/ptp2/ptp.c:8333
+#: camlibs/ptp2/ptp.c:8339 camlibs/ptp2/ptp.c:8345
+#: camlibs/sierra/nikon-desc.c:190 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:1279
 msgid "Low"
 msgstr "低"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/konica/qm150.c:790 camlibs/konica/qm150.c:800
-#: camlibs/ptp2/config.c:2199 camlibs/ptp2/config.c:2206
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1294
+#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:789
+#: camlibs/ptp2/config.c:2202 camlibs/ptp2/config.c:2214
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/config.c:2485
+#: camlibs/ptp2/config.c:2492 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:960
+#: camlibs/sierra/sierra.c:1281
 msgid "Medium"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/konica/qm150.c:791 camlibs/konica/qm150.c:794
-#: camlibs/ptp2/config.c:3237 camlibs/ptp2/config.c:4237
-#: camlibs/ptp2/config.c:4861 camlibs/ptp2/config.c:4960
-#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:5683 camlibs/ptp2/ptp.c:6117
-#: camlibs/ptp2/ptp.c:6123 camlibs/ptp2/ptp.c:6129 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1263
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:783
+#: camlibs/ptp2/config.c:2117 camlibs/ptp2/config.c:4049
+#: camlibs/ptp2/config.c:4080 camlibs/ptp2/config.c:5894
+#: camlibs/ptp2/config.c:6763 camlibs/ptp2/config.c:6776
+#: camlibs/ptp2/config.c:6973 camlibs/ptp2/config.c:6983
+#: camlibs/ptp2/config.c:7199 camlibs/ptp2/ptp.c:7901 camlibs/ptp2/ptp.c:8335
+#: camlibs/ptp2/ptp.c:8341 camlibs/ptp2/ptp.c:8347 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:962 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1283
 msgid "High"
 msgstr "高"
 
 # camlibs/polaroid/pdc700.c:162
-#: camlibs/konica/qm150.c:805 camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:2267 camlibs/ptp2/config.c:2293
-#: camlibs/ptp2/config.c:2319 camlibs/ptp2/ptp.c:6164
+#: camlibs/konica/qm150.c:794 camlibs/polaroid/pdc700.c:148
+#: camlibs/ptp2/config.c:2572 camlibs/ptp2/config.c:2598
+#: camlibs/ptp2/config.c:2624 camlibs/ptp2/ptp.c:8382
 msgid "LCD"
 msgstr "LCD"
 
-#: camlibs/konica/qm150.c:819
+#: camlibs/konica/qm150.c:808
 msgid "Icons"
 msgstr ""
 
-#: camlibs/konica/qm150.c:953 camlibs/konica/qm150.c:962
+#: camlibs/konica/qm150.c:942 camlibs/konica/qm150.c:951
 msgid "2.0 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:954 camlibs/konica/qm150.c:965
+#: camlibs/konica/qm150.c:943 camlibs/konica/qm150.c:954
 msgid "0.5 m"
 msgstr ""
 
-#: camlibs/konica/qm150.c:955 camlibs/konica/qm150.c:968
+#: camlibs/konica/qm150.c:944 camlibs/konica/qm150.c:957
 msgid "0.1 m"
 msgstr ""
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/konica/qm150.c:973
+#: camlibs/konica/qm150.c:962
 #, fuzzy
 msgid "White balance"
 msgstr "白平衡"
@@ -3699,41 +3883,42 @@
 # camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1274
 # camlibs/sierra/sierra.c:1398 camlibs/sierra/sierra.c:1406
 # camlibs/sierra/sierra.c:1633
-#: camlibs/konica/qm150.c:975 camlibs/konica/qm150.c:986
+#: camlibs/konica/qm150.c:964 camlibs/konica/qm150.c:975
 #, fuzzy
 msgid "Office"
 msgstr "关"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/konica/qm150.c:976 camlibs/konica/qm150.c:983
-#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/config.c:4336 camlibs/ptp2/config.c:4355
-#: camlibs/ptp2/ptp.c:5622 camlibs/ptp2/ptp.c:6088
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
+#: camlibs/konica/qm150.c:965 camlibs/konica/qm150.c:972
+#: camlibs/ptp2/config.c:1460 camlibs/ptp2/config.c:1509
+#: camlibs/ptp2/config.c:4009 camlibs/ptp2/config.c:5999
+#: camlibs/ptp2/config.c:6017 camlibs/ptp2/config.c:9147
+#: camlibs/ptp2/ptp.c:7838 camlibs/ptp2/ptp.c:8306
+#: camlibs/sierra/olympus-desc.c:549 camlibs/sierra/olympus-desc.c:568
+#: camlibs/sierra/olympus-desc.c:587 camlibs/sierra/olympus-desc.c:608
 #, fuzzy
 msgid "Daylight"
 msgstr "日光"
 
-#: camlibs/konica/qm150.c:991 camlibs/ptp2/config.c:7327
-#: camlibs/ptp2/ptp.c:4761 camlibs/ptp2/ptp.c:4829
+#: camlibs/konica/qm150.c:980 camlibs/ptp2/config.c:11008
+#: camlibs/ptp2/ptp.c:6228 camlibs/ptp2/ptp.c:6296
 msgid "Sharpness"
 msgstr ""
 
-#: camlibs/konica/qm150.c:993 camlibs/konica/qm150.c:1001
+#: camlibs/konica/qm150.c:982 camlibs/konica/qm150.c:990
 msgid "Sharp"
 msgstr ""
 
-#: camlibs/konica/qm150.c:994 camlibs/konica/qm150.c:1004
-#: camlibs/ptp2/ptp.c:6047 camlibs/ptp2/ptp.c:6174
+#: camlibs/konica/qm150.c:983 camlibs/konica/qm150.c:993
+#: camlibs/ptp2/ptp.c:8265 camlibs/ptp2/ptp.c:8392
 msgid "Soft"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
 # camlibs/sierra/sierra.c:1698
-#: camlibs/konica/qm150.c:1009 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
+#: camlibs/konica/qm150.c:998 camlibs/sierra/epson-desc.c:122
+#: camlibs/sierra/nikon-desc.c:206
 #, fuzzy
 msgid "Color"
 msgstr "彩色"
@@ -3741,93 +3926,94 @@
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/konica/qm150.c:1011 camlibs/konica/qm150.c:1021
+#: camlibs/konica/qm150.c:1000 camlibs/konica/qm150.c:1010
+#: camlibs/ptp2/config.c:6867 camlibs/ptp2/config.c:6900
 #, fuzzy
 msgid "Light"
 msgstr "高"
 
 # camlibs/konica/library.c:647 camlibs/konica/library.c:858
-#: camlibs/konica/qm150.c:1012 camlibs/konica/qm150.c:1024
+#: camlibs/konica/qm150.c:1001 camlibs/konica/qm150.c:1013
 #, fuzzy
 msgid "Deep"
 msgstr "鸣笛"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/konica/qm150.c:1013 camlibs/konica/qm150.c:1027
+#: camlibs/konica/qm150.c:1002 camlibs/konica/qm150.c:1016
 #, fuzzy
 msgid "Black and White"
 msgstr "黑白"
 
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1069
-#: camlibs/ptp2/config.c:2463
+#: camlibs/konica/qm150.c:1054 camlibs/konica/qm150.c:1058
+#: camlibs/ptp2/config.c:2796
 msgid "Single"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1072
+#: camlibs/konica/qm150.c:1055 camlibs/konica/qm150.c:1061
 msgid "Sequence 9"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1077
+#: camlibs/konica/qm150.c:1066
 msgid "Date display"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1079 camlibs/konica/qm150.c:1088
+#: camlibs/konica/qm150.c:1068 camlibs/konica/qm150.c:1077
 msgid "Anywhere"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/konica/qm150.c:1080 camlibs/konica/qm150.c:1086
+#: camlibs/konica/qm150.c:1069 camlibs/konica/qm150.c:1075
 #, fuzzy
 msgid "Play mode"
 msgstr "闪光灯模式"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1081 camlibs/konica/qm150.c:1094
+#: camlibs/konica/qm150.c:1070 camlibs/konica/qm150.c:1083
 #, fuzzy
 msgid "Record mode"
 msgstr "录制模式"
 
-#: camlibs/konica/qm150.c:1082 camlibs/konica/qm150.c:1092
+#: camlibs/konica/qm150.c:1071 camlibs/konica/qm150.c:1081
 msgid "Everywhere"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1153 camlibs/ptp2/ptp.c:5982
+#: camlibs/konica/qm150.c:1142 camlibs/ptp2/ptp.c:8200
 #, c-format
 msgid "AC"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1156 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:361
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:348
 #, c-format
 msgid "Play"
 msgstr "播放"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1158 camlibs/minolta/dimagev/dimagev.c:297
-#: camlibs/sierra/nikon-desc.c:360
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/sierra/nikon-desc.c:347
 #, c-format
 msgid "Record"
 msgstr "录制"
 
-#: camlibs/konica/qm150.c:1168
+#: camlibs/konica/qm150.c:1157
 #, c-format
 msgid "DD/MM/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1173
+#: camlibs/konica/qm150.c:1162
 #, c-format
 msgid "YYYY/MM/DD"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1177
+#: camlibs/konica/qm150.c:1166
 #, c-format
 msgid "MM/DD/YYYY"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1181
+#: camlibs/konica/qm150.c:1170
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3840,7 +4026,7 @@
 "Date and Time: %s\n"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1204
+#: camlibs/konica/qm150.c:1193
 #, c-format
 msgid ""
 "Konica Q-M150 Library\n"
@@ -3850,7 +4036,7 @@
 "Support for the french Konica Q-M150."
 msgstr ""
 
-#: camlibs/konica/qm150.c:1219
+#: camlibs/konica/qm150.c:1208
 #, c-format
 msgid ""
 "About Konica Q-M150:\n"
@@ -3862,7 +4048,7 @@
 "If you have some issues with this driver, please e-mail its authors.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:228
+#: camlibs/largan/lmini/largan.c:216
 #, fuzzy
 msgid ""
 "Largan driver\n"
@@ -3873,21 +4059,142 @@
 "\n"
 "Handles Largan Lmini 相机。\n"
 
-#: camlibs/lg_gsm/library.c:102
+#: camlibs/lg_gsm/library.c:104
 #, c-format
 msgid ""
 "Your USB camera seems to be a LG GSM.\n"
 "Firmware: %s\n"
 "Firmware Version: %s\n"
 msgstr ""
+"您的 USB 相机可能为 LG GSM。\n"
+"固件：%s\n"
+"固件版本：%s\n"
 
-#: camlibs/lg_gsm/library.c:114
+#: camlibs/lg_gsm/library.c:116
 msgid ""
 "LG GSM generic driver\n"
 "Guillaume Bedot <littletux@zarb.org>\n"
 msgstr ""
+"LG GSM 通用驱动\n"
+"Guillaume Bedot <littletux@zarb.org>\n"
+
+# camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
+# camlibs/sierra/sierra.c:1353
+#: camlibs/lumix/lumix.c:1099
+#, fuzzy
+msgid "Lumix Configuration"
+msgstr "配置"
+
+#: camlibs/lumix/lumix.c:1106
+msgid "Clock"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/lumix/lumix.c:1114 camlibs/ptp2/chdk.c:1028
+#: camlibs/ptp2/config.c:11004 camlibs/ptp2/config.c:11005
+#: camlibs/ptp2/ptp.c:7080 camlibs/ptp2/ptp.c:7082
+#, fuzzy
+msgid "Shutterspeed"
+msgstr "快门速度 (秒)"
+
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/lumix/lumix.c:1127 camlibs/ptp2/ptp.c:7320
+#, fuzzy
+msgid "Quality"
+msgstr "图像质量"
+
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/lumix/lumix.c:1132 camlibs/ptp2/config.c:10888
+#: camlibs/ptp2/ptp.c:6243
+#, fuzzy
+msgid "Video Quality"
+msgstr "图像质量"
+
+#: camlibs/lumix/lumix.c:1154 camlibs/pentax/library.c:687
+#: camlibs/pentax/library.c:865 camlibs/ptp2/chdk.c:1026
+#: camlibs/ptp2/ptp.c:7074 camlibs/ptp2/ptp.c:7549 camlibs/ptp2/ptp.c:7550
+#: camlibs/ptp2/ptp.c:7554
+msgid "ISO"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1176 camlibs/ptp2/config.c:2085
+#: camlibs/ptp2/ptp.c:7557
+msgid "Movie"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/lumix/lumix.c:1182 camlibs/ptp2/ptp.c:6967
+#, fuzzy
+msgid "Autofocus Mode"
+msgstr "聚焦模式"
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/lumix/lumix.c:1187
+#, fuzzy
+msgid "Liveview Size"
+msgstr "LED 模式"
+
+# frontends/command-line/actions.c:159
+#: camlibs/lumix/lumix.c:1192 camlibs/ptp2/config.c:10785
+#, fuzzy
+msgid "Device Name"
+msgstr "设备版本"
+
+#: camlibs/lumix/lumix.c:1202
+msgid "MF Assist"
+msgstr ""
+
+#: camlibs/lumix/lumix.c:1207
+msgid "MF Assist Mag"
+msgstr ""
 
-#: camlibs/mars/library.c:124
+#: camlibs/lumix/lumix.c:1212
+msgid "Ex Teleconv"
+msgstr ""
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/lumix/lumix.c:1217
+#, fuzzy
+msgid "Lens"
+msgstr "镜头模式"
+
+#: camlibs/lumix/lumix.c:1233
+#, fuzzy
+msgid "Capability"
+msgstr "兼容模式"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/lumix/lumix.c:1239
+#, fuzzy
+msgid "All Menu"
+msgstr "无手册"
+
+# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
+# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
+#: camlibs/lumix/lumix.c:1244
+#, fuzzy
+msgid "Cur Menu"
+msgstr "彩色模式"
+
+#: camlibs/lumix/lumix.c:1698
+msgid ""
+"Lumix WiFi Library\n"
+"Robert Hasson <robert_hasson@yahoo.com>\n"
+"Connects to Lumix Cameras over Wifi.\n"
+"using the http GET commands."
+msgstr ""
+
+#: camlibs/mars/library.c:125
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
@@ -3897,7 +4204,7 @@
 "There are %i photos in it.\n"
 msgstr0 ""
 
-#: camlibs/mars/library.c:135
+#: camlibs/mars/library.c:136
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??).\n"
@@ -3911,14 +4218,14 @@
 "For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:153
+#: camlibs/mars/library.c:154
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:272
-#: camlibs/minolta/dimagev/dimagev.c:261
+#: camlibs/minolta/dimagev/dimagev.c:249
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3930,7 +4237,7 @@
 "固件版本号：\t%s\n"
 
 # camlibs/minolta/dimagev/dimagev.c:287
-#: camlibs/minolta/dimagev/dimagev.c:276
+#: camlibs/minolta/dimagev/dimagev.c:264
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3958,38 +4265,39 @@
 "闪光灯模式：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:288 camlibs/ptp2/config.c:3300
-#: camlibs/ptp2/ptp.c:5667
+#: camlibs/minolta/dimagev/dimagev.c:276 camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/ptp.c:7883
 msgid "Remote"
 msgstr "远程"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:288
+#: camlibs/minolta/dimagev/dimagev.c:276
 msgid "Local"
 msgstr "本地"
 
 # camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
 # camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
 # frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "Yes"
 msgstr "是"
 
 # camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
 # camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
 # frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:289 camlibs/minolta/dimagev/dimagev.c:291
-#: camlibs/minolta/dimagev/dimagev.c:295 camlibs/minolta/dimagev/dimagev.c:298
-#: camlibs/ptp2/ptp.c:5567
+#: camlibs/minolta/dimagev/dimagev.c:277 camlibs/minolta/dimagev/dimagev.c:279
+#: camlibs/minolta/dimagev/dimagev.c:283 camlibs/minolta/dimagev/dimagev.c:286
+#: camlibs/ptp2/ptp.c:7779
 msgid "No"
 msgstr "否"
 
 # camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
 # camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:4921
-#: camlibs/ptp2/ptp.c:5997 camlibs/sierra/nikon-desc.c:283
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:6869
+#: camlibs/ptp2/config.c:6898 camlibs/ptp2/config.c:6906
+#: camlibs/ptp2/ptp.c:8215 camlibs/sierra/nikon-desc.c:270
 msgid "Fine"
 msgstr "精细"
 
@@ -3997,40 +4305,41 @@
 # camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
 # camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
 # camlibs/sierra/sierra.c:1680
-#: camlibs/minolta/dimagev/dimagev.c:296 camlibs/ptp2/config.c:2083
-#: camlibs/ptp2/config.c:3513 camlibs/ptp2/config.c:4920
-#: camlibs/ptp2/ptp.c:6116 camlibs/ptp2/ptp.c:6122 camlibs/ptp2/ptp.c:6128
-#: camlibs/ptp2/ptp.c:6132 camlibs/sierra/sierra.c:924
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:1261
+#: camlibs/minolta/dimagev/dimagev.c:284 camlibs/ptp2/config.c:2111
+#: camlibs/ptp2/config.c:2368 camlibs/ptp2/config.c:4411
+#: camlibs/ptp2/config.c:6868 camlibs/ptp2/config.c:6905
+#: camlibs/ptp2/ptp.c:8334 camlibs/ptp2/ptp.c:8340 camlibs/ptp2/ptp.c:8346
+#: camlibs/ptp2/ptp.c:8350 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1248
 msgid "Standard"
 msgstr "标准"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/minolta/dimagev/dimagev.c:312
+#: camlibs/minolta/dimagev/dimagev.c:300
 #, c-format
 msgid "Automatic\n"
 msgstr "自动\n"
 
 # camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/minolta/dimagev/dimagev.c:320
+#: camlibs/minolta/dimagev/dimagev.c:308
 #, c-format
 msgid "Force Flash\n"
 msgstr "强制闪光\n"
 
 # camlibs/minolta/dimagev/dimagev.c:339
-#: camlibs/minolta/dimagev/dimagev.c:328
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "禁止闪光\n"
 
 # camlibs/minolta/dimagev/dimagev.c:347
-#: camlibs/minolta/dimagev/dimagev.c:336
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "非法值 ( %d )\n"
 
 # camlibs/minolta/dimagev/dimagev.c:361
-#: camlibs/minolta/dimagev/dimagev.c:350
+#: camlibs/minolta/dimagev/dimagev.c:338
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -4048,88 +4357,88 @@
 "镜头状态：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:367
-#: camlibs/minolta/dimagev/dimagev.c:356
+#: camlibs/minolta/dimagev/dimagev.c:344
 msgid "Not Full"
 msgstr "未满"
 
 # camlibs/minolta/dimagev/dimagev.c:367 camlibs/minolta/dimagev/dimagev.c:410
-#: camlibs/minolta/dimagev/dimagev.c:356 camlibs/minolta/dimagev/dimagev.c:399
-#: camlibs/ptp2/config.c:1954 camlibs/ptp2/config.c:2008
-#: camlibs/ptp2/config.c:2061 camlibs/ptp2/ptp.c:5910 camlibs/ptp2/ptp.c:5916
+#: camlibs/minolta/dimagev/dimagev.c:344 camlibs/minolta/dimagev/dimagev.c:387
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/config.c:2293
+#: camlibs/ptp2/config.c:2346 camlibs/ptp2/ptp.c:8128 camlibs/ptp2/ptp.c:8134
 #, c-format
 msgid "Full"
 msgstr "满"
 
 # camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Busy"
 msgstr "忙"
 
 # camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:347
 msgid "Idle"
 msgstr "闲"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Charging"
 msgstr "正在充电"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:360
+#: camlibs/minolta/dimagev/dimagev.c:348
 msgid "Ready"
 msgstr "就绪"
 
 # camlibs/minolta/dimagev/dimagev.c:382
-#: camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/minolta/dimagev/dimagev.c:359
 #, c-format
 msgid "Normal\n"
 msgstr "普通\n"
 
 # camlibs/minolta/dimagev/dimagev.c:385
-#: camlibs/minolta/dimagev/dimagev.c:374
+#: camlibs/minolta/dimagev/dimagev.c:362
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "镜头方向与闪光灯方向不匹配\n"
 
 # camlibs/minolta/dimagev/dimagev.c:388
-#: camlibs/minolta/dimagev/dimagev.c:377
+#: camlibs/minolta/dimagev/dimagev.c:365
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "镜头未连接\n"
 
 # camlibs/minolta/dimagev/dimagev.c:391
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:368
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "错误的镜头状态值 %d\n"
 
 # camlibs/minolta/dimagev/dimagev.c:400
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:377
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "卡状态：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:413
-#: camlibs/minolta/dimagev/dimagev.c:402
+#: camlibs/minolta/dimagev/dimagev.c:390
 #, c-format
 msgid "Write-protected"
 msgstr "写保护"
 
 # camlibs/minolta/dimagev/dimagev.c:416
-#: camlibs/minolta/dimagev/dimagev.c:405
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Unsuitable card"
 msgstr "不适当的卡"
 
 # camlibs/minolta/dimagev/dimagev.c:419
-#: camlibs/minolta/dimagev/dimagev.c:408
+#: camlibs/minolta/dimagev/dimagev.c:396
 #, fuzzy, c-format
 msgid "Bad value for card status %d"
 msgstr "错误的卡状态值 %d"
 
 # camlibs/minolta/dimagev/dimagev.c:438
-#: camlibs/minolta/dimagev/dimagev.c:427
+#: camlibs/minolta/dimagev/dimagev.c:415
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -4143,66 +4452,66 @@
 "特别感谢 Minolta 提供相机规范。"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/mustek/core.c:575
+#: camlibs/mustek/core.c:564
 msgid "FlashLight : Auto (RedEye Reduction)"
 msgstr "闪光灯：自动 (消红眼)"
 
-#: camlibs/mustek/core.c:577
+#: camlibs/mustek/core.c:566
 msgid "FlashLight : Auto"
 msgstr "闪光灯：自动"
 
-#: camlibs/mustek/core.c:579
+#: camlibs/mustek/core.c:568
 msgid "FlashLight : On (RedEye Reduction)"
 msgstr "闪光灯：开 (消红眼)"
 
-#: camlibs/mustek/core.c:581
+#: camlibs/mustek/core.c:570
 msgid "FlashLight : On"
 msgstr "闪光灯：开"
 
-#: camlibs/mustek/core.c:583
+#: camlibs/mustek/core.c:572
 msgid "FlashLight : Off"
 msgstr "闪光灯：关"
 
-#: camlibs/mustek/core.c:585
+#: camlibs/mustek/core.c:574
 msgid "FlashLight : undefined"
 msgstr "闪光灯：未定义"
 
-#: camlibs/mustek/mdc800.c:217
+#: camlibs/mustek/mdc800.c:205
 msgid "Summary for Mustek MDC800:\n"
 msgstr "关于 Mustek MDC800 的概要：\n"
 
 # camlibs/konica/konica.c:83
-#: camlibs/mustek/mdc800.c:220
+#: camlibs/mustek/mdc800.c:208
 msgid "no status reported."
 msgstr "无报告状态。"
 
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/mustek/mdc800.c:226
+#: camlibs/mustek/mdc800.c:214
 msgid "Compact Flash Card detected\n"
 msgstr "探测到闪存卡\n"
 
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/mustek/mdc800.c:228
+#: camlibs/mustek/mdc800.c:216
 msgid "No Compact Flash Card detected\n"
 msgstr "未探测到闪存卡\n"
 
-#: camlibs/mustek/mdc800.c:232
+#: camlibs/mustek/mdc800.c:220
 msgid "Current Mode: Camera Mode\n"
 msgstr "当前模式：照相机模式\n"
 
-#: camlibs/mustek/mdc800.c:234
+#: camlibs/mustek/mdc800.c:222
 msgid "Current Mode: Playback Mode\n"
 msgstr "当前模式：回放模式\n"
 
-#: camlibs/mustek/mdc800.c:243
+#: camlibs/mustek/mdc800.c:231
 msgid "Batteries are ok."
 msgstr "电池就绪。"
 
-#: camlibs/mustek/mdc800.c:245
+#: camlibs/mustek/mdc800.c:233
 msgid "Batteries are low."
 msgstr "电池低电量。"
 
-#: camlibs/mustek/mdc800.c:264
+#: camlibs/mustek/mdc800.c:252
 #, fuzzy
 msgid ""
 "Mustek MDC-800 gPhoto2 Library\n"
@@ -4216,29 +4525,29 @@
 "支持串口和 USB 协议。"
 
 # camlibs/panasonic/coolshot/coolshot.c:264
-#: camlibs/panasonic/coolshot/coolshot.c:256
+#: camlibs/panasonic/coolshot/coolshot.c:245
 msgid "coolshot library v"
 msgstr "coolshot 库 v"
 
 # camlibs/panasonic/dc1000.c:371 camlibs/panasonic/dc1580.c:468
-#: camlibs/panasonic/dc1000.c:369 camlibs/panasonic/dc1580.c:465
+#: camlibs/panasonic/dc1000.c:358 camlibs/panasonic/dc1580.c:454
 msgid "Disconnecting camera."
 msgstr "正在断开与相机的连接。"
 
 # camlibs/panasonic/dc1000.c:411
-#: camlibs/panasonic/dc1000.c:406
+#: camlibs/panasonic/dc1000.c:395
 #, c-format
 msgid "Downloading image %s."
 msgstr "正在下载图像 %s。"
 
 # camlibs/panasonic/dc1000.c:452 camlibs/panasonic/dc1580.c:577
-#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
+#: camlibs/panasonic/dc1000.c:433 camlibs/panasonic/dc1580.c:554
 #, c-format
 msgid "Uploading image: %s."
 msgstr "正在上载图像：%s。"
 
 # camlibs/panasonic/dc1000.c:463 camlibs/panasonic/dc1580.c:588
-#: camlibs/panasonic/dc1000.c:455 camlibs/panasonic/dc1580.c:576
+#: camlibs/panasonic/dc1000.c:444 camlibs/panasonic/dc1580.c:565
 #, fuzzy, c-format
 msgid ""
 "File size is %ld bytes. The size of the largest file possible to upload is: "
@@ -4246,19 +4555,19 @@
 msgstr "文件大小为 %i 字节。可以上载的文件最大为：%i 字节。"
 
 # camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
-#: camlibs/panasonic/dc1000.c:468 camlibs/panasonic/dc1580.c:587
-#: camlibs/ricoh/ricoh.c:853
+#: camlibs/panasonic/dc1000.c:457 camlibs/panasonic/dc1580.c:576
+#: camlibs/ricoh/ricoh.c:838
 msgid "Uploading..."
 msgstr "正在上载..."
 
 # camlibs/panasonic/dc1000.c:503 camlibs/panasonic/dc1580.c:625
-#: camlibs/panasonic/dc1000.c:495 camlibs/panasonic/dc1580.c:613
+#: camlibs/panasonic/dc1000.c:484 camlibs/panasonic/dc1580.c:602
 #, c-format
 msgid "Deleting image %s."
 msgstr "正在删除图像 %s。"
 
 # camlibs/panasonic/dc1000.c:516
-#: camlibs/panasonic/dc1000.c:508
+#: camlibs/panasonic/dc1000.c:497
 msgid ""
 "Panasonic DC1000 gPhoto library\n"
 "Mariusz Zynel <mariusz@mizar.org>\n"
@@ -4275,13 +4584,13 @@
 "dc1000 程序。"
 
 # camlibs/panasonic/dc1580.c:528
-#: camlibs/panasonic/dc1580.c:519
+#: camlibs/panasonic/dc1580.c:508
 #, c-format
 msgid "Downloading %s."
 msgstr "正在下载 %s。"
 
 # camlibs/panasonic/dc1580.c:637
-#: camlibs/panasonic/dc1580.c:625
+#: camlibs/panasonic/dc1580.c:614
 #, fuzzy
 msgid ""
 "Panasonic DC1580 gPhoto2 library\n"
@@ -4299,13 +4608,13 @@
 "dc1000 程序。<"
 
 # camlibs/panasonic/l859/l859.c:505
-#: camlibs/panasonic/l859/l859.c:504
+#: camlibs/panasonic/l859/l859.c:493
 #, c-format
 msgid "Downloading '%s'..."
 msgstr "正在下载“%s”..."
 
 # camlibs/panasonic/l859/l859.c:586
-#: camlibs/panasonic/l859/l859.c:582
+#: camlibs/panasonic/l859/l859.c:571
 #, fuzzy
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
@@ -4325,7 +4634,7 @@
 "像素所以只能生成低质量照片。"
 
 # camlibs/panasonic/l859/l859.c:604
-#: camlibs/panasonic/l859/l859.c:600
+#: camlibs/panasonic/l859/l859.c:589
 msgid ""
 "Known problems:\n"
 "\n"
@@ -4340,7 +4649,7 @@
 "情况下恢复过来，特别是如果是在速度高于 9600 时出现问题而相机没有正常关闭时。"
 
 # camlibs/panasonic/l859/l859.c:618
-#: camlibs/panasonic/l859/l859.c:614
+#: camlibs/panasonic/l859/l859.c:603
 msgid ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
@@ -4348,7 +4657,7 @@
 "松下 PV-L859-K/PV-L779-K Palmcorder 驱动程序\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam300/library.c:216
+#: camlibs/pccam300/library.c:217
 #, c-format
 msgid ""
 " Total memory is %8d bytes.\n"
@@ -4356,7 +4665,7 @@
 " Filecount: %d"
 msgstr ""
 
-#: camlibs/pccam300/library.c:228
+#: camlibs/pccam300/library.c:229
 msgid ""
 "Creative PC-CAM 300\n"
 " Authors: Till Adam\n"
@@ -4367,11 +4676,11 @@
 
 # camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
 # camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/pccam600/library.c:190
+#: camlibs/pccam600/library.c:180
 msgid "Downloading file..."
 msgstr "正在下载文件..."
 
-#: camlibs/pccam600/library.c:249
+#: camlibs/pccam600/library.c:239
 #, fuzzy
 msgid ""
 "Creative PC-CAM600\n"
@@ -4381,32 +4690,138 @@
 " 作者：Peter Kajberg\n"
 " 电子邮件：<pbk@odense.kollegienet.dk>\n"
 
-#: camlibs/pccam600/pccam600.c:126 camlibs/pccam600/pccam600.c:155
+#: camlibs/pccam600/pccam600.c:116 camlibs/pccam600/pccam600.c:145
 #, c-format
 msgid "pccam600_init: Expected > %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:139
+#: camlibs/pccam600/pccam600.c:129
 #, c-format
 msgid "pccam600_get_file:got index %d but expected index > %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:180
+#: camlibs/pccam600/pccam600.c:170
 #, c-format
 msgid "pccam600_close: return value was %d instead of %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:213
+#: camlibs/pccam600/pccam600.c:202 camlibs/pccam600/pccam600.c:209
 #, c-format
 msgid "pccam600_init: Expected %d blocks got %d"
 msgstr ""
 
-#: camlibs/pccam600/pccam600.c:224
+#: camlibs/pccam600/pccam600.c:219
 #, c-format
 msgid "pccam600 init: Unexpected error: gp_port_read returned %d instead of %d"
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:461
+#: camlibs/pentax/library.c:210
+#, c-format
+msgid ""
+"Pentax K DSLR capture driver.\n"
+"Using code from pktriggercord by Andras Salamon.\n"
+"Collected Status Information:\n"
+"%s"
+msgstr ""
+
+# frontends/command-line/main.c:384
+#: camlibs/pentax/library.c:634
+#, fuzzy
+msgid "Model"
+msgstr "型号："
+
+# libgphoto2/gphoto2-result.c:46
+#: camlibs/pentax/library.c:651
+#, fuzzy, c-format
+msgid "Unknown format %d"
+msgstr "未知型号"
+
+# camlibs/polaroid/pdc700.c:160
+#: camlibs/pentax/library.c:657 camlibs/pentax/library.c:814
+#: camlibs/polaroid/pdc700.c:146 camlibs/ptp2/config.c:10850
+#: camlibs/ptp2/config.c:10852 camlibs/ptp2/config.c:10853
+#: camlibs/ptp2/config.c:10854 camlibs/ptp2/ptp.c:6208 camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:7084
+msgid "Image Size"
+msgstr "图像大小"
+
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/pentax/library.c:677 camlibs/pentax/library.c:893
+#: camlibs/polaroid/pdc700.c:145 camlibs/ptp2/config.c:10840
+#: camlibs/ptp2/config.c:10957 camlibs/ptp2/config.c:10958
+#: camlibs/ptp2/config.c:10959 camlibs/ptp2/config.c:11162
+#: camlibs/ptp2/config.c:11167 camlibs/ptp2/config.c:11178
+#: camlibs/ptp2/config.c:11184 camlibs/ptp2/config.c:11190
+#: camlibs/ptp2/config.c:11198 camlibs/ptp2/config.c:11204
+#: camlibs/ptp2/config.c:11233 camlibs/ptp2/config.c:11246
+#: camlibs/ptp2/config.c:11280 camlibs/ptp2/ptp.c:6277
+msgid "Image Quality"
+msgstr "图像质量"
+
+#: camlibs/pentax/library.c:720
+msgid "Aperture at Lens Minimum Focal Length"
+msgstr ""
+
+#: camlibs/pentax/library.c:736
+msgid "Aperture at Lens Maximum Focal Length"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/pentax/library.c:766 camlibs/pentax/library.c:840
+#: camlibs/ptp2/ptp.c:6283 camlibs/ptp2/ptp.c:6649
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "快门速度 (秒)"
+
+#: camlibs/pentax/library.c:768 camlibs/pentax/library.c:778
+#: camlibs/pentax/library.c:848
+msgid "GREEN"
+msgstr ""
+
+#: camlibs/pentax/library.c:770 camlibs/pentax/library.c:783
+#: camlibs/pentax/library.c:852
+msgid "SV"
+msgstr ""
+
+#: camlibs/pentax/library.c:771 camlibs/pentax/library.c:782
+#: camlibs/pentax/library.c:853 camlibs/ptp2/config.c:2053
+#: camlibs/ptp2/config.c:2066
+msgid "TV"
+msgstr ""
+
+#: camlibs/pentax/library.c:772 camlibs/pentax/library.c:781
+#: camlibs/pentax/library.c:854 camlibs/ptp2/config.c:2054
+#: camlibs/ptp2/config.c:2067
+msgid "AV"
+msgstr ""
+
+#: camlibs/pentax/library.c:773 camlibs/pentax/library.c:784
+#: camlibs/pentax/library.c:855
+msgid "TAV"
+msgstr ""
+
+#: camlibs/pentax/library.c:775 camlibs/pentax/library.c:786
+#: camlibs/pentax/library.c:850
+msgid "B"
+msgstr ""
+
+#: camlibs/pentax/library.c:776 camlibs/pentax/library.c:785
+#: camlibs/pentax/library.c:856
+msgid "X"
+msgstr ""
+
+# libgphoto2/gphoto2-result.c:46
+#: camlibs/pentax/library.c:788
+#, fuzzy, c-format
+msgid "Unknown mode %d"
+msgstr "未知型号"
+
+#: camlibs/pentax/library.c:969
+msgid ""
+"You need to switch the shooting mode or the camera to 'B' for bulb exposure."
+msgstr ""
+
+#: camlibs/polaroid/pdc320.c:445
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
@@ -4415,12 +4830,12 @@
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
-#: camlibs/polaroid/pdc320.c:491
+#: camlibs/polaroid/pdc320.c:475
 #, c-format
 msgid "Model: %x, %x, %x, %x"
 msgstr ""
 
-#: camlibs/polaroid/pdc640.c:889
+#: camlibs/polaroid/pdc640.c:879
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -4429,133 +4844,119 @@
 "Marcus Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:159
-#: camlibs/polaroid/pdc700.c:161 camlibs/ptp2/config.c:7217
-#: camlibs/ptp2/config.c:7291 camlibs/ptp2/config.c:7292
-#: camlibs/ptp2/config.c:7448 camlibs/ptp2/config.c:7476
-#: camlibs/ptp2/config.c:7489 camlibs/ptp2/ptp.c:4810
-msgid "Image Quality"
-msgstr "图像质量"
-
-# camlibs/polaroid/pdc700.c:160
-#: camlibs/polaroid/pdc700.c:162 camlibs/ptp2/config.c:7224
-#: camlibs/ptp2/config.c:7225 camlibs/ptp2/config.c:7226
-#: camlibs/ptp2/config.c:7227 camlibs/ptp2/ptp.c:4741 camlibs/ptp2/ptp.c:4812
-#: camlibs/ptp2/ptp.c:5376
-msgid "Image Size"
-msgstr "图像大小"
-
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/polaroid/pdc700.c:163
+#: camlibs/polaroid/pdc700.c:147
 msgid "Flash Setting"
 msgstr "闪光灯设置"
 
 # camlibs/polaroid/pdc700.c:164
-#: camlibs/polaroid/pdc700.c:166
+#: camlibs/polaroid/pdc700.c:150
 msgid "Auto Power Off (minutes)"
 msgstr "自动关机 (分钟)"
 
 # camlibs/polaroid/pdc700.c:165
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:151
 msgid "Information"
 msgstr "信息"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1880
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2037
+#: camlibs/ptp2/config.c:9938 camlibs/ptp2/config.c:9954
 msgid "normal"
 msgstr "普通"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1881
-#: camlibs/sierra/sierra.c:1621 camlibs/sierra/sierra.c:1628
-#: camlibs/sierra/sierra.c:1838
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2038
+#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1615
+#: camlibs/sierra/sierra.c:1825
 msgid "fine"
 msgstr "精细"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1883
-#: camlibs/sierra/sierra.c:1622 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1840
+#: camlibs/polaroid/pdc700.c:153 camlibs/ptp2/config.c:2040
+#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1827
 msgid "superfine"
 msgstr "超精细"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/sierra/sierra.c:1368
 # camlibs/sierra/sierra.c:1382 camlibs/sierra/sierra.c:1617
-#: camlibs/polaroid/pdc700.c:171 camlibs/ptp2/config.c:1929
-#: camlibs/ptp2/config.c:4465 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1519 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1769
+#: camlibs/polaroid/pdc700.c:155 camlibs/ptp2/config.c:2127
+#: camlibs/ptp2/config.c:6141 camlibs/ptp2/config.c:6142
+#: camlibs/ptp2/config.c:6757 camlibs/sierra/epson-desc.c:102
+#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1756
 msgid "auto"
 msgstr "自动"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1930 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2128 camlibs/sierra/nikon-desc.c:552
+#: camlibs/sierra/nikon-desc.c:557
 msgid "on"
 msgstr "开"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/polaroid/pdc700.c:171 camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/config.c:1928 camlibs/ptp2/config.c:2438
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/polaroid/pdc700.c:155 camlibs/polaroid/pdc700.c:156
+#: camlibs/ptp2/config.c:2126 camlibs/ptp2/config.c:2779
+#: camlibs/sierra/nikon-desc.c:551 camlibs/sierra/nikon-desc.c:556
 msgid "off"
 msgstr "关"
 
 # camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "play"
 msgstr "播放"
 
 # camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "record"
 msgstr "录制"
 
 # camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:173
+#: camlibs/polaroid/pdc700.c:157
 msgid "menu"
 msgstr "菜单"
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "battery"
 msgstr "电池"
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/polaroid/pdc700.c:174
+#: camlibs/polaroid/pdc700.c:158
 msgid "a/c adaptor"
 msgstr "交流变压器"
 
 # camlibs/polaroid/pdc700.c:229
-#: camlibs/polaroid/pdc700.c:231
+#: camlibs/polaroid/pdc700.c:215
 #, c-format
 msgid "Received unexpected header (%i)"
 msgstr "收到意外的头 (%i)"
 
 # camlibs/polaroid/pdc700.c:242
-#: camlibs/polaroid/pdc700.c:244
+#: camlibs/polaroid/pdc700.c:232
 msgid "Received unexpected response"
 msgstr "收到意外应答"
 
 # camlibs/polaroid/pdc700.c:263
-#: camlibs/polaroid/pdc700.c:265
+#: camlibs/polaroid/pdc700.c:253
 msgid "Checksum error"
 msgstr "校验和错误"
 
 # camlibs/polaroid/pdc700.c:296
-#: camlibs/polaroid/pdc700.c:298
+#: camlibs/polaroid/pdc700.c:286
 msgid "The camera did not accept the command."
 msgstr "相机不接受命令。"
 
 # camlibs/polaroid/pdc700.c:349
-#: camlibs/polaroid/pdc700.c:351
+#: camlibs/polaroid/pdc700.c:339
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "相机发送了比预期更多的字节 (%i)"
 
 # camlibs/polaroid/pdc700.c:451
-#: camlibs/polaroid/pdc700.c:453
+#: camlibs/polaroid/pdc700.c:441
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -4563,7 +4964,7 @@
 msgstr "请求关于照片 %i (= 0x%x) 的信息，但得到了关于照片 %i 的返回信息"
 
 # camlibs/polaroid/pdc700.c:916
-#: camlibs/polaroid/pdc700.c:916
+#: camlibs/polaroid/pdc700.c:904
 #, fuzzy, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write to %s "
@@ -4572,7 +4973,7 @@
 "已接收 %i 字节的未知格式图像。请写 Email 到 <gphoto-devel@lists.sourceforge."
 "net> 以寻求帮助。"
 
-#: camlibs/polaroid/pdc700.c:941
+#: camlibs/polaroid/pdc700.c:929
 msgid ""
 "Download program for Polaroid DC700 camera. Originally written by Ryan "
 "Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
@@ -4580,22 +4981,23 @@
 msgstr ""
 
 # camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/polaroid/pdc700.c:984
+#: camlibs/polaroid/pdc700.c:972 camlibs/ptp2/config.c:1578
+#: camlibs/ptp2/config.c:2173
 msgid "Camera"
 msgstr "相机"
 
 # camlibs/polaroid/pdc700.c:996
-#: camlibs/polaroid/pdc700.c:997
+#: camlibs/polaroid/pdc700.c:985
 msgid "How long will it take until the camera powers off?"
 msgstr "在相机关机前须等待多长时间？"
 
 # camlibs/polaroid/pdc700.c:999
-#: camlibs/polaroid/pdc700.c:1000 camlibs/ricoh/library.c:356
+#: camlibs/polaroid/pdc700.c:988 camlibs/ricoh/library.c:340
 msgid "Image"
 msgstr "图像"
 
 # camlibs/polaroid/pdc700.c:1110
-#: camlibs/polaroid/pdc700.c:1114
+#: camlibs/polaroid/pdc700.c:1102
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -4629,54 +5031,202 @@
 "电源来源：%s"
 
 # camlibs/polaroid/pdc700.c:1229
-#: camlibs/polaroid/pdc700.c:1238
+#: camlibs/polaroid/pdc700.c:1226
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "该驱动程序不支持请求的端口类型 (%i)。"
 
-#: camlibs/ptp2/config.c:201
+#: camlibs/ptp2/chdk.c:140
+#, c-format
+msgid "CHDK lua engine reports error: %s"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:472
+#, c-format
+msgid ""
+"PTP2 / CHDK driver\n"
+"(c) 2015-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This is a PTP subdriver that supports CHDK using Canon cameras.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:400
+#: camlibs/ptp2/chdk.c:489
+#, fuzzy, c-format
+msgid "CHDK %d.%d Status:\n"
+msgstr "卡状态：\t\t"
+
+# frontends/command-line/main.c:384
+#: camlibs/ptp2/chdk.c:492
+#, fuzzy, c-format
+msgid "Mode: %d\n"
+msgstr "型号：%s\n"
+
+#: camlibs/ptp2/chdk.c:494
+#, c-format
+msgid "SV96: %d, ISO: %d\n"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/chdk.c:496
+#, fuzzy, c-format
+msgid "TV96: %d, Shutterspeed: %f\n"
+msgstr "快门速度 (秒)"
+
+#: camlibs/ptp2/chdk.c:498
+#, c-format
+msgid "AV96: %d, Aperture: %f\n"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/chdk.c:500
+#, fuzzy, c-format
+msgid "Focus: %d\n"
+msgstr "聚焦模式"
+
+# frontends/command-line/main.c:384
+#: camlibs/ptp2/chdk.c:502
+#, fuzzy, c-format
+msgid "ISO Mode: %d\n"
+msgstr "型号：%s\n"
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/chdk.c:505
+#, fuzzy, c-format
+msgid "Zoom: %d\n"
+msgstr "快门速度 (秒)"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/chdk.c:507
+#, fuzzy, c-format
+msgid "Optical Temperature: %d\n"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/chdk.c:509
+#, fuzzy, c-format
+msgid "CCD Temperature: %d\n"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/chdk.c:511
+#, fuzzy, c-format
+msgid "Battery Temperature: %d\n"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/chdk.c:514
+#, fuzzy, c-format
+msgid "Flash Mode: %d\n"
+msgstr "闪光灯模式"
+
+#: camlibs/ptp2/chdk.c:1025
+msgid "Raw ISO"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
+# camlibs/sierra/sierra.c:1745
+#: camlibs/ptp2/chdk.c:1031
+#, fuzzy
+msgid "Press"
+msgstr "葡萄牙语"
+
+#: camlibs/ptp2/chdk.c:1032 camlibs/ptp2/config.c:7047
+#: camlibs/ptp2/config.c:7054
+msgid "Release"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1033
+msgid "Click"
+msgstr ""
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/chdk.c:1034
+#, fuzzy
+msgid "Capture Mode"
+msgstr "光圈"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/chdk.c:1035 camlibs/ptp2/ptp.c:7323
+#, fuzzy
+msgid "AE Lock"
+msgstr "曝光"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/chdk.c:1036
+#, fuzzy
+msgid "AF Lock"
+msgstr "聚焦模式"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/chdk.c:1037
+#, fuzzy
+msgid "MF Lock"
+msgstr "聚焦模式"
+
+#: camlibs/ptp2/chdk.c:1039 camlibs/st2205/library.c:539
+#: camlibs/st2205/library.c:563
+msgid "Orientation"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1040 camlibs/ptp2/config.c:10830
+msgid "CHDK"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
+#: camlibs/ptp2/chdk.c:1056 camlibs/ptp2/config.c:11305
+#, fuzzy
+msgid "Image Settings"
+msgstr "相机设置"
+
+#: camlibs/ptp2/chdk.c:1348
+msgid "CHDK get live data failed"
+msgstr ""
+
+#: camlibs/ptp2/chdk.c:1350
+#, c-format
+msgid "CHDK get live data failed: incomplete data (%d bytes) returned"
+msgstr ""
+
+#: camlibs/ptp2/config.c:171
 msgid "CHDK did not leave recording mode."
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/config.c:512 camlibs/ptp2/config.c:585
+#: camlibs/ptp2/config.c:527 camlibs/ptp2/config.c:617
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "您的相机不支持文件改名。"
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: camlibs/ptp2/config.c:732 camlibs/ptp2/config.c:789
-#: camlibs/ptp2/config.c:835 camlibs/ptp2/config.c:908
-#: camlibs/ptp2/config.c:964 camlibs/ptp2/config.c:1040
-#: camlibs/ptp2/config.c:1048 camlibs/ptp2/config.c:1082
-#: camlibs/ptp2/config.c:1096 camlibs/ptp2/config.c:1120
+#: camlibs/ptp2/config.c:760 camlibs/ptp2/config.c:792
+#: camlibs/ptp2/config.c:818 camlibs/ptp2/config.c:864
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "未知的文件类型 %i。"
 
-# libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: camlibs/ptp2/config.c:763 camlibs/ptp2/config.c:935
-#: camlibs/ptp2/config.c:987
-#, fuzzy, c-format
-msgid "Unknown value %04d"
-msgstr "未知的文件类型 %i。"
-
 # camlibs/canon/serial.c:672
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1167
-#: camlibs/ptp2/config.c:1276 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:962 camlibs/ptp2/config.c:979
+#: camlibs/ptp2/config.c:1116 camlibs/ptp2/config.c:1146
+#: camlibs/ptp2/config.c:1447
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "错误：未预期的包类型。"
 
-#: camlibs/ptp2/config.c:1422
+#: camlibs/ptp2/config.c:1327
 msgid "Target value is not in enumeration."
 msgstr ""
 
-#: camlibs/ptp2/config.c:1483
-msgid "Now value is not in enumeration."
-msgstr ""
-
-#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:1422 camlibs/ptp2/config.c:1428
 msgid "Sony was not able to set the new value, is it valid?"
 msgstr ""
 
@@ -4688,224 +5238,254 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1898
-#: camlibs/ptp2/config.c:1911 camlibs/ptp2/config.c:1940
-#: camlibs/ptp2/config.c:1977 camlibs/ptp2/config.c:2038
-#: camlibs/ptp2/config.c:4254 camlibs/ptp2/config.c:4273
-#: camlibs/ptp2/config.c:4320 camlibs/ptp2/config.c:4360
-#: camlibs/ptp2/ptp.c:5619 camlibs/ptp2/ptp.c:5894 camlibs/ptp2/ptp.c:6034
-#: camlibs/ptp2/ptp.c:6069 camlibs/ptp2/ptp.c:6109
-#: camlibs/sierra/olympus-desc.c:639
-#, fuzzy
+#: camlibs/ptp2/config.c:1457 camlibs/ptp2/config.c:2055
+#: camlibs/ptp2/config.c:2068 camlibs/ptp2/config.c:2138
+#: camlibs/ptp2/config.c:2262 camlibs/ptp2/config.c:2323
+#: camlibs/ptp2/config.c:5911 camlibs/ptp2/config.c:5930
+#: camlibs/ptp2/config.c:5983 camlibs/ptp2/config.c:6022
+#: camlibs/ptp2/ptp.c:7835 camlibs/ptp2/ptp.c:8112 camlibs/ptp2/ptp.c:8252
+#: camlibs/ptp2/ptp.c:8287 camlibs/ptp2/ptp.c:8327
+#: camlibs/sierra/olympus-desc.c:632
 msgid "Manual"
-msgstr "无手册"
+msgstr "手动"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:4274
-#: camlibs/ptp2/ptp.c:5620 camlibs/ptp2/ptp.c:5631
+#: camlibs/ptp2/config.c:1458 camlibs/ptp2/config.c:1508
+#: camlibs/ptp2/config.c:5931 camlibs/ptp2/config.c:9146
+#: camlibs/ptp2/ptp.c:7836 camlibs/ptp2/ptp.c:7847
 msgid "Automatic"
 msgstr "自动"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:1525 camlibs/ptp2/ptp.c:5621
+#: camlibs/ptp2/config.c:1459 camlibs/ptp2/ptp.c:7837
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "自动\n"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:4339
-#: camlibs/ptp2/config.c:4358 camlibs/ptp2/ptp.c:5623 camlibs/ptp2/ptp.c:6091
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/ptp2/config.c:1461 camlibs/ptp2/config.c:1513
+#: camlibs/ptp2/config.c:4008 camlibs/ptp2/config.c:6002
+#: camlibs/ptp2/config.c:6020 camlibs/ptp2/ptp.c:7839 camlibs/ptp2/ptp.c:8309
+#: camlibs/ricoh/library.c:312 camlibs/sierra/nikon-desc.c:272
+#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/olympus-desc.c:569
+#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1368
 msgid "Fluorescent"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
 # camlibs/sierra/sierra.c:1239
-#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/config.c:4338 camlibs/ptp2/config.c:4357
-#: camlibs/ptp2/ptp.c:6090 camlibs/sierra/olympus-desc.c:558
-#: camlibs/sierra/olympus-desc.c:577 camlibs/sierra/olympus-desc.c:595
-#: camlibs/sierra/olympus-desc.c:616 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1097 camlibs/sierra/sierra.c:1383
+#: camlibs/ptp2/config.c:1462 camlibs/ptp2/config.c:1512
+#: camlibs/ptp2/config.c:4007 camlibs/ptp2/config.c:6001
+#: camlibs/ptp2/config.c:6019 camlibs/ptp2/config.c:9148
+#: camlibs/ptp2/ptp.c:8308 camlibs/sierra/olympus-desc.c:551
+#: camlibs/sierra/olympus-desc.c:570 camlibs/sierra/olympus-desc.c:588
+#: camlibs/sierra/olympus-desc.c:609 camlibs/sierra/sierra.c:1074
+#: camlibs/sierra/sierra.c:1084 camlibs/sierra/sierra.c:1370
 msgid "Tungsten"
 msgstr "钨"
 
 # camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963
 # camlibs/sierra/sierra.c:1241
-#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1549
-#: camlibs/ptp2/config.c:1562 camlibs/ptp2/config.c:3216
-#: camlibs/ptp2/config.c:4337 camlibs/ptp2/config.c:4356
-#: camlibs/ptp2/ptp.c:5626 camlibs/ptp2/ptp.c:6089
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1385
+#: camlibs/ptp2/config.c:1464 camlibs/ptp2/config.c:1485
+#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511
+#: camlibs/ptp2/config.c:4011 camlibs/ptp2/config.c:6000
+#: camlibs/ptp2/config.c:6018 camlibs/ptp2/config.c:9151
+#: camlibs/ptp2/ptp.c:7842 camlibs/ptp2/ptp.c:8307
+#: camlibs/sierra/nikon-desc.c:275 camlibs/sierra/olympus-desc.c:552
+#: camlibs/sierra/olympus-desc.c:571 camlibs/sierra/olympus-desc.c:592
+#: camlibs/sierra/olympus-desc.c:615 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1372
 msgid "Cloudy"
 msgstr "多云"
 
-#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:1540
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:5627
+#: camlibs/ptp2/config.c:1465 camlibs/ptp2/config.c:1476
+#: camlibs/ptp2/config.c:1484 camlibs/ptp2/config.c:1497
+#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:4012
+#: camlibs/ptp2/ptp.c:7843
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:4342
-#: camlibs/ptp2/config.c:4363 camlibs/ptp2/config.c:7237
-#: camlibs/ptp2/config.c:7238 camlibs/ptp2/ptp.c:4791 camlibs/ptp2/ptp.c:5418
-#: camlibs/ptp2/ptp.c:5628 camlibs/ptp2/ptp.c:6094
+#: camlibs/ptp2/config.c:1466 camlibs/ptp2/config.c:6005
+#: camlibs/ptp2/config.c:6025 camlibs/ptp2/config.c:10872
+#: camlibs/ptp2/config.c:10873 camlibs/ptp2/config.c:10874
+#: camlibs/ptp2/ptp.c:6258 camlibs/ptp2/ptp.c:7319 camlibs/ptp2/ptp.c:7844
+#: camlibs/ptp2/ptp.c:8312
 msgid "Color Temperature"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:1533 camlibs/ptp2/config.c:1558
-#: camlibs/ptp2/config.c:3221 camlibs/ptp2/ptp.c:5629 camlibs/ptp2/ptp.c:6092
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
+#: camlibs/ptp2/config.c:1467 camlibs/ptp2/config.c:1494
+#: camlibs/ptp2/config.c:4016 camlibs/ptp2/ptp.c:7845 camlibs/ptp2/ptp.c:8310
+#: camlibs/sierra/nikon-desc.c:274 camlibs/sierra/olympus-desc.c:614
 #, fuzzy
 msgid "Preset"
 msgstr "葡萄牙语"
 
+#: camlibs/ptp2/config.c:1469
+msgid "Natural light auto"
+msgstr ""
+
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1535
+#: camlibs/ptp2/config.c:1471
 #, fuzzy
 msgid "Fluorescent Lamp 1"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1536
+#: camlibs/ptp2/config.c:1472
 #, fuzzy
 msgid "Fluorescent Lamp 2"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1537
+#: camlibs/ptp2/config.c:1473
 #, fuzzy
 msgid "Fluorescent Lamp 3"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1538
+#: camlibs/ptp2/config.c:1474
 #, fuzzy
 msgid "Fluorescent Lamp 4"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1539
+#: camlibs/ptp2/config.c:1475
 #, fuzzy
 msgid "Fluorescent Lamp 5"
 msgstr "荧光"
 
-#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:1554
+#: camlibs/ptp2/config.c:1477 camlibs/ptp2/config.c:1490
 msgid "Choose Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1542
+#: camlibs/ptp2/config.c:1478
 msgid "Preset Custom 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1543
+#: camlibs/ptp2/config.c:1479
 msgid "Preset Custom 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1544
+#: camlibs/ptp2/config.c:1480
 msgid "Preset Custom 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1545
+#: camlibs/ptp2/config.c:1481
 msgid "Preset Custom 4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1546
+#: camlibs/ptp2/config.c:1482
 msgid "Preset Custom 5"
 msgstr ""
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1550
+#: camlibs/ptp2/config.c:1486
 #, fuzzy
 msgid "Fluorescent: Warm White"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1551
+#: camlibs/ptp2/config.c:1487
 #, fuzzy
 msgid "Fluorescent: Cold White"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1552 camlibs/ptp2/config.c:1565
+#: camlibs/ptp2/config.c:1488 camlibs/ptp2/config.c:1501
 #, fuzzy
 msgid "Fluorescent: Day White"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1553 camlibs/ptp2/config.c:1564
+#: camlibs/ptp2/config.c:1489 camlibs/ptp2/config.c:1500
 #, fuzzy
 msgid "Fluorescent: Daylight"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:1555
+#: camlibs/ptp2/config.c:1491 camlibs/ptp2/config.c:1516
+#: camlibs/ptp2/config.c:9154
 #, fuzzy
 msgid "Preset 1"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:1556
+#: camlibs/ptp2/config.c:1492 camlibs/ptp2/config.c:1517
+#: camlibs/ptp2/config.c:9155
 #, fuzzy
 msgid "Preset 2"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:1557
+#: camlibs/ptp2/config.c:1493 camlibs/ptp2/config.c:1518
+#: camlibs/ptp2/config.c:9156
 #, fuzzy
 msgid "Preset 3"
 msgstr "葡萄牙语"
 
-#: camlibs/ptp2/config.c:1559
+#: camlibs/ptp2/config.c:1495
 msgid "Underwater: Auto"
 msgstr ""
 
 # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
 # camlibs/sierra/sierra.c:1239
-#: camlibs/ptp2/config.c:1563
+#: camlibs/ptp2/config.c:1499
 #, fuzzy
 msgid "Tungsten 2"
 msgstr "钨"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1566
+#: camlibs/ptp2/config.c:1502
 #, fuzzy
 msgid "Fluorescent: White"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1567
+#: camlibs/ptp2/config.c:1503
 #, fuzzy
 msgid "Fluorescent: Tungsten"
 msgstr "荧光"
 
-#: camlibs/ptp2/config.c:1573 camlibs/ptp2/config.c:4871
-#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4893
-#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4914
-#: camlibs/ptp2/ptp.c:5616
+# camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
+# camlibs/sierra/sierra.c:1745
+#: camlibs/ptp2/config.c:1519 camlibs/ptp2/config.c:9157
+#, fuzzy
+msgid "Preset 4"
+msgstr "葡萄牙语"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2072
+#: camlibs/ptp2/config.c:5884 camlibs/ptp2/config.c:5906
+#: camlibs/ptp2/config.c:6003 camlibs/ptp2/ptp.c:7910 camlibs/ptp2/ptp.c:8075
+#: camlibs/sierra/epson-desc.c:157 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1571 camlibs/sierra/sierra.c:1794
+msgid "Custom"
+msgstr "定制"
+
+#: camlibs/ptp2/config.c:1526 camlibs/ptp2/config.c:6783
+#: camlibs/ptp2/config.c:6794 camlibs/ptp2/config.c:6805
+#: camlibs/ptp2/config.c:6817 camlibs/ptp2/config.c:6828
+#: camlibs/ptp2/config.c:6846 camlibs/ptp2/config.c:6861
+#: camlibs/ptp2/ptp.c:7832
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
@@ -4918,14 +5498,15 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:1574 camlibs/ptp2/config.c:4870
-#: camlibs/ptp2/config.c:4881 camlibs/ptp2/config.c:4892
-#: camlibs/ptp2/config.c:4904 camlibs/ptp2/config.c:4913
+#: camlibs/ptp2/config.c:1527 camlibs/ptp2/config.c:6782
+#: camlibs/ptp2/config.c:6793 camlibs/ptp2/config.c:6804
+#: camlibs/ptp2/config.c:6816 camlibs/ptp2/config.c:6826
+#: camlibs/ptp2/config.c:6844 camlibs/ptp2/config.c:6860
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "普通"
 
-#: camlibs/ptp2/config.c:1575
+#: camlibs/ptp2/config.c:1528
 #, fuzzy
 msgid "RAW + JPEG Fine"
 msgstr "JPEG"
@@ -4938,176 +5519,406 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:1576
+#: camlibs/ptp2/config.c:1529
 #, fuzzy
 msgid "RAW + JPEG Normal"
 msgstr "普通"
 
-#: camlibs/ptp2/config.c:1581
+#: camlibs/ptp2/config.c:1539
+msgid "Large Fine JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1540
+msgid "Large Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1541
+msgid "Medium Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1542
+msgid "Small Normal JPEG+RAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1547
 msgid "Single frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1582 camlibs/ptp2/config.c:2466
+#: camlibs/ptp2/config.c:1548 camlibs/ptp2/config.c:2800
 msgid "Continuous low speed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1583 camlibs/ptp2/config.c:2465
+#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:2799
 msgid "Continuous high speed"
 msgstr ""
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:1584
+#: camlibs/ptp2/config.c:1550
 #, fuzzy
 msgid "Self-timer"
 msgstr "自动定时"
 
-#: camlibs/ptp2/config.c:1585
+#: camlibs/ptp2/config.c:1551
 msgid "Mup Mirror up"
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/config.c:1878
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:788
+# camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
+# camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
+# camlibs/sierra/sierra.c:1680
+#: camlibs/ptp2/config.c:1556
 #, fuzzy
+msgid "PROVIA/Standard"
+msgstr "标准"
+
+#: camlibs/ptp2/config.c:1557
+msgid "Velvia/Vivid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1558
+msgid "ASTIA/Soft"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1559
+msgid "PRO Neg.Hi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1560
+msgid "PRO Neg.Std"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:4412
+#: camlibs/ricoh/library.c:314 camlibs/sierra/epson-desc.c:123
+msgid "Black & White"
+msgstr "黑白"
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:1562
+#, fuzzy
+msgid "Black & White+Ye Filter"
+msgstr "黑白"
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:1563
+#, fuzzy
+msgid "Black & White+R Filter"
+msgstr "黑白"
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:1564
+#, fuzzy
+msgid "Black & White+G Filter"
+msgstr "黑白"
+
+#: camlibs/ptp2/config.c:1566
+msgid "Classic Chrome"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1567
+msgid "ACROS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1568
+msgid "ACROS+Ye Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1569
+msgid "ACROS+R Filter,"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1570
+msgid "ACROS+G Filter"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1571
+msgid "ETERNA/Cinema"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1572
+msgid "Classic Neg"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1573
+msgid "ETERNA BLEACH BYPASS"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1579
+msgid "USB"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:167
+#: camlibs/ptp2/config.c:2035
 msgid "undefined"
-msgstr "超精细"
+msgstr "未定义"
 
-#: camlibs/ptp2/config.c:1879
+#: camlibs/ptp2/config.c:2036
 msgid "economy"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1882
+#: camlibs/ptp2/config.c:2039
 msgid "lossless"
-msgstr ""
+msgstr "无损"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/config.c:1888 camlibs/ptp2/config.c:2266
-#: camlibs/ptp2/config.c:4272 camlibs/ptp2/library.c:5808
-#: camlibs/ptp2/library.c:5821 camlibs/ptp2/ptp.c:5640 camlibs/ptp2/ptp.c:5988
-#: camlibs/ptp2/ptp.c:5994 camlibs/ptp2/ptp.c:6001 camlibs/ptp2/ptp.c:6163
-#: camlibs/ptp2/ptp.c:6389
+#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:2571
+#: camlibs/ptp2/config.c:5929 camlibs/ptp2/library.c:7832
+#: camlibs/ptp2/library.c:7845 camlibs/ptp2/ptp.c:6159 camlibs/ptp2/ptp.c:7856
+#: camlibs/ptp2/ptp.c:8206 camlibs/ptp2/ptp.c:8212 camlibs/ptp2/ptp.c:8219
+#: camlibs/ptp2/ptp.c:8381 camlibs/ptp2/ptp.c:8608
 #, fuzzy
 msgid "Undefined"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/config.c:1890 camlibs/ptp2/ptp.c:6003
+#: camlibs/ptp2/config.c:2047 camlibs/ptp2/ptp.c:8221
 msgid "CRW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1896 camlibs/ptp2/config.c:1909
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1897 camlibs/ptp2/config.c:1910
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1899 camlibs/ptp2/config.c:1913
-#: camlibs/ptp2/ptp.c:6028
+#: camlibs/ptp2/config.c:2056 camlibs/ptp2/config.c:2070
+#: camlibs/ptp2/ptp.c:8246
 msgid "A_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1900 camlibs/ptp2/ptp.c:6029
+#: camlibs/ptp2/config.c:2057 camlibs/ptp2/ptp.c:8247
 msgid "M_DEP"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1914
+#: camlibs/ptp2/config.c:2071
 msgid "DEP"
 msgstr ""
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:1915 camlibs/ptp2/config.c:4227
-#: camlibs/ptp2/config.c:4249 camlibs/ptp2/config.c:4340
-#: camlibs/ptp2/ptp.c:5692 camlibs/ptp2/ptp.c:5857
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1807
-msgid "Custom"
-msgstr "定制"
-
-#: camlibs/ptp2/config.c:1916
+#: camlibs/ptp2/config.c:2073
 msgid "Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1918 camlibs/ptp2/config.c:3046
-#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3085
-#: camlibs/ptp2/config.c:3284 camlibs/ptp2/ptp.c:5661
+#: camlibs/ptp2/config.c:2075 camlibs/ptp2/config.c:3830
+#: camlibs/ptp2/config.c:3854 camlibs/ptp2/config.c:3878
+#: camlibs/ptp2/config.c:4127 camlibs/ptp2/ptp.c:7877
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1919 camlibs/ptp2/config.c:3045
-#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3251
-#: camlibs/ptp2/config.c:3270 camlibs/ptp2/ptp.c:5659 camlibs/ptp2/ptp.c:6042
+#: camlibs/ptp2/config.c:2076 camlibs/ptp2/config.c:3829
+#: camlibs/ptp2/config.c:3876 camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:4113 camlibs/ptp2/ptp.c:7875 camlibs/ptp2/ptp.c:8260
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1921 camlibs/ptp2/config.c:2085
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3059
-#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3249
-#: camlibs/ptp2/config.c:3268 camlibs/ptp2/config.c:4226
-#: camlibs/ptp2/ptp.c:5657 camlibs/ptp2/ptp.c:5856 camlibs/st2205/library.c:513
-#: camlibs/st2205/library.c:526
+#: camlibs/ptp2/config.c:2078 camlibs/ptp2/config.c:2370
+#: camlibs/ptp2/config.c:3827 camlibs/ptp2/config.c:3850
+#: camlibs/ptp2/config.c:3874 camlibs/ptp2/config.c:4092
+#: camlibs/ptp2/config.c:4111 camlibs/ptp2/config.c:5883
+#: camlibs/ptp2/ptp.c:7873 camlibs/ptp2/ptp.c:8074 camlibs/st2205/library.c:503
+#: camlibs/st2205/library.c:516
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1922
+#: camlibs/ptp2/config.c:2079
 msgid "Closeup"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:1923
+#: camlibs/ptp2/config.c:2080
 #, fuzzy
 msgid "Flash Off"
 msgstr "闪光灯模式"
 
+# camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
+#: camlibs/ptp2/config.c:2082
+#, fuzzy
+msgid "C2"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:2083
+msgid "C3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+msgid "Creative Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+msgid "Handheld Night Scene"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
+#: camlibs/ptp2/config.c:2088
+#, fuzzy
+msgid "HDR Backlight Control"
+msgstr "LCD 亮度"
+
+#: camlibs/ptp2/config.c:2089
+msgid "SCN"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2090 camlibs/ptp2/config.c:3871
+msgid "Food"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2091
+msgid "Grainy B/W"
+msgstr ""
+
+# camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
+# camlibs/dimera/dimera3500.c:918
+#: camlibs/ptp2/config.c:2092
+#, fuzzy
+msgid "Soft focus"
+msgstr "内存耗尽"
+
+#: camlibs/ptp2/config.c:2093
+msgid "Toy camera effect"
+msgstr ""
+
+# libgphoto2/gphoto2-result.c:45
+#: camlibs/ptp2/config.c:2094
+#, fuzzy
+msgid "Fish-eye effect"
+msgstr "鱼眼"
+
+#: camlibs/ptp2/config.c:2095
+msgid "Water painting effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2096 camlibs/ptp2/config.c:4420
+msgid "Miniature effect"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:788
+# camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
+# camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
+# camlibs/sierra/sierra.c:1680
+#: camlibs/ptp2/config.c:2097
+#, fuzzy
+msgid "HDR art standard"
+msgstr "标准"
+
+#: camlibs/ptp2/config.c:2098
+msgid "HDR art vivid"
+msgstr ""
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:2099
+#, fuzzy
+msgid "HDR art bold"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:2100
+msgid "HDR art embossed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2101
+msgid "Panning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2102
+msgid "HDR"
+msgstr ""
+
+# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
+# camlibs/sierra/sierra.c:1220
+#: camlibs/ptp2/config.c:2103
+#, fuzzy
+msgid "Self Portrait"
+msgstr "对比度-"
+
+#: camlibs/ptp2/config.c:2104
+msgid "Hybrid Auto"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2105
+msgid "Smooth skin"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2106
+msgid "Fv"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2112
+msgid "Standard (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2114
+msgid "Low (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2116
+msgid "Off (disabled in manual exposure)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2118
+msgid "High (disabled in manual exposure)"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
+#: camlibs/ptp2/config.c:2119
+#, fuzzy
+msgid "x1"
+msgstr "1x"
+
+# camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
+#: camlibs/ptp2/config.c:2120
+#, fuzzy
+msgid "x2"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:2121
+msgid "x3"
+msgstr ""
+
 # camlibs/konica/library.c:748 camlibs/konica/library.c:759
 # camlibs/konica/library.c:991
-#: camlibs/ptp2/config.c:1931
+#: camlibs/ptp2/config.c:2129
 #, fuzzy
 msgid "red eye suppression"
 msgstr "开，消红眼"
 
-#: camlibs/ptp2/config.c:1932
+#: camlibs/ptp2/config.c:2130
 msgid "fill in"
 msgstr ""
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/config.c:1933
+#: camlibs/ptp2/config.c:2131
 #, fuzzy
 msgid "auto + red eye suppression"
 msgstr "自动，消红眼"
 
 # camlibs/konica/library.c:748 camlibs/konica/library.c:759
 # camlibs/konica/library.c:991
-#: camlibs/ptp2/config.c:1934
+#: camlibs/ptp2/config.c:2132
 #, fuzzy
 msgid "on + red eye suppression"
 msgstr "开，消红眼"
 
-#: camlibs/ptp2/config.c:1939
+#: camlibs/ptp2/config.c:2137
 msgid "iTTL"
 msgstr ""
 
 # camlibs/konica/konica.c:131
-#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:5895
+#: camlibs/ptp2/config.c:2139 camlibs/ptp2/ptp.c:8113
 #, fuzzy
 msgid "Commander"
 msgstr "命令顺序错误。"
 
-#: camlibs/ptp2/config.c:1942
+#: camlibs/ptp2/config.c:2140
 msgid "Repeating"
 msgstr ""
 
-#: camlibs/ptp2/config.c:1947 camlibs/ptp2/config.c:1976
-#: camlibs/ptp2/config.c:2036 camlibs/ptp2/ptp.c:5897
+#: camlibs/ptp2/config.c:2145 camlibs/ptp2/config.c:2261
+#: camlibs/ptp2/config.c:2321 camlibs/ptp2/ptp.c:8115
 msgid "TTL"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:1948 camlibs/ptp2/config.c:2037
-#: camlibs/ptp2/ptp.c:5898
+#: camlibs/ptp2/config.c:2146 camlibs/ptp2/config.c:2322
+#: camlibs/ptp2/ptp.c:8116
 #, fuzzy
 msgid "Auto Aperture"
 msgstr "光圈"
@@ -5120,222 +5931,316 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:1949 camlibs/ptp2/ptp.c:5899
+#: camlibs/ptp2/config.c:2147 camlibs/ptp2/ptp.c:8117
 #, fuzzy
 msgid "Full Manual"
 msgstr "无手册"
 
-#: camlibs/ptp2/config.c:2045 camlibs/ptp2/config.c:4276
-#: camlibs/ptp2/ptp.c:5865
+#: camlibs/ptp2/config.c:2152 camlibs/ptp2/config.c:2161
+msgid "QVGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2153 camlibs/ptp2/config.c:2160
+msgid "VGA"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2154 camlibs/ptp2/config.c:2159
+msgid "XGA"
+msgstr ""
+
+# frontends/command-line/gphoto2-cmd-capture.c:218
+# libgphoto2/gphoto2-result.c:51
+#: camlibs/ptp2/config.c:2174
+#, fuzzy
+msgid "Application"
+msgstr "操作模式"
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/ptp2/config.c:2196 camlibs/ptp2/config.c:2215
+#: camlibs/ptp2/config.c:2227 camlibs/ptp2/config.c:2475
+#: camlibs/ptp2/config.c:2484 camlibs/ptp2/config.c:2493
+#: camlibs/ptp2/config.c:2756 camlibs/ptp2/ptp.c:8223
+#, fuzzy
+msgid "Large"
+msgstr "图像"
+
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:2479
+#: camlibs/ptp2/config.c:2486 camlibs/ptp2/config.c:2491
+#: camlibs/ptp2/config.c:2753 camlibs/ptp2/ptp.c:8225
+msgid "Small"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2330 camlibs/ptp2/config.c:5933
+#: camlibs/ptp2/ptp.c:8083
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2046 camlibs/ptp2/config.c:4277
-#: camlibs/ptp2/config.c:4283 camlibs/ptp2/ptp.c:5866
+#: camlibs/ptp2/config.c:2331 camlibs/ptp2/config.c:5934
+#: camlibs/ptp2/config.c:5944 camlibs/ptp2/ptp.c:8084
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2047 camlibs/ptp2/config.c:4278
-#: camlibs/ptp2/config.c:4282 camlibs/ptp2/ptp.c:5867
+#: camlibs/ptp2/config.c:2332 camlibs/ptp2/config.c:5935
+#: camlibs/ptp2/config.c:5943 camlibs/ptp2/ptp.c:8085
 msgid "AF-A"
 msgstr ""
 
 # camlibs/konica/library.c:779 camlibs/konica/library.c:786
 # camlibs/sierra/sierra.c:1425 camlibs/sierra/sierra.c:1431
 # camlibs/sierra/sierra.c:1651
-#: camlibs/ptp2/config.c:2048 camlibs/ptp2/ptp.c:5868
+#: camlibs/ptp2/config.c:2333 camlibs/ptp2/ptp.c:8086
 #, fuzzy
 msgid "MF (fixed)"
 msgstr "固定"
 
-#: camlibs/ptp2/config.c:2049 camlibs/ptp2/ptp.c:5869
+#: camlibs/ptp2/config.c:2334 camlibs/ptp2/ptp.c:8087
 msgid "MF (selection)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2071
+#: camlibs/ptp2/config.c:2356
 msgid "Center-weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2073 camlibs/ptp2/config.c:3479
-#: camlibs/ptp2/config.c:4130 camlibs/ptp2/ptp.c:5636
+#: camlibs/ptp2/config.c:2358 camlibs/ptp2/config.c:4368
+#: camlibs/ptp2/config.c:5703 camlibs/ptp2/config.c:5712
+#: camlibs/ptp2/ptp.c:7852
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2074
+#: camlibs/ptp2/config.c:2359
 msgid "Evaluative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2075
+#: camlibs/ptp2/config.c:2360
 msgid "Partial"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2076
+#: camlibs/ptp2/config.c:2361
 msgid "Center-weighted average"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2077
+#: camlibs/ptp2/config.c:2362
 msgid "Spot metering interlocked with AF frame"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2078
+#: camlibs/ptp2/config.c:2363
 msgid "Multi spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2087
+#: camlibs/ptp2/config.c:2372
 msgid "Faithful"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2088 camlibs/ptp2/ptp.c:6044 camlibs/ptp2/ptp.c:6176
+#: camlibs/ptp2/config.c:2373 camlibs/ptp2/ptp.c:8262 camlibs/ptp2/ptp.c:8394
 msgid "Monochrome"
 msgstr ""
 
+#: camlibs/ptp2/config.c:2375
+msgid "Fine detail"
+msgstr ""
+
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/config.c:2090
+#: camlibs/ptp2/config.c:2376
 #, fuzzy
 msgid "User defined 1"
 msgstr "超精细"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/config.c:2091
+#: camlibs/ptp2/config.c:2377
 #, fuzzy
 msgid "User defined 2"
 msgstr "超精细"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/config.c:2092
+#: camlibs/ptp2/config.c:2378
 #, fuzzy
 msgid "User defined 3"
 msgstr "超精细"
 
-#: camlibs/ptp2/config.c:2178 camlibs/ptp2/ptp.c:6079
+#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:8297
 msgid "Focusing Point on Center Only, Manual"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2179 camlibs/ptp2/ptp.c:6080
+#: camlibs/ptp2/config.c:2465 camlibs/ptp2/ptp.c:8298
 msgid "Focusing Point on Center Only, Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2180 camlibs/ptp2/ptp.c:6081
+#: camlibs/ptp2/config.c:2466 camlibs/ptp2/ptp.c:8299
 msgid "Multiple Focusing Points (No Specification), Manual"
 msgstr ""
 
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/config.c:2181 camlibs/ptp2/ptp.c:6082
+#: camlibs/ptp2/config.c:2467 camlibs/ptp2/ptp.c:8300
 #, fuzzy
 msgid "Multiple Focusing Points, Auto"
 msgstr "聚焦错误。"
 
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:6083
+#: camlibs/ptp2/config.c:2468 camlibs/ptp2/ptp.c:8301
 #, fuzzy
 msgid "Multiple Focusing Points (Right)"
 msgstr "聚焦错误。"
 
-#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:6084
+#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:8302
 msgid "Multiple Focusing Points (Center)"
 msgstr ""
 
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:6085
+#: camlibs/ptp2/config.c:2470 camlibs/ptp2/ptp.c:8303
 #, fuzzy
 msgid "Multiple Focusing Points (Left)"
 msgstr "聚焦错误。"
 
-# camlibs/polaroid/pdc700.c:999
-#: camlibs/ptp2/config.c:2189 camlibs/ptp2/config.c:2198
-#: camlibs/ptp2/config.c:2207 camlibs/ptp2/ptp.c:6005
-#, fuzzy
-msgid "Large"
-msgstr "图像"
-
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:2190 camlibs/ptp2/ptp.c:6006
+#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2754
+#: camlibs/ptp2/ptp.c:8224
 #, fuzzy
 msgid "Medium 1"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:6008
+#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2755
+#: camlibs/ptp2/ptp.c:8226
 #, fuzzy
 msgid "Medium 2"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:2192 camlibs/ptp2/ptp.c:6009
+#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:8227
 #, fuzzy
 msgid "Medium 3"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:2193 camlibs/ptp2/config.c:2200
-#: camlibs/ptp2/config.c:2205 camlibs/ptp2/ptp.c:6007
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2212
+#: camlibs/ptp2/config.c:2498
 msgid "3:2"
 msgstr "3:2"
 
-#: camlibs/ptp2/config.c:2213
+#: camlibs/ptp2/config.c:2499
 msgid "16:9"
 msgstr "16:9"
 
-#: camlibs/ptp2/config.c:2229 camlibs/ptp2/config.c:4102
-#: camlibs/ptp2/config.c:4120 camlibs/ptp2/ptp.c:5742 camlibs/ptp2/ptp.c:5745
-#: camlibs/ptp2/ptp.c:6012
+#: camlibs/ptp2/config.c:2500
+msgid "4:3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2501
+msgid "1:1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2518 camlibs/ptp2/config.c:5675
+#: camlibs/ptp2/config.c:5693 camlibs/ptp2/ptp.c:7960 camlibs/ptp2/ptp.c:7963
+#: camlibs/ptp2/ptp.c:8230
 msgid "10 seconds"
 msgstr "10秒"
 
-#: camlibs/ptp2/config.c:2230 camlibs/ptp2/config.c:4118
-#: camlibs/ptp2/config.c:4326 camlibs/ptp2/ptp.c:5740 camlibs/ptp2/ptp.c:6013
+#: camlibs/ptp2/config.c:2519 camlibs/ptp2/config.c:5691
+#: camlibs/ptp2/config.c:5989 camlibs/ptp2/ptp.c:7958 camlibs/ptp2/ptp.c:8231
 msgid "2 seconds"
 msgstr "2秒"
 
-#: camlibs/ptp2/config.c:2240
+#: camlibs/ptp2/config.c:2526
 msgid "TFT"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2241
+#: camlibs/ptp2/config.c:2527
 msgid "PC"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2242
+#: camlibs/ptp2/config.c:2528
 msgid "TFT + PC"
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/config.c:2244
-#, fuzzy
-msgid "Setting 4"
-msgstr "闪光灯设置"
+#: camlibs/ptp2/config.c:2529
+msgid "MOBILE"
+msgstr ""
 
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/config.c:2245
-#, fuzzy
-msgid "Setting 5"
-msgstr "闪光灯设置"
+#: camlibs/ptp2/config.c:2530
+msgid "TFT + MOBILE"
+msgstr ""
 
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/config.c:2246
-#, fuzzy
-msgid "Setting 6"
-msgstr "闪光灯设置"
+#: camlibs/ptp2/config.c:2531
+msgid "PC + MOBILE"
+msgstr ""
 
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/config.c:2247
-#, fuzzy
-msgid "Setting 7"
-msgstr "闪光灯设置"
+#: camlibs/ptp2/config.c:2532
+msgid "TFT + PC + MOBILE"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2533
+msgid "MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2534
+msgid "TFT + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2535
+msgid "PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2536
+msgid "TFT + PC + MOBILE2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2541
+msgid "Quick"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2542
+msgid "Live"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2543
+msgid "LiveFace"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2544
+msgid "LiveMulti"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2545
+msgid "LiveZone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2546
+msgid "LiveSingleExpandCross"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2547
+msgid "LiveSingleExpandSurround"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2548
+msgid "LiveZoneLargeH"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2549
+msgid "LiveZoneLargeV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2550
+msgid "LiveCatchAF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2551
+msgid "LiveSpotAF"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2253 camlibs/ptp2/config.c:4112
-#: camlibs/ptp2/ptp.c:5828
+#: camlibs/ptp2/config.c:2557 camlibs/ptp2/config.c:5686
+msgid "SDRAM"
+msgstr "SDRAM"
+
+#: camlibs/ptp2/config.c:2558 camlibs/ptp2/config.c:5685
+#: camlibs/ptp2/ptp.c:8046
 msgid "Card"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2268 camlibs/ptp2/config.c:2294
-#: camlibs/ptp2/config.c:2320 camlibs/ptp2/ptp.c:6165
+#: camlibs/ptp2/config.c:2573 camlibs/ptp2/config.c:2599
+#: camlibs/ptp2/config.c:2625 camlibs/ptp2/ptp.c:8383
 msgid "Video OUT"
 msgstr ""
 
@@ -5347,779 +6252,1277 @@
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/ptp2/config.c:2290 camlibs/ptp2/config.c:2304
-#: camlibs/ptp2/config.c:2322
-#, fuzzy, c-format
+#: camlibs/ptp2/config.c:2595 camlibs/ptp2/config.c:2609
+#: camlibs/ptp2/config.c:2627
+#, c-format
 msgid "Unknown %d"
-msgstr "%i (未知)"
+msgstr "未知 %d"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/config.c:2347 camlibs/ptp2/config.c:4375
+#: camlibs/ptp2/config.c:2651 camlibs/ptp2/config.c:6041
 #, fuzzy
 msgid "Factory Default"
 msgstr "日光"
 
-#: camlibs/ptp2/config.c:2390
+# camlibs/konica/library.c:749 camlibs/konica/library.c:765
+# camlibs/konica/library.c:780 camlibs/konica/library.c:783
+# camlibs/konica/library.c:993 camlibs/konica/library.c:1023
+# camlibs/sierra/sierra.c:787 camlibs/sierra/sierra.c:793
+# camlibs/sierra/sierra.c:827 camlibs/sierra/sierra.c:833
+# camlibs/sierra/sierra.c:886 camlibs/sierra/sierra.c:893
+# camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:954
+# camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1150
+# camlibs/sierra/sierra.c:1190 camlibs/sierra/sierra.c:1233
+# camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
+# camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
+# camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
+#: camlibs/ptp2/config.c:2693 camlibs/ptp2/config.c:3068
+#: camlibs/ptp2/config.c:3089 camlibs/ptp2/config.c:3201
+#: camlibs/ptp2/config.c:10868 camlibs/ptp2/config.c:11275
+#: camlibs/ptp2/ptp.c:6701
+#, fuzzy, c-format
+msgid "Auto ISO"
+msgstr "自动"
+
+#: camlibs/ptp2/config.c:2700
 msgid "mRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2391
+#: camlibs/ptp2/config.c:2701
 msgid "sRAW"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2400
+#: camlibs/ptp2/config.c:2702
+msgid "cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2711
 msgid "Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2401
+#: camlibs/ptp2/config.c:2712
 #, fuzzy
 msgid "Tiny JPEG"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:2403
+#: camlibs/ptp2/config.c:2714
 msgid "mRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2404
+#: camlibs/ptp2/config.c:2715
 msgid "sRAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2406
+#: camlibs/ptp2/config.c:2716
+msgid "cRAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2718
 msgid "mRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2407
+#: camlibs/ptp2/config.c:2719
 msgid "sRAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2410 camlibs/ptp2/config.c:2411
+#: camlibs/ptp2/config.c:2720
+msgid "cRAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2723 camlibs/ptp2/config.c:2724
 msgid "mRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2412 camlibs/ptp2/config.c:2413
+#: camlibs/ptp2/config.c:2725 camlibs/ptp2/config.c:2726
 msgid "sRAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2415
+#: camlibs/ptp2/config.c:2727
+msgid "cRAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2729
 msgid "mRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2416
+#: camlibs/ptp2/config.c:2730
 msgid "sRAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2418
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:2731
+#, fuzzy
+msgid "cRAW + Large Normal JPEG"
+msgstr "普通"
+
+#: camlibs/ptp2/config.c:2733
 msgid "mRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2419
+#: camlibs/ptp2/config.c:2734
 msgid "sRAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2422 camlibs/ptp2/config.c:2423
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:2735
+#, fuzzy
+msgid "cRAW + Medium Normal JPEG"
+msgstr "普通"
+
+#: camlibs/ptp2/config.c:2738 camlibs/ptp2/config.c:2739
 msgid "mRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2425
+#: camlibs/ptp2/config.c:2740 camlibs/ptp2/config.c:2741
 msgid "sRAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2426
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:2742
+#, fuzzy
+msgid "cRAW + Small Normal JPEG"
+msgstr "普通"
+
+#: camlibs/ptp2/config.c:2743
 msgid "RAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2427
+#: camlibs/ptp2/config.c:2744
 msgid "mRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2428
+#: camlibs/ptp2/config.c:2745
 msgid "sRAW + Smaller JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2429
+#: camlibs/ptp2/config.c:2746
+msgid "cRAW + Smaller JPEG"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2747
 msgid "RAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2430
+#: camlibs/ptp2/config.c:2748
 msgid "mRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2431
+#: camlibs/ptp2/config.c:2749
 msgid "sRAW + Tiny JPEG"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2464 camlibs/ptp2/ptp.c:6110
+#: camlibs/ptp2/config.c:2757
+msgid "Small + RAW"
+msgstr ""
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2758
+#, fuzzy
+msgid "Medium 1 + RAW"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2759
+#, fuzzy
+msgid "Medium 2 + RAW"
+msgstr "中"
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/ptp2/config.c:2760
+#, fuzzy
+msgid "Large + RAW"
+msgstr "图像"
+
+#: camlibs/ptp2/config.c:2761
+msgid "Small + cRAW"
+msgstr ""
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2762
+#, fuzzy
+msgid "Medium 1 + cRAW"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2763
+#, fuzzy
+msgid "Medium 2 + cRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2764
+msgid "Large + cRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2767
+msgid "Large + mRAW"
+msgstr ""
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2768
+#, fuzzy
+msgid "Medium 1 + mRAW"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2769
+#, fuzzy
+msgid "Medium 2 + mRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2770
+msgid "Small + mRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2771
+msgid "Large + sRAW"
+msgstr ""
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2772
+#, fuzzy
+msgid "Medium 1 + sRAW"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/config.c:2773
+#, fuzzy
+msgid "Medium 2 + sRAW"
+msgstr "中"
+
+#: camlibs/ptp2/config.c:2774
+msgid "Small + sRAW"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2797 camlibs/ptp2/ptp.c:8328
 msgid "Continuous"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2467
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:2798 camlibs/ptp2/library.c:7685
+#, fuzzy
+msgid "Video"
+msgstr "录制模式"
+
+#: camlibs/ptp2/config.c:2801
 msgid "Single: Silent shooting"
 msgstr ""
 
+# camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
+#: camlibs/ptp2/config.c:2802
+#, fuzzy
+msgid "Continuous timer"
+msgstr "场景测量模式"
+
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/config.c:2468
+#: camlibs/ptp2/config.c:2803
 #, fuzzy
 msgid "Timer 10 sec"
 msgstr "远程"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/config.c:2469
+#: camlibs/ptp2/config.c:2804
 #, fuzzy
 msgid "Timer 2 sec"
 msgstr "远程"
 
-#: camlibs/ptp2/config.c:2470
+#: camlibs/ptp2/config.c:2805
 msgid "Super high speed continuous shooting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2471
+#: camlibs/ptp2/config.c:2806
 msgid "Single silent"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2472
+#: camlibs/ptp2/config.c:2807
 msgid "Continuous silent"
 msgstr ""
 
-# camlibs/konica/library.c:749 camlibs/konica/library.c:765
-# camlibs/konica/library.c:780 camlibs/konica/library.c:783
-# camlibs/konica/library.c:993 camlibs/konica/library.c:1023
-# camlibs/sierra/sierra.c:787 camlibs/sierra/sierra.c:793
-# camlibs/sierra/sierra.c:827 camlibs/sierra/sierra.c:833
-# camlibs/sierra/sierra.c:886 camlibs/sierra/sierra.c:893
-# camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:954
-# camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1150
-# camlibs/sierra/sierra.c:1190 camlibs/sierra/sierra.c:1233
-# camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
-# camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
-# camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/ptp2/config.c:2564 camlibs/ptp2/config.c:2582
-#: camlibs/ptp2/config.c:2605 camlibs/ptp2/config.c:7249
-#: camlibs/ptp2/ptp.c:5001
-#, fuzzy, c-format
-msgid "Auto ISO"
-msgstr "自动"
+#: camlibs/ptp2/config.c:2808
+msgid "Silent HS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2566 camlibs/ptp2/config.c:2584
-#: camlibs/ptp2/config.c:2609
-#, fuzzy, c-format
-msgid "Auto ISO Multi Frame Noise Reduction"
-msgstr "曝光补偿"
+#: camlibs/ptp2/config.c:2809
+msgid "Silent LS continuous"
+msgstr ""
 
-#: camlibs/ptp2/config.c:2569 camlibs/ptp2/config.c:2587
+#: camlibs/ptp2/config.c:2883 camlibs/ptp2/config.c:9845
+msgid ""
+"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
+"'shutterspeed' to 'bulb'."
+msgstr ""
+
+#: camlibs/ptp2/config.c:2894
+msgid "Shoot"
+msgstr ""
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:2895
+#, fuzzy
+msgid "Bulb On"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:2896
+msgid "Bulb Off"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2897 camlibs/ptp2/config.c:9304
+msgid "AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2898
+msgid "Cancel AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3042
+#: camlibs/ptp2/library.c:5254
+msgid "Fuji Capture failed: Perhaps no auto-focus?"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2977
+msgid "91 Points (7x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2978
+msgid "325 Points (13x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2979
+msgid "117 Points (9x13)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2980
+msgid "425 Points (17x25)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3109
+#: camlibs/ptp2/config.c:3213
 #, fuzzy, c-format
-msgid "%d Multi Frame Noise Reduction"
+msgid "Multi Frame Noise Reduction"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:2617
+#: camlibs/ptp2/config.c:3205
 #, fuzzy
-msgid "Multi Frame Noise Reduction"
+msgid "Auto ISO Multi Frame Noise Reduction"
 msgstr "曝光补偿"
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:2816 camlibs/ptp2/config.c:2844
-#: camlibs/ptp2/config.c:3688 camlibs/ptp2/config.c:3733
+#: camlibs/ptp2/config.c:3535 camlibs/ptp2/config.c:3563
+#: camlibs/ptp2/config.c:4640 camlibs/ptp2/config.c:4685
+#: camlibs/ptp2/config.c:4726 camlibs/ptp2/config.c:4779
 #, fuzzy, c-format
 msgid "Time"
 msgstr "自动定时"
 
-#: camlibs/ptp2/config.c:2820
+#: camlibs/ptp2/config.c:3539
 #, c-format
 msgid "%0.4fs"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2850
+#: camlibs/ptp2/config.c:3569
 #, c-format
 msgid "%d %d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2853
+#: camlibs/ptp2/config.c:3572
 #, c-format
 msgid "%d/%d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:2856
+#: camlibs/ptp2/config.c:3575 camlibs/ptp2/config.c:3652
 #, c-format
 msgid "%f"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3038
+#: camlibs/ptp2/config.c:3822
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3039
+#: camlibs/ptp2/config.c:3823
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3047 camlibs/ptp2/config.c:3283
-#: camlibs/ptp2/ptp.c:5660
+#: camlibs/ptp2/config.c:3831 camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/ptp.c:7876
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3253
-#: camlibs/ptp2/config.c:3272
+#: camlibs/ptp2/config.c:3832 camlibs/ptp2/config.c:4096
+#: camlibs/ptp2/config.c:4115
 msgid "Children"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:3049
+#: camlibs/ptp2/config.c:3833
 #, fuzzy
 msgid "Automatic (No Flash)"
 msgstr "自动\n"
 
-#: camlibs/ptp2/config.c:3051
+#: camlibs/ptp2/config.c:3834 camlibs/ptp2/config.c:4099
+msgid "U1"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3835 camlibs/ptp2/config.c:4100
+msgid "U2"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3836
+msgid "U3"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3838
 msgid "Intelligent Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3052
+#: camlibs/ptp2/config.c:3839
 msgid "Superior Auto"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3053 camlibs/ptp2/ptp.c:5446
-msgid "Movie"
-msgstr ""
+#: camlibs/ptp2/config.c:3840
+#, fuzzy
+msgid "Movie (P)"
+msgstr "音效"
+
+#: camlibs/ptp2/config.c:3841
+#, fuzzy
+msgid "Movie (A)"
+msgstr "音效"
+
+#: camlibs/ptp2/config.c:3842
+#, fuzzy
+msgid "Movie (S)"
+msgstr "音效"
+
+#: camlibs/ptp2/config.c:3843
+#, fuzzy
+msgid "Movie (M)"
+msgstr "音效"
+
+#: camlibs/ptp2/config.c:3844
+#, fuzzy
+msgid "Movie (Scene)"
+msgstr "音效"
 
-#: camlibs/ptp2/config.c:3054
+#: camlibs/ptp2/config.c:3845
 msgid "Tele-zoom Cont. Priority AE"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3055
+#: camlibs/ptp2/config.c:3846
 msgid "Sweep Panorama"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3056
+#: camlibs/ptp2/config.c:3847
 msgid "Intelligent Auto Flash Off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3057
+#: camlibs/ptp2/config.c:3848
 msgid "Sports Action"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3072
+#: camlibs/ptp2/config.c:3851 camlibs/ptp2/config.c:3865
 msgid "Sunset"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3061
+#: camlibs/ptp2/config.c:3852
 msgid "Night Scene"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3062
+#: camlibs/ptp2/config.c:3853
 msgid "Hand-held Twilight"
 msgstr ""
 
+#: camlibs/ptp2/config.c:3855
+msgid "Anti Motion Blur"
+msgstr ""
+
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:3064 camlibs/ptp2/ptp.c:5443
+#: camlibs/ptp2/config.c:3856 camlibs/ptp2/ptp.c:7547
 #, fuzzy
 msgid "Picture Effect"
 msgstr "照片设置"
 
-#: camlibs/ptp2/config.c:3069
+#: camlibs/ptp2/config.c:3857
+msgid "S&Q"
+msgstr ""
+
+#: camlibs/ptp2/config.c:3862
 msgid "Night landscape"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3070
+#: camlibs/ptp2/config.c:3863
 msgid "Party/Indoor"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3071
+#: camlibs/ptp2/config.c:3864
 msgid "Beach/Snow"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3073
+#: camlibs/ptp2/config.c:3866
 msgid "Dusk/Dawn"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/config.c:3074
+#: camlibs/ptp2/config.c:3867
 #, fuzzy
 msgid "Pet Portrait"
 msgstr "对比度-"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/config.c:3075
+#: camlibs/ptp2/config.c:3868
 #, fuzzy
 msgid "Candlelight"
 msgstr "日光"
 
-#: camlibs/ptp2/config.c:3076
+#: camlibs/ptp2/config.c:3869
 msgid "Blossom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3077
+#: camlibs/ptp2/config.c:3870
 msgid "Autumn colors"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3078
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
+#: camlibs/ptp2/config.c:3875
 msgid "Child"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3084
+#: camlibs/ptp2/config.c:3877
 msgid "Close up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3093
+#: camlibs/ptp2/config.c:3886
 msgid "A6400 (160-6400)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3094
+#: camlibs/ptp2/config.c:3887
 msgid "A3200 (160-3200)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3095
+#: camlibs/ptp2/config.c:3888
 msgid "A800 (160-800)"
 msgstr ""
 
-# camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
-# camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:3213
-#, fuzzy
-msgid "Flourescent"
-msgstr "荧光"
-
-#: camlibs/ptp2/config.c:3220
+#: camlibs/ptp2/config.c:4015
 msgid "Water"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3227
+#: camlibs/ptp2/config.c:4022 camlibs/ptp2/config.c:4032
+#: camlibs/ptp2/config.c:4039
 msgid "1 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3228
+#: camlibs/ptp2/config.c:4023 camlibs/ptp2/config.c:4033
+#: camlibs/ptp2/config.c:4040
 msgid "2 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3229
+#: camlibs/ptp2/config.c:4024 camlibs/ptp2/config.c:4034
+#: camlibs/ptp2/config.c:4041
 msgid "3 EV"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3238 camlibs/ptp2/config.c:4860
+#: camlibs/ptp2/config.c:4029
+msgid "1/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4030
+msgid "1/2 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4031
+msgid "2/3 EV"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4050 camlibs/ptp2/config.c:4081
+#: camlibs/ptp2/config.c:6762 camlibs/ptp2/config.c:6777
 msgid "Extra high"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3254 camlibs/ptp2/config.c:3273
-msgid "Scene"
+#: camlibs/ptp2/config.c:4055
+msgid "2 images (normal and under)"
 msgstr ""
 
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:3255 camlibs/ptp2/config.c:3274
+#: camlibs/ptp2/config.c:4056
+msgid "2 images (normal and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4057
+msgid "3 images (normal and 2 unders)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4058
+msgid "3 images (normal and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4059
+msgid "3 images (normal, under and over)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4060
+msgid "5 images (normal, 2 unders and 2 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4061
+msgid "7 images (normal, 3 unders and 3 overs)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4062
+msgid "9 images (normal, 4 unders and 4 overs)"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/ptp2/config.c:4063 camlibs/ptp2/config.c:4072
 #, fuzzy
-msgid "Effects"
-msgstr "录制模式"
+msgid "0 image"
+msgstr "图像"
 
-#: camlibs/ptp2/config.c:3256
-msgid "U1"
+#: camlibs/ptp2/config.c:4068
+msgid "2 shots (Off -> User setting)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3257
-msgid "U2"
+#: camlibs/ptp2/config.c:4069
+msgid "3 shots (Off -> Low -> User setting)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4070
+msgid "4 shots (Off -> Low -> Normal -> High)"
 msgstr ""
 
+#: camlibs/ptp2/config.c:4071
+msgid "5 shots (Off -> Low -> Normal -> High -> Extra High)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4097 camlibs/ptp2/config.c:4116
+msgid "Scene"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4117
+#, fuzzy
+msgid "Effects"
+msgstr "录制模式"
+
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/config.c:3285
+#: camlibs/ptp2/config.c:4128
 #, fuzzy
 msgid "Back Light"
 msgstr "高"
 
-#: camlibs/ptp2/config.c:3286
+#: camlibs/ptp2/config.c:4129
 msgid "Panorama"
 msgstr "全景"
 
-#: camlibs/ptp2/config.c:3287
+#: camlibs/ptp2/config.c:4130
 msgid "Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3288
+#: camlibs/ptp2/config.c:4131
 msgid "Tilt-Shift"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3289
+#: camlibs/ptp2/config.c:4132
 msgid "Select Color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:5662 camlibs/ptp2/ptp.c:6106
+#: camlibs/ptp2/config.c:4147 camlibs/ptp2/ptp.c:7878 camlibs/ptp2/ptp.c:8324
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3295
+#: camlibs/ptp2/config.c:4148
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:5664
+#: camlibs/ptp2/config.c:4149 camlibs/ptp2/ptp.c:7880
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3297 camlibs/ptp2/config.c:3305
-#: camlibs/ptp2/ptp.c:5665
+#: camlibs/ptp2/config.c:4150 camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/ptp.c:7881
 msgid "Continuous Low Speed"
 msgstr ""
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:3298 camlibs/ptp2/ptp.c:5666
+#: camlibs/ptp2/config.c:4151 camlibs/ptp2/ptp.c:7882
 #, fuzzy
 msgid "Timer"
 msgstr "自动定时"
 
-#: camlibs/ptp2/config.c:3299 camlibs/ptp2/ptp.c:5668
+#: camlibs/ptp2/config.c:4152 camlibs/ptp2/ptp.c:7884
 msgid "Mirror Up"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3301
+#: camlibs/ptp2/config.c:4154
 msgid "Quick Response Remote"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:4580
-#: camlibs/ptp2/ptp.c:5960
+#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:6405
+#: camlibs/ptp2/ptp.c:8178
 #, fuzzy
 msgid "Delayed Remote"
 msgstr "远程"
 
-#: camlibs/ptp2/config.c:3303
+#: camlibs/ptp2/config.c:4156
 msgid "Quiet Release"
 msgstr ""
 
+#: camlibs/ptp2/config.c:4157
+msgid "Continuous Quiet Release"
+msgstr ""
+
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:3306
+#: camlibs/ptp2/config.c:4160
 #, fuzzy
 msgid "Selftimer 2s"
 msgstr "自动定时"
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:3307
+#: camlibs/ptp2/config.c:4161
 #, fuzzy
 msgid "Selftimer 5s"
 msgstr "自动定时"
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:3308
+#: camlibs/ptp2/config.c:4162
 #, fuzzy
 msgid "Selftimer 10s"
 msgstr "自动定时"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3309
+#: camlibs/ptp2/config.c:4163
 #, fuzzy
 msgid "Selftimer 10s 3 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3310
+#: camlibs/ptp2/config.c:4164
 #, fuzzy
 msgid "Selftimer 10s 5 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3311
+#: camlibs/ptp2/config.c:4165
 #, fuzzy
 msgid "Selftimer 5s 3 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3312
+#: camlibs/ptp2/config.c:4166
 #, fuzzy
 msgid "Selftimer 5s 5 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3313
+#: camlibs/ptp2/config.c:4167
 #, fuzzy
 msgid "Selftimer 2s 3 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
 # camlibs/konica/library.c:799 camlibs/konica/library.c:1028
-#: camlibs/ptp2/config.c:3314
+#: camlibs/ptp2/config.c:4168
 #, fuzzy
 msgid "Selftimer 2s 5 Pictures"
 msgstr "自动定时 (仅用于下一张照片)"
 
-#: camlibs/ptp2/config.c:3316
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/config.c:4169
+#, fuzzy
+msgid "Continuous Hi+ Speed"
+msgstr "快门速度 (秒)"
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/config.c:4170
+#, fuzzy
+msgid "Continuous Med Speed"
+msgstr "快门速度 (秒)"
+
+#: camlibs/ptp2/config.c:4172
 msgid "Bracketing C 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3317
+#: camlibs/ptp2/config.c:4173
 msgid "Bracketing C 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3318
+#: camlibs/ptp2/config.c:4174
 msgid "Bracketing C 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3320
+#: camlibs/ptp2/config.c:4176
 msgid "Bracketing C 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3321
+#: camlibs/ptp2/config.c:4177
 msgid "Bracketing C 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3322
+#: camlibs/ptp2/config.c:4178
 msgid "Bracketing C 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3324
+#: camlibs/ptp2/config.c:4180
 msgid "Bracketing C 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3325
+#: camlibs/ptp2/config.c:4181
 msgid "Bracketing C 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3326
+#: camlibs/ptp2/config.c:4182
 msgid "Bracketing C 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3328
+#: camlibs/ptp2/config.c:4184
 msgid "Bracketing C 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3329
+#: camlibs/ptp2/config.c:4185
 msgid "Bracketing C 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3330
+#: camlibs/ptp2/config.c:4186
 msgid "Bracketing C 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3332
+#: camlibs/ptp2/config.c:4188
 msgid "Bracketing C 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3333
+#: camlibs/ptp2/config.c:4189
 msgid "Bracketing C 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3335
+#: camlibs/ptp2/config.c:4191
 msgid "Bracketing C 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3336
+#: camlibs/ptp2/config.c:4192
 msgid "Bracketing C 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3338
+#: camlibs/ptp2/config.c:4194
 msgid "Bracketing S 0.3 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3339
+#: camlibs/ptp2/config.c:4195
 msgid "Bracketing S 0.3 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3340
+#: camlibs/ptp2/config.c:4196
 msgid "Bracketing S 0.3 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3342
+#: camlibs/ptp2/config.c:4198
 msgid "Bracketing S 0.5 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3343
+#: camlibs/ptp2/config.c:4199
 msgid "Bracketing S 0.5 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3344
+#: camlibs/ptp2/config.c:4200
 msgid "Bracketing S 0.5 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3346
+#: camlibs/ptp2/config.c:4202
 msgid "Bracketing S 0.7 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3347
+#: camlibs/ptp2/config.c:4203
 msgid "Bracketing S 0.7 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3348
+#: camlibs/ptp2/config.c:4204
 msgid "Bracketing S 0.7 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3350
+#: camlibs/ptp2/config.c:4206
 msgid "Bracketing S 1.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3351
+#: camlibs/ptp2/config.c:4207
 msgid "Bracketing S 1.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3352
+#: camlibs/ptp2/config.c:4208
 msgid "Bracketing S 1.0 Steps 9 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3354
+#: camlibs/ptp2/config.c:4210
 msgid "Bracketing S 2.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3355
+#: camlibs/ptp2/config.c:4211
 msgid "Bracketing S 2.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3356
+#: camlibs/ptp2/config.c:4212
 msgid "Bracketing S 3.0 Steps 3 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3357
+#: camlibs/ptp2/config.c:4213
 msgid "Bracketing S 3.0 Steps 5 Pictures"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3358
+#: camlibs/ptp2/config.c:4214
 msgid "Bracketing WB Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3359
+#: camlibs/ptp2/config.c:4215
 msgid "Bracketing DRO Lo"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3360
+#: camlibs/ptp2/config.c:4216
 msgid "Bracketing WB Hi"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3361
+#: camlibs/ptp2/config.c:4217
 msgid "Bracketing DRO Hi"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:3370 camlibs/ptp2/ptp.c:5670
+#: camlibs/ptp2/config.c:4226 camlibs/ptp2/ptp.c:7886
 #, fuzzy
 msgid "Centre-spot"
 msgstr "光圈"
 
-#: camlibs/ptp2/config.c:3371 camlibs/ptp2/ptp.c:5638 camlibs/ptp2/ptp.c:5671
+#: camlibs/ptp2/config.c:4227 camlibs/ptp2/ptp.c:7854 camlibs/ptp2/ptp.c:7887
 msgid "Multi-spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3372 camlibs/ptp2/config.c:3384
-#: camlibs/ptp2/ptp.c:5672
+#: camlibs/ptp2/config.c:4228 camlibs/ptp2/config.c:4240
+#: camlibs/ptp2/ptp.c:7888
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3373 camlibs/ptp2/ptp.c:5673
+#: camlibs/ptp2/config.c:4229 camlibs/ptp2/ptp.c:7889
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3374 camlibs/ptp2/ptp.c:5674
+#: camlibs/ptp2/config.c:4230 camlibs/ptp2/ptp.c:7890
 msgid "Group Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3375
+#: camlibs/ptp2/config.c:4231
 msgid "Single-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3376
+#: camlibs/ptp2/config.c:4232
 msgid "Dynamic-area AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3377
+#: camlibs/ptp2/config.c:4233
 msgid "Group-dynamic AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3378
+#: camlibs/ptp2/config.c:4234
 msgid "Dynamic-area AF with closest subject priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3385
+#: camlibs/ptp2/config.c:4241
 msgid "Dynamic Area (9)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3386
+#: camlibs/ptp2/config.c:4242
 msgid "Dynamic Area (21)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3387
+#: camlibs/ptp2/config.c:4243
 msgid "Dynamic Area (51)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3388
+#: camlibs/ptp2/config.c:4244
 msgid "3D Tracking"
 msgstr ""
 
+#: camlibs/ptp2/config.c:4249
+msgid "Dynamic-area AF (25 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4250
+msgid "Single-point AF"
+msgstr ""
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:4251
+#, fuzzy
+msgid "Auto-area AF"
+msgstr "普通"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:4252
+#, fuzzy
+msgid "3D-tracking"
+msgstr "曝光测定"
+
+#: camlibs/ptp2/config.c:4253
+msgid "Dynamic-area AF (72 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4254
+msgid "Dynamic-area AF (153 points)"
+msgstr ""
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:4255
+#, fuzzy
+msgid "Group-area AF"
+msgstr "普通"
+
+#: camlibs/ptp2/config.c:4256
+msgid "Dynamic-area AF (9 points)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4258
+msgid "Pinpoint AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4259
+msgid "Wide-area AF (S)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4260
+msgid "Wide-area AF (L)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4261
+msgid "Wide-area AF (C1)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4262
+msgid "Wide-area AF (C2)"
+msgstr ""
+
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/config.c:3394
+#: camlibs/ptp2/config.c:4267
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "对比度-"
 
-#: camlibs/ptp2/config.c:3395 camlibs/ptp2/config.c:3402
-#: camlibs/ptp2/config.c:3408
+#: camlibs/ptp2/config.c:4268 camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:4281
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3396
+#: camlibs/ptp2/config.c:4269
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3401 camlibs/ptp2/config.c:3407
+#: camlibs/ptp2/config.c:4274 camlibs/ptp2/config.c:4280
 msgid "sRGB"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3449
+#: camlibs/ptp2/config.c:4321
 #, fuzzy, c-format
 msgid "Unknown value 0x%04x"
 msgstr "未知 (0x%02x)"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:3469 camlibs/ptp2/ptp.c:5822
+#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:8040
 #, fuzzy
 msgid "Centre"
 msgstr "光圈"
 
-#: camlibs/ptp2/config.c:3470 camlibs/ptp2/ptp.c:5823
+#: camlibs/ptp2/config.c:4342 camlibs/ptp2/ptp.c:8041
 msgid "Top"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
-#: camlibs/ptp2/config.c:3471 camlibs/ptp2/ptp.c:5824
+#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:8042
 #, fuzzy
 msgid "Bottom"
 msgstr "缩放"
 
-#: camlibs/ptp2/config.c:3472 camlibs/ptp2/ptp.c:5825
+#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:8043
 msgid "Left"
 msgstr ""
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:5826
+#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:8044
 #, fuzzy
 msgid "Right"
 msgstr "高"
 
-#: camlibs/ptp2/config.c:3480 camlibs/sierra/olympus-desc.c:790
+#: camlibs/ptp2/config.c:4350 camlibs/sierra/nikon-desc.c:535
+msgid "Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4351
+msgid "Zone"
+msgstr ""
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:4352 camlibs/ptp2/config.c:4378
+#, fuzzy
+msgid "Center"
+msgstr "光圈"
+
+#: camlibs/ptp2/config.c:4353
+msgid "Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4354
+msgid "Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4355
+msgid "Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4356
+msgid "Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4357
+msgid "Lock-on AF: Wide"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4358
+msgid "Lock-on AF: Zone"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4359
+msgid "Lock-on AF: Center"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4360
+msgid "Lock-on AF: Flexible Spot: S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4361
+msgid "Lock-on AF: Flexible Spot: M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4362
+msgid "Lock-on AF: Flexible Spot: L"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4363
+msgid "Lock-on AF: Expand Flexible Spot"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4369 camlibs/sierra/olympus-desc.c:783
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3481
+#: camlibs/ptp2/config.c:4370
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3482
+#: camlibs/ptp2/config.c:4371
 msgid "Center Spot"
 msgstr ""
 
+#: camlibs/ptp2/config.c:4373 camlibs/sierra/olympus-desc.c:785
+msgid "ESP"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4374
+msgid "Spot+Highlights"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4375
+msgid "Spot+Shadows"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4377
+msgid "Multi"
+msgstr ""
+
+#: camlibs/ptp2/config.c:4379
+msgid "Entire Screen Avg."
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:788
+# camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
+# camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
+# camlibs/sierra/sierra.c:1680
+#: camlibs/ptp2/config.c:4380
+#, fuzzy
+msgid "Spot Standard"
+msgstr "标准"
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/ptp2/config.c:4381
+#, fuzzy
+msgid "Spot Large"
+msgstr "图像"
+
+# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
+# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
+# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
+#: camlibs/ptp2/config.c:4382
+#, fuzzy
+msgid "Highlight"
+msgstr "高"
+
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:3489
+#: camlibs/ptp2/config.c:4387
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "自动\n"
 
 # camlibs/dimera/dimera3500.c:533 camlibs/konica/library.c:744
 # camlibs/konica/library.c:984
-#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:5643
+#: camlibs/ptp2/config.c:4389 camlibs/ptp2/ptp.c:7859
 #, fuzzy
 msgid "Fill flash"
 msgstr "闪光灯"
@@ -6127,18 +7530,18 @@
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/config.c:3492
+#: camlibs/ptp2/config.c:4390
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "消红眼"
 
-#: camlibs/ptp2/config.c:3493
+#: camlibs/ptp2/config.c:4391
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "红眼闪光灯"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/config.c:3494 camlibs/ptp2/ptp.c:5646
+#: camlibs/ptp2/config.c:4392 camlibs/ptp2/ptp.c:7862
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
@@ -6146,31 +7549,31 @@
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/ptp2/config.c:3496 camlibs/ptp2/ptp.c:5648
+#: camlibs/ptp2/config.c:4394 camlibs/ptp2/ptp.c:7864
 #, fuzzy
 msgid "Auto Slow Sync"
 msgstr "慢同步"
 
-#: camlibs/ptp2/config.c:3497 camlibs/ptp2/ptp.c:5649
+#: camlibs/ptp2/config.c:4395 camlibs/ptp2/ptp.c:7865
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/config.c:3498 camlibs/ptp2/ptp.c:5650
+#: camlibs/ptp2/config.c:4396 camlibs/ptp2/ptp.c:7866
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "消红眼"
 
-#: camlibs/ptp2/config.c:3499
+#: camlibs/ptp2/config.c:4397
 msgid "Front-curtain sync"
 msgstr ""
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/config.c:3500
+#: camlibs/ptp2/config.c:4398
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "消红眼"
@@ -6178,7 +7581,7 @@
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/config.c:3501
+#: camlibs/ptp2/config.c:4399
 #, fuzzy
 msgid "Red-eye reduction with slow sync"
 msgstr "消红眼"
@@ -6186,102 +7589,109 @@
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/ptp2/config.c:3502
+#: camlibs/ptp2/config.c:4400
 #, fuzzy
 msgid "Slow sync"
 msgstr "慢同步"
 
-#: camlibs/ptp2/config.c:3503
+#: camlibs/ptp2/config.c:4401
 msgid "Rear-curtain with slow sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3504
+#: camlibs/ptp2/config.c:4402
 msgid "Rear-curtain sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3506
+#: camlibs/ptp2/config.c:4404
 msgid "Rear Curtain Sync"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3507
+#: camlibs/ptp2/config.c:4405
 msgid "Wireless Sync"
 msgstr ""
 
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/ptp2/config.c:3508 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1340 camlibs/sierra/sierra.c:1551
-#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1790
+#: camlibs/ptp2/config.c:4406 camlibs/sierra/epson-desc.c:141
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1025
+#: camlibs/sierra/sierra.c:1327 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1777
 msgid "Slow Sync"
 msgstr "慢同步"
 
-# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
-# camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/config.c:3514 camlibs/ricoh/library.c:330
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "黑白"
-
-#: camlibs/ptp2/config.c:3520
+#: camlibs/ptp2/config.c:4418
 msgid "Night Vision"
 msgstr ""
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/ptp2/config.c:3521
+#: camlibs/ptp2/config.c:4419
 #, fuzzy
 msgid "Color sketch"
 msgstr "彩色模式"
 
-#: camlibs/ptp2/config.c:3522
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3523
+#: camlibs/ptp2/config.c:4421
 msgid "Selective color"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3524
+#: camlibs/ptp2/config.c:4422
 msgid "Silhouette"
 msgstr ""
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/config.c:3525
+#: camlibs/ptp2/config.c:4423
 #, fuzzy
 msgid "High key"
 msgstr "高"
 
-#: camlibs/ptp2/config.c:3526
+#: camlibs/ptp2/config.c:4424
 msgid "Low key"
 msgstr ""
 
+#: camlibs/ptp2/config.c:4527 camlibs/ptp2/config.c:4565
+#: camlibs/ptp2/config.c:4573 camlibs/ptp2/config.c:4611
+#, c-format
+msgid "%d mm"
+msgstr ""
+
 # camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
 # camlibs/sierra/sierra.c:1258
-#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3655
+#: camlibs/ptp2/config.c:4563 camlibs/ptp2/config.c:4607
 #, fuzzy
 msgid "infinite"
 msgstr "无限/鱼眼"
 
-#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3621
-#: camlibs/ptp2/config.c:3659
+#: camlibs/ptp2/config.c:4636 camlibs/ptp2/config.c:4681
 #, c-format
-msgid "%d mm"
+msgid "x 200"
 msgstr ""
 
-#: camlibs/ptp2/config.c:3684 camlibs/ptp2/config.c:3729
-#, c-format
-msgid "x 200"
+#: camlibs/ptp2/config.c:4722 camlibs/ptp2/config.c:4775
+#, fuzzy, c-format
+msgid "Composite"
+msgstr "压缩"
+
+#: camlibs/ptp2/config.c:4993 camlibs/ptp2/config.c:5733
+#: camlibs/ptp2/config.c:5794
+msgid "bulb"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4069
+# camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
+# camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
+# camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
+#: camlibs/ptp2/config.c:5050
+#, fuzzy
+msgid "Sync"
+msgstr "慢同步"
+
+#: camlibs/ptp2/config.c:5609 camlibs/ptp2/config.c:5639
 msgid "Face-priority AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4070
+#: camlibs/ptp2/config.c:5610 camlibs/ptp2/config.c:5640
 msgid "Wide-area AF"
 msgstr ""
 
@@ -6293,20 +7703,72 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:4071
+#: camlibs/ptp2/config.c:5611 camlibs/ptp2/config.c:5641
 #, fuzzy
 msgid "Normal-area AF"
 msgstr "普通"
 
-#: camlibs/ptp2/config.c:4072
+#: camlibs/ptp2/config.c:5612 camlibs/ptp2/config.c:5642
 msgid "Subject-tracking AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4077
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:5613 camlibs/ptp2/config.c:5643
+#, fuzzy
+msgid "Spot-area AF"
+msgstr "普通"
+
+# camlibs/polaroid/pdc700.c:171
+#: camlibs/ptp2/config.c:5619 camlibs/ptp2/config.c:5629
+#, fuzzy
+msgid "Entire Display"
+msgstr "播放"
+
+#: camlibs/ptp2/config.c:5620 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7313
+msgid "25%"
+msgstr "25%"
+
+#: camlibs/ptp2/config.c:5621 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7310
+msgid "50%"
+msgstr "50%"
+
+#: camlibs/ptp2/config.c:5622 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7311
+msgid "100%"
+msgstr "100%"
+
+#: camlibs/ptp2/config.c:5623
+msgid "200%"
+msgstr "200%"
+
+#: camlibs/ptp2/config.c:5631
+msgid "33%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5633
+msgid "66%"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5648
 msgid "Single-servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4078
+# camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
+#: camlibs/ptp2/config.c:5649
+#, fuzzy
+msgid "Continuous-servo AF"
+msgstr "场景测量模式"
+
+#: camlibs/ptp2/config.c:5650
 msgid "Full-time-servo AF"
 msgstr ""
 
@@ -6318,753 +7780,865 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:4079 camlibs/ptp2/ptp.c:5630
+#: camlibs/ptp2/config.c:5651
 #, fuzzy
-msgid "Manual Focus"
+msgid "Manual Focus (fixed)"
+msgstr "无手册"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:5652
+#, fuzzy
+msgid "Manual Focus (selection)"
 msgstr "无手册"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:4092 camlibs/ptp2/ptp.c:5726
+#: camlibs/ptp2/config.c:5665 camlibs/ptp2/ptp.c:7944
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:4093 camlibs/ptp2/ptp.c:5728
+#: camlibs/ptp2/config.c:5666 camlibs/ptp2/ptp.c:7946
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4094
+#: camlibs/ptp2/config.c:5667
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4095 camlibs/ptp2/ptp.c:5729
+#: camlibs/ptp2/config.c:5668 camlibs/ptp2/ptp.c:7947
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4096 camlibs/ptp2/ptp.c:5730
+#: camlibs/ptp2/config.c:5669 camlibs/ptp2/ptp.c:7948
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4097
+#: camlibs/ptp2/config.c:5670
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4103 camlibs/ptp2/config.c:4121
-#: camlibs/ptp2/ptp.c:5743 camlibs/ptp2/ptp.c:5746
+#: camlibs/ptp2/config.c:5676 camlibs/ptp2/config.c:5694
+#: camlibs/ptp2/ptp.c:7961 camlibs/ptp2/ptp.c:7964
 msgid "20 seconds"
-msgstr ""
+msgstr "20 秒"
 
-#: camlibs/ptp2/config.c:4104 camlibs/ptp2/config.c:4212
-#: camlibs/ptp2/config.c:4986 camlibs/ptp2/ptp.c:5747
-#, fuzzy
+#: camlibs/ptp2/config.c:5677 camlibs/ptp2/config.c:5869
+#: camlibs/ptp2/config.c:6999 camlibs/ptp2/ptp.c:7965
 msgid "1 minute"
-msgstr "41 mm"
+msgstr "1 分钟"
 
-#: camlibs/ptp2/config.c:4105 camlibs/ptp2/config.c:4213
-#: camlibs/ptp2/config.c:4987 camlibs/ptp2/ptp.c:5748
+#: camlibs/ptp2/config.c:5678 camlibs/ptp2/config.c:5870
+#: camlibs/ptp2/config.c:7000 camlibs/ptp2/ptp.c:7966
 msgid "5 minutes"
-msgstr ""
+msgstr "5 分钟"
 
-#: camlibs/ptp2/config.c:4106 camlibs/ptp2/config.c:4214
-#: camlibs/ptp2/config.c:4988 camlibs/ptp2/ptp.c:5749
-#, fuzzy
+#: camlibs/ptp2/config.c:5679 camlibs/ptp2/config.c:5871
+#: camlibs/ptp2/config.c:7001 camlibs/ptp2/ptp.c:7967
 msgid "10 minutes"
-msgstr "41 mm"
+msgstr "10 分钟"
 
-#: camlibs/ptp2/config.c:4107 camlibs/ptp2/config.c:4119
-#: camlibs/ptp2/ptp.c:5741 camlibs/ptp2/ptp.c:5750
+#: camlibs/ptp2/config.c:5680 camlibs/ptp2/config.c:5692
+#: camlibs/ptp2/ptp.c:7959 camlibs/ptp2/ptp.c:7968
 msgid "5 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4113
-msgid "SDRAM"
-msgstr "SDRAM"
+msgstr "5 秒"
 
-#: camlibs/ptp2/config.c:4126
+#: camlibs/ptp2/config.c:5699
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4127
+#: camlibs/ptp2/config.c:5700 camlibs/ptp2/config.c:5708
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/config.c:4128
+#: camlibs/ptp2/config.c:5701
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4129
+#: camlibs/ptp2/config.c:5702 camlibs/ptp2/config.c:5709
 msgid "12 mm"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4135
+#: camlibs/ptp2/config.c:5710
+msgid "15 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5711
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5717
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4136
+#: camlibs/ptp2/config.c:5718
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4137
+#: camlibs/ptp2/config.c:5719
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4138
+#: camlibs/ptp2/config.c:5720
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4139
+#: camlibs/ptp2/config.c:5721
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4140
+#: camlibs/ptp2/config.c:5722
 msgid "1/2"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
-#: camlibs/ptp2/config.c:4141
+#: camlibs/ptp2/config.c:5723
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
 # camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
-#: camlibs/ptp2/config.c:4142 camlibs/ptp2/config.c:5056
+#: camlibs/ptp2/config.c:5724 camlibs/ptp2/config.c:7071
 #, fuzzy
 msgid "2"
 msgstr "2x"
 
-#: camlibs/ptp2/config.c:4143 camlibs/ptp2/config.c:5054
+#: camlibs/ptp2/config.c:5725 camlibs/ptp2/config.c:7069
 #, fuzzy
 msgid "4"
 msgstr "4x"
 
-#: camlibs/ptp2/config.c:4144
+#: camlibs/ptp2/config.c:5726
 #, fuzzy
 msgid "8"
 msgstr "8x"
 
-#: camlibs/ptp2/config.c:4145
+#: camlibs/ptp2/config.c:5727
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/config.c:4146
+#: camlibs/ptp2/config.c:5728
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4151
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4152 camlibs/ptp2/config.c:5096
+#: camlibs/ptp2/config.c:5734 camlibs/ptp2/config.c:7111
 msgid "30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4153
+#: camlibs/ptp2/config.c:5735
 msgid "25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4154
+#: camlibs/ptp2/config.c:5736
 #, fuzzy
 msgid "20s"
 msgstr "2.0"
 
-#: camlibs/ptp2/config.c:4155 camlibs/ptp2/config.c:5095
+#: camlibs/ptp2/config.c:5737 camlibs/ptp2/config.c:7110
 #, fuzzy
 msgid "15s"
 msgstr "1.5"
 
-#: camlibs/ptp2/config.c:4156
+#: camlibs/ptp2/config.c:5738
 msgid "13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4157
+#: camlibs/ptp2/config.c:5739
 #, fuzzy
 msgid "10s"
 msgstr "1.0"
 
-#: camlibs/ptp2/config.c:4158 camlibs/ptp2/config.c:5094
+#: camlibs/ptp2/config.c:5740 camlibs/ptp2/config.c:7109
 msgid "8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4159
+#: camlibs/ptp2/config.c:5741
 msgid "6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4160
+#: camlibs/ptp2/config.c:5742
 msgid "5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4161 camlibs/ptp2/config.c:5093
+#: camlibs/ptp2/config.c:5743 camlibs/ptp2/config.c:7108
 msgid "4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4162
+#: camlibs/ptp2/config.c:5744
 msgid "3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4163
+#: camlibs/ptp2/config.c:5745
 msgid "2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4164 camlibs/ptp2/config.c:5092
+#: camlibs/ptp2/config.c:5746 camlibs/ptp2/config.c:7107
 msgid "2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4165
+#: camlibs/ptp2/config.c:5747
 msgid "1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4166
+#: camlibs/ptp2/config.c:5748
 msgid "1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4167 camlibs/ptp2/config.c:5091
+#: camlibs/ptp2/config.c:5749 camlibs/ptp2/config.c:7106
 msgid "1s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4168
+#: camlibs/ptp2/config.c:5750
 msgid "1/1.3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4169
+#: camlibs/ptp2/config.c:5751
 msgid "1/1.6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4170 camlibs/ptp2/config.c:5090
+#: camlibs/ptp2/config.c:5752 camlibs/ptp2/config.c:7105
 msgid "1/2s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4171
+#: camlibs/ptp2/config.c:5753
 msgid "1/2.5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4172
+#: camlibs/ptp2/config.c:5754
 msgid "1/3s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4173 camlibs/ptp2/config.c:5089
+#: camlibs/ptp2/config.c:5755 camlibs/ptp2/config.c:7104
 msgid "1/4s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4174
+#: camlibs/ptp2/config.c:5756
 msgid "1/5s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4175
+#: camlibs/ptp2/config.c:5757
 msgid "1/6s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4176 camlibs/ptp2/config.c:5088
+#: camlibs/ptp2/config.c:5758 camlibs/ptp2/config.c:7103
 msgid "1/8s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4177
+#: camlibs/ptp2/config.c:5759
 msgid "1/10s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4178
+#: camlibs/ptp2/config.c:5760
 msgid "1/13s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4179 camlibs/ptp2/config.c:5087
+#: camlibs/ptp2/config.c:5761 camlibs/ptp2/config.c:7102
 msgid "1/15s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4180
+#: camlibs/ptp2/config.c:5762
 msgid "1/20s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4181
+#: camlibs/ptp2/config.c:5763
 msgid "1/25s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4182 camlibs/ptp2/config.c:5086
+#: camlibs/ptp2/config.c:5764 camlibs/ptp2/config.c:7101
 msgid "1/30s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4183
+#: camlibs/ptp2/config.c:5765
 msgid "1/40s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4184
+#: camlibs/ptp2/config.c:5766
 msgid "1/50s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4185 camlibs/ptp2/config.c:5014
-#: camlibs/ptp2/config.c:5027 camlibs/ptp2/config.c:5085
+#: camlibs/ptp2/config.c:5767 camlibs/ptp2/config.c:7029
+#: camlibs/ptp2/config.c:7042 camlibs/ptp2/config.c:7100
 msgid "1/60s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4186 camlibs/ptp2/config.c:5013
-#: camlibs/ptp2/config.c:5026
+#: camlibs/ptp2/config.c:5768 camlibs/ptp2/config.c:7028
+#: camlibs/ptp2/config.c:7041
 msgid "1/80s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4187 camlibs/ptp2/config.c:5012
-#: camlibs/ptp2/config.c:5025
+#: camlibs/ptp2/config.c:5769 camlibs/ptp2/config.c:7027
+#: camlibs/ptp2/config.c:7040
 msgid "1/100s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:5011
-#: camlibs/ptp2/config.c:5024
+#: camlibs/ptp2/config.c:5770 camlibs/ptp2/config.c:7026
+#: camlibs/ptp2/config.c:7039
 msgid "1/125s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4189 camlibs/ptp2/config.c:5010
-#: camlibs/ptp2/config.c:5023
+#: camlibs/ptp2/config.c:5771 camlibs/ptp2/config.c:7025
+#: camlibs/ptp2/config.c:7038
 msgid "1/160s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4190 camlibs/ptp2/config.c:5009
-#: camlibs/ptp2/config.c:5022
+#: camlibs/ptp2/config.c:5772 camlibs/ptp2/config.c:7024
+#: camlibs/ptp2/config.c:7037
 msgid "1/200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4191 camlibs/ptp2/config.c:5008
-#: camlibs/ptp2/config.c:5021
+#: camlibs/ptp2/config.c:5773 camlibs/ptp2/config.c:7023
+#: camlibs/ptp2/config.c:7036
 msgid "1/250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4192
+#: camlibs/ptp2/config.c:5774
 msgid "1/320s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4193
+#: camlibs/ptp2/config.c:5775
 msgid "1/400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4194
+#: camlibs/ptp2/config.c:5776
 msgid "1/500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4195
+#: camlibs/ptp2/config.c:5777
 msgid "1/640s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4196
+#: camlibs/ptp2/config.c:5778
 msgid "1/800s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4197
+#: camlibs/ptp2/config.c:5779
 msgid "1/1000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4198 camlibs/ptp2/config.c:4199
+#: camlibs/ptp2/config.c:5780 camlibs/ptp2/config.c:5781
 msgid "1/1250s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4200
+#: camlibs/ptp2/config.c:5782
 msgid "1/1600s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4201
+#: camlibs/ptp2/config.c:5783
 msgid "1/2000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4202
+#: camlibs/ptp2/config.c:5784
 msgid "1/2500s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4203
+#: camlibs/ptp2/config.c:5785
 msgid "1/3200s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4204
+#: camlibs/ptp2/config.c:5786
 msgid "1/4000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4205
+#: camlibs/ptp2/config.c:5787
 msgid "1/5000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4206
+#: camlibs/ptp2/config.c:5788
 msgid "1/6400s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4207
+#: camlibs/ptp2/config.c:5789
 msgid "1/8000s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4215
+#: camlibs/ptp2/config.c:5872
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/config.c:4222 camlibs/ptp2/ptp.c:5852
+#: camlibs/ptp2/config.c:5879 camlibs/ptp2/ptp.c:8070
 #, fuzzy
 msgid "Sharper"
 msgstr "正在充电"
 
-#: camlibs/ptp2/config.c:4223 camlibs/ptp2/ptp.c:5853
+#: camlibs/ptp2/config.c:5880 camlibs/ptp2/ptp.c:8071
 msgid "Softer"
 msgstr ""
 
 # libgphoto2/gphoto2-result.c:49
-#: camlibs/ptp2/config.c:4224 camlibs/ptp2/ptp.c:5854
+#: camlibs/ptp2/config.c:5881 camlibs/ptp2/ptp.c:8072
 #, fuzzy
 msgid "Direct Print"
 msgstr "目录存在"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:4235 camlibs/ptp2/config.c:4246
-#: camlibs/ptp2/ptp.c:5681 camlibs/ptp2/ptp.c:5689
+#: camlibs/ptp2/config.c:5892 camlibs/ptp2/config.c:5903
+#: camlibs/ptp2/ptp.c:7899 camlibs/ptp2/ptp.c:7907
 #, fuzzy
 msgid "Medium Low"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:4236 camlibs/ptp2/ptp.c:5682
+#: camlibs/ptp2/config.c:5893 camlibs/ptp2/ptp.c:7900
 #, fuzzy
 msgid "Medium high"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/config.c:4245 camlibs/ptp2/ptp.c:5688
+#: camlibs/ptp2/config.c:5902 camlibs/ptp2/ptp.c:7906
 #, fuzzy
 msgid "Low contrast"
 msgstr "对比度-"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/config.c:4247 camlibs/ptp2/ptp.c:5690
+#: camlibs/ptp2/config.c:5904 camlibs/ptp2/ptp.c:7908
 #, fuzzy
 msgid "Medium High"
 msgstr "中"
 
-#: camlibs/ptp2/config.c:4248 camlibs/ptp2/ptp.c:5691
+#: camlibs/ptp2/config.c:5905 camlibs/ptp2/ptp.c:7909
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4257 camlibs/ptp2/ptp.c:6072
+#: camlibs/ptp2/config.c:5914 camlibs/ptp2/ptp.c:8290
 msgid "Zone Focus (Close-up)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4258 camlibs/ptp2/ptp.c:6073
+#: camlibs/ptp2/config.c:5915 camlibs/ptp2/ptp.c:8291
 msgid "Zone Focus (Very Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4259 camlibs/ptp2/ptp.c:6074
+#: camlibs/ptp2/config.c:5916 camlibs/ptp2/ptp.c:8292
 msgid "Zone Focus (Close)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4260 camlibs/ptp2/ptp.c:6075
+#: camlibs/ptp2/config.c:5917 camlibs/ptp2/ptp.c:8293
 msgid "Zone Focus (Medium)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4261 camlibs/ptp2/ptp.c:6076
+#: camlibs/ptp2/config.c:5918 camlibs/ptp2/ptp.c:8294
 msgid "Zone Focus (Far)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4262
+#: camlibs/ptp2/config.c:5919
 msgid "Zone Focus (Reserved 1)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4263
+#: camlibs/ptp2/config.c:5920
 msgid "Zone Focus (Reserved 2)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4264
+#: camlibs/ptp2/config.c:5921
 msgid "Zone Focus (Reserved 3)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4265
+#: camlibs/ptp2/config.c:5922
 msgid "Zone Focus (Reserved 4)"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:4275
+#: camlibs/ptp2/config.c:5932
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自动\n"
 
-#: camlibs/ptp2/config.c:4279
+#: camlibs/ptp2/config.c:5936
+msgid "AF-F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5937
 msgid "Single-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4280
+#: camlibs/ptp2/config.c:5938
 msgid "Continuous-Servo AF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4284
+#: camlibs/ptp2/config.c:5940
+msgid "C-AF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5941
+msgid "S-AF+MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:5945
 msgid "DMF"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4317
+#: camlibs/ptp2/config.c:5980
 msgid "One Shot"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4318 camlibs/ptp2/ptp.c:6107
+#: camlibs/ptp2/config.c:5981 camlibs/ptp2/ptp.c:8325
 msgid "AI Servo"
 msgstr ""
 
 # camlibs/konica/library.c:777 camlibs/konica/library.c:1010
-#: camlibs/ptp2/config.c:4319 camlibs/ptp2/ptp.c:6108
+#: camlibs/ptp2/config.c:5982 camlibs/ptp2/ptp.c:8326
 #, fuzzy
 msgid "AI Focus"
 msgstr "聚焦"
 
-#: camlibs/ptp2/config.c:4327 camlibs/ptp2/config.c:4981
-#: camlibs/ptp2/ptp.c:5733
+#: camlibs/ptp2/config.c:5990 camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/ptp.c:7951
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4328 camlibs/ptp2/config.c:4983
-#: camlibs/ptp2/ptp.c:5735
+#: camlibs/ptp2/config.c:5991 camlibs/ptp2/config.c:6996
+#: camlibs/ptp2/ptp.c:7953
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4329
+#: camlibs/ptp2/config.c:5992
 msgid "Hold"
 msgstr ""
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:4341 camlibs/ptp2/ptp.c:6093 camlibs/ptp2/ptp.c:6099
+#: camlibs/ptp2/config.c:6004 camlibs/ptp2/ptp.c:8311 camlibs/ptp2/ptp.c:8317
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:4343 camlibs/ptp2/ptp.c:6095
+#: camlibs/ptp2/config.c:6006 camlibs/ptp2/ptp.c:8313
 #, fuzzy
 msgid "Custom Whitebalance PC-1"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:4344 camlibs/ptp2/ptp.c:6096
+#: camlibs/ptp2/config.c:6007 camlibs/ptp2/ptp.c:8314
 #, fuzzy
 msgid "Custom Whitebalance PC-2"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:4345 camlibs/ptp2/ptp.c:6097
+#: camlibs/ptp2/config.c:6008 camlibs/ptp2/ptp.c:8315
 #, fuzzy
 msgid "Custom Whitebalance PC-3"
 msgstr "白平衡"
 
-#: camlibs/ptp2/config.c:4346 camlibs/ptp2/ptp.c:6098
+#: camlibs/ptp2/config.c:6009 camlibs/ptp2/ptp.c:8316
 msgid "Missing Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4362
+#: camlibs/ptp2/config.c:6024 camlibs/ptp2/config.c:9158
 msgid "Shadow"
 msgstr ""
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:4366
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:6026
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "定制"
+msgid "Custom Whitebalance: PC-1"
+msgstr "白平衡"
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:4367
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:6027
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "定制"
+msgid "Custom Whitebalance: PC-2"
+msgstr "白平衡"
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:4368
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:6028
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "定制"
+msgid "Custom Whitebalance: PC-3"
+msgstr "白平衡"
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:4369
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:6030
 #, fuzzy
-msgid "Custom WB 5"
-msgstr "定制"
+msgid "Manual 3"
+msgstr "无手册"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:6031
+#, fuzzy
+msgid "Manual 4"
+msgstr "无手册"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:6032
+#, fuzzy
+msgid "Manual 5"
+msgstr "无手册"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:6033
+#, fuzzy
+msgid "Custom Whitebalance: PC-4"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:6034
+#, fuzzy
+msgid "Custom Whitebalance: PC-5"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:6035
+#, fuzzy
+msgid "AWB White"
+msgstr "黑白"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/config.c:4456
+#: camlibs/ptp2/config.c:6122
 #, fuzzy
 msgid "Low sharpening"
 msgstr "正在充电"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/config.c:4458
+#: camlibs/ptp2/config.c:6124
 #, fuzzy
 msgid "Black & white"
 msgstr "黑白"
 
-#: camlibs/ptp2/config.c:4464
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:6131
+#, fuzzy
+msgid "AE bracket"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:6132
+#, fuzzy
+msgid "ISO bracket"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:6133
+#, fuzzy
+msgid "WB bracket"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:6134
+#, fuzzy
+msgid "FE bracket"
+msgstr "曝光测定"
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:6135
+#, fuzzy
+msgid "Bracket off"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:6140
 msgid "implicit auto"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:533
-#: camlibs/ptp2/config.c:4556 camlibs/ptp2/ptp.c:5774
+#: camlibs/ptp2/config.c:6381 camlibs/ptp2/ptp.c:7992
 #, fuzzy
 msgid "AE & Flash"
 msgstr "无闪光灯"
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/ptp2/config.c:4557 camlibs/ptp2/ptp.c:5775
+#: camlibs/ptp2/config.c:6382 camlibs/ptp2/ptp.c:7993
 #, fuzzy
 msgid "AE only"
 msgstr "就绪"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:4558 camlibs/ptp2/config.c:4720
-#: camlibs/ptp2/ptp.c:5776
+#: camlibs/ptp2/config.c:6383 camlibs/ptp2/config.c:6565
+#: camlibs/ptp2/ptp.c:7994
 #, fuzzy
 msgid "Flash only"
 msgstr "闪光灯模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:4559 camlibs/ptp2/ptp.c:5777
+#: camlibs/ptp2/config.c:6384 camlibs/ptp2/ptp.c:7995
 #, fuzzy
 msgid "WB bracketing"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:4560
+#: camlibs/ptp2/config.c:6385
 #, fuzzy
 msgid "ADL bracketing"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/config.c:4566
+#: camlibs/ptp2/config.c:6391
 msgid "Startup"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4567
+#: camlibs/ptp2/config.c:6392
 msgid "Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4568
+#: camlibs/ptp2/config.c:6393
 msgid "Startup and Shutdown"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4573
+#: camlibs/ptp2/config.c:6398
 msgid "50 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4574
+#: camlibs/ptp2/config.c:6399
 msgid "60 Hz"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4581 camlibs/ptp2/ptp.c:5961
+#: camlibs/ptp2/config.c:6406 camlibs/ptp2/ptp.c:8179
 msgid "Quick Response"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/config.c:4582 camlibs/ptp2/ptp.c:5962
+#: camlibs/ptp2/config.c:6407 camlibs/ptp2/ptp.c:8180
 #, fuzzy
 msgid "Remote Mirror Up"
 msgstr "日期和时间"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/config.c:4587
+#: camlibs/ptp2/config.c:6412
 #, fuzzy
 msgid "Application Mode 0"
 msgstr "操作模式"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/config.c:4588
+#: camlibs/ptp2/config.c:6413
 #, fuzzy
 msgid "Application Mode 1"
 msgstr "操作模式"
 
-#: camlibs/ptp2/config.c:4594 camlibs/ptp2/ptp.c:5860
+#: camlibs/ptp2/config.c:6419 camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/ptp.c:8078
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4595 camlibs/ptp2/ptp.c:5861
+#: camlibs/ptp2/config.c:6420 camlibs/ptp2/ptp.c:8079
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4601 camlibs/ptp2/ptp.c:5779
+#: camlibs/ptp2/config.c:6426 camlibs/ptp2/ptp.c:7997
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4602 camlibs/ptp2/ptp.c:5780
+#: camlibs/ptp2/config.c:6427 camlibs/ptp2/ptp.c:7998
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4622
+#: camlibs/ptp2/config.c:6447
 msgid "Auto sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4623
+#: camlibs/ptp2/config.c:6448
 msgid "High sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4624
+#: camlibs/ptp2/config.c:6449
 msgid "Medium sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4625
+#: camlibs/ptp2/config.c:6450
 #, fuzzy
 msgid "Low sensitivity"
 msgstr "低 (最佳质量)"
 
-#: camlibs/ptp2/config.c:4626
+#: camlibs/ptp2/config.c:6451
 msgid "Microphone off"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4681
+#: camlibs/ptp2/config.c:6526
 msgid "Hi 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4682
+#: camlibs/ptp2/config.c:6527
 msgid "Hi 2"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:4717
+#: camlibs/ptp2/config.c:6562
 #, fuzzy
 msgid "Flash/speed"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/config.c:4718
+#: camlibs/ptp2/config.c:6563
 msgid "Flash/speed/aperture"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:4719
+#: camlibs/ptp2/config.c:6564
 #, fuzzy
 msgid "Flash/aperture"
 msgstr "光圈"
 
-#: camlibs/ptp2/config.c:4872 camlibs/ptp2/config.c:4880
-#: camlibs/ptp2/config.c:4891 camlibs/ptp2/config.c:4903
-#: camlibs/ptp2/config.c:4912 camlibs/ptp2/ptp.c:5614
+#: camlibs/ptp2/config.c:6784 camlibs/ptp2/config.c:6792
+#: camlibs/ptp2/config.c:6803 camlibs/ptp2/config.c:6815
+#: camlibs/ptp2/config.c:6824 camlibs/ptp2/config.c:6842
+#: camlibs/ptp2/config.c:6859 camlibs/ptp2/ptp.c:7830
 msgid "JPEG Basic"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
 # camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
-#: camlibs/ptp2/config.c:4873 camlibs/ptp2/config.c:4886
-#: camlibs/ptp2/config.c:4898 camlibs/ptp2/config.c:4918
+#: camlibs/ptp2/config.c:6785 camlibs/ptp2/config.c:6798
+#: camlibs/ptp2/config.c:6810 camlibs/ptp2/config.c:6836
+#: camlibs/ptp2/config.c:6853 camlibs/ptp2/config.c:6865
 #, fuzzy
 msgid "NEF+Fine"
 msgstr "精细"
 
-#: camlibs/ptp2/config.c:4874 camlibs/ptp2/config.c:4875
-#: camlibs/ptp2/config.c:4883 camlibs/ptp2/config.c:4895
-#: camlibs/ptp2/config.c:4906 camlibs/ptp2/config.c:4915
+#: camlibs/ptp2/config.c:6786 camlibs/ptp2/config.c:6787
+#: camlibs/ptp2/config.c:6795 camlibs/ptp2/config.c:6807
+#: camlibs/ptp2/config.c:6818 camlibs/ptp2/config.c:6831
+#: camlibs/ptp2/config.c:6848 camlibs/ptp2/config.c:6862
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4884 camlibs/ptp2/config.c:4896
-#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4916
+#: camlibs/ptp2/config.c:6796 camlibs/ptp2/config.c:6808
+#: camlibs/ptp2/config.c:6819 camlibs/ptp2/config.c:6832
+#: camlibs/ptp2/config.c:6849 camlibs/ptp2/config.c:6863
 msgid "NEF+Basic"
 msgstr ""
 
@@ -7076,99 +8650,266 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:4885 camlibs/ptp2/config.c:4897
-#: camlibs/ptp2/config.c:4917
+#: camlibs/ptp2/config.c:6797 camlibs/ptp2/config.c:6809
+#: camlibs/ptp2/config.c:6834 camlibs/ptp2/config.c:6851
+#: camlibs/ptp2/config.c:6864
 #, fuzzy
 msgid "NEF+Normal"
 msgstr "普通"
 
-#: camlibs/ptp2/config.c:4894
+#: camlibs/ptp2/config.c:6806
 msgid "TIFF (RGB)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:4922
+#: camlibs/ptp2/config.c:6825 camlibs/ptp2/config.c:6843
+#, fuzzy
+msgid "JPEG Basic*"
+msgstr "JPEG"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:6827 camlibs/ptp2/config.c:6845
+#, fuzzy
+msgid "JPEG Normal*"
+msgstr "普通"
+
+#: camlibs/ptp2/config.c:6829 camlibs/ptp2/config.c:6847
+#, fuzzy
+msgid "JPEG Fine*"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6830
+msgid "TIFF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6833 camlibs/ptp2/config.c:6850
+msgid "NEF+Basic*"
+msgstr ""
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:6835 camlibs/ptp2/config.c:6852
+#, fuzzy
+msgid "NEF+Normal*"
+msgstr "普通"
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
+# camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
+#: camlibs/ptp2/config.c:6837 camlibs/ptp2/config.c:6854
+#, fuzzy
+msgid "NEF+Fine*"
+msgstr "精细"
+
+#: camlibs/ptp2/config.c:6870 camlibs/ptp2/config.c:6907
 #, fuzzy
 msgid "Extra Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/config.c:4924
+#: camlibs/ptp2/config.c:6872
+#, fuzzy
+msgid "RAW+JPEG (Light)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6873
+#, fuzzy
+msgid "RAW+JPEG (Std)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6874
+#, fuzzy
+msgid "RAW+JPEG (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6875
+#, fuzzy
+msgid "RAW+JPEG (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6877
+msgid "HEIF (Light)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6878
+msgid "HEIF (Std)"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
+# camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
+#: camlibs/ptp2/config.c:6879
+#, fuzzy
+msgid "HEIF (Fine)"
+msgstr "精细"
+
+#: camlibs/ptp2/config.c:6880
+#, fuzzy
+msgid "HEIF (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6881
+#, fuzzy
+msgid "RAW+HEIF (Light)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6882
+#, fuzzy
+msgid "RAW+HEIF (Std)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6883
+#, fuzzy
+msgid "RAW+HEIF (Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6884
+#, fuzzy
+msgid "RAW+HEIF (X.Fine)"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6890 camlibs/ptp2/config.c:6909
 #, fuzzy
 msgid "RAW+JPEG"
 msgstr "JPEG"
 
+#: camlibs/ptp2/config.c:6896
+msgid "n/a"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
+# camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
+#: camlibs/ptp2/config.c:6897
+#, fuzzy
+msgid "X.Fine"
+msgstr "精细"
+
+#: camlibs/ptp2/config.c:6899
+msgid "Std"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6914
+msgid "Original"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
+#: camlibs/ptp2/config.c:6915
+#, fuzzy
+msgid "2M"
+msgstr "2x"
+
+#: camlibs/ptp2/config.c:6920
+#, fuzzy
+msgid "RAW & JPEG"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6921
+#, fuzzy
+msgid "JPEG Only"
+msgstr "JPEG"
+
+#: camlibs/ptp2/config.c:6922
+msgid "RAW Only"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6923
+msgid "RAW & HEIF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:6924
+msgid "HEIF Only"
+msgstr ""
+
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:4961
+#: camlibs/ptp2/config.c:6974
 #, fuzzy
 msgid "Multi-Shot"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:5734
+#: camlibs/ptp2/config.c:6995 camlibs/ptp2/ptp.c:7952
 msgid "6 seconds"
-msgstr ""
+msgstr "6 秒"
 
-#: camlibs/ptp2/config.c:4984 camlibs/ptp2/ptp.c:5736
+#: camlibs/ptp2/config.c:6997 camlibs/ptp2/ptp.c:7954
 msgid "16 seconds"
-msgstr ""
+msgstr "16 秒"
 
-#: camlibs/ptp2/config.c:4985 camlibs/ptp2/ptp.c:5738
+#: camlibs/ptp2/config.c:6998 camlibs/ptp2/ptp.c:7956
 msgid "30 seconds"
-msgstr ""
+msgstr "30 秒"
 
-#: camlibs/ptp2/config.c:4989 camlibs/ptp2/ptp.c:5737
+#: camlibs/ptp2/config.c:7002 camlibs/ptp2/ptp.c:7955
 msgid "30 minutes"
-msgstr ""
+msgstr "30 分钟"
 
-#: camlibs/ptp2/config.c:4995 camlibs/ptp2/ptp.c:5814 camlibs/ptp2/ptp.c:5998
+#: camlibs/ptp2/config.c:7008 camlibs/ptp2/ptp.c:8032 camlibs/ptp2/ptp.c:8216
 msgid "Lossless"
-msgstr ""
+msgstr "无损"
 
-#: camlibs/ptp2/config.c:4996 camlibs/ptp2/ptp.c:5815
+#: camlibs/ptp2/config.c:7009 camlibs/ptp2/ptp.c:8033
 msgid "Lossy"
+msgstr "有损"
+
+#: camlibs/ptp2/config.c:7010
+msgid "High Efficiency*"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5001
+# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
+# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
+# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
+#: camlibs/ptp2/config.c:7011
+#, fuzzy
+msgid "High Efficiency"
+msgstr "高"
+
+#: camlibs/ptp2/config.c:7016
 msgid "Size Priority"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/config.c:5002
+#: camlibs/ptp2/config.c:7017
 #, fuzzy
 msgid "Optimal quality"
 msgstr "图像质量"
 
-#: camlibs/ptp2/config.c:5007 camlibs/ptp2/config.c:5020
+#: camlibs/ptp2/config.c:7022 camlibs/ptp2/config.c:7035
 msgid "1/250s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5019
+#: camlibs/ptp2/config.c:7034
 msgid "1/320s (Auto FP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5032 camlibs/ptp2/config.c:5039
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
+#: camlibs/ptp2/config.c:7048
 msgid "Release + Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5045
+#: camlibs/ptp2/config.c:7060
 msgid "9 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5046
+#: camlibs/ptp2/config.c:7061
 msgid "21 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5047
+#: camlibs/ptp2/config.c:7062
 msgid "51 points"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5048
+#: camlibs/ptp2/config.c:7063
 msgid "51 points (3D)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5053
+#: camlibs/ptp2/config.c:7068
 msgid "5 (Long)"
 msgstr ""
 
@@ -7180,193 +8921,199 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:5055
+#: camlibs/ptp2/config.c:7070
 #, fuzzy
 msgid "3 (Normal)"
 msgstr "普通"
 
-#: camlibs/ptp2/config.c:5057
+#: camlibs/ptp2/config.c:7072
 msgid "1 (Short)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5063
+#: camlibs/ptp2/config.c:7078
 msgid "Shutter/AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5064 camlibs/ptp2/config.c:5075
+#: camlibs/ptp2/config.c:7079 camlibs/ptp2/config.c:7090
 msgid "AF-ON"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5069
+#: camlibs/ptp2/config.c:7084
 msgid "AF51"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5070
+#: camlibs/ptp2/config.c:7085
 msgid "AF11"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5076 camlibs/ptp2/config.c:5142
+#: camlibs/ptp2/config.c:7091 camlibs/ptp2/config.c:7169
 msgid "AE/AF lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5077 camlibs/ptp2/config.c:5143
+#: camlibs/ptp2/config.c:7092 camlibs/ptp2/config.c:7170
 msgid "AE lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5078
+#: camlibs/ptp2/config.c:7093
 msgid "AE lock (Reset on release)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5079
+#: camlibs/ptp2/config.c:7094
 msgid "AE lock (Hold)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5146
+#: camlibs/ptp2/config.c:7095 camlibs/ptp2/config.c:7173
 msgid "AF lock only"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5101 camlibs/ptp2/config.c:5111
-#: camlibs/ptp2/config.c:5124
+#: camlibs/ptp2/config.c:7116 camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:7139 camlibs/ptp2/config.c:7151
 msgid "4 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5102 camlibs/ptp2/config.c:5112
-#: camlibs/ptp2/config.c:5125
+#: camlibs/ptp2/config.c:7117 camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:7140 camlibs/ptp2/config.c:7152
 msgid "3 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5113
-#: camlibs/ptp2/config.c:5126
+#: camlibs/ptp2/config.c:7118 camlibs/ptp2/config.c:7128
+#: camlibs/ptp2/config.c:7141 camlibs/ptp2/config.c:7153
 msgid "2 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5104 camlibs/ptp2/config.c:5114
-#: camlibs/ptp2/config.c:5127
+#: camlibs/ptp2/config.c:7119 camlibs/ptp2/config.c:7129
+#: camlibs/ptp2/config.c:7142 camlibs/ptp2/config.c:7154
 msgid "1 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5109 camlibs/ptp2/config.c:5122
+#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7137
+#: camlibs/ptp2/config.c:7149
 msgid "6 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5110 camlibs/ptp2/config.c:5123
+#: camlibs/ptp2/config.c:7125 camlibs/ptp2/config.c:7138
+#: camlibs/ptp2/config.c:7150
 msgid "5 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5119 camlibs/ptp2/config.c:5134
+#: camlibs/ptp2/config.c:7134 camlibs/ptp2/config.c:7161
 msgid "9 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5120
+#: camlibs/ptp2/config.c:7135 camlibs/ptp2/config.c:7147
 msgid "8 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5121
+#: camlibs/ptp2/config.c:7136 camlibs/ptp2/config.c:7148
 msgid "7 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5132
+#: camlibs/ptp2/config.c:7159
 msgid "11 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5133
+#: camlibs/ptp2/config.c:7160
 msgid "10 fps"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5139
+#: camlibs/ptp2/config.c:7166
 msgid "Unassigned"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5140
+#: camlibs/ptp2/config.c:7167
 msgid "Preview"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5141
+#: camlibs/ptp2/config.c:7168
 msgid "FV lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5145
+#: camlibs/ptp2/config.c:7172
 msgid "AE lock (hold)"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:5148
+#: camlibs/ptp2/config.c:7175
 #, fuzzy
 msgid "Bracketing burst"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/config.c:5149
+#: camlibs/ptp2/config.c:7176
 msgid "Matrix metering"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5150
+#: camlibs/ptp2/config.c:7177
 msgid "Center-weighted metering"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:5151
+#: camlibs/ptp2/config.c:7178
 #, fuzzy
 msgid "Spot metering"
 msgstr "场景测量模式"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:5152
+#: camlibs/ptp2/config.c:7179
 #, fuzzy
 msgid "Playback"
 msgstr "播放"
 
-#: camlibs/ptp2/config.c:5153
+#: camlibs/ptp2/config.c:7180
 msgid "Access top item in MY MENU"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5154
+#: camlibs/ptp2/config.c:7181
 msgid "+NEF (RAW)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5155
+#: camlibs/ptp2/config.c:7182
 msgid "Framing grid"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5156 camlibs/ptp2/config.c:7474
-#: camlibs/ptp2/config.c:7501 camlibs/ptp2/config.c:7510
-#: camlibs/ptp2/ptp.c:5249 camlibs/ptp2/ptp.c:5388
+#: camlibs/ptp2/config.c:7183 camlibs/ptp2/config.c:11169
+#: camlibs/ptp2/config.c:11232 camlibs/ptp2/config.c:11257
+#: camlibs/ptp2/config.c:11266 camlibs/ptp2/ptp.c:6949 camlibs/ptp2/ptp.c:7100
 msgid "Active D-Lighting"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5157
+#: camlibs/ptp2/config.c:7184
 msgid "1 step spd/aperture"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5158
+#: camlibs/ptp2/config.c:7185
 msgid "Choose non-CPU lens number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5159
+#: camlibs/ptp2/config.c:7186
 msgid "Viewfinder virtual horizont"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5160
+#: camlibs/ptp2/config.c:7187
 msgid "Start movie recording"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5167
+#: camlibs/ptp2/config.c:7194
 msgid "On (image review excluded)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5269
-msgid "50%"
-msgstr ""
+# camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
+# camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
+# camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
+#: camlibs/ptp2/config.c:7214
+#, fuzzy
+msgid "Face detection"
+msgstr "消红眼"
 
-#: camlibs/ptp2/config.c:5270
-msgid "100%"
+#: camlibs/ptp2/config.c:7215
+msgid "Face and pupil detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5271
-msgid "75%"
+#: camlibs/ptp2/config.c:7216
+msgid "Animal detection"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5272
-msgid "25%"
+#: camlibs/ptp2/config.c:7312
+msgid "75%"
 msgstr ""
 
 # camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
@@ -7377,441 +9124,994 @@
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/ptp2/config.c:5273
+#: camlibs/ptp2/config.c:7314
 #, fuzzy
 msgid "Unknown value"
 msgstr "%i (未知)"
 
-#: camlibs/ptp2/config.c:5433
+#: camlibs/ptp2/config.c:7474
 msgid "Nikon changeafarea works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5449
+#: camlibs/ptp2/config.c:7490
 msgid "Nikon autofocus drive did not focus."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5530
+#: camlibs/ptp2/config.c:7571
 msgid "Nikon manual focus works only in LiveView mode."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5540
+#: camlibs/ptp2/config.c:7581
 msgid "Nikon manual focus at limit."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5544
+#: camlibs/ptp2/config.c:7585
 msgid "Nikon manual focus stepping too small."
 msgstr ""
 
-#: camlibs/ptp2/config.c:5582 camlibs/ptp2/config.c:5620
+#: camlibs/ptp2/config.c:7649 camlibs/ptp2/config.c:7687
 msgid "Press Half"
 msgstr ""
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/config.c:5583 camlibs/ptp2/config.c:5622
+#: camlibs/ptp2/config.c:7650 camlibs/ptp2/config.c:7689
 #, fuzzy
 msgid "Press Full"
 msgstr "PTP 存储已满"
 
-#: camlibs/ptp2/config.c:5584 camlibs/ptp2/config.c:5642
+#: camlibs/ptp2/config.c:7651 camlibs/ptp2/config.c:7709
 msgid "Release Half"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5585 camlibs/ptp2/config.c:5644
+#: camlibs/ptp2/config.c:7652 camlibs/ptp2/config.c:7711
 msgid "Release Full"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5586 camlibs/ptp2/config.c:5624
+#: camlibs/ptp2/config.c:7653 camlibs/ptp2/config.c:7691
 msgid "Immediate"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:5588 camlibs/ptp2/config.c:5630
+#: camlibs/ptp2/config.c:7655 camlibs/ptp2/config.c:7697
 #, fuzzy
 msgid "Press 1"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:5589 camlibs/ptp2/config.c:5632
+#: camlibs/ptp2/config.c:7656 camlibs/ptp2/config.c:7699
 #, fuzzy
 msgid "Press 2"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:5590 camlibs/ptp2/config.c:5634
+#: camlibs/ptp2/config.c:7657 camlibs/ptp2/config.c:7701
 #, fuzzy
 msgid "Press 3"
 msgstr "葡萄牙语"
 
-#: camlibs/ptp2/config.c:5591 camlibs/ptp2/config.c:5636
+#: camlibs/ptp2/config.c:7658 camlibs/ptp2/config.c:7703
 msgid "Release 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5592 camlibs/ptp2/config.c:5638
+#: camlibs/ptp2/config.c:7659 camlibs/ptp2/config.c:7705
 msgid "Release 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5593 camlibs/ptp2/config.c:5640
+#: camlibs/ptp2/config.c:7660 camlibs/ptp2/config.c:7707
 msgid "Release 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5695
+#: camlibs/ptp2/config.c:7762 camlibs/ptp2/config.c:7806
+#: camlibs/ptp2/config.c:7854
 msgid "Near 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5696
+#: camlibs/ptp2/config.c:7763 camlibs/ptp2/config.c:7807
+#: camlibs/ptp2/config.c:7855
 msgid "Near 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5697
+#: camlibs/ptp2/config.c:7764 camlibs/ptp2/config.c:7856
 msgid "Near 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5699
+#: camlibs/ptp2/config.c:7766 camlibs/ptp2/config.c:7809
+#: camlibs/ptp2/config.c:7858
 msgid "Far 1"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5700
+#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:7810
+#: camlibs/ptp2/config.c:7859
 msgid "Far 2"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5701
+#: camlibs/ptp2/config.c:7768 camlibs/ptp2/config.c:7860
 msgid "Far 3"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5719
+#: camlibs/ptp2/config.c:7786 camlibs/ptp2/config.c:7828
+#: camlibs/ptp2/config.c:7880
 #, c-format
 msgid "Near %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:5720
+#: camlibs/ptp2/config.c:7787 camlibs/ptp2/config.c:7829
+#: camlibs/ptp2/config.c:7881
 #, c-format
 msgid "Far %d"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6027 camlibs/ptp2/config.c:6203
-#: camlibs/ptp2/config.c:6205 camlibs/ptp2/library.c:2826
-#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2841
-#: camlibs/ptp2/library.c:2848
-msgid "Nikon enable liveview failed"
+#: camlibs/ptp2/config.c:8303
+msgid "Liveview cannot start: Battery exhausted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8304
+msgid "Liveview cannot start: Temperature too high"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8305
+msgid "Liveview cannot start: TTL error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8306
+msgid "Liveview cannot start: In Mirror-up operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8307
+msgid "Liveview cannot start: Lens is retracting"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8308
+msgid "Liveview cannot start: Minimum aperture warning"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6395
+#: camlibs/ptp2/config.c:8309
+msgid "Liveview cannot start: Processing of shooting operation"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8310
+msgid "Liveview cannot start: Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8311
+msgid "Liveview cannot start: Exposure Program Mode is not P/A/S/M"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8312
+msgid "Liveview cannot start: Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8313
+msgid "Liveview cannot start: Card unformatted"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8314
+msgid "Liveview cannot start: Card error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8315
+msgid "Liveview cannot start: Card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8316
 msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
+"Liveview cannot start: Recording destination card, but no card or card "
+"protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8317 camlibs/ptp2/config.c:8318
+msgid "Liveview cannot start: Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8319
+msgid "Liveview cannot start: Fully pressed button"
 msgstr ""
 
+#: camlibs/ptp2/config.c:8321 camlibs/ptp2/library.c:3691
+#, c-format
+msgid "Liveview cannot start: code 0x%08x"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8330 camlibs/ptp2/config.c:8661
+#: camlibs/ptp2/config.c:8663 camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/library.c:3710
+#: camlibs/ptp2/library.c:3712 camlibs/ptp2/library.c:4163
+msgid "Nikon enable liveview failed"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8547
+msgid "Movie prohibit conditions: "
+msgstr ""
+
+# frontends/command-line/gphoto2-cmd-capture.c:218
+# libgphoto2/gphoto2-result.c:51
+#: camlibs/ptp2/config.c:8555
+#, fuzzy
+msgid "Not in application mode"
+msgstr "操作模式"
+
+#: camlibs/ptp2/config.c:8556 camlibs/ptp2/config.c:8671
+msgid "Set liveview selector is enabled"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:160
+#: camlibs/ptp2/config.c:8557 camlibs/ptp2/config.c:8558
+#: camlibs/ptp2/config.c:8672
+#, fuzzy
+msgid "In enlarged liveview"
+msgstr "图像大小"
+
+# camlibs/konica/konica.c:95
+#: camlibs/ptp2/config.c:8559 camlibs/ptp2/config.c:8603
+#: camlibs/ptp2/config.c:8673 camlibs/ptp2/library.c:3684
+#, fuzzy
+msgid "Card protected"
+msgstr "卡已写保护。"
+
+#: camlibs/ptp2/config.c:8560 camlibs/ptp2/config.c:8674
+msgid "Already in movie recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8561 camlibs/ptp2/config.c:8675
+msgid "Images / movies not yet record in buffer"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8562 camlibs/ptp2/config.c:8676
+msgid "Card full"
+msgstr ""
+
+# camlibs/kodak/dc240/library.c:614
+#: camlibs/ptp2/config.c:8563 camlibs/ptp2/config.c:8677
+#, fuzzy
+msgid "Card not formatted"
+msgstr "卡尚未格式化"
+
+# camlibs/konica/konica.c:65
+#: camlibs/ptp2/config.c:8564 camlibs/ptp2/config.c:8604
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/library.c:3683
+#, fuzzy
+msgid "Card error"
+msgstr "光圈错误。"
+
+#: camlibs/ptp2/config.c:8569
+msgid "No movie prohibit conditions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8587
+msgid "Live View prohibit conditions: "
+msgstr ""
+
+#: camlibs/ptp2/config.c:8594 camlibs/ptp2/library.c:3679
+msgid "Sequence error"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8595 camlibs/ptp2/library.c:3688
+msgid "Fully pressed button"
+msgstr ""
+
+# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
+#: camlibs/ptp2/config.c:8596 camlibs/ptp2/library.c:3677
+#, fuzzy
+msgid "Minimum aperture warning"
+msgstr "照片设置"
+
+# camlibs/canon/serial.c:625 camlibs/canon/serial.c:690
+#: camlibs/ptp2/config.c:8597 camlibs/ptp2/library.c:3673
+#, fuzzy
+msgid "Battery exhausted"
+msgstr "电池没电，关闭相机。"
+
+# camlibs/ptp/library.c:130
+#: camlibs/ptp2/config.c:8598 camlibs/ptp2/library.c:3675
+#, fuzzy
+msgid "TTL error"
+msgstr "PTP I/O 错误"
+
+#: camlibs/ptp2/config.c:8599 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687
+msgid "Pending unretrieved SDRAM image"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8600 camlibs/ptp2/library.c:3685
+msgid "Recording destination card, but no card or card protected"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8601 camlibs/ptp2/library.c:3678
+msgid "Processing of shooting operation"
+msgstr ""
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:8602 camlibs/ptp2/library.c:3674
+#, fuzzy
+msgid "Temperature too high"
+msgstr "光圈"
+
+# camlibs/kodak/dc240/library.c:614
+#: camlibs/ptp2/config.c:8605 camlibs/ptp2/library.c:3682
+#, fuzzy
+msgid "Card unformatted"
+msgstr "卡尚未格式化"
+
+#: camlibs/ptp2/config.c:8606 camlibs/ptp2/library.c:3681
+msgid "Bulb warning"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8607 camlibs/ptp2/library.c:3676
+msgid "In Mirror-up operation"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:161
+#: camlibs/ptp2/config.c:8608 camlibs/ptp2/library.c:3690
+#, fuzzy
+msgid "Lens is retracting"
+msgstr "闪光灯设置"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:8609 camlibs/ptp2/library.c:3680
+#, fuzzy
+msgid "Exposure Program Mode is not P/A/S/M"
+msgstr "曝光测定"
+
+#: camlibs/ptp2/config.c:8613
+msgid "Liveview should not be prohibited"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670 camlibs/ptp2/config.c:8671
+#: camlibs/ptp2/config.c:8672 camlibs/ptp2/config.c:8673
+#: camlibs/ptp2/config.c:8674 camlibs/ptp2/config.c:8675
+#: camlibs/ptp2/config.c:8676 camlibs/ptp2/config.c:8677
+#: camlibs/ptp2/config.c:8678 camlibs/ptp2/config.c:8679
+#, c-format
+msgid "Movie recording cannot start: %s."
+msgstr ""
+
+#: camlibs/ptp2/config.c:8670
+msgid "Camera is not in application mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:8680
+#, c-format
+msgid "Movie recording cannot start: code 0x%08x."
+msgstr ""
+
+# camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
+# camlibs/sierra/sierra.c:1237
+#: camlibs/ptp2/config.c:9149
+#, fuzzy
+msgid "Flourescent"
+msgstr "荧光"
+
+# camlibs/canon/library.c:905
+#: camlibs/ptp2/config.c:9152
+#, fuzzy
+msgid "White set"
+msgstr "时间设置"
+
+# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
+# camlibs/sierra/sierra.c:1700
+#: camlibs/ptp2/config.c:9153
+#, fuzzy
+msgid "Black White"
+msgstr "黑白"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:9159
+#, fuzzy
+msgid "Temperature 1"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:9160
+#, fuzzy
+msgid "Temperature 2"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:9161
+#, fuzzy
+msgid "Temperature 3"
+msgstr "光圈"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:9162
+#, fuzzy
+msgid "Temperature 4"
+msgstr "光圈"
+
+# camlibs/minolta/dimagev/dimagev.c:323
+#: camlibs/ptp2/config.c:9163
+#, fuzzy
+msgid "Automatic Cool"
+msgstr "自动"
+
+# camlibs/minolta/dimagev/dimagev.c:323
+#: camlibs/ptp2/config.c:9164
+#, fuzzy
+msgid "Automatic Warm"
+msgstr "自动\n"
+
+#: camlibs/ptp2/config.c:9283 camlibs/ptp2/config.c:9355
+#: camlibs/ptp2/config.c:9454
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9293 camlibs/ptp2/config.c:9368
+#: camlibs/ptp2/config.c:9464 camlibs/ptp2/config.c:9562
+#: camlibs/ptp2/config.c:9594 camlibs/ptp2/config.c:9610
+#, fuzzy, c-format
+msgid "Unknown 0x%04x"
+msgstr "未知 (0x%02x)"
+
+# camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:983
+# camlibs/sierra/sierra.c:1254 camlibs/sierra/sierra.c:1450
+# camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666
+#: camlibs/ptp2/config.c:9305
+#, fuzzy
+msgid "AF macro"
+msgstr "巨大"
+
+#: camlibs/ptp2/config.c:9306
+msgid "AF macro (D)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9307
+msgid "MF"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9308
+msgid "AF_S"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9309
+msgid "AF_C"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9310
+msgid "AF_F"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9379
+msgid "Stop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9380
+msgid "Far fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9381
+msgid "Far slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9382
+msgid "Near slow"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9383
+msgid "Near fast"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9424
+msgid "A"
+msgstr ""
+
+#: camlibs/ptp2/config.c:9425
+msgid "S"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:788
+# camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
+# camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
+# camlibs/sierra/sierra.c:1680
+#: camlibs/ptp2/config.c:9494
+#, fuzzy
+msgid "Standby"
+msgstr "标准"
+
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:9495
+#, fuzzy
+msgid "Recording"
+msgstr "录制"
+
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:9496
+#, fuzzy
+msgid "Playing"
+msgstr "播放"
+
+#: camlibs/ptp2/config.c:9497
+msgid "Other process."
+msgstr ""
+
+# camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:254
+#: camlibs/ptp2/config.c:9498
+#, fuzzy
+msgid "Other playing"
+msgstr "其它设置"
+
+#: camlibs/ptp2/config.c:9499
+#, fuzzy
+msgid "Noise reduction"
+msgstr "曝光补偿"
+
+# camlibs/konica/library.c:725 camlibs/konica/library.c:950
+#: camlibs/ptp2/config.c:9500
+#, fuzzy
+msgid "Displaying menu"
+msgstr "请勿显示电视菜单"
+
+#: camlibs/ptp2/config.c:9501
+msgid "Streaming"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/ptp2/config.c:9939 camlibs/ptp2/config.c:9958
+#, fuzzy
+msgid "large"
+msgstr "图像"
+
+# libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
+#: camlibs/ptp2/config.c:9962
+#, fuzzy, c-format
+msgid "Unknown thumb size value '%s'."
+msgstr "未知的文件类型 %i。"
+
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/config.c:6460
+#: camlibs/ptp2/config.c:9970
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
 # camlibs/kodak/dc240/library.c:618
-#: camlibs/ptp2/config.c:6461
+#: camlibs/ptp2/config.c:9971
 #, fuzzy
 msgid "Memory card"
 msgstr "无卡"
 
-#: camlibs/ptp2/config.c:6667
+#: camlibs/ptp2/config.c:10238
 msgid "ESSID"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:171
-#: camlibs/ptp2/config.c:6672
+#: camlibs/ptp2/config.c:10243
 #, fuzzy
 msgid "Display"
 msgstr "播放"
 
-#: camlibs/ptp2/config.c:6682
+#: camlibs/ptp2/config.c:10253
 #, c-format
 msgid "Creation date: %s, Last usage date: %s"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6688
+#: camlibs/ptp2/config.c:10259
 msgid "Delete"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6750
+#: camlibs/ptp2/config.c:10321
 msgid "WEP 64-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6751
+#: camlibs/ptp2/config.c:10322
 msgid "WEP 128-bit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6795
+#: camlibs/ptp2/config.c:10366
 msgid "Managed"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6796
+#: camlibs/ptp2/config.c:10367
 msgid "Ad-hoc"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6935
+#: camlibs/ptp2/config.c:10506
 msgid "Profile name"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6936
+#: camlibs/ptp2/config.c:10507
 msgid "WIFI ESSID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6937
+#: camlibs/ptp2/config.c:10508
 msgid "IP address (empty for DHCP)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6938
+#: camlibs/ptp2/config.c:10509
 msgid "Network mask"
 msgstr ""
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/config.c:6939
+#: camlibs/ptp2/config.c:10510
 #, fuzzy
 msgid "Default gateway"
 msgstr "日光"
 
-#: camlibs/ptp2/config.c:6940
+#: camlibs/ptp2/config.c:10511
 msgid "Access mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6941
+#: camlibs/ptp2/config.c:10512
 msgid "WIFI channel"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6942
+#: camlibs/ptp2/config.c:10513
 msgid "Encryption"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6943
+#: camlibs/ptp2/config.c:10514
 msgid "Encryption key (hex)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:6944
+#: camlibs/ptp2/config.c:10515
 msgid "Write"
 msgstr ""
 
 # camlibs/canon/library.c:870 camlibs/canon/library.c:912
-#: camlibs/ptp2/config.c:6994
+#: camlibs/ptp2/config.c:10565
 #, fuzzy
 msgid "List Wifi profiles"
 msgstr "列出所有文件"
 
-#: camlibs/ptp2/config.c:6995
+#: camlibs/ptp2/config.c:10566
 msgid "Create Wifi profile"
 msgstr ""
 
+#: camlibs/ptp2/config.c:10671
+msgid "Synchronize camera date and time with PC (UTC)"
+msgstr ""
+
 # camlibs/konica/library.c:777 camlibs/konica/library.c:1010
-#: camlibs/ptp2/config.c:7103
+#: camlibs/ptp2/config.c:10674
 #, fuzzy
 msgid "Auto-Focus"
 msgstr "聚焦"
 
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:10675
+#, fuzzy
+msgid "Manual-Focus"
+msgstr "无手册"
+
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/config.c:7105
+#: camlibs/ptp2/config.c:10677
 #, fuzzy
 msgid "Power Down"
 msgstr "无电源指示灯"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7106 camlibs/ptp2/ptp.c:5023
+#: camlibs/ptp2/config.c:10678 camlibs/ptp2/ptp.c:6723
 #, fuzzy
 msgid "Focus Lock"
 msgstr "聚焦模式"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7107 camlibs/ptp2/config.c:7108
-#: camlibs/ptp2/config.c:7109
+#: camlibs/ptp2/config.c:10679 camlibs/ptp2/config.c:10680
+#: camlibs/ptp2/config.c:10681 camlibs/ptp2/config.c:10682
+#: camlibs/ptp2/config.c:10683
 #, fuzzy
 msgid "Bulb Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7110
+#: camlibs/ptp2/config.c:10684
 msgid "UI Lock"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7111
+# camlibs/dimera/dimera3500.c:533
+#: camlibs/ptp2/config.c:10685
+#, fuzzy
+msgid "Popup Flash"
+msgstr "无闪光灯"
+
+#: camlibs/ptp2/config.c:10686
 msgid "Drive Nikon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7112
+#: camlibs/ptp2/config.c:10687
 msgid "Drive Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7113
+# camlibs/konica/konica.c:107
+#: camlibs/ptp2/config.c:10688
+#, fuzzy
+msgid "Drive Fuji Autofocus"
+msgstr "自动聚焦错误。"
+
+#: camlibs/ptp2/config.c:10689
 msgid "Drive Nikon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7114
+#: camlibs/ptp2/config.c:10690
 msgid "Set Nikon Autofocus area"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7115
+#: camlibs/ptp2/config.c:10691
 msgid "Set Nikon Control Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7116
+#: camlibs/ptp2/config.c:10692
 msgid "Drive Canon DSLR Manual focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7117
+#: camlibs/ptp2/config.c:10693
 msgid "Cancel Canon DSLR Autofocus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7118
+#: camlibs/ptp2/config.c:10694
+msgid "Drive Olympus OMD Manual focus"
+msgstr ""
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/config.c:10695
+#, fuzzy
+msgid "Drive Panasonic Manual focus"
+msgstr "无手册"
+
+# camlibs/konica/konica.c:62
+#: camlibs/ptp2/config.c:10696
+#, fuzzy
+msgid "Get Fuji focuspoint"
+msgstr "聚焦错误。"
+
+#: camlibs/ptp2/config.c:10697
+msgid "Fuji FocusPoint Grid dimensions"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10698
+#, fuzzy
+msgid "Fuji Zoom Position"
+msgstr "聚焦位置"
+
+#: camlibs/ptp2/config.c:10700
 msgid "Canon EOS Zoom"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7119
+#: camlibs/ptp2/config.c:10701
 msgid "Canon EOS Zoom Position"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7120
+#: camlibs/ptp2/config.c:10702
 msgid "Canon EOS Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7121
+#: camlibs/ptp2/config.c:10703
+msgid "Panasonic Viewfinder"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10704
 msgid "Nikon Viewfinder"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7122
+#: camlibs/ptp2/config.c:10705
 msgid "Canon EOS Remote Release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7123
+#: camlibs/ptp2/config.c:10706
 msgid "CHDK Script"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:7124 camlibs/ptp2/config.c:7125
-#: camlibs/ptp2/config.c:7126
+#: camlibs/ptp2/config.c:10707 camlibs/ptp2/config.c:10708
+#: camlibs/ptp2/config.c:10709 camlibs/ptp2/config.c:10710
+#: camlibs/ptp2/config.c:10711
 #, fuzzy
 msgid "Movie Capture"
 msgstr "光圈"
 
-#: camlibs/ptp2/config.c:7127
+#: camlibs/ptp2/config.c:10712
+#, fuzzy
+msgid "Movie Mode"
+msgstr "音效"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/config.c:10713
+#, fuzzy
+msgid "Focus Magnify"
+msgstr "聚焦模式"
+
+#: camlibs/ptp2/config.c:10714
+msgid "Focus Magnify Exit"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/config.c:10715
+#, fuzzy
+msgid "Focus Magnify Up"
+msgstr "聚焦模式"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/config.c:10716
+#, fuzzy
+msgid "Focus Magnify Down"
+msgstr "聚焦模式"
+
+#: camlibs/ptp2/config.c:10717
+msgid "Focus Magnify Left"
+msgstr ""
+
+# camlibs/konica/konica.c:62
+#: camlibs/ptp2/config.c:10718
+#, fuzzy
+msgid "Focus Magnify Right"
+msgstr "聚焦错误。"
+
+#: camlibs/ptp2/config.c:10719
 msgid "PTP Opcode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1818
-#: camlibs/ptp2/config.c:7132 camlibs/ptp2/config.c:7155
-#, fuzzy
+#: camlibs/ptp2/config.c:10724 camlibs/ptp2/config.c:10755
 msgid "Serial Number"
-msgstr "%s序列号：%s\n"
+msgstr "序列号"
 
 # camlibs/canon/serial.c:1190
-#: camlibs/ptp2/config.c:7133
+#: camlibs/ptp2/config.c:10725
 #, fuzzy
 msgid "Camera Manufacturer"
 msgstr "相机就绪。\n"
 
 # frontends/command-line/actions.c:159
-#: camlibs/ptp2/config.c:7135
-#, fuzzy
+#: camlibs/ptp2/config.c:10727
 msgid "Device Version"
-msgstr "版本："
+msgstr "设备版本"
 
-#: camlibs/ptp2/config.c:7136
+#: camlibs/ptp2/config.c:10728
 msgid "Vendor Extension"
 msgstr ""
 
 # frontends/command-line/actions.c:159
-#: camlibs/ptp2/config.c:7141
+#: camlibs/ptp2/config.c:10733
 #, fuzzy
 msgid "PTP Version"
 msgstr "版本："
 
 # frontends/command-line/actions.c:159
-#: camlibs/ptp2/config.c:7142 camlibs/ptp2/ptp.c:4873
+#: camlibs/ptp2/config.c:10734 camlibs/ptp2/ptp.c:6340
 #, fuzzy
 msgid "DPOF Version"
 msgstr "版本："
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7143 camlibs/ptp2/ptp.c:5175
+#: camlibs/ptp2/config.c:10735 camlibs/ptp2/ptp.c:6875
 #, fuzzy
 msgid "AC Power"
 msgstr "闪光灯模式"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/config.c:7144
+#: camlibs/ptp2/config.c:10736
 #, fuzzy
 msgid "External Flash"
 msgstr "外部"
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/ptp2/config.c:7145 camlibs/ptp2/config.c:7146
-#: camlibs/ptp2/config.c:7147 camlibs/ptp2/ptp.c:4739 camlibs/ptp2/ptp.c:5442
+#: camlibs/ptp2/config.c:10737 camlibs/ptp2/config.c:10738
+#: camlibs/ptp2/config.c:10739 camlibs/ptp2/ptp.c:6206 camlibs/ptp2/ptp.c:7546
 #, fuzzy
 msgid "Battery Level"
 msgstr "%s电池寿命：%i\n"
 
+#: camlibs/ptp2/config.c:10740
+msgid "Mirror Up Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10741
+msgid "Mirror Lock"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10742
+msgid "Mirror Lock Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10743
+msgid "Mirror Down Status"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10744
+msgid "Mirror Up Shooting Count"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
+#: camlibs/ptp2/config.c:10745
+#, fuzzy
+msgid "Continuous Shooting Count"
+msgstr "场景测量模式"
+
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/config.c:7148 camlibs/ptp2/config.c:7149
-#: camlibs/ptp2/config.c:7150 camlibs/ptp2/ptp.c:5197
+#: camlibs/ptp2/config.c:10746 camlibs/ptp2/config.c:10747
+#: camlibs/ptp2/config.c:10748 camlibs/ptp2/ptp.c:6897
 #, fuzzy
 msgid "Camera Orientation"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7151 camlibs/ptp2/ptp.c:5339
+#: camlibs/ptp2/config.c:10749 camlibs/ptp2/ptp.c:7039
 #, fuzzy
 msgid "Flash Open"
 msgstr "闪光灯模式"
 
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:10750
+#, fuzzy
+msgid "Active Folder"
+msgstr "LED 模式"
+
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/ptp2/config.c:7152 camlibs/ptp2/ptp.c:5341
+#: camlibs/ptp2/config.c:10751 camlibs/ptp2/ptp.c:7041
 #, fuzzy
 msgid "Flash Charged"
 msgstr "闪存卡"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7153 camlibs/ptp2/config.c:7154
+#: camlibs/ptp2/config.c:10752 camlibs/ptp2/config.c:10753
+#: camlibs/ptp2/config.c:10754
 #, fuzzy
 msgid "Lens Name"
 msgstr "镜头模式"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7156
+#: camlibs/ptp2/config.c:10756 camlibs/ptp2/config.c:10757
 #, fuzzy
 msgid "Shutter Counter"
 msgstr "快门速度 (秒)"
 
 # frontends/command-line/shell.c:779
-#: camlibs/ptp2/config.c:7157
+#: camlibs/ptp2/config.c:10758 camlibs/ptp2/config.c:10759
 #, fuzzy
 msgid "Available Shots"
 msgstr "可用的内存："
 
-#: camlibs/ptp2/config.c:7158
+#: camlibs/ptp2/config.c:10760
 msgid "Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7159
+#: camlibs/ptp2/config.c:10761
 msgid "Focal Length Maximum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7160
+#: camlibs/ptp2/config.c:10762
 msgid "Maximum Aperture at Focal Length Minimum"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7161
+#: camlibs/ptp2/config.c:10763
 msgid "Maximum Aperture at Focal Length Maximum"
 msgstr ""
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/config.c:7162
+#: camlibs/ptp2/config.c:10764
 #, fuzzy
 msgid "Low Light"
 msgstr "高"
@@ -7819,200 +10119,286 @@
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/config.c:7163 camlibs/ptp2/config.c:7164
+#: camlibs/ptp2/config.c:10765 camlibs/ptp2/config.c:10766
 #, fuzzy
 msgid "Light Meter"
 msgstr "高"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7165 camlibs/ptp2/ptp.c:5179
+#: camlibs/ptp2/config.c:10767 camlibs/ptp2/ptp.c:6879
 #, fuzzy
 msgid "AF Locked"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:7166 camlibs/ptp2/ptp.c:5180
+#: camlibs/ptp2/config.c:10768 camlibs/ptp2/ptp.c:6880
 msgid "AE Locked"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7167 camlibs/ptp2/ptp.c:5181
+#: camlibs/ptp2/config.c:10769 camlibs/ptp2/ptp.c:6881
 #, fuzzy
 msgid "FV Locked"
 msgstr "聚焦模式"
 
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/ptp2/config.c:10770
+#, fuzzy
+msgid "Movie Switch"
+msgstr "图像质量"
+
+#: camlibs/ptp2/config.c:10771
+msgid "Movie Prohibit Condition"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10772
+msgid "Liveview Prohibit Condition"
+msgstr ""
+
 # camlibs/konica/library.c:633 camlibs/konica/library.c:844
 # camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
 # camlibs/polaroid/pdc700.c:1088
-#: camlibs/ptp2/config.c:7172 camlibs/ptp2/config.c:7173
-#: camlibs/ptp2/config.c:7174 camlibs/ptp2/config.c:7175
+#: camlibs/ptp2/config.c:10777 camlibs/ptp2/config.c:10778
+#: camlibs/ptp2/config.c:10779 camlibs/ptp2/config.c:10780
+#: camlibs/ptp2/config.c:10781
 #, fuzzy
 msgid "Camera Date and Time"
 msgstr "日期和时间"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7176 camlibs/ptp2/ptp.c:4794 camlibs/ptp2/ptp.c:4805
+#: camlibs/ptp2/config.c:10782 camlibs/ptp2/ptp.c:6261 camlibs/ptp2/ptp.c:6272
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7177
+#: camlibs/ptp2/config.c:10783 camlibs/ptp2/config.c:10784
 #, fuzzy
 msgid "Image Comment"
 msgstr "图像调整"
 
-#: camlibs/ptp2/config.c:7178
+#: camlibs/ptp2/config.c:10786
 msgid "WLAN GUID"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7179
+#: camlibs/ptp2/config.c:10787
 #, fuzzy
 msgid "Enable Image Comment"
 msgstr "图像调整"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/config.c:7180 camlibs/ptp2/ptp.c:5031
+#: camlibs/ptp2/config.c:10788 camlibs/ptp2/ptp.c:6731
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "自动关机时间"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:7181 camlibs/ptp2/ptp.c:5191
+#: camlibs/ptp2/config.c:10789 camlibs/ptp2/ptp.c:6891
 #, fuzzy
 msgid "Recording Media"
 msgstr "录制模式"
 
-#: camlibs/ptp2/config.c:7182
+#: camlibs/ptp2/config.c:10790
 msgid "Quick Review Time"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7183 camlibs/ptp2/ptp.c:5295
+#: camlibs/ptp2/config.c:10791 camlibs/ptp2/ptp.c:6995
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7184 camlibs/ptp2/ptp.c:5092
+#: camlibs/ptp2/config.c:10792 camlibs/ptp2/ptp.c:6792
 msgid "Reverse Command Dial"
 msgstr ""
 
 # camlibs/canon/serial.c:1190
-#: camlibs/ptp2/config.c:7185 camlibs/ptp2/config.c:7186
-#: camlibs/ptp2/ptp.c:4857
+#: camlibs/ptp2/config.c:10793 camlibs/ptp2/config.c:10794
+#: camlibs/ptp2/ptp.c:6324
 #, fuzzy
 msgid "Camera Output"
 msgstr "相机就绪。\n"
 
-#: camlibs/ptp2/config.c:7187
+#: camlibs/ptp2/config.c:10795
 msgid "Recording Destination"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7188
+#: camlibs/ptp2/config.c:10796
 #, fuzzy
 msgid "EVF Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7191 camlibs/ptp2/config.c:7192
-#: camlibs/ptp2/ptp.c:4770
+#: camlibs/ptp2/config.c:10799 camlibs/ptp2/config.c:10800
+#: camlibs/ptp2/ptp.c:6237
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7193
+#: camlibs/ptp2/config.c:10801
 msgid "CCD Number"
 msgstr ""
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/config.c:7194 camlibs/ptp2/config.c:7195
-#: camlibs/ricoh/library.c:439
+#: camlibs/ptp2/config.c:10802 camlibs/ptp2/config.c:10804
+#: camlibs/ptp2/config.c:10805 camlibs/ricoh/library.c:423
 msgid "Copyright"
 msgstr "版权"
 
-#: camlibs/ptp2/config.c:7196
+#: camlibs/ptp2/config.c:10803
+msgid "Nickname"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10806
 msgid "Clean Sensor"
 msgstr ""
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/config.c:7197 camlibs/ptp2/ptp.c:4957
+#: camlibs/ptp2/config.c:10807 camlibs/ptp2/ptp.c:6657
 #, fuzzy
 msgid "Flicker Reduction"
 msgstr "消红眼"
 
-#: camlibs/ptp2/config.c:7198
+#: camlibs/ptp2/config.c:10808
 msgid "Custom Functions Ex"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7199
+#: camlibs/ptp2/config.c:10809
 #, fuzzy
 msgid "Focus Info"
 msgstr "聚焦模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7200
+#: camlibs/ptp2/config.c:10810 camlibs/ptp2/config.c:11052
+#: camlibs/ptp2/ptp.c:7561
 #, fuzzy
 msgid "Focus Area"
 msgstr "聚焦模式"
 
+#: camlibs/ptp2/config.c:10811
+msgid "Strobo Firing"
+msgstr ""
+
+# camlibs/kodak/dc120/dc120.c:31
+#: camlibs/ptp2/config.c:10812
+#, fuzzy
+msgid "Flash Charging State"
+msgstr "闪存卡"
+
+#: camlibs/ptp2/config.c:10813
+msgid "One Shot Raw On"
+msgstr ""
+
 # camlibs/polaroid/pdc700.c:164
-#: camlibs/ptp2/config.c:7201
+#: camlibs/ptp2/config.c:10814
 #, fuzzy
 msgid "Auto Power Off"
 msgstr "自动关机 (分钟)"
 
-#: camlibs/ptp2/config.c:7202
+#: camlibs/ptp2/config.c:10815
 msgid "Depth of Field"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7203 camlibs/ptp2/ptp.c:5096
+#: camlibs/ptp2/config.c:10816 camlibs/ptp2/ptp.c:6796
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7206
+#: camlibs/ptp2/config.c:10817
+msgid "External Recording Control"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
+#: camlibs/ptp2/config.c:10818
+#, fuzzy
+msgid "Camera Action"
+msgstr "相机设置"
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:10819 camlibs/ptp2/config.c:10820
+#, fuzzy
+msgid "Priority Mode"
+msgstr "LED 模式"
+
+# camlibs/stv0680/library.c:590
+#: camlibs/ptp2/config.c:10823
+#, fuzzy
+msgid "Thumb Size"
+msgstr "缩略"
+
+#: camlibs/ptp2/config.c:10824
 msgid "Fast Filesystem"
 msgstr ""
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:7207 camlibs/ptp2/config.c:7209
+#: camlibs/ptp2/config.c:10825 camlibs/ptp2/config.c:10827
+#: camlibs/ptp2/config.c:10828 camlibs/ptp2/config.c:10829
+#: camlibs/ptp2/ptp.c:7565
 #, fuzzy
 msgid "Capture Target"
 msgstr "照片设置"
 
 # camlibs/konica/konica.c:107
-#: camlibs/ptp2/config.c:7208
+#: camlibs/ptp2/config.c:10826 camlibs/ptp2/ptp.c:7560
 #, fuzzy
 msgid "Autofocus"
 msgstr "自动聚焦错误。"
 
-#: camlibs/ptp2/config.c:7210
-msgid "CHDK"
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:10832 camlibs/ptp2/config.c:11105
+#: camlibs/ptp2/ptp.c:6659
+#, fuzzy
+msgid "Remote Mode"
+msgstr "录制模式"
+
+# camlibs/minolta/dimagev/dimagev.c:308
+#: camlibs/ptp2/config.c:10833
+#, fuzzy
+msgid "Event Mode"
+msgstr "录制模式"
+
+#: camlibs/ptp2/config.c:10834
+msgid "Test OLC"
 msgstr ""
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/config.c:7220
+#: camlibs/ptp2/config.c:10844
 #, fuzzy
 msgid "Image Format SD"
 msgstr "日期格式"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/config.c:7221
+#: camlibs/ptp2/config.c:10845
 #, fuzzy
 msgid "Image Format CF"
 msgstr "日期格式"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/config.c:7223
+#: camlibs/ptp2/config.c:10848
 #, fuzzy
 msgid "Image Format Ext HD"
 msgstr "日期格式"
 
-#: camlibs/ptp2/config.c:7230
+# camlibs/konica/library.c:684 camlibs/konica/library.c:896
+# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
+# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
+#: camlibs/ptp2/config.c:10849 camlibs/ptp2/ptp.c:7318
+#, fuzzy
+msgid "Film Simulation"
+msgstr "文件分辨率"
+
+# camlibs/polaroid/pdc700.c:160
+#: camlibs/ptp2/config.c:10851
+#, fuzzy
+msgid "Raw Image Size"
+msgstr "图像大小"
+
+#: camlibs/ptp2/config.c:10858
 #, fuzzy
 msgid "Movie ISO Speed"
 msgstr "ISO 速度"
@@ -8029,863 +10415,1169 @@
 # camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
 # camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
 # camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/ptp2/config.c:7234 camlibs/ptp2/ptp.c:5283
+#: camlibs/ptp2/config.c:10867 camlibs/ptp2/ptp.c:6983
 #, fuzzy
 msgid "ISO Auto"
 msgstr "自动"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7235 camlibs/ptp2/config.c:7236
-#: camlibs/ptp2/config.c:7239 camlibs/ptp2/config.c:7240
+#: camlibs/ptp2/config.c:10869 camlibs/ptp2/config.c:10870
+#: camlibs/ptp2/config.c:10871 camlibs/ptp2/config.c:10875
+#: camlibs/ptp2/config.c:10876
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7241
+#: camlibs/ptp2/config.c:10877
 #, fuzzy
 msgid "WhiteBalance Adjust A"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7242
+#: camlibs/ptp2/config.c:10878
 #, fuzzy
 msgid "WhiteBalance Adjust B"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7243
+#: camlibs/ptp2/config.c:10879
 #, fuzzy
 msgid "WhiteBalance X A"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7244
+#: camlibs/ptp2/config.c:10880
 #, fuzzy
 msgid "WhiteBalance X B"
 msgstr "白平衡"
 
-#: camlibs/ptp2/config.c:7245 camlibs/ptp2/ptp.c:4867
+#: camlibs/ptp2/config.c:10881 camlibs/ptp2/ptp.c:6334
 msgid "Photo Effect"
 msgstr ""
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/ptp2/config.c:7246 camlibs/ptp2/ptp.c:4941
+#: camlibs/ptp2/config.c:10882 camlibs/ptp2/ptp.c:6641
 #, fuzzy
 msgid "Color Model"
 msgstr "彩色模式"
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/ptp2/config.c:7247 camlibs/ptp2/config.c:7248
-#: camlibs/ptp2/ptp.c:4953
+#: camlibs/ptp2/config.c:10883 camlibs/ptp2/config.c:10884
+#: camlibs/ptp2/config.c:10885 camlibs/ptp2/ptp.c:6653
 #, fuzzy
 msgid "Color Space"
 msgstr "彩色模式"
 
-#: camlibs/ptp2/config.c:7254 camlibs/ptp2/config.c:7255
+# camlibs/konica/library.c:729 camlibs/konica/library.c:960
+#: camlibs/ptp2/config.c:10886 camlibs/ptp2/ptp.c:6241
+#, fuzzy
+msgid "Video Format"
+msgstr "日期格式"
+
+# camlibs/konica/library.c:684 camlibs/konica/library.c:896
+# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
+# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
+#: camlibs/ptp2/config.c:10887 camlibs/ptp2/ptp.c:6242
+#, fuzzy
+msgid "Video Resolution"
+msgstr "文件分辨率"
+
+#: camlibs/ptp2/config.c:10889 camlibs/ptp2/ptp.c:6244
+msgid "Video Framerate"
+msgstr ""
+
+# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
+# camlibs/sierra/sierra.c:1220
+#: camlibs/ptp2/config.c:10890 camlibs/ptp2/ptp.c:6245
+#, fuzzy
+msgid "Video Contrast"
+msgstr "对比度-"
+
+# camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
+#: camlibs/ptp2/config.c:10891 camlibs/ptp2/ptp.c:6246
+#, fuzzy
+msgid "Video Brightness"
+msgstr "LCD 亮度"
+
+# camlibs/konica/library.c:729 camlibs/konica/library.c:960
+#: camlibs/ptp2/config.c:10892 camlibs/ptp2/ptp.c:6247
+#, fuzzy
+msgid "Audio Format"
+msgstr "日期格式"
+
+#: camlibs/ptp2/config.c:10893 camlibs/ptp2/ptp.c:6248
+msgid "Audio Bitrate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10894
+msgid "Audio Sampling Rate"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10895
+msgid "Audio Bit per Sample"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10896 camlibs/ptp2/ptp.c:6251
+msgid "Audio Volume"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10901 camlibs/ptp2/config.c:10902
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7256
+#: camlibs/ptp2/config.c:10903
 #, fuzzy
 msgid "Auto Focus Mode 2"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:7258 camlibs/ptp2/config.c:7261
-#: camlibs/ptp2/ptp.c:4868
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/config.c:10907
+#, fuzzy
+msgid "Zoom Speed"
+msgstr "快门速度 (秒)"
+
+#: camlibs/ptp2/config.c:10908 camlibs/ptp2/config.c:10911
+#: camlibs/ptp2/ptp.c:6335
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7259
+#: camlibs/ptp2/config.c:10909
 msgid "Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7268 camlibs/ptp2/ptp.c:4836
+#: camlibs/ptp2/config.c:10917
+#, fuzzy
+msgid "Movie Exposure Compensation"
+msgstr "曝光补偿"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:10921 camlibs/ptp2/ptp.c:6210 camlibs/ptp2/ptp.c:6290
+#: camlibs/ptp2/ptp.c:7096 camlibs/ptp2/ptp.c:7563
+#: camlibs/sierra/epson-desc.c:162 camlibs/sierra/nikon-desc.c:280
+#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
+#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:621
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1561 camlibs/sierra/sierra.c:1786
+msgid "White Balance"
+msgstr "白平衡"
+
+#: camlibs/ptp2/config.c:10922 camlibs/ptp2/ptp.c:7540
+msgid "Color temperature"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10923
+msgid "Adjust A/B"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10924
+msgid "Adjust G/M"
+msgstr ""
+
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:10925 camlibs/ptp2/ptp.c:6292
+#, fuzzy
+msgid "AF Mode"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:10926
+#, fuzzy
+msgid "MF Adjust"
+msgstr "图像调整"
+
+#: camlibs/ptp2/config.c:10927
+msgid "Exp mode"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10928
+msgid "Start/Stop recording"
+msgstr ""
+
+#: camlibs/ptp2/config.c:10931 camlibs/ptp2/ptp.c:6303
 #, fuzzy
 msgid "Flash Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:7269 camlibs/ptp2/ptp.c:4837
+#: camlibs/ptp2/config.c:10932 camlibs/ptp2/ptp.c:6304
 #, fuzzy
 msgid "AEB Exposure Compensation"
 msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7272
+#: camlibs/ptp2/config.c:10935
 #, fuzzy
 msgid "Nikon Flash Mode"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7273 camlibs/ptp2/ptp.c:5279
+#: camlibs/ptp2/config.c:10936 camlibs/ptp2/ptp.c:6979
 #, fuzzy
 msgid "Flash Commander Mode"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7274
+#: camlibs/ptp2/config.c:10937
 #, fuzzy
 msgid "Flash Commander Power"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/config.c:7275 camlibs/ptp2/ptp.c:5349
+#: camlibs/ptp2/config.c:10938 camlibs/ptp2/ptp.c:7049
 msgid "Flash Command Channel"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7276 camlibs/ptp2/ptp.c:5351
+#: camlibs/ptp2/config.c:10939 camlibs/ptp2/ptp.c:7051
 #, fuzzy
 msgid "Flash Command Self Mode"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/config.c:7277 camlibs/ptp2/ptp.c:5353
+#: camlibs/ptp2/config.c:10940 camlibs/ptp2/ptp.c:7053
 #, fuzzy
 msgid "Flash Command Self Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:7278 camlibs/ptp2/ptp.c:5355
+#: camlibs/ptp2/config.c:10941 camlibs/ptp2/ptp.c:7055
 msgid "Flash Command Self Value"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7279 camlibs/ptp2/ptp.c:5357
+#: camlibs/ptp2/config.c:10942 camlibs/ptp2/ptp.c:7057
 #, fuzzy
 msgid "Flash Command A Mode"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/config.c:7280 camlibs/ptp2/ptp.c:5359
+#: camlibs/ptp2/config.c:10943 camlibs/ptp2/ptp.c:7059
 #, fuzzy
 msgid "Flash Command A Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:7281 camlibs/ptp2/ptp.c:5361
+#: camlibs/ptp2/config.c:10944 camlibs/ptp2/ptp.c:7061
 msgid "Flash Command A Value"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7282 camlibs/ptp2/ptp.c:5363
+#: camlibs/ptp2/config.c:10945 camlibs/ptp2/ptp.c:7063
 #, fuzzy
 msgid "Flash Command B Mode"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/config.c:7283 camlibs/ptp2/ptp.c:5365
+#: camlibs/ptp2/config.c:10946 camlibs/ptp2/ptp.c:7065
 #, fuzzy
 msgid "Flash Command B Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:7284 camlibs/ptp2/ptp.c:5367
+#: camlibs/ptp2/config.c:10947 camlibs/ptp2/ptp.c:7067
 msgid "Flash Command B Value"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7285 camlibs/ptp2/ptp.c:5275
+#: camlibs/ptp2/config.c:10948 camlibs/ptp2/ptp.c:6975
 msgid "AF Area Illumination"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7286 camlibs/ptp2/ptp.c:5265
+#: camlibs/ptp2/config.c:10949 camlibs/ptp2/ptp.c:6965
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7287 camlibs/ptp2/config.c:7288
-#: camlibs/ptp2/ptp.c:4745
+#: camlibs/ptp2/config.c:10950 camlibs/ptp2/config.c:10951
+#: camlibs/ptp2/config.c:10952 camlibs/ptp2/config.c:10953
+#: camlibs/ptp2/ptp.c:6212
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7289
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:10954 camlibs/ptp2/config.c:11039
+#: camlibs/ptp2/config.c:11040 camlibs/ptp2/config.c:11041
+#: camlibs/ptp2/config.c:11287
+#, fuzzy
+msgid "Live View Size"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:10955
 msgid "Movie F-Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7290 camlibs/ptp2/ptp.c:5187
+#: camlibs/ptp2/config.c:10956 camlibs/ptp2/ptp.c:6887
 msgid "Flexible Program"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7293 camlibs/ptp2/ptp.c:4747
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/ptp2/config.c:10960
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "图像质量"
+
+# camlibs/polaroid/pdc700.c:160
+#: camlibs/ptp2/config.c:10961
+#, fuzzy
+msgid "PC Save Image Size"
+msgstr "图像大小"
+
+# camlibs/konica/library.c:729 camlibs/konica/library.c:960
+#: camlibs/ptp2/config.c:10962
+#, fuzzy
+msgid "PC Save Image Format"
+msgstr "日期格式"
+
+#: camlibs/ptp2/config.c:10963 camlibs/ptp2/ptp.c:6214
 #, fuzzy
 msgid "Focus Distance"
 msgstr "聚焦位置"
 
-#: camlibs/ptp2/config.c:7294 camlibs/ptp2/ptp.c:4746 camlibs/ptp2/ptp.c:4840
+#: camlibs/ptp2/config.c:10964 camlibs/ptp2/ptp.c:6213 camlibs/ptp2/ptp.c:6307
 msgid "Focal Length"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7298
+#: camlibs/ptp2/config.c:10969
 #, fuzzy
 msgid "Focus Mode 2"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:7300
+#: camlibs/ptp2/config.c:10971
 msgid "Continuous AF"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:7301 camlibs/ptp2/config.c:7302
-#: camlibs/ptp2/ptp.c:4763 camlibs/ptp2/ptp.c:4963
+#: camlibs/ptp2/config.c:10972 camlibs/ptp2/config.c:10973
+#: camlibs/ptp2/ptp.c:6230 camlibs/ptp2/ptp.c:6663
 #, fuzzy
 msgid "Effect Mode"
 msgstr "录制模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7303 camlibs/ptp2/config.c:7304
-#: camlibs/ptp2/config.c:7454 camlibs/ptp2/config.c:7463
+#: camlibs/ptp2/config.c:10974 camlibs/ptp2/config.c:10975
+#: camlibs/ptp2/config.c:11212 camlibs/ptp2/config.c:11221
 #, fuzzy
 msgid "Exposure Program"
 msgstr "曝光测定"
 
+# camlibs/sierra/sierra.c:1806
+#: camlibs/ptp2/config.c:10976
+#, fuzzy
+msgid "User Mode"
+msgstr "%s相机型号：%s\n"
+
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7305 camlibs/ptp2/ptp.c:5172
+#: camlibs/ptp2/config.c:10977 camlibs/ptp2/ptp.c:6872
 #, fuzzy
 msgid "Scene Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7306 camlibs/ptp2/config.c:7307
-#: camlibs/ptp2/ptp.c:5438
+#: camlibs/ptp2/config.c:10978 camlibs/ptp2/config.c:10979
+#: camlibs/ptp2/config.c:10980 camlibs/ptp2/ptp.c:7542
 msgid "Aspect Ratio"
 msgstr ""
 
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:10981
+#, fuzzy
+msgid "AF Method"
+msgstr "LED 模式"
+
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/config.c:7308
+#: camlibs/ptp2/config.c:10982
 #, fuzzy
 msgid "Storage Device"
 msgstr "图像大小"
 
-#: camlibs/ptp2/config.c:7309 camlibs/ptp2/config.c:7475
-#: camlibs/ptp2/config.c:7500 camlibs/ptp2/config.c:7511
-#: camlibs/ptp2/config.c:7517 camlibs/ptp2/ptp.c:5382
+#: camlibs/ptp2/config.c:10983 camlibs/ptp2/config.c:11267
+#: camlibs/ptp2/config.c:11274 camlibs/ptp2/ptp.c:7094
 #, fuzzy
 msgid "High ISO Noise Reduction"
 msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7310 camlibs/ptp2/ptp.c:5227
+#: camlibs/ptp2/config.c:10984 camlibs/ptp2/ptp.c:6927
 #, fuzzy
 msgid "HDR Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7311 camlibs/ptp2/ptp.c:5229
+#: camlibs/ptp2/config.c:10985 camlibs/ptp2/ptp.c:6929
 msgid "HDR High Dynamic"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7312 camlibs/ptp2/ptp.c:5231
+#: camlibs/ptp2/config.c:10986 camlibs/ptp2/ptp.c:6931
 msgid "HDR Smoothing"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7313 camlibs/ptp2/config.c:7314
-#: camlibs/ptp2/ptp.c:4759
+#: camlibs/ptp2/config.c:10987 camlibs/ptp2/config.c:10988
+#: camlibs/ptp2/ptp.c:6226
 msgid "Still Capture Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:7315
+#: camlibs/ptp2/config.c:10989
 #, fuzzy
 msgid "Canon Shooting Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/config.c:7316
+#: camlibs/ptp2/config.c:10990
 #, fuzzy
 msgid "Canon Auto Exposure Mode"
 msgstr "自动曝光锁"
 
+#: camlibs/ptp2/config.c:10991
+#, fuzzy
+msgid "Canon Auto Exposure Mode Dial"
+msgstr "自动曝光锁"
+
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7317 camlibs/ptp2/ptp.c:4818
+#: camlibs/ptp2/config.c:10992 camlibs/ptp2/ptp.c:6285
 #, fuzzy
 msgid "Drive Mode"
 msgstr "LED 模式"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:7318
+#: camlibs/ptp2/config.c:10993
 #, fuzzy
 msgid "Picture Style"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:7319 camlibs/ptp2/ptp.c:4768
+#: camlibs/ptp2/config.c:10994 camlibs/ptp2/config.c:10995
+#: camlibs/ptp2/config.c:11173 camlibs/ptp2/config.c:11205
+#: camlibs/ptp2/ptp.c:6235
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "场景测量模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7320 camlibs/ptp2/ptp.c:4749
+#: camlibs/ptp2/config.c:10996 camlibs/ptp2/ptp.c:6216
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/config.c:7323
+#: camlibs/ptp2/config.c:11000
 msgid "AV Open"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7324
+#: camlibs/ptp2/config.c:11001
 msgid "AV Max"
 msgstr ""
 
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/config.c:11006
+#, fuzzy
+msgid "Aperture 2"
+msgstr "光圈"
+
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/config.c:7326 camlibs/ptp2/ptp.c:4822
+#: camlibs/ptp2/config.c:11007 camlibs/ptp2/ptp.c:6289
 #, fuzzy
 msgid "Focusing Point"
 msgstr "聚焦错误。"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/config.c:7328
+#: camlibs/ptp2/config.c:11009
 #, fuzzy
 msgid "Capture Delay"
 msgstr "光圈"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7332
+#: camlibs/ptp2/config.c:11015
 #, fuzzy
 msgid "Shutter Speed 2"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7333
+#: camlibs/ptp2/config.c:11016
 #, fuzzy
 msgid "Movie Shutter Speed 2"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:7338 camlibs/ptp2/config.c:7339
-#: camlibs/ptp2/ptp.c:4820
+#: camlibs/ptp2/config.c:11026 camlibs/ptp2/config.c:11027
+#: camlibs/ptp2/ptp.c:6287
 #, fuzzy
 msgid "Metering Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/config.c:7340 camlibs/ptp2/ptp.c:4821
+#: camlibs/ptp2/config.c:11028 camlibs/ptp2/ptp.c:6288
 #, fuzzy
 msgid "AF Distance"
 msgstr "聚焦位置"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7341 camlibs/ptp2/ptp.c:4991
+#: camlibs/ptp2/config.c:11029 camlibs/ptp2/ptp.c:6691
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "聚焦模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7342
+#: camlibs/ptp2/config.c:11030
 #, fuzzy
 msgid "Exposure Delay Mode"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7343 camlibs/ptp2/ptp.c:5021
+#: camlibs/ptp2/config.c:11031 camlibs/ptp2/ptp.c:6721
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "曝光"
 
-#: camlibs/ptp2/config.c:7344
+#: camlibs/ptp2/config.c:11032
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7345 camlibs/ptp2/config.c:7346
+#: camlibs/ptp2/config.c:11033 camlibs/ptp2/config.c:11034
 msgid "Live View AF Mode"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7347 camlibs/ptp2/ptp.c:5025
+#: camlibs/ptp2/config.c:11035 camlibs/ptp2/ptp.c:6725
 msgid "Live View AF Focus"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7348 camlibs/ptp2/ptp.c:5047
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:11036
+#, fuzzy
+msgid "Live View Exposure Preview"
+msgstr "LED 模式"
+
+#: camlibs/ptp2/config.c:11037 camlibs/ptp2/config.c:11199
+#: camlibs/ptp2/ptp.c:7027
+msgid "Live View Image Zoom Ratio"
+msgstr ""
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11038
+#, fuzzy
+msgid "Live View White Balance"
+msgstr "白平衡"
+
+#: camlibs/ptp2/config.c:11042 camlibs/ptp2/ptp.c:7556
+msgid "Live View Setting Effect"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11043 camlibs/ptp2/ptp.c:6747
 msgid "File Number Sequencing"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/config.c:7349 camlibs/ptp2/ptp.c:5281
+#: camlibs/ptp2/config.c:11044 camlibs/ptp2/ptp.c:6981
 #, fuzzy
 msgid "Flash Sign"
 msgstr "闪光灯设置"
 
 # camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/ptp2/config.c:7350
+#: camlibs/ptp2/config.c:11045
 #, fuzzy
 msgid "Modelling Flash"
 msgstr "强制闪光\n"
 
-#: camlibs/ptp2/config.c:7351
+#: camlibs/ptp2/config.c:11046
 msgid "Viewfinder Grid"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/config.c:7352 camlibs/ptp2/ptp.c:5273
+#: camlibs/ptp2/config.c:11047 camlibs/ptp2/ptp.c:6973
 #, fuzzy
 msgid "Image Review"
 msgstr "图像大小"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/config.c:7353
+#: camlibs/ptp2/config.c:11048 camlibs/ptp2/config.c:11168
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "相机设置"
 
-#: camlibs/ptp2/config.c:7354
+#: camlibs/ptp2/config.c:11049
 msgid "Release without CF card"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7355 camlibs/ptp2/ptp.c:5289
+#: camlibs/ptp2/config.c:11050 camlibs/ptp2/ptp.c:6989
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7356
+#: camlibs/ptp2/config.c:11051
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:7357 camlibs/ptp2/ptp.c:5225
+#: camlibs/ptp2/config.c:11053 camlibs/ptp2/ptp.c:6925
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "曝光补偿"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7358 camlibs/ptp2/config.c:7359
+#: camlibs/ptp2/config.c:11054 camlibs/ptp2/config.c:11055
 #, fuzzy
 msgid "Bracketing"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/config.c:7360
+#: camlibs/ptp2/config.c:11056
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/config.c:7361
+#: camlibs/ptp2/config.c:11057
 #, fuzzy
 msgid "EV Step"
 msgstr "ISO 速度"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/config.c:7362 camlibs/ptp2/ptp.c:5071
+#: camlibs/ptp2/config.c:11058 camlibs/ptp2/ptp.c:6771
 #, fuzzy
 msgid "Bracket Set"
 msgstr "自动，消红眼"
 
-#: camlibs/ptp2/config.c:7363 camlibs/ptp2/ptp.c:5075
+#: camlibs/ptp2/config.c:11059 camlibs/ptp2/ptp.c:6775
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7364 camlibs/ptp2/ptp.c:4764
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11060
+#, fuzzy
+msgid "AE Bracketing Step"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11061
+#, fuzzy
+msgid "WB Bracketing Step"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11062
+#, fuzzy
+msgid "AE Bracketing Pattern"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11063
+#, fuzzy
+msgid "WB Bracketing Pattern"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11064
+#, fuzzy
+msgid "AE Bracketing Count"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11065
+#, fuzzy
+msgid "ADL Bracketing Pattern"
+msgstr "曝光测定"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/config.c:11066
+#, fuzzy
+msgid "ADL Bracketing Step"
+msgstr "曝光测定"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11067
+#, fuzzy
+msgid "WB Preset Comment 1"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11068
+#, fuzzy
+msgid "WB Preset Comment 2"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11069
+#, fuzzy
+msgid "WB Preset Comment 3"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11070
+#, fuzzy
+msgid "WB Preset Comment 4"
+msgstr "白平衡"
+
+#: camlibs/ptp2/config.c:11071
+msgid "WB Preset Comment 5"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11072
+msgid "WB Preset Comment 6"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11073 camlibs/ptp2/ptp.c:6231
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7365 camlibs/ptp2/ptp.c:4765
+#: camlibs/ptp2/config.c:11074 camlibs/ptp2/ptp.c:6232
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7366 camlibs/ptp2/ptp.c:5041 camlibs/ptp2/ptp.c:5178
+#: camlibs/ptp2/config.c:11075 camlibs/ptp2/ptp.c:6741 camlibs/ptp2/ptp.c:6878
 msgid "Maximum Shots"
 msgstr ""
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7369 camlibs/ptp2/config.c:7377
-#: camlibs/ptp2/ptp.c:4899
+#: camlibs/ptp2/config.c:11078 camlibs/ptp2/config.c:11087
+#: camlibs/ptp2/ptp.c:6599
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7370 camlibs/ptp2/config.c:7378
-#: camlibs/ptp2/ptp.c:4901
+#: camlibs/ptp2/config.c:11079 camlibs/ptp2/config.c:11088
+#: camlibs/ptp2/ptp.c:6601
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7371 camlibs/ptp2/config.c:7379
-#: camlibs/ptp2/ptp.c:4903
+#: camlibs/ptp2/config.c:11080 camlibs/ptp2/config.c:11089
+#: camlibs/ptp2/ptp.c:6603
 #, fuzzy
 msgid "Fluorescent White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7372 camlibs/ptp2/config.c:7380
-#: camlibs/ptp2/ptp.c:4905
+#: camlibs/ptp2/config.c:11081 camlibs/ptp2/config.c:11090
+#: camlibs/ptp2/ptp.c:6605
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7373 camlibs/ptp2/config.c:7381
-#: camlibs/ptp2/ptp.c:4907
+#: camlibs/ptp2/config.c:11082 camlibs/ptp2/config.c:11091
+#: camlibs/ptp2/ptp.c:6607
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7374 camlibs/ptp2/config.c:7382
-#: camlibs/ptp2/ptp.c:4909
+#: camlibs/ptp2/config.c:11083 camlibs/ptp2/config.c:11092
+#: camlibs/ptp2/ptp.c:6609
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7375 camlibs/ptp2/config.c:7383
-#: camlibs/ptp2/ptp.c:4911
+#: camlibs/ptp2/config.c:11084 camlibs/ptp2/config.c:11093
+#: camlibs/ptp2/ptp.c:6611
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7385
+#: camlibs/ptp2/config.c:11085
+#, fuzzy
+msgid "Natural light auto White Balance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/config.c:11095
 #, fuzzy
 msgid "White Balance Bias Preset Nr"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7386
+#: camlibs/ptp2/config.c:11096
 #, fuzzy
 msgid "White Balance Bias Preset 0"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7387
+#: camlibs/ptp2/config.c:11097
 #, fuzzy
 msgid "White Balance Bias Preset 1"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7388
+#: camlibs/ptp2/config.c:11098
 #, fuzzy
 msgid "White Balance Bias Preset 2"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7389
+#: camlibs/ptp2/config.c:11099
 #, fuzzy
 msgid "White Balance Bias Preset 3"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:7390
+#: camlibs/ptp2/config.c:11100
 #, fuzzy
 msgid "White Balance Bias Preset 4"
 msgstr "白平衡"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/ptp2/config.c:7391
+#: camlibs/ptp2/config.c:11101
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "自动定时器时间"
 
-#: camlibs/ptp2/config.c:7392
+#: camlibs/ptp2/config.c:11102 camlibs/ptp2/config.c:11172
 msgid "Center Weight Area"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7393 camlibs/ptp2/config.c:7488
-#: camlibs/ptp2/config.c:7526 camlibs/ptp2/ptp.c:5065
+#: camlibs/ptp2/config.c:11103 camlibs/ptp2/config.c:11245
+#: camlibs/ptp2/config.c:11285 camlibs/ptp2/ptp.c:6765
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/config.c:7394 camlibs/ptp2/ptp.c:5285
+#: camlibs/ptp2/config.c:11104 camlibs/ptp2/ptp.c:6985
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "日期和时间"
 
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:7395 camlibs/ptp2/ptp.c:4959
-#, fuzzy
-msgid "Remote Mode"
-msgstr "录制模式"
-
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/config.c:7396
+#: camlibs/ptp2/config.c:11106 camlibs/ptp2/config.c:11107
 #, fuzzy
 msgid "Application Mode"
 msgstr "操作模式"
 
-#: camlibs/ptp2/config.c:7397 camlibs/ptp2/ptp.c:5233
+#: camlibs/ptp2/config.c:11108 camlibs/ptp2/ptp.c:6933
 msgid "Optimize Image"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/config.c:7398 camlibs/ptp2/ptp.c:4937
+#: camlibs/ptp2/config.c:11109 camlibs/ptp2/ptp.c:6637
 #, fuzzy
 msgid "Sharpening"
 msgstr "正在充电"
 
-#: camlibs/ptp2/config.c:7399 camlibs/ptp2/ptp.c:4939
+#: camlibs/ptp2/config.c:11110 camlibs/ptp2/ptp.c:6639
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "曝光补偿"
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/ptp2/config.c:7400 camlibs/ptp2/ptp.c:5235
+#: camlibs/ptp2/config.c:11111 camlibs/ptp2/ptp.c:6935
 #, fuzzy
 msgid "Saturation"
 msgstr "配置"
 
-#: camlibs/ptp2/config.c:7401 camlibs/ptp2/ptp.c:4943
+#: camlibs/ptp2/config.c:11112 camlibs/ptp2/ptp.c:6643
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "图像调整"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:7402
+#: camlibs/ptp2/config.c:11113
 #, fuzzy
 msgid "Auto Exposure Bracketing"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/config.c:7404
+#: camlibs/ptp2/config.c:11114
 msgid "Auto Lighting Optimization"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7406
+#: camlibs/ptp2/config.c:11115
 #, fuzzy
 msgid "Movie Sound"
 msgstr "音效"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:7407 camlibs/ptp2/ptp.c:5128
+#: camlibs/ptp2/config.c:11116 camlibs/ptp2/ptp.c:6828
 #, fuzzy
 msgid "Manual Movie Setting"
 msgstr "照片设置"
 
-#: camlibs/ptp2/config.c:7408
+#: camlibs/ptp2/config.c:11117
 msgid "Microphone"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7409
+#: camlibs/ptp2/config.c:11118
 msgid "Reverse Indicators"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7410 camlibs/ptp2/ptp.c:5170
+#: camlibs/ptp2/config.c:11119 camlibs/ptp2/ptp.c:6870
 msgid "Auto Distortion Control"
 msgstr ""
 
+# camlibs/ptp/library.c:90
+#: camlibs/ptp2/config.c:11120
+#, fuzzy
+msgid "Vignette Correction"
+msgstr "未定义的 PTP 错误"
+
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/config.c:7411 camlibs/ptp2/ptp.c:4961
+#: camlibs/ptp2/config.c:11121 camlibs/ptp2/ptp.c:6661
 #, fuzzy
 msgid "Video Mode"
 msgstr "录制模式"
 
+#: camlibs/ptp2/config.c:11122 camlibs/ptp2/ptp.c:7559
+msgid "Sensor Crop"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11123
+msgid "HDMI Output Data Depth"
+msgstr ""
+
+# camlibs/konica/library.c:684 camlibs/konica/library.c:896
+# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
+# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
+#: camlibs/ptp2/config.c:11124
+#, fuzzy
+msgid "Face Detection"
+msgstr "文件分辨率"
+
+#: camlibs/ptp2/config.c:11125
+#, fuzzy
+msgid "Movie Servo AF"
+msgstr "音效"
+
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/config.c:7429
+#: camlibs/ptp2/config.c:11143
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "自动关机时间"
 
-#: camlibs/ptp2/config.c:7435 camlibs/ptp2/config.c:7442
+#: camlibs/ptp2/config.c:11149 camlibs/ptp2/config.c:11156
 msgid "Assign Func Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7436 camlibs/ptp2/config.c:7443
+#: camlibs/ptp2/config.c:11150 camlibs/ptp2/config.c:11157
 msgid "Assign Preview Button"
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/config.c:7453 camlibs/ptp2/config.c:7462
-#: camlibs/ptp2/config.c:7515 camlibs/ptp2/config.c:7516
-#: camlibs/ptp2/ptp.c:5130 camlibs/ptp2/ptp.c:5380
-#, fuzzy
-msgid "Movie Quality"
-msgstr "图像质量"
-
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7455 camlibs/ptp2/config.c:7464
-#: camlibs/ptp2/config.c:7472 camlibs/ptp2/config.c:7483
-#: camlibs/ptp2/config.c:7508
+#: camlibs/ptp2/config.c:11170 camlibs/ptp2/config.c:11223
+#: camlibs/ptp2/config.c:11234 camlibs/ptp2/config.c:11242
+#: camlibs/ptp2/config.c:11269
 #, fuzzy
-msgid "Minimum Shutter Speed"
+msgid "Continuous Shooting Speed Slow"
 msgstr "快门速度 (秒)"
 
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/config.c:7461
+#: camlibs/ptp2/config.c:11171 camlibs/ptp2/config.c:11219
 #, fuzzy
 msgid "Movie Resolution"
 msgstr "文件分辨率"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7465 camlibs/ptp2/config.c:7477
-#: camlibs/ptp2/config.c:7485 camlibs/ptp2/config.c:7513
+#: camlibs/ptp2/config.c:11206 camlibs/ptp2/config.c:11213
+#: camlibs/ptp2/config.c:11222 camlibs/ptp2/config.c:11230
+#: camlibs/ptp2/config.c:11240 camlibs/ptp2/config.c:11264
 #, fuzzy
-msgid "Continuous Shooting Speed Slow"
+msgid "Minimum Shutter Speed"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/config.c:7466 camlibs/ptp2/config.c:7473
-#: camlibs/ptp2/config.c:7484 camlibs/ptp2/config.c:7509
+# camlibs/polaroid/pdc700.c:159
+#: camlibs/ptp2/config.c:11211 camlibs/ptp2/config.c:11220
+#: camlibs/ptp2/config.c:11271 camlibs/ptp2/config.c:11272
+#: camlibs/ptp2/ptp.c:6830 camlibs/ptp2/ptp.c:7092
+#, fuzzy
+msgid "Movie Quality"
+msgstr "图像质量"
+
+#: camlibs/ptp2/config.c:11224 camlibs/ptp2/config.c:11231
+#: camlibs/ptp2/config.c:11241 camlibs/ptp2/config.c:11265
 msgid "ISO Auto Hi Limit"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7467 camlibs/ptp2/config.c:7487
-#: camlibs/ptp2/config.c:7525 camlibs/ptp2/ptp.c:5063
+#: camlibs/ptp2/config.c:11225 camlibs/ptp2/config.c:11244
+#: camlibs/ptp2/config.c:11284 camlibs/ptp2/ptp.c:6763
 msgid "Flash Sync. Speed"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:7468
+#: camlibs/ptp2/config.c:11226
 #, fuzzy
 msgid "Focus Metering"
 msgstr "场景测量模式"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/config.c:7486 camlibs/ptp2/config.c:7524
+#: camlibs/ptp2/config.c:11243 camlibs/ptp2/config.c:11283
 #, fuzzy
 msgid "Continuous Shooting Speed High"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/config.c:7490 camlibs/ptp2/ptp.c:4951
+#: camlibs/ptp2/config.c:11247 camlibs/ptp2/ptp.c:6651
 #, fuzzy
 msgid "JPEG Compression Policy"
 msgstr "压缩"
 
-#: camlibs/ptp2/config.c:7491
+#: camlibs/ptp2/config.c:11248
 msgid "AF-C Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7492
+#: camlibs/ptp2/config.c:11249
 msgid "AF-S Mode Priority"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7493
+#: camlibs/ptp2/config.c:11250
 msgid "AF Activation"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7494 camlibs/ptp2/ptp.c:5303
+#: camlibs/ptp2/config.c:11251 camlibs/ptp2/ptp.c:7003
 msgid "Dynamic AF Area"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/config.c:7495 camlibs/ptp2/ptp.c:4995
+#: camlibs/ptp2/config.c:11252 camlibs/ptp2/ptp.c:6695
 #, fuzzy
 msgid "AF Lock On"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/config.c:7496 camlibs/ptp2/ptp.c:5106
+#: camlibs/ptp2/config.c:11253 camlibs/ptp2/ptp.c:6806
 msgid "AF Area Point"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7497
+#: camlibs/ptp2/config.c:11254
 msgid "AF On Button"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7512
+#: camlibs/ptp2/config.c:11268
 #, fuzzy
 msgid "Movie High ISO Noise Reduction"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/config.c:7514
+#: camlibs/ptp2/config.c:11270
 msgid "Maximum continuous release"
 msgstr ""
 
-#: camlibs/ptp2/config.c:7519 camlibs/ptp2/ptp.c:4897
+#: camlibs/ptp2/config.c:11273
+msgid "Movie Loop Length"
+msgstr ""
+
+#: camlibs/ptp2/config.c:11277 camlibs/ptp2/ptp.c:6597
 #, fuzzy
 msgid "Raw Compression"
 msgstr "压缩"
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/config.c:7521
+#: camlibs/ptp2/config.c:11279
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "图像质量"
 
-# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/config.c:7543
+# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
+# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
+#: camlibs/ptp2/config.c:11288
 #, fuzzy
-msgid "Image Settings"
-msgstr "相机设置"
+msgid "Live View Zoom Area"
+msgstr "LED 模式"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:7546 camlibs/ptp2/config.c:7547
-#: camlibs/ptp2/config.c:7548 camlibs/ptp2/config.c:7549
-#: camlibs/ptp2/config.c:7550 camlibs/ptp2/config.c:7551
-#: camlibs/ptp2/config.c:7552
+#: camlibs/ptp2/config.c:11308 camlibs/ptp2/config.c:11309
+#: camlibs/ptp2/config.c:11310 camlibs/ptp2/config.c:11311
+#: camlibs/ptp2/config.c:11312 camlibs/ptp2/config.c:11313
+#: camlibs/ptp2/config.c:11314 camlibs/ptp2/config.c:11315
+#: camlibs/ptp2/config.c:11316 camlibs/ptp2/config.c:11317
+#: camlibs/ptp2/config.c:11318 camlibs/ptp2/config.c:11319
+#: camlibs/ptp2/config.c:11320 camlibs/ptp2/config.c:11321
+#: camlibs/ptp2/config.c:11322 camlibs/ptp2/config.c:11323
+#: camlibs/ptp2/config.c:11324 camlibs/ptp2/config.c:11325
+#: camlibs/ptp2/config.c:11326 camlibs/ptp2/config.c:11327
+#: camlibs/ptp2/config.c:11328 camlibs/ptp2/config.c:11329
 #, fuzzy
 msgid "Capture Settings"
 msgstr "照片设置"
 
-#: camlibs/ptp2/config.c:7554
+#: camlibs/ptp2/config.c:11331
 msgid "WIFI profiles"
 msgstr ""
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/config.c:7767 camlibs/ptp2/config.c:8128
+#: camlibs/ptp2/config.c:11590 camlibs/ptp2/config.c:11980
 #, fuzzy
 msgid "Other PTP Device Properties"
 msgstr "不支持的 PTP 设备属性"
 
-#: camlibs/ptp2/config.c:7804 camlibs/ptp2/config.c:8143
+#: camlibs/ptp2/config.c:11627 camlibs/ptp2/config.c:11995
+#: camlibs/ptp2/config.c:12279
 #, c-format
 msgid "PTP Property 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8072 camlibs/ptp2/config.c:8163
+#: camlibs/ptp2/config.c:11897 camlibs/ptp2/config.c:12015
 #, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
+msgid "Sorry, the property '%s' / 0x%04x is currently read-only."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8078
+#: camlibs/ptp2/config.c:11904
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)"
 msgstr ""
 
-#: camlibs/ptp2/config.c:8105 camlibs/ptp2/config.c:8204
+#: camlibs/ptp2/config.c:11935 camlibs/ptp2/config.c:12056
 #, c-format
 msgid "The property '%s' / 0x%04x was not set (0x%04x: %s)."
 msgstr ""
 
-#: camlibs/ptp2/config.c:8111
+#: camlibs/ptp2/config.c:11942 camlibs/ptp2/config.c:11968
 #, c-format
 msgid "Parsing the value of widget '%s' / 0x%04x failed with %d."
 msgstr ""
 
 # libgphoto2/gphoto2-result.c:47
-#: camlibs/ptp2/config.c:8215
+#: camlibs/ptp2/config.c:12067
 #, fuzzy, c-format
 msgid "Property '%s' not found."
 msgstr "找不到目录"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:93
 msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2610
+#: camlibs/ptp2/library.c:3288
 #, c-format
 msgid ""
 "PTP2 driver\n"
@@ -8897,202 +11589,228 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2654 camlibs/ptp2/library.c:3794
+# libgphoto2/gphoto2-camera.c:850
+#: camlibs/ptp2/library.c:3447 camlibs/ptp2/library.c:3737
+#, fuzzy
+msgid ""
+"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
+"mode"
+msgstr "您的相机不支持文件改名。"
+
+#: camlibs/ptp2/library.c:3488 camlibs/ptp2/library.c:4821
 msgid "Canon enable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2658
+#: camlibs/ptp2/library.c:3492
 msgid "Canon get viewfinder image failed"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:2792
+#: camlibs/ptp2/library.c:3634
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "您的相机不支持文件改名。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:2800
+#: camlibs/ptp2/library.c:3642
 #, fuzzy
 msgid "Sorry, your Nikon camera does not support LiveView mode"
 msgstr "您的相机不支持文件改名。"
 
-# libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:2878 camlibs/ptp2/library.c:2894
-#, fuzzy
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr "您的相机不支持文件改名。"
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/library.c:3676
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3679 camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/library.c:3685 camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3687 camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3690
+#, c-format
+msgid "Liveview cannot start: %s"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2915
+#: camlibs/ptp2/library.c:3752
 msgid "Nikon disable liveview failed"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:2945 camlibs/ptp2/library.c:2961
+#: camlibs/ptp2/library.c:3806
 #, fuzzy
 msgid ""
 "Sorry, your Sony camera does not seem to return a JPEG image in LiveView mode"
 msgstr "您的相机不支持文件改名。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:3108
+#: camlibs/ptp2/library.c:3913 camlibs/ptp2/library.c:3973
+#, fuzzy
+msgid ""
+"Sorry, your Panasonic camera does not seem to return a JPEG image in "
+"LiveView mode"
+msgstr "您的相机不支持文件改名。"
+
+# libgphoto2/gphoto2-camera.c:850
+#: camlibs/ptp2/library.c:4128
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:3140 camlibs/ptp2/library.c:4568
+#: camlibs/ptp2/library.c:4161 camlibs/ptp2/library.c:6162
 msgid "Failed to enable liveview on a Nikon 1, but it is required for capture"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:3382
+#: camlibs/ptp2/library.c:4405
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:3394 camlibs/ptp2/library.c:4408
-#: camlibs/ptp2/library.c:4889
+#: camlibs/ptp2/library.c:4417 camlibs/ptp2/library.c:5989
+#: camlibs/ptp2/library.c:6542
 msgid "Canon EOS Get Changes failed"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/library.c:4657
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:3672 camlibs/ptp2/library.c:4715
+#: camlibs/ptp2/library.c:4699 camlibs/ptp2/library.c:6302
 msgid "Canon disable viewfinder failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/library.c:3685
-#: camlibs/ptp2/library.c:4736
+#: camlibs/ptp2/library.c:4704 camlibs/ptp2/library.c:4712
+#: camlibs/ptp2/library.c:6323
 msgid "Canon Capture failed"
 msgstr ""
 
+#: camlibs/ptp2/library.c:5568
+msgid "Capture failed: No focus."
+msgstr ""
+
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:4191 camlibs/ptp2/library.c:4839
+#: camlibs/ptp2/library.c:5757 camlibs/ptp2/library.c:6493
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:4329
+#: camlibs/ptp2/library.c:5900
 msgid "Camera memorycard ran full during capture."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4402
+#: camlibs/ptp2/library.c:5983
 msgid "Canon EOS Half-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4416 camlibs/ptp2/library.c:4512
+#: camlibs/ptp2/library.c:5997 camlibs/ptp2/library.c:6106
 msgid "Canon EOS Capture failed to release: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4442 camlibs/ptp2/library.c:4454
+#: camlibs/ptp2/library.c:6027 camlibs/ptp2/library.c:6036
+#: camlibs/ptp2/library.c:6048
 msgid "Canon EOS Half-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4447
+#: camlibs/ptp2/library.c:6038
 msgid "Canon EOS Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4450
+#: camlibs/ptp2/library.c:6044
 msgid "Canon EOS Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4459
+#: camlibs/ptp2/library.c:6053
 msgid "Canon EOS M Full-Press failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4486
+#: camlibs/ptp2/library.c:6080
 msgid "Canon EOS M Capture failed: Perhaps no focus?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4493
+#: camlibs/ptp2/library.c:6087
 msgid "Canon EOS M Full-Release failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4502
+#: camlibs/ptp2/library.c:6096
 msgid "Canon EOS Capture failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4505
+#: camlibs/ptp2/library.c:6099
 #, c-format
 msgid "Canon EOS Capture failed: %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4514
+#: camlibs/ptp2/library.c:6108
 msgid "Canon EOS Capture failed to release: Perhaps mirror up?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4516
+#: camlibs/ptp2/library.c:6110
 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4518
+#: camlibs/ptp2/library.c:6112
 msgid "Canon EOS Capture failed to release: Card read-only?"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4520
+#: camlibs/ptp2/library.c:6114
 #, c-format
 msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4680
+#: camlibs/ptp2/library.c:6267
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
 # camlibs/sierra/sierra.c:1810
-#: camlibs/ptp2/library.c:5645 camlibs/sierra/sierra.c:1975
-#, fuzzy, c-format
+#: camlibs/ptp2/library.c:7628 camlibs/sierra/sierra.c:1962
+#, c-format
 msgid "Manufacturer: %s\n"
-msgstr "%s制造商：%s\n"
+msgstr "制造商：%s\n"
 
 # frontends/command-line/main.c:384
-#: camlibs/ptp2/library.c:5646
+#: camlibs/ptp2/library.c:7629
 #, c-format
 msgid "Model: %s\n"
 msgstr "型号：%s\n"
 
 # frontends/command-line/actions.c:159
-#: camlibs/ptp2/library.c:5647
+#: camlibs/ptp2/library.c:7630
 #, c-format
 msgid "  Version: %s\n"
 msgstr "版本：%s\n"
 
 # camlibs/sierra/sierra.c:1818
-#: camlibs/ptp2/library.c:5649
+#: camlibs/ptp2/library.c:7632
 #, c-format
 msgid "  Serial Number: %s\n"
 msgstr "  序列号：%s\n"
 
-#: camlibs/ptp2/library.c:5651
+#: camlibs/ptp2/library.c:7634
 #, c-format
 msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5657
+#: camlibs/ptp2/library.c:7640
 #, c-format
 msgid "Vendor Extension Description: %s\n"
 msgstr ""
 
 # camlibs/kodak/dc240/dc240.c:183
-#: camlibs/ptp2/library.c:5660
+#: camlibs/ptp2/library.c:7643
 #, fuzzy, c-format
 msgid "PTP Standard Version: %d.%d\n"
 msgstr "固件版本：%d.%02d\n"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/library.c:5665
+#: camlibs/ptp2/library.c:7648
 #, fuzzy, c-format
 msgid "Functional Mode: 0x%04x\n"
 msgstr "操作模式"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:5668
+#: camlibs/ptp2/library.c:7651
 #, fuzzy
 msgid ""
 "\n"
@@ -9100,1336 +11818,1441 @@
 msgstr "日期格式"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:5677
+#: camlibs/ptp2/library.c:7660
 #, fuzzy
 msgid "Display Formats: "
 msgstr "日期格式"
 
-#: camlibs/ptp2/library.c:5688
+#: camlibs/ptp2/library.c:7676
+msgid ""
+"\n"
+"Streams:"
+msgstr ""
+
+#: camlibs/ptp2/library.c:7687
+msgid "Audio"
+msgstr "音频"
+
+#: camlibs/ptp2/library.c:7712
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5699
+#: camlibs/ptp2/library.c:7723
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5712
+#: camlibs/ptp2/library.c:7736
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
+"\n"
+"设备能力：\n"
 
-#: camlibs/ptp2/library.c:5715
+#: camlibs/ptp2/library.c:7739
 msgid "\tFile Download, "
-msgstr ""
+msgstr "\t文件下载，"
 
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/library.c:5717
-#, fuzzy
+#: camlibs/ptp2/library.c:7741
 msgid "File Deletion, "
-msgstr "文件分辨率"
+msgstr "文件删除，"
 
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/library.c:5719
+#: camlibs/ptp2/library.c:7743
 #, fuzzy
 msgid "No File Deletion, "
 msgstr "文件分辨率"
 
 # camlibs/canon/serial.c:888
-#: camlibs/ptp2/library.c:5722
-#, fuzzy
+#: camlibs/ptp2/library.c:7746
 msgid "File Upload\n"
-msgstr "正在上载文件..."
+msgstr "文件上传\n"
 
-#: camlibs/ptp2/library.c:5724
+#: camlibs/ptp2/library.c:7748
 msgid "No File Upload\n"
-msgstr ""
+msgstr "无文件上传\n"
 
-#: camlibs/ptp2/library.c:5728
+#: camlibs/ptp2/library.c:7752
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5730
+#: camlibs/ptp2/library.c:7754
 msgid "\tNo Image Capture, "
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:5732
+#: camlibs/ptp2/library.c:7756
 #, fuzzy
 msgid "Open Capture, "
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:5734
+#: camlibs/ptp2/library.c:7758
 msgid "No Open Capture, "
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:5740
+#: camlibs/ptp2/library.c:7764
 #, fuzzy
 msgid "Canon Capture, "
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:5742
+#: camlibs/ptp2/library.c:7766
 msgid "Canon EOS Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5744
+#: camlibs/ptp2/library.c:7768
 msgid "Canon EOS Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5748
+#: camlibs/ptp2/library.c:7772
 msgid "Nikon Capture 1, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5750
+#: camlibs/ptp2/library.c:7774
 msgid "Nikon Capture 2, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5752
+#: camlibs/ptp2/library.c:7776
 msgid "Nikon Capture 3, "
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:5756
+#: camlibs/ptp2/library.c:7780
 #, fuzzy
 msgid "Sony Capture, "
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:5761
+#: camlibs/ptp2/library.c:7785
 msgid "Olympus E XML Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:5765
+#: camlibs/ptp2/library.c:7789
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5776
+#: camlibs/ptp2/library.c:7800
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
 # camlibs/konica/konica.c:83
-#: camlibs/ptp2/library.c:5780
+#: camlibs/ptp2/library.c:7804
 #, fuzzy
 msgid "\tCanon Wifi support\n"
 msgstr "不支持的卡。"
 
-#: camlibs/ptp2/library.c:5787
+#: camlibs/ptp2/library.c:7811
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5800
+#: camlibs/ptp2/library.c:7824
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5803
+#: camlibs/ptp2/library.c:7827
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5809
+#: camlibs/ptp2/library.c:7833
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5810
+#: camlibs/ptp2/library.c:7834
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5811
+#: camlibs/ptp2/library.c:7835
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5812
+#: camlibs/ptp2/library.c:7836
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5814 camlibs/ptp2/library.c:5826
-#: camlibs/ptp2/library.c:5837
+#: camlibs/ptp2/library.c:7838 camlibs/ptp2/library.c:7850
+#: camlibs/ptp2/library.c:7861
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "未知 (0x%02x)"
 
-#: camlibs/ptp2/library.c:5818
+#: camlibs/ptp2/library.c:7842
 #, c-format
 msgid "\tStorage Type: %s\n"
-msgstr ""
+msgstr "\t存储类型：%s\n"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/library.c:5822
+#: camlibs/ptp2/library.c:7846
 #, fuzzy
 msgid "Generic Flat"
 msgstr "普通"
 
-#: camlibs/ptp2/library.c:5823
+#: camlibs/ptp2/library.c:7847
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5824
+#: camlibs/ptp2/library.c:7848
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5830
+#: camlibs/ptp2/library.c:7854
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5833
+#: camlibs/ptp2/library.c:7857
 msgid "Read-Write"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:5834
+#: camlibs/ptp2/library.c:7858
 #, fuzzy
 msgid "Read-Only"
 msgstr "就绪"
 
-#: camlibs/ptp2/library.c:5835
+#: camlibs/ptp2/library.c:7859
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5841
+#: camlibs/ptp2/library.c:7865
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5842
+#: camlibs/ptp2/library.c:7866
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5846
+#: camlibs/ptp2/library.c:7870
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:5850
+#: camlibs/ptp2/library.c:7874
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "图像数量：%d\n"
 
-#: camlibs/ptp2/library.c:5856
+#: camlibs/ptp2/library.c:7880
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5880
+#: camlibs/ptp2/library.c:7904
 msgid " not read out.\n"
 msgstr ""
 
 # camlibs/konica/konica.c:92
-#: camlibs/ptp2/library.c:5886
+#: camlibs/ptp2/library.c:7910
 #, fuzzy
 msgid "cannot be queried.\n"
 msgstr "无法写入卡。"
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/ptp2/library.c:5895
-#, fuzzy
+#: camlibs/ptp2/library.c:7919
 msgid "read only"
-msgstr "就绪"
+msgstr "只读"
 
-#: camlibs/ptp2/library.c:5896
+#: camlibs/ptp2/library.c:7920
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:5939
+#: camlibs/ptp2/library.c:7963
 #, c-format
 msgid " error %x on query."
 msgstr ""
 
-#: camlibs/ptp2/library.c:6721 camlibs/ptp2/library.c:6847
-#: camlibs/ptp2/library.c:7060
+#: camlibs/ptp2/library.c:8747 camlibs/ptp2/library.c:8873
+#: camlibs/ptp2/library.c:9156
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:7065
+#: camlibs/ptp2/library.c:9161
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:818
-#: camlibs/ptp2/library.c:7250
+#: camlibs/ptp2/library.c:9354
 #, fuzzy
 msgid "Device does not support setting object protection."
 msgstr "该相机不支持设置配置选项。"
 
-#: camlibs/ptp2/library.c:7254
+#: camlibs/ptp2/library.c:9358
 #, c-format
 msgid "Device failed to set object protection to %d"
 msgstr ""
 
 # camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:7579
+#: camlibs/ptp2/library.c:9687
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
 "port type %x"
 msgstr "PTP 仅为 USB 相机实现。"
 
-#: camlibs/ptp2/library.c:7662
+#: camlibs/ptp2/library.c:9770
 msgid ""
 "Olympus wrapped XML support is currently only available with libxml2 support "
 "built in."
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:4649
+#: camlibs/ptp2/ptp.c:6080
 msgid "PTP Undefined Error"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:91
-#: camlibs/ptp2/ptp.c:4650
+#: camlibs/ptp2/ptp.c:6081
 msgid "PTP OK!"
 msgstr "PTP OK！"
 
 # camlibs/ptp/library.c:92
-#: camlibs/ptp2/ptp.c:4651
+#: camlibs/ptp2/ptp.c:6082
 msgid "PTP General Error"
 msgstr "PTP 通用错误"
 
 # camlibs/ptp/library.c:93
-#: camlibs/ptp2/ptp.c:4652
+#: camlibs/ptp2/ptp.c:6083
 msgid "PTP Session Not Open"
 msgstr "PTP 会话未打开"
 
 # camlibs/ptp/library.c:94
-#: camlibs/ptp2/ptp.c:4653
+#: camlibs/ptp2/ptp.c:6084
 msgid "PTP Invalid Transaction ID"
 msgstr "非法的 PTP 传输 ID"
 
 # camlibs/ptp/library.c:95
-#: camlibs/ptp2/ptp.c:4654
+#: camlibs/ptp2/ptp.c:6085
 msgid "PTP Operation Not Supported"
 msgstr "不支持的 PTP 操作"
 
 # camlibs/ptp/library.c:96
-#: camlibs/ptp2/ptp.c:4655
+#: camlibs/ptp2/ptp.c:6086
 msgid "PTP Parameter Not Supported"
 msgstr "不支持的 PTP 参数"
 
 # camlibs/ptp/library.c:97
-#: camlibs/ptp2/ptp.c:4656
+#: camlibs/ptp2/ptp.c:6087
 msgid "PTP Incomplete Transfer"
 msgstr "未完成的 PTP 传输"
 
 # camlibs/ptp/library.c:98
-#: camlibs/ptp2/ptp.c:4657
+#: camlibs/ptp2/ptp.c:6088
 msgid "PTP Invalid Storage ID"
 msgstr "非法的 PTP 存储 ID"
 
 # camlibs/ptp/library.c:99
-#: camlibs/ptp2/ptp.c:4658
+#: camlibs/ptp2/ptp.c:6089
 msgid "PTP Invalid Object Handle"
 msgstr "非法的 PTP 对象句柄"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/ptp.c:4659
+#: camlibs/ptp2/ptp.c:6090
 msgid "PTP Device Prop Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/ptp/library.c:101
-#: camlibs/ptp2/ptp.c:4660
+#: camlibs/ptp2/ptp.c:6091
 msgid "PTP Invalid Object Format Code"
 msgstr "非法的 PTP 对象格式代码"
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/ptp.c:4661
+#: camlibs/ptp2/ptp.c:6092
 msgid "PTP Store Full"
 msgstr "PTP 存储已满"
 
 # camlibs/ptp/library.c:103
-#: camlibs/ptp2/ptp.c:4662
+#: camlibs/ptp2/ptp.c:6093
 msgid "PTP Object Write Protected"
 msgstr "PTP 对象已写保护"
 
 # camlibs/ptp/library.c:104
-#: camlibs/ptp2/ptp.c:4663
+#: camlibs/ptp2/ptp.c:6094
 msgid "PTP Store Read Only"
 msgstr "只读的 PTP 存储"
 
 # camlibs/ptp/library.c:105
-#: camlibs/ptp2/ptp.c:4664
+#: camlibs/ptp2/ptp.c:6095
 msgid "PTP Access Denied"
 msgstr "PTP 访问遭拒绝"
 
 # camlibs/ptp/library.c:106
-#: camlibs/ptp2/ptp.c:4665
+#: camlibs/ptp2/ptp.c:6096
 msgid "PTP No Thumbnail Present"
 msgstr "不存在 PTP 缩略图"
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/ptp.c:4666
+#: camlibs/ptp2/ptp.c:6097
 msgid "PTP Self Test Failed"
 msgstr "PTP 自检失败"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/ptp.c:4667
+#: camlibs/ptp2/ptp.c:6098
 msgid "PTP Partial Deletion"
 msgstr "PTP 部分删除"
 
 # camlibs/ptp/library.c:109
-#: camlibs/ptp2/ptp.c:4668
+#: camlibs/ptp2/ptp.c:6099
 msgid "PTP Store Not Available"
 msgstr "PTP 存储不可用"
 
 # camlibs/ptp/library.c:111
-#: camlibs/ptp2/ptp.c:4669
+#: camlibs/ptp2/ptp.c:6100
 msgid "PTP Specification By Format Unsupported"
 msgstr "不支持的 PTP 格式规范"
 
 # camlibs/ptp/library.c:112
-#: camlibs/ptp2/ptp.c:4670
+#: camlibs/ptp2/ptp.c:6101
 msgid "PTP No Valid Object Info"
 msgstr "没有合法的 PTP 对象信息"
 
 # camlibs/ptp/library.c:113
-#: camlibs/ptp2/ptp.c:4671
+#: camlibs/ptp2/ptp.c:6102
 msgid "PTP Invalid Code Format"
 msgstr "非法的 PTP 代码格式"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/ptp.c:4672
+#: camlibs/ptp2/ptp.c:6103
 msgid "PTP Unknown Vendor Code"
 msgstr "未知的 PTP 厂家代码"
 
 # camlibs/ptp/library.c:116
-#: camlibs/ptp2/ptp.c:4673
+#: camlibs/ptp2/ptp.c:6104
 msgid "PTP Capture Already Terminated"
 msgstr "PTP 捕获已终止"
 
 # camlibs/ptp/library.c:117
-#: camlibs/ptp2/ptp.c:4674
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6105
 msgid "PTP Device Busy"
-msgstr "PTP 设备总线"
+msgstr "PTP 设备忙"
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/ptp.c:4675
+#: camlibs/ptp2/ptp.c:6106
 msgid "PTP Invalid Parent Object"
 msgstr "非法的 PTP 父对象"
 
 # camlibs/ptp/library.c:119
-#: camlibs/ptp2/ptp.c:4676
+#: camlibs/ptp2/ptp.c:6107
 msgid "PTP Invalid Device Prop Format"
 msgstr "非法的 PTP 设备属性格式"
 
 # camlibs/ptp/library.c:120
-#: camlibs/ptp2/ptp.c:4677
+#: camlibs/ptp2/ptp.c:6108
 msgid "PTP Invalid Device Prop Value"
 msgstr "非法的 PTP 设备属性值"
 
 # camlibs/ptp/library.c:121
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4711
+#: camlibs/ptp2/ptp.c:6109 camlibs/ptp2/ptp.c:6178
 msgid "PTP Invalid Parameter"
 msgstr "非法的 PTP 参数"
 
 # camlibs/ptp/library.c:122
-#: camlibs/ptp2/ptp.c:4679
+#: camlibs/ptp2/ptp.c:6110
 msgid "PTP Session Already Opened"
 msgstr "PTP 会话已打开"
 
 # camlibs/ptp/library.c:123
-#: camlibs/ptp2/ptp.c:4680
+#: camlibs/ptp2/ptp.c:6111
 msgid "PTP Transaction Canceled"
 msgstr "PTP 传输已取消"
 
 # camlibs/ptp/library.c:125
-#: camlibs/ptp2/ptp.c:4681
+#: camlibs/ptp2/ptp.c:6112
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "不支持的 PTP 目标规范"
 
-# camlibs/ptp/library.c:126
-#: camlibs/ptp2/ptp.c:4683
+# camlibs/ptp/library.c:99
+#: camlibs/ptp2/ptp.c:6113
+#, fuzzy
+msgid "Invalid Enum Handle"
+msgstr "非法的 PTP 对象句柄"
+
+# camlibs/canon/library.c:268
+#: camlibs/ptp2/ptp.c:6114
+#, fuzzy
+msgid "No Stream Enabled"
+msgstr "不知缘由"
+
+# camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
+#: camlibs/ptp2/ptp.c:6115
 #, fuzzy
+msgid "Invalid Data Set"
+msgstr "非法"
+
+# camlibs/ptp/library.c:126
+#: camlibs/ptp2/ptp.c:6117
 msgid "Filename Required"
-msgstr "需要 PTP EK 文件名"
+msgstr "需要文件名"
 
 # camlibs/ptp/library.c:127
-#: camlibs/ptp2/ptp.c:4684
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6118
 msgid "Filename Conflicts"
-msgstr "PTP EK 文件名冲突"
+msgstr "文件名冲突"
 
 # camlibs/ptp/library.c:128
-#: camlibs/ptp2/ptp.c:4685
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6119
 msgid "Filename Invalid"
-msgstr "非法的 PTP EK 文件名"
+msgstr "文件名无效"
 
-#: camlibs/ptp2/ptp.c:4687
+#: camlibs/ptp2/ptp.c:6121
 msgid "Hardware Error"
-msgstr ""
+msgstr "硬件错误"
 
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
-#: camlibs/ptp2/ptp.c:4688
+#: camlibs/ptp2/ptp.c:6122
 #, fuzzy
 msgid "Out of Focus"
 msgstr "内存耗尽"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/ptp.c:4689
+#: camlibs/ptp2/ptp.c:6123
 #, fuzzy
 msgid "Change Camera Mode Failed"
 msgstr "%s相机型号：%s\n"
 
 # camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
-#: camlibs/ptp2/ptp.c:4690
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6124
 msgid "Invalid Status"
-msgstr "非法"
+msgstr "无效的状态"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/ptp.c:4691
+#: camlibs/ptp2/ptp.c:6125
 #, fuzzy
 msgid "Set Property Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4692
+#: camlibs/ptp2/ptp.c:6126
 #, fuzzy
 msgid "Whitebalance Reset Error"
 msgstr "白平衡"
 
-#: camlibs/ptp2/ptp.c:4693
+#: camlibs/ptp2/ptp.c:6127
 msgid "Dust Reference Error"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:4694
+#: camlibs/ptp2/ptp.c:6128
 #, fuzzy
 msgid "Shutter Speed Bulb"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/ptp.c:4695
+#: camlibs/ptp2/ptp.c:6129
 msgid "Mirror Up Sequence"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4696
+#: camlibs/ptp2/ptp.c:6130
 msgid "Camera Mode Not Adjust FNumber"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4697
+#: camlibs/ptp2/ptp.c:6131
 msgid "Not in Liveview"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4698
+#: camlibs/ptp2/ptp.c:6132
 msgid "Mf Drive Step End"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4699
+#: camlibs/ptp2/ptp.c:6133
 msgid "Mf Drive Step Insufficiency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4700
+#: camlibs/ptp2/ptp.c:6134
 msgid "Advanced Transfer Cancel"
 msgstr ""
 
+# camlibs/ptp/library.c:106
+#: camlibs/ptp2/ptp.c:6135
+#, fuzzy
+msgid "No Full HD Present"
+msgstr "不存在 PTP 缩略图"
+
+# camlibs/konica/konica.c:68
+#: camlibs/ptp2/ptp.c:6136
+#, fuzzy
+msgid "Store Error"
+msgstr "闪光灯。"
+
+# camlibs/kodak/dc240/library.c:614
+#: camlibs/ptp2/ptp.c:6137
+#, fuzzy
+msgid "Store Unformatted"
+msgstr "卡尚未格式化"
+
+#: camlibs/ptp2/ptp.c:6138
+msgid "Bulb Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6139
+msgid "Silent Release Busy"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6140
+msgid "MovieFrame Release Busy"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/ptp.c:6141
+#, fuzzy
+msgid "Shutter Speed Time"
+msgstr "快门速度 (秒)"
+
+#: camlibs/ptp2/ptp.c:6142
+msgid "Waiting for 2nd Release"
+msgstr ""
+
+# camlibs/ptp/library.c:116
+#: camlibs/ptp2/ptp.c:6143
+#, fuzzy
+msgid "MirrorUpCapture Already Started"
+msgstr "PTP 捕获已终止"
+
+# camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
+#: camlibs/ptp2/ptp.c:6144
+#, fuzzy
+msgid "Invalid SBAttribute Value"
+msgstr "非法"
+
 # libgphoto2/gphoto2-result.c:46
-#: camlibs/ptp2/ptp.c:4702
+#: camlibs/ptp2/ptp.c:6146 camlibs/ptp2/ptp.c:6151
 #, fuzzy
 msgid "Unknown Command"
 msgstr "未知型号"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptp.c:4703
+#: camlibs/ptp2/ptp.c:6147 camlibs/ptp2/ptp.c:6152
 #, fuzzy
 msgid "Operation Refused"
 msgstr "操作已取消"
 
-#: camlibs/ptp2/ptp.c:4704
+#: camlibs/ptp2/ptp.c:6148
 msgid "Lens Cover Present"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/ptp.c:4705
+#: camlibs/ptp2/ptp.c:6149
 #, fuzzy
 msgid "Battery Low"
 msgstr "电池"
 
 # camlibs/canon/library.c:811
-#: camlibs/ptp2/ptp.c:4706
+#: camlibs/ptp2/ptp.c:6150
 #, fuzzy
 msgid "Camera Not Ready"
 msgstr "相机型号 (只读)"
 
-# camlibs/ptp/library.c:117
-#: camlibs/ptp2/ptp.c:4708
+#: camlibs/ptp2/ptp.c:6153
+msgid "Lens Cover Closed"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:172
+#: camlibs/ptp2/ptp.c:6154
+#, fuzzy
+msgid "Low Battery"
+msgstr "电池"
+
+# camlibs/canon/library.c:811
+#: camlibs/ptp2/ptp.c:6155
+#, fuzzy
+msgid "Object Not Ready"
+msgstr "相机型号 (只读)"
+
+#: camlibs/ptp2/ptp.c:6156
+msgid "Cannot Make Object"
+msgstr ""
+
+# camlibs/canon/library.c:811
+#: camlibs/ptp2/ptp.c:6157
+#, fuzzy
+msgid "Memory Status Not Ready"
+msgstr "相机型号 (只读)"
+
+# camlibs/ptp/library.c:101
+#: camlibs/ptp2/ptp.c:6160
+#, fuzzy
+msgid "Invalid ObjectPropCode"
+msgstr "非法的 PTP 对象格式代码"
+
+# camlibs/ptp/library.c:101
+#: camlibs/ptp2/ptp.c:6161
+#, fuzzy
+msgid "Invalid ObjectProp Format"
+msgstr "非法的 PTP 对象格式代码"
+
+# camlibs/ptp/library.c:120
+#: camlibs/ptp2/ptp.c:6162
+#, fuzzy
+msgid "Invalid ObjectProp Value"
+msgstr "非法的 PTP 设备属性值"
+
+# camlibs/ptp/library.c:99
+#: camlibs/ptp2/ptp.c:6163
 #, fuzzy
+msgid "Invalid ObjectReference"
+msgstr "非法的 PTP 对象句柄"
+
+# camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
+#: camlibs/ptp2/ptp.c:6164
+#, fuzzy
+msgid "Invalid Dataset"
+msgstr "非法"
+
+# camlibs/ptp/library.c:111
+#: camlibs/ptp2/ptp.c:6165
+#, fuzzy
+msgid "Specification By Group Unsupported"
+msgstr "不支持的 PTP 格式规范"
+
+# camlibs/ptp/library.c:111
+#: camlibs/ptp2/ptp.c:6166
+#, fuzzy
+msgid "Specification By Depth Unsupported"
+msgstr "不支持的 PTP 格式规范"
+
+#: camlibs/ptp2/ptp.c:6167
+msgid "Object Too Large"
+msgstr ""
+
+# camlibs/ptp/library.c:100
+#: camlibs/ptp2/ptp.c:6168
+#, fuzzy
+msgid "ObjectProp Not Supported"
+msgstr "不支持的 PTP 设备属性"
+
+# camlibs/ptp/library.c:94
+#: camlibs/ptp2/ptp.c:6169
+#, fuzzy
+msgid "Invalid Media Session ID"
+msgstr "非法的 PTP 传输 ID"
+
+#: camlibs/ptp2/ptp.c:6170
+msgid "Media Session Limit Reached"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:6171
+msgid "No More Data"
+msgstr ""
+
+# camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
+#: camlibs/ptp2/ptp.c:6172
+#, fuzzy
+msgid "Invalid WFC Syntax"
+msgstr "非法"
+
+# camlibs/ptp/library.c:95
+#: camlibs/ptp2/ptp.c:6173
+#, fuzzy
+msgid "WFC Version Not Supported"
+msgstr "不支持的 PTP 操作"
+
+# camlibs/ptp/library.c:117
+#: camlibs/ptp2/ptp.c:6175
 msgid "PTP No Device"
-msgstr "PTP 设备总线"
+msgstr "PTP 无设备"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/ptp.c:4709
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6176
 msgid "PTP Timeout"
-msgstr "日期和时间"
+msgstr "PTP 超时"
 
-#: camlibs/ptp2/ptp.c:4710
+#: camlibs/ptp2/ptp.c:6177
 msgid "PTP Cancel Request"
-msgstr ""
+msgstr "PTP 取消请求"
 
 # camlibs/ptp/library.c:133
-#: camlibs/ptp2/ptp.c:4712
+#: camlibs/ptp2/ptp.c:6179
 #, fuzzy
 msgid "PTP Response Expected"
 msgstr "PTP 协议错误，需要响应"
 
 # camlibs/ptp/library.c:132
-#: camlibs/ptp2/ptp.c:4713
+#: camlibs/ptp2/ptp.c:6180
 #, fuzzy
 msgid "PTP Data Expected"
 msgstr "PTP 协议错误，需要数据"
 
 # camlibs/ptp/library.c:130
-#: camlibs/ptp2/ptp.c:4714
+#: camlibs/ptp2/ptp.c:6181
 #, fuzzy
 msgid "PTP I/O Error"
 msgstr "PTP I/O 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:4738
+#: camlibs/ptp2/ptp.c:6205
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "未定义的 PTP 错误"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptp.c:4740
+#: camlibs/ptp2/ptp.c:6207
 #, fuzzy
 msgid "Functional Mode"
 msgstr "操作模式"
 
-#: camlibs/ptp2/ptp.c:4742
+#: camlibs/ptp2/ptp.c:6209
 #, fuzzy
 msgid "Compression Setting"
 msgstr "压缩"
 
-# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
-# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4743 camlibs/ptp2/ptp.c:4823 camlibs/ptp2/ptp.c:5384
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1372
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1799
-msgid "White Balance"
-msgstr "白平衡"
-
-#: camlibs/ptp2/ptp.c:4744
+#: camlibs/ptp2/ptp.c:6211
 msgid "RGB Gain"
 msgstr ""
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:4751
+#: camlibs/ptp2/ptp.c:6218
 #, fuzzy
 msgid "Exposure Time"
 msgstr "闪光灯闪光时间"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:4752
+#: camlibs/ptp2/ptp.c:6219
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/ptp.c:4754
+#: camlibs/ptp2/ptp.c:6221
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4756
+#: camlibs/ptp2/ptp.c:6223 camlibs/ptp2/ptp.c:7552 camlibs/ptp2/ptp.c:7553
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:4758
+#: camlibs/ptp2/ptp.c:6225
 msgid "Pre-Capture Delay"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/ptp.c:4760 camlibs/ptp2/ptp.c:4827
+#: camlibs/ptp2/ptp.c:6227 camlibs/ptp2/ptp.c:6294
 #, fuzzy
 msgid "Contrast"
 msgstr "对比度-"
 
-#: camlibs/ptp2/ptp.c:4762 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
+#: camlibs/ptp2/ptp.c:6229 camlibs/sierra/nikon-desc.c:540
+#: camlibs/sierra/nikon-desc.c:563
 msgid "Digital Zoom"
 msgstr "数字缩放"
 
-#: camlibs/ptp2/ptp.c:4766
+#: camlibs/ptp2/ptp.c:6233
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4767
+#: camlibs/ptp2/ptp.c:6234
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4769
+#: camlibs/ptp2/ptp.c:6236
 msgid "Upload URL"
 msgstr ""
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/ptp.c:4771
+#: camlibs/ptp2/ptp.c:6238
 #, fuzzy
 msgid "Copyright Info"
 msgstr "版权"
 
-#: camlibs/ptp2/ptp.c:4772
+#: camlibs/ptp2/ptp.c:6239
 msgid "Supported Streams"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4773
+#: camlibs/ptp2/ptp.c:6240
 msgid "Enabled Streams"
 msgstr ""
 
-# camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/ptp.c:4774
-#, fuzzy
-msgid "Video Format"
-msgstr "日期格式"
-
-# camlibs/konica/library.c:684 camlibs/konica/library.c:896
-# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
-# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/ptp.c:4775
-#, fuzzy
-msgid "Video Resolution"
-msgstr "文件分辨率"
-
-# camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/ptp.c:4776
-#, fuzzy
-msgid "Video Quality"
-msgstr "图像质量"
-
-#: camlibs/ptp2/ptp.c:4777
-msgid "Video Framerate"
-msgstr ""
-
-# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
-# camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/ptp.c:4778
-#, fuzzy
-msgid "Video Contrast"
-msgstr "对比度-"
-
-# camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/ptp2/ptp.c:4779
-#, fuzzy
-msgid "Video Brightness"
-msgstr "LCD 亮度"
-
-# camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/ptp.c:4780
-#, fuzzy
-msgid "Audio Format"
-msgstr "日期格式"
-
-#: camlibs/ptp2/ptp.c:4781
-msgid "Audio Bitrate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4782
+#: camlibs/ptp2/ptp.c:6249
 msgid "Audio Samplingrate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4783
+#: camlibs/ptp2/ptp.c:6250
 msgid "Audio Bits per sample"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4784
-msgid "Audio Volume"
-msgstr ""
-
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/ptp.c:4793
+#: camlibs/ptp2/ptp.c:6260
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "日期格式"
 
-#: camlibs/ptp2/ptp.c:4795
+#: camlibs/ptp2/ptp.c:6262
 msgid "Video Out"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptp.c:4796
+#: camlibs/ptp2/ptp.c:6263
 #, fuzzy
 msgid "Power Saving"
 msgstr "无电源指示灯"
 
 # camlibs/konica/library.c:710 camlibs/konica/library.c:915
 # camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
-#: camlibs/ptp2/ptp.c:4797
+#: camlibs/ptp2/ptp.c:6264
 #, fuzzy
 msgid "UI Language"
 msgstr "语言"
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/ptp.c:4806
+#: camlibs/ptp2/ptp.c:6273
 #, fuzzy
 msgid "Battery Type"
 msgstr "电池"
 
 # camlibs/polaroid/pdc700.c:172
-#: camlibs/ptp2/ptp.c:4807
+#: camlibs/ptp2/ptp.c:6274
 #, fuzzy
 msgid "Battery Mode"
 msgstr "电池"
 
-#: camlibs/ptp2/ptp.c:4808
+#: camlibs/ptp2/ptp.c:6275
 msgid "UILockType"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/ptp.c:4809
+#: camlibs/ptp2/ptp.c:6276
 #, fuzzy
 msgid "Camera Mode"
 msgstr "%s相机型号：%s\n"
 
-#: camlibs/ptp2/ptp.c:4811
+#: camlibs/ptp2/ptp.c:6278
 msgid "Full View File Format"
 msgstr ""
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/ptp.c:4813
+#: camlibs/ptp2/ptp.c:6280
 #, fuzzy
 msgid "Self Time"
 msgstr "自动定时"
 
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:4816 camlibs/ptp2/ptp.c:4949
-#, fuzzy
-msgid "Shooting Mode"
-msgstr "快门速度 (秒)"
-
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/ptp.c:4817
+#: camlibs/ptp2/ptp.c:6284
 #, fuzzy
 msgid "Image Mode"
 msgstr "图像大小"
 
 # camlibs/sierra/sierra.c:1355
-#: camlibs/ptp2/ptp.c:4824
+#: camlibs/ptp2/ptp.c:6291
 #, fuzzy
 msgid "Slow Shutter Setting"
 msgstr "拍摄设置"
 
-# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
-# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:4825
-#, fuzzy
-msgid "AF Mode"
-msgstr "LED 模式"
-
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/ptp.c:4826
+#: camlibs/ptp2/ptp.c:6293
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "相机设置"
 
 # camlibs/jd11/jd11.c:215 camlibs/jd11/jd11.c:263
-#: camlibs/ptp2/ptp.c:4828
+#: camlibs/ptp2/ptp.c:6295
 #, fuzzy
 msgid "Color Gain"
 msgstr "色彩设置"
 
-#: camlibs/ptp2/ptp.c:4830
+#: camlibs/ptp2/ptp.c:6297
 msgid "Sensitivity"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4831
+#: camlibs/ptp2/ptp.c:6298
 #, fuzzy
 msgid "Parameter Set"
 msgstr "参数 1"
 
-#: camlibs/ptp2/ptp.c:4838
+#: camlibs/ptp2/ptp.c:6305
 msgid "Av Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4839
+#: camlibs/ptp2/ptp.c:6306
 msgid "Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4841 camlibs/ptp2/ptp.c:4865
+#: camlibs/ptp2/ptp.c:6308 camlibs/ptp2/ptp.c:6332
 msgid "Focal Length Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4842
+#: camlibs/ptp2/ptp.c:6309
 msgid "Focal Length Wide"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4843
+#: camlibs/ptp2/ptp.c:6310
 msgid "Focal Length Denominator"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/ptp.c:4844
+#: camlibs/ptp2/ptp.c:6311
 #, fuzzy
 msgid "Capture Transfer Mode"
 msgstr "%s相机型号：%s\n"
 
-#: camlibs/ptp2/ptp.c:4846
+#: camlibs/ptp2/ptp.c:6313
 msgid "Name Prefix"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/ptp.c:4847
+#: camlibs/ptp2/ptp.c:6314
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "图像质量"
 
-#: camlibs/ptp2/ptp.c:4848
+#: camlibs/ptp2/ptp.c:6315
 msgid "Supported Thumb Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4849
+#: camlibs/ptp2/ptp.c:6316
 msgid "Size of Output Data from Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4850
+#: camlibs/ptp2/ptp.c:6317
 msgid "Size of Input Data to Camera"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4851
+#: camlibs/ptp2/ptp.c:6318
 msgid "Remote API Version"
 msgstr ""
 
 # camlibs/canon/serial.c:1190
-#: camlibs/ptp2/ptp.c:4854
+#: camlibs/ptp2/ptp.c:6321
 #, fuzzy
 msgid "Camera Owner"
 msgstr "相机就绪。\n"
 
-#: camlibs/ptp2/ptp.c:4855
+#: camlibs/ptp2/ptp.c:6322
 msgid "UNIX Time"
-msgstr ""
+msgstr "UNIX 时间"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/ptp.c:4856
+#: camlibs/ptp2/ptp.c:6323
 #, fuzzy
 msgid "Camera Body ID"
 msgstr "%s相机型号：%s\n"
 
-#: camlibs/ptp2/ptp.c:4858
+#: camlibs/ptp2/ptp.c:6325
 msgid "Disp Av"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4859
+#: camlibs/ptp2/ptp.c:6326
 msgid "Av Open Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4860
+#: camlibs/ptp2/ptp.c:6327
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "数字缩放"
 
-#: camlibs/ptp2/ptp.c:4861
+#: camlibs/ptp2/ptp.c:6328
 #, fuzzy
 msgid "Ml Spot Position"
 msgstr "聚焦位置"
 
-#: camlibs/ptp2/ptp.c:4862
+#: camlibs/ptp2/ptp.c:6329
 msgid "Disp Av Max"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4863
+#: camlibs/ptp2/ptp.c:6330
 msgid "Av Max Apex"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4864
+#: camlibs/ptp2/ptp.c:6331
 msgid "EZoom Start Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4866
+#: camlibs/ptp2/ptp.c:6333
 msgid "EZoom Size of Tele"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4869
+#: camlibs/ptp2/ptp.c:6336
 msgid "Flash Quantity Count"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4870
+#: camlibs/ptp2/ptp.c:6337
 msgid "Rotation Angle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4871
+#: camlibs/ptp2/ptp.c:6338
 msgid "Rotation Scene"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4872
+#: camlibs/ptp2/ptp.c:6339
 msgid "Event Emulate Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4874
+#: camlibs/ptp2/ptp.c:6341
 msgid "Type of Slideshow"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4875
+#: camlibs/ptp2/ptp.c:6342
 msgid "Average Filesizes"
 msgstr ""
 
 # frontends/command-line/main.c:384
-#: camlibs/ptp2/ptp.c:4876
+#: camlibs/ptp2/ptp.c:6343
 #, fuzzy
 msgid "Model ID"
 msgstr "型号："
 
+#: camlibs/ptp2/ptp.c:6344
+msgid "EOS Fixed Movie Switch"
+msgstr ""
+
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:4885
+#: camlibs/ptp2/ptp.c:6585
 #, fuzzy
 msgid "Shooting Bank"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/ptp.c:4887
+#: camlibs/ptp2/ptp.c:6587
 msgid "Shooting Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4889
+#: camlibs/ptp2/ptp.c:6589
 msgid "Shooting Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4891
+#: camlibs/ptp2/ptp.c:6591
 msgid "Shooting Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4893
+#: camlibs/ptp2/ptp.c:6593
 msgid "Shooting Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4895
+#: camlibs/ptp2/ptp.c:6595
 msgid "Reset Bank 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4913
+#: camlibs/ptp2/ptp.c:6613
 msgid "White Balance Colour Temperature"
 msgstr ""
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4915
+#: camlibs/ptp2/ptp.c:6615
 #, fuzzy
 msgid "White Balance Preset Number"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4917
+#: camlibs/ptp2/ptp.c:6617
 #, fuzzy
 msgid "White Balance Preset Name 0"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4919
+#: camlibs/ptp2/ptp.c:6619
 #, fuzzy
 msgid "White Balance Preset Name 1"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4921
+#: camlibs/ptp2/ptp.c:6621
 #, fuzzy
 msgid "White Balance Preset Name 2"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4923
+#: camlibs/ptp2/ptp.c:6623
 #, fuzzy
 msgid "White Balance Preset Name 3"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4925
+#: camlibs/ptp2/ptp.c:6625
 #, fuzzy
 msgid "White Balance Preset Name 4"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4927
+#: camlibs/ptp2/ptp.c:6627
 #, fuzzy
 msgid "White Balance Preset Value 0"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4929
+#: camlibs/ptp2/ptp.c:6629
 #, fuzzy
 msgid "White Balance Preset Value 1"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4931
+#: camlibs/ptp2/ptp.c:6631
 #, fuzzy
 msgid "White Balance Preset Value 2"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4933
+#: camlibs/ptp2/ptp.c:6633
 #, fuzzy
 msgid "White Balance Preset Value 3"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:4935
+#: camlibs/ptp2/ptp.c:6635
 #, fuzzy
 msgid "White Balance Preset Value 4"
 msgstr "白平衡"
 
-#: camlibs/ptp2/ptp.c:4945
+#: camlibs/ptp2/ptp.c:6645
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4947
+#: camlibs/ptp2/ptp.c:6647
 msgid "Lens Maximum Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4955
+#: camlibs/ptp2/ptp.c:6655
 msgid "Auto DX Crop"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4967
+#: camlibs/ptp2/ptp.c:6667
 msgid "Menu Bank Name A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4969
+#: camlibs/ptp2/ptp.c:6669
 msgid "Menu Bank Name B"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4971
+#: camlibs/ptp2/ptp.c:6671
 msgid "Menu Bank Name C"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4973
+#: camlibs/ptp2/ptp.c:6673
 msgid "Menu Bank Name D"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4975
+#: camlibs/ptp2/ptp.c:6675
 msgid "Reset Menu Bank"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:4993
+#: camlibs/ptp2/ptp.c:6693
 msgid "Vertical AF On"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:4997
+#: camlibs/ptp2/ptp.c:6697
 #, fuzzy
 msgid "Focus Area Zone"
 msgstr "聚焦模式"
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/ptp.c:4999
+#: camlibs/ptp2/ptp.c:6699
 #, fuzzy
 msgid "Enable Copyright"
 msgstr "版权"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5003
+#: camlibs/ptp2/ptp.c:6703
 #, fuzzy
 msgid "Exposure ISO Step"
 msgstr "闪光灯闪光时间"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5005
+#: camlibs/ptp2/ptp.c:6705
 #, fuzzy
 msgid "Exposure Step"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5007
+#: camlibs/ptp2/ptp.c:6707
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:5011
+#: camlibs/ptp2/ptp.c:6711
 msgid "Centre Weight Area"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5013
+#: camlibs/ptp2/ptp.c:6713
 #, fuzzy
 msgid "Exposure Base Matrix"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5015
+#: camlibs/ptp2/ptp.c:6715
 #, fuzzy
 msgid "Exposure Base Center"
 msgstr "曝光测定"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5017
+#: camlibs/ptp2/ptp.c:6717
 #, fuzzy
 msgid "Exposure Base Spot"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5019
+#: camlibs/ptp2/ptp.c:6719
 msgid "Live View AF Area"
 msgstr ""
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:5027
+#: camlibs/ptp2/ptp.c:6727
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/ptp2/ptp.c:5029
+#: camlibs/ptp2/ptp.c:6729
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "自动定时器时间"
 
-#: camlibs/ptp2/ptp.c:5033
+#: camlibs/ptp2/ptp.c:6733
 msgid "Img Conf Time"
 msgstr ""
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:5035
+#: camlibs/ptp2/ptp.c:6735
 #, fuzzy
 msgid "Auto Off Timers"
 msgstr "自动关机时间"
 
-#: camlibs/ptp2/ptp.c:5037
+#: camlibs/ptp2/ptp.c:6737
 msgid "Angle Level"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:5039
+#: camlibs/ptp2/ptp.c:6739
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "快门速度 (秒)"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5043
+#: camlibs/ptp2/ptp.c:6743
 #, fuzzy
 msgid "Exposure delay mode"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/ptp.c:5045 camlibs/ptp2/ptp.c:5378
+#: camlibs/ptp2/ptp.c:6745 camlibs/ptp2/ptp.c:7086
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:5053
+#: camlibs/ptp2/ptp.c:6753
 msgid "LCD Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5055
+#: camlibs/ptp2/ptp.c:6755
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:5057
+#: camlibs/ptp2/ptp.c:6757
 msgid "On screen tips"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5059
+#: camlibs/ptp2/ptp.c:6759
 msgid "Artist Name"
 msgstr ""
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/ptp.c:5061
+#: camlibs/ptp2/ptp.c:6761
 #, fuzzy
 msgid "Copyright Information"
 msgstr "版权"
 
 # camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/ptp2/ptp.c:5069
+#: camlibs/ptp2/ptp.c:6769
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "强制闪光\n"
 
-#: camlibs/ptp2/ptp.c:5073
+#: camlibs/ptp2/ptp.c:6773
 msgid "Manual Mode Bracketing"
 msgstr ""
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:5077
+#: camlibs/ptp2/ptp.c:6777
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "自动，消红眼"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:5078
+#: camlibs/ptp2/ptp.c:6778
 #, fuzzy
 msgid "NIKON Auto Bracketing Set"
 msgstr "自动，消红眼"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:5080
+#: camlibs/ptp2/ptp.c:6780
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/ptp.c:5082
+#: camlibs/ptp2/ptp.c:6782
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "当前模式：回放模式\n"
 
-#: camlibs/ptp2/ptp.c:5084
+#: camlibs/ptp2/ptp.c:6784
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5086
+#: camlibs/ptp2/ptp.c:6786
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5088
+#: camlibs/ptp2/ptp.c:6788
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5090
+#: camlibs/ptp2/ptp.c:6790
 msgid "Customise Command Dials"
 msgstr ""
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/ptp.c:5094
+#: camlibs/ptp2/ptp.c:6794
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "照片设置"
 
-#: camlibs/ptp2/ptp.c:5098
+#: camlibs/ptp2/ptp.c:6798
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5100
+#: camlibs/ptp2/ptp.c:6800
 msgid "No CF Card Release"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:5102
+#: camlibs/ptp2/ptp.c:6802
 #, fuzzy
 msgid "Center Button Zoom Ratio"
 msgstr "场景测量模式"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptp.c:5104
+#: camlibs/ptp2/ptp.c:6804
 #, fuzzy
 msgid "Function Button 2"
 msgstr "操作模式"
@@ -10442,362 +13265,354 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/ptp.c:5108
+#: camlibs/ptp2/ptp.c:6808
 #, fuzzy
 msgid "Normal AF On"
 msgstr "普通"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/ptp.c:5110
+#: camlibs/ptp2/ptp.c:6810
 #, fuzzy
 msgid "Clean Image Sensor"
 msgstr "相机设置"
 
-#: camlibs/ptp2/ptp.c:5112
+#: camlibs/ptp2/ptp.c:6812
 #, fuzzy
 msgid "Image Comment String"
 msgstr "图像调整"
 
-#: camlibs/ptp2/ptp.c:5114
+#: camlibs/ptp2/ptp.c:6814
 #, fuzzy
 msgid "Image Comment Enable"
 msgstr "图像调整"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/ptp.c:5116
+#: camlibs/ptp2/ptp.c:6816
 #, fuzzy
 msgid "Image Rotation"
 msgstr "相机设置"
 
-#: camlibs/ptp2/ptp.c:5118
+#: camlibs/ptp2/ptp.c:6818
 msgid "Manual Set Lens Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5120
+#: camlibs/ptp2/ptp.c:6820
 msgid "Movie Screen Size"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5122
+#: camlibs/ptp2/ptp.c:6822
 msgid "Movie Voice"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5124
+#: camlibs/ptp2/ptp.c:6824
 msgid "Movie Microphone"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5126
+#: camlibs/ptp2/ptp.c:6826
 msgid "Movie Card Slot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5132
+#: camlibs/ptp2/ptp.c:6832
 msgid "Monitor Off Delay"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5134
+#: camlibs/ptp2/ptp.c:6834
 #, fuzzy
 msgid "Bracketing Enable"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5136
+#: camlibs/ptp2/ptp.c:6836
 #, fuzzy
 msgid "Exposure Bracketing Step"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5138
+#: camlibs/ptp2/ptp.c:6838
 #, fuzzy
 msgid "Exposure Bracketing Program"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5140
+#: camlibs/ptp2/ptp.c:6840
 #, fuzzy
 msgid "Auto Exposure Bracket Count"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:5141
+#: camlibs/ptp2/ptp.c:6841
 #, fuzzy
 msgid "White Balance Bracket Step"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:5142
+#: camlibs/ptp2/ptp.c:6842
 #, fuzzy
 msgid "White Balance Bracket Program"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:5144
+#: camlibs/ptp2/ptp.c:6844
 #, fuzzy
 msgid "Lens ID"
 msgstr "镜头模式"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:5146
+#: camlibs/ptp2/ptp.c:6846
 #, fuzzy
 msgid "Lens Sort"
 msgstr "镜头模式"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:5148
+#: camlibs/ptp2/ptp.c:6848
 #, fuzzy
 msgid "Lens Type"
 msgstr "镜头模式"
 
-#: camlibs/ptp2/ptp.c:5150
+#: camlibs/ptp2/ptp.c:6850
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5152
+#: camlibs/ptp2/ptp.c:6852
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5154
+#: camlibs/ptp2/ptp.c:6854
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5156
+#: camlibs/ptp2/ptp.c:6856
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5158
+#: camlibs/ptp2/ptp.c:6858
 msgid "Finder ISO Display"
 msgstr ""
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:5160
+#: camlibs/ptp2/ptp.c:6860
 #, fuzzy
 msgid "Auto Off Photo"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:5162
+#: camlibs/ptp2/ptp.c:6862
 #, fuzzy
 msgid "Auto Off Menu"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:5164
+#: camlibs/ptp2/ptp.c:6864
 #, fuzzy
 msgid "Auto Off Info"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/ptp2/ptp.c:5166
+#: camlibs/ptp2/ptp.c:6866
 #, fuzzy
 msgid "Self Timer Shot Number"
 msgstr "自动定时器时间"
 
-#: camlibs/ptp2/ptp.c:5168
+#: camlibs/ptp2/ptp.c:6868
 msgid "Vignette Control"
 msgstr ""
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5174
+#: camlibs/ptp2/ptp.c:6874
 #, fuzzy
 msgid "Nikon Exposure Time"
 msgstr "闪光灯闪光时间"
 
 # camlibs/minolta/dimagev/dimagev.c:400
-#: camlibs/ptp2/ptp.c:5176
-#, fuzzy
+#: camlibs/ptp2/ptp.c:6876
 msgid "Warning Status"
-msgstr "卡状态：\t\t"
+msgstr "警告状态"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:5183
+#: camlibs/ptp2/ptp.c:6883
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD 模式"
 
-#: camlibs/ptp2/ptp.c:5185
+#: camlibs/ptp2/ptp.c:6885
 msgid "Active AF Sensor"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5189
+#: camlibs/ptp2/ptp.c:6889
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/ptp.c:5193
+#: camlibs/ptp2/ptp.c:6893
 #, fuzzy
 msgid "USB Speed"
 msgstr "ISO 速度"
 
 # camlibs/sierra/sierra.c:1818
-#: camlibs/ptp2/ptp.c:5195
+#: camlibs/ptp2/ptp.c:6895
 #, fuzzy
 msgid "CCD Serial Number"
 msgstr "%s序列号：%s\n"
 
-#: camlibs/ptp2/ptp.c:5199
+#: camlibs/ptp2/ptp.c:6899
 msgid "Group PTN Type"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5201
+#: camlibs/ptp2/ptp.c:6901
 #, fuzzy
 msgid "FNumber Lock"
 msgstr "聚焦模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5203
+#: camlibs/ptp2/ptp.c:6903
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:1355
-#: camlibs/ptp2/ptp.c:5205
+#: camlibs/ptp2/ptp.c:6905
 #, fuzzy
 msgid "TV Lock Setting"
 msgstr "拍摄设置"
 
 # camlibs/sierra/sierra.c:1355
-#: camlibs/ptp2/ptp.c:5207
+#: camlibs/ptp2/ptp.c:6907
 #, fuzzy
 msgid "AV Lock Setting"
 msgstr "拍摄设置"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/ptp.c:5209
+#: camlibs/ptp2/ptp.c:6909
 #, fuzzy
 msgid "Illum Setting"
 msgstr "相机设置"
 
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/ptp.c:5211
+#: camlibs/ptp2/ptp.c:6911
 #, fuzzy
 msgid "Focus Point Bright"
 msgstr "聚焦错误。"
 
-#: camlibs/ptp2/ptp.c:5213
+#: camlibs/ptp2/ptp.c:6913
 msgid "External Flash Attached"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5215
+#: camlibs/ptp2/ptp.c:6915
 msgid "External Flash Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5217
+#: camlibs/ptp2/ptp.c:6917
 msgid "External Flash Sort"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5219 camlibs/ptp2/ptp.c:5223
+#: camlibs/ptp2/ptp.c:6919 camlibs/ptp2/ptp.c:6923
 #, fuzzy
 msgid "External Flash Mode"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/ptp.c:5221
+#: camlibs/ptp2/ptp.c:6921
 #, fuzzy
 msgid "External Flash Compensation"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:5237
+#: camlibs/ptp2/ptp.c:6937
 msgid "BW Filler Effect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5239
+#: camlibs/ptp2/ptp.c:6939
 msgid "BW Sharpness"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/ptp.c:5241
+#: camlibs/ptp2/ptp.c:6941
 #, fuzzy
 msgid "BW Contrast"
 msgstr "对比度-"
 
-#: camlibs/ptp2/ptp.c:5243
+#: camlibs/ptp2/ptp.c:6943
 msgid "BW Setting Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5245
+#: camlibs/ptp2/ptp.c:6945
 msgid "Slot 2 Save Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5247
+#: camlibs/ptp2/ptp.c:6947
 msgid "Raw Bit Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/ptp.c:5251
+#: camlibs/ptp2/ptp.c:6951
 #, fuzzy
-msgid "Flourescent Type"
+msgid "Fluorescent Type"
 msgstr "荧光"
 
-#: camlibs/ptp2/ptp.c:5253
+#: camlibs/ptp2/ptp.c:6953
 msgid "Tune Colour Temperature"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/ptp.c:5255
+#: camlibs/ptp2/ptp.c:6955
 #, fuzzy
 msgid "Tune Preset 0"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/ptp.c:5257
+#: camlibs/ptp2/ptp.c:6957
 #, fuzzy
 msgid "Tune Preset 1"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/ptp.c:5259
+#: camlibs/ptp2/ptp.c:6959
 #, fuzzy
 msgid "Tune Preset 2"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/ptp.c:5261
+#: camlibs/ptp2/ptp.c:6961
 #, fuzzy
 msgid "Tune Preset 3"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/ptp.c:5263
+#: camlibs/ptp2/ptp.c:6963
 #, fuzzy
 msgid "Tune Preset 4"
 msgstr "葡萄牙语"
 
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5267
-#, fuzzy
-msgid "Autofocus Mode"
-msgstr "聚焦模式"
-
-#: camlibs/ptp2/ptp.c:5269
+#: camlibs/ptp2/ptp.c:6969
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5271
+#: camlibs/ptp2/ptp.c:6971
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5287
+#: camlibs/ptp2/ptp.c:6987
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5291
+#: camlibs/ptp2/ptp.c:6991
 msgid "Flash Mode Commander Power"
 msgstr ""
 
@@ -10813,476 +13628,496 @@
 # camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
 # camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
 # camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/ptp2/ptp.c:5293
+#: camlibs/ptp2/ptp.c:6993
 #, fuzzy
 msgid "Auto FP"
 msgstr "自动"
 
-#: camlibs/ptp2/ptp.c:5297
+#: camlibs/ptp2/ptp.c:6997
 msgid "Warning Display"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/ptp2/ptp.c:5299
+#: camlibs/ptp2/ptp.c:6999
 #, fuzzy
 msgid "Battery Cell Kind"
 msgstr "%s电池寿命：%i\n"
 
-#: camlibs/ptp2/ptp.c:5301
+#: camlibs/ptp2/ptp.c:7001
 msgid "ISO Auto High Limit"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5305
+#: camlibs/ptp2/ptp.c:7005
 msgid "Continuous Speed High"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/ptp.c:5307
+#: camlibs/ptp2/ptp.c:7007
 #, fuzzy
 msgid "Info Disp Setting"
 msgstr "闪光灯设置"
 
-#: camlibs/ptp2/ptp.c:5309
+#: camlibs/ptp2/ptp.c:7009
 msgid "Preview Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5311
+#: camlibs/ptp2/ptp.c:7011
 msgid "Preview Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5313
+#: camlibs/ptp2/ptp.c:7013
 msgid "AEAF Lock Button 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5315
+#: camlibs/ptp2/ptp.c:7015
 msgid "Indicator Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5317
+#: camlibs/ptp2/ptp.c:7017
 msgid "Cell Kind Priority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5319
+#: camlibs/ptp2/ptp.c:7019
 msgid "Bracketing Frames and Steps"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:5321
+#: camlibs/ptp2/ptp.c:7021
 #, fuzzy
 msgid "Live View Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/ptp.c:5323
+#: camlibs/ptp2/ptp.c:7023
 msgid "Live View Drive Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5325
+#: camlibs/ptp2/ptp.c:7025
 msgid "Live View Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5327
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5329
+#: camlibs/ptp2/ptp.c:7029
 msgid "Live View Prohibit Condition"
 msgstr ""
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5331
+#: camlibs/ptp2/ptp.c:7031
 #, fuzzy
 msgid "Exposure Display Status"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5333
+#: camlibs/ptp2/ptp.c:7033
 msgid "Exposure Indicate Status"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5335
+#: camlibs/ptp2/ptp.c:7035
 msgid "Info Display Error Status"
 msgstr ""
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5337
+#: camlibs/ptp2/ptp.c:7037
 #, fuzzy
 msgid "Exposure Indicate Lightup"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5343
+#: camlibs/ptp2/ptp.c:7043
 msgid "Flash MRepeat Value"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5345
+#: camlibs/ptp2/ptp.c:7045
 #, fuzzy
 msgid "Flash MRepeat Count"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/ptp.c:5347
+#: camlibs/ptp2/ptp.c:7047
 msgid "Flash MRepeat Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5369
+#: camlibs/ptp2/ptp.c:7069
 msgid "Active Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5371
+#: camlibs/ptp2/ptp.c:7071
 msgid "Change Pic Ctrl Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5374 camlibs/ptp2/ptp.c:5445
-msgid "ISO"
+# camlibs/canon/serial.c:1190
+#: camlibs/ptp2/ptp.c:7088
+#, fuzzy
+msgid "Camera Language"
+msgstr "相机就绪。\n"
+
+#: camlibs/ptp2/ptp.c:7090
+msgid "Release without SD card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5386
+#: camlibs/ptp2/ptp.c:7098
 #, fuzzy
 msgid "Image Compression"
 msgstr "压缩"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5395
+#: camlibs/ptp2/ptp.c:7295
 #, fuzzy
 msgid "Secure Time"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5396
+#: camlibs/ptp2/ptp.c:7296
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5397
+#: camlibs/ptp2/ptp.c:7297
 msgid "Revocation Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5399
+#: camlibs/ptp2/ptp.c:7299
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5401
+#: camlibs/ptp2/ptp.c:7301
 msgid "Friendly Device Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5402
+#: camlibs/ptp2/ptp.c:7302
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5403
+#: camlibs/ptp2/ptp.c:7303
 msgid "Device Icon"
-msgstr ""
+msgstr "设备图标"
 
-#: camlibs/ptp2/ptp.c:5404
+#: camlibs/ptp2/ptp.c:7304
 msgid "Session Initiator Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5405
+#: camlibs/ptp2/ptp.c:7305
 msgid "Perceived Device Type"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5406
+#: camlibs/ptp2/ptp.c:7306
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5407
+#: camlibs/ptp2/ptp.c:7307
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5409
+#: camlibs/ptp2/ptp.c:7309
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5410
+#: camlibs/ptp2/ptp.c:7310
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5411
+#: camlibs/ptp2/ptp.c:7311
 msgid "PlaysForSure ID"
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/ptp.c:5419
-#, fuzzy
-msgid "Quality"
-msgstr "图像质量"
-
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5420
+#: camlibs/ptp2/ptp.c:7321
 #, fuzzy
 msgid "Release Mode"
 msgstr "闪光灯模式"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5421
+#: camlibs/ptp2/ptp.c:7322
 #, fuzzy
 msgid "Focus Areas"
 msgstr "聚焦模式"
 
-# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:5422
+# camlibs/konica/konica.c:62
+#: camlibs/ptp2/ptp.c:7326
 #, fuzzy
-msgid "AE Lock"
-msgstr "曝光"
+msgid "Focus Point"
+msgstr "聚焦错误。"
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/ptp.c:5434
+#: camlibs/ptp2/ptp.c:7537
 #, fuzzy
 msgid "Image size"
 msgstr "图像大小"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:5435
+#: camlibs/ptp2/ptp.c:7538 camlibs/ptp2/ptp.c:7539 camlibs/ptp2/ptp.c:7555
 #, fuzzy
 msgid "Shutter speed"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/ptp.c:5436
-msgid "Color temperature"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5439
+#: camlibs/ptp2/ptp.c:7543
 #, fuzzy
 msgid "Focus status"
 msgstr "聚焦位置"
 
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
-#: camlibs/ptp2/ptp.c:5440
+#: camlibs/ptp2/ptp.c:7544
 #, fuzzy
 msgid "Objects in memory"
 msgstr "内存耗尽"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:5441
+#: camlibs/ptp2/ptp.c:7545
 #, fuzzy
 msgid "Expose Index"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:5444
+#: camlibs/ptp2/ptp.c:7548
 msgid "AB Filter"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:999
-#: camlibs/ptp2/ptp.c:5447
+#: camlibs/ptp2/ptp.c:7558
 #, fuzzy
 msgid "Still Image"
 msgstr "图像"
 
-#: camlibs/ptp2/ptp.c:5589 camlibs/ptp2/ptp.c:5595 camlibs/ptp2/ptp.c:5596
-#: camlibs/ptp2/ptp.c:5603
+#: camlibs/ptp2/ptp.c:7566
+msgid "Near Far"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:7567
+#, fuzzy
+msgid "AF Area Position"
+msgstr "聚焦位置"
+
+# camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
+#: camlibs/ptp2/ptp.c:7568
+#, fuzzy
+msgid "Date Time"
+msgstr "日期和时间"
+
+#: camlibs/ptp2/ptp.c:7801 camlibs/ptp2/ptp.c:7811 camlibs/ptp2/ptp.c:7812
+#: camlibs/ptp2/ptp.c:7819
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5597
+#: camlibs/ptp2/ptp.c:7813
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5615
+#: camlibs/ptp2/ptp.c:7831
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:5618
+#: camlibs/ptp2/ptp.c:7834
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5624 camlibs/ricoh/library.c:329
-#: camlibs/sierra/nikon-desc.c:284
+#: camlibs/ptp2/ptp.c:7840 camlibs/ricoh/library.c:313
+#: camlibs/sierra/nikon-desc.c:271
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5632
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#: camlibs/ptp2/ptp.c:7846
+#, fuzzy
+msgid "Manual Focus"
+msgstr "无手册"
+
+#: camlibs/ptp2/ptp.c:7848
 msgid "Automatic Macro (close-up)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5637
+#: camlibs/ptp2/ptp.c:7853
 msgid "Center Weighted Average"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5639
+#: camlibs/ptp2/ptp.c:7855
 msgid "Center-spot"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/ptp.c:5641
+#: camlibs/ptp2/ptp.c:7857
 #, fuzzy
 msgid "Automatic flash"
 msgstr "自动\n"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:5644
+#: camlibs/ptp2/ptp.c:7860
 #, fuzzy
 msgid "Automatic Red-eye Reduction"
 msgstr "自动，消红眼"
 
-#: camlibs/ptp2/ptp.c:5645
+#: camlibs/ptp2/ptp.c:7861
 #, fuzzy
 msgid "Red-eye fill flash"
 msgstr "红眼闪光灯"
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptp.c:5663
+#: camlibs/ptp2/ptp.c:7879
 #, fuzzy
 msgid "Power Wind"
 msgstr "无电源指示灯"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/ptp.c:5669
+#: camlibs/ptp2/ptp.c:7885
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "远程"
 
-#: camlibs/ptp2/ptp.c:5727
+#: camlibs/ptp2/ptp.c:7945
 msgid "AF Lock only"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:5731
+#: camlibs/ptp2/ptp.c:7949
 #, fuzzy
 msgid "Flash Lock"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/ptp.c:5782
+#: camlibs/ptp2/ptp.c:8000
 msgid "Reset focus point to center"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5783
+#: camlibs/ptp2/ptp.c:8001
 msgid "Highlight active focus point"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5784
+#: camlibs/ptp2/ptp.c:8002
 msgid "Unused"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5829
+#: camlibs/ptp2/ptp.c:8047
 msgid "SDRam"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5831
+#: camlibs/ptp2/ptp.c:8049
 msgid "USB 1.1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5832
+#: camlibs/ptp2/ptp.c:8050
 msgid "USB 2.0"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/ptp2/ptp.c:5844
+#: camlibs/ptp2/ptp.c:8062
 #, fuzzy
 msgid "LCD Backlight"
 msgstr "LCD 亮度"
 
-#: camlibs/ptp2/ptp.c:5845
+#: camlibs/ptp2/ptp.c:8063
 msgid "LCD Backlight and Info Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5903
+#: camlibs/ptp2/ptp.c:8121
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:5904
+#: camlibs/ptp2/ptp.c:8122
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5905
+#: camlibs/ptp2/ptp.c:8123
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5906
+#: camlibs/ptp2/ptp.c:8124
 msgid "15 mins"
 msgstr ""
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/ptp.c:5941
+#: camlibs/ptp2/ptp.c:8159
 #, fuzzy
 msgid "Dark on light"
 msgstr "日光"
 
 # camlibs/konica/konica.c:104
-#: camlibs/ptp2/ptp.c:5942
+#: camlibs/ptp2/ptp.c:8160
 #, fuzzy
 msgid "Light on dark"
 msgstr "光线太暗。"
 
-#: camlibs/ptp2/ptp.c:5983
+#: camlibs/ptp2/ptp.c:8201
 msgid "Lithium Ion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5984
+#: camlibs/ptp2/ptp.c:8202
 msgid "Nickel hydride"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5985
+#: camlibs/ptp2/ptp.c:8203
 msgid "Nickel cadmium"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5986
+#: camlibs/ptp2/ptp.c:8204
 msgid "Alkalium manganese"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5990
+#: camlibs/ptp2/ptp.c:8208
 msgid "Warning Level 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5991
+#: camlibs/ptp2/ptp.c:8209
 msgid "Emergency"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5992
+#: camlibs/ptp2/ptp.c:8210
 msgid "Warning Level 0"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:5995
+#: camlibs/ptp2/ptp.c:8213
 msgid "Economy"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479
 # camlibs/sierra/sierra.c:1684
-#: camlibs/ptp2/ptp.c:5999
+#: camlibs/ptp2/ptp.c:8217
 msgid "SuperFine"
 msgstr "超精细"
 
-#: camlibs/ptp2/ptp.c:6018
+#: camlibs/ptp2/ptp.c:8236
 msgid "Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6019
+#: camlibs/ptp2/ptp.c:8237
 msgid "Low Speed Synchronization"
 msgstr ""
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:6020
+#: camlibs/ptp2/ptp.c:8238
 #, fuzzy
 msgid "Auto + Red Eye Suppression"
 msgstr "自动，消红眼"
 
-#: camlibs/ptp2/ptp.c:6021
+#: camlibs/ptp2/ptp.c:8239
 msgid "On + Red Eye Suppression"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6035
+#: camlibs/ptp2/ptp.c:8253
 msgid "Distant View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6036
+#: camlibs/ptp2/ptp.c:8254
 msgid "High-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6037
+#: camlibs/ptp2/ptp.c:8255
 msgid "Low-Speed Shutter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6038 camlibs/ptp2/ptp.c:6102
+#: camlibs/ptp2/ptp.c:8256 camlibs/ptp2/ptp.c:8320
 msgid "Night View"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6039
+#: camlibs/ptp2/ptp.c:8257
 msgid "Grayscale"
 msgstr ""
 
@@ -11294,695 +14129,693 @@
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/ptp.c:6045
+#: camlibs/ptp2/ptp.c:8263
 #, fuzzy
 msgid "Pan Focus"
 msgstr "无手册"
 
-#: camlibs/ptp2/ptp.c:6049
+#: camlibs/ptp2/ptp.c:8267
 msgid "Single-Frame Shooting"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:6050
+#: camlibs/ptp2/ptp.c:8268
 #, fuzzy
 msgid "Continuous Shooting"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/ptp.c:6051
+#: camlibs/ptp2/ptp.c:8269
 msgid "Timer (Single) Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6052
+#: camlibs/ptp2/ptp.c:8270
 msgid "Continuous Low-speed Shooting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6053
+#: camlibs/ptp2/ptp.c:8271
 msgid "Continuous High-speed Shooting"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
-#: camlibs/ptp2/ptp.c:6056 camlibs/ricoh/library.c:377
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
+#: camlibs/ptp2/ptp.c:8274 camlibs/ricoh/library.c:361
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1156
 msgid "2x"
 msgstr "2x"
 
-#: camlibs/ptp2/ptp.c:6057 camlibs/ricoh/library.c:379
+#: camlibs/ptp2/ptp.c:8275 camlibs/ricoh/library.c:363
 msgid "4x"
 msgstr "4x"
 
-#: camlibs/ptp2/ptp.c:6058
+#: camlibs/ptp2/ptp.c:8276
 msgid "Smooth"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6060
+#: camlibs/ptp2/ptp.c:8278
 msgid "Center-weighted Metering"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:6061
+#: camlibs/ptp2/ptp.c:8279
 #, fuzzy
 msgid "Spot Metering"
 msgstr "场景测量模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:6062
+#: camlibs/ptp2/ptp.c:8280
 #, fuzzy
 msgid "Average Metering"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:6063
+#: camlibs/ptp2/ptp.c:8281
 #, fuzzy
 msgid "Evaluative Metering"
 msgstr "曝光测定"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/ptp.c:6064
+#: camlibs/ptp2/ptp.c:8282
 #, fuzzy
 msgid "Partial Metering"
 msgstr "PTP 部分删除"
 
-#: camlibs/ptp2/ptp.c:6065
+#: camlibs/ptp2/ptp.c:8283
 msgid "Center-weighted Average Metering"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6066
+#: camlibs/ptp2/ptp.c:8284
 msgid "Spot Metering Interlocked with AF Frame"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:6067
+#: camlibs/ptp2/ptp.c:8285
 #, fuzzy
 msgid "Multi-Spot Metering"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/ptp.c:6104
+#: camlibs/ptp2/ptp.c:8322
 msgid "Low-speed shutter function not available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6114 camlibs/ptp2/ptp.c:6120 camlibs/ptp2/ptp.c:6126
+#: camlibs/ptp2/ptp.c:8332 camlibs/ptp2/ptp.c:8338 camlibs/ptp2/ptp.c:8344
 msgid "Low 2"
 msgstr ""
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/ptp.c:6118 camlibs/ptp2/ptp.c:6124 camlibs/ptp2/ptp.c:6130
+#: camlibs/ptp2/ptp.c:8336 camlibs/ptp2/ptp.c:8342 camlibs/ptp2/ptp.c:8348
 #, fuzzy
 msgid "High 2"
 msgstr "高"
 
-#: camlibs/ptp2/ptp.c:6133
+#: camlibs/ptp2/ptp.c:8351
 msgid "Upper 1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6134
+#: camlibs/ptp2/ptp.c:8352
 msgid "Upper 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6136
+#: camlibs/ptp2/ptp.c:8354
 msgid "Standard Development Parameters"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6137
+#: camlibs/ptp2/ptp.c:8355
 #, fuzzy
 msgid "Development Parameters 1"
 msgstr "参数 1"
 
-#: camlibs/ptp2/ptp.c:6138
+#: camlibs/ptp2/ptp.c:8356
 #, fuzzy
 msgid "Development Parameters 2"
 msgstr "参数 2"
 
-#: camlibs/ptp2/ptp.c:6139
+#: camlibs/ptp2/ptp.c:8357
 #, fuzzy
 msgid "Development Parameters 3"
 msgstr "参数 3"
 
-#: camlibs/ptp2/ptp.c:6168
+#: camlibs/ptp2/ptp.c:8386
 msgid "MlSpotPosCenter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6169
+#: camlibs/ptp2/ptp.c:8387
 msgid "MlSpotPosAfLink"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6278
+#: camlibs/ptp2/ptp.c:8497
 msgid "Media Card"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6279
+#: camlibs/ptp2/ptp.c:8498
 msgid "Media Card Group"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/ptp.c:6280
+#: camlibs/ptp2/ptp.c:8499
 #, fuzzy
 msgid "Encounter"
 msgstr "光圈"
 
-#: camlibs/ptp2/ptp.c:6281
+#: camlibs/ptp2/ptp.c:8500
 msgid "Encounter Box"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6282
+#: camlibs/ptp2/ptp.c:8501
 msgid "M4A"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6283
+#: camlibs/ptp2/ptp.c:8502
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6284
+#: camlibs/ptp2/ptp.c:8503
 msgid "Windows Image Format"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:6285
+#: camlibs/ptp2/ptp.c:8504
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:6289
+#: camlibs/ptp2/ptp.c:8508
 msgid "Audible.com Codec"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6291
+#: camlibs/ptp2/ptp.c:8510
 msgid "Samsung Playlist"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:6292
+#: camlibs/ptp2/ptp.c:8511
 #, fuzzy
 msgid "Undefined Video"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:6297
+#: camlibs/ptp2/ptp.c:8516
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:6298
+#: camlibs/ptp2/ptp.c:8517
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6299
+#: camlibs/ptp2/ptp.c:8518
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6300
+#: camlibs/ptp2/ptp.c:8519
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6301
+#: camlibs/ptp2/ptp.c:8520
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6302
+#: camlibs/ptp2/ptp.c:8521
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6303
+#: camlibs/ptp2/ptp.c:8522
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6304
+#: camlibs/ptp2/ptp.c:8523
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6305
+#: camlibs/ptp2/ptp.c:8524
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6306
+#: camlibs/ptp2/ptp.c:8525
 msgid "Abstract Audio Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6307
+#: camlibs/ptp2/ptp.c:8526
 msgid "Abstract Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6308
+#: camlibs/ptp2/ptp.c:8527
 msgid "Abstract Mediacast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6309
+#: camlibs/ptp2/ptp.c:8528
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6310
+#: camlibs/ptp2/ptp.c:8529
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6311
+#: camlibs/ptp2/ptp.c:8530
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6312
+#: camlibs/ptp2/ptp.c:8531
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6313
+#: camlibs/ptp2/ptp.c:8532
 msgid "PLS Playlist"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:6314
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8533
 msgid "Undefined Document"
-msgstr "未定义的 PTP 错误"
+msgstr "未定义的文档"
 
-#: camlibs/ptp2/ptp.c:6315
+#: camlibs/ptp2/ptp.c:8534
 msgid "Abstract Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6316
+#: camlibs/ptp2/ptp.c:8535
 msgid "XMLDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6317
+#: camlibs/ptp2/ptp.c:8536
 msgid "Microsoft Word Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6318
+#: camlibs/ptp2/ptp.c:8537
 msgid "MHT Compiled HTML Document"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6319
+#: camlibs/ptp2/ptp.c:8538
 msgid "Microsoft Excel Spreadsheet (.xls)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6320
+#: camlibs/ptp2/ptp.c:8539
 msgid "Microsoft Powerpoint (.ppt)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6321
+#: camlibs/ptp2/ptp.c:8540
 msgid "Undefined Message"
-msgstr ""
+msgstr "未定义消息"
 
-#: camlibs/ptp2/ptp.c:6322
+#: camlibs/ptp2/ptp.c:8541
 msgid "Abstract Message"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:6323
+#: camlibs/ptp2/ptp.c:8542
 #, fuzzy
 msgid "Undefined Contact"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:6324
+#: camlibs/ptp2/ptp.c:8543
 msgid "Abstract Contact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6325
+#: camlibs/ptp2/ptp.c:8544
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6326
+#: camlibs/ptp2/ptp.c:8545
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6327
+#: camlibs/ptp2/ptp.c:8546
 msgid "Undefined Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6328
+#: camlibs/ptp2/ptp.c:8547
 msgid "Abstract Calendar Item"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6329
+#: camlibs/ptp2/ptp.c:8548
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6330
+#: camlibs/ptp2/ptp.c:8549
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6331
+#: camlibs/ptp2/ptp.c:8550
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6332
+#: camlibs/ptp2/ptp.c:8551
 msgid "Media Cast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6333
+#: camlibs/ptp2/ptp.c:8552
 msgid "Section"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6380
+#: camlibs/ptp2/ptp.c:8599
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "未知 (0x%02x)"
 
-#: camlibs/ptp2/ptp.c:6390
+#: camlibs/ptp2/ptp.c:8609
 msgid "Get device info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6391
+#: camlibs/ptp2/ptp.c:8610
 #, fuzzy
 msgid "Open session"
 msgstr "压缩"
 
-#: camlibs/ptp2/ptp.c:6392
+#: camlibs/ptp2/ptp.c:8611
 #, fuzzy
 msgid "Close session"
 msgstr "压缩"
 
-#: camlibs/ptp2/ptp.c:6393
+#: camlibs/ptp2/ptp.c:8612
 msgid "Get storage IDs"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6394
+#: camlibs/ptp2/ptp.c:8613
 msgid "Get storage info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6395
+#: camlibs/ptp2/ptp.c:8614
 msgid "Get number of objects"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6396
+#: camlibs/ptp2/ptp.c:8615
 msgid "Get object handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6397
+#: camlibs/ptp2/ptp.c:8616
 msgid "Get object info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6398
+#: camlibs/ptp2/ptp.c:8617
 msgid "Get object"
 msgstr ""
 
 # camlibs/canon/serial.c:1400
-#: camlibs/ptp2/ptp.c:6399
+#: camlibs/ptp2/ptp.c:8618
 #, fuzzy
 msgid "Get thumbnail"
 msgstr "正在获取缩略图..."
 
-#: camlibs/ptp2/ptp.c:6400
+#: camlibs/ptp2/ptp.c:8619
 msgid "Delete object"
-msgstr ""
+msgstr "删除对象"
 
-#: camlibs/ptp2/ptp.c:6401
+#: camlibs/ptp2/ptp.c:8620
 msgid "Send object info"
-msgstr ""
+msgstr "发送对象信息"
 
-#: camlibs/ptp2/ptp.c:6402
+#: camlibs/ptp2/ptp.c:8621
 msgid "Send object"
-msgstr ""
+msgstr "发送对象"
 
-#: camlibs/ptp2/ptp.c:6403
+#: camlibs/ptp2/ptp.c:8622
 msgid "Initiate capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6404
+#: camlibs/ptp2/ptp.c:8623
 msgid "Format storage"
-msgstr ""
+msgstr "格式化存储"
 
-#: camlibs/ptp2/ptp.c:6405
+#: camlibs/ptp2/ptp.c:8624
 msgid "Reset device"
 msgstr ""
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/ptp.c:6406
-#, fuzzy
+#: camlibs/ptp2/ptp.c:8625
 msgid "Self test device"
-msgstr "PTP 自检失败"
+msgstr "设备自检"
 
-#: camlibs/ptp2/ptp.c:6407
+#: camlibs/ptp2/ptp.c:8626
 msgid "Set object protection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6408
+#: camlibs/ptp2/ptp.c:8627
 msgid "Power down device"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6409
+#: camlibs/ptp2/ptp.c:8628
 msgid "Get device property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6410
+#: camlibs/ptp2/ptp.c:8629
 msgid "Get device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6411
+#: camlibs/ptp2/ptp.c:8630
 msgid "Set device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6412
+#: camlibs/ptp2/ptp.c:8631
 msgid "Reset device property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6413
+#: camlibs/ptp2/ptp.c:8632
 msgid "Terminate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6414
+#: camlibs/ptp2/ptp.c:8633
 msgid "Move object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6415
+#: camlibs/ptp2/ptp.c:8634
 msgid "Copy object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6416
+#: camlibs/ptp2/ptp.c:8635
 msgid "Get partial object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6417
+#: camlibs/ptp2/ptp.c:8636
 msgid "Initiate open capture"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6419
+#: camlibs/ptp2/ptp.c:8638
 msgid "Start Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6420
+#: camlibs/ptp2/ptp.c:8639
 msgid "Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6421
+#: camlibs/ptp2/ptp.c:8640
 msgid "Stop Enumerate Handles"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6422
+#: camlibs/ptp2/ptp.c:8641
 msgid "Get Vendor Extension Maps"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6423
+#: camlibs/ptp2/ptp.c:8642
 msgid "Get Vendor Device Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6424
+#: camlibs/ptp2/ptp.c:8643
 msgid "Get Resized Image Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6425
+#: camlibs/ptp2/ptp.c:8644
 msgid "Get Filesystem Manifest"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6426
+#: camlibs/ptp2/ptp.c:8645
 msgid "Get Stream Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6427
+#: camlibs/ptp2/ptp.c:8646
 msgid "Get Stream"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6431
+#: camlibs/ptp2/ptp.c:8650
 msgid "Get object properties supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6432
+#: camlibs/ptp2/ptp.c:8651
 msgid "Get object property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6433
+#: camlibs/ptp2/ptp.c:8652
 msgid "Get object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6434
+#: camlibs/ptp2/ptp.c:8653
 msgid "Set object property value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6435
+#: camlibs/ptp2/ptp.c:8654
 msgid "Get object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6436
+#: camlibs/ptp2/ptp.c:8655
 msgid "Set object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6437
+#: camlibs/ptp2/ptp.c:8656
 msgid "Get interdependent property description"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6438
+#: camlibs/ptp2/ptp.c:8657
 msgid "Send object property list"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6439
+#: camlibs/ptp2/ptp.c:8658
 msgid "Get object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6440
+#: camlibs/ptp2/ptp.c:8659
 msgid "Set object references"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6441
+#: camlibs/ptp2/ptp.c:8660
 msgid "Update device firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6442
+#: camlibs/ptp2/ptp.c:8661
 msgid "Skip to next position in playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6445
+#: camlibs/ptp2/ptp.c:8664
 msgid "Get secure time challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6446
+#: camlibs/ptp2/ptp.c:8665
 msgid "Get secure time response"
 msgstr ""
 
 # camlibs/canon/serial.c:1235
-#: camlibs/ptp2/ptp.c:6447
+#: camlibs/ptp2/ptp.c:8666
 #, fuzzy
 msgid "Set license response"
 msgstr "不可识别的应答"
 
-#: camlibs/ptp2/ptp.c:6448
+#: camlibs/ptp2/ptp.c:8667
 msgid "Get sync list"
-msgstr ""
+msgstr "获取同步列表"
 
-#: camlibs/ptp2/ptp.c:6449
+#: camlibs/ptp2/ptp.c:8668
 msgid "Send meter challenge query"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6450
+#: camlibs/ptp2/ptp.c:8669
 msgid "Get meter challenge"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:242
-#: camlibs/ptp2/ptp.c:6451
+#: camlibs/ptp2/ptp.c:8670
 #, fuzzy
 msgid "Get meter response"
 msgstr "收到意外应答"
 
-#: camlibs/ptp2/ptp.c:6452
+#: camlibs/ptp2/ptp.c:8671
 msgid "Clean data store"
-msgstr ""
+msgstr "清理数据存储"
 
-#: camlibs/ptp2/ptp.c:6453
+#: camlibs/ptp2/ptp.c:8672
 msgid "Get license state"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6454
+#: camlibs/ptp2/ptp.c:8673
 msgid "Send WMDRM-PD Command"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6455
+#: camlibs/ptp2/ptp.c:8674
 msgid "Send WMDRM-PD Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6458
+#: camlibs/ptp2/ptp.c:8677
 msgid "Report Added/Deleted Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6459
+#: camlibs/ptp2/ptp.c:8678
 msgid "Report Acquired Items"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6460
+#: camlibs/ptp2/ptp.c:8679
 msgid "Get transferable playlist types"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6463
+#: camlibs/ptp2/ptp.c:8682
 msgid "Send WMDRM-PD Application Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6464
+#: camlibs/ptp2/ptp.c:8683
 msgid "Get WMDRM-PD Application Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6465
+#: camlibs/ptp2/ptp.c:8684
 msgid "Enable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6466
+#: camlibs/ptp2/ptp.c:8685
 msgid "Disable trusted file operations"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6467
+#: camlibs/ptp2/ptp.c:8686
 msgid "End trusted application session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6470
+#: camlibs/ptp2/ptp.c:8689
 msgid "Open Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6471
+#: camlibs/ptp2/ptp.c:8690
 msgid "Close Media Session"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6472
+#: camlibs/ptp2/ptp.c:8691
 msgid "Get Next Data Block"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6473
+#: camlibs/ptp2/ptp.c:8692
 msgid "Set Current Time Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6476
+#: camlibs/ptp2/ptp.c:8695
 msgid "Send Registration Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6477
+#: camlibs/ptp2/ptp.c:8696
 msgid "Get Registration Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6478
+#: camlibs/ptp2/ptp.c:8697
 msgid "Get Proximity Challenge"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6479
+#: camlibs/ptp2/ptp.c:8698
 msgid "Send Proximity Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6480
+#: camlibs/ptp2/ptp.c:8699
 msgid "Send WMDRM-ND License Request"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6481
+#: camlibs/ptp2/ptp.c:8700
 msgid "Get WMDRM-ND License Response"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6484
+#: camlibs/ptp2/ptp.c:8703
 msgid "Process WFC Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6487
+#: camlibs/ptp2/ptp.c:8706
 msgid "Get Partial Object (64bit Offset)"
 msgstr ""
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/ptp.c:6488
+#: camlibs/ptp2/ptp.c:8707
 #, fuzzy
 msgid "Send Partial Object"
 msgstr "非法的 PTP 父对象"
 
-#: camlibs/ptp2/ptp.c:6489
+#: camlibs/ptp2/ptp.c:8708
 msgid "Truncate Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6490
+#: camlibs/ptp2/ptp.c:8709
 msgid "Begin Edit Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:6491
+#: camlibs/ptp2/ptp.c:8710
 msgid "End Edit Object"
 msgstr ""
 
@@ -11994,127 +14827,109 @@
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/ptp2/ptp.c:6737
-#, fuzzy
+#: camlibs/ptp2/ptp.c:9117
 msgid "Unknown PTP_OC"
-msgstr "%i (未知)"
+msgstr "未知 PTP_OC"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/ptp.c:6755
+#: camlibs/ptp2/ptp.c:9138
 #, fuzzy
 msgid "Unknown VendorExtensionID"
 msgstr "未知的 PTP 厂家代码"
 
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
-# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
-# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/ptp2/ptp.c:6792
-#, fuzzy
-msgid "Unknown Event"
-msgstr "%i (未知)"
-
 # camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
 # camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/ricoh/g3.c:356
+#: camlibs/ricoh/g3.c:361
 #, fuzzy
 msgid "Downloading movie..."
 msgstr "正在下载文件..."
 
 # camlibs/konica/lowlevel.c:382 camlibs/polaroid/pdc700.c:314
 # camlibs/sierra/library.c:989
-#: camlibs/ricoh/g3.c:362
+#: camlibs/ricoh/g3.c:367
 #, fuzzy
 msgid "Downloading audio..."
 msgstr "正在下载..."
 
 # camlibs/jamcam/library.c:336 camlibs/jd11/serial.c:455
-#: camlibs/ricoh/g3.c:377
-#, fuzzy
+#: camlibs/ricoh/g3.c:382
 msgid "Downloading EXIF data..."
-msgstr "正在下载数据..."
+msgstr "正在下载 EXIF 数据..."
 
 # camlibs/canon/library.c:586
-#: camlibs/ricoh/g3.c:379 camlibs/ricoh/g3.c:398
+#: camlibs/ricoh/g3.c:384 camlibs/ricoh/g3.c:403
 #, fuzzy, c-format
 msgid "No EXIF data available for %s."
 msgstr "不可用：%s"
 
 # libgphoto2/gphoto2-filesys.c:1282
-#: camlibs/ricoh/g3.c:483
-#, fuzzy
+#: camlibs/ricoh/g3.c:488
 msgid "Could not delete file."
-msgstr "无法找到文件“%s”。"
+msgstr "无法删除文件。"
 
 # camlibs/canon/library.c:774
-#: camlibs/ricoh/g3.c:511
-#, fuzzy
+#: camlibs/ricoh/g3.c:516
 msgid "Could not remove directory."
-msgstr "无法创建目录 \\DCIM。"
+msgstr "无法删除目录。"
 
 # camlibs/canon/library.c:774
-#: camlibs/ricoh/g3.c:539
-#, fuzzy
+#: camlibs/ricoh/g3.c:544
 msgid "Could not create directory."
-msgstr "无法创建目录 \\DCIM。"
+msgstr "无法创建目录。"
 
 # frontends/command-line/actions.c:159
-#: camlibs/ricoh/g3.c:558
-#, fuzzy, c-format
+#: camlibs/ricoh/g3.c:563
+#, c-format
 msgid "Version: %s\n"
-msgstr "版本："
+msgstr "版本：%s\n"
 
 # camlibs/minolta/dimagev/dimagev.c:400
-#: camlibs/ricoh/g3.c:563
+#: camlibs/ricoh/g3.c:568
 #, fuzzy, c-format
 msgid "RTC Status: %d\n"
 msgstr "卡状态：\t\t"
 
 # camlibs/sierra/sierra.c:1814
-#: camlibs/ricoh/g3.c:569
+#: camlibs/ricoh/g3.c:574
 #, fuzzy, c-format
 msgid "Camera time: %s %s\n"
 msgstr "%s相机 ID：%s\n"
 
 # camlibs/sierra/sierra.c:1814
-#: camlibs/ricoh/g3.c:575 camlibs/sierra/sierra.c:1978
+#: camlibs/ricoh/g3.c:580 camlibs/sierra/sierra.c:1965
 #, fuzzy, c-format
 msgid "Camera ID: %s\n"
 msgstr "%s相机 ID：%s\n"
 
 # camlibs/konica/konica.c:83
-#: camlibs/ricoh/g3.c:581
-#, fuzzy, c-format
+#: camlibs/ricoh/g3.c:586
+#, c-format
 msgid "No SD Card inserted.\n"
-msgstr "不支持的卡。"
+msgstr "未插入 SD 卡。\n"
 
 # camlibs/sierra/sierra.c:1814
-#: camlibs/ricoh/g3.c:584
-#, fuzzy, c-format
+#: camlibs/ricoh/g3.c:589
+#, c-format
 msgid "SD Card ID: %s\n"
-msgstr "%s相机 ID：%s\n"
+msgstr "SD 卡 ID：%s\n"
 
 # camlibs/stv0680/library.c:542
-#: camlibs/ricoh/g3.c:592
+#: camlibs/ricoh/g3.c:597
 #, fuzzy, c-format
 msgid "Photos on camera: %d\n"
 msgstr "相机内置内存：%d 兆位。\n"
 
-#: camlibs/ricoh/g3.c:598
+#: camlibs/ricoh/g3.c:603
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:605
+#: camlibs/ricoh/g3.c:610
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:615
+#: camlibs/ricoh/g3.c:620
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -12122,7 +14937,7 @@
 "at the firmware update image and wild guessing.\n"
 msgstr ""
 
-#: camlibs/ricoh/library.c:217
+#: camlibs/ricoh/library.c:201
 msgid ""
 "Ricoh / Philips driver by\n"
 "Lutz Mueller <lutz@users.sourceforge.net>,\n"
@@ -12134,13 +14949,13 @@
 "Martin Fischer <martin.fischer@inka.de>,\n"
 "根据 Bob Paauwe 的驱动程序编制\n"
 
-#: camlibs/ricoh/library.c:251
+#: camlibs/ricoh/library.c:235
 #, c-format
 msgid "unknown (0x%02x)"
 msgstr "未知 (0x%02x)"
 
 # camlibs/ricoh/library.c:177
-#: camlibs/ricoh/library.c:254
+#: camlibs/ricoh/library.c:238
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -12149,149 +14964,149 @@
 "型号：%s\n"
 "内存：%d(字节)/%d 可用"
 
-#: camlibs/ricoh/library.c:302
+#: camlibs/ricoh/library.c:286
 msgid "-2.0"
 msgstr "-2.0"
 
-#: camlibs/ricoh/library.c:303
+#: camlibs/ricoh/library.c:287
 msgid "-1.5"
 msgstr "-1.5"
 
-#: camlibs/ricoh/library.c:304
+#: camlibs/ricoh/library.c:288
 msgid "-1.0"
 msgstr "-1.0"
 
-#: camlibs/ricoh/library.c:305
+#: camlibs/ricoh/library.c:289
 msgid "-0.5"
 msgstr "-0.5"
 
-#: camlibs/ricoh/library.c:306
+#: camlibs/ricoh/library.c:290
 msgid "0.0"
 msgstr "0.0"
 
-#: camlibs/ricoh/library.c:307
+#: camlibs/ricoh/library.c:291
 msgid "0.5"
 msgstr "0.5"
 
-#: camlibs/ricoh/library.c:308
+#: camlibs/ricoh/library.c:292
 msgid "1.0"
 msgstr "1.0"
 
-#: camlibs/ricoh/library.c:309
+#: camlibs/ricoh/library.c:293
 msgid "1.5"
 msgstr "1.5"
 
-#: camlibs/ricoh/library.c:310
+#: camlibs/ricoh/library.c:294
 msgid "2.0"
 msgstr "2.0"
 
-#: camlibs/ricoh/library.c:319
+#: camlibs/ricoh/library.c:303
 msgid "1280 x 960"
 msgstr "1280 x 960"
 
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
-#: camlibs/ricoh/library.c:327
+#: camlibs/ricoh/library.c:311
 msgid "Outdoor"
 msgstr "户外"
 
-#: camlibs/ricoh/library.c:347
+#: camlibs/ricoh/library.c:331
 msgid "Maximal"
 msgstr "最大的"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ricoh/library.c:349
+#: camlibs/ricoh/library.c:333
 msgid "Minimal"
 msgstr "最小的"
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/ricoh/library.c:357
+#: camlibs/ricoh/library.c:341
 msgid "Character"
 msgstr "人物"
 
-#: camlibs/ricoh/library.c:358
+#: camlibs/ricoh/library.c:342
 msgid "Sound"
 msgstr "音效"
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ricoh/library.c:359
+#: camlibs/ricoh/library.c:343
 msgid "Image & Sound"
 msgstr "图像和音效"
 
-#: camlibs/ricoh/library.c:360
+#: camlibs/ricoh/library.c:344
 msgid "Character & Sound"
 msgstr "人物和音效"
 
-#: camlibs/ricoh/library.c:378
+#: camlibs/ricoh/library.c:362
 msgid "3x"
 msgstr "3x"
 
 # camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/ricoh/library.c:380
+#: camlibs/ricoh/library.c:364
 msgid "5x"
 msgstr "5x"
 
 # camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1035
-#: camlibs/ricoh/library.c:381
+#: camlibs/ricoh/library.c:365
 msgid "6x"
 msgstr "6x"
 
-#: camlibs/ricoh/library.c:382
+#: camlibs/ricoh/library.c:366
 msgid "7x"
 msgstr "7x"
 
-#: camlibs/ricoh/library.c:383
+#: camlibs/ricoh/library.c:367
 msgid "8x"
 msgstr "8x"
 
-#: camlibs/ricoh/library.c:384
+#: camlibs/ricoh/library.c:368
 msgid "9x"
 msgstr "9x"
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/ricoh/library.c:432
+#: camlibs/ricoh/library.c:416
 msgid "Configuration"
 msgstr "配置"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ricoh/library.c:435
+#: camlibs/ricoh/library.c:419
 msgid "General"
 msgstr "普通"
 
-#: camlibs/ricoh/library.c:441
+#: camlibs/ricoh/library.c:425
 msgid "Copyright (max. 20 characters)"
 msgstr "版权 (最多 20 个字符)"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ricoh/library.c:455
+#: camlibs/ricoh/library.c:439
 msgid "Pictures"
 msgstr "照片"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ricoh/library.c:501
+#: camlibs/ricoh/library.c:485
 msgid "White level"
 msgstr "白平衡"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ricoh/library.c:505
+#: camlibs/ricoh/library.c:489
 msgid "Record Mode"
 msgstr "录制模式"
 
-#: camlibs/ricoh/library.c:506
+#: camlibs/ricoh/library.c:490
 msgid "Compression"
 msgstr "压缩"
 
 # camlibs/ricoh/library.c:252
-#: camlibs/ricoh/library.c:573
+#: camlibs/ricoh/library.c:557
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "不支持速度 %i！"
 
 # camlibs/ricoh/ricoh.c:75
-#: camlibs/ricoh/ricoh.c:66
+#: camlibs/ricoh/ricoh.c:51
 #, fuzzy, c-format
 msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
@@ -12299,7 +15114,7 @@
 "net>。"
 
 # camlibs/ricoh/ricoh.c:75
-#: camlibs/ricoh/ricoh.c:75
+#: camlibs/ricoh/ricoh.c:60
 #, fuzzy, c-format
 msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
@@ -12307,63 +15122,63 @@
 "net>。"
 
 # camlibs/ricoh/ricoh.c:165 camlibs/ricoh/ricoh.c:179
-#: camlibs/ricoh/ricoh.c:179 camlibs/ricoh/ricoh.c:193
+#: camlibs/ricoh/ricoh.c:164 camlibs/ricoh/ricoh.c:178
 #, fuzzy, c-format
 msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "我们希望得到 0x%x 但收到 0x%x。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:208
-#: camlibs/ricoh/ricoh.c:222
+#: camlibs/ricoh/ricoh.c:207
 #, fuzzy, c-format
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "错误的字符 (0x%x，0x%x)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:250
-#: camlibs/ricoh/ricoh.c:263 camlibs/ricoh/ricoh.c:338
+#: camlibs/ricoh/ricoh.c:248 camlibs/ricoh/ricoh.c:323
 #, fuzzy, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "相机忙。如果问题总是存在，请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/ricoh/ricoh.c:298
+#: camlibs/ricoh/ricoh.c:283
 #, fuzzy, c-format
 msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "两次重试后仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/ricoh/ricoh.c:314
+#: camlibs/ricoh/ricoh.c:299
 #, fuzzy, c-format
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "两次重试后仍然通讯错误。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:250
-#: camlibs/ricoh/ricoh.c:352
+#: camlibs/ricoh/ricoh.c:337
 #, fuzzy, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "相机处于错误的模式。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/ricoh/ricoh.c:361
+#: camlibs/ricoh/ricoh.c:346
 #, fuzzy, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "相机无法接收参数。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/ricoh/ricoh.c:367
+#: camlibs/ricoh/ricoh.c:352
 #, fuzzy, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "遇到未知的错误。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/ricoh/ricoh.c:833
+#: camlibs/ricoh/ricoh.c:818
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
 msgstr "文件名的长度不能超过 12 个字符 (“%s” 含有 %i 个字符)。"
 
 # camlibs/samsung/samsung.c:244
-#: camlibs/samsung/samsung.c:243
+#: camlibs/samsung/samsung.c:233
 msgid ""
 "The Samsung digimax 800k driver has been written by James McKenzie "
 "<james@fishsoup.dhs.org> for gphoto. Lutz Mueller <lutz@users.sourceforge."
@@ -12375,144 +15190,143 @@
 "Marcus Meissner <marcus@jet.franken.de> 修正并增强了移植后的版本。"
 
 # camlibs/dimera/dimera3500.c:537
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
+#: camlibs/sierra/epson-desc.c:71 camlibs/sierra/nikon-desc.c:79
+#: camlibs/sierra/nikon-desc.c:113 camlibs/sierra/olympus-desc.c:94
+#: camlibs/sierra/olympus-desc.c:124 camlibs/sierra/olympus-desc.c:153
 msgid "Resolution plus Size"
 msgstr "分辨率加尺寸"
 
 # camlibs/konica/library.c:633 camlibs/konica/library.c:844
 # camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
 # camlibs/polaroid/pdc700.c:1088
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
+#: camlibs/sierra/epson-desc.c:89 camlibs/sierra/nikon-desc.c:131
+#: camlibs/sierra/olympus-desc.c:171
 msgid "Date and time (GMT)"
 msgstr "日期和时间 (GMT)"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
+#: camlibs/sierra/epson-desc.c:113 camlibs/sierra/nikon-desc.c:197
+#: camlibs/sierra/olympus-desc.c:382 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/olympus-desc.c:438 camlibs/sierra/olympus-desc.c:463
 #, fuzzy
 msgid "Aperture Settings"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1305
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1851
+#: camlibs/sierra/epson-desc.c:128 camlibs/sierra/nikon-desc.c:212
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1838
 msgid "Color Mode"
 msgstr "彩色模式"
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1788
+#: camlibs/sierra/epson-desc.c:140 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1775
 msgid "Red-eye Reduction"
 msgstr "消红眼"
 
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
+#: camlibs/sierra/epson-desc.c:146 camlibs/sierra/nikon-desc.c:230
+#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:518
+#: camlibs/sierra/olympus-desc.c:539
 msgid "Flash Settings"
 msgstr "闪光灯设置"
 
 # camlibs/canon/library.c:598
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
+#: camlibs/sierra/epson-desc.c:179 camlibs/sierra/olympus-desc.c:702
 #, fuzzy
 msgid "Host power save (seconds)"
 msgstr "%s (主机时间 %s%i 秒)"
 
 # camlibs/canon/library.c:811
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
+#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/olympus-desc.c:687
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "相机型号 (只读)"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1114
-#: camlibs/sierra/sierra.c:1394 camlibs/sierra/sierra.c:1600
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:1101
+#: camlibs/sierra/sierra.c:1381 camlibs/sierra/sierra.c:1587
+#: camlibs/sierra/sierra.c:1803
 msgid "Lens Mode"
 msgstr "镜头模式"
 
 # camlibs/sierra/sierra.c:1545 camlibs/sierra/sierra.c:1554
 # camlibs/sierra/sierra.c:1731
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1696
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/sierra.c:1692 camlibs/sierra/sierra.c:1878
 msgid "Korean"
 msgstr "韩语"
 
 # camlibs/sierra/sierra.c:1546 camlibs/sierra/sierra.c:1556
 # camlibs/sierra/sierra.c:1733
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1707
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/epson-desc.c:220 camlibs/sierra/nikon-desc.c:406
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1880
 msgid "English"
 msgstr "英语"
 
 # camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1558
 # camlibs/sierra/sierra.c:1735
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1698 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/epson-desc.c:221 camlibs/sierra/nikon-desc.c:407
+#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1882
 msgid "French"
 msgstr "法语"
 
 # camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1560
 # camlibs/sierra/sierra.c:1737
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1699 camlibs/sierra/sierra.c:1711
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:408
+#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1698
+#: camlibs/sierra/sierra.c:1884
 msgid "German"
 msgstr "德语"
 
 # camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1562
 # camlibs/sierra/sierra.c:1739
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1713 camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1700 camlibs/sierra/sierra.c:1886
 msgid "Italian"
 msgstr "意大利语"
 
 # camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1564
 # camlibs/sierra/sierra.c:1741
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1701
-#: camlibs/sierra/sierra.c:1715 camlibs/sierra/sierra.c:1901
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1702 camlibs/sierra/sierra.c:1888
 msgid "Japanese"
 msgstr "日语"
 
 # camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1566
 # camlibs/sierra/sierra.c:1743
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1702
-#: camlibs/sierra/sierra.c:1717 camlibs/sierra/sierra.c:1903
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1704 camlibs/sierra/sierra.c:1890
 msgid "Spanish"
 msgstr "西班牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1703
-#: camlibs/sierra/sierra.c:1719 camlibs/sierra/sierra.c:1905
-#, fuzzy
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1706 camlibs/sierra/sierra.c:1892
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/nikon-desc.c:678
+#: camlibs/sierra/nikon-desc.c:689 camlibs/sierra/nikon-desc.c:700
+#: camlibs/sierra/olympus-desc.c:1008 camlibs/sierra/olympus-desc.c:1107
+#: camlibs/sierra/olympus-desc.c:1118 camlibs/sierra/olympus-desc.c:1128
+#: camlibs/sierra/sierra.c:900 camlibs/sierra/sierra.c:1581
 msgid "Picture Settings"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:1852
-#: camlibs/sierra/epson-desc.c:289
+#: camlibs/sierra/epson-desc.c:275
 #, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -12534,95 +15348,95 @@
 "  <gphoto-devel@lists.sourceforge.net> 发送电子邮件 (用英语)\n"
 
 # camlibs/konica/konica.c:80
-#: camlibs/sierra/library.c:148 camlibs/sierra/library.c:1380
+#: camlibs/sierra/library.c:134 camlibs/sierra/library.c:1377
 msgid "No memory card present"
 msgstr "未插内存卡"
 
 # camlibs/sierra/library.c:285
-#: camlibs/sierra/library.c:303
+#: camlibs/sierra/library.c:289
 msgid "Cannot retrieve the battery capacity"
 msgstr "无法检索电池容量"
 
 # camlibs/sierra/library.c:291
-#: camlibs/sierra/library.c:311
+#: camlibs/sierra/library.c:297
 #, c-format
 msgid ""
 "The battery level of the camera is too low (%d%%). The operation is aborted."
 msgstr "相机电量太低 (%d%%)。操作取消。"
 
 # camlibs/sierra/library.c:315
-#: camlibs/sierra/library.c:335
+#: camlibs/sierra/library.c:321
 msgid "Cannot retrieve the available memory left"
 msgstr "无法检索剩余可用内存"
 
-#: camlibs/sierra/library.c:390
+#: camlibs/sierra/library.c:376
 msgid "Camera refused 3 times to keep a connection open."
 msgstr "相机三次拒绝保持连接打开的请求。"
 
 # camlibs/sierra/library.c:502
-#: camlibs/sierra/library.c:615
+#: camlibs/sierra/library.c:607
 #, c-format
 msgid "The first byte received (0x%x) is not valid."
 msgstr "接收的第一个字节 (0x%x) 非法。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/sierra/library.c:737
+#: camlibs/sierra/library.c:733
 #, fuzzy, c-format
 msgid ""
 "Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "在 %i 次重试后包传输仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/sierra/library.c:772 camlibs/sierra/library.c:797
+#: camlibs/sierra/library.c:768 camlibs/sierra/library.c:794
 msgid "Could not transmit packet even after several retries."
 msgstr "在几次重试后仍不能传输包。"
 
 # camlibs/sierra/library.c:657
-#: camlibs/sierra/library.c:788
+#: camlibs/sierra/library.c:785
 #, fuzzy, c-format
 msgid "Packet was rejected by camera. Please contact %s."
 msgstr "相机拒绝包。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:664
-#: camlibs/sierra/library.c:815
+#: camlibs/sierra/library.c:812
 #, fuzzy, c-format
 msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "无法传输包 (错误码 %i)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/sierra/library.c:906
+#: camlibs/sierra/library.c:903
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "在两次重试后传输仍然超时。放弃..."
 
 # camlibs/sierra/library.c:744
-#: camlibs/sierra/library.c:925
+#: camlibs/sierra/library.c:922
 #, fuzzy, c-format
 msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "得到意外的结果 0x%x。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:819
-#: camlibs/sierra/library.c:1024
+#: camlibs/sierra/library.c:1021
 #, fuzzy, c-format
 msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "收到意外的应答 (%i)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/sierra/library.c:1087
+#: camlibs/sierra/library.c:1084
 #, fuzzy, c-format
 msgid "Could not get register %i. Please contact %s."
 msgstr "无法读取寄存器 %i。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/sierra/library.c:1107 camlibs/sierra/library.c:1127
+#: camlibs/sierra/library.c:1104 camlibs/sierra/library.c:1124
 msgid "Too many retries failed."
 msgstr "重试失败过多。"
 
 # camlibs/sierra/library.c:923
-#: camlibs/sierra/library.c:1167
+#: camlibs/sierra/library.c:1164
 msgid "Sending data..."
 msgstr "正在发送数据..."
 
 # camlibs/sierra/library.c:657
-#: camlibs/sierra/library.c:1225
+#: camlibs/sierra/library.c:1222
 #, fuzzy, c-format
 msgid ""
 "recursive calls are not supported by the sierra driver! Please contact %s."
@@ -12630,175 +15444,167 @@
 "Sierra 驱动程序不支持递归调用！请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:1010
-#: camlibs/sierra/library.c:1279
+#: camlibs/sierra/library.c:1276
 #, fuzzy, c-format
 msgid "Could not get string register %i. Please contact %s."
 msgstr "无法读取字符串寄存器 %i。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:1157
-#: camlibs/sierra/library.c:1518
+#: camlibs/sierra/library.c:1515
 #, fuzzy, c-format
 msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "需要 32 字节，得到 %i。请连线 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
+#: camlibs/sierra/nikon-desc.c:149 camlibs/sierra/olympus-desc.c:350
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "快门速度 (微秒，0 表示自动)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
+#: camlibs/sierra/nikon-desc.c:180 camlibs/sierra/olympus-desc.c:217
+#: camlibs/sierra/olympus-desc.c:271 camlibs/sierra/olympus-desc.c:331
 msgid "Shutter Speed (in seconds)"
 msgstr "快门速度 (秒)"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
+#: camlibs/sierra/nikon-desc.c:207 camlibs/sierra/olympus-desc.c:474
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
+#: camlibs/sierra/nikon-desc.c:224 camlibs/sierra/olympus-desc.c:494
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/olympus-desc.c:530
 msgid "Anti-redeye"
 msgstr ""
 
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/nikon-desc.c:238
+#: camlibs/sierra/nikon-desc.c:225
 #, fuzzy
 msgid "Slow-sync"
 msgstr "慢同步"
 
 # camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:930
 # camlibs/sierra/sierra.c:1218
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1361
+#: camlibs/sierra/nikon-desc.c:241 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1348
 msgid "Contrast+"
 msgstr "对比度+"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/nikon-desc.c:242 camlibs/sierra/sierra.c:1045
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1350
 msgid "Contrast-"
 msgstr "对比度-"
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/sierra/nikon-desc.c:256
-#, fuzzy
+#: camlibs/sierra/nikon-desc.c:243
 msgid "Brightness+"
-msgstr "LCD 亮度"
+msgstr "亮度+"
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/sierra/nikon-desc.c:257
-#, fuzzy
+#: camlibs/sierra/nikon-desc.c:244
 msgid "Brightness-"
-msgstr "LCD 亮度"
+msgstr "亮度-"
 
-#: camlibs/sierra/nikon-desc.c:262
+#: camlibs/sierra/nikon-desc.c:249
 msgid "Image Adjustment"
 msgstr "图像调整"
 
-#: camlibs/sierra/nikon-desc.c:306
+#: camlibs/sierra/nikon-desc.c:293
 msgid "Blink"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/nikon-desc.c:311
+#: camlibs/sierra/nikon-desc.c:298
 msgid "LED Mode"
 msgstr "LED 模式"
 
 # camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
 # camlibs/sierra/sierra.c:1258
-#: camlibs/sierra/nikon-desc.c:326
+#: camlibs/sierra/nikon-desc.c:313
 #, fuzzy
 msgid "Infinity"
 msgstr "无限/鱼眼"
 
-#: camlibs/sierra/nikon-desc.c:362
+#: camlibs/sierra/nikon-desc.c:349
 msgid "Preview Thumbnail"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:363
+#: camlibs/sierra/nikon-desc.c:350
 msgid "Next"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:364
+#: camlibs/sierra/nikon-desc.c:351
 msgid "Previous"
 msgstr ""
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/sierra/nikon-desc.c:378
+#: camlibs/sierra/nikon-desc.c:365
 msgid "Operation Mode"
 msgstr "操作模式"
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1220 camlibs/sierra/sierra.c:1471
+#: camlibs/sierra/nikon-desc.c:379 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/sierra.c:1207 camlibs/sierra/sierra.c:1458
 msgid "LCD Brightness"
 msgstr "LCD 亮度"
 
 # camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
+#: camlibs/sierra/nikon-desc.c:394 camlibs/sierra/olympus-desc.c:715
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD 自动关闭 (秒)"
 
-#: camlibs/sierra/nikon-desc.c:491
+#: camlibs/sierra/nikon-desc.c:478
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
+#: camlibs/sierra/nikon-desc.c:480 camlibs/sierra/olympus-desc.c:769
+#: camlibs/sierra/olympus-desc.c:786
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:494
+#: camlibs/sierra/nikon-desc.c:481
 msgid "Spot-AF"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
+#: camlibs/sierra/nikon-desc.c:486 camlibs/sierra/olympus-desc.c:774
+#: camlibs/sierra/olympus-desc.c:792
 msgid "Exposure Metering"
 msgstr "曝光测定"
 
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
+#: camlibs/sierra/nikon-desc.c:504 camlibs/sierra/olympus-desc.c:808
+#: camlibs/sierra/olympus-desc.c:825 camlibs/sierra/olympus-desc.c:842
 msgid "Zoom (in millimeters)"
 msgstr "缩放 (毫米)"
 
 # frontends/command-line/actions.c:168
-#: camlibs/sierra/nikon-desc.c:543
-#, fuzzy
+#: camlibs/sierra/nikon-desc.c:530
 msgid "none"
 msgstr "无"
 
-#: camlibs/sierra/nikon-desc.c:546
+#: camlibs/sierra/nikon-desc.c:533
 msgid "AE-lock"
 msgstr ""
 
 # libgphoto2/gphoto2-result.c:45
-#: camlibs/sierra/nikon-desc.c:547
-#, fuzzy
+#: camlibs/sierra/nikon-desc.c:534
 msgid "Fisheye"
-msgstr "文件类型"
+msgstr "鱼眼"
 
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:558
+#: camlibs/sierra/nikon-desc.c:545
 #, fuzzy
 msgid "Misc exposure/lens settings"
 msgstr "其它曝光/镜头设置"
 
-#: camlibs/sierra/nikon-desc.c:581
+#: camlibs/sierra/nikon-desc.c:568
 msgid "Auto exposure lock"
 msgstr "自动曝光锁"
 
-#: camlibs/sierra/nikon-desc.c:724
+#: camlibs/sierra/nikon-desc.c:711
 msgid ""
 "Nikon Coolpix 880:\n"
 "    Camera configuration (or preferences):\n"
@@ -12829,7 +15635,7 @@
 "        将相机设置为 'M' 模式\n"
 "        以便设置快门速度。\n"
 
-#: camlibs/sierra/nikon-desc.c:743
+#: camlibs/sierra/nikon-desc.c:730
 #, fuzzy
 msgid ""
 "Nikon Coolpix 995:\n"
@@ -12852,21 +15658,21 @@
 
 # camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:869
 # camlibs/sierra/sierra.c:1175
-#: camlibs/sierra/olympus-desc.c:483
+#: camlibs/sierra/olympus-desc.c:476
 #, fuzzy
 msgid "White board"
 msgstr "白板"
 
 # camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:871
 # camlibs/sierra/sierra.c:1177
-#: camlibs/sierra/olympus-desc.c:484
+#: camlibs/sierra/olympus-desc.c:477
 #, fuzzy
 msgid "Black board"
 msgstr "黑板"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:482
 #, fuzzy
 msgid "Color or Function Mode"
 msgstr "操作模式"
@@ -12874,66 +15680,62 @@
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
+#: camlibs/sierra/olympus-desc.c:512 camlibs/sierra/olympus-desc.c:531
 #, fuzzy
 msgid "Slow"
 msgstr "慢同步"
 
-#: camlibs/sierra/olympus-desc.c:540
+#: camlibs/sierra/olympus-desc.c:533
 msgid "Anti-redeye Fill"
 msgstr ""
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/sierra/olympus-desc.c:596 camlibs/sierra/olympus-desc.c:617
+#: camlibs/sierra/olympus-desc.c:589 camlibs/sierra/olympus-desc.c:610
 #, fuzzy
 msgid "Fluorescent-1-home-6700K"
 msgstr "荧光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/sierra/olympus-desc.c:597 camlibs/sierra/olympus-desc.c:618
+#: camlibs/sierra/olympus-desc.c:590 camlibs/sierra/olympus-desc.c:611
 #, fuzzy
 msgid "Fluorescent-2-desk-5000K"
 msgstr "荧光"
 
-#: camlibs/sierra/olympus-desc.c:598 camlibs/sierra/olympus-desc.c:619
+#: camlibs/sierra/olympus-desc.c:591 camlibs/sierra/olympus-desc.c:612
 msgid "Fluorescent-3-office-4200K"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:620
+#: camlibs/sierra/olympus-desc.c:613
 msgid "Dusk"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:659
+#: camlibs/sierra/olympus-desc.c:652
 msgid "Monitor"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/olympus-desc.c:665
+#: camlibs/sierra/olympus-desc.c:658
 msgid "LCD Mode"
 msgstr "LCD 模式"
 
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:864
+#: camlibs/sierra/olympus-desc.c:859
 msgid "Digital zoom"
 msgstr "数字缩放"
 
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
+#: camlibs/sierra/olympus-desc.c:910 camlibs/sierra/olympus-desc.c:926
 msgid "Focus position"
 msgstr "聚焦位置"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/sierra/olympus-desc.c:948
+#: camlibs/sierra/olympus-desc.c:943
 msgid "Time format"
 msgstr "时间格式"
 
 # camlibs/sierra/sierra.c:1864
-#: camlibs/sierra/olympus-desc.c:1147
+#: camlibs/sierra/olympus-desc.c:1142
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
@@ -12971,7 +15773,7 @@
 "    到“关闭”。"
 
 # camlibs/sierra/sierra.c:1864
-#: camlibs/sierra/olympus-desc.c:1166
+#: camlibs/sierra/olympus-desc.c:1161
 #, fuzzy
 msgid ""
 "Olympus 750 Ultra Zoom:\n"
@@ -13005,7 +15807,7 @@
 "    该重新将相机连接到 PC 上并从 LCD 切换\n"
 "    到“关闭”。"
 
-#: camlibs/sierra/olympus-desc.c:1182
+#: camlibs/sierra/olympus-desc.c:1177
 #, fuzzy
 msgid ""
 "Default sierra driver:\n"
@@ -13036,31 +15838,44 @@
 "    配置作出贡献，请联络\n"
 "    gphoto-devel@gphoto.net\n"
 
+# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
+# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
+# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
+# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
+# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
+# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
+# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
+# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
+#: camlibs/sierra/sierra-desc.c:174
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (未知)"
+
 # camlibs/sierra/sierra.c:635
-#: camlibs/sierra/sierra.c:770 camlibs/soundvision/soundvision.c:416
+#: camlibs/sierra/sierra.c:757 camlibs/soundvision/soundvision.c:403
 msgid "The file to be uploaded has a null length"
 msgstr "要上载的文件具有空长度"
 
 # camlibs/sierra/sierra.c:649
-#: camlibs/sierra/sierra.c:784
+#: camlibs/sierra/sierra.c:771
 msgid "Not enough memory available on the memory card"
 msgstr "内存卡上没有足够的内存"
 
 # camlibs/sierra/sierra.c:656
-#: camlibs/sierra/sierra.c:791
+#: camlibs/sierra/sierra.c:778
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "无法检索含有照片的文件夹名称"
 
 # camlibs/sierra/sierra.c:663
-#: camlibs/sierra/sierra.c:798
+#: camlibs/sierra/sierra.c:785
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "只支持上载到文件夹“%s”"
 
 # camlibs/sierra/sierra.c:790 camlibs/sierra/sierra.c:799
 # camlibs/sierra/sierra.c:1127
-#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:1265
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1252
 msgid "Best"
 msgstr "最佳"
 
@@ -13072,106 +15887,106 @@
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1041
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1103
-#: camlibs/sierra/sierra.c:1127 camlibs/sierra/sierra.c:1149
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1564 camlibs/sierra/sierra.c:1587
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1654 camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1059 camlibs/sierra/sierra.c:1090
+#: camlibs/sierra/sierra.c:1114 camlibs/sierra/sierra.c:1136
+#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1574
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1622
+#: camlibs/sierra/sierra.c:1641 camlibs/sierra/sierra.c:1709
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (未知)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1275
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:1262
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "快门速度 (微秒，0 表示自动)"
 
 # camlibs/sierra/sierra.c:857 camlibs/sierra/sierra.c:865
 # camlibs/sierra/sierra.c:1171
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1312
+#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:989
+#: camlibs/sierra/sierra.c:1299
 msgid "Black/White"
 msgstr "黑白"
 
 # camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:869
 # camlibs/sierra/sierra.c:1175
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:993
+#: camlibs/sierra/sierra.c:1303
 msgid "White Board"
 msgstr "白板"
 
 # camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:871
 # camlibs/sierra/sierra.c:1177
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:995
+#: camlibs/sierra/sierra.c:1305
 msgid "Black Board"
 msgstr "黑板"
 
 # camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1208
-#: camlibs/sierra/sierra.c:1052 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1337
 msgid "Brightness/Contrast"
 msgstr "亮度/对比度"
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1357
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1344
 msgid "Bright+"
 msgstr "亮度+"
 
 # camlibs/sierra/sierra.c:919 camlibs/sierra/sierra.c:928
 # camlibs/sierra/sierra.c:1216
-#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1359
+#: camlibs/sierra/sierra.c:1043 camlibs/sierra/sierra.c:1052
+#: camlibs/sierra/sierra.c:1346
 msgid "Bright-"
 msgstr "亮度-"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1379
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1080
+#: camlibs/sierra/sierra.c:1366
 msgid "Skylight"
 msgstr "日光"
 
 # camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
 # camlibs/sierra/sierra.c:1258
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1124
-#: camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1390
 msgid "Infinity/Fish-eye"
 msgstr "无限/鱼眼"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1413
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1400
 msgid "Spot Metering Mode"
 msgstr "场景测量模式"
 
 # camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1161 camlibs/sierra/sierra.c:1167
+#: camlibs/sierra/sierra.c:1148 camlibs/sierra/sierra.c:1154
 msgid "1x"
 msgstr "1x"
 
 # camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1035
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1172
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1159
 msgid "1.6x"
 msgstr "1.6x"
 
 # camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1162
 msgid "2.5x"
 msgstr "2.5x"
 
 # camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1302
 # camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1668 camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1179 camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1853
 msgid "Auto Off (host) (in seconds)"
 msgstr "自动关机 (连接) (秒)"
 
 # camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1519
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1670
+#: camlibs/sierra/sierra.c:1181 camlibs/sierra/sierra.c:1657
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -13179,67 +15994,67 @@
 
 # camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1312
 # camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1719
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1877
+#: camlibs/sierra/sierra.c:1193 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1669 camlibs/sierra/sierra.c:1864
 msgid "Auto Off (field) (in seconds)"
 msgstr "自动关机 (未连接) (秒)"
 
 # camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1684
+#: camlibs/sierra/sierra.c:1195 camlibs/sierra/sierra.c:1671
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "在未连接到计算机时，须等待多长时间再自动关机？"
 
 # camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1468
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD 自动关闭 (以秒为单位)"
 
 # camlibs/sierra/sierra.c:1355
-#: camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1493
 msgid "Shot Settings"
 msgstr "拍摄设置"
 
 # camlibs/sierra/sierra.c:1362 camlibs/sierra/sierra.c:1370
 # camlibs/sierra/sierra.c:1605
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:1500 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1744
 msgid "F2"
 msgstr "F2"
 
 # camlibs/sierra/sierra.c:1363 camlibs/sierra/sierra.c:1372
 # camlibs/sierra/sierra.c:1607
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1759
+#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1510
+#: camlibs/sierra/sierra.c:1746
 msgid "F2.3"
 msgstr "F2.3"
 
 # camlibs/sierra/sierra.c:1364 camlibs/sierra/sierra.c:1374
 # camlibs/sierra/sierra.c:1609
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1748
 msgid "F2.8"
 msgstr "F2.8"
 
 # camlibs/sierra/sierra.c:1365 camlibs/sierra/sierra.c:1376
 # camlibs/sierra/sierra.c:1611
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1750
 msgid "F4"
 msgstr "F4"
 
 # camlibs/sierra/sierra.c:1366 camlibs/sierra/sierra.c:1378
 # camlibs/sierra/sierra.c:1613
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1516
+#: camlibs/sierra/sierra.c:1752
 msgid "F5.6"
 msgstr "F5.6"
 
 # camlibs/sierra/sierra.c:1367 camlibs/sierra/sierra.c:1380
 # camlibs/sierra/sierra.c:1615
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1531
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1518
+#: camlibs/sierra/sierra.c:1754
 msgid "F8"
 msgstr "F8"
 
@@ -13247,94 +16062,93 @@
 # camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
 # camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
 # camlibs/sierra/sierra.c:1680
-#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1836
-#, fuzzy
+#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1823
 msgid "standard"
 msgstr "标准"
 
 # camlibs/sierra/sierra.c:1472 camlibs/sierra/sierra.c:1481
 # camlibs/sierra/sierra.c:1686
-#: camlibs/sierra/sierra.c:1623 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/sierra.c:1829
 msgid "HyPict"
 msgstr "合成照片"
 
 # camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
 # camlibs/sierra/sierra.c:1698
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1649
-#: camlibs/sierra/sierra.c:1855
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1842
 msgid "color"
 msgstr "彩色"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1651
-#: camlibs/sierra/sierra.c:1857
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1844
 msgid "black & white"
 msgstr "黑白"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1950
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "注意：没有内存卡，有些值可能是无效的\n"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/sierra/sierra.c:1972
+#: camlibs/sierra/sierra.c:1959
 #, fuzzy, c-format
 msgid "Camera Model: %s\n"
 msgstr "%s相机型号：%s\n"
 
 # camlibs/sierra/sierra.c:1818
-#: camlibs/sierra/sierra.c:1981
+#: camlibs/sierra/sierra.c:1968
 #, fuzzy, c-format
 msgid "Serial Number: %s\n"
 msgstr "%s序列号：%s\n"
 
 # camlibs/sierra/sierra.c:1822
-#: camlibs/sierra/sierra.c:1984
+#: camlibs/sierra/sierra.c:1971
 #, fuzzy, c-format
 msgid "Software Rev.: %s\n"
 msgstr "%s软件版本号：%s\n"
 
 # camlibs/sierra/sierra.c:1826
-#: camlibs/sierra/sierra.c:1989 camlibs/sierra/sierra.c:1992
+#: camlibs/sierra/sierra.c:1976 camlibs/sierra/sierra.c:1979
 #, fuzzy, c-format
 msgid "Frames Taken: %i\n"
 msgstr "%s已用帧：%i\n"
 
 # camlibs/sierra/sierra.c:1828
-#: camlibs/sierra/sierra.c:1995
+#: camlibs/sierra/sierra.c:1982
 #, fuzzy, c-format
 msgid "Frames Left: %i\n"
 msgstr "%s剩余帧：%i\n"
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/sierra/sierra.c:1997
+#: camlibs/sierra/sierra.c:1984
 #, fuzzy, c-format
 msgid "Battery Life: %i\n"
 msgstr "%s电池寿命：%i\n"
 
 # camlibs/sierra/sierra.c:1832
-#: camlibs/sierra/sierra.c:1999
+#: camlibs/sierra/sierra.c:1986
 #, fuzzy, c-format
 msgid "Memory Left: %i bytes\n"
 msgstr "%s内存剩余：%i 字节\n"
 
 # camlibs/sierra/sierra.c:1836
-#: camlibs/sierra/sierra.c:2004
+#: camlibs/sierra/sierra.c:1991
 #, fuzzy, c-format
 msgid "Date: %s"
 msgstr "%s日期：%s"
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/sierra/sierra.c:2065
+#: camlibs/sierra/sierra.c:2052
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "相机不可用"
 
 # camlibs/sierra/sierra.c:1852
-#: camlibs/sierra/sierra.c:2072
+#: camlibs/sierra/sierra.c:2059
 #, fuzzy, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -13356,7 +16170,7 @@
 "  <gphoto-devel@lists.sourceforge.net> 发送电子邮件 (用英语)\n"
 
 # camlibs/sierra/sierra.c:1864
-#: camlibs/sierra/sierra.c:2084
+#: camlibs/sierra/sierra.c:2071
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -13394,7 +16208,7 @@
 "    到“关闭”。"
 
 # camlibs/sierra/sierra.c:1887
-#: camlibs/sierra/sierra.c:2111
+#: camlibs/sierra/sierra.c:2098
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -13415,20 +16229,7 @@
 "因为使用了他们的奥林巴斯 C-3030Z\n"
 "以实现 USB 支持。"
 
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
-# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
-# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra-desc.c:187
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (未知)"
-
-#: camlibs/sipix/blink.c:871
+#: camlibs/sipix/blink.c:860
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -13439,11 +16240,11 @@
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
 # camlibs/canon/usb.c:215
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:251
+#: camlibs/sipix/blink.c:983 camlibs/stv0674/stv0674.c:244
 msgid "Could not apply USB settings"
 msgstr "无法应用 USB 设置"
 
-#: camlibs/sipix/web2.c:626
+#: camlibs/sipix/web2.c:616
 msgid ""
 "SiPix Web2\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -13460,7 +16261,7 @@
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonix/library.c:122
+#: camlibs/sonix/library.c:123
 #, c-format
 msgid ""
 "Sonix camera.\n"
@@ -13469,8 +16270,10 @@
 "Sonix camera.\n"
 "There are %i photos in it.\n"
 msgstr0 ""
+"Sonix 相机。\n"
+"共存储了 %i 照片。\n"
 
-#: camlibs/sonix/library.c:133
+#: camlibs/sonix/library.c:134
 msgid ""
 "This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
 "The following operations are supported:\n"
@@ -13485,14 +16288,14 @@
 "A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
 
-#: camlibs/sonix/library.c:151
+#: camlibs/sonix/library.c:152
 msgid ""
 "Sonix camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
 # camlibs/sonydscf1/sonydscf1.c:133
-#: camlibs/sonydscf1/sonydscf1.c:583
+#: camlibs/sonydscf1/sonydscf1.c:572
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
 "M. Adam Kendall <joker@penguinpub.com>\n"
@@ -13507,7 +16310,7 @@
 "由 Bart van Leeuwen <bart@netage.nl> 移植到 gphoto2"
 
 # camlibs/sonydscf55/camera.c:91
-#: camlibs/sonydscf55/camera.c:102
+#: camlibs/sonydscf55/camera.c:105
 msgid ""
 "Sony DSC-F55/505 gPhoto library\n"
 "Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
@@ -13519,7 +16322,7 @@
 "最初由 Mark Davies <mdavies@dial.pipex.com> 编写\n"
 "由 Raymond Penners <raymond@dotsphinx.com> 移植到 gphoto2"
 
-#: camlibs/soundvision/soundvision.c:333
+#: camlibs/soundvision/soundvision.c:320
 #, c-format
 msgid ""
 "Firmware Revision: %8s\n"
@@ -13529,13 +16332,13 @@
 msgstr ""
 
 # camlibs/stv0680/library.c:525
-#: camlibs/soundvision/soundvision.c:339
+#: camlibs/soundvision/soundvision.c:326
 #, c-format
 msgid "Firmware Revision: %8s"
 msgstr "固件版本：%8s"
 
 # camlibs/agfa/agfa.c:228
-#: camlibs/soundvision/soundvision.c:346
+#: camlibs/soundvision/soundvision.c:333
 msgid ""
 "Soundvision Driver\n"
 "Vince Weaver <vince@deater.net>\n"
@@ -13543,14 +16346,14 @@
 "Soundvision 驱动程序\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca50x/library.c:270
+#: camlibs/spca50x/library.c:262
 #, c-format
 msgid ""
 "FLASH:\n"
 " Files: %d\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:279
+#: camlibs/spca50x/library.c:271
 #, c-format
 msgid ""
 "SDRAM:\n"
@@ -13562,10 +16365,9 @@
 msgstr ""
 
 # camlibs/jamcam/jamcam.c:280
-#: camlibs/spca50x/library.c:295
-#, fuzzy
+#: camlibs/spca50x/library.c:287
 msgid "spca50x library v"
-msgstr "gsmart 库 v"
+msgstr "spca50x 库 v"
 
 #: camlibs/sq905/library.c:133
 #, c-format
@@ -13604,19 +16406,19 @@
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:83
+#: camlibs/st2205/library.c:73
 #, c-format
 msgid "Your USB picture frame has a ST2205 chipset\n"
 msgstr ""
 
-#: camlibs/st2205/library.c:92
+#: camlibs/st2205/library.c:82
 msgid ""
 "ST2205 based picture frames come with a variety of resolutions.\n"
 "The gphoto driver for these devices allows you to download,\n"
 "upload and delete pictures from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:105
+#: camlibs/st2205/library.c:95
 msgid ""
 "ST2205 USB picture frame driver\n"
 "Hans de Goede <hdegoede@redhat.com>\n"
@@ -13624,11 +16426,7 @@
 "from the picture frame."
 msgstr ""
 
-#: camlibs/st2205/library.c:549 camlibs/st2205/library.c:573
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:198
+#: camlibs/stv0674/stv0674.c:191
 msgid ""
 "STV0674\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -13637,133 +16435,133 @@
 msgstr ""
 
 # camlibs/stv0680/library.c:356 camlibs/stv0680/library.c:390
-#: camlibs/stv0680/library.c:377 camlibs/stv0680/library.c:411
+#: camlibs/stv0680/library.c:367 camlibs/stv0680/library.c:401
 msgid "Bad exposure (not enough light probably)"
 msgstr "曝光失败 (可能是没有充足的光线)"
 
 # camlibs/stv0680/library.c:520
-#: camlibs/stv0680/library.c:543
+#: camlibs/stv0680/library.c:533
 #, fuzzy
 msgid "Information on STV0680-based camera:\n"
 msgstr "关于基于 STV0680 的相机的信息：\n"
 
 # camlibs/stv0680/library.c:525
-#: camlibs/stv0680/library.c:548
+#: camlibs/stv0680/library.c:538
 #, c-format
 msgid "Firmware Revision: %d.%d\n"
 msgstr "固件版本：%d.%d\n"
 
 # camlibs/stv0680/library.c:529
-#: camlibs/stv0680/library.c:552
+#: camlibs/stv0680/library.c:542
 #, c-format
 msgid "ASIC Revision: %d.%d\n"
 msgstr "专用集成电路版本：%d.%d\n"
 
 # camlibs/stv0680/library.c:533
-#: camlibs/stv0680/library.c:556
+#: camlibs/stv0680/library.c:546
 #, c-format
 msgid "Sensor ID: %d.%d\n"
 msgstr "感应器 ID：%d.%d\n"
 
 # camlibs/stv0680/library.c:539
-#: camlibs/stv0680/library.c:562
+#: camlibs/stv0680/library.c:552
 #, fuzzy, c-format
 msgid "Camera is configured for lights flickering by %dHz.\n"
 msgstr "相机是按照以 %dHz 闪烁的光源来配置的。\n"
 
 # camlibs/stv0680/library.c:542
-#: camlibs/stv0680/library.c:565
+#: camlibs/stv0680/library.c:555
 #, c-format
 msgid "Memory in camera: %d Mbit.\n"
 msgstr "相机内置内存：%d 兆位。\n"
 
 # camlibs/stv0680/library.c:546
-#: camlibs/stv0680/library.c:569
+#: camlibs/stv0680/library.c:559
 msgid "Camera supports Thumbnails.\n"
 msgstr "相机支持缩略图。\n"
 
 # camlibs/stv0680/library.c:548
-#: camlibs/stv0680/library.c:571
+#: camlibs/stv0680/library.c:561
 msgid "Camera supports Video.\n"
 msgstr "相机支持视频。\n"
 
 # camlibs/stv0680/library.c:551
-#: camlibs/stv0680/library.c:574
+#: camlibs/stv0680/library.c:564
 msgid "Camera pictures are monochrome.\n"
 msgstr "相机照片为黑白照片。\n"
 
 # camlibs/stv0680/library.c:553
-#: camlibs/stv0680/library.c:576
+#: camlibs/stv0680/library.c:566
 msgid "Camera has memory.\n"
 msgstr "相机有内存。\n"
 
 # camlibs/stv0680/library.c:555
-#: camlibs/stv0680/library.c:578
+#: camlibs/stv0680/library.c:568
 msgid "Camera supports videoformats: "
 msgstr "相机支持的视频格式："
 
 # camlibs/stv0680/library.c:561
-#: camlibs/stv0680/library.c:584
+#: camlibs/stv0680/library.c:574
 #, c-format
 msgid "Vendor ID: %02x%02x\n"
 msgstr "厂家 ID：%02x%02x\n"
 
 # camlibs/stv0680/library.c:565
-#: camlibs/stv0680/library.c:588
+#: camlibs/stv0680/library.c:578
 #, c-format
 msgid "Product ID: %02x%02x\n"
 msgstr "产品 ID：%02x%02x\n"
 
 # camlibs/stv0680/library.c:572
-#: camlibs/stv0680/library.c:595
+#: camlibs/stv0680/library.c:585
 #, c-format
 msgid "Number of Images: %d\n"
 msgstr "图像数量：%d\n"
 
 # camlibs/stv0680/library.c:575
-#: camlibs/stv0680/library.c:598
+#: camlibs/stv0680/library.c:588
 #, c-format
 msgid "Maximum number of Images: %d\n"
 msgstr "最大图像数量：%d\n"
 
 # camlibs/stv0680/library.c:578
-#: camlibs/stv0680/library.c:601
+#: camlibs/stv0680/library.c:591
 #, c-format
 msgid "Image width: %d\n"
 msgstr "图像宽度：%d\n"
 
 # camlibs/stv0680/library.c:581
-#: camlibs/stv0680/library.c:604
+#: camlibs/stv0680/library.c:594
 #, c-format
 msgid "Image height: %d\n"
 msgstr "图像高度：%d\n"
 
 # camlibs/stv0680/library.c:584
-#: camlibs/stv0680/library.c:607
+#: camlibs/stv0680/library.c:597
 #, c-format
 msgid "Image size: %d\n"
 msgstr "图像大小：%d\n"
 
 # camlibs/stv0680/library.c:588
-#: camlibs/stv0680/library.c:611
+#: camlibs/stv0680/library.c:601
 #, c-format
 msgid "Thumbnail width: %d\n"
 msgstr "缩略图宽度：%d\n"
 
 # camlibs/stv0680/library.c:589
-#: camlibs/stv0680/library.c:612
+#: camlibs/stv0680/library.c:602
 #, c-format
 msgid "Thumbnail height: %d\n"
 msgstr "缩略图高度：%d\n"
 
 # camlibs/stv0680/library.c:590
-#: camlibs/stv0680/library.c:613
+#: camlibs/stv0680/library.c:603
 #, c-format
 msgid "Thumbnail size: %d\n"
 msgstr "缩略图大小：%d\n"
 
 # camlibs/stv0680/stv0680.c:258
-#: camlibs/stv0680/stv0680.c:270
+#: camlibs/stv0680/stv0680.c:259
 msgid ""
 "STV0680\n"
 "Adam Harrison <adam@antispin.org>\n"
@@ -13780,12 +16578,12 @@
 "为 Aiptek PenCam 和其它 STM USB 双模式相机进行了扩展。"
 
 # camlibs/konica/library.c:617
-#: camlibs/sx330z/library.c:139
+#: camlibs/sx330z/library.c:120
 #, c-format
 msgid "Getting information on %i files..."
 msgstr "正在获取第 %i 个文件的信息..."
 
-#: camlibs/sx330z/library.c:242
+#: camlibs/sx330z/library.c:223
 msgid ""
 "(Traveler) SX330z Library (And other Aldi-cams).\n"
 "Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
@@ -13793,21 +16591,20 @@
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:285
+#: camlibs/sx330z/library.c:266
 msgid "sx330z is USB only"
 msgstr "sx330z 只支持 USB"
 
 # camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:254
-#: camlibs/topfield/puppy.c:552
-#, fuzzy
+#: camlibs/topfield/puppy.c:540
 msgid "Driver Settings"
-msgstr "其它设置"
+msgstr "驱动设置"
 
-#: camlibs/topfield/puppy.c:556
+#: camlibs/topfield/puppy.c:544
 msgid "Turbo mode"
 msgstr ""
 
-#: camlibs/topfield/puppy.c:612
+#: camlibs/topfield/puppy.c:600
 msgid ""
 "Topfield TF5000PVR\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -13816,59 +16613,79 @@
 msgstr ""
 
 # camlibs/panasonic/l859/l859.c:505
-#: camlibs/topfield/puppy.c:659
-#, fuzzy, c-format
+#: camlibs/topfield/puppy.c:647
+#, c-format
 msgid "Downloading %s..."
-msgstr "正在下载“%s”..."
+msgstr "正在下载 %s..."
 
-#: camlibs/toshiba/pdrm11/library.c:120
+#: camlibs/toshiba/pdrm11/library.c:107
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 driver.\n"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:190
-msgid "Internal error looking for camlibs. (path names too long?)"
+#: camlibs/tp6801/library.c:84
+#, c-format
+msgid "Your USB picture frame has a TP6801 chipset\n"
+msgstr ""
+
+#: camlibs/tp6801/library.c:93
+msgid ""
+"TP6801 based picture frames come with a variety of resolutions.\n"
+"The gphoto driver for these devices allows you to download,\n"
+"upload and delete pictures from the picture frame."
+msgstr ""
+
+#: camlibs/tp6801/library.c:106
+msgid ""
+"TP6801 USB picture frame driver\n"
+"Hans de Goede <hdegoede@redhat.com>\n"
+"This driver allows you to download, upload and delete pictures\n"
+"from the picture frame."
 msgstr ""
 
+#: libgphoto2/gphoto2-abilities-list.c:223
+msgid "Internal error looking for camlibs. (path names too long?)"
+msgstr "寻找 camlibs 时出现内部错误。（路径名是否过长？）"
+
 # libgphoto2/gphoto2-abilities-list.c:260
-#: libgphoto2/gphoto2-abilities-list.c:203
+#: libgphoto2/gphoto2-abilities-list.c:236
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "正在从“%s”装入相机驱动程序..."
 
 # libgphoto2/gphoto2-camera.c:81
-#: libgphoto2/gphoto2-camera.c:77
+#: libgphoto2/gphoto2-camera.c:62
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "io-库 (“%s”) 中出现错误：%s"
 
 # libgphoto2/gphoto2-camera.c:662
-#: libgphoto2/gphoto2-camera.c:729
+#: libgphoto2/gphoto2-camera.c:717
 msgid "Could not detect any camera"
 msgstr "无法检测到任何相机"
 
 # libgphoto2/gphoto2-camera.c:662
-#: libgphoto2/gphoto2-camera.c:750
+#: libgphoto2/gphoto2-camera.c:738
 #, fuzzy, c-format
 msgid "Could not detect any camera at port %s"
 msgstr "无法检测到任何相机"
 
 # libgphoto2/gphoto2-camera.c:682
-#: libgphoto2/gphoto2-camera.c:774
+#: libgphoto2/gphoto2-camera.c:762
 #, fuzzy
 msgid "You have to set the port prior to initialization of the camera."
 msgstr "您必须在初始化相机以前设定端口。"
 
 # libgphoto2/gphoto2-camera.c:710
-#: libgphoto2/gphoto2-camera.c:798
+#: libgphoto2/gphoto2-camera.c:789
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "无法装入必须的相机驱动程序“%s”(%s)。"
 
 # libgphoto2/gphoto2-camera.c:728
-#: libgphoto2/gphoto2-camera.c:811
+#: libgphoto2/gphoto2-camera.c:807
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "相机驱动程序“%s”缺少“camera_init”函数。"
@@ -13918,13 +16735,13 @@
 msgstr "该相机不能预览视频捕捉。"
 
 # libgphoto2/gphoto2-filesys.c:214
-#: libgphoto2/gphoto2-filesys.c:300
+#: libgphoto2/gphoto2-filesys.c:284
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "路径“%s”不是绝对路径。"
 
 # libgphoto2/gphoto2-filesys.c:970
-#: libgphoto2/gphoto2-filesys.c:1122
+#: libgphoto2/gphoto2-filesys.c:1110
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -13932,144 +16749,204 @@
 msgstr "您试图从文件夹“%2$s”中删除“%1$s”，但文件系统不支持删除文件。"
 
 # libgphoto2/gphoto2-filesys.c:1077
-#: libgphoto2/gphoto2-filesys.c:1259
+#: libgphoto2/gphoto2-filesys.c:1247
 #, fuzzy, c-format
 msgid ""
 "There are still subfolders in folder '%s/%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有子文件夹。"
 
 # libgphoto2/gphoto2-filesys.c:1071
-#: libgphoto2/gphoto2-filesys.c:1264
+#: libgphoto2/gphoto2-filesys.c:1252
 #, fuzzy, c-format
 msgid "There are still files in folder '%s/%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有文件。"
 
 # libgphoto2/gphoto2-filesys.c:1117
-#: libgphoto2/gphoto2-filesys.c:1303
+#: libgphoto2/gphoto2-filesys.c:1291
 msgid "The filesystem does not support upload of files."
 msgstr "文件系统不支持上载文件。"
 
 # libgphoto2/gphoto2-filesys.c:1158
-#: libgphoto2/gphoto2-filesys.c:1359
+#: libgphoto2/gphoto2-filesys.c:1347
 #, fuzzy, c-format
 msgid ""
 "Folder '%s' only contains %i files, but you requested a file with number %i."
 msgstr "文件夹“%s”只含有 %i 个文件，但您请求编号为 %i 的文件。"
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: libgphoto2/gphoto2-filesys.c:1407
+#: libgphoto2/gphoto2-filesys.c:1395
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # libgphoto2/gphoto2-filesys.c:1282
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1512
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "无法找到文件“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:1407
-#: libgphoto2/gphoto2-filesys.c:1548
+#: libgphoto2/gphoto2-filesys.c:1536
 msgid "The filesystem doesn't support getting files"
 msgstr "文件系统不支持获取文件"
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: libgphoto2/gphoto2-filesys.c:1582 libgphoto2/gphoto2-filesys.c:2113
-#: libgphoto2/gphoto2-filesys.c:2269
+#: libgphoto2/gphoto2-filesys.c:1570 libgphoto2/gphoto2-filesys.c:2101
+#: libgphoto2/gphoto2-filesys.c:2257
 #, c-format
 msgid "Unknown file type %i."
 msgstr "未知的文件类型 %i。"
 
 # libgphoto2/gphoto2-filesys.c:1656
-#: libgphoto2/gphoto2-filesys.c:1873
+#: libgphoto2/gphoto2-filesys.c:1861
 msgid "The filesystem doesn't support getting file information"
 msgstr "文件系统不支持获取文件信息"
 
 # libgphoto2/gphoto2-filesys.c:1867
-#: libgphoto2/gphoto2-filesys.c:2378
+#: libgphoto2/gphoto2-filesys.c:2397
 msgid "The filesystem doesn't support setting file information"
 msgstr "文件系统不支持设置文件信息"
 
 # libgphoto2/gphoto2-filesys.c:1890
-#: libgphoto2/gphoto2-filesys.c:2400
+#: libgphoto2/gphoto2-filesys.c:2419
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "无法改变像宽度和高度这样的只读文件属性。"
 
 # libgphoto2/gphoto2-filesys.c:1656
-#: libgphoto2/gphoto2-filesys.c:2457
-#, fuzzy
+#: libgphoto2/gphoto2-filesys.c:2476
 msgid "The filesystem doesn't support getting storage information"
-msgstr "文件系统不支持获取文件信息"
+msgstr "文件系统不支持获取存储信息"
 
 # libgphoto2/gphoto2-result.c:44
-#: libgphoto2/gphoto2-result.c:47
+#: libgphoto2/gphoto2-result.c:36
 msgid "Corrupted data"
 msgstr "已毁坏的数据"
 
 # libgphoto2/gphoto2-result.c:45
-#: libgphoto2/gphoto2-result.c:48
+#: libgphoto2/gphoto2-result.c:37
 msgid "File exists"
 msgstr "文件存在"
 
 # libgphoto2/gphoto2-result.c:46
-#: libgphoto2/gphoto2-result.c:49
+#: libgphoto2/gphoto2-result.c:38
 msgid "Unknown model"
 msgstr "未知型号"
 
 # libgphoto2/gphoto2-result.c:47
-#: libgphoto2/gphoto2-result.c:50
+#: libgphoto2/gphoto2-result.c:39
 msgid "Directory not found"
 msgstr "找不到目录"
 
 # libgphoto2/gphoto2-result.c:48
-#: libgphoto2/gphoto2-result.c:51
+#: libgphoto2/gphoto2-result.c:40
 msgid "File not found"
 msgstr "找不到文件"
 
 # libgphoto2/gphoto2-result.c:49
-#: libgphoto2/gphoto2-result.c:52
+#: libgphoto2/gphoto2-result.c:41
 msgid "Directory exists"
 msgstr "目录存在"
 
-#: libgphoto2/gphoto2-result.c:53
+#: libgphoto2/gphoto2-result.c:42
 msgid "I/O in progress"
-msgstr ""
+msgstr "正在进行 I/O 操作"
 
 # libgphoto2/gphoto2-result.c:50
-#: libgphoto2/gphoto2-result.c:54
+#: libgphoto2/gphoto2-result.c:43
 msgid "Path not absolute"
 msgstr "路径不是绝对路径"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: libgphoto2/gphoto2-result.c:55
+#: libgphoto2/gphoto2-result.c:44
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
-#: libgphoto2/gphoto2-result.c:56
+#: libgphoto2/gphoto2-result.c:45
 msgid "Camera could not complete operation"
-msgstr ""
+msgstr "相机无法完成操作"
 
 # camlibs/dimera/dimera3500.c:957
-#: libgphoto2/gphoto2-result.c:57
-#, fuzzy
+#: libgphoto2/gphoto2-result.c:46
 msgid "OS error in camera communication"
-msgstr "设置相机通讯速度出问题"
+msgstr "相机通讯中出现操作系统错误"
 
-#: libgphoto2/gphoto2-result.c:58
+#: libgphoto2/gphoto2-result.c:47
 msgid "Not enough free space"
 msgstr "没有足够空闲空间"
 
 # libgphoto2/gphoto2-result.c:76
-#: libgphoto2/gphoto2-result.c:83
+#: libgphoto2/gphoto2-result.c:72
 msgid "Unknown camera library error"
 msgstr "未知的相机库错误"
 
 # libgphoto2/gphoto2-result.c:82
-#: libgphoto2/gphoto2-result.c:89
+#: libgphoto2/gphoto2-result.c:78
 msgid "Unknown error"
 msgstr "未知的错误"
 
+# libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
+#, fuzzy, c-format
+#~| msgid "Unknown file type %i."
+#~ msgid "Unknown value %04d"
+#~ msgstr "未知的文件类型 %i。"
+
+#, fuzzy, c-format
+#~ msgid "%d Multi Frame Noise Reduction"
+#~ msgstr "曝光补偿"
+
+# camlibs/polaroid/pdc700.c:161
+#, fuzzy
+#~| msgid "Flash Setting"
+#~ msgid "Setting 4"
+#~ msgstr "闪光灯设置"
+
+# camlibs/polaroid/pdc700.c:161
+#, fuzzy
+#~| msgid "Flash Setting"
+#~ msgid "Setting 5"
+#~ msgstr "闪光灯设置"
+
+# camlibs/polaroid/pdc700.c:161
+#, fuzzy
+#~| msgid "Flash Setting"
+#~ msgid "Setting 6"
+#~ msgstr "闪光灯设置"
+
+# camlibs/polaroid/pdc700.c:161
+#, fuzzy
+#~| msgid "Flash Setting"
+#~ msgid "Setting 7"
+#~ msgstr "闪光灯设置"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 2"
+#~ msgstr "定制"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 3"
+#~ msgstr "定制"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 4"
+#~ msgstr "定制"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#, fuzzy
+#~| msgid "Custom"
+#~ msgid "Custom WB 5"
+#~ msgstr "定制"
+
 # camlibs/canon/library.c:176
 #, fuzzy
 #~ msgid "Initializing Camera"
@@ -14400,11 +17277,6 @@
 #~ msgid "PTP: EK Filename Invalid"
 #~ msgstr "非法的 PTP EK 文件名"
 
-# camlibs/ptp/library.c:130
-#, fuzzy
-#~ msgid "PTP: I/O error"
-#~ msgstr "PTP I/O 错误"
-
 # camlibs/ptp/library.c:131
 #, fuzzy
 #~ msgid "PTP: Error: bad parameter"
@@ -14420,11 +17292,6 @@
 #~ msgid "PTP: Protocol error, response expected"
 #~ msgstr "PTP 协议错误，需要响应"
 
-# camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#, fuzzy
-#~ msgid "Date Time"
-#~ msgstr "日期和时间"
-
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
 #, fuzzy
 #~ msgid "ShutterSpeed"
@@ -14435,12 +17302,6 @@
 #~ msgid "Real Image Width"
 #~ msgstr "图像宽度：%d\n"
 
-# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
-# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#, fuzzy
-#~ msgid "Colour Mode"
-#~ msgstr "彩色模式"
-
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
 #, fuzzy
 #~ msgid "Exposure Bracketing Distance"

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/Makefile.am -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/Makefile.am Changed

@@ -1,14 +1,18 @@
-SUBDIRS = ddb
+########################################################################
+# Housekeeping
+########################################################################
 
-EXTRA_DIST =
 EXTRA_PROGRAMS =
 check_PROGRAMS =
-check_SCRIPTS =
 TESTS =
 INSTALL_TESTS =
 noinst_PROGRAMS =
 
 
+########################################################################
+# Set up test environment
+########################################################################
+
 # Now that we build all the camlibs in one directory, we can run our checks
 # with CAMLIBS set to the camlib build directory.
 TESTS_ENVIRONMENT = env \
@@ -19,33 +23,62 @@
 	CAMLIBS="$(DESTDIR)$(camlibdir)" \
 	LD_LIBRARY_PATH="$(DESTDIR)$(libdir)$${LD_LIBRARY_PATH+:$${LD_LIBRARY_PATH}}"
 
-AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)  -I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/libgphoto2 -I$(top_builddir)/libgphoto2
 
-CLEANFILES = $(check_SCRIPTS)
+########################################################################
+# Define test programs
+########################################################################
+
+
+# Default CPPFLAGS to use
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)  -I$(top_srcdir)/libgphoto2_port
 
 
-TESTS += test-endian
-check_PROGRAMS += test-endian
-test_endian_SOURCE = test-endian.c
-test_endian_LDADD = \
+# Test i18n
+check_PROGRAMS     += test-i18n
+test_i18n_SOURCES   = test-i18n.c
+test_i18n_CPPFLAGS  = $(AM_CPPFLAGS)
+test_i18n_CFLAGS    = $(AM_CFLAGS)
+test_i18n_LDADD     = $(INTLLIBS)
+
+
+# Test endianness conversions
+TESTS              += test-endian
+check_PROGRAMS     += test-endian
+test_endian_SOURCES = test-endian.c
+test_endian_LDADD   = \
 	$(top_builddir)/libgphoto2/libgphoto2.la \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
 	$(LIBLTDL) \
 	$(LIBEXIF_LIBS) \
 	$(INTLLIBS)
 
-noinst_PROGRAMS += test-gphoto2
-test_gphoto2_SOURCE = test-gphoto2.c
-test_gphoto2_LDADD = \
+
+# Print the libgphoto2 version information for this libgphoto2 build
+noinst_PROGRAMS                 += print-libgphoto2-version
+print_libgphoto2_version_SOURCES = print-libgphoto2-version.c
+print_libgphoto2_version_LDADD   =
+print_libgphoto2_version_LDADD  += $(top_builddir)/libgphoto2/libgphoto2.la
+print_libgphoto2_version_LDADD  += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+print_libgphoto2_version_LDADD  += $(LIBLTDL)
+print_libgphoto2_version_LDADD  += $(LIBEXIF_LIBS)
+print_libgphoto2_version_LDADD  += $(INTLLIBS)
+
+
+# Test basic libgphoto2 functionality
+noinst_PROGRAMS     += test-gphoto2
+test_gphoto2_SOURCES = test-gphoto2.c
+test_gphoto2_LDADD   = \
 	$(top_builddir)/libgphoto2/libgphoto2.la \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
 	$(LIBLTDL) \
 	$(LIBEXIF_LIBS) \
 	$(INTLLIBS)
 
-noinst_PROGRAMS += test-filesys
-test_filesys_SOURCE = test-filesys.c
-test_filesys_LDADD = \
+
+# Test gp_filesystem_* functions
+noinst_PROGRAMS    += test-filesys
+test_filesys_SOURCES = test-filesys.c
+test_filesys_LDADD   = \
 	$(top_builddir)/libgphoto2/libgphoto2.la \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
 	$(LIBLTDL) \
@@ -53,12 +86,12 @@
 	$(INTLLIBS)
 
 
-
-TESTS += test-camera-list
-INSTALL_TESTS += test-camera-list
-check_PROGRAMS += test-camera-list
-test_camera_list_SOURCE = test-camera-list.c
-test_camera_list_LDADD = \
+# Print a list of all cameras supported by this build of libgphoto2
+TESTS          += test-camera-list
+INSTALL_TESTS  += test-camera-list
+check_PROGRAMS         += test-camera-list
+test_camera_list_SOURCES = test-camera-list.c
+test_camera_list_LDADD   = \
 	$(top_builddir)/libgphoto2/libgphoto2.la \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
 	$(LIBLTDL) \
@@ -66,49 +99,149 @@
 	$(INTLLIBS)
 
 
-if HAVE_GCC
-PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Wextra -Werror
-PEDANTIC_CXXFLAGS = -std=c++98 -pedantic-errors -W -Wall -Wextra -Werror
-else
-PEDANTIC_CFLAGS = 
-PEDANTIC_CXXFLAGS = 
+TESTS          += test-init-localedir
+check_PROGRAMS += test-init-localedir
+test_init_localedir_LDADD =
+test_init_localedir_LDADD += $(top_builddir)/libgphoto2/libgphoto2.la
+test_init_localedir_LDADD += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
+test_init_localedir_LDADD += $(LIBLTDL)
+test_init_localedir_LDADD += $(LIBEXIF_LIBS)
+test_init_localedir_LDADD += $(INTLLIBS)
+
+
+########################################################################
+# Test pedantic compilation for multiple language standard
+########################################################################
+
+generic_pedantic_cppflags   =
+generic_pedantic_cppflags  += -I$(top_srcdir)/libgphoto2_port
+generic_pedantic_cppflags  += -I$(top_srcdir)
+
+generic_pedantic_cflags     =
+
+generic_pedantic_cxxflags   =
+
+if GP_HAVE_PEDANTIC_FLAGS_C90
+TESTS                      += test-pedantic-c90
+check_PROGRAMS             += test-pedantic-c90
+endif
+EXTRA_PROGRAMS             += test-pedantic-c90
+test_pedantic_c90_SOURCES   = test-pedantic-compilation.c
+test_pedantic_c90_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_c90_CFLAGS    = $(GP_PEDANTIC_CFLAGS_C90)
+test_pedantic_c90_CFLAGS   += $(generic_pedantic_cflags)
+test_pedantic_c90_LDADD     =
+test_pedantic_c90_LDFLAGS   =
+
+if GP_HAVE_PEDANTIC_FLAGS_C99
+TESTS                      += test-pedantic-c99
+check_PROGRAMS             += test-pedantic-c99
 endif
+EXTRA_PROGRAMS             += test-pedantic-c99
+test_pedantic_c99_SOURCES   = test-pedantic-compilation.c
+test_pedantic_c99_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_c99_CFLAGS    = $(GP_PEDANTIC_CFLAGS_C99)
+test_pedantic_c99_CFLAGS   += $(generic_pedantic_cflags)
+test_pedantic_c99_LDADD     =
+test_pedantic_c99_LDFLAGS   =
+
+if GP_HAVE_PEDANTIC_FLAGS_C11
+TESTS                      += test-pedantic-c11
+check_PROGRAMS             += test-pedantic-c11
+endif
+EXTRA_PROGRAMS             += test-pedantic-c11
+test_pedantic_c11_SOURCES   = test-pedantic-compilation.c
+test_pedantic_c11_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_c11_CFLAGS    = $(GP_PEDANTIC_CFLAGS_C11)
+test_pedantic_c11_CFLAGS   += $(generic_pedantic_cflags)
+test_pedantic_c11_LDADD     =
+test_pedantic_c11_LDFLAGS   =
+
+if GP_HAVE_PEDANTIC_FLAGS_C2X
+TESTS                      += test-pedantic-c2x
+check_PROGRAMS             += test-pedantic-c2x
+endif
+EXTRA_PROGRAMS             += test-pedantic-c2x
+test_pedantic_c2x_SOURCES   = test-pedantic-compilation.c
+test_pedantic_c2x_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_c2x_CFLAGS    = $(GP_PEDANTIC_CFLAGS_C2X)
+test_pedantic_c2x_CFLAGS   += $(generic_pedantic_cflags)
+test_pedantic_c2x_LDADD     =
+test_pedantic_c2x_LDFLAGS   =
 
-TESTS += test-pedantic-c
-check_PROGRAMS += test-pedantic-c
-test_pedantic_c_SOURCES = test-pedantic-compilation.c
-test_pedantic_c_CPPFLAGS = \
-	$(AM_CPPFLAGS) $(CPPFLAGS) \
-	-U_GPHOTO2_INTERNAL_CODE
-test_pedantic_c_CFLAGS = \
-	$(AM_CFLAGS) $(PEDANTIC_CFLAGS) $(CFLAGS) \
-	-U_GPHOTO2_INTERNAL_CODE
-test_pedantic_c_LDADD = \
-	$(top_builddir)/libgphoto2/libgphoto2.la \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(LIBEXIF_LIBS) \
-	$(INTLLIBS)
+if HAVE_CXX
+if GP_HAVE_PEDANTIC_FLAGS_CXX98
+TESTS                        += test-pedantic-cxx98
+check_PROGRAMS               += test-pedantic-cxx98
+endif
+endif
+EXTRA_PROGRAMS               += test-pedantic-cxx98
+test_pedantic_cxx98_SOURCES   = test-pedantic-compilation.cxx
+test_pedantic_cxx98_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_cxx98_CXXFLAGS  = $(GP_PEDANTIC_CXXFLAGS_CXX98)
+test_pedantic_cxx98_CXXFLAGS += $(generic_pedantic_cxxflags)
+test_pedantic_cxx98_LDADD     =
+test_pedantic_cxx98_LDFLAGS   =
 
+if HAVE_CXX
+if GP_HAVE_PEDANTIC_FLAGS_CXX11
+TESTS                        += test-pedantic-cxx11
+check_PROGRAMS               += test-pedantic-cxx11
+endif
+endif
+EXTRA_PROGRAMS               += test-pedantic-cxx11
+test_pedantic_cxx11_SOURCES   = test-pedantic-compilation.cxx
+test_pedantic_cxx11_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_cxx11_CXXFLAGS  = $(GP_PEDANTIC_CXXFLAGS_CXX11)
+test_pedantic_cxx11_CXXFLAGS += $(generic_pedantic_cxxflags)
+test_pedantic_cxx11_LDADD     =
+test_pedantic_cxx11_LDFLAGS   =
 
 if HAVE_CXX
-check_PROGRAMS += test-pedantic-cxx
-TESTS += test-pedantic-cxx
-else
-EXTRA_PROGRAMS += test-pedantic-cxx
+if GP_HAVE_PEDANTIC_FLAGS_CXX14
+TESTS                        += test-pedantic-cxx14
+check_PROGRAMS               += test-pedantic-cxx14
 endif
-test_pedantic_cxx_SOURCES = test-pedantic-compilation.cxx
-test_pedantic_cxx_CPPFLAGS = \
-	$(AM_CPPFLAGS) $(CPPFLAGS) \
-	-U_GPHOTO2_INTERNAL_CODE
-test_pedantic_cxx_CXXFLAGS = \
-	$(AM_CXXFLAGS) $(PEDANTIC_CXXFLAGS) $(CXXFLAGS) \
-	-U_GPHOTO2_INTERNAL_CODE
-test_pedantic_cxx_LDADD = \
-	$(top_builddir)/libgphoto2/libgphoto2.la \
-	$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
-	$(LIBLTDL) \
-	$(LIBEXIF_LIBS) \
-	$(INTLLIBS)
+endif
+EXTRA_PROGRAMS               += test-pedantic-cxx14
+test_pedantic_cxx14_SOURCES   = test-pedantic-compilation.cxx
+test_pedantic_cxx14_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_cxx14_CXXFLAGS  = $(GP_PEDANTIC_CXXFLAGS_CXX14)
+test_pedantic_cxx14_CXXFLAGS += $(generic_pedantic_cxxflags)
+test_pedantic_cxx14_LDADD     =
+test_pedantic_cxx14_LDFLAGS   =
+
+if HAVE_CXX
+if GP_HAVE_PEDANTIC_FLAGS_CXX17
+TESTS                        += test-pedantic-cxx17
+check_PROGRAMS               += test-pedantic-cxx17
+endif
+endif
+EXTRA_PROGRAMS               += test-pedantic-cxx17
+test_pedantic_cxx17_SOURCES   = test-pedantic-compilation.cxx
+test_pedantic_cxx17_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_cxx17_CXXFLAGS  = $(GP_PEDANTIC_CXXFLAGS_CXX17)
+test_pedantic_cxx17_CXXFLAGS += $(generic_pedantic_cxxflags)
+test_pedantic_cxx17_LDADD     =
+test_pedantic_cxx17_LDFLAGS   =
+
+if HAVE_CXX
+if GP_HAVE_PEDANTIC_FLAGS_CXX20
+TESTS                        += test-pedantic-cxx20
+check_PROGRAMS               += test-pedantic-cxx20
+endif
+endif
+EXTRA_PROGRAMS               += test-pedantic-cxx20
+test_pedantic_cxx20_SOURCES   = test-pedantic-compilation.cxx
+test_pedantic_cxx20_CPPFLAGS  = $(generic_pedantic_cppflags)
+test_pedantic_cxx20_CXXFLAGS  = $(GP_PEDANTIC_CXXFLAGS_CXX20)
+test_pedantic_cxx20_CXXFLAGS += $(generic_pedantic_cxxflags)
+test_pedantic_cxx20_LDADD     =
+test_pedantic_cxx20_LDFLAGS   =
+
+
+########################################################################
+# Implement the checks for the installed library
+########################################################################
 
 include $(top_srcdir)/installcheck.mk

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/Makefile.in -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/Makefile.in Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/print-libgphoto2-version.c Added

@@ -0,0 +1,150 @@
+/* print-libgphoto2-version.c - print libgphoto2 library version
+ *
+ * Copyright 2002,2005 Hans Ulrich Niedermann <hun@users.sourceforge.net>
+ * Portions Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
+ * Portions Copyright 2005 Julien BLACHE <jblache@debian.org>
+ * Portions Copyright 2020 Hans Ulrich Niedermann <hun@n-dimensional.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ *
+ * This has been mostly copied from the file
+ *
+ *     packaging/generic/print-camera-list.c
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "gphoto2/gphoto2-version.h"
+
+
+/* Not sure whether this is the best possible name */
+#define ARGV0 "print-libgphoto2-version"
+
+
+#define FATAL(msg...)				\
+	do { \
+		fprintf(stderr, ARGV0 ": Fatal: " msg); \
+		fprintf(stderr, "\n"); \
+		exit(13); \
+	} while (0)
+
+
+typedef struct {
+	char *name;
+	GPVersionFunc version_func;
+} module_version;
+
+
+const module_version module_versions = {
+	{ "libgphoto2", gp_library_version },
+	{ "libgphoto2_port", gp_port_library_version },
+	{ NULL, NULL }
+};
+
+
+/* print_version_comment
+ * Print comment to output containing information on library versions
+ *
+ * out        the file to write the comment to
+ * startline  printed at the start of each line, e.g. "# " or "    | "
+ * endline    printed as the end of each line,   e.g. "\n" or "\n"
+ * firstline  printed before first line,         e.g. NULL or "\n"
+ */
+
+static void
+print_version_comment(FILE *out,
+		      const char *startline, const char *endline,
+		      const char *firstline, const char *lastline)
+{
+	unsigned int n;
+	if (out == NULL) { FATAL("Internal error: NULL out in print_version_comment()"); }
+	if (firstline != NULL) { fputs(firstline, out); }
+	if (startline != NULL) { fputs(startline, out); }
+	fputs("Short runtime version information on the libgphoto2 build:", out);
+	if (endline != NULL) { fputs(endline, out); }
+	for (n=0; (module_versionsn.name != NULL) && (module_versionsn.version_func != NULL); n++) {
+		const char *name = module_versionsn.name;
+		GPVersionFunc func = module_versionsn.version_func;
+		const char **v = func(GP_VERSION_SHORT);
+		unsigned int i;
+		if (!v) { continue; }
+		if (!v0) { continue; }
+		if (startline != NULL) { fputs(startline, out); }
+		fputs("  ", out);
+		fprintf(out,"%-15s %-14s ", name, v0);
+		for (i=1; vi != NULL; i++) {
+			fputs(vi, out);
+			if (vi+1 != NULL) {
+				fputs(", ", out);
+			}
+		}
+		if (endline != NULL) { fputs(endline, out); }
+	}
+	if (lastline != NULL) { fputs(lastline, out); }
+}
+
+
+static void
+print_version_verbose(FILE *out,
+		      const char *startline, const char *endline,
+		      const char *firstline, const char *lastline)
+{
+	unsigned int n;
+	if (out == NULL) { FATAL("Internal error: NULL out in print_version_verbose()"); }
+	if (firstline != NULL) { fputs(firstline, out); }
+	if (startline != NULL) { fputs(startline, out); }
+	fputs("Verbose runtime version information on the libgphoto2 build:", out);
+	if (endline != NULL) { fputs(endline, out); }
+	for (n=0; (module_versionsn.name != NULL) && (module_versionsn.version_func != NULL); n++) {
+		const char *name = module_versionsn.name;
+		GPVersionFunc func = module_versionsn.version_func;
+		const char **v = func(GP_VERSION_VERBOSE);
+		unsigned int i;
+		if (!v) { continue; }
+		if (!v0) { continue; }
+		if (startline != NULL) { fputs(startline, out); }
+		fputs("  * ", out);
+		fprintf(out,"%s %s", name, v0);
+		if (endline != NULL) { fputs(endline, out); }
+		for (i=1; vi != NULL; i++) {
+			fprintf(out, "      * %s", vi);
+			if (endline != NULL) { fputs(endline, out); }
+		}
+	}
+	if (lastline != NULL) { fputs(lastline, out); }
+}
+
+
+int main(void)
+{
+	print_version_comment(stdout, NULL, "\n", NULL, NULL);
+	printf("\n");
+	print_version_verbose(stdout, NULL, "\n", NULL, NULL);
+	return 0;
+}
+
+
+/*
+ * Local Variables:
+ * c-file-style:"linux"
+ * indent-tabs-mode:t
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-camera-list.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-camera-list.c Changed

@@ -8,10 +8,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library 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
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -73,7 +73,8 @@
 static void
 print_headline (void)
 {
-	printf("No.|%-20s|%-20s|%s\n",
+	printf("%-4s|%-20s|%-20s|%s\n",
+	       "No.",
 	       "camlib",
 	       "driver name",
 	       "camera model");
@@ -83,7 +84,8 @@
 static void
 print_hline (void)
 {
-	printf("---+%-20s+%-20s+%s\n",
+	printf("%-4s+%-20s+%-20s+%s\n",
+	       "----",
 	       "--------------------",
 	       "--------------------",
 	       "-------------------------------------------");
@@ -97,7 +99,7 @@
 	char *result, *tmp;
 	/* remove path part from camlib name */
 	for (result=tmp=(char *)pathname; (*tmp!='\0'); tmp++) {
-		if ((*tmp == gp_system_dir_delim) 
+		if ((*tmp == gp_system_dir_delim)
 		    && (*(tmp+1) != '\0')) {
 			result = tmp+1;
 		}
@@ -115,7 +117,7 @@
 	/* Text table without headers. */
 	FMT_FLAT_TEXT,
 	/* Text table just of camlibs without headers,
-	 * which will contain duplicate lines! 
+	 * which will contain duplicate lines!
 	 * Treat the output with | sort | uniq to get meaningful results.
 	 */
 	FMT_FLAT_CAMLIBS,
@@ -130,6 +132,23 @@
 static OutputFormat format = FMT_HEADED_TEXT;
 
 
+static
+const char usage = ""
+	"Usage: %s --debug --format=FORMAT\n"
+	"\n"
+	"Prints list of cameras supported by libgphoto2 in a certain output format.\n"
+	"\n"
+	"List of FORMAT values\n"
+	"  text      Text table with headers (the default)\n"
+	"  flattext  Text table without headers\n"
+	"  csv       Comma Separated Values (CSV) without headers\n"
+	"  xml       Custom demo XML schema\n"
+	"  count     Just print the number of cameras in the list\n"
+	"  camlibs   Text table of just the camlibs\n"
+	"            Pipe this through `| sort | uniq` to get a useful output.\n"
+	;
+
+
 /* #define DEBUG_OUTPUT */
 
 
@@ -160,6 +179,10 @@
 			format = FMT_COUNT;
 		} else if (strcmp(argvi, "--format=camlibs") == 0) {
 			format = FMT_FLAT_CAMLIBS;
+		} else if (strcmp(argvi, "--help") == 0) {
+			const char * const bn = path_basename(argv0);
+			printf(usage, bn);
+			exit(0);
 		} else {
 			const char * const bn = path_basename(argv0);
 			printf("Unknown command line parameter %d: \"%s\"\n",
@@ -173,7 +196,7 @@
 }
 
 
-/** 
+/**
  * Get list of supported cameras, walk through it and create some output.
  */
 int
@@ -205,7 +228,9 @@
 	} else if (count == 0) {
 		/* Copied from gphoto2-abilities-list.c gp_abilities_list_load() */
 		const char *camlib_env = getenv(CAMLIBDIR_ENV);
-		const char *camlibs = (camlib_env != NULL)?camlib_env:CAMLIBS;
+		/*
+		 * const char *camlibs = (camlib_env != NULL)?camlib_env:CAMLIBS;
+		 */
 
 		printf("No camera drivers (camlibs) found in camlib dir:\n"
 		       "    CAMLIBS='%s', default='%s', used=%s\n",
@@ -215,17 +240,17 @@
 	}
 
 
-	/* Set output format for file body, 
+	/* Set output format for file body,
 	 * and print opening part of output file. */
 	switch (format) {
 	case FMT_CSV:
 		fmt_str = "%d,%s,%s,%s\n";
 		break;
 	case FMT_FLAT_TEXT:
-		fmt_str = "%3d|%-20s|%-20s|%s\n";
+		fmt_str = "%4d|%-20s|%-20s|%s\n";
 		break;
 	case FMT_HEADED_TEXT:
-		fmt_str = "%3d|%-20s|%-20s|%s\n";
+		fmt_str = "%4d|%-20s|%-20s|%s\n";
 		break;
 	case FMT_XML:
 		fmt_str = "  <camera name=\"%4$s\" entry_number=\"%1$d\">\n"
@@ -233,7 +258,7 @@
 			"    <driver-name value=\"%3$s\"/>\n"
 			"  </camera>\n";
 		printf("<?xml version=\"%s\" encoding=\"%s\"?>\n"
-		       "<camera-list camera-count=\"%d\">\n", 
+		       "<camera-list camera-count=\"%d\">\n",
 		       "1.0", "us-ascii", count);
 		break;
 	case FMT_FLAT_CAMLIBS:
@@ -246,7 +271,7 @@
 	}
 
 	strcpy(lastmodel,"xxx");
-	/* For each camera in the list, add a text snippet to the 
+	/* For each camera in the list, add a text snippet to the
 	 * output file. */
 	for (i = 0; i < count; i++) {
 		CameraAbilities abilities;
@@ -262,7 +287,7 @@
 
 		switch (format) {
 		case FMT_HEADED_TEXT:
-			if ( ((i%25)== 0) && 
+			if ( ((i%25)== 0) &&
 			     ( (i==0) || ((count-i) > 5) ) ) {
 				print_hline();
 				print_headline();
@@ -282,7 +307,7 @@
 		}
 
 		printf(fmt_str,
-		       i+1, 
+		       i+1,
 		       camlib_basename,
 		       abilities.id,
 		       abilities.model);
@@ -307,7 +332,7 @@
 	case FMT_COUNT:
 		break;
 	}
-	
+
 	CHECK (gp_abilities_list_free (al));
 	gp_log_remove_func (logid);
 	return (0);

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-endian.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-endian.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-filesys.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-filesys.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-gphoto2.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-gphoto2.c Changed

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-i18n.c Added

@@ -0,0 +1,99 @@
+#include "config.h"
+
+#include <stdio.h>
+
+#include <locale.h>
+
+#include "libgphoto2/i18n.h"
+
+
+static
+const char *const default_locale_list = {
+	"C",
+	"",
+	"en_US",
+	"en_US.UTF-8",
+	"en@quot",
+	"en@quot_US",
+	"en@quot_US.UTF-8",
+	"en_US@quot",
+	"en_US.UTF-8@quot",
+	"en_US@quot.UTF-8",
+	"de",
+	"de_DE",
+	"de_DE.UTF-8",
+	"fr",
+	"fr_FR",
+	"fr_FR.UTF-8"
+};
+
+
+static
+const size_t default_locale_list_count =
+	sizeof(default_locale_list) / sizeof(default_locale_list0);
+
+
+static
+void indented_print(char *indentation, char *message)
+{
+	if (message0 == '\0') {
+		printf("%s<no translation>\n", indentation);
+		return;
+	}
+	printf("%s", indentation);
+	for (char *p=message; *p != '\0'; ++p) {
+		if (p0 == '\n') {
+			putchar(p0);
+			if (p1 != '\0') {
+				printf("%s", indentation);
+			}
+		} else {
+			putchar(p0);
+		}
+	}
+}
+
+
+static
+void print_locale_list(const size_t list_count,
+		       const char *const *list)
+{
+	for (size_t i=0; i<list_count; ++i) {
+		char *locale = setlocale(LC_ALL, listi);
+		if (locale) {
+			printf("Translated empty string to '%s' (%s):\n",
+			       listi, locale);
+		        indented_print("    ",
+				       dgettext(GETTEXT_PACKAGE_LIBGPHOTO2,
+						""));
+			setlocale(LC_ALL, "C");
+		} else {
+			printf("Skipping locale: '%s'\n", listi);
+		}
+	}
+}
+
+
+int main(const int argc, const char *const *argv)
+{
+	bindtextdomain(GETTEXT_PACKAGE_LIBGPHOTO2, LOCALEDIR);
+
+	if (argc > 1) {
+		const size_t list_counter = (size_t) (argc - 1);
+		const char *const *list   = &(argv1);
+		print_locale_list(list_counter, list);
+	} else {
+		print_locale_list(default_locale_list_count,
+				  default_locale_list);
+	}
+
+	return 0;
+}
+
+
+/*
+ * Local variables:
+ * mode:c
+ * c-basic-offset:8
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-init-localedir.c Added

@@ -0,0 +1,66 @@
+/** \file tests/test-init-localedir.c
+ * \brief Exercise the *_init_localedir() functions
+ *
+ * Copyright 2022 Hans Ulrich Niedermann <hun@n-dimensional.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ *
+ * Usage:
+ *   ./test-init-localedir /foo/share/locale
+ *   ./test-init-localedir /foo/share/locale NULL
+ *   ./test-init-localedir NULL /foo/share/locale /usr/share/locale
+ *
+ * Calls the gp_init_localedir() for each and every command line
+ * argument in sequence. Command line arguments are interpreted as
+ * directory paths (absolute or relative to the current working
+ * directory), but "NULL" is interpreted as a C NULL value.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <gphoto2/gphoto2-port-log.h>
+#include <gphoto2/gphoto2-abilities-list.h>
+
+
+void log_func(GPLogLevel level, const char *domain,
+	      const char *str, void *data)
+{
+	printf("%d:%s:%s\n", level, domain, str);
+}
+
+
+int main(const int argc, const char *const argv)
+{
+	gp_log_add_func(GP_LOG_ALL, log_func, NULL);
+	for (int i=1; i<argc; ++i) {
+		const char *const arg = argvi;
+		const char *const localedir =
+			(strcmp(arg, "NULL") == 0) ? NULL : argv1;
+		printf("main: calling gp_init_localedir(%s)\n",
+		       localedir?localedir:"(null)");
+		gp_init_localedir(localedir);
+	}
+}
+
+
+/*
+ * Local Variables:
+ * c-file-style:"linux"
+ * indent-tabs-mode:t
+ * End:
+ */

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-pedantic-compilation.c -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-pedantic-compilation.c Changed

_service:tar_scm:libgphoto2-2.5.18.tar.bz2/tests/test-pedantic-compilation.cxx -> _service:tar_scm:libgphoto2-2.5.31.tar.bz2/tests/test-pedantic-compilation.cxx Changed